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
32 changes: 32 additions & 0 deletions src/transports/websocket.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,38 @@ describe("WebSocket transport", () => {
expect(mockServer.close).toHaveBeenCalled();
});

it("unrefs the stop timeout so the event loop can exit", async () => {
const transport = new WebSocketTransport({
middleware: [],
port: 9712,
});

const mockWss = {
clients: new Set(),
close: jest.fn((cb) => cb()),
removeAllListeners: jest.fn(),
} as any;
(transport as any).wss = mockWss;

const mockServer = {
close: jest.fn((cb) => cb()),
} as any;
(transport as any).server = mockServer;

const unref = jest.fn();
const originalSetTimeout = global.setTimeout;
(global as any).setTimeout = (fn: (...args: any[]) => void, _ms?: number) => {
fn();
return { unref } as any;
};

await transport.stop();

expect(unref).toHaveBeenCalled();

(global as any).setTimeout = originalSetTimeout;
});

it("applies default timeout when none provided", () => {
const transport = new WebSocketTransport({
middleware: [],
Expand Down
5 changes: 4 additions & 1 deletion src/transports/websocket.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,10 @@ export default class WebSocketServerTransport extends ServerTransport {
socket.close();
});
// Wait for sockets to close, then hard close any remaining
await new Promise((resolve) => setTimeout(resolve, this.options.timeout));
await new Promise((resolve) => {
// unref timer so it doesn't keep the event loop alive
setTimeout(resolve, this.options.timeout).unref();
});
this.wss.clients.forEach((socket) => {
if ([socket.OPEN, socket.CLOSING].includes((socket as any).readyState)) {
socket.terminate();
Expand Down
Loading