@@ -3341,6 +3341,8 @@ template <typename T>
3341
3341
inline Reference<T>::~Reference () {
3342
3342
if (_ref != nullptr ) {
3343
3343
if (!_suppressDestruct) {
3344
+ // TODO(legendecas): napi_delete_reference should be invoked immediately.
3345
+ // Fix this when https://github.com/nodejs/node/pull/55620 lands.
3344
3346
#ifdef NODE_API_EXPERIMENTAL_HAS_POST_FINALIZER
3345
3347
Env ().PostFinalizer (
3346
3348
[](Napi::Env env, napi_ref ref) { napi_delete_reference (env, ref); },
@@ -4595,7 +4597,7 @@ template <typename T>
4595
4597
inline ObjectWrap<T>::~ObjectWrap () {
4596
4598
// If the JS object still exists at this point, remove the finalizer added
4597
4599
// through `napi_wrap()`.
4598
- if (!IsEmpty ()) {
4600
+ if (!IsEmpty () && !_finalized ) {
4599
4601
Object object = Value ();
4600
4602
// It is not valid to call `napi_remove_wrap()` with an empty `object`.
4601
4603
// This happens e.g. during garbage collection.
@@ -5044,8 +5046,10 @@ inline void ObjectWrap<T>::FinalizeCallback(node_addon_api_basic_env env,
5044
5046
(void )env;
5045
5047
T* instance = static_cast <T*>(data);
5046
5048
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 ;
5049
5053
5050
5054
// If class overrides the basic finalizer, execute it.
5051
5055
if constexpr (details::HasBasicFinalizer<T>::value) {
0 commit comments