stream: prevent pipeline hang with generator functions

Fixes: nodejs#47708 PR-URL: nodejs#47712 Reviewed-By: Robert Nagy <ronagy@icloud.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Feng Yu <F3n67u@outlook.com>
yjl9903 · Apr 29, 2023 · f917263 · f917263
1 parent e6c98a5
commit f917263
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/lib/internal/streams/pipeline.js b/lib/internal/streams/pipeline.js
@@ -138,10 +138,9 @@ async function pumpToNode(iterable, writable, finish, { end }) {
 
     if (end) {
       writable.end();
+      await wait();
     }
 
-    await wait();
-
     finish();
   } catch (err) {
     finish(error !== err ? aggregateTwoErrors(error, err) : err);

diff --git a/test/parallel/test-stream-pipeline.js b/test/parallel/test-stream-pipeline.js
@@ -1616,3 +1616,21 @@ const tsp = require('timers/promises');
   dup.push(null);
   dup.read();
 }
+
+{
+  let res = '';
+  const writable = new Writable({
+    write(chunk, enc, cb) {
+      res += chunk;
+      cb();
+    }
+  });
+  pipelinep(async function*() {
+    yield 'hello';
+    await Promise.resolve();
+    yield 'world';
+  }, writable, { end: false }).then(common.mustCall(() => {
+    assert.strictEqual(res, 'helloworld');
+    assert.strictEqual(writable.closed, false);
+  }));
+}