From 81f630fd53cbb441a12fe7177a40eb479a6c0711 Mon Sep 17 00:00:00 2001
From: atlowChemi <chemi@testim.io>
Date: Sun, 25 Jun 2023 20:19:40 +0300
Subject: [PATCH 1/6] http: server add async dispose

---
 doc/api/http.md                                 | 12 ++++++++++++
 lib/_http_server.js                             |  6 ++++++
 test/parallel/test-http-server-async-dispose.js | 14 ++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 test/parallel/test-http-server-async-dispose.js

diff --git a/doc/api/http.md b/doc/api/http.md
index b6fa32a3c0b4cc..5451cb0ccf6f96 100644
--- 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
index d72faed56e6056..67c28e2d3a2d1f 100644
--- a/lib/_http_server.js
+++ b/lib/_http_server.js
@@ -30,6 +30,7 @@ const {
   RegExpPrototypeExec,
   ReflectApply,
   Symbol,
+  SymbolAsyncDispose,
   SymbolFor,
 } = primordials;
 
@@ -81,6 +82,7 @@ const {
 } = codes;
 const {
   kEmptyObject,
+  promisify,
 } = require('internal/util');
 const {
   validateInteger,
@@ -557,6 +559,10 @@ Server.prototype.close = function() {
   ReflectApply(net.Server.prototype.close, this, arguments);
 };
 
+Server.prototype[SymbolAsyncDispose] = async function() {
+  return promisify(this.close).call(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
new file mode 100644
index 00000000000000..8af11dcb7b0c3c
--- /dev/null
+++ 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);
+  }));
+}));

From bb0485498375a9a921b8e6b0d3fde648a97807c7 Mon Sep 17 00:00:00 2001
From: atlowChemi <chemi@testim.io>
Date: Sun, 25 Jun 2023 23:19:38 +0300
Subject: [PATCH 2/6] http2: Server add `asyncDispose`

---
 doc/api/http2.md                                 | 13 +++++++++++++
 lib/internal/http2/core.js                       |  5 +++++
 test/parallel/test-http2-server-async-dispose.js | 15 +++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 test/parallel/test-http2-server-async-dispose.js

diff --git a/doc/api/http2.md b/doc/api/http2.md
index 5efcd5fdcbe421..68ef172ca3b6fe 100644
--- a/doc/api/http2.md
+++ b/doc/api/http2.md
@@ -2070,6 +2070,18 @@ If `callback` is provided, it is not invoked until all active sessions have been
 closed, although the server has already stopped allowing new sessions. See
 [`net.Server.close()`][] for more details.
 
+
+#### `server[Symbol.asyncDispose]()`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+> Stability: 1 - Experimental
+
+Calls [`server.close()`][] and returns a promise that fulfills when the
+server has closed.
+
 #### `server.setTimeout([msecs][, callback])`
 
 <!-- YAML
@@ -4226,6 +4238,7 @@ you need to implement any fall-back behavior yourself.
 [`response.write(data, encoding)`]: http.md#responsewritechunk-encoding-callback
 [`response.writeContinue()`]: #responsewritecontinue
 [`response.writeHead()`]: #responsewriteheadstatuscode-statusmessage-headers
+[`server.close()`]: #serverclosecallback
 [`server.maxHeadersCount`]: http.md#servermaxheaderscount
 [`tls.Server.close()`]: tls.md#serverclosecallback
 [`tls.TLSSocket`]: tls.md#class-tlstlssocket
diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
index 6d0b6a1b72d377..7fce6a21585648 100644
--- a/lib/internal/http2/core.js
+++ b/lib/internal/http2/core.js
@@ -26,6 +26,7 @@ const {
   SafeSet,
   StringPrototypeSlice,
   Symbol,
+  SymbolAsyncDispose,
   TypedArrayPrototypeGetLength,
   Uint32Array,
   Uint8Array,
@@ -3189,6 +3190,10 @@ class Http2Server extends NETServer {
     validateSettings(settings);
     this[kOptions].settings = { ...this[kOptions].settings, ...settings };
   }
+
+  async [SymbolAsyncDispose]() {
+    return promisify(super.close).call(this);
+  }
 }
 
 Http2Server.prototype[EventEmitter.captureRejectionSymbol] = function(
diff --git a/test/parallel/test-http2-server-async-dispose.js b/test/parallel/test-http2-server-async-dispose.js
new file mode 100644
index 00000000000000..4782e12e417d27
--- /dev/null
+++ b/test/parallel/test-http2-server-async-dispose.js
@@ -0,0 +1,15 @@
+'use strict';
+
+const common = require('../common');
+
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
+const http2 = require('http2');
+
+const server = http2.createServer();
+
+server.listen(0, common.mustCall(() => {
+  server.on('close', common.mustCall());
+  server[Symbol.asyncDispose]().then(common.mustCall());
+}));

From 7577fd83998d8e0c8590a8c3308abe91e69a35c3 Mon Sep 17 00:00:00 2001
From: atlowChemi <chemi@testim.io>
Date: Sun, 25 Jun 2023 23:29:58 +0300
Subject: [PATCH 3/6] https: Server add `asyncDispose`

---
 doc/api/https.md                              | 13 +++++++++++++
 lib/https.js                                  |  6 ++++++
 .../test-https-server-async-dispose.js        | 19 +++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 test/parallel/test-https-server-async-dispose.js

diff --git a/doc/api/https.md b/doc/api/https.md
index c4dbd898613d6f..7f98ed761119da 100644
--- a/doc/api/https.md
+++ b/doc/api/https.md
@@ -135,6 +135,18 @@ added: v0.1.90
 
 See [`server.close()`][] in the `node:http` module.
 
+
+### `server[Symbol.asyncDispose]()`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+> Stability: 1 - Experimental
+
+Calls [`server.close()`][httpsServerClose] and returns a promise that fulfills when the
+server has closed.
+
 ### `server.closeAllConnections()`
 
 <!-- YAML
@@ -571,4 +583,5 @@ headers: max-age=0; pin-sha256="WoiWRyIOVNa9ihaBciRSC7XHjliYS9VwUGOIud4PB18="; p
 [`tls.connect()`]: tls.md#tlsconnectoptions-callback
 [`tls.createSecureContext()`]: tls.md#tlscreatesecurecontextoptions
 [`tls.createServer()`]: tls.md#tlscreateserveroptions-secureconnectionlistener
+[httpsServerClose]: serverclosecallback
 [sni wiki]: https://en.wikipedia.org/wiki/Server_Name_Indication
diff --git a/lib/https.js b/lib/https.js
index ca695555640a32..e3acde5ab663bb 100644
--- a/lib/https.js
+++ b/lib/https.js
@@ -33,11 +33,13 @@ const {
   ObjectSetPrototypeOf,
   ReflectApply,
   ReflectConstruct,
+  SymbolAsyncDispose,
 } = primordials;
 
 const {
   assertCrypto,
   kEmptyObject,
+  promisify,
 } = require('internal/util');
 assertCrypto();
 
@@ -110,6 +112,10 @@ Server.prototype.close = function() {
   ReflectApply(tls.Server.prototype.close, this, arguments);
 };
 
+Server.prototype[SymbolAsyncDispose] = async function() {
+  return promisify(this.close).call(this);
+};
+
 /**
  * Creates a new `https.Server` instance.
  * @param {{
diff --git a/test/parallel/test-https-server-async-dispose.js b/test/parallel/test-https-server-async-dispose.js
new file mode 100644
index 00000000000000..93b5cb74bbda11
--- /dev/null
+++ b/test/parallel/test-https-server-async-dispose.js
@@ -0,0 +1,19 @@
+'use strict';
+
+const common = require('../common');
+
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
+const assert = require('assert');
+const { createServer } = require('https');
+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);
+  }));
+}));

From 362b8e5d22c5ee326c171f7e502a1b032fb20c87 Mon Sep 17 00:00:00 2001
From: atlowChemi <chemi@testim.io>
Date: Tue, 27 Jun 2023 12:28:53 +0300
Subject: [PATCH 4/6] fixup! http: server add async dispose

---
 lib/_http_server.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/_http_server.js b/lib/_http_server.js
index 67c28e2d3a2d1f..0242e7a089dd6f 100644
--- a/lib/_http_server.js
+++ b/lib/_http_server.js
@@ -24,6 +24,7 @@
 const {
   ArrayIsArray,
   Error,
+  FunctionPrototypeCall,
   MathMin,
   ObjectKeys,
   ObjectSetPrototypeOf,
@@ -560,7 +561,7 @@ Server.prototype.close = function() {
 };
 
 Server.prototype[SymbolAsyncDispose] = async function() {
-  return promisify(this.close).call(this);
+  return FunctionPrototypeCall(promisify(this.close), this);
 };
 
 Server.prototype.closeAllConnections = function() {

From 90f2be5202feb76dbac43a43b4a686a04e4fd200 Mon Sep 17 00:00:00 2001
From: atlowChemi <chemi@testim.io>
Date: Tue, 27 Jun 2023 12:30:04 +0300
Subject: [PATCH 5/6] fixup! http2: Server add `asyncDispose`

---
 doc/api/http2.md           | 1 -
 lib/internal/http2/core.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/api/http2.md b/doc/api/http2.md
index 68ef172ca3b6fe..ab7de677319e63 100644
--- a/doc/api/http2.md
+++ b/doc/api/http2.md
@@ -2070,7 +2070,6 @@ If `callback` is provided, it is not invoked until all active sessions have been
 closed, although the server has already stopped allowing new sessions. See
 [`net.Server.close()`][] for more details.
 
-
 #### `server[Symbol.asyncDispose]()`
 
 <!-- YAML
diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
index 7fce6a21585648..fe104f52a38ed8 100644
--- a/lib/internal/http2/core.js
+++ b/lib/internal/http2/core.js
@@ -3192,7 +3192,7 @@ class Http2Server extends NETServer {
   }
 
   async [SymbolAsyncDispose]() {
-    return promisify(super.close).call(this);
+    return FunctionPrototypeCall(promisify(super.close), this);
   }
 }
 

From 3a31a058072b21e7341564546462b900a2f6b6a0 Mon Sep 17 00:00:00 2001
From: atlowChemi <chemi@testim.io>
Date: Tue, 27 Jun 2023 12:30:22 +0300
Subject: [PATCH 6/6] fixup! https: Server add `asyncDispose`

---
 doc/api/https.md | 7 +++----
 lib/https.js     | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/api/https.md b/doc/api/https.md
index 7f98ed761119da..c511d8107ff0d4 100644
--- a/doc/api/https.md
+++ b/doc/api/https.md
@@ -135,7 +135,6 @@ added: v0.1.90
 
 See [`server.close()`][] in the `node:http` module.
 
-
 ### `server[Symbol.asyncDispose]()`
 
 <!-- YAML
@@ -144,8 +143,8 @@ added: REPLACEME
 
 > Stability: 1 - Experimental
 
-Calls [`server.close()`][httpsServerClose] and returns a promise that fulfills when the
-server has closed.
+Calls [`server.close()`][httpsServerClose] and returns a promise that
+fulfills when the server has closed.
 
 ### `server.closeAllConnections()`
 
@@ -583,5 +582,5 @@ headers: max-age=0; pin-sha256="WoiWRyIOVNa9ihaBciRSC7XHjliYS9VwUGOIud4PB18="; p
 [`tls.connect()`]: tls.md#tlsconnectoptions-callback
 [`tls.createSecureContext()`]: tls.md#tlscreatesecurecontextoptions
 [`tls.createServer()`]: tls.md#tlscreateserveroptions-secureconnectionlistener
-[httpsServerClose]: serverclosecallback
+[httpsServerClose]: #serverclosecallback
 [sni wiki]: https://en.wikipedia.org/wiki/Server_Name_Indication
diff --git a/lib/https.js b/lib/https.js
index e3acde5ab663bb..d8b42c85493f7e 100644
--- a/lib/https.js
+++ b/lib/https.js
@@ -113,7 +113,7 @@ Server.prototype.close = function() {
 };
 
 Server.prototype[SymbolAsyncDispose] = async function() {
-  return promisify(this.close).call(this);
+  return FunctionPrototypeCall(promisify(this.close), this);
 };
 
 /**