Refine sonar-project.properties

[e-mobility-charging-stations-simulator.git] / src / ui / web / src / composables / UIClient.ts

diff --git a/src/ui/web/src/composables/UIClient.ts b/src/ui/web/src/composables/UIClient.ts
index 556e9bb7c4e4b458ecfaaa4499a6f32d9f9e713c..cf9894009d8844b5f4879d44d899404052f0db1a 100644 (file)
--- a/src/ui/web/src/composables/UIClient.ts
+++ b/src/ui/web/src/composables/UIClient.ts
@@ -3,7 +3,6 @@ import type { ProtocolResponse, ResponsePayload } from '@/types/UIProtocol';
 
 import Utils from './Utils';
 import config from '@/assets/config';
-import { v4 as uuidv4 } from 'uuid';
 
 type ResponseHandler = {
   procedureName: ProcedureName;
@@ -117,7 +116,7 @@ export default class UIClient {
       console.error('WebSocket error: ', errorEvent);
     };
     this._ws.onclose = (closeEvent) => {
-      console.info('WebSocket close: ', closeEvent);
+      console.info('WebSocket closed: ', closeEvent);
     };
   }
 
@@ -145,7 +144,7 @@ export default class UIClient {
     let uuid: string;
     return Utils.promiseWithTimeout(
       new Promise((resolve, reject) => {
-        uuid = uuidv4();
+        uuid = crypto.randomUUID();
         const msg = JSON.stringify([uuid, command, data]);
 
         if (this._ws.readyState !== WebSocket.OPEN) {
@@ -154,13 +153,13 @@ export default class UIClient {
         if (this._ws.readyState === WebSocket.OPEN) {
           this._ws.send(msg);
         } else {
-          throw new Error(`Send request ${command} message: connection not opened`);
+          throw new Error(`Send request '${command}' message: connection not opened`);
         }
 
         this.setResponseHandler(uuid, command, resolve, reject);
       }),
-      60 * 1000,
-      Error(`Send request ${command} message timeout`),
+      120 * 1000,
+      Error(`Send request '${command}' message timeout`),
       () => {
         this._responseHandlers.delete(uuid);
       }
@@ -168,28 +167,28 @@ export default class UIClient {
   }
 
   private responseHandler(messageEvent: MessageEvent<string>): void {
-    const data = JSON.parse(messageEvent.data) as ProtocolResponse;
+    const response = JSON.parse(messageEvent.data) as ProtocolResponse;
 
-    if (Array.isArray(data) === false) {
-      throw new Error('Response not an array: ' + JSON.stringify(data, null, 2));
+    if (Array.isArray(response) === false) {
+      throw new Error('Response not an array: ' + JSON.stringify(response, null, 2));
     }
 
-    const [uuid, response] = data;
+    const [uuid, responsePayload] = response;
 
     if (this._responseHandlers.has(uuid) === true) {
-      switch (response.status) {
+      switch (responsePayload.status) {
         case ResponseStatus.SUCCESS:
-          this.getResponseHandler(uuid)?.resolve(response);
+          this.getResponseHandler(uuid)?.resolve(responsePayload);
           break;
         case ResponseStatus.FAILURE:
-          this.getResponseHandler(uuid)?.reject(response);
+          this.getResponseHandler(uuid)?.reject(responsePayload);
           break;
         default:
-          console.error(`Response status not supported: ${response.status}`);
+          console.error(`Response status not supported: ${responsePayload.status}`);
       }
       this.deleteResponseHandler(uuid);
     } else {
-      throw new Error('Not a response to a request: ' + JSON.stringify(data, null, 2));
+      throw new Error('Not a response to a request: ' + JSON.stringify(response, null, 2));
     }
   }
 }