From c6900ddd0cacb59339ee3b11a91d5d7d9e55d421 Mon Sep 17 00:00:00 2001 From: Momtchil Momtchev Date: Sat, 24 Oct 2020 15:50:20 +0200 Subject: [PATCH] http2: centralise socket event binding in Http2Session Move the socket event binding to the HTTP2Session constructor so that an error event could be delivered should the constructor fail Ref: https://github.com/nodejs/node/pull/35772 PR-URL: https://github.com/nodejs/node/pull/35772 Fixes: https://github.com/nodejs/node/issues/35695 Reviewed-By: Matteo Collina Reviewed-By: Anna Henningsen Reviewed-By: Rich Trott Reviewed-By: James M Snell Reviewed-By: Ricky Zhou <0x19951125@gmail.com> --- lib/internal/http2/core.js | 11 ++--------- test/parallel/test-http2-client-jsstream-destroy.js | 6 +++--- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js index f69abc80a3c013..7260f59868e63a 100644 --- a/lib/internal/http2/core.js +++ b/lib/internal/http2/core.js @@ -1120,6 +1120,8 @@ class Http2Session extends EventEmitter { if (!socket._handle || !socket._handle.isStreamBase) { socket = new JSStreamSocket(socket); } + socket.on('error', socketOnError); + socket.on('close', socketOnClose); // No validation is performed on the input parameters because this // constructor is not exported directly for users. @@ -2887,9 +2889,6 @@ function connectionListener(socket) { return; } - socket.on('error', socketOnError); - socket.on('close', socketOnClose); - // Set up the Session const session = new ServerHttp2Session(options, socket, this); @@ -3100,12 +3099,6 @@ function connect(authority, options, listener) { const session = new ClientHttp2Session(options, socket); - // ClientHttp2Session may create a new socket object - // when socket is a JSSocket (socket != kSocket) - // https://github.com/nodejs/node/issues/35695 - session[kSocket].on('error', socketOnError); - session[kSocket].on('close', socketOnClose); - session[kAuthority] = `${options.servername || host}:${port}`; session[kProtocol] = protocol; diff --git a/test/parallel/test-http2-client-jsstream-destroy.js b/test/parallel/test-http2-client-jsstream-destroy.js index f2f0669170c4bc..f881eac47aa809 100644 --- a/test/parallel/test-http2-client-jsstream-destroy.js +++ b/test/parallel/test-http2-client-jsstream-destroy.js @@ -46,9 +46,9 @@ server.listen(0, common.mustCall(function() { }); const req = client.request(); - setTimeout(() => socket.destroy(), 200); - setTimeout(() => client.close(), 400); - setTimeout(() => server.close(), 600); + setTimeout(() => socket.destroy(), common.platformTimeout(100)); + setTimeout(() => client.close(), common.platformTimeout(200)); + setTimeout(() => server.close(), common.platformTimeout(300)); req.on('close', common.mustCall(() => { })); });