n-api: make thread-safe-function calls properly

Use `NapiCallIntoModuleThrow()` to execute the call into JavaScript and the finalizer for consistency with the rest of the calls into the N-API addon. PR-URL: #28606 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Michael Dawson <[email protected]>
nodejs · Jul 20, 2019 · 44de431 · 44de431
1 parent 5b9c227
commit 44de431
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/node_api.cc b/src/node_api.cc
@@ -325,10 +325,9 @@ class ThreadSafeFunction : public node::AsyncResource {
             v8::Local<v8::Function>::New(env->isolate, ref);
           js_callback = v8impl::JsValueFromV8LocalValue(js_cb);
         }
-        call_js_cb(env,
-                   js_callback,
-                   context,
-                   data);
+        NapiCallIntoModuleThrow(env, [&]() {
+          call_js_cb(env, js_callback, context, data);
+        });
       }
     }
   }
@@ -347,7 +346,9 @@ class ThreadSafeFunction : public node::AsyncResource {
     v8::HandleScope scope(env->isolate);
     if (finalize_cb) {
       CallbackScope cb_scope(this);
-      finalize_cb(env, finalize_data, context);
+      NapiCallIntoModuleThrow(env, [&]() {
+        finalize_cb(env, finalize_data, context);
+      });
     }
     EmptyQueueAndDelete();
   }