Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import { ensureGateway, findExistingGatewayProcess, killGateway } from './gatewa
import { publicRoutes, api, adminUi, debug, cdp } from './routes';
import { redactSensitiveParams } from './utils/logging';
import { restoreIfNeeded, createSnapshot } from './persistence';
import { normalizeWebSocketCloseCode } from './websocket-close';
import { handleScheduled } from './cron/handler';
import loadingPageHtml from './assets/loading.html';
import configErrorHtml from './assets/config-error.html';
Expand Down Expand Up @@ -439,7 +440,7 @@ app.all('*', async (c) => {
if (debugLogs) {
console.log('[WS] Client closed:', event.code, event.reason);
}
containerWs.close(event.code, event.reason);
containerWs.close(normalizeWebSocketCloseCode(event.code), event.reason);
});

containerWs.addEventListener('close', (event) => {
Expand All @@ -454,7 +455,7 @@ app.all('*', async (c) => {
if (debugLogs) {
console.log('[WS] Transformed close reason:', reason);
}
serverWs.close(event.code, reason);
serverWs.close(normalizeWebSocketCloseCode(event.code), reason);
});

// Handle errors
Expand Down
22 changes: 22 additions & 0 deletions src/websocket-close.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { describe, expect, it } from 'vitest';
import { normalizeWebSocketCloseCode } from './websocket-close';

describe('normalizeWebSocketCloseCode', () => {
it('preserves valid standard close codes', () => {
expect(normalizeWebSocketCloseCode(1000)).toBe(1000);
expect(normalizeWebSocketCloseCode(1001)).toBe(1001);
expect(normalizeWebSocketCloseCode(1011)).toBe(1011);
});

it('preserves valid application close codes', () => {
expect(normalizeWebSocketCloseCode(3000)).toBe(3000);
expect(normalizeWebSocketCloseCode(4999)).toBe(4999);
});

it('maps reserved close codes to a safe fallback', () => {
expect(normalizeWebSocketCloseCode(1004)).toBe(1011);
expect(normalizeWebSocketCloseCode(1005)).toBe(1011);
expect(normalizeWebSocketCloseCode(1006)).toBe(1011);
expect(normalizeWebSocketCloseCode(1015)).toBe(1011);
});
});
14 changes: 14 additions & 0 deletions src/websocket-close.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
export function normalizeWebSocketCloseCode(code: number): number {
if (
code === 1000 ||
code === 1001 ||
code === 1002 ||
code === 1003 ||
(code >= 1007 && code <= 1014) ||
(code >= 3000 && code <= 4999)
) {
return code;
}

return 1011;
}