fixup

nodejs · Nov 19, 2021 · 6d65966 · 6d65966
1 parent 6fbe14d
commit 6d65966
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/lib/internal/streams/destroy.js b/lib/internal/streams/destroy.js
@@ -326,12 +326,12 @@ function emitErrorCloseLegacy(stream, err) {
 }
 
 // Normalize destroy for legacy.
-function destroyer(stream, err) {
+function destroyer(stream, err, options) {
   if (!stream || isDestroyed(stream)) {
     return;
   }
 
-  if (!err && !isFinished(stream)) {
+  if (!err && !isFinished(stream) && options?.autoAbort !== false) {
     err = new AbortError();
   }
 

diff --git a/lib/internal/streams/readable.js b/lib/internal/streams/readable.js
@@ -1150,7 +1150,9 @@ async function* createAsyncIterator(stream, options) {
       (error || options?.destroyOnReturn !== false) &&
       (error === undefined || stream._readableState.autoDestroy)
     ) {
-      destroyImpl.destroyer(stream, null);
+      destroyImpl.destroyer(stream, null, {
+        autoAbort: false
+      });
     }
   }
 }

diff --git a/test/parallel/test-stream-pipeline.js b/test/parallel/test-stream-pipeline.js
@@ -764,21 +764,21 @@ const tsp = require('timers/promises');
   }));
 }
 
-// {
-//   const s = new PassThrough();
-//   pipeline(async function*() {
-//     await Promise.resolve();
-//     yield 'hello';
-//     yield 'world';
-//   }, s, async function(source) {
-//     for await (const chunk of source) {
-//       throw new Error('kaboom');
-//     }
-//   }, common.mustCall((err, val) => {
-//     assert.strictEqual(err.message, 'kaboom');
-//     assert.strictEqual(s.destroyed, true);
-//   }));
-// }
+{
+  const s = new PassThrough();
+  pipeline(async function*() {
+    await Promise.resolve();
+    yield 'hello';
+    yield 'world';
+  }, s, async function(source) {
+    for await (const chunk of source) {
+      throw new Error('kaboom');
+    }
+  }, common.mustCall((err, val) => {
+    assert.strictEqual(err.message, 'kaboom');
+    assert.strictEqual(s.destroyed, true);
+  }));
+}
 
 {
   const s = new PassThrough();