stream: fix finished regression when working with legacy Stream

nodejs · Nov 18, 2021 · ab9104f · ab9104f
1 parent d6c3a10
commit ab9104f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/internal/streams/end-of-stream.js b/lib/internal/streams/end-of-stream.js
@@ -171,7 +171,7 @@ function eos(stream, options, callback) {
   } else if (
     !writable &&
     (!willEmitClose || isWritable(stream)) &&
-    (readableFinished || !isReadable(stream))
+    (readableFinished || !isReadableNodeStream(stream))
   ) {
     process.nextTick(onclose);
   } else if ((rState && stream.req && stream.aborted)) {

diff --git a/test/parallel/test-stream-finished.js b/test/parallel/test-stream-finished.js
@@ -7,7 +7,8 @@ const {
   Transform,
   finished,
   Duplex,
-  PassThrough
+  PassThrough,
+  Stream
 } = require('stream');
 const assert = require('assert');
 const EE = require('events');
@@ -630,3 +631,9 @@ testClosed((opts) => new Writable({ write() {}, ...opts }));
     }));
   }));
 }
+
+{
+  // This case is needed to support the send module
+  const s = new Stream();
+  finished(s, common.mustNotCall());
+}