X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=ui%2Fweb%2Fsrc%2Fcomposables%2FUIClient.ts;h=bbb4a4499b233a6aead4703eaf1b3de93004e32e;hb=4ed03b6ec8110ad11b67ead121145c80995f69df;hp=29874cc2ee55db709d3cecbb8a97a50119118957;hpb=82a77234c9524e07aab73dc4fa49d6a82580f8ae;p=e-mobility-charging-stations-simulator.git

diff --git a/ui/web/src/composables/UIClient.ts b/ui/web/src/composables/UIClient.ts
index 29874cc2..bbb4a449 100644
--- a/ui/web/src/composables/UIClient.ts
+++ b/ui/web/src/composables/UIClient.ts
@@ -1,40 +1,39 @@
+import { promiseWithTimeout } from './Utils';
 import {
   ProcedureName,
   type ProtocolResponse,
   type RequestPayload,
   type ResponsePayload,
   ResponseStatus,
-} from '@/types/UIProtocol';
-
-import Utils from './Utils';
+} from '@/types';
 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();
-    this._responseHandlers = new Map<string, ResponseHandler>();
+    this.responseHandlers = new Map<string, ResponseHandler>();
   }
 
   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) {
-    this._ws.addEventListener('open', listener);
+    this.ws.addEventListener('open', listener);
   }
 
   public async startSimulator(): Promise<ResponsePayload> {
@@ -72,7 +71,7 @@ export default class UIClient {
   public async startTransaction(
     hashId: string,
     connectorId: number,
-    idTag: string | undefined
+    idTag: string | undefined,
   ): Promise<ResponsePayload> {
     return this.sendRequest(ProcedureName.START_TRANSACTION, {
       hashIds: [hashId],
@@ -83,7 +82,7 @@ export default class UIClient {
 
   public async stopTransaction(
     hashId: string,
-    transactionId: number | undefined
+    transactionId: number | undefined,
   ): Promise<ResponsePayload> {
     return this.sendRequest(ProcedureName.STOP_TRANSACTION, {
       hashIds: [hashId],
@@ -93,7 +92,7 @@ export default class UIClient {
 
   public async startAutomaticTransactionGenerator(
     hashId: string,
-    connectorId: number
+    connectorId: number,
   ): Promise<ResponsePayload> {
     return this.sendRequest(ProcedureName.START_AUTOMATIC_TRANSACTION_GENERATOR, {
       hashIds: [hashId],
@@ -103,7 +102,7 @@ export default class UIClient {
 
   public async stopAutomaticTransactionGenerator(
     hashId: string,
-    connectorId: number
+    connectorId: number,
   ): Promise<ResponsePayload> {
     return this.sendRequest(ProcedureName.STOP_AUTOMATIC_TRANSACTION_GENERATOR, {
       hashIds: [hashId],
@@ -112,15 +111,15 @@ export default class UIClient {
   }
 
   private openWS(): void {
-    this._ws = new WebSocket(
+    this.ws = new WebSocket(
       `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);
     };
-    this._ws.onclose = (closeEvent) => {
+    this.ws.onclose = (closeEvent) => {
       console.info('WebSocket closed: ', closeEvent);
     };
   }
@@ -129,34 +128,34 @@ export default class UIClient {
     id: string,
     procedureName: ProcedureName,
     resolve: (value: ResponsePayload | PromiseLike<ResponsePayload>) => void,
-    reject: (reason?: any) => void
+    reject: (reason?: unknown) => void,
   ): void {
-    this._responseHandlers.set(id, { procedureName, resolve, reject });
+    this.responseHandlers.set(id, { procedureName, resolve, reject });
   }
 
   private getResponseHandler(id: string): ResponseHandler | undefined {
-    return this._responseHandlers.get(id);
+    return this.responseHandlers.get(id);
   }
 
   private deleteResponseHandler(id: string): boolean {
-    return this._responseHandlers.delete(id);
+    return this.responseHandlers.delete(id);
   }
 
   private async sendRequest(
     command: ProcedureName,
-    data: RequestPayload
+    data: RequestPayload,
   ): 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]);
 
-        if (this._ws.readyState !== WebSocket.OPEN) {
+        if (this.ws.readyState !== WebSocket.OPEN) {
           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`);
         }
@@ -166,8 +165,8 @@ export default class UIClient {
       120 * 1000,
       Error(`Send request '${command}' message timeout`),
       () => {
-        this._responseHandlers.delete(uuid);
-      }
+        this.responseHandlers.delete(uuid);
+      },
     );
   }
 
@@ -175,12 +174,12 @@ export default class UIClient {
     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;
 
-    if (this._responseHandlers.has(uuid) === true) {
+    if (this.responseHandlers.has(uuid) === true) {
       switch (responsePayload.status) {
         case ResponseStatus.SUCCESS:
           this.getResponseHandler(uuid)?.resolve(responsePayload);
@@ -193,7 +192,7 @@ export default class UIClient {
       }
       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)}`);
     }
   }
 }