Revert "stream: fix async iterator destroyed error propagation"

This reverts commit d15b8ea. PR-URL: #31508 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Anatoli Papirovski <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]>
nodejs · Feb 17, 2020 · 538582b · 538582b
1 parent 39c86bb
commit 538582b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 30 deletions.
diff --git a/lib/internal/streams/async_iterator.js b/lib/internal/streams/async_iterator.js
@@ -114,20 +114,18 @@ const ReadableStreamAsyncIteratorPrototype = ObjectSetPrototypeOf({
     }
 
     if (this[kStream].destroyed) {
+      // We need to defer via nextTick because if .destroy(err) is
+      // called, the error will be emitted via nextTick, and
+      // we cannot guarantee that there is no error lingering around
+      // waiting to be emitted.
       return new Promise((resolve, reject) => {
-        if (this[kError]) {
-          reject(this[kError]);
-        } else if (this[kEnded]) {
-          resolve(createIterResult(undefined, true));
-        } else {
-          finished(this[kStream], (err) => {
-            if (err && err.code !== 'ERR_STREAM_PREMATURE_CLOSE') {
-              reject(err);
-            } else {
-              resolve(createIterResult(undefined, true));
-            }
-          });
-        }
+        process.nextTick(() => {
+          if (this[kError]) {
+            reject(this[kError]);
+          } else {
+            resolve(createIterResult(undefined, true));
+          }
+        });
       });
     }
 

diff --git a/test/parallel/test-stream-readable-async-iterators.js b/test/parallel/test-stream-readable-async-iterators.js
@@ -567,23 +567,6 @@ async function tests() {
       assert.strictEqual(e, err);
     })()]);
   }
-
-  {
-    const _err = new Error('asd');
-    const r = new Readable({
-      read() {
-      },
-      destroy(err, callback) {
-        setTimeout(() => callback(_err), 1);
-      }
-    });
-
-    r.destroy();
-    const it = r[Symbol.asyncIterator]();
-    it.next().catch(common.mustCall((err) => {
-      assert.strictEqual(err, _err);
-    }));
-  }
 }
 
 {