stream: fix finished regression when working with legacy Stream · nodejs/node@534409d · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 633
• Pull requests 759
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 534409d

Browse filesBrowse the repository at this point in the historyBrowse files

mcollina

authored and

targos

committed

stream: fix finished regression when working with legacy Stream

Signed-off-by: Matteo Collina <hello@matteocollina.com> PR-URL: #40858 Reviewed-By: Robert Nagy <ronagy@icloud.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>

1 parent 90f35fc commit 534409d
Copy full SHA for 534409d

2 files changed

+12-3Lines changed: 12 additions & 3 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib/internal/streams
  • end-of-stream.js
• test/parallel
  • test-stream-finished.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/internal/streams/end-of-stream.js‎

Copy file name to clipboardExpand all lines: lib/internal/streams/end-of-stream.js

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -165,13 +165,13 @@ function eos(stream, options, callback) {
165	165	} else if (
166	166	!readable &&
167	167	(!willEmitClose || isReadable(stream)) &&
168		- (writableFinished || !isWritable(stream))
	168	+ (writableFinished || isWritable(stream) === false)
169	169	) {
170	170	process.nextTick(onclose);
171	171	} else if (
172	172	!writable &&
173	173	(!willEmitClose || isWritable(stream)) &&
174		- (readableFinished || !isReadable(stream))
	174	+ (readableFinished || isReadable(stream) === false)
175	175	) {
176	176	process.nextTick(onclose);
177	177	} else if ((rState && stream.req && stream.aborted)) {

Collapse file

‎test/parallel/test-stream-finished.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-stream-finished.js

+10-1Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -7,7 +7,8 @@ const {
7	7	Transform,
8	8	finished,
9	9	Duplex,
10		- PassThrough
	10	+ PassThrough,
	11	+ Stream,
11	12	} = require('stream');
12	13	const assert = require('assert');
13	14	const EE = require('events');
@@ -630,3 +631,11 @@ testClosed((opts) => new Writable({ write() {}, ...opts }));
630	631	}));
631	632	}));
632	633	}
	634	+
	635	+ {
	636	+ // Legacy Streams do not inherit from Readable or Writable.
	637	+ // We cannot really assume anything about them, so we cannot close them
	638	+ // automatically.
	639	+ const s = new Stream();
	640	+ finished(s, common.mustNotCall());
	641	+ }

0 commit comments

Comments

0 (0)