X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=ui%2Fweb%2Fsrc%2Fcomposables%2FUIClient.ts;h=841ec3dca8c42510c3ce504c05dbe42c45773adc;hb=82fa111074a9a4eed94579c0ff734a1564f8f8e6;hp=056e2ce27cef9ddfb051ece83ee2266acc66339d;hpb=8475b2228f0b36777e1a9528b2d61348facad82f;p=e-mobility-charging-stations-simulator.git

diff --git a/ui/web/src/composables/UIClient.ts b/ui/web/src/composables/UIClient.ts
index 056e2ce2..841ec3dc 100644
--- a/ui/web/src/composables/UIClient.ts
+++ b/ui/web/src/composables/UIClient.ts
@@ -1,35 +1,38 @@
-import { ProcedureName, ResponseStatus, type RequestPayload } from '@/types/UIProtocol';
-import type { ProtocolResponse, ResponsePayload } from '@/types/UIProtocol';
-
-import Utils 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;
-  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> {
@@ -67,7 +70,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],
@@ -78,7 +81,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],
@@ -88,7 +91,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],
@@ -98,7 +101,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],
@@ -107,15 +110,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);
     };
   }
@@ -124,71 +127,77 @@ 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) => {
-        uuid = crypto.randomUUID();
-        const msg = JSON.stringify([uuid, command, data]);
+    return await new Promise<ResponsePayload>((resolve, reject) => {
+      uuid = crypto.randomUUID();
+      const msg = JSON.stringify([uuid, command, data]);
 
-        if (this._ws.readyState !== WebSocket.OPEN) {
-          this.openWS();
-        }
-        if (this._ws.readyState === WebSocket.OPEN) {
-          this._ws.send(msg);
-        } else {
-          throw new Error(`Send request '${command}' message: connection not opened`);
+      if (this.ws.readyState !== WebSocket.OPEN) {
+        this.openWS();
+      }
+      if (this.ws.readyState === WebSocket.OPEN) {
+        const sendTimeout = setTimeout(() => {
+          this.deleteResponseHandler(uuid);
+          return reject(new Error(`Send request '${command}' message timeout`));
+        }, 60 * 1000);
+        try {
+          this.ws.send(msg);
+          this.setResponseHandler(uuid, command, resolve, reject);
+        } catch (error) {
+          this.deleteResponseHandler(uuid);
+          reject(error);
+        } finally {
+          clearTimeout(sendTimeout);
         }
-
-        this.setResponseHandler(uuid, command, resolve, reject);
-      }),
-      120 * 1000,
-      Error(`Send request '${command}' message timeout`),
-      () => {
-        this._responseHandlers.delete(uuid);
+      } else {
+        throw new Error(`Send request '${command}' message: connection not opened`);
       }
-    );
+    });
   }
 
   private responseHandler(messageEvent: MessageEvent<string>): void {
     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) {
+      const { procedureName, resolve, reject } = this.getResponseHandler(uuid)!;
       switch (responsePayload.status) {
         case ResponseStatus.SUCCESS:
-          this.getResponseHandler(uuid)?.resolve(responsePayload);
+          resolve(responsePayload);
           break;
         case ResponseStatus.FAILURE:
-          this.getResponseHandler(uuid)?.reject(responsePayload);
+          reject(responsePayload);
           break;
         default:
-          console.error(`Response status not supported: ${responsePayload.status}`);
+          console.error(
+            `Response status for procedure '${procedureName}' not supported: '${responsePayload.status}'`,
+          );
       }
       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)}`);
     }
   }
 }