objc-js 0.0.9 → 0.0.11

package/package.json

@@ -39,7 +39,7 @@
     "format": "prettier --write \"**/*.{ts,js,json,md}\"",
     "preinstall-disabled": "npm run build-scripts && npm run make-clangd-config"
   },
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "Objective-C bridge for Node.js",
   "main": "dist/index.js",
   "dependencies": {

package/src/native/protocol-impl.mm

@@ -551,7 +551,15 @@ void ForwardInvocation(id self, SEL _cmd, NSInvocation *invocation) {
     js_thread = it->second.js_thread;
     
     // Get the ThreadSafeFunction - this is thread-safe by design
+    // IMPORTANT: We must Acquire() to increment the ref count, because copying
+    // a ThreadSafeFunction does NOT increment it. If DeallocImplementation runs
+    // and calls Release() on the original, our copy would become invalid.
     tsfn = callbackIt->second;
+    napi_status acq_status = tsfn.Acquire();
+    if (acq_status != napi_ok) {
+      NSLog(@"Warning: Failed to acquire ThreadSafeFunction for selector %s", selectorName.c_str());
+      return;
+    }
     
     // Get the type encoding for return value handling
     auto encIt = it->second.typeEncodings.find(selectorName);
@@ -571,9 +579,14 @@ void ForwardInvocation(id self, SEL _cmd, NSInvocation *invocation) {
   
   if (is_js_thread) {
     // We're on the JS thread, so it's safe to access N-API values directly
+    // Release the TSFN we acquired - we don't need it on this path
+    tsfn.Release();
+    
     // Do a second lookup to get the JS callback
+    // IMPORTANT: We must call .Value() while holding the lock to prevent
+    // DeallocImplementation from erasing the entry while we're using it
     napi_env stored_env;
-    Napi::FunctionReference* jsCallbackPtr = nullptr;
+    Napi::Function jsFn;
     {
       std::lock_guard<std::mutex> lock(g_implementations_mutex);
       auto it = g_implementations.find(ptr);
@@ -591,12 +604,13 @@ void ForwardInvocation(id self, SEL _cmd, NSInvocation *invocation) {
       }
       
       stored_env = it->second.env;
-      jsCallbackPtr = &jsCallbackIt->second;
+      // Get the function value WHILE HOLDING THE LOCK
+      // This prevents a race with DeallocImplementation clearing the jsCallbacks map
+      jsFn = jsCallbackIt->second.Value();
     }
     
-    // Now we can safely access N-API values since we're on the JS thread
+    // Now jsFn is a local Napi::Function (napi_value), safe to use after lock release
     Napi::Env env(stored_env);
-    Napi::Function jsFn = jsCallbackPtr->Value();  // Safe: on JS thread with valid HandleScope
     CallJSCallback(env, jsFn, data);
     // Data is deleted in CallJSCallback
   } else {
@@ -604,6 +618,10 @@ void ForwardInvocation(id self, SEL _cmd, NSInvocation *invocation) {
     // Use ThreadSafeFunction to marshal to JS thread
     napi_status status = tsfn.BlockingCall(data, CallJSCallback);
     
+    // Release our acquired reference to the TSFN
+    // This balances the Acquire() call above
+    tsfn.Release();
+    
     if (status != napi_ok) {
       NSLog(@"Error: Failed to call ThreadSafeFunction for selector %s (status: %d)",
             selectorName.c_str(), status);