Skip to content

stream: fix handling generators in Readable.from #32844

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
vadzim wants to merge 11 commits into from
+229 −1
Closed

stream: fix handling generators in Readable.from #32844

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2fa5848
stream: close iterator in Readable.from
vadzim Apr 14, 2020
980a7c8
fixup: explicit `yielded` event in closeStreamWhileNextIsPending
vadzim Apr 15, 2020
b772927
fixup: test fot iterator closing after null has been yielded
vadzim Apr 15, 2020
57bb126
fixup: escape unhandled rejected promise
vadzim Apr 15, 2020
8a2974f
fixup: test for closing iterator on yielded null
vadzim Apr 15, 2020
8528ad4
fixup: fix variable name
vadzim Apr 15, 2020
e821b98
fixup: run callback with process.nextTick
vadzim Apr 15, 2020
e9becca
remove unnesessary closure
vadzim Apr 15, 2020
509be2c
fixup: do not doublecheck needToClose flag
vadzim Apr 15, 2020
7aac752
fixup: make _destroy not async
vadzim Apr 16, 2020
bffbf58
fixup: trigger build
vadzim Apr 17, 2020
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: make _destroy not async
  • Loading branch information
@vadzim
vadzim committed Apr 16, 2020
commit 7aac752bdbf39d23bd6a5d4448802fa37f7e6936
19 changes: 9 additions & 10 deletions lib/internal/streams/from.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,15 @@ function from(Readable, iterable, opts) {
}
};

readable._destroy = async function(error, cb) {
try {
if (needToClose) {
needToClose = false;
await close();
}
} catch (e) {
error = error || e;
} finally {
process.nextTick(cb, error);
readable._destroy = function(error, cb) {
if (needToClose) {
needToClose = false;
close().then(
() => process.nextTick(cb, error),
(e) => process.nextTick(cb, error || e),
);
} else {
cb(error);
Comment thread
ronag marked this conversation as resolved.
}
};
Comment thread
vadzim marked this conversation as resolved.

Expand Down