cthrace/collabvm-1.2.ts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev/proto_capability_rework

Browse Source
This commit is contained in:
Elijah R
2025-03-21 19:03:55 -04:00
parent 4c085619ff 53dd05ccc2
commit e1e5f4a352
14 changed files with 448 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cvmts/src/net/ws/WSClient.ts
View File

@@ -1,11 +1,13 @@
import { WebSocket } from 'ws';
import { NetworkClient } from '../NetworkClient.js';
import EventEmitter from 'events';
import pino from 'pino';
export default class WSClient extends EventEmitter implements NetworkClient {
socket: WebSocket;
ip: string;
enforceTextOnly = true
private logger = pino({ name: "CVMTS.WebsocketClient" });
constructor(ws: WebSocket, ip: string) {
super();
@@ -22,6 +24,10 @@ export default class WSClient extends EventEmitter implements NetworkClient {
this.emit('msg', buf, isBinary);
});
this.socket.on('error', (err: Error) => {
this.logger.error(err, 'WebSocket recv error');
})
this.socket.on('close', () => {
this.emit('disconnect');
});
@@ -37,11 +43,13 @@ export default class WSClient extends EventEmitter implements NetworkClient {
send(msg: string): Promise<void> {
return new Promise((res, rej) => {
if (!this.isOpen()) res();
if (!this.isOpen()) return res();
this.socket.send(msg, (err) => {
if (err) {
rej(err);
this.logger.error(err, 'WebSocket send error');
this.close();
res();
return;
}
res();
@@ -51,11 +59,13 @@ export default class WSClient extends EventEmitter implements NetworkClient {
sendBinary(msg: Uint8Array): Promise<void> {
return new Promise((res, rej) => {
if (!this.isOpen()) res();
if (!this.isOpen()) return res();
this.socket.send(msg, (err) => {
if (err) {
rej(err);
this.logger.error(err, 'WebSocket send error');
this.close();
res();
return;
}
res();

2
cvmts/src/net/ws/WSServer.ts
View File

@@ -24,7 +24,7 @@ export default class WSServer extends EventEmitter implements NetworkServer {
this.Config = config;
this.clients = [];
this.httpServer = http.createServer();
this.wsServer = new WebSocketServer({ noServer: true });
this.wsServer = new WebSocketServer({ noServer: true, perMessageDeflate: false, clientTracking: false });
this.httpServer.on('upgrade', (req: http.IncomingMessage, socket: internal.Duplex, head: Buffer) => this.httpOnUpgrade(req, socket, head));
this.httpServer.on('request', (req, res) => {
res.writeHead(426);