fixup

nodejs · Dec 21, 2023 · f394f77 · f394f77
1 parent 8abfa7d
commit f394f77
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/lib/fetch/request.js b/lib/fetch/request.js
@@ -34,12 +34,7 @@ const { getMaxListeners, setMaxListeners, getEventListeners, defaultMaxListeners
 
 const kAbortController = Symbol('abortController')
 
-const requestFinalizer = new FinalizationRegistry(({ signal, abort, controller }) => {
-  // Currently FinalizationRegistry has a problem and will explicitly call unregister.
-  // https://github.com/nodejs/node/issues/49344
-  // https://github.com/nodejs/node/issues/47748
-  // It will be removed in the future.
-  requestFinalizer.unregister(controller)
+const requestFinalizer = new FinalizationRegistry(({ signal, abort }) => {
   signal.removeEventListener('abort', abort)
 })
 
@@ -376,6 +371,7 @@ class Request {
         const abort = function () {
           const ac = acRef.deref()
           if (ac !== undefined) {
+            requestFinalizer.unregister(ac)
             ac.abort(this.reason)
           }
         }
@@ -393,7 +389,7 @@ class Request {
         } catch {}
 
         util.addAbortListener(signal, abort)
-        requestFinalizer.register(ac, { signal, abort, controller: ac })
+        requestFinalizer.register(ac, { signal, abort })
       }
     }