Skip to content

stream: eos on closed #28748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ronag wants to merge 12 commits into from
Closed

stream: eos on closed #28748

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
820074e
stream: eos on closed
ronag Jul 18, 2019
729cd05
fixup: check ended and finished
ronag Aug 27, 2019
e662280
fixup: http response doesn't have destroyed, use aborted instead
ronag Aug 27, 2019
3ec6ecc
fixup: tests
ronag Aug 28, 2019
27a9624
fixup: more tests
ronag Aug 28, 2019
5641590
fixup: merge #28720
ronag Sep 1, 2019
41a692a
fixup: sligthly simplify and add more tests
ronag Sep 1, 2019
3be0454
fixup: test descriptions
ronag Sep 1, 2019
53c04a3
fixup: linting
ronag Sep 1, 2019
e8284ec
fixup: merge duplicate test files
ronag Sep 1, 2019
a4542b7
fixup: comments styling
ronag Sep 1, 2019
9b5a84e
fixup: typo when merging tests
ronag Sep 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup: check ended and finished
  • Loading branch information
@ronag
ronag committed Sep 2, 2019
commit 729cd0525060e395caa5eb60381b53c3bfed53eb
10 changes: 0 additions & 10 deletions lib/internal/streams/async_iterator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,6 @@ const ReadableStreamAsyncIteratorPrototype = Object.setPrototypeOf({
return() {
return new Promise((resolve, reject) => {
const stream = this[kStream];

// TODO(ronag): Remove this check once finished() handles
// already ended and/or destroyed streams.
const ended = stream.destroyed || stream.readableEnded ||
(stream._readableState && stream._readableState.endEmitted);
if (ended) {
resolve(createIterResult(undefined, true));
return;
}

finished(stream, (err) => {
if (err && err.code !== 'ERR_STREAM_PREMATURE_CLOSE') {
reject(err);
Expand Down
16 changes: 9 additions & 7 deletions lib/internal/streams/end-of-stream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,14 @@ function eos(stream, opts, callback) {
callback.call(stream, err);
};

if (stream.destroyed) {
// destroy(err) emits error in nextTick.
let writableFinished = stream.writableFinished ||
(stream._writableState && stream._writableState.finished);
let readableEnded = stream.readableEnded ||
(stream._readableState && stream._readableState.endEmitted);

if (writableFinished || readableEnded || stream.destroyed) {
if (opts.error !== false) stream.on('error', onerror);
// A destroy(err) call emits error in nextTick.
process.nextTick(callback.bind(stream));
Comment thread
ronag marked this conversation as resolved.
Outdated
return () => {
stream.removeListener('error', onerror);
Expand All @@ -48,15 +53,12 @@ function eos(stream, opts, callback) {
if (!stream.writable) onfinish();
};

var writableEnded = stream._writableState && stream._writableState.finished;
const onfinish = () => {
writable = false;
writableEnded = true;
writableFinished = true;
if (!readable) callback.call(stream);
};

var readableEnded = stream.readableEnded ||
(stream._readableState && stream._readableState.endEmitted);
const onend = () => {
readable = false;
readableEnded = true;
Expand All @@ -70,7 +72,7 @@ function eos(stream, opts, callback) {
err = new ERR_STREAM_PREMATURE_CLOSE();
return callback.call(stream, err);
}
if (writable && !writableEnded) {
if (writable && !writableFinished) {
if (!stream._writableState || !stream._writableState.ended)
err = new ERR_STREAM_PREMATURE_CLOSE();
return callback.call(stream, err);
Expand Down