repositories
/
e-mobility-charging-stations-simulator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #775 from SAP/combined-prs-branch
[e-mobility-charging-stations-simulator.git]
/
ui
/
web
/
src
/
composables
/
UIClient.ts
diff --git
a/ui/web/src/composables/UIClient.ts
b/ui/web/src/composables/UIClient.ts
index cf9894009d8844b5f4879d44d899404052f0db1a..bbb4a4499b233a6aead4703eaf1b3de93004e32e 100644
(file)
--- a/
ui/web/src/composables/UIClient.ts
+++ b/
ui/web/src/composables/UIClient.ts
@@
-1,35
+1,39
@@
-import { ProcedureName, ResponseStatus, type RequestPayload } from '@/types/UIProtocol';
-import type { ProtocolResponse, ResponsePayload } from '@/types/UIProtocol';
-
-import Utils from './Utils';
+import { promiseWithTimeout } from './Utils';
+import {
+ ProcedureName,
+ type ProtocolResponse,
+ type RequestPayload,
+ type ResponsePayload,
+ ResponseStatus,
+} from '@/types';
import config from '@/assets/config';
type ResponseHandler = {
procedureName: ProcedureName;
resolve: (value: ResponsePayload | PromiseLike<ResponsePayload>) => void;
import config from '@/assets/config';
type ResponseHandler = {
procedureName: ProcedureName;
resolve: (value: ResponsePayload | PromiseLike<ResponsePayload>) => void;
- reject: (reason?:
any
) => void;
+ reject: (reason?:
unknown
) => void;
};
};
-export
default
class UIClient {
- private static
_
instance: UIClient | null = null;
+export class UIClient {
+ private static instance: UIClient | null = null;
- private
_
ws!: WebSocket;
- private
_
responseHandlers: Map<string, ResponseHandler>;
+ private ws!: WebSocket;
+ private responseHandlers: Map<string, ResponseHandler>;
private constructor() {
this.openWS();
private constructor() {
this.openWS();
- this.
_
responseHandlers = new Map<string, ResponseHandler>();
+ this.responseHandlers = new Map<string, ResponseHandler>();
}
public static getInstance() {
}
public static getInstance() {
- if (UIClient.
_
instance === null) {
- UIClient.
_
instance = new UIClient();
+ if (UIClient.instance === null) {
+ UIClient.instance = new UIClient();
}
}
- return UIClient.
_
instance;
+ return UIClient.instance;
}
public registerWSonOpenListener(listener: (event: Event) => void) {
}
public registerWSonOpenListener(listener: (event: Event) => void) {
- this.
_
ws.addEventListener('open', listener);
+ this.ws.addEventListener('open', listener);
}
public async startSimulator(): Promise<ResponsePayload> {
}
public async startSimulator(): Promise<ResponsePayload> {
@@
-67,7
+71,7
@@
export default class UIClient {
public async startTransaction(
hashId: string,
connectorId: number,
public async startTransaction(
hashId: string,
connectorId: number,
- idTag: string | undefined
+ idTag: string | undefined
,
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.START_TRANSACTION, {
hashIds: [hashId],
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.START_TRANSACTION, {
hashIds: [hashId],
@@
-78,7
+82,7
@@
export default class UIClient {
public async stopTransaction(
hashId: string,
public async stopTransaction(
hashId: string,
- transactionId: number | undefined
+ transactionId: number | undefined
,
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.STOP_TRANSACTION, {
hashIds: [hashId],
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.STOP_TRANSACTION, {
hashIds: [hashId],
@@
-88,7
+92,7
@@
export default class UIClient {
public async startAutomaticTransactionGenerator(
hashId: string,
public async startAutomaticTransactionGenerator(
hashId: string,
- connectorId: number
+ connectorId: number
,
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.START_AUTOMATIC_TRANSACTION_GENERATOR, {
hashIds: [hashId],
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.START_AUTOMATIC_TRANSACTION_GENERATOR, {
hashIds: [hashId],
@@
-98,7
+102,7
@@
export default class UIClient {
public async stopAutomaticTransactionGenerator(
hashId: string,
public async stopAutomaticTransactionGenerator(
hashId: string,
- connectorId: number
+ connectorId: number
,
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.STOP_AUTOMATIC_TRANSACTION_GENERATOR, {
hashIds: [hashId],
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.STOP_AUTOMATIC_TRANSACTION_GENERATOR, {
hashIds: [hashId],
@@
-107,15
+111,15
@@
export default class UIClient {
}
private openWS(): void {
}
private openWS(): void {
- this.
_
ws = new WebSocket(
+ this.ws = new WebSocket(
`ws://${config.uiServer.host}:${config.uiServer.port}`,
`ws://${config.uiServer.host}:${config.uiServer.port}`,
- config.uiServer.protocol
+ config.uiServer.protocol
,
);
);
- this.
_
ws.onmessage = this.responseHandler.bind(this);
- this.
_
ws.onerror = (errorEvent) => {
+ this.ws.onmessage = this.responseHandler.bind(this);
+ this.ws.onerror = (errorEvent) => {
console.error('WebSocket error: ', errorEvent);
};
console.error('WebSocket error: ', errorEvent);
};
- this.
_
ws.onclose = (closeEvent) => {
+ this.ws.onclose = (closeEvent) => {
console.info('WebSocket closed: ', closeEvent);
};
}
console.info('WebSocket closed: ', closeEvent);
};
}
@@
-124,34
+128,34
@@
export default class UIClient {
id: string,
procedureName: ProcedureName,
resolve: (value: ResponsePayload | PromiseLike<ResponsePayload>) => void,
id: string,
procedureName: ProcedureName,
resolve: (value: ResponsePayload | PromiseLike<ResponsePayload>) => void,
- reject: (reason?:
any) => void
+ reject: (reason?:
unknown) => void,
): void {
): void {
- this.
_
responseHandlers.set(id, { procedureName, resolve, reject });
+ this.responseHandlers.set(id, { procedureName, resolve, reject });
}
private getResponseHandler(id: string): ResponseHandler | undefined {
}
private getResponseHandler(id: string): ResponseHandler | undefined {
- return this.
_
responseHandlers.get(id);
+ return this.responseHandlers.get(id);
}
private deleteResponseHandler(id: string): boolean {
}
private deleteResponseHandler(id: string): boolean {
- return this.
_
responseHandlers.delete(id);
+ return this.responseHandlers.delete(id);
}
private async sendRequest(
command: ProcedureName,
}
private async sendRequest(
command: ProcedureName,
- data: RequestPayload
+ data: RequestPayload
,
): Promise<ResponsePayload> {
let uuid: string;
): Promise<ResponsePayload> {
let uuid: string;
- return
Utils.
promiseWithTimeout(
- new Promise((resolve, reject) => {
+ return promiseWithTimeout(
+ new Promise
<ResponsePayload>
((resolve, reject) => {
uuid = crypto.randomUUID();
const msg = JSON.stringify([uuid, command, data]);
uuid = crypto.randomUUID();
const msg = JSON.stringify([uuid, command, data]);
- if (this.
_
ws.readyState !== WebSocket.OPEN) {
+ if (this.ws.readyState !== WebSocket.OPEN) {
this.openWS();
}
this.openWS();
}
- if (this.
_
ws.readyState === WebSocket.OPEN) {
- this.
_
ws.send(msg);
+ if (this.ws.readyState === WebSocket.OPEN) {
+ this.ws.send(msg);
} else {
throw new Error(`Send request '${command}' message: connection not opened`);
}
} else {
throw new Error(`Send request '${command}' message: connection not opened`);
}
@@
-161,8
+165,8
@@
export default class UIClient {
120 * 1000,
Error(`Send request '${command}' message timeout`),
() => {
120 * 1000,
Error(`Send request '${command}' message timeout`),
() => {
- this.
_
responseHandlers.delete(uuid);
- }
+ this.responseHandlers.delete(uuid);
+ }
,
);
}
);
}
@@
-170,12
+174,12
@@
export default class UIClient {
const response = JSON.parse(messageEvent.data) as ProtocolResponse;
if (Array.isArray(response) === false) {
const response = JSON.parse(messageEvent.data) as ProtocolResponse;
if (Array.isArray(response) === false) {
- throw new Error(
'Response not an array: ' + JSON.stringify(response, null, 2)
);
+ throw new Error(
`Response not an array: ${JSON.stringify(response, undefined, 2)}`
);
}
const [uuid, responsePayload] = response;
}
const [uuid, responsePayload] = response;
- if (this.
_
responseHandlers.has(uuid) === true) {
+ if (this.responseHandlers.has(uuid) === true) {
switch (responsePayload.status) {
case ResponseStatus.SUCCESS:
this.getResponseHandler(uuid)?.resolve(responsePayload);
switch (responsePayload.status) {
case ResponseStatus.SUCCESS:
this.getResponseHandler(uuid)?.resolve(responsePayload);
@@
-188,7
+192,7
@@
export default class UIClient {
}
this.deleteResponseHandler(uuid);
} else {
}
this.deleteResponseHandler(uuid);
} else {
- throw new Error(
'Not a response to a request: ' + JSON.stringify(response, null, 2)
);
+ throw new Error(
`Not a response to a request: ${JSON.stringify(response, undefined, 2)}`
);
}
}
}
}
}
}