[fix] Call the _final() callback before destroying the stream

Ensure that `'finish'` event is emitted. Refs: nodejs/node#32780
th37rose · Apr 22, 2020 · 41f04dd · 41f04dd
1 parent 60e0679
commit 41f04dd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/lib/stream.js b/lib/stream.js
@@ -125,8 +125,8 @@ function createWebSocketStream(ws, options) {
     if (ws._socket === null) return;
 
     if (ws._socket._writableState.finished) {
-      if (duplex._readableState.endEmitted) duplex.destroy();
       callback();
+      if (duplex._readableState.endEmitted) duplex.destroy();
     } else {
       ws._socket.once('finish', function finish() {
         // `duplex` is not destroyed here because the `'end'` event will be

diff --git a/test/create-websocket-stream.test.js b/test/create-websocket-stream.test.js
@@ -354,7 +354,6 @@ describe('createWebSocketStream', () => {
 
         duplex.on('finish', () => {
           events.push('finish');
-          assert.ok(duplex.destroyed);
         });
 
         duplex.resume();