X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=ui%2Fweb%2Fsrc%2Fcomposables%2FUIClient.ts;h=10f2d3dea0b42ad2fe08fe549b7f1fb475802d41;hb=6f9618c30217a9ddee12830fe5f77e6cabe7296e;hp=ccd16c215565855d99ec0fa400bb7da0f8dd89bc;hpb=f568f36861d62d759a95b17fbe10380eca88a71b;p=e-mobility-charging-stations-simulator.git

diff --git a/ui/web/src/composables/UIClient.ts b/ui/web/src/composables/UIClient.ts
index ccd16c21..10f2d3de 100644
--- a/ui/web/src/composables/UIClient.ts
+++ b/ui/web/src/composables/UIClient.ts
@@ -1,71 +1,70 @@
-import { promiseWithTimeout } from './Utils';
 import {
   ProcedureName,
   type ProtocolResponse,
   type RequestPayload,
   type ResponsePayload,
   ResponseStatus,
-} from '@/types';
-import config from '@/assets/config';
+} from '@/types'
+import config from '@/assets/config'
 
 type ResponseHandler = {
-  procedureName: ProcedureName;
-  resolve: (value: ResponsePayload | PromiseLike<ResponsePayload>) => void;
-  reject: (reason?: unknown) => void;
-};
+  procedureName: ProcedureName
+  resolve: (value: ResponsePayload | PromiseLike<ResponsePayload>) => 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.openWS()
+    this.responseHandlers = new Map<string, ResponseHandler>()
   }
 
   public static getInstance() {
     if (UIClient.instance === null) {
-      UIClient.instance = new UIClient();
+      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> {
-    return this.sendRequest(ProcedureName.START_SIMULATOR, {});
+    return this.sendRequest(ProcedureName.START_SIMULATOR, {})
   }
 
   public async stopSimulator(): Promise<ResponsePayload> {
-    return this.sendRequest(ProcedureName.STOP_SIMULATOR, {});
+    return this.sendRequest(ProcedureName.STOP_SIMULATOR, {})
   }
 
   public async listChargingStations(): Promise<ResponsePayload> {
-    return this.sendRequest(ProcedureName.LIST_CHARGING_STATIONS, {});
+    return this.sendRequest(ProcedureName.LIST_CHARGING_STATIONS, {})
   }
 
   public async startChargingStation(hashId: string): Promise<ResponsePayload> {
-    return this.sendRequest(ProcedureName.START_CHARGING_STATION, { hashIds: [hashId] });
+    return this.sendRequest(ProcedureName.START_CHARGING_STATION, { hashIds: [hashId] })
   }
 
   public async stopChargingStation(hashId: string): Promise<ResponsePayload> {
-    return this.sendRequest(ProcedureName.STOP_CHARGING_STATION, { hashIds: [hashId] });
+    return this.sendRequest(ProcedureName.STOP_CHARGING_STATION, { hashIds: [hashId] })
   }
 
   public async openConnection(hashId: string): Promise<ResponsePayload> {
     return this.sendRequest(ProcedureName.OPEN_CONNECTION, {
       hashIds: [hashId],
-    });
+    })
   }
 
   public async closeConnection(hashId: string): Promise<ResponsePayload> {
     return this.sendRequest(ProcedureName.CLOSE_CONNECTION, {
       hashIds: [hashId],
-    });
+    })
   }
 
   public async startTransaction(
@@ -77,7 +76,7 @@ export default class UIClient {
       hashIds: [hashId],
       connectorId,
       idTag,
-    });
+    })
   }
 
   public async stopTransaction(
@@ -87,7 +86,7 @@ export default class UIClient {
     return this.sendRequest(ProcedureName.STOP_TRANSACTION, {
       hashIds: [hashId],
       transactionId,
-    });
+    })
   }
 
   public async startAutomaticTransactionGenerator(
@@ -97,7 +96,7 @@ export default class UIClient {
     return this.sendRequest(ProcedureName.START_AUTOMATIC_TRANSACTION_GENERATOR, {
       hashIds: [hashId],
       connectorIds: [connectorId],
-    });
+    })
   }
 
   public async stopAutomaticTransactionGenerator(
@@ -107,21 +106,21 @@ export default class UIClient {
     return this.sendRequest(ProcedureName.STOP_AUTOMATIC_TRANSACTION_GENERATOR, {
       hashIds: [hashId],
       connectorIds: [connectorId],
-    });
+    })
   }
 
   private openWS(): void {
     this.ws = new WebSocket(
       `ws://${config.uiServer.host}:${config.uiServer.port}`,
       config.uiServer.protocol
-    );
-    this.ws.onmessage = this.responseHandler.bind(this);
+    )
+    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) => {
-      console.info('WebSocket closed: ', closeEvent);
-    };
+      console.info('WebSocket closed: ', closeEvent)
+    }
   }
 
   private setResponseHandler(
@@ -130,69 +129,73 @@ export default class UIClient {
     resolve: (value: ResponsePayload | PromiseLike<ResponsePayload>) => 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
   ): Promise<ResponsePayload> {
-    let uuid: string;
-    return promiseWithTimeout(
-      new Promise((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`);
+    return new Promise<ResponsePayload>((resolve, reject) => {
+      if (this.ws.readyState !== WebSocket.OPEN) {
+        this.openWS()
+      }
+      if (this.ws.readyState === WebSocket.OPEN) {
+        const uuid = crypto.randomUUID()
+        const msg = JSON.stringify([uuid, command, data])
+        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;
+    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) {
+      const { procedureName, resolve, reject } = this.getResponseHandler(uuid)!
       switch (responsePayload.status) {
         case ResponseStatus.SUCCESS:
-          this.getResponseHandler(uuid)?.resolve(responsePayload);
-          break;
+          resolve(responsePayload)
+          break
         case ResponseStatus.FAILURE:
-          this.getResponseHandler(uuid)?.reject(responsePayload);
-          break;
+          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);
+      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)}`)
     }
   }
 }