events: remove error listener on signal abort

Lxxyx · ruyadorno · commit abf0477c9ed6 · 2021-01-21T17:57:36.000-05:00
Fixes: #36949 PR-URL: #36969 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/lib/events.js b/lib/events.js
@@ -736,7 +736,7 @@ async function once(emitter, name, options = {}) {
 }
 function abortListener() {
 eventTargetAgnosticRemoveListener(emitter, name, resolver);
- eventTargetAgnosticRemoveListener(emitter, 'error', resolver);
+ eventTargetAgnosticRemoveListener(emitter, 'error', errorListener);
 reject(lazyDOMException('The operation was aborted', 'AbortError'));
 }
 if (signal != null) {
diff --git a/test/parallel/test-events-once.js b/test/parallel/test-events-once.js
@@ -169,6 +169,19 @@ async function abortSignalAfterEvent() {
 await once(ee, 'foo', { signal: ac.signal });
 }
 
+async function abortSignalRemoveListener() {
+ const ee = new EventEmitter();
+ const ac = new AbortController();
+
+ try {
+ process.nextTick(() => ac.abort());
+ await once(ee, 'test', { signal: ac.signal });
+ } catch {
+ strictEqual(ee.listeners('test').length, 0);
+ strictEqual(ee.listeners('error').length, 0);
+ }
+}
+
 async function eventTargetAbortSignalBefore() {
 const et = new EventTarget();
 const ac = new AbortController();
@@ -218,6 +231,7 @@ Promise.all([
 abortSignalBefore(),
 abortSignalAfter(),
 abortSignalAfterEvent(),
+ abortSignalRemoveListener(),
 eventTargetAbortSignalBefore(),
 eventTargetAbortSignalAfter(),
 eventTargetAbortSignalAfterEvent(),

Original file line number	Diff line number	Diff line change
`@@ -736,7 +736,7 @@ async function once(emitter, name, options = {}) {`
`736`	`736`	`}`
`737`	`737`	`functionabortListener(){`
`738`	`738`	`eventTargetAgnosticRemoveListener(emitter,name,resolver);`
`739`		`-eventTargetAgnosticRemoveListener(emitter,'error',resolver);`
	`739`	`+eventTargetAgnosticRemoveListener(emitter,'error',errorListener);`
`740`	`740`	`reject(lazyDOMException('The operation was aborted','AbortError'));`
`741`	`741`	`}`
`742`	`742`	`if(signal!=null){`
-Original file line number
+Diff line change
 awaitonce(ee,'foo',{signal: ac.signal});
+}
 +asyncfunctionabortSignalRemoveListener(){
 +constee=newEventEmitter();
 +constac=newAbortController();
++
 +try{
 +process.nextTick(()=>ac.abort());
 +awaitonce(ee,'test',{signal: ac.signal});
 +}catch{
 +strictEqual(ee.listeners('test').length,0);
 +strictEqual(ee.listeners('error').length,0);
 +}
 +}
++
 asyncfunctioneventTargetAbortSignalBefore(){
 constet=newEventTarget();
 constac=newAbortController();
 abortSignalBefore(),
 abortSignalAfter(),
 abortSignalAfterEvent(),
 +abortSignalRemoveListener(),
 eventTargetAbortSignalBefore(),
 eventTargetAbortSignalAfter(),
 eventTargetAbortSignalAfterEvent(),