fixup! fix error listener handler case

nodejs · Jun 6, 2020 · a62ff6d · a62ff6d
1 parent 0f2315c
commit a62ff6d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/lib/events.js b/lib/events.js
@@ -627,7 +627,9 @@ function once(emitter, name) {
       resolve(args);
     };
     eventTargetAgnosticAddListener(emitter, name, resolver, { once: true });
-    addErrorHandlerIfEventEmitter(emitter, errorListener, { once: true });
+    if (name !== 'error') {
+      addErrorHandlerIfEventEmitter(emitter, errorListener, { once: true });
+    }
   });
 }
 
@@ -733,7 +735,9 @@ function on(emitter, event) {
   }, AsyncIteratorPrototype);
 
   eventTargetAgnosticAddListener(emitter, event, eventHandler);
-  addErrorHandlerIfEventEmitter(emitter, errorHandler);
+  if (event !== 'error') {
+    addErrorHandlerIfEventEmitter(emitter, errorHandler);
+  }
 
 
   return iterator;

diff --git a/test/parallel/test-event-on-async-iterator.js b/test/parallel/test-event-on-async-iterator.js
@@ -225,6 +225,12 @@ async function eventTarget() {
   clearInterval(interval);
 }
 
+async function errorListenerCount() {
+  const et = new EventEmitter();
+  on(et, 'foo');
+  assert.strictEqual(et.listenerCount('error'), 1);
+}
+
 async function nodeEventTarget() {
   const et = new NodeEventTarget();
   const tick = () => et.dispatchEvent(new Event('tick'));
@@ -252,6 +258,7 @@ async function run() {
     nextError,
     iterableThrow,
     eventTarget,
+    errorListenerCount,
     nodeEventTarget
   ];
 

diff --git a/test/parallel/test-events-once.js b/test/parallel/test-events-once.js
@@ -78,7 +78,9 @@ async function onceError() {
     ee.emit('error', expected);
   });
 
-  const [err] = await once(ee, 'error');
+  const promise = once(ee, 'error');
+  strictEqual(ee.listenerCount('error'), 1);
+  const [ err ] = await promise;
   strictEqual(err, expected);
   strictEqual(ee.listenerCount('error'), 0);
   strictEqual(ee.listenerCount('myevent'), 0);