X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Fui-server%2FUIWebSocketServer.ts;h=16477146f0c638fbd1776213df0d336e3fa9f62d;hb=a474cbe107fedbe17398e5d21f852f0ce0d5ca2f;hp=097533e0b493196bc7a0c864907ba1dbde3f5984;hpb=66a7748ddeda8c94d7562a1ce58d440319654a4c;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 097533e0..16477146 100644
--- a/src/charging-station/ui-server/UIWebSocketServer.ts
+++ b/src/charging-station/ui-server/UIWebSocketServer.ts
@@ -14,6 +14,7 @@ import {
 } from '../../types/index.js'
 import {
   Constants,
+  JSONStringifyWithMapSupport,
   getWebSocketCloseEventStatusString,
   isNotEmptyString,
   logPrefix,
@@ -47,13 +48,13 @@ export class UIWebSocketServer extends AbstractUIServer {
       }
       const [, version] = UIServerUtils.getProtocolAndVersion(ws.protocol)
       this.registerProtocolVersionUIService(version)
-      ws.on('message', (rawData) => {
+      ws.on('message', rawData => {
         const request = this.validateRawDataRequest(rawData)
         if (request === false) {
           ws.close(WebSocketCloseEventStatusCode.CLOSE_INVALID_PAYLOAD)
           return
         }
-        const [requestId] = request as ProtocolRequest
+        const [requestId] = request
         this.responseHandlers.set(requestId, ws)
         this.uiServices
           .get(version)
@@ -65,7 +66,7 @@ export class UIWebSocketServer extends AbstractUIServer {
           })
           .catch(Constants.EMPTY_FUNCTION)
       })
-      ws.on('error', (error) => {
+      ws.on('error', error => {
         logger.error(`${this.logPrefix(moduleName, 'start.ws.onerror')} WebSocket error:`, error)
       })
       ws.on('close', (code, reason) => {
@@ -80,13 +81,13 @@ export class UIWebSocketServer extends AbstractUIServer {
       })
     })
     this.httpServer.on('connect', (req: IncomingMessage, socket: Duplex, _head: Buffer) => {
-      if (req.headers?.connection !== 'Upgrade' || req.headers?.upgrade !== 'websocket') {
+      if (req.headers.connection !== 'Upgrade' || req.headers.upgrade !== 'websocket') {
         socket.write(`HTTP/1.1 ${StatusCodes.BAD_REQUEST} Bad Request\r\n\r\n`)
         socket.destroy()
       }
     })
     this.httpServer.on('upgrade', (req: IncomingMessage, socket: Duplex, head: Buffer): void => {
-      this.authenticate(req, (err) => {
+      this.authenticate(req, err => {
         if (err != null) {
           socket.write(`HTTP/1.1 ${StatusCodes.UNAUTHORIZED} Unauthorized\r\n\r\n`)
           socket.destroy()
@@ -115,18 +116,20 @@ export class UIWebSocketServer extends AbstractUIServer {
   }
 
   public sendResponse (response: ProtocolResponse): void {
-    const responseId = response?.[0]
+    const responseId = response[0]
     try {
       if (this.hasResponseHandler(responseId)) {
         const ws = this.responseHandlers.get(responseId) as WebSocket
-        if (ws?.readyState === WebSocket.OPEN) {
-          ws.send(JSON.stringify(response))
+        if (ws.readyState === WebSocket.OPEN) {
+          ws.send(JSONStringifyWithMapSupport(response))
         } else {
           logger.error(
             `${this.logPrefix(
               moduleName,
               'sendResponse'
-            )} Error at sending response id '${responseId}', WebSocket is not open: ${ws?.readyState}`
+            )} Error at sending response id '${responseId}', WebSocket is not open: ${
+              ws.readyState
+            }`
           )
         }
       } else {
@@ -162,7 +165,7 @@ export class UIWebSocketServer extends AbstractUIServer {
 
   private broadcastToClients (message: string): void {
     for (const client of this.webSocketServer.clients) {
-      if (client?.readyState === WebSocket.OPEN) {
+      if (client.readyState === WebSocket.OPEN) {
         client.send(message)
       }
     }
@@ -177,8 +180,20 @@ export class UIWebSocketServer extends AbstractUIServer {
     //   )} Raw data received in string format: ${rawData.toString()}`
     // )
 
-    // eslint-disable-next-line @typescript-eslint/no-base-to-string
-    const request = JSON.parse(rawData.toString()) as ProtocolRequest
+    let request: ProtocolRequest
+    try {
+      // eslint-disable-next-line @typescript-eslint/no-base-to-string
+      request = JSON.parse(rawData.toString()) as ProtocolRequest
+    } catch (error) {
+      logger.error(
+        `${this.logPrefix(
+          moduleName,
+          'validateRawDataRequest'
+          // eslint-disable-next-line @typescript-eslint/no-base-to-string
+        )} UI protocol request is not valid JSON: ${rawData.toString()}`
+      )
+      return false
+    }
 
     if (!Array.isArray(request)) {
       logger.error(
@@ -191,6 +206,7 @@ export class UIWebSocketServer extends AbstractUIServer {
       return false
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     if (request.length !== 3) {
       logger.error(
         `${this.logPrefix(moduleName, 'validateRawDataRequest')} UI protocol request is malformed:`,
@@ -199,7 +215,7 @@ export class UIWebSocketServer extends AbstractUIServer {
       return false
     }
 
-    if (!validateUUID(request?.[0])) {
+    if (!validateUUID(request[0])) {
       logger.error(
         `${this.logPrefix(
           moduleName,