stream: callback should be called when pendingcb is 0

jakecastelli · targos · commit b3372a8b0e90 · 2024-06-20T14:45:14.000+02:00
Fixes: #46170 PR-URL: #53438 Reviewed-By: Robert Nagy <ronagy@icloud.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
diff --git a/lib/internal/streams/end-of-stream.js b/lib/internal/streams/end-of-stream.js
@@ -213,7 +213,8 @@ function eos(stream, options, callback) {
   } else if (
     !readable &&
     (!willEmitClose || isReadable(stream)) &&
-    (writableFinished || isWritable(stream) === false)
+    (writableFinished || isWritable(stream) === false) &&
+    (wState == null || wState.pendingcb === 0)
   ) {
     process.nextTick(onclosed);
   } else if (
diff --git a/test/parallel/test-stream-finished.js b/test/parallel/test-stream-finished.js
@@ -669,15 +669,21 @@ testClosed((opts) => new Writable({ write() {}, ...opts }));
 }
 
 {
+  let isCalled = false;
   const stream = new Duplex({
     write(chunk, enc, cb) {
-      setImmediate(cb);
+      setImmediate(() => {
+        isCalled = true;
+        cb();
+      });
     }
   });
 
   stream.end('foo');
 
   finished(stream, { readable: false }, common.mustCall((err) => {
     assert(!err);
+    assert.strictEqual(isCalled, true);
+    assert.strictEqual(stream._writableState.pendingcb, 0);
   }));
 }

Original file line number	Diff line number	Diff line change
`@@ -669,15 +669,21 @@ testClosed((opts) => new Writable({ write() {}, ...opts }));`
`669`	`669`	`}`
`670`	`670`
`671`	`671`	`{`
	`672`	`+ let isCalled = false;`
`672`	`673`	`const stream = new Duplex({`
`673`	`674`	`write(chunk, enc, cb) {`
`674`		`- setImmediate(cb);`
	`675`	`+ setImmediate(() => {`
	`676`	`+ isCalled = true;`
	`677`	`+ cb();`
	`678`	`+ });`
`675`	`679`	`}`
`676`	`680`	`});`
`677`	`681`
`678`	`682`	`stream.end('foo');`
`679`	`683`
`680`	`684`	`finished(stream, { readable: false }, common.mustCall((err) => {`
`681`	`685`	`assert(!err);`
	`686`	`+ assert.strictEqual(isCalled, true);`
	`687`	`+ assert.strictEqual(stream._writableState.pendingcb, 0);`
`682`	`688`	`}));`
`683`	`689`	`}`