nodejs
diff --git a/Collapse file
‎lib/internal/streams/readable.js‎
Copy file name to clipboardExpand all lines: lib/internal/streams/readable.js
+4-1Lines changed: 4 additions & 1 deletion b/Collapse file
‎lib/internal/streams/readable.js‎
Copy file name to clipboardExpand all lines: lib/internal/streams/readable.js
+4-1Lines changed: 4 additions & 1 deletion
diff --git a/Collapse file
‎test/parallel/test-stream-readable-async-iterators.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-stream-readable-async-iterators.js
+14Lines changed: 14 additions & 0 deletions b/Collapse file
‎test/parallel/test-stream-readable-async-iterators.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-stream-readable-async-iterators.js
+14Lines changed: 14 additions & 0 deletions
@@ -1122,7 +1122,7 @@ async function* createAsyncIterator(stream, options) {
   stream.on('readable', next);
 
   let error;
-  eos(stream, { writable: false }, (err) => {
+  const cleanup = eos(stream, { writable: false }, (err) => {
     error = err ? aggregateTwoErrors(error, err) : null;
     callback();
     callback = nop;
@@ -1150,6 +1150,9 @@ async function* createAsyncIterator(stream, options) {
       (error === undefined || stream._readableState.autoDestroy)
     ) {
       destroyImpl.destroyer(stream, null);
+    } else {
+      stream.off('readable', next);
+      cleanup();
     }
   }
 }
 
@@ -789,6 +789,20 @@ async function tests() {
       }
     );
   }
+
+  // Check for dangling listeners
+  (async function() {
+    const readable = createReadable();
+    const opts = { destroyOnReturn: false };
+    while (readable.readable) {
+      // eslint-disable-next-line no-unused-vars
+      for await (const chunk of readable.iterator(opts)) {
+        break;
+      }
+    }
+
+    assert.deepStrictEqual(readable.eventNames(), []);
+  })().then(common.mustCall());
 }
 
 {
Original file line number	Diff line number	Diff line change
`@@ -1122,7 +1122,7 @@ async function* createAsyncIterator(stream, options) {`
`1122`	`1122`	`stream.on('readable', next);`
`1123`	`1123`
`1124`	`1124`	`let error;`
`1125`		`- eos(stream, { writable: false }, (err) => {`
	`1125`	`+ const cleanup = eos(stream, { writable: false }, (err) => {`
`1126`	`1126`	`error = err ? aggregateTwoErrors(error, err) : null;`
`1127`	`1127`	`callback();`
`1128`	`1128`	`callback = nop;`
`@@ -1150,6 +1150,9 @@ async function* createAsyncIterator(stream, options) {`
`1150`	`1150`	`(error === undefined \|\| stream._readableState.autoDestroy)`
`1151`	`1151`	`) {`
`1152`	`1152`	`destroyImpl.destroyer(stream, null);`
	`1153`	`+ } else {`
	`1154`	`+ stream.off('readable', next);`
	`1155`	`+ cleanup();`
`1153`	`1156`	`}`
`1154`	`1157`	`}`
`1155`	`1158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -789,6 +789,20 @@ async function tests() {`
`789`	`789`	`}`
`790`	`790`	`);`
`791`	`791`	`}`
	`792`	`+`
	`793`	`+ // Check for dangling listeners`
	`794`	`+ (async function() {`
	`795`	`+ const readable = createReadable();`
	`796`	`+ const opts = { destroyOnReturn: false };`
	`797`	`+ while (readable.readable) {`
	`798`	`+ // eslint-disable-next-line no-unused-vars`
	`799`	`+ for await (const chunk of readable.iterator(opts)) {`
	`800`	`+ break;`
	`801`	`+ }`
	`802`	`+ }`
	`803`	`+`
	`804`	`+ assert.deepStrictEqual(readable.eventNames(), []);`
	`805`	`+ })().then(common.mustCall());`
`792`	`806`	`}`
`793`	`807`
`794`	`808`	`{`