X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Fui-server%2FUIWebSocketServer.ts;h=60a4e3c186221f9c00556744e68110ec123cfa1b;hb=8bd02502e5cb44f91964241a5bc93b762ca7557e;hp=4ac5d23561abcdd9e25a29a8fd12d22d37ba18d8;hpb=7cb5b17fac198fe3ecd009ac4c692c0d88dd051e;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 4ac5d235..60a4e3c1 100644 --- a/src/charging-station/ui-server/UIWebSocketServer.ts +++ b/src/charging-station/ui-server/UIWebSocketServer.ts @@ -2,7 +2,6 @@ import type { IncomingMessage } from 'http'; import type internal from 'stream'; import { StatusCodes } from 'http-status-codes'; -import * as uuid from 'uuid'; import WebSocket, { type RawData, WebSocketServer } from 'ws'; import type { UIServerConfiguration } from '../../types/ConfigurationData'; @@ -11,7 +10,7 @@ import { WebSocketCloseEventStatusCode } from '../../types/WebSocket'; import logger from '../../utils/Logger'; import Utils from '../../utils/Utils'; import { AbstractUIServer } from './AbstractUIServer'; -import { UIServiceUtils } from './ui-services/UIServiceUtils'; +import { UIServerUtils } from './UIServerUtils'; const moduleName = 'UIWebSocketServer'; @@ -21,14 +20,15 @@ export default class UIWebSocketServer extends AbstractUIServer { public constructor(protected readonly uiServerConfiguration: UIServerConfiguration) { super(uiServerConfiguration); this.webSocketServer = new WebSocketServer({ - handleProtocols: UIServiceUtils.handleProtocols, + handleProtocols: UIServerUtils.handleProtocols, noServer: true, }); } public start(): void { + // eslint-disable-next-line @typescript-eslint/no-unused-vars this.webSocketServer.on('connection', (ws: WebSocket, req: IncomingMessage): void => { - if (UIServiceUtils.isProtocolAndVersionSupported(ws.protocol) === false) { + if (UIServerUtils.isProtocolAndVersionSupported(ws.protocol) === false) { logger.error( `${this.logPrefix( moduleName, @@ -37,7 +37,7 @@ export default class UIWebSocketServer extends AbstractUIServer { ); ws.close(WebSocketCloseEventStatusCode.CLOSE_PROTOCOL_ERROR); } - const [, version] = UIServiceUtils.getProtocolAndVersion(ws.protocol); + const [, version] = UIServerUtils.getProtocolAndVersion(ws.protocol); this.registerProtocolVersionUIService(version); ws.on('message', (rawData) => { const request = this.validateRawDataRequest(rawData); @@ -174,7 +174,7 @@ export default class UIWebSocketServer extends AbstractUIServer { return false; } - if (uuid.validate(request[0]) === false) { + if (Utils.validateUUID(request[0]) === false) { logger.error( `${this.logPrefix( moduleName,