introduce logic to invoke sync void method (facebook#39970)

Summary: Changelog: [Internal] in this diff, i add the logic that makes void return values run synchronously Differential Revision: D49613770
philIip · Oct 9, 2023 · c62934b · c62934b
1 parent ec1de61
commit c62934b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/...act-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp b/...act-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp
@@ -196,7 +196,8 @@ TurboModuleManager::createTurboModuleProvider() {
           .moduleName = name,
           .instance = moduleInstance,
           .jsInvoker = jsCallInvoker,
-          .nativeMethodCallInvoker = nativeMethodCallInvoker};
+          .nativeMethodCallInvoker = nativeMethodCallInvoker,
+          .shouldVoidMethodsExecuteSync = false};
 
       auto turboModule = delegate->cthis()->getTurboModule(name, params);
       turboModuleCache->insert({name, turboModule});
@@ -270,7 +271,8 @@ TurboModuleManager::createLegacyModuleProvider() {
           .moduleName = name,
           .instance = moduleInstance,
           .jsInvoker = jsCallInvoker,
-          .nativeMethodCallInvoker = nativeMethodCallInvoker};
+          .nativeMethodCallInvoker = nativeMethodCallInvoker,
+          .shouldVoidMethodsExecuteSync = false};
 
       static auto getMethodDescriptorsFromModule =
           javaPart->getClass()

diff --git a/...tive/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp b/...tive/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp
@@ -31,7 +31,8 @@ namespace TMPL = TurboModulePerfLogger;
 JavaTurboModule::JavaTurboModule(const InitParams& params)
     : TurboModule(params.moduleName, params.jsInvoker),
       instance_(jni::make_global(params.instance)),
-      nativeMethodCallInvoker_(params.nativeMethodCallInvoker) {}
+      nativeMethodCallInvoker_(params.nativeMethodCallInvoker),
+      shouldVoidMethodsExecuteSync_(params.shouldVoidMethodsExecuteSync) {}
 
 JavaTurboModule::~JavaTurboModule() {
   /**
@@ -454,7 +455,9 @@ jsi::Value JavaTurboModule::invokeJavaMethod(
   const char* methodName = methodNameStr.c_str();
   const char* moduleName = name_.c_str();
 
-  bool isMethodSync = !(valueKind == VoidKind || valueKind == PromiseKind);
+  bool isMethodSync =
+      (valueKind == VoidKind && shouldVoidMethodsExecuteSync_) ||
+      !(valueKind == VoidKind || valueKind == PromiseKind);
 
   if (isMethodSync) {
     TMPL::syncMethodCallStart(moduleName, methodName);
@@ -733,6 +736,18 @@ jsi::Value JavaTurboModule::invokeJavaMethod(
       return returnValue;
     }
     case VoidKind: {
+      if (shouldVoidMethodsExecuteSync_) {
+        env->CallVoidMethodA(instance, methodID, jargs.data());
+        TMPL::syncMethodCallEnd(moduleName, methodName);
+        try {
+          FACEBOOK_JNI_THROW_PENDING_EXCEPTION();
+        } catch (...) {
+          TMPL::syncMethodCallExecutionFail(moduleName, methodName, id);
+          throw;
+        }
+        return jsi::Value::undefined();
+      }
+
       TMPL::asyncMethodCallArgConversionEnd(moduleName, methodName);
       TMPL::asyncMethodCallDispatch(moduleName, methodName);
 

diff --git a/...native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h b/...native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h
@@ -32,6 +32,7 @@ class JSI_EXPORT JavaTurboModule : public TurboModule {
     jni::alias_ref<jobject> instance;
     std::shared_ptr<CallInvoker> jsInvoker;
     std::shared_ptr<NativeMethodCallInvoker> nativeMethodCallInvoker;
+    bool shouldVoidMethodsExecuteSync;
   };
 
   JavaTurboModule(const InitParams& params);
@@ -50,6 +51,7 @@ class JSI_EXPORT JavaTurboModule : public TurboModule {
   // instance_ can be of type JTurboModule, or JNativeModule
   jni::global_ref<jobject> instance_;
   std::shared_ptr<NativeMethodCallInvoker> nativeMethodCallInvoker_;
+  bool shouldVoidMethodsExecuteSync_;
 };
 
 } // namespace facebook::react