@@ -3341,6 +3341,8 @@ template <typename T>
33413341inline Reference<T>::~Reference () {
33423342 if (_ref != nullptr ) {
33433343 if (!_suppressDestruct) {
3344+ // TODO(legendecas): napi_delete_reference should be invoked immediately.
3345+ // Fix this when https://github.com/nodejs/node/pull/55620 lands.
33443346#ifdef NODE_API_EXPERIMENTAL_HAS_POST_FINALIZER
33453347 Env ().PostFinalizer (
33463348 [](Napi::Env env, napi_ref ref) { napi_delete_reference (env, ref); },
@@ -4595,7 +4597,7 @@ template <typename T>
45954597inline ObjectWrap<T>::~ObjectWrap () {
45964598 // If the JS object still exists at this point, remove the finalizer added
45974599 // through `napi_wrap()`.
4598- if (!IsEmpty ()) {
4600+ if (!IsEmpty () && !_finalized ) {
45994601 Object object = Value ();
46004602 // It is not valid to call `napi_remove_wrap()` with an empty `object`.
46014603 // This happens e.g. during garbage collection.
@@ -5044,8 +5046,10 @@ inline void ObjectWrap<T>::FinalizeCallback(node_addon_api_basic_env env,
50445046 (void )env;
50455047 T* instance = static_cast <T*>(data);
50465048
5047- // Prevent ~ObjectWrap from calling napi_remove_wrap
5048- instance->_ref = nullptr ;
5049+ // Prevent ~ObjectWrap from calling napi_remove_wrap.
5050+ // The instance->_ref should be deleted with napi_delete_reference in
5051+ // ~Reference.
5052+ instance->_finalized = true ;
50495053
50505054 // If class overrides the basic finalizer, execute it.
50515055 if constexpr (details::HasBasicFinalizer<T>::value) {
0 commit comments