Skip to content

Commit

Permalink
fix: call explicitly unregister
Browse files Browse the repository at this point in the history
  • Loading branch information
tsctx committed Dec 22, 2023
1 parent 5f4d435 commit 79b4daf
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
2 changes: 2 additions & 0 deletions lib/compat/dispatcher-weakref.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ class CompatFinalizer {
})
}
}

unregister (key) {}
}

module.exports = function () {
Expand Down
24 changes: 23 additions & 1 deletion lib/fetch/request.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ const { getMaxListeners, setMaxListeners, getEventListeners, defaultMaxListeners
const kAbortController = Symbol('abortController')

const requestFinalizer = new FinalizationRegistry(({ signal, abort }) => {
// 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.
// The unregister key is abort.
requestFinalizer.unregister(abort)
signal.removeEventListener('abort', abort)
})

Expand Down Expand Up @@ -371,6 +377,18 @@ class Request {
const abort = function () {
const ac = acRef.deref()
if (ac !== undefined) {
// Currently, there is a problem with FinalizationRegistry.
// https://github.com/nodejs/node/issues/49344
// https://github.com/nodejs/node/issues/47748
// In the case of abort, the first step is to unregister from it.
// If the controller can refer to it, it is still registered.
// It will be removed in the future.
requestFinalizer.unregister(abort)

// Unsubscribe a listener.
// FinalizationRegistry will no longer be called, so this must be done.
this.removeEventListener('abort', abort)

ac.abort(this.reason)
}
}
Expand All @@ -388,7 +406,11 @@ class Request {
} catch {}

util.addAbortListener(signal, abort)
requestFinalizer.register(ac, { signal, abort })
// The third argument must be a registry key to be unregistered.
// Without it, you cannot unregister.
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/FinalizationRegistry
// abort is used as the unregister key. (because it is unique)
requestFinalizer.register(ac, { signal, abort }, abort)
}
}

Expand Down

0 comments on commit 79b4daf

Please sign in to comment.