X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Fui-server%2FUIWebSocketServer.ts;h=f8f836b1073b98b0f861145cefa441ba71192f89;hb=07561812b72072b6d9f20997be86a42ee88e15a2;hp=ce773db37e8387e23ed8370c945fc7b015aa628c;hpb=94dc30801f06da3ae0bb9c3bb73ff29dbbf96b6e;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ui-server/UIWebSocketServer.ts b/src/charging-station/ui-server/UIWebSocketServer.ts
index ce773db3..f8f836b1 100644
--- a/src/charging-station/ui-server/UIWebSocketServer.ts
+++ b/src/charging-station/ui-server/UIWebSocketServer.ts
@@ -3,7 +3,7 @@ import type internal from 'stream';
 
 import { StatusCodes } from 'http-status-codes';
 import * as uuid from 'uuid';
-import WebSocket, { RawData, WebSocketServer } from 'ws';
+import WebSocket, { type RawData, WebSocketServer } from 'ws';
 
 import type { UIServerConfiguration } from '../../types/ConfigurationData';
 import type { ProtocolRequest, ProtocolResponse } from '../../types/UIProtocol';
@@ -94,19 +94,39 @@ export default class UIWebSocketServer extends AbstractUIServer {
 
   public sendResponse(response: ProtocolResponse): void {
     const responseId = response[0];
-    if (this.responseHandlers.has(responseId)) {
-      const ws = this.responseHandlers.get(responseId) as WebSocket;
-      if (ws?.readyState === WebSocket.OPEN) {
-        ws.send(JSON.stringify(response));
+    try {
+      if (this.responseHandlers.has(responseId)) {
+        const ws = this.responseHandlers.get(responseId) as WebSocket;
+        if (ws?.readyState === WebSocket.OPEN) {
+          ws.send(JSON.stringify(response));
+        } else {
+          logger.error(
+            `${this.logPrefix(
+              moduleName,
+              'sendResponse'
+            )} Error at sending response id '${responseId}', WebSocket is not open: ${
+              ws?.readyState
+            }`
+          );
+        }
+      } else {
+        logger.error(
+          `${this.logPrefix(
+            moduleName,
+            'sendResponse'
+          )} Response for unknown request id: ${responseId}`
+        );
       }
-      this.responseHandlers.delete(responseId);
-    } else {
+    } catch (error) {
       logger.error(
         `${this.logPrefix(
           moduleName,
           'sendResponse'
-        )} Response for unknown request id: ${responseId}`
+        )} Error at sending response id '${responseId}':`,
+        error
       );
+    } finally {
+      this.responseHandlers.delete(responseId);
     }
   }
 
@@ -127,18 +147,6 @@ export default class UIWebSocketServer extends AbstractUIServer {
     }
   }
 
-  private authenticate(req: IncomingMessage, next: (err?: Error) => void): void {
-    if (this.isBasicAuthEnabled() === true) {
-      if (this.isValidBasicAuth(req) === false) {
-        next(new Error('Unauthorized'));
-      } else {
-        next();
-      }
-    } else {
-      next();
-    }
-  }
-
   private validateRawDataRequest(rawData: RawData): ProtocolRequest | false {
     // logger.debug(
     //   `${this.logPrefix(