refactor(ui): cleanup vue.js app initialization code and logic

[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 0251512d2f233df9e551948d1de3f1bd7054e188..572dc5d48182c5a6ed883b8472842a3c64326532 100644 (file)
--- a/ui/web/src/composables/UIClient.ts
+++ b/ui/web/src/composables/UIClient.ts
@@ -1,5 +1,6 @@
 import {
   ApplicationProtocol,
+  AuthenticationType,
   type ConfigurationData,
   ProcedureName,
   type ProtocolResponse,
@@ -44,6 +45,10 @@ export class UIClient {
     return this.sendRequest(ProcedureName.STOP_SIMULATOR, {})
   }
 
+  public async deleteChargingStation(hashId: string): Promise<ResponsePayload> {
+    return this.sendRequest(ProcedureName.DELETE_CHARGING_STATIONS, { hashIds: [hashId] })
+  }
+
   public async listChargingStations(): Promise<ResponsePayload> {
     return this.sendRequest(ProcedureName.LIST_CHARGING_STATIONS, {})
   }
@@ -110,11 +115,22 @@ export class UIClient {
     })
   }
 
-  private openWS(): void {
+  public openWS(): void {
+    const protocols =
+      this.configuration.uiServer.authentication?.enabled === true &&
+      this.configuration.uiServer.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.configuration.uiServer.protocol}${this.configuration.uiServer.version}`
     this.ws = new WebSocket(
       `${this.configuration.uiServer.secure === true ? ApplicationProtocol.WSS : ApplicationProtocol.WS}://${this.configuration.uiServer.host}:${this.configuration.uiServer.port}`,
-      `${this.configuration.uiServer.protocol}${this.configuration.uiServer.version}`
+      protocols
     )
+    this.ws.onopen = openEvent => {
+      console.info('WebSocket opened', openEvent)
+    }
     this.ws.onmessage = this.responseHandler.bind(this)
     this.ws.onerror = errorEvent => {
       console.error('WebSocket error: ', errorEvent)
@@ -129,15 +145,12 @@ export class UIClient {
     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, procedureName, payload])
         const sendTimeout = setTimeout(() => {
           this.responseHandlers.delete(uuid)
-          return reject(new Error(`Send request '${procedureName}' message timeout`))
+          return reject(new Error(`Send request '${procedureName}' message: connection timeout`))
         }, 60000)
         try {
           this.ws.send(msg)
@@ -149,7 +162,7 @@ export class UIClient {
           clearTimeout(sendTimeout)
         }
       } else {
-        throw new Error(`Send request '${procedureName}' message: connection not opened`)
+        reject(new Error(`Send request '${procedureName}' message: connection closed`))
       }
     })
   }