chore: using install sync to avoid race condition (#87)

jerson · Jan 28, 2024 · b47b1a7 · b47b1a7
1 parent d7b0d20
commit b47b1a7
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 31 deletions.
diff --git a/android/src/main/java/com/fastrsa/FastRsaModule.kt b/android/src/main/java/com/fastrsa/FastRsaModule.kt
@@ -60,26 +60,22 @@ internal class FastRsaModule(reactContext: ReactApplicationContext) :
     }.start()
   }
 
-  @ReactMethod
-  fun install(promise: Promise) {
-    Thread {
-      reactApplicationContext.runOnJSQueueThread {
-        Log.d(TAG, "installing")
-        try {
-          val contextHolder = this.reactApplicationContext.javaScriptContextHolder!!.get()
-          if (contextHolder.toInt() == 0) {
-            promise.resolve(false)
-            return@runOnJSQueueThread
-          }
-          initialize(contextHolder)
-          Log.i(TAG, "successfully installed")
-          promise.resolve(true)
-        } catch (exception: java.lang.Exception) {
-          Log.e(TAG, "failed to install JSI", exception)
-          promise.reject(exception)
-        }
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  fun install(): Boolean {
+    Log.d(TAG, "installing")
+    try {
+      val contextHolder = this.reactApplicationContext.javaScriptContextHolder!!.get()
+      if (contextHolder.toInt() == 0) {
+        Log.d(TAG, "context not available")
+        return false
       }
-    }.start()
+      initialize(contextHolder)
+      Log.i(TAG, "successfully installed")
+      return true
+    } catch (exception: java.lang.Exception) {
+      Log.e(TAG, "failed to install JSI", exception)
+      return false
+    }
   }
 
   override fun getName(): String {

diff --git a/ios/FastRsa.mm b/ios/FastRsa.mm
@@ -97,20 +97,21 @@ @implementation FastRsa
     resolve(result);
 }
 
-RCT_REMAP_METHOD(install,installWithResolver:(RCTPromiseResolveBlock)resolve
-                 withReject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install)
 {
     RCTCxxBridge *cxxBridge = (RCTCxxBridge *)self.bridge;
     if (!cxxBridge.runtime) {
-        NSNumber * val = [NSNumber numberWithBool:NO];
-        resolve(val);
-        return;
+        return @false;
     }
-    jsi::Runtime * runtime = (jsi::Runtime *)cxxBridge.runtime;
+    using namespace facebook;
+    auto jsiRuntime = (jsi::Runtime *)cxxBridge.runtime;
+    if (jsiRuntime == nil) {
+        return @false;
+    }
+    auto &runtime = *jsiRuntime;
 
-    fastRSA::install(*runtime);
-    NSNumber * val = [NSNumber numberWithBool:TRUE];
-    resolve(val);
+    fastRSA::install(runtime);
+    return @true;
 }
 
 + (BOOL)requiresMainQueueSetup {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-fast-rsa",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "library for use RSA",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

diff --git a/src/index.tsx b/src/index.tsx
@@ -540,7 +540,7 @@ export default class RSA {
       let result: BridgeResponse;
       if (this.useJSI) {
         if (!this.loaded) {
-          this.loaded = await FastRSANativeModules.install();
+          this.loaded = FastRSANativeModules.install();
           console.log(
             this.TAG,
             `(${name})`,

diff --git a/src/types.d.ts b/src/types.d.ts
@@ -46,7 +46,7 @@ interface FastRSANativeModules {
   /**
    * this method will install JSI definitions
    */
-  install(): Promise<boolean>;
+  install(): boolean;
 }
 
 interface NativeModulesDef {