http: server add async dispose

PR-URL: #48548 Reviewed-By: Moshe Atlow <[email protected]> Reviewed-By: Paolo Insogna <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Matteo Collina <[email protected]>
nodejs · Jul 3, 2023 · 94ebb02 · 94ebb02
1 parent 07eb310
commit 94ebb02
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/doc/api/http.md b/doc/api/http.md
@@ -1667,6 +1667,17 @@ to 8.0.0, which did not have a keep-alive timeout.
 The socket timeout logic is set up on connection, so changing this value only
 affects new connections to the server, not any existing connections.
 
+### `server[Symbol.asyncDispose]()`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+> Stability: 1 - Experimental
+
+Calls [`server.close()`][] and returns a promise that fulfills when the
+server has closed.
+
 ## Class: `http.ServerResponse`
 
 <!-- YAML
@@ -3895,6 +3906,7 @@ Set the maximum number of idle HTTP parsers.
 [`response.write(data, encoding)`]: #responsewritechunk-encoding-callback
 [`response.writeContinue()`]: #responsewritecontinue
 [`response.writeHead()`]: #responsewriteheadstatuscode-statusmessage-headers
+[`server.close()`]: #serverclosecallback
 [`server.headersTimeout`]: #serverheaderstimeout
 [`server.keepAliveTimeout`]: #serverkeepalivetimeout
 [`server.listen()`]: net.md#serverlisten

diff --git a/lib/_http_server.js b/lib/_http_server.js
@@ -24,12 +24,14 @@
 const {
   ArrayIsArray,
   Error,
+  FunctionPrototypeCall,
   MathMin,
   ObjectKeys,
   ObjectSetPrototypeOf,
   RegExpPrototypeExec,
   ReflectApply,
   Symbol,
+  SymbolAsyncDispose,
   SymbolFor,
 } = primordials;
 
@@ -81,6 +83,7 @@ const {
 } = codes;
 const {
   kEmptyObject,
+  promisify,
 } = require('internal/util');
 const {
   validateInteger,
@@ -557,6 +560,10 @@ Server.prototype.close = function() {
   ReflectApply(net.Server.prototype.close, this, arguments);
 };
 
+Server.prototype[SymbolAsyncDispose] = async function() {
+  return FunctionPrototypeCall(promisify(this.close), this);
+};
+
 Server.prototype.closeAllConnections = function() {
   const connections = this[kConnections].all();
 

diff --git a/test/parallel/test-http-server-async-dispose.js b/test/parallel/test-http-server-async-dispose.js
@@ -0,0 +1,14 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const { createServer } = require('http');
+const { kConnectionsCheckingInterval } = require('_http_server');
+
+const server = createServer();
+
+server.listen(0, common.mustCall(() => {
+  server.on('close', common.mustCall());
+  server[Symbol.asyncDispose]().then(common.mustCall(() => {
+    assert(server[kConnectionsCheckingInterval]._destroyed);
+  }));
+}));