Skip to content

Commit 7577fd8

Browse files
committed
https: Server add asyncDispose
1 parent bb04854 commit 7577fd8

File tree

3 files changed

+38
-0
lines changed

3 files changed

+38
-0
lines changed

doc/api/https.md

+13
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,18 @@ added: v0.1.90
135135

136136
See [`server.close()`][] in the `node:http` module.
137137

138+
139+
### `server[Symbol.asyncDispose]()`
140+
141+
<!-- YAML
142+
added: REPLACEME
143+
-->
144+
145+
> Stability: 1 - Experimental
146+
147+
Calls [`server.close()`][httpsServerClose] and returns a promise that fulfills when the
148+
server has closed.
149+
138150
### `server.closeAllConnections()`
139151

140152
<!-- YAML
@@ -571,4 +583,5 @@ headers: max-age=0; pin-sha256="WoiWRyIOVNa9ihaBciRSC7XHjliYS9VwUGOIud4PB18="; p
571583
[`tls.connect()`]: tls.md#tlsconnectoptions-callback
572584
[`tls.createSecureContext()`]: tls.md#tlscreatesecurecontextoptions
573585
[`tls.createServer()`]: tls.md#tlscreateserveroptions-secureconnectionlistener
586+
[httpsServerClose]: serverclosecallback
574587
[sni wiki]: https://en.wikipedia.org/wiki/Server_Name_Indication

lib/https.js

+6
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,13 @@ const {
3333
ObjectSetPrototypeOf,
3434
ReflectApply,
3535
ReflectConstruct,
36+
SymbolAsyncDispose,
3637
} = primordials;
3738

3839
const {
3940
assertCrypto,
4041
kEmptyObject,
42+
promisify,
4143
} = require('internal/util');
4244
assertCrypto();
4345

@@ -110,6 +112,10 @@ Server.prototype.close = function() {
110112
ReflectApply(tls.Server.prototype.close, this, arguments);
111113
};
112114

115+
Server.prototype[SymbolAsyncDispose] = async function() {
116+
return promisify(this.close).call(this);
117+
};
118+
113119
/**
114120
* Creates a new `https.Server` instance.
115121
* @param {{
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
'use strict';
2+
3+
const common = require('../common');
4+
5+
if (!common.hasCrypto)
6+
common.skip('missing crypto');
7+
8+
const assert = require('assert');
9+
const { createServer } = require('https');
10+
const { kConnectionsCheckingInterval } = require('_http_server');
11+
12+
const server = createServer();
13+
14+
server.listen(0, common.mustCall(() => {
15+
server.on('close', common.mustCall());
16+
server[Symbol.asyncDispose]().then(common.mustCall(() => {
17+
assert(server[kConnectionsCheckingInterval]._destroyed);
18+
}));
19+
}));

0 commit comments

Comments
 (0)