Skip to content
Closed
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: 4 additions & 1 deletion src/js/node/net.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3997,7 +3997,10 @@ function addServerAbortSignalOption(self, options) {
if (signal.aborted) {
process.nextTick(onAborted);
} else {
signal.addEventListener("abort", onAborted);
// Detached on 'close', otherwise a long-lived signal retains every server that ever listened with it.
addAbortListener ??= require("internal/abort_listener").addAbortListener;
const disposable = addAbortListener(signal, onAborted);
self.once("close", disposable[Symbol.dispose]);
}
}

Expand Down
27 changes: 26 additions & 1 deletion test/js/node/net/node-net-server.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { realpathSync } from "fs";
import { bunEnv, bunExe, tempDir } from "harness";
import { AddressInfo, createServer, Server, Socket } from "net";
import { createTest } from "node-harness";
import { once } from "node:events";
import { getEventListeners, once } from "node:events";
import { tmpdir } from "os";
import { join } from "path";

Expand Down Expand Up @@ -433,6 +433,31 @@ describe("net.createServer events", () => {
});
});

it("listen({ signal }) removes its abort listener from the signal once the server closes", async () => {
const controller = new AbortController();
const { signal } = controller;
const abortListenerCounts: number[] = [];
let closeEvents = 0;

for (let i = 0; i < 3; i++) {
const server = createServer();
server.on("close", () => closeEvents++);
server.listen({ port: 0, host: "127.0.0.1", signal });
await once(server, "listening");
abortListenerCounts.push(getEventListeners(signal, "abort").length);
server.close();
await once(server, "close");
abortListenerCounts.push(getEventListeners(signal, "abort").length);
}
expect(abortListenerCounts).toEqual([1, 0, 1, 0, 1, 0]);

// A stale listener would call close() on the already-closed server again,
// which emits a second 'close' on the next tick.
controller.abort();
await new Promise(resolve => process.nextTick(resolve));
expect(closeEvents).toBe(3);
});

it("should echo data", done => {
const { mustNotCall } = createCallCheckCtx(done);
let timeout: Timer;
Expand Down
Loading