http2: cleanup Http2Stream/Http2Session destroy

PR-URL: https://github.com/nodejs/node/pull/17406
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>

This is a significant cleanup and refactoring of the
cleanup/close/destroy logic for Http2Stream and Http2Session.
There are significant changes here in the timing and ordering
of cleanup logic, JS apis. and various related necessary edits.

1 files changed, 7 insertions, 9 deletions

diff --git a/test/parallel/test-http2-multiplex.js b/test/parallel/test-http2-multiplex.js
index c818a28572..1778bced5f 100644
--- a/test/parallel/test-http2-multiplex.js
+++ b/test/parallel/test-http2-multiplex.js
@@ -8,6 +8,7 @@ if (!common.hasCrypto)
   common.skip('missing crypto');
 const assert = require('assert');
 const http2 = require('http2');
+const Countdown = require('../common/countdown');
 
 const server = http2.createServer();
 
@@ -20,15 +21,12 @@ server.on('stream', common.mustCall((stream) => {
 
 server.listen(0, common.mustCall(() => {
   const client = http2.connect(`http://localhost:${server.address().port}`);
+  client.setMaxListeners(100);
 
-  let remaining = count;
-
-  function maybeClose() {
-    if (--remaining === 0) {
-      server.close();
-      client.destroy();
-    }
-  }
+  const countdown = new Countdown(count, () => {
+    server.close();
+    client.close();
+  });
 
   function doRequest() {
     const req = client.request({ ':method': 'POST ' });
@@ -38,8 +36,8 @@ server.listen(0, common.mustCall(() => {
     req.on('data', (chunk) => data += chunk);
     req.on('end', common.mustCall(() => {
       assert.strictEqual(data, 'abcdefghij');
-      maybeClose();
     }));
+    req.on('close', common.mustCall(() => countdown.dec()));
 
     let n = 0;
     function writeChunk() {