Moved setting CallInvoker to turbo module constructor

Author: paradowstack

packages/host/android/src/main/cpp/OnLoad.cpp

@@ -3,7 +3,6 @@
 #include <ReactCommon/CxxTurboModuleUtils.h>
 
 #include <CxxNodeApiHostModule.hpp>
-#include <RuntimeNodeApiAsync.hpp>
 #include <WeakNodeApiInjector.hpp>
 
 // Called when the library is loaded
@@ -13,7 +12,6 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
   facebook::react::registerCxxModuleToGlobalModuleMap(
       callstack::nodeapihost::CxxNodeApiHostModule::kModuleName,
       [](std::shared_ptr<facebook::react::CallInvoker> jsInvoker) {
-        callstack::nodeapihost::setCallInvoker(jsInvoker);
         return std::make_shared<callstack::nodeapihost::CxxNodeApiHostModule>(
             jsInvoker);
       });

packages/host/cpp/CxxNodeApiHostModule.cpp

@@ -1,5 +1,6 @@
 #include "CxxNodeApiHostModule.hpp"
 #include "Logger.hpp"
+#include "RuntimeNodeApiAsync.hpp"
 
 using namespace facebook;
 
@@ -10,6 +11,8 @@ CxxNodeApiHostModule::CxxNodeApiHostModule(
     : TurboModule(CxxNodeApiHostModule::kModuleName, jsInvoker) {
   methodMap_["requireNodeAddon"] =
       MethodMetadata{1, &CxxNodeApiHostModule::requireNodeAddon};
+
+  callstack::nodeapihost::setCallInvoker(jsInvoker);
 }
 
 jsi::Value

packages/host/ios/NodeApiHostModuleProvider.mm

@@ -1,6 +1,5 @@
 #import "CxxNodeApiHostModule.hpp"
 #import "WeakNodeApiInjector.hpp"
-#import "RuntimeNodeApiAsync.hpp"
 
 #define USE_CXX_TURBO_MODULE_UTILS 0
 #if defined(__has_include)
@@ -28,7 +27,6 @@ + (void)load {
   facebook::react::registerCxxModuleToGlobalModuleMap(
       callstack::nodeapihost::CxxNodeApiHostModule::kModuleName,
       [](std::shared_ptr<facebook::react::CallInvoker> jsInvoker) {
-        callstack::nodeapihost::setCallInvoker(jsInvoker);
         return std::make_shared<callstack::nodeapihost::CxxNodeApiHostModule>(
             jsInvoker);
       });