Stored call invokers by napi_env

Author: paradowstack

packages/host/cpp/CxxNodeApiHostModule.cpp

@@ -12,7 +12,7 @@ CxxNodeApiHostModule::CxxNodeApiHostModule(
   methodMap_["requireNodeAddon"] =
       MethodMetadata{1, &CxxNodeApiHostModule::requireNodeAddon};
 
-  callstack::nodeapihost::setCallInvoker(jsInvoker);
+  callInvoker_ = std::move(jsInvoker);
 }
 
 jsi::Value
@@ -127,6 +127,7 @@ bool CxxNodeApiHostModule::initializeNodeModule(jsi::Runtime &rt,
       napi_set_named_property(env, global, addon.generatedName.data(), exports);
   assert(status == napi_ok);
 
+  callstack::nodeapihost::setCallInvoker(env, callInvoker_);
   return true;
 }
 

packages/host/cpp/CxxNodeApiHostModule.hpp

@@ -28,6 +28,8 @@ class JSI_EXPORT CxxNodeApiHostModule : public facebook::react::TurboModule {
     std::string generatedName;
   };
   std::unordered_map<std::string, NodeAddon> nodeAddons_;
+  std::shared_ptr<facebook::react::CallInvoker> callInvoker_;
+
   using LoaderPolicy = PosixLoader; // FIXME: HACK: This is temporary workaround
                                     // for my lazyness (work on iOS and Android)
 

packages/host/cpp/RuntimeNodeApiAsync.cpp

@@ -80,14 +80,21 @@ class AsyncWorkRegistry {
   std::unordered_map<IdType, std::shared_ptr<AsyncJob>> jobs_;
 };
 
-static std::weak_ptr<facebook::react::CallInvoker> callInvoker;
+static std::unordered_map<napi_env, std::weak_ptr<facebook::react::CallInvoker>>
+    callInvokers;
 static AsyncWorkRegistry asyncWorkRegistry;
 
 namespace callstack::nodeapihost {
 
-void setCallInvoker(
+void setCallInvoker(napi_env env,
     const std::shared_ptr<facebook::react::CallInvoker>& invoker) {
-  callInvoker = invoker;
+  callInvokers[env] = invoker;
+}
+
+std::weak_ptr<facebook::react::CallInvoker> getCallInvoker(napi_env env) {
+  return callInvokers.contains(env)
+             ? callInvokers[env]
+             : std::weak_ptr<facebook::react::CallInvoker>{};
 }
 
 napi_status napi_create_async_work(napi_env env,
@@ -116,7 +123,7 @@ napi_status napi_queue_async_work(
     return napi_invalid_arg;
   }
 
-  const auto invoker = callInvoker.lock();
+  const auto invoker = getCallInvoker(env).lock();
   if (!invoker) {
     log_debug("Error: No CallInvoker available for async work");
     return napi_invalid_arg;

packages/host/cpp/RuntimeNodeApiAsync.hpp

@@ -6,7 +6,7 @@
 
 namespace callstack::nodeapihost {
 void setCallInvoker(
-    const std::shared_ptr<facebook::react::CallInvoker>& invoker);
+    napi_env env, const std::shared_ptr<facebook::react::CallInvoker>& invoker);
 
 napi_status napi_create_async_work(napi_env env,
     napi_value async_resource,