fixup

Author: ronag

lib/events.js

@@ -1009,10 +1009,8 @@ function eventTargetAgnosticAddListener(emitter, name, listener, flags) {
  * @returns {AsyncIterator}
  */
 function on(emitter, event, options) {
-  const queue = new FixedQueue();
+  let queue = new FixedQueue();
   let resume = null;
-  let error = null;
-  let errored = false
 
   const signal = options?.signal;
   validateAbortSignal(signal, 'options.signal');
@@ -1033,48 +1031,42 @@ function on(emitter, event, options) {
       { once: true });
   }
 
-  function errorHandler (err) {
-    error = err;
-    errored = true;
-
+  function push(val) {
     if (resume) {
-      resume(Promise.reject(err));
+      resume(val);
       resume = null;
+    } else {
+      queue.push(val);
     }
   }
 
-  function abortListener() {
-    errorHandler(new AbortError(undefined, { cause: signal?.reason }));
+  function errorHandler (err) {
+    if (queue) {
+      push(Promise.reject(err));
+    }
   }
 
   function eventHandler(...args) {
-    if (resume) {
-      resume(args);
-      resume = null;
-    } else {
-      queue.push(args);
-    }
+    push(args);
+  }
+
+  function abortListener() {
+    errorHandler(new AbortError(undefined, { cause: signal?.reason }));
   }
 
   return async function * () {
     try {
       while (true) {
         while (!queue.isEmpty()) {
-          if (errored) {
-            throw error;
-          }
-          yield queue.shift();
-        }
-
-        if (errored) {
-          throw error;
+          yield await queue.shift();
         }
 
         yield await new Promise(resolve => {
           resume = resolve;
         });
       }
     } finally {
+      queue = null;
       eventTargetAgnosticRemoveListener(emitter, event, eventHandler);
       eventTargetAgnosticRemoveListener(emitter, 'error', errorHandler);
     }