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';
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';
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 => {
- const [protocol, version] = UIServiceUtils.getProtocolAndVersion(ws.protocol);
- if (UIServiceUtils.isProtocolAndVersionSupported(protocol, version) === false) {
+ if (UIServerUtils.isProtocolAndVersionSupported(ws.protocol) === false) {
logger.error(
`${this.logPrefix(
moduleName,
'start.server.onconnection'
- )} Unsupported UI protocol version: '${protocol}${version}'`
+ )} Unsupported UI protocol version: '${ws.protocol}'`
);
ws.close(WebSocketCloseEventStatusCode.CLOSE_PROTOCOL_ERROR);
}
+ const [, version] = UIServerUtils.getProtocolAndVersion(ws.protocol);
this.registerProtocolVersionUIService(version);
ws.on('message', (rawData) => {
const request = this.validateRawDataRequest(rawData);
});
}
);
- if (this.httpServer.listening === false) {
- this.httpServer.listen(this.uiServerConfiguration.options);
- }
+ this.startHttpServer();
}
public sendRequest(request: ProtocolRequest): void {
return false;
}
- if (uuid.validate(request[0]) === false) {
+ if (Utils.validateUUID(request[0]) === false) {
logger.error(
`${this.logPrefix(
moduleName,