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 10f2d3dea0b42ad2fe08fe549b7f1fb475802d41..9a6920418d3adb255f64a8e97e50be35e9586640 100644 (file)
--- a/ui/web/src/composables/UIClient.ts
+++ b/ui/web/src/composables/UIClient.ts
@@ -1,11 +1,13 @@
 import {
+  ApplicationProtocol,
+  AuthenticationType,
   ProcedureName,
   type ProtocolResponse,
   type RequestPayload,
   type ResponsePayload,
   ResponseStatus,
+  type UIServerConfigurationSection
 } from '@/types'
-import config from '@/assets/config'
 
 type ResponseHandler = {
   procedureName: ProcedureName
@@ -19,20 +21,23 @@ export class UIClient {
   private ws!: WebSocket
   private responseHandlers: Map<string, ResponseHandler>
 
-  private constructor() {
+  private constructor(private uiServerConfiguration: UIServerConfigurationSection) {
     this.openWS()
     this.responseHandlers = new Map<string, ResponseHandler>()
   }
 
-  public static getInstance() {
+  public static getInstance(uiServerConfiguration: UIServerConfigurationSection): UIClient {
     if (UIClient.instance === null) {
-      UIClient.instance = new UIClient()
+      UIClient.instance = new UIClient(uiServerConfiguration)
     }
     return UIClient.instance
   }
 
-  public registerWSonOpenListener(listener: (event: Event) => void) {
-    this.ws.addEventListener('open', listener)
+  public registerWSEventListener<K extends keyof WebSocketEventMap>(
+    event: K,
+    listener: (event: WebSocketEventMap[K]) => void
+  ) {
+    this.ws.addEventListener(event, listener)
   }
 
   public async startSimulator(): Promise<ResponsePayload> {
@@ -43,10 +48,32 @@ export class UIClient {
     return this.sendRequest(ProcedureName.STOP_SIMULATOR, {})
   }
 
+  public async listTemplates(): Promise<ResponsePayload> {
+    return this.sendRequest(ProcedureName.LIST_TEMPLATES, {})
+  }
+
   public async listChargingStations(): Promise<ResponsePayload> {
     return this.sendRequest(ProcedureName.LIST_CHARGING_STATIONS, {})
   }
 
+  public async addChargingStations(
+    template: string,
+    numberOfStations: number
+  ): Promise<ResponsePayload> {
+    return this.sendRequest(ProcedureName.ADD_CHARGING_STATIONS, { template, numberOfStations })
+  }
+
+  public async deleteChargingStation(hashId: string): Promise<ResponsePayload> {
+    return this.sendRequest(ProcedureName.DELETE_CHARGING_STATIONS, { hashIds: [hashId] })
+  }
+
+  public async setSupervisionUrl(hashId: string, supervisionUrl: string): Promise<ResponsePayload> {
+    return this.sendRequest(ProcedureName.SET_SUPERVISION_URL, {
+      hashIds: [hashId],
+      url: supervisionUrl
+    })
+  }
+
   public async startChargingStation(hashId: string): Promise<ResponsePayload> {
     return this.sendRequest(ProcedureName.START_CHARGING_STATION, { hashIds: [hashId] })
   }
@@ -57,13 +84,13 @@ export class UIClient {
 
   public async openConnection(hashId: string): Promise<ResponsePayload> {
     return this.sendRequest(ProcedureName.OPEN_CONNECTION, {
-      hashIds: [hashId],
+      hashIds: [hashId]
     })
   }
 
   public async closeConnection(hashId: string): Promise<ResponsePayload> {
     return this.sendRequest(ProcedureName.CLOSE_CONNECTION, {
-      hashIds: [hashId],
+      hashIds: [hashId]
     })
   }
 
@@ -75,7 +102,7 @@ export class UIClient {
     return this.sendRequest(ProcedureName.START_TRANSACTION, {
       hashIds: [hashId],
       connectorId,
-      idTag,
+      idTag
     })
   }
 
@@ -85,7 +112,7 @@ export class UIClient {
   ): Promise<ResponsePayload> {
     return this.sendRequest(ProcedureName.STOP_TRANSACTION, {
       hashIds: [hashId],
-      transactionId,
+      transactionId
     })
   }
 
@@ -95,7 +122,7 @@ export class UIClient {
   ): Promise<ResponsePayload> {
     return this.sendRequest(ProcedureName.START_AUTOMATIC_TRANSACTION_GENERATOR, {
       hashIds: [hashId],
-      connectorIds: [connectorId],
+      connectorIds: [connectorId]
     })
   }
 
@@ -105,67 +132,58 @@ export class UIClient {
   ): Promise<ResponsePayload> {
     return this.sendRequest(ProcedureName.STOP_AUTOMATIC_TRANSACTION_GENERATOR, {
       hashIds: [hashId],
-      connectorIds: [connectorId],
+      connectorIds: [connectorId]
     })
   }
 
   private openWS(): void {
+    const protocols =
+      this.uiServerConfiguration.authentication?.enabled === true &&
+      this.uiServerConfiguration.authentication?.type === AuthenticationType.PROTOCOL_BASIC_AUTH
+        ? [
+            `${this.uiServerConfiguration.protocol}${this.uiServerConfiguration.version}`,
+            `authorization.basic.${btoa(`${this.uiServerConfiguration.authentication.username}:${this.uiServerConfiguration.authentication.password}`).replace(/={1,2}$/, '')}`
+          ]
+        : `${this.uiServerConfiguration.protocol}${this.uiServerConfiguration.version}`
     this.ws = new WebSocket(
-      `ws://${config.uiServer.host}:${config.uiServer.port}`,
-      config.uiServer.protocol
+      `${this.uiServerConfiguration.secure === true ? ApplicationProtocol.WSS : ApplicationProtocol.WS}://${this.uiServerConfiguration.host}:${this.uiServerConfiguration.port}`,
+      protocols
     )
+    this.ws.onopen = openEvent => {
+      console.info('WebSocket opened', openEvent)
+    }
     this.ws.onmessage = this.responseHandler.bind(this)
-    this.ws.onerror = (errorEvent) => {
+    this.ws.onerror = errorEvent => {
       console.error('WebSocket error: ', errorEvent)
     }
-    this.ws.onclose = (closeEvent) => {
+    this.ws.onclose = closeEvent => {
       console.info('WebSocket closed: ', closeEvent)
     }
   }
 
-  private setResponseHandler(
-    id: string,
-    procedureName: ProcedureName,
-    resolve: (value: ResponsePayload | PromiseLike<ResponsePayload>) => void,
-    reject: (reason?: unknown) => void
-  ): void {
-    this.responseHandlers.set(id, { procedureName, resolve, reject })
-  }
-
-  private getResponseHandler(id: string): ResponseHandler | undefined {
-    return this.responseHandlers.get(id)
-  }
-
-  private deleteResponseHandler(id: string): boolean {
-    return this.responseHandlers.delete(id)
-  }
-
   private async sendRequest(
-    command: ProcedureName,
-    data: RequestPayload
+    procedureName: ProcedureName,
+    payload: RequestPayload
   ): Promise<ResponsePayload> {
     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])
+        const msg = JSON.stringify([uuid, procedureName, payload])
         const sendTimeout = setTimeout(() => {
-          this.deleteResponseHandler(uuid)
-          return reject(new Error(`Send request '${command}' message timeout`))
-        }, 60 * 1000)
+          this.responseHandlers.delete(uuid)
+          return reject(new Error(`Send request '${procedureName}' message: connection timeout`))
+        }, 60000)
         try {
           this.ws.send(msg)
-          this.setResponseHandler(uuid, command, resolve, reject)
+          this.responseHandlers.set(uuid, { procedureName, resolve, reject })
         } catch (error) {
-          this.deleteResponseHandler(uuid)
+          this.responseHandlers.delete(uuid)
           reject(error)
         } finally {
           clearTimeout(sendTimeout)
         }
       } else {
-        throw new Error(`Send request '${command}' message: connection not opened`)
+        reject(new Error(`Send request '${procedureName}' message: connection closed`))
       }
     })
   }
@@ -180,7 +198,7 @@ export class UIClient {
     const [uuid, responsePayload] = response
 
     if (this.responseHandlers.has(uuid) === true) {
-      const { procedureName, resolve, reject } = this.getResponseHandler(uuid)!
+      const { procedureName, resolve, reject } = this.responseHandlers.get(uuid)!
       switch (responsePayload.status) {
         case ResponseStatus.SUCCESS:
           resolve(responsePayload)
@@ -189,11 +207,13 @@ 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.deleteResponseHandler(uuid)
+      this.responseHandlers.delete(uuid)
     } else {
       throw new Error(`Not a response to a request: ${JSON.stringify(response, undefined, 2)}`)
     }