foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00
Code Issues Packages 1 Wiki Activity

fix(ext/node): delay accept() call 2 ticks in net.Server#listen (#25481)

Browse source 
A workaround for the issue #25480

`Deno.Listener` can't be closed synchronously after `accept()` is
called. This PR delays the `accept` call 2 ticks (The listener callback
is called 1 tick later. So the 1 tick delay is not enough), and makes
`net.Server` capable of being closed synchronously.

This unblocks `npm:detect-port` and `npm:portfinder`

closes #18301 
closes #25175
This commit is contained in:
Yoshiya Hinosawa 2024-09-08 12:22:18 +09:00 committed by GitHub
parent 30687c786c
commit ce1d668929
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ext/node/polyfills/internal_binding/tcp_wrap.ts
View file

@ -45,6 +45,7 @@ import {
INITIAL_ACCEPT_BACKOFF_DELAY,
MAX_ACCEPT_BACKOFF_DELAY,
} from "ext:deno_node/internal_binding/_listen.ts";
import { nextTick } from "ext:deno_node/_next_tick.ts";
/** The type of TCP socket. */
enum socketType {
@ -228,7 +229,14 @@ export class TCP extends ConnectionWrap {
this.#port = address.port;
this.#listener = listener;
this.#accept();
// TODO(kt3k): Delays the accept() call 2 ticks. Deno.Listener can't be closed
// synchronously when accept() is called. By delaying the accept() call,
// the user can close the server synchronously in the callback of listen().
// This workaround enables `npm:detect-port` to work correctly.
// Remove these nextTick calls when the below issue resolved:
// https://github.com/denoland/deno/issues/25480
nextTick(nextTick, () => this.#accept());
return 0;
}

19
tests/unit_node/net_test.ts
View file

@ -228,3 +228,22 @@ Deno.test("[node/net] BlockList doesn't leak resources", () => {
blockList.addAddress("1.1.1.1");
assert(blockList.check("1.1.1.1"));
});
Deno.test("[node/net] net.Server can listen on the same port immediately after it's closed", async () => {
const serverClosed = Promise.withResolvers<void>();
const server = net.createServer();
server.on("error", (e) => {
console.error(e);
});
server.listen(0, () => {
// deno-lint-ignore no-explicit-any
const { port } = server.address() as any;
server.close();
server.listen(port, () => {
server.close(() => {
serverClosed.resolve();
});
});
});
await serverClosed.promise;
});