X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Fui-server%2FUIWebSocketServer.ts;h=c135cb13859d09d212a8bda3060f6c95f7729c01;hb=0193fdd350fa2b861631493bb2d3f857a69dda5f;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..c135cb13 100644 --- a/src/charging-station/ui-server/UIWebSocketServer.ts +++ b/src/charging-station/ui-server/UIWebSocketServer.ts @@ -53,7 +53,7 @@ export class UIWebSocketServer extends AbstractUIServer { ws.close(WebSocketCloseEventStatusCode.CLOSE_INVALID_PAYLOAD) return } - const [requestId] = request as ProtocolRequest + const [requestId] = request this.responseHandlers.set(requestId, ws) this.uiServices .get(version) @@ -80,7 +80,7 @@ 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() } @@ -115,18 +115,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) { + 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}` + )} Error at sending response id '${responseId}', WebSocket is not open: ${ + ws.readyState + }` ) } } else { @@ -162,7 +164,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) } } @@ -191,6 +193,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 +202,7 @@ export class UIWebSocketServer extends AbstractUIServer { return false } - if (!validateUUID(request?.[0])) { + if (!validateUUID(request[0])) { logger.error( `${this.logPrefix( moduleName,