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, 8 insertions, 7 deletions

diff --git a/test/parallel/test-http2-stream-destroy-event-order.js b/test/parallel/test-http2-stream-destroy-event-order.js
index c375bd80b3..e2732830ef 100644
--- a/test/parallel/test-http2-stream-destroy-event-order.js
+++ b/test/parallel/test-http2-stream-destroy-event-order.js
@@ -3,26 +3,27 @@
 const common = require('../common');
 if (!common.hasCrypto)
   common.skip('missing crypto');
-const assert = require('assert');
 const http2 = require('http2');
 
 let client;
 let req;
 const server = http2.createServer();
 server.on('stream', common.mustCall((stream) => {
-  stream.on('error', common.mustCall(() => {
-    stream.on('close', common.mustCall((code) => {
-      assert.strictEqual(code, 2);
-      client.destroy();
+  stream.on('close', common.mustCall(() => {
+    stream.on('error', common.mustCall(() => {
       server.close();
     }));
   }));
 
-  req.rstStream(2);
+  req.close(2);
 }));
 server.listen(0, common.mustCall(() => {
   client = http2.connect(`http://localhost:${server.address().port}`);
   req = client.request();
   req.resume();
-  req.on('error', common.mustCall());
+  req.on('close', common.mustCall(() => {
+    req.on('error', common.mustCall(() => {
+      client.close();
+    }));
+  }));
 }));