GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — stream: avoid premature close when will not emit close · nodejs/node@ac9a4ab

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

+16-4Lines changed: 16 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,18 @@ function eos(stream, options, callback) {`
`151`	`151`	`callback.call(stream);`
`152`	`152`	`};`
`153`	`153`
	`154`	`+ const onclosed = () => {`
	`155`	`+ closed = true;`
	`156`	`+`
	`157`	`+ const errored = isWritableErrored(stream) \|\| isReadableErrored(stream);`
	`158`	`+`
	`159`	`+ if (errored && typeof errored !== 'boolean') {`
	`160`	`+ return callback.call(stream, errored);`
	`161`	`+ }`
	`162`	`+`
	`163`	`+ callback.call(stream);`
	`164`	`+ };`
	`165`	`+`
`154`	`166`	`const onrequest = () => {`
`155`	`167`	`stream.req.on('finish', onfinish);`
`156`	`168`	`};`
`@@ -186,22 +198,22 @@ function eos(stream, options, callback) {`
`186`	`198`	`process.nextTick(onclose);`
`187`	`199`	`} else if (wState?.errorEmitted \|\| rState?.errorEmitted) {`
`188`	`200`	`if (!willEmitClose) {`
`189`		`- process.nextTick(onclose);`
	`201`	`+ process.nextTick(onclosed);`
`190`	`202`	`}`
`191`	`203`	`} else if (`
`192`	`204`	`!readable &&`
`193`	`205`	`(!willEmitClose \|\| isReadable(stream)) &&`
`194`	`206`	`(writableFinished \|\| isWritable(stream) === false)`
`195`	`207`	`) {`
`196`		`- process.nextTick(onclose);`
	`208`	`+ process.nextTick(onclosed);`
`197`	`209`	`} else if (`
`198`	`210`	`!writable &&`
`199`	`211`	`(!willEmitClose \|\| isWritable(stream)) &&`
`200`	`212`	`(readableFinished \|\| isReadable(stream) === false)`
`201`	`213`	`) {`
`202`		`- process.nextTick(onclose);`
	`214`	`+ process.nextTick(onclosed);`
`203`	`215`	`} else if ((rState && stream.req && stream.aborted)) {`
`204`		`- process.nextTick(onclose);`
	`216`	`+ process.nextTick(onclosed);`
`205`	`217`	`}`
`206`	`218`
`207`	`219`	`const cleanup = () => {`

Collapse file

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

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

+14Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -667,3 +667,17 @@ testClosed((opts) => new Writable({ write() {}, ...opts }));`
`667`	`667`	`).end();`
`668`	`668`	`});`
`669`	`669`	`}`
	`670`	`+`
	`671`	`+{`
	`672`	`+ const stream = new Duplex({`
	`673`	`+ write(chunk, enc, cb) {`
	`674`	`+ setImmediate(cb);`
	`675`	`+ }`
	`676`	`+ });`
	`677`	`+`
	`678`	`+ stream.end('foo');`
	`679`	`+`
	`680`	`+ finished(stream, { readable: false }, common.mustCall((err) => {`
	`681`	`+ assert(!err);`
	`682`	`+ }));`
	`683`	`+}`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.