refactor: cleanup null checks and helpers

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

diff --git a/ui/web/src/composables/UIClient.ts b/ui/web/src/composables/UIClient.ts
index 29874cc2ee55db709d3cecbb8a97a50119118957..ccd16c215565855d99ec0fa400bb7da0f8dd89bc 100644 (file)
--- 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;
+  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> {
@@ -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
     );
-    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,17 +128,17 @@ 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(
@@ -147,16 +146,16 @@ export default class UIClient {
     data: RequestPayload
   ): Promise<ResponsePayload> {
     let uuid: string;
-    return Utils.promiseWithTimeout(
+    return promiseWithTimeout(
       new Promise((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,7 +165,7 @@ export default class UIClient {
       120 * 1000,
       Error(`Send request '${command}' message timeout`),
       () => {
-        this._responseHandlers.delete(uuid);
+        this.responseHandlers.delete(uuid);
       }
     );
   }
@@ -180,7 +179,7 @@ export default class UIClient {
 
     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);