From 2a33d748e48af0972fbd96cc893de218f4487779 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Arturo=20Cabral=20Mej=C3=ADa?= Date: Sun, 29 Jan 2023 23:51:56 -0500 Subject: [PATCH] chore: inc. pong timeout --- src/adapters/web-socket-adapter.ts | 8 +++++--- src/adapters/web-socket-server-adapter.ts | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/adapters/web-socket-adapter.ts b/src/adapters/web-socket-adapter.ts index 6d42fae..5330578 100644 --- a/src/adapters/web-socket-adapter.ts +++ b/src/adapters/web-socket-adapter.ts @@ -1,7 +1,7 @@ +import ws, { WebSocket } from 'ws' import cluster from 'cluster' import { EventEmitter } from 'stream' import { IncomingMessage as IncomingHttpMessage } from 'http' -import { WebSocket } from 'ws' import { ContextMetadata, Factory } from '../@types/base' import { createNoticeMessage, createOutgoingEventMessage } from '../utils/messages' @@ -22,7 +22,7 @@ import { Settings } from '../@types/settings' import { SocketAddress } from 'net' (() => { - (WebSocket as any).Receiver.prototype._write = function _write (chunk: any, _encoding: any, cb: any) { + (ws as any).Receiver.prototype._write = function _write (chunk: any, _encoding: any, cb: any) { if (this._opcode === 0x08 && this._state == 0) return cb() this._bufferedBytes += chunk.length @@ -68,6 +68,8 @@ export class WebSocketAdapter extends EventEmitter implements IWebSocketAdapter family: address.indexOf(':') >= 0 ? 'ipv6' : 'ipv4', }) + console.log(`web-socket-adapter: new client ${this.clientId} (${this.getClientAddress()})`) + this.client .on('error', (error) => { if (error.name === 'RangeError' && error.message === 'Max payload size exceeded') { @@ -274,6 +276,6 @@ export class WebSocketAdapter extends EventEmitter implements IWebSocketAdapter this.removeAllListeners() this.client.removeAllListeners() - debug('client %s closed', this.clientId) + console.error(`web-socket-adapter: disconnected client ${this.clientId} (${this.getClientAddress()})`) } } diff --git a/src/adapters/web-socket-server-adapter.ts b/src/adapters/web-socket-server-adapter.ts index 6a99b40..7c22d5b 100644 --- a/src/adapters/web-socket-server-adapter.ts +++ b/src/adapters/web-socket-server-adapter.ts @@ -14,7 +14,7 @@ import { WebServerAdapter } from './web-server-adapter' const debug = createLogger('web-socket-server-adapter') -const WSS_CLIENT_HEALTH_PROBE_INTERVAL = 30000 +const WSS_CLIENT_HEALTH_PROBE_INTERVAL = 60000 export class WebSocketServerAdapter extends WebServerAdapter implements IWebSocketServerAdapter { private webSocketsAdapters: WeakMap @@ -95,6 +95,8 @@ export class WebSocketServerAdapter extends WebServerAdapter implements IWebSock return } + console.log('web-socket-server-adapter: connected clients:', this.webSocketServer.clients.size) + this.webSocketsAdapters.set(client, this.createWebSocketAdapter([client, req, this])) }