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, 19 insertions, 28 deletions

diff --git a/test/parallel/test-http2-single-headers.js b/test/parallel/test-http2-single-headers.js
index bb2f57cba1..c545b06501 100644
--- a/test/parallel/test-http2-single-headers.js
+++ b/test/parallel/test-http2-single-headers.js
@@ -26,35 +26,26 @@ server.on('stream', common.mustNotCall());
 server.listen(0, common.mustCall(() => {
   const client = http2.connect(`http://localhost:${server.address().port}`);
 
-  let remaining = singles.length * 2;
-  function maybeClose() {
-    if (--remaining === 0) {
-      server.close();
-      client.destroy();
-    }
-  }
-
   singles.forEach((i) => {
-    const req = client.request({
-      [i]: 'abc',
-      [i.toUpperCase()]: 'xyz'
-    });
-    req.on('error', common.expectsError({
-      code: 'ERR_HTTP2_HEADER_SINGLE_VALUE',
-      type: Error,
-      message: `Header field "${i}" must have only a single value`
-    }));
-    req.on('error', common.mustCall(maybeClose));
-
-    const req2 = client.request({
-      [i]: ['abc', 'xyz']
-    });
-    req2.on('error', common.expectsError({
-      code: 'ERR_HTTP2_HEADER_SINGLE_VALUE',
-      type: Error,
-      message: `Header field "${i}" must have only a single value`
-    }));
-    req2.on('error', common.mustCall(maybeClose));
+    common.expectsError(
+      () => client.request({ [i]: 'abc', [i.toUpperCase()]: 'xyz' }),
+      {
+        code: 'ERR_HTTP2_HEADER_SINGLE_VALUE',
+        type: Error,
+        message: `Header field "${i}" must have only a single value`
+      }
+    );
+
+    common.expectsError(
+      () => client.request({ [i]: ['abc', 'xyz'] }),
+      {
+        code: 'ERR_HTTP2_HEADER_SINGLE_VALUE',
+        type: Error,
+        message: `Header field "${i}" must have only a single value`
+      }
+    );
   });
 
+  server.close();
+  client.close();
 }));