http2: do not register unnecessary listeners
PR-URL: https://github.com/nodejs/node/pull/27987 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
parent
269c1d69c9
commit
bcf11356b3
@ -160,6 +160,7 @@ const kLocalSettings = Symbol('local-settings');
|
|||||||
const kOptions = Symbol('options');
|
const kOptions = Symbol('options');
|
||||||
const kOwner = owner_symbol;
|
const kOwner = owner_symbol;
|
||||||
const kOrigin = Symbol('origin');
|
const kOrigin = Symbol('origin');
|
||||||
|
const kPendingRequestCalls = Symbol('kPendingRequestCalls');
|
||||||
const kProceed = Symbol('proceed');
|
const kProceed = Symbol('proceed');
|
||||||
const kProtocol = Symbol('protocol');
|
const kProtocol = Symbol('protocol');
|
||||||
const kRemoteSettings = Symbol('remote-settings');
|
const kRemoteSettings = Symbol('remote-settings');
|
||||||
@ -1413,6 +1414,7 @@ class ServerHttp2Session extends Http2Session {
|
|||||||
class ClientHttp2Session extends Http2Session {
|
class ClientHttp2Session extends Http2Session {
|
||||||
constructor(options, socket) {
|
constructor(options, socket) {
|
||||||
super(NGHTTP2_SESSION_CLIENT, options, socket);
|
super(NGHTTP2_SESSION_CLIENT, options, socket);
|
||||||
|
this[kPendingRequestCalls] = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Submits a new HTTP2 request to the connected peer. Returns the
|
// Submits a new HTTP2 request to the connected peer. Returns the
|
||||||
@ -1482,7 +1484,15 @@ class ClientHttp2Session extends Http2Session {
|
|||||||
|
|
||||||
const onConnect = requestOnConnect.bind(stream, headersList, options);
|
const onConnect = requestOnConnect.bind(stream, headersList, options);
|
||||||
if (this.connecting) {
|
if (this.connecting) {
|
||||||
this.once('connect', onConnect);
|
if (this[kPendingRequestCalls] !== null) {
|
||||||
|
this[kPendingRequestCalls].push(onConnect);
|
||||||
|
} else {
|
||||||
|
this[kPendingRequestCalls] = [onConnect];
|
||||||
|
this.once('connect', () => {
|
||||||
|
this[kPendingRequestCalls].forEach((f) => f());
|
||||||
|
this[kPendingRequestCalls] = null;
|
||||||
|
});
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
onConnect();
|
onConnect();
|
||||||
}
|
}
|
||||||
|
41
test/parallel/test-http2-client-request-listeners-warning.js
Normal file
41
test/parallel/test-http2-client-request-listeners-warning.js
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
'use strict';
|
||||||
|
const common = require('../common');
|
||||||
|
if (!common.hasCrypto)
|
||||||
|
common.skip('missing crypto');
|
||||||
|
const http2 = require('http2');
|
||||||
|
const EventEmitter = require('events');
|
||||||
|
|
||||||
|
// This test ensures that a MaxListenersExceededWarning isn't emitted if
|
||||||
|
// more than EventEmitter.defaultMaxListeners requests are started on a
|
||||||
|
// ClientHttp2Session before it has finished connecting.
|
||||||
|
|
||||||
|
process.on('warning', common.mustNotCall('A warning was emitted'));
|
||||||
|
|
||||||
|
const server = http2.createServer();
|
||||||
|
server.on('stream', (stream) => {
|
||||||
|
stream.respond();
|
||||||
|
stream.end();
|
||||||
|
});
|
||||||
|
|
||||||
|
server.listen(common.mustCall(() => {
|
||||||
|
const client = http2.connect(`http://localhost:${server.address().port}`);
|
||||||
|
|
||||||
|
function request() {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
const stream = client.request();
|
||||||
|
stream.on('error', reject);
|
||||||
|
stream.on('response', resolve);
|
||||||
|
stream.end();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const requests = [];
|
||||||
|
for (let i = 0; i < EventEmitter.defaultMaxListeners + 1; i++) {
|
||||||
|
requests.push(request());
|
||||||
|
}
|
||||||
|
|
||||||
|
Promise.all(requests).then(common.mustCall()).finally(common.mustCall(() => {
|
||||||
|
server.close();
|
||||||
|
client.close();
|
||||||
|
}));
|
||||||
|
}));
|
Loading…
x
Reference in New Issue
Block a user