stream: always emit error before close

nodejs · Apr 6, 2018 · dfd2f30 · dfd2f30
1 parent 67bc5fe
commit dfd2f30
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/lib/internal/streams/destroy.js b/lib/internal/streams/destroy.js
@@ -30,20 +30,27 @@ function destroy(err, cb) {
   }
 
   this._destroy(err || null, (err) => {
-    process.nextTick(emitCloseNT, this);
     if (!cb && err) {
-      process.nextTick(emitErrorNT, this, err);
+      process.nextTick(emitErrorAndCloseNT, this, err);
       if (this._writableState) {
         this._writableState.errorEmitted = true;
       }
     } else if (cb) {
+      process.nextTick(emitCloseNT, this);
       cb(err);
+    } else {
+      process.nextTick(emitCloseNT, this);
     }
   });
 
   return this;
 }
 
+function emitErrorAndCloseNT(self, err) {
+  emitErrorNT(self, err);
+  emitCloseNT(self);
+}
+
 function emitCloseNT(self) {
   if (self._writableState && !self._writableState.emitClose)
     return;

diff --git a/test/parallel/test-http2-stream-destroy-event-order.js b/test/parallel/test-http2-stream-destroy-event-order.js
@@ -9,8 +9,8 @@ let client;
 let req;
 const server = http2.createServer();
 server.on('stream', common.mustCall((stream) => {
-  stream.on('close', common.mustCall(() => {
-    stream.on('error', common.mustCall(() => {
+  stream.on('error', common.mustCall(() => {
+    stream.on('close', common.mustCall(() => {
       server.close();
     }));
   }));
@@ -21,8 +21,8 @@ server.listen(0, common.mustCall(() => {
   client = http2.connect(`http://localhost:${server.address().port}`);
   req = client.request();
   req.resume();
-  req.on('close', common.mustCall(() => {
-    req.on('error', common.mustCall(() => {
+  req.on('error', common.mustCall(() => {
+    req.on('close', common.mustCall(() => {
       client.close();
     }));
   }));