stream: always emit error before close

PR-URL: https://github.com/nodejs/node/pull/19836
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

1 files changed, 9 insertions, 2 deletions

diff --git a/lib/internal/streams/destroy.js b/lib/internal/streams/destroy.js
index 5d29e18204..3a0383cc3c 100644
--- 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;