stream: async iteration should work with destroyed stream
Fixes #23730.

Fixes #23730.
stream: async iteration should work with destroyed stream
Fixes #23730. PR-URL: #23785 Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Matheus Marchini <mat@mmarchini.me>
nodejs · mcollina · mcollina · mcollina · Oct 20, 2018 · mcollina
diff --git a/test/parallel/test-stream-readable-async-iterators.js b/test/parallel/test-stream-readable-async-iterators.js
diff --git a/lib/internal/streams/async_iterator.js b/lib/internal/streams/async_iterator.js
+    if (this[kStream].destroyed) {
+      // this is needed because if .destro(err) is called, the error
+      // will be emitted via nextTick
+      return new Promise((resolve, rejects) => {
diff --git a/lib/internal/streams/async_iterator.js b/lib/internal/streams/async_iterator.js
diff --git a/lib/zlib.js b/lib/zlib.js
+
+Zlib.prototype._destroy = function(err, cb) {
+  const handle = this._handle;
+  if (handle && handle.buffer !== null) {
diff --git a/lib/zlib.js b/lib/zlib.js
-  _close(this, callback);
-  this.destroy();
+Zlib.prototype.close = function(callback) {
+  this.destroy(null, callback);
diff --git a/lib/internal/streams/async_iterator.js b/lib/internal/streams/async_iterator.js
@@ -158,6 +174,9 @@ const createReadableStreamAsyncIterator = (stream) => {
  stream.on('readable', onReadable.bind(null, iterator));
  stream.on('end', onEnd.bind(null, iterator));
  stream.on('error', onError.bind(null, iterator));
+  // needed because some streams will not emit 'end', e.g. Zlib.
+  // https://github.com/nodejs/node/issues/23730
+  stream.on('close', onEnd.bind(null, iterator));
diff --git a/test/parallel/test-stream-readable-async-iterators.js b/test/parallel/test-stream-readable-async-iterators.js
+    const passthrough = new PassThrough();
+    const err = new Error('kaboom');
+    pipeline(readable, passthrough, common.mustCall((e) => {
+      assert.strictEqual(err, e);
-      assert.strictEqual(err, e);
+      assert.strictEqual(e, err);
diff --git a/test/parallel/test-stream-readable-async-iterators.js b/test/parallel/test-stream-readable-async-iterators.js
+    try {
+      await readable[Symbol.asyncIterator]().next();
+    } catch (e) {
+      assert.strictEqual(err, e);
-      assert.strictEqual(err, e);
+      assert.strictEqual(e, err);