stream: make checking pendingcb on WritableStream backward compatible

jakecastelli · targos · commit 9297d29cdb01 · 2024-08-14T08:14:52.000+02:00
PR-URL: #54142 Fixes: #54131 Refs: #54131 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Robert Nagy <ronagy@icloud.com>
diff --git a/lib/internal/streams/end-of-stream.js b/lib/internal/streams/end-of-stream.js
@@ -214,7 +214,7 @@ function eos(stream, options, callback) {
 !readable &&
 (!willEmitClose || isReadable(stream)) &&
 (writableFinished || isWritable(stream) === false) &&
- (wState == null || wState.pendingcb === 0)
+ (wState == null || wState.pendingcb === undefined || wState.pendingcb === 0)
 ) {
 process.nextTick(onclosed);
 } else if (
diff --git a/test/parallel/test-stream-finished.js b/test/parallel/test-stream-finished.js
@@ -687,3 +687,16 @@ testClosed((opts) => new Writable({ write() {}, ...opts }));
 assert.strictEqual(stream._writableState.pendingcb, 0);
 }));
 }
+
+{
+ const stream = new Duplex({
+ write(chunk, enc, cb) {}
+ });
+
+ stream.end('foo');
+
+ // Simulate an old stream implementation that doesn't have pendingcb
+ delete stream._writableState.pendingcb;
+
+ finished(stream, { readable: false }, common.mustCall());
+}

-Original file line number
+Diff line change
 !readable&&
 (!willEmitClose||isReadable(stream))&&
 (writableFinished||isWritable(stream)===false)&&
 -(wState==null||wState.pendingcb===0)
 +(wState==null||wState.pendingcb===undefined||wState.pendingcb===0)
 ){
 process.nextTick(onclosed);
 }elseif(
-Original file line number
+Diff line change
 assert.strictEqual(stream._writableState.pendingcb,0);
 }));
+}
++
 +{
 +conststream=newDuplex({
 +write(chunk,enc,cb){}
 +});
++
 +stream.end('foo');
++
 +// Simulate an old stream implementation that doesn't have pendingcb
 +deletestream._writableState.pendingcb;
++
 +finished(stream,{readable: false},common.mustCall());
 +}