stream: fix finished regression when working with legacy Stream

mcollina · mcollina · commit fe41a9dd6bb9 · 2021-11-18T17:41:53.000+01:00
Signed-off-by: Matteo Collina &lt;hello@matteocollina.com&gt;
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,11 @@ testClosed((opts) => new Writable({ write() {}, ...opts }));
     }));
   }));
 }
+
+{
+  // Legacy Streams do not inherit from Readable or Writable.
+  // We cannot really assume anything about them, so we cannot close them
+  // automatically.
+  const s = new Stream();
+  finished(s, common.mustNotCall());
+}
