Skip to content
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.

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

stream: async iterator improvements #31316

Closed
wants to merge 5 commits into from
Closed
Changes from 1 commit
Commits
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
stream: implement throw for async iterator
ronag committed Jan 18, 2020
commit 0620728a9a53b0daf1b068a0cdc41ecfe200d8c4
49 changes: 29 additions & 20 deletions lib/internal/streams/async_iterator.js
Original file line number Diff line number Diff line change
@@ -71,6 +71,31 @@ function wrapForNext(lastPromise, iter) {
const AsyncIteratorPrototype = ObjectGetPrototypeOf(
ObjectGetPrototypeOf(async function* () {}).prototype);

function finish(self, err) {
return new Promise((resolve, reject) => {
const stream = self[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);
} else {
resolve(createIterResult(undefined, true));
}
});
destroy(stream, err);
});
}

const ReadableStreamAsyncIteratorPrototype = ObjectSetPrototypeOf({
get stream() {
return this[kStream];
@@ -131,27 +156,11 @@ const ReadableStreamAsyncIteratorPrototype = ObjectSetPrototypeOf({
},

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;
}
return finish(this);
},

finished(stream, (err) => {
if (err && err.code !== 'ERR_STREAM_PREMATURE_CLOSE') {
reject(err);
} else {
resolve(createIterResult(undefined, true));
}
});
destroy(stream);
});
throw(err) {
return finish(this, err);
},
}, AsyncIteratorPrototype);

22 changes: 22 additions & 0 deletions test/parallel/test-stream-readable-async-iterators.js
Original file line number Diff line number Diff line change
@@ -282,6 +282,28 @@ async function tests() {
assert.strictEqual(received, 1);
}

{
// Iterator throw.

const readable = new Readable({
objectMode: true,
read() {
this.push('hello');
}
});

readable.on('error', common.mustCall((err) => {
assert.strictEqual(err.message, 'kaboom');
}));

const it = readable[Symbol.asyncIterator]();
it.throw(new Error('kaboom')).catch(common.mustCall((err) => {
assert.strictEqual(err.message, 'kaboom');
}));

assert.strictEqual(readable.destroyed, true);
}

{
console.log('destroyed by throw');
const readable = new Readable({