Web UI: fix UT

[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 0c30494dd95ff8f2bdec8dcd61d13d1746cc2017..275e30e9f8519111cc726e6e171558e900d6048b 100644 (file)
--- a/src/ui/web/src/composables/UIClient.ts
+++ b/src/ui/web/src/composables/UIClient.ts
@@ -30,7 +30,7 @@ export default class UIClient {
     return UIClient._instance;
   }
 
-  public registerWSonOpenListener(listener: (this: WebSocket, ev: Event) => void) {
+  public registerWSonOpenListener(listener: (event: Event) => void) {
     this._ws.addEventListener('open', listener);
   }
 
@@ -90,12 +90,15 @@ export default class UIClient {
 
   private openWS(): void {
     this._ws = new WebSocket(
-      `ws://${config.emobility.host}:${config.emobility.port}`,
-      config.emobility.protocol
+      `ws://${config.uiServer.host}:${config.uiServer.port}`,
+      config.uiServer.protocol
     );
     this._ws.onmessage = this.responseHandler.bind(this);
-    this._ws.onerror = (error) => {
-      console.error('WebSocket error: ', error);
+    this._ws.onerror = (errorEvent) => {
+      console.error('WebSocket error: ', errorEvent);
+    };
+    this._ws.onclose = (closeEvent) => {
+      console.info('WebSocket close: ', closeEvent);
     };
   }
 
@@ -105,7 +108,7 @@ export default class UIClient {
     resolve: (value: ResponsePayload | PromiseLike<ResponsePayload>) => void,
     reject: (reason?: any) => void
   ): void {
-    this._responseHandlers.set(id, { resolve, reject, procedureName });
+    this._responseHandlers.set(id, { procedureName, resolve, reject });
   }
 
   private getResponseHandler(id: string): ResponseHandler | undefined {