http2: emit 'aborted' events instead of 'sessionError'

Fixes: nodejs#28267
rexagod · Apr 22, 2020 · ca0b8c5 · ca0b8c5
1 parent c355430
commit ca0b8c5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 28 deletions.
diff --git a/doc/api/http2.md b/doc/api/http2.md
@@ -1710,14 +1710,6 @@ added: v8.4.0
 The `'session'` event is emitted when a new `Http2Session` is created by the
 `Http2Server`.
 
-#### Event: `'sessionError'`
-<!-- YAML
-added: v8.4.0
--->
-
-The `'sessionError'` event is emitted when an `'error'` event is emitted by
-an `Http2Session` object associated with the `Http2Server`.
-
 #### Event: `'stream'`
 <!-- YAML
 added: v8.4.0
@@ -1871,14 +1863,6 @@ added: v8.4.0
 The `'session'` event is emitted when a new `Http2Session` is created by the
 `Http2SecureServer`.
 
-#### Event: `'sessionError'`
-<!-- YAML
-added: v8.4.0
--->
-
-The `'sessionError'` event is emitted when an `'error'` event is emitted by
-an `Http2Session` object associated with the `Http2SecureServer`.
-
 #### Event: `'stream'`
 <!-- YAML
 added: v8.4.0

diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
@@ -2794,7 +2794,7 @@ function sessionOnPriority(stream, parent, weight, exclusive) {
 
 function sessionOnError(error) {
   if (this[kServer] !== undefined)
-    this[kServer].emit('sessionError', error, this);
+    this[kServer].emit('aborted', error, this);
 }
 
 // When the session times out on the server, try emitting a timeout event.

diff --git a/test/parallel/test-http2-client-destroy.js b/test/parallel/test-http2-client-destroy.js
@@ -70,27 +70,27 @@ const Countdown = require('../common/countdown');
 
     req.on('response', common.mustNotCall());
 
-    const sessionError = {
+    const aborted = {
       name: 'Error',
       code: 'ERR_HTTP2_INVALID_SESSION',
       message: 'The session has been destroyed'
     };
 
-    assert.throws(() => client.setNextStreamID(), sessionError);
-    assert.throws(() => client.ping(), sessionError);
-    assert.throws(() => client.settings({}), sessionError);
-    assert.throws(() => client.goaway(), sessionError);
-    assert.throws(() => client.request(), sessionError);
+    assert.throws(() => client.setNextStreamID(), aborted);
+    assert.throws(() => client.ping(), aborted);
+    assert.throws(() => client.settings({}), aborted);
+    assert.throws(() => client.goaway(), aborted);
+    assert.throws(() => client.request(), aborted);
     client.close();  // Should be a non-op at this point
 
     // Wait for setImmediate call from destroy() to complete
     // so that state.destroyed is set to true
     setImmediate(() => {
-      assert.throws(() => client.setNextStreamID(), sessionError);
-      assert.throws(() => client.ping(), sessionError);
-      assert.throws(() => client.settings({}), sessionError);
-      assert.throws(() => client.goaway(), sessionError);
-      assert.throws(() => client.request(), sessionError);
+      assert.throws(() => client.setNextStreamID(), aborted);
+      assert.throws(() => client.ping(), aborted);
+      assert.throws(() => client.settings({}), aborted);
+      assert.throws(() => client.goaway(), aborted);
+      assert.throws(() => client.request(), aborted);
       client.close();  // Should be a non-op at this point
     });