fgixup

nodejs · Nov 25, 2021 · 917fb2a · 917fb2a
1 parent bab2cd5
commit 917fb2a
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/lib/internal/streams/pipeline.js b/lib/internal/streams/pipeline.js
@@ -84,9 +84,7 @@ async function* fromReadable(val) {
   yield* Readable.prototype[SymbolAsyncIterator].call(val);
 }
 
-async function pump(iterable, writable, finish, opts) {
-  const end = opts?.end !== false;
-
+async function pump(iterable, writable, finish, { end }) {
   let error;
   let onresolve = null;
 
@@ -208,11 +206,10 @@ function pipelineImpl(streams, callback, opts) {
     const writing = i > 0;
     const end = reading || opts?.end !== false;
 
-    if (isNodeStream(stream) && end) {
-      destroys.push(destroyer(stream, reading, writing));
-    }
-
     if (isNodeStream(stream)) {
+      if (end) {
+        destroys.push(destroyer(stream, reading, writing));
+      }
       eos(stream, { readable: reading, writable: writing }, (err) => {
         if (err && err.name !== 'AbortError' && err.code !== 'ERR_STREAM_PREMATURE_CLOSE') {
           finish(err);
@@ -310,9 +307,7 @@ function pipelineImpl(streams, callback, opts) {
   return ret;
 }
 
-function pipe(src, dst, finish, opts) {
-  const end = opts?.end !== false;
-
+function pipe(src, dst, finish, { end }) {
   src.pipe(dst, { end })
 
   if (end) {