X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=ui%2Fweb%2Fsrc%2Fcomposables%2FUIClient.ts;h=387d73d27529bfaf91e25f068bd9612ce53fb33c;hb=de7b9e0583275225509c099f75a2801371da54d0;hp=4cdfed71e5b3b53bf792d0dc8ae116af58bc7aa5;hpb=f3095697dad156dcb13ea8247a16eb08ca007e6b;p=e-mobility-charging-stations-simulator.git

diff --git a/ui/web/src/composables/UIClient.ts b/ui/web/src/composables/UIClient.ts
index 4cdfed71..387d73d2 100644
--- a/ui/web/src/composables/UIClient.ts
+++ b/ui/web/src/composables/UIClient.ts
@@ -1,4 +1,3 @@
-import { promiseWithTimeout } from './Utils';
 import {
   ProcedureName,
   type ProtocolResponse,
@@ -145,54 +144,58 @@ export class UIClient {
     command: ProcedureName,
     data: RequestPayload,
   ): Promise<ResponsePayload> {
-    let uuid: string;
-    return promiseWithTimeout(
-      new Promise((resolve, reject) => {
-        uuid = crypto.randomUUID();
+    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]);
-
-        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);
-        } else {
-          throw new Error(`Send request '${command}' message: connection not opened`);
+          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) {
+      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)}`);
     }
   }
 }