Skip to content

refactor(client): merge the two companion worker close-code normalizers #3552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thymikee merged 2 commits into from
Oct 13, 2026
Merged

refactor(client): merge the two companion worker close-code normalizers #3552

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3aa7bf9
refactor(client): merge the two worker close-code normalizers
thymikee Oct 12, 2026
063fc97
docs(client): name the RFC 6455 subranges the worker close-code shape…
thymikee Oct 12, 2026
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
28 changes: 11 additions & 17 deletions src/client/client-companion-tunnel-worker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,17 +206,14 @@ function toUpstreamWebSocketUrl(localBaseUrl: string, requestPath: string): stri
return upstream.toString();
}

/**
* The only code shape `WebSocket.close` may be handed: 1000, or the 3000-4999 range RFC 6455 keeps
* for this program's own use (3000-3999 for libraries and applications, 4000-4999 private). Any
* other code, including the 1001-1015 range and a missing one, leaves as 3001 so the close lands
* instead of being refused by the client.
*/
function normalizeCloseCode(code: number | undefined): number {
if (typeof code !== 'number' || !Number.isInteger(code)) return 1011;
if (code === 1000) return code;
if (code >= 3000 && code <= 4999) return code;
if (code >= 1001 && code <= 1015 && code !== 1004 && code !== 1005 && code !== 1006) {
return code;
}
return 1011;
}

function normalizeOutgoingCloseCode(code: number): number {
if (typeof code !== 'number' || !Number.isInteger(code)) return 3001;
if (code === 1000) return code;
if (code >= 3000 && code <= 4999) return code;
return 3001;
Expand Down Expand Up @@ -272,9 +269,10 @@ async function waitForSocketShutdown(socket: WebSocket): Promise<void> {
});
}

function closeSocketQuietly(socket: WebSocket, code: number, reason: string): void {
/** Closes one socket with the only code a client may send, ignoring shutdown races. */
function closeSocketQuietly(socket: WebSocket, code: number | undefined, reason: string): void {
try {
socket.close(normalizeOutgoingCloseCode(code), reason);
socket.close(normalizeCloseCode(code), reason);
} catch {
// ignore shutdown races
}
Expand Down Expand Up @@ -396,11 +394,7 @@ function handleBridgeWebSocketClose(
const upstreamSocket = upstreamSockets.get(message.streamId);
if (!upstreamSocket) return;
upstreamSockets.delete(message.streamId);
closeSocketQuietly(
upstreamSocket,
normalizeCloseCode(message.code),
message.reason ?? 'bridge requested close',
);
closeSocketQuietly(upstreamSocket, message.code, message.reason ?? 'bridge requested close');
}

async function handleBridgeMessage(
Expand Down
Loading