whisper.rn 0.4.3 → 0.5.0-rc.1

package/README.md

@@ -38,9 +38,7 @@ Add proguard rule if it's enabled in project (android/app/proguard-rules.pro):
 -keep class com.rnwhisper.** { *; }
 ```
 
-By default, `whisper.rn` will use pre-built libraries for Android. If you want to build from source, please set `rnwhisperBuildFromSource` to `true` in `android/gradle.properties`.
-
-For build from source, it's recommended to use `ndkVersion = "24.0.8215888"` (or above) in your root project build configuration for Apple Silicon Macs. Otherwise please follow this trobleshooting [issue](./TROUBLESHOOTING.md#android-got-build-error-unknown-host-cpu-architecture-arm64-on-apple-silicon-macs).
+It's recommended to use `ndkVersion = "24.0.8215888"` (or above) in your root project build configuration for Apple Silicon Macs. Otherwise please follow this trobleshooting [issue](./TROUBLESHOOTING.md#android-got-build-error-unknown-host-cpu-architecture-arm64-on-apple-silicon-macs).
 
 #### Expo
 

package/android/build.gradle

@@ -35,6 +35,33 @@ def reactNativeArchitectures() {
   return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
+// Detect RN Version as done here:
+// https://github.com/software-mansion/react-native-reanimated/blob/66a6bd0e3a819ca7ae46751d36e405fe32b68b71/packages/react-native-reanimated/android/build.gradle#L73
+def resolveReactNativeDirectory() {
+  def reactNativeLocation = rootProject.ext.has("REACT_NATIVE_NODE_MODULES_DIR") ? rootProject.ext.get("REACT_NATIVE_NODE_MODULES_DIR") : null
+  if (reactNativeLocation != null) {
+    return file(reactNativeLocation)
+  }
+
+  // Fallback to node resolver for custom directory structures like monorepos.
+  def reactNativePackage = file(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim())
+  if(reactNativePackage.exists()) {
+    return reactNativePackage.parentFile
+  }
+
+  throw new GradleException(
+          "[Reanimated] Unable to resolve react-native location in node_modules. You should project extension property (in `app/build.gradle`) `REACT_NATIVE_NODE_MODULES_DIR` with path to react-native."
+  )
+}
+
+def reactNativeRootDir = resolveReactNativeDirectory()
+
+def reactProperties = new Properties()
+file("$reactNativeRootDir/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
+
+def REACT_NATIVE_VERSION = reactProperties.getProperty("VERSION_NAME")
+def REACT_NATIVE_MINOR_VERSION = REACT_NATIVE_VERSION.startsWith("0.0.0-") ? 1000 : REACT_NATIVE_VERSION.split("\\.")[1].toInteger()
+
 android {
   def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
   if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
@@ -50,21 +77,47 @@ android {
     externalNativeBuild {
       cmake {
         abiFilters (*reactNativeArchitectures())
+        // Configure STL to be compatible with ReactAndroid JSI libraries
+        arguments "-DANDROID_STL=c++_shared",
+                  "-DREACT_NATIVE_MINOR_VERSION=${REACT_NATIVE_MINOR_VERSION}"
       }
     }
+    ndk {
+      // Ensure shared STL is used for JSI compatibility
+      abiFilters (*reactNativeArchitectures())
+    }
   }
-  def rnwhisperBuildFromSource = project.properties["rnwhisperBuildFromSource"]
-  if (rnwhisperBuildFromSource == "true") {
-    externalNativeBuild {
-      cmake {
-        path = file('src/main/CMakeLists.txt')
-      }
+
+  packagingOptions {
+    doNotStrip resolveBuildType() == "debug" ? "**/**/*.so" : ""
+    excludes = [
+      "META-INF",
+      "META-INF/**",
+      "**/libc++_shared.so",
+      "**/libfbjni.so",
+      "**/libjsi.so",
+      "**/libfolly_json.so",
+      "**/libfolly_runtime.so",
+      "**/libglog.so",
+      "**/libreactnative.so",
+      "**/libreactnativejni.so",
+      "**/libturbomodulejsijni.so",
+      "**/libreact_nativemodule_core.so",
+    ]
+  }
+
+  buildFeatures {
+    prefab = true
+  }
+  externalNativeBuild {
+    cmake {
+      path = file('src/main/CMakeLists.txt')
     }
-    // Exclude jniLibs
-    sourceSets {
-      main {
-        jniLibs.srcDirs = []
-      }
+  }
+  // Exclude jniLibs when building from source
+  sourceSets {
+    main {
+      jniLibs.srcDirs = []
     }
   }
   buildTypes {
@@ -113,3 +166,10 @@ if (isNewArchitectureEnabled()) {
     codegenJavaPackageName = "com.rnwhisper"
   }
 }
+
+def resolveBuildType() {
+    Gradle gradle = getGradle()
+    String tskReqStr = gradle.getStartParameter().getTaskRequests()["args"].toString()
+
+    return tskReqStr.contains("Release") ? "release" : "debug"
+}

package/android/src/main/CMakeLists.txt

@@ -5,9 +5,17 @@ project(whisper.rn)
 set(CMAKE_CXX_STANDARD 17)
 set(RNWHISPER_LIB_DIR ${CMAKE_SOURCE_DIR}/../../../cpp)
 
+# Configure STL to be compatible with ReactAndroid JSI libraries
+set(CMAKE_ANDROID_STL_TYPE c++_shared)
+
+# Find ReactAndroid package for JSI
+find_package(ReactAndroid REQUIRED CONFIG)
+find_package(fbjni REQUIRED CONFIG)
+
 include_directories(
     ${RNWHISPER_LIB_DIR}
     ${RNWHISPER_LIB_DIR}/ggml-cpu
+    ${RNWHISPER_LIB_DIR}/jsi
 )
 
 set(
@@ -34,6 +42,7 @@ set(
     ${RNWHISPER_LIB_DIR}/whisper.cpp
     ${RNWHISPER_LIB_DIR}/rn-audioutils.cpp
     ${RNWHISPER_LIB_DIR}/rn-whisper.cpp
+    ${RNWHISPER_LIB_DIR}/jsi/RNWhisperJSI.cpp
     ${CMAKE_SOURCE_DIR}/jni.cpp
 )
 
@@ -54,7 +63,25 @@ function(build_library target_name arch cpu_flags)
         ${SOURCE_FILES_ARCH}
     )
 
-    target_link_libraries(${target_name} ${LOG_LIB} android)
+    # Link JSI libraries
+    if(${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 76)
+        target_link_libraries(${target_name}
+            ${LOG_LIB}
+            android
+            fbjni::fbjni
+            ReactAndroid::jsi
+            ReactAndroid::reactnative
+        )
+    else ()
+        target_link_libraries(${target_name}
+            ${LOG_LIB}
+            android
+            fbjni::fbjni
+            ReactAndroid::jsi
+            ReactAndroid::turbomodulejsijni
+            ReactAndroid::react_nativemodule_core
+        )
+    endif ()
 
     if (${arch} STREQUAL "generic")
         target_compile_options(${target_name} PRIVATE -DWSP_GGML_CPU_GENERIC)

package/android/src/main/java/com/rnwhisper/JSCallInvokerResolver.java

@@ -0,0 +1,40 @@
+package com.rnwhisper;
+
+import androidx.annotation.OptIn;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.common.annotations.FrameworkAPI;
+import com.facebook.react.turbomodule.core.CallInvokerHolderImpl;
+
+public class JSCallInvokerResolver {
+
+  @OptIn(markerClass = FrameworkAPI.class)
+  public static CallInvokerHolderImpl getJSCallInvokerHolder(ReactApplicationContext context) {
+    try {
+      var method = context.getClass().getMethod("getJSCallInvokerHolder");
+      return (CallInvokerHolderImpl) method.invoke(context);
+    } catch (Exception ignored) {
+      // In newer implementations, the method is in CatalystInstance, continue.
+    }
+    try {
+      var catalystInstance = context.getClass().getMethod("getCatalystInstance").invoke(context);
+      assert catalystInstance != null;
+      var method = catalystInstance.getClass().getMethod("getJSCallInvokerHolder");
+      return (CallInvokerHolderImpl) method.invoke(catalystInstance);
+    } catch (Exception e) {
+      throw new RuntimeException("Failed to get JSCallInvokerHolder", e);
+    }
+  }
+
+  @OptIn(markerClass = FrameworkAPI.class)
+  public static long getJavaScriptContextHolder(ReactApplicationContext context) {
+    try {
+      var method = context.getClass().getMethod("getJavaScriptContextHolder");
+      var holder = method.invoke(context);
+      var getMethod = holder.getClass().getMethod("get");
+      return (Long) getMethod.invoke(holder);
+    } catch (Exception e) {
+      throw new RuntimeException("Failed to get JavaScriptContextHolder", e);
+    }
+  }
+}
+

package/android/src/main/java/com/rnwhisper/RNWhisper.java

@@ -15,6 +15,9 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.turbomodule.core.CallInvokerHolderImpl;
+import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder;
+import com.facebook.react.bridge.Arguments;
 
 import java.util.HashMap;
 import java.util.Random;
@@ -23,6 +26,11 @@ import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.PushbackInputStream;
 
+import com.facebook.react.common.LifecycleState;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+import com.facebook.react.turbomodule.core.CallInvokerHolderImpl;
+import com.facebook.react.bridge.ReactContext;
+
 public class RNWhisper implements LifecycleEventListener {
   public static final String NAME = "RNWhisper";
 
@@ -50,6 +58,43 @@ public class RNWhisper implements LifecycleEventListener {
   private HashMap<Integer, WhisperContext> contexts = new HashMap<>();
   private HashMap<Integer, WhisperVadContext> vadContexts = new HashMap<>();
 
+  // JSI helper method to check if context exists
+  public boolean hasContext(int contextId) {
+    return contexts.containsKey(contextId);
+  }
+
+  public void installJSIBindings(Promise promise) {
+
+    AsyncTask task = new AsyncTask<Void, Void, Void>() {
+      private Exception exception;
+
+      @Override
+      protected Void doInBackground(Void... voids) {
+        try {
+          CallInvokerHolderImpl callInvokerHolder = JSCallInvokerResolver.getJSCallInvokerHolder(reactContext);
+          long runtimePtr = JSCallInvokerResolver.getJavaScriptContextHolder(reactContext);
+
+          WhisperContext.installJSIBindings(runtimePtr, callInvokerHolder);
+          android.util.Log.i("RNWhisperModule", "JSI bindings installed successfully");
+        } catch (Exception e) {
+          exception = e;
+        }
+        return null;
+      }
+
+      @Override
+      protected void onPostExecute(Void result) {
+        if (exception != null) {
+          promise.reject(exception);
+          return;
+        }
+        promise.resolve(null);
+        tasks.remove(this);
+      }
+    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    tasks.put(task, "installJSIBindings");
+  }
+
   private int getResourceIdentifier(String filePath) {
     int identifier = reactContext.getResources().getIdentifier(
       filePath,
@@ -67,11 +112,11 @@ public class RNWhisper implements LifecycleEventListener {
   }
 
   public void initContext(final ReadableMap options, final Promise promise) {
-    AsyncTask task = new AsyncTask<Void, Void, Integer>() {
+    AsyncTask task = new AsyncTask<Void, Void, WhisperContext>() {
       private Exception exception;
 
       @Override
-      protected Integer doInBackground(Void... voids) {
+      protected WhisperContext doInBackground(Void... voids) {
         try {
           String modelPath = options.getString("filePath");
           boolean isBundleAsset = options.getBoolean("isBundleAsset");
@@ -81,24 +126,25 @@ public class RNWhisper implements LifecycleEventListener {
             modelFilePath = downloader.downloadFile(modelPath);
           }
 
+          int id = Math.abs(new Random().nextInt());
           long context;
           int resId = getResourceIdentifier(modelFilePath);
           if (resId > 0) {
             context = WhisperContext.initContextWithInputStream(
+              id,
               new PushbackInputStream(reactContext.getResources().openRawResource(resId))
             );
           } else if (isBundleAsset) {
-            context = WhisperContext.initContextWithAsset(reactContext.getAssets(), modelFilePath);
+            context = WhisperContext.initContextWithAsset(id, reactContext.getAssets(), modelFilePath);
           } else {
-            context = WhisperContext.initContext(modelFilePath);
+            context = WhisperContext.initContext(id, modelFilePath);
           }
           if (context == 0) {
             throw new Exception("Failed to initialize context");
           }
-          int id = Math.abs(new Random().nextInt());
           WhisperContext whisperContext = new WhisperContext(id, reactContext, context);
           contexts.put(id, whisperContext);
-          return id;
+          return whisperContext;
         } catch (Exception e) {
           exception = e;
           return null;
@@ -106,13 +152,14 @@ public class RNWhisper implements LifecycleEventListener {
       }
 
       @Override
-      protected void onPostExecute(Integer id) {
+      protected void onPostExecute(WhisperContext context) {
         if (exception != null) {
           promise.reject(exception);
           return;
         }
         WritableMap result = Arguments.createMap();
-        result.putInt("contextId", id);
+        result.putInt("contextId", context.getId());
+        result.putDouble("contextPtr", (double) context.getContextPtr());
         result.putBoolean("gpu", false);
         result.putString("reasonNoGPU", "Currently not supported");
         promise.resolve(result);
@@ -361,21 +408,22 @@ public class RNWhisper implements LifecycleEventListener {
             modelFilePath = downloader.downloadFile(modelPath);
           }
 
+          int id = Math.abs(new Random().nextInt());
           long vadContext;
           int resId = getResourceIdentifier(modelFilePath);
           if (resId > 0) {
             vadContext = WhisperContext.initVadContextWithInputStream(
+              id,
               new PushbackInputStream(reactContext.getResources().openRawResource(resId))
             );
           } else if (isBundleAsset) {
-            vadContext = WhisperContext.initVadContextWithAsset(reactContext.getAssets(), modelFilePath);
+            vadContext = WhisperContext.initVadContextWithAsset(id, reactContext.getAssets(), modelFilePath);
           } else {
-            vadContext = WhisperContext.initVadContext(modelFilePath);
+            vadContext = WhisperContext.initVadContext(id, modelFilePath);
           }
           if (vadContext == 0) {
             throw new Exception("Failed to initialize VAD context");
           }
-          int id = Math.abs(new Random().nextInt());
           WhisperVadContext whisperVadContext = new WhisperVadContext(id, reactContext, vadContext);
           vadContexts.put(id, whisperVadContext);
           return id;

package/android/src/main/java/com/rnwhisper/WhisperContext.java

@@ -81,6 +81,14 @@ public class WhisperContext {
     fullHandler = null;
   }
 
+  public int getId() {
+    return id;
+  }
+
+  public long getContextPtr() {
+    return context;
+  }
+
   private boolean vad(int sliceIndex, int nSamples, int n) {
     if (isTranscribing) return true;
     return vadSimple(jobId, sliceIndex, nSamples, n);
@@ -430,7 +438,7 @@ public class WhisperContext {
 
   public void release() {
     stopCurrentTranscribe();
-    freeContext(context);
+    freeContext(id, context);
   }
 
   static {
@@ -497,10 +505,10 @@ public class WhisperContext {
   }
 
   // JNI methods
-  protected static native long initContext(String modelPath);
-  protected static native long initContextWithAsset(AssetManager assetManager, String modelPath);
-  protected static native long initContextWithInputStream(PushbackInputStream inputStream);
-  protected static native void freeContext(long contextPtr);
+  protected static native long initContext(int contextId, String modelPath);
+  protected static native long initContextWithAsset(int contextId, AssetManager assetManager, String modelPath);
+  protected static native long initContextWithInputStream(int contextId, PushbackInputStream inputStream);
+  protected static native void freeContext(int contextId, long contextPtr);
 
   protected static native int fullWithNewJob(
     int job_id,
@@ -535,10 +543,10 @@ public class WhisperContext {
   protected static native String bench(long context, int n_threads);
 
   // VAD JNI methods
-  protected static native long initVadContext(String modelPath);
-  protected static native long initVadContextWithAsset(AssetManager assetManager, String modelPath);
-  protected static native long initVadContextWithInputStream(PushbackInputStream inputStream);
-  protected static native void freeVadContext(long vadContextPtr);
+  protected static native long initVadContext(int contextId, String modelPath);
+  protected static native long initVadContextWithAsset(int contextId, AssetManager assetManager, String modelPath);
+  protected static native long initVadContextWithInputStream(int contextId, PushbackInputStream inputStream);
+  protected static native void freeVadContext(int contextId, long vadContextPtr);
   protected static native boolean vadDetectSpeech(long vadContextPtr, float[] audioData, int nSamples);
   protected static native long vadGetSegmentsFromProbs(long vadContextPtr, float threshold,
                                                        int minSpeechDurationMs, int minSilenceDurationMs,
@@ -559,4 +567,8 @@ public class WhisperContext {
       return null;
     }
   }
+
+  // JSI Installation
+  protected static native void installJSIBindings(long runtimePtr, Object callInvokerHolder);
+  protected static native void cleanupJSIBindings();
 }

package/android/src/main/java/com/rnwhisper/WhisperVadContext.java

@@ -94,7 +94,7 @@ public class WhisperVadContext {
 
     public void release() {
         if (vadContext != 0) {
-            WhisperContext.freeVadContext(vadContext);
+            WhisperContext.freeVadContext(id, vadContext);
             vadContext = 0;
         }
     }

package/android/src/main/jni.cpp

@@ -11,6 +11,11 @@
 #include "rn-whisper.h"
 #include "ggml.h"
 #include "jni-utils.h"
+#include "RNWhisperJSI.h"
+
+// Include fbjni headers for type-safe JNI
+#include <fbjni/fbjni.h>
+#include <ReactCommon/CallInvokerHolder.h>
 
 #define UNUSED(x) (void)(x)
 #define TAG "JNI"
@@ -193,7 +198,7 @@ extern "C" {
 
 JNIEXPORT jlong JNICALL
 Java_com_rnwhisper_WhisperContext_initContext(
-        JNIEnv *env, jobject thiz, jstring model_path_str) {
+        JNIEnv *env, jobject thiz, jint context_id, jstring model_path_str) {
     UNUSED(thiz);
     struct whisper_context_params cparams;
 
@@ -205,6 +210,7 @@ Java_com_rnwhisper_WhisperContext_initContext(
     const char *model_path_chars = env->GetStringUTFChars(model_path_str, nullptr);
     context = whisper_init_from_file_with_params(model_path_chars, cparams);
     env->ReleaseStringUTFChars(model_path_str, model_path_chars);
+    rnwhisper_jsi::addContext(context_id, reinterpret_cast<jlong>(context));
     return reinterpret_cast<jlong>(context);
 }
 
@@ -542,11 +548,12 @@ Java_com_rnwhisper_WhisperContext_getTextSegmentT1(
 
 JNIEXPORT void JNICALL
 Java_com_rnwhisper_WhisperContext_freeContext(
-        JNIEnv *env, jobject thiz, jlong context_ptr) {
+        JNIEnv *env, jobject thiz, jint context_id, jlong context_ptr) {
     UNUSED(env);
     UNUSED(thiz);
     struct whisper_context *context = reinterpret_cast<struct whisper_context *>(context_ptr);
     whisper_free(context);
+    rnwhisper_jsi::removeContext(context_id);
 }
 
 JNIEXPORT jboolean JNICALL
@@ -576,6 +583,7 @@ JNIEXPORT jlong JNICALL
 Java_com_rnwhisper_WhisperContext_initVadContext(
     JNIEnv *env,
     jobject thiz,
+    jint context_id,
     jstring model_path_str
 ) {
     UNUSED(thiz);
@@ -585,6 +593,7 @@ Java_com_rnwhisper_WhisperContext_initVadContext(
     const char *model_path_chars = env->GetStringUTFChars(model_path_str, nullptr);
     vad_context = whisper_vad_init_from_file_with_params(model_path_chars, vad_params);
     env->ReleaseStringUTFChars(model_path_str, model_path_chars);
+    rnwhisper_jsi::addVadContext(context_id, reinterpret_cast<jlong>(vad_context));
     return reinterpret_cast<jlong>(vad_context);
 }
 
@@ -592,6 +601,7 @@ JNIEXPORT jlong JNICALL
 Java_com_rnwhisper_WhisperContext_initVadContextWithAsset(
     JNIEnv *env,
     jobject thiz,
+    jint context_id,
     jobject asset_manager,
     jstring model_path_str
 ) {
@@ -602,6 +612,7 @@ Java_com_rnwhisper_WhisperContext_initVadContextWithAsset(
     const char *model_path_chars = env->GetStringUTFChars(model_path_str, nullptr);
     vad_context = whisper_vad_init_from_asset(env, asset_manager, model_path_chars, vad_params);
     env->ReleaseStringUTFChars(model_path_str, model_path_chars);
+    rnwhisper_jsi::addVadContext(context_id, reinterpret_cast<jlong>(vad_context));
     return reinterpret_cast<jlong>(vad_context);
 }
 
@@ -609,6 +620,7 @@ JNIEXPORT jlong JNICALL
 Java_com_rnwhisper_WhisperContext_initVadContextWithInputStream(
     JNIEnv *env,
     jobject thiz,
+    jint context_id,
     jobject input_stream
 ) {
     UNUSED(thiz);
@@ -616,6 +628,7 @@ Java_com_rnwhisper_WhisperContext_initVadContextWithInputStream(
 
     struct whisper_vad_context *vad_context = nullptr;
     vad_context = whisper_vad_init_from_input_stream(env, input_stream, vad_params);
+    rnwhisper_jsi::addVadContext(context_id, reinterpret_cast<jlong>(vad_context));
     return reinterpret_cast<jlong>(vad_context);
 }
 
@@ -623,12 +636,14 @@ JNIEXPORT void JNICALL
 Java_com_rnwhisper_WhisperContext_freeVadContext(
     JNIEnv *env,
     jobject thiz,
+    jint context_id,
     jlong vad_context_ptr
 ) {
     UNUSED(env);
     UNUSED(thiz);
     struct whisper_vad_context *vad_context = reinterpret_cast<struct whisper_vad_context *>(vad_context_ptr);
     whisper_vad_free(vad_context);
+    rnwhisper_jsi::removeVadContext(context_id);
 }
 
 JNIEXPORT jboolean JNICALL
@@ -726,4 +741,66 @@ Java_com_rnwhisper_WhisperContext_vadFreeSegments(
     whisper_vad_free_segments(segments);
 }
 
+// JSI Installation function using fbjni
+JNIEXPORT void JNICALL
+Java_com_rnwhisper_WhisperContext_installJSIBindings(
+    JNIEnv *env,
+    jclass clazz,
+    jlong runtimePtr,
+    jobject callInvokerHolder
+) {
+    auto runtime = reinterpret_cast<facebook::jsi::Runtime*>(runtimePtr);
+
+    if (runtime == nullptr) {
+        LOGW("Runtime is null, cannot install JSI bindings");
+        return;
+    }
+
+    std::shared_ptr<facebook::react::CallInvoker> callInvoker = nullptr;
+
+    if (callInvokerHolder != nullptr) {
+        try {
+            // Use fbjni for type-safe access to CallInvoker
+            auto holder = facebook::jni::alias_ref<facebook::react::CallInvokerHolder::javaobject>{
+                reinterpret_cast<facebook::react::CallInvokerHolder::javaobject>(callInvokerHolder)
+            };
+
+            if (holder) {
+                callInvoker = holder->cthis()->getCallInvoker();
+                LOGI("Successfully obtained CallInvoker using fbjni");
+            }
+        } catch (const std::exception& e) {
+            LOGW("Failed to obtain CallInvoker: %s", e.what());
+        } catch (...) {
+            LOGW("Failed to obtain CallInvoker: unknown error");
+        }
+    }
+
+    if (callInvoker == nullptr) {
+        LOGW("CallInvoker is null, cannot install JSI bindings");
+        return;
+    }
+
+    callInvoker->invokeAsync([runtime, callInvoker]() {
+        try {
+            rnwhisper_jsi::installJSIBindings(*runtime, callInvoker);
+            LOGI("JSI bindings installed successfully on JS thread");
+        } catch (const facebook::jsi::JSError& e) {
+            LOGW("JSError installing JSI bindings: %s", e.getMessage().c_str());
+        } catch (const std::exception& e) {
+            LOGW("Exception installing JSI bindings: %s", e.what());
+        } catch (...) {
+            LOGW("Unknown error installing JSI bindings");
+        }
+    });
+}
+
+JNIEXPORT void JNICALL
+Java_com_rnwhisper_WhisperContext_cleanupJSIBindings(
+    JNIEnv *env,
+    jclass clazz
+) {
+    rnwhisper_jsi::cleanupJSIBindings();
+}
+
 } // extern "C"

package/android/src/newarch/java/com/rnwhisper/RNWhisperModule.java

@@ -26,6 +26,11 @@ public class RNWhisperModule extends NativeRNWhisperSpec {
     rnwhisper = new RNWhisper(reactContext);
   }
 
+  @ReactMethod
+  public void installJSIBindings(Promise promise) {
+    rnwhisper.installJSIBindings(promise);
+  }
+
   @Override
   @NonNull
   public String getName() {

package/android/src/oldarch/java/com/rnwhisper/RNWhisperModule.java

@@ -26,6 +26,11 @@ public class RNWhisperModule extends ReactContextBaseJavaModule {
     rnwhisper = new RNWhisper(reactContext);
   }
 
+  @ReactMethod
+  public void installJSIBindings(Promise promise) {
+    rnwhisper.installJSIBindings(promise);
+  }
+
   @Override
   @NonNull
   public String getName() {