From 5ce3b6d7a4922b35536811071f33fd446f38548b Mon Sep 17 00:00:00 2001 From: Matteo Collina Date: Fri, 26 Oct 2018 12:24:16 +0200 Subject: [PATCH] stream: ended streams should resolve the async iteration Fixes: https://github.com/nodejs/node/issues/23891 PR-URL: https://github.com/nodejs/node/pull/23901 Reviewed-By: Colin Ihrig Reviewed-By: James M Snell --- lib/internal/streams/async_iterator.js | 5 ++++- .../test-stream-readable-async-iterators.js | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/lib/internal/streams/async_iterator.js b/lib/internal/streams/async_iterator.js index 25b393d21f1fcb..5d7f3f0fb424b7 100644 --- a/lib/internal/streams/async_iterator.js +++ b/lib/internal/streams/async_iterator.js @@ -127,7 +127,10 @@ const createReadableStreamAsyncIterator = (stream) => { [kLastResolve]: { value: null, writable: true }, [kLastReject]: { value: null, writable: true }, [kError]: { value: null, writable: true }, - [kEnded]: { value: false, writable: true }, + [kEnded]: { + value: stream._readableState.endEmitted, + writable: true + }, [kLastPromise]: { value: null, writable: true }, // the function passed to new Promise // is cached so we avoid allocating a new diff --git a/test/parallel/test-stream-readable-async-iterators.js b/test/parallel/test-stream-readable-async-iterators.js index ec558955c6ed18..a9431fab81654a 100644 --- a/test/parallel/test-stream-readable-async-iterators.js +++ b/test/parallel/test-stream-readable-async-iterators.js @@ -362,6 +362,24 @@ async function tests() { assert.strictEqual(e, err); } })(); + + await (async () => { + console.log('iterating on an ended stream completes'); + const r = new Readable({ + objectMode: true, + read() { + this.push('asdf'); + this.push('hehe'); + this.push(null); + } + }); + // eslint-disable-next-line no-unused-vars + for await (const a of r) { + } + // eslint-disable-next-line no-unused-vars + for await (const b of r) { + } + })(); } // to avoid missing some tests if a promise does not resolve