objc-js 0.0.9 → 0.0.10

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.10",
   "description": "Objective-C bridge for Node.js",
   "main": "dist/index.js",
   "dependencies": {

package/src/native/protocol-impl.mm

@@ -572,8 +572,10 @@ 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
     // 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 +593,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 {