refactor(ui): revert wrongly introduced code to handle multiples UI

[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 ce459f1b253504abbb478fa54b5aef5544646a22..9a6920418d3adb255f64a8e97e50be35e9586640 100644 (file)
--- a/ui/web/src/composables/UIClient.ts
+++ b/ui/web/src/composables/UIClient.ts
@@ -1,12 +1,12 @@
 import {
   ApplicationProtocol,
   AuthenticationType,
-  type ConfigurationData,
   ProcedureName,
   type ProtocolResponse,
   type RequestPayload,
   type ResponsePayload,
-  ResponseStatus
+  ResponseStatus,
+  type UIServerConfigurationSection
 } from '@/types'
 
 type ResponseHandler = {
@@ -21,14 +21,14 @@ export class UIClient {
   private ws!: WebSocket
   private responseHandlers: Map<string, ResponseHandler>
 
-  private constructor(private configuration: ConfigurationData) {
+  private constructor(private uiServerConfiguration: UIServerConfigurationSection) {
     this.openWS()
     this.responseHandlers = new Map<string, ResponseHandler>()
   }
 
-  public static getInstance(configuration: ConfigurationData) {
+  public static getInstance(uiServerConfiguration: UIServerConfigurationSection): UIClient {
     if (UIClient.instance === null) {
-      UIClient.instance = new UIClient(configuration)
+      UIClient.instance = new UIClient(uiServerConfiguration)
     }
     return UIClient.instance
   }
@@ -138,15 +138,15 @@ export class UIClient {
 
   private openWS(): void {
     const protocols =
-      this.configuration.uiServer.authentication?.enabled === true &&
-      this.configuration.uiServer.authentication?.type === AuthenticationType.PROTOCOL_BASIC_AUTH
+      this.uiServerConfiguration.authentication?.enabled === true &&
+      this.uiServerConfiguration.authentication?.type === AuthenticationType.PROTOCOL_BASIC_AUTH
         ? [
-            `${this.configuration.uiServer.protocol}${this.configuration.uiServer.version}`,
-            `authorization.basic.${btoa(`${this.configuration.uiServer.authentication.username}:${this.configuration.uiServer.authentication.password}`).replace(/={1,2}$/, '')}`
+            `${this.uiServerConfiguration.protocol}${this.uiServerConfiguration.version}`,
+            `authorization.basic.${btoa(`${this.uiServerConfiguration.authentication.username}:${this.uiServerConfiguration.authentication.password}`).replace(/={1,2}$/, '')}`
           ]
-        : `${this.configuration.uiServer.protocol}${this.configuration.uiServer.version}`
+        : `${this.uiServerConfiguration.protocol}${this.uiServerConfiguration.version}`
     this.ws = new WebSocket(
-      `${this.configuration.uiServer.secure === true ? ApplicationProtocol.WSS : ApplicationProtocol.WS}://${this.configuration.uiServer.host}:${this.configuration.uiServer.port}`,
+      `${this.uiServerConfiguration.secure === true ? ApplicationProtocol.WSS : ApplicationProtocol.WS}://${this.uiServerConfiguration.host}:${this.uiServerConfiguration.port}`,
       protocols
     )
     this.ws.onopen = openEvent => {
@@ -207,8 +207,10 @@ export class UIClient {
           reject(responsePayload)
           break
         default:
-          console.error(
-            `Response status for procedure '${procedureName}' not supported: '${responsePayload.status}'`
+          reject(
+            new Error(
+              `Response status for procedure '${procedureName}' not supported: '${responsePayload.status}'`
+            )
           )
       }
       this.responseHandlers.delete(uuid)