http2: client session destroy also destroys associated socket

Author: kjin

lib/internal/http2/core.js

@@ -435,7 +435,14 @@ class Http2Session extends EventEmitter {
  destroy() {
  const state = this[kState];
  const streams = state.streams;
+ const socket = this[kSocket];
+ if (state.destroyed) {
+ return;
+ }
  state.destroyed = true;
+ socket.destroy();
+ this[kSocket] = undefined;
+ this[kServer] = undefined;
  timers.unenroll(this);
  streams.forEach((value, key) => {
  value[kSession] = undefined;
@@ -955,12 +962,10 @@ Object.defineProperties(Http2Session.prototype, {
 // establishment of a new connection.
 function socketDestroy(error) {
  const session = this[kSession];
- session.destroy();
- session[kServer] = undefined;
- session[kSocket] = undefined;
  this[kServer] = undefined;
  this.destroy = this[kDestroySocket];
  this.destroy(error);
+ session.destroy();
 }
 
 function socketOnResume() {

test/parallel/test-http2-create-client-connect.js

@@ -28,7 +28,7 @@ const URL = url.URL;
  let count = items.length;
 
  const maybeClose = common.mustCall((client) => {
- client.socket.destroy();
+ client.destroy();
  if (--count === 0) {
  setImmediate(() => server.close());
  }

test/parallel/test-http2-create-client-session.js

@@ -47,7 +47,7 @@ server.on('listening', common.mustCall(function() {
  assert.strictEqual(body, data);
  if (--expected === 0) {
  server.close();
- client.socket.destroy();
+ client.destroy();
  }
  }));
  req.end();