stream: fix error handling with async iteration

julien-f · MylesBorins · commit 05b7b8d50659 · 2018-05-04T11:54:32.000-04:00
Fix an issue when an error was emitted by the stream before `iterator.next()` is called. PR-URL: #20329 Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
diff --git a/lib/internal/streams/async_iterator.js b/lib/internal/streams/async_iterator.js
@@ -58,7 +58,7 @@ function onError(iter, err) {
 iter[kLastReject] = null;
 reject(err);
 }
- iter.error = err;
+ iter[kError] = err;
 }
 
 function wrapForNext(lastPromise, iter) {
diff --git a/test/parallel/test-stream-readable-async-iterators.js b/test/parallel/test-stream-readable-async-iterators.js
@@ -115,6 +115,18 @@ async function tests() {
 readable.destroy(new Error('kaboom'));
 })();
 
+ await (async function() {
+ console.log('call next() after error');
+ const readable = new Readable({
+ read() {}
+ });
+ const iterator = readable[Symbol.asyncIterator]();
+
+ const err = new Error('kaboom');
+ readable.destroy(new Error('kaboom'));
+ await assert.rejects(iterator.next.bind(iterator), err);
+ })();
+
 await (async function() {
 console.log('read object mode');
 const max = 42;

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ function onError(iter, err) {`
`58`	`58`	`iter[kLastReject]=null;`
`59`	`59`	`reject(err);`
`60`	`60`	`}`
`61`		`-iter.error=err;`
	`61`	`+iter[kError]=err;`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`functionwrapForNext(lastPromise,iter){`
-Original file line number
+Diff line change
 readable.destroy(newError('kaboom'));
 })();
 +await(asyncfunction(){
 +console.log('call next() after error');
 +constreadable=newReadable({
 +read(){}
 +});
 +constiterator=readable[Symbol.asyncIterator]();
++
 +consterr=newError('kaboom');
 +readable.destroy(newError('kaboom'));
 +awaitassert.rejects(iterator.next.bind(iterator),err);
 +})();
++
 await(asyncfunction(){
 console.log('read object mode');
 constmax=42;