Skip to content

Commit d293a6a

Browse files
committed
http: server add async dispose
1 parent 7cd4e70 commit d293a6a

File tree

3 files changed

+39
-0
lines changed

3 files changed

+39
-0
lines changed

doc/api/http.md

+12
Original file line numberDiff line numberDiff line change
@@ -1667,6 +1667,17 @@ to 8.0.0, which did not have a keep-alive timeout.
16671667
The socket timeout logic is set up on connection, so changing this value only
16681668
affects new connections to the server, not any existing connections.
16691669

1670+
### `server[Symbol.asyncDispose]()`
1671+
1672+
<!-- YAML
1673+
added: REPLACEME
1674+
-->
1675+
1676+
> Stability: 1 - Experimental
1677+
1678+
Calls [`server.close()`][] and returns a promise that fulfills when the
1679+
server has closed.
1680+
16701681
## Class: `http.ServerResponse`
16711682

16721683
<!-- YAML
@@ -3895,6 +3906,7 @@ Set the maximum number of idle HTTP parsers.
38953906
[`response.write(data, encoding)`]: #responsewritechunk-encoding-callback
38963907
[`response.writeContinue()`]: #responsewritecontinue
38973908
[`response.writeHead()`]: #responsewriteheadstatuscode-statusmessage-headers
3909+
[`server.close()`]: #serverclosecallback
38983910
[`server.headersTimeout`]: #serverheaderstimeout
38993911
[`server.keepAliveTimeout`]: #serverkeepalivetimeout
39003912
[`server.listen()`]: net.md#serverlisten

lib/_http_server.js

+13
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ const {
3030
RegExpPrototypeExec,
3131
ReflectApply,
3232
Symbol,
33+
SymbolAsyncDispose,
3334
SymbolFor,
3435
} = primordials;
3536

@@ -80,6 +81,7 @@ const {
8081
ERR_INVALID_CHAR,
8182
} = codes;
8283
const {
84+
createDeferredPromise,
8385
kEmptyObject,
8486
} = require('internal/util');
8587
const {
@@ -557,6 +559,17 @@ Server.prototype.close = function() {
557559
ReflectApply(net.Server.prototype.close, this, arguments);
558560
};
559561

562+
Server.prototype[SymbolAsyncDispose] = async function() {
563+
const { promise, reject, resolve } = createDeferredPromise();
564+
this.close((err) => {
565+
if (err) {
566+
reject(err);
567+
}
568+
resolve();
569+
});
570+
return promise;
571+
};
572+
560573
Server.prototype.closeAllConnections = function() {
561574
const connections = this[kConnections].all();
562575

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
'use strict';
2+
const common = require('../common');
3+
const assert = require('assert');
4+
const { createServer } = require('http');
5+
const { kConnectionsCheckingInterval } = require('_http_server');
6+
7+
const server = createServer();
8+
9+
server.listen(0, common.mustCall(() => {
10+
server.on('close', common.mustCall());
11+
server[Symbol.asyncDispose]().then(common.mustCall(() => {
12+
assert(server[kConnectionsCheckingInterval]._destroyed);
13+
}));
14+
}));

0 commit comments

Comments
 (0)