import type internal from 'stream';
import { StatusCodes } from 'http-status-codes';
-import * as uuid from 'uuid';
import WebSocket, { type RawData, WebSocketServer } from 'ws';
+import { AbstractUIServer } from './AbstractUIServer';
+import { UIServerUtils } from './UIServerUtils';
import type { UIServerConfiguration } from '../../types/ConfigurationData';
import type { ProtocolRequest, ProtocolResponse } from '../../types/UIProtocol';
import { WebSocketCloseEventStatusCode } from '../../types/WebSocket';
import logger from '../../utils/Logger';
import Utils from '../../utils/Utils';
-import { AbstractUIServer } from './AbstractUIServer';
-import { UIServerUtils } from './UIServerUtils';
const moduleName = 'UIWebSocketServer';
this.responseHandlers.set(requestId, ws);
this.uiServices
.get(version)
- .requestHandler(request)
+ ?.requestHandler(request)
.catch(() => {
/* Error caught by AbstractUIService */
});
);
});
});
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ this.httpServer.on('connect', (req: IncomingMessage, socket: internal.Duplex, head: Buffer) => {
+ 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: internal.Duplex, head: Buffer): void => {
socket.destroy();
return;
}
- this.webSocketServer.handleUpgrade(req, socket, head, (ws: WebSocket) => {
- this.webSocketServer.emit('connection', ws, req);
- });
+ try {
+ this.webSocketServer.handleUpgrade(req, socket, head, (ws: WebSocket) => {
+ this.webSocketServer.emit('connection', ws, req);
+ });
+ } catch (error) {
+ logger.error(
+ `${this.logPrefix(
+ moduleName,
+ 'start.httpServer.on.upgrade'
+ )} Error at handling connection upgrade:`,
+ error
+ );
+ }
});
}
);
return false;
}
- if (uuid.validate(request[0]) === false) {
+ if (Utils.validateUUID(request[0]) === false) {
logger.error(
`${this.logPrefix(
moduleName,