feat: android module with new architecture

Author: lukaszkurantdev

android/CMakeLists.txt

@@ -2,14 +2,52 @@ cmake_minimum_required(VERSION 3.4.1)
 project(FastOpencv)
 
 set (CMAKE_VERBOSE_MAKEFILE ON)
-set (CMAKE_CXX_STANDARD 14)
+set (CMAKE_CXX_STANDARD 20)
+
+find_package(ReactAndroid REQUIRED CONFIG)
+find_package(fbjni REQUIRED CONFIG)
+find_package(OpenCV REQUIRED COMPONENTS OpenCV::opencv_java4)
+
+add_library(react-native-fast-opencv
+        SHARED
+        ../node_modules/react-native/ReactCommon/jsi/jsi/jsi.cpp
+        ../cpp/react-native-fast-opencv.cpp
+        ../cpp/react-native-fast-opencv.h
+        cpp-adapter.cpp
+        ../cpp/ConvertImage.cpp
+        ../cpp/FOCV_Function.cpp
+        ../cpp/FOCV_FunctionArguments.cpp
+        ../cpp/FOCV_Ids.cpp
+        ../cpp/FOCV_JsiObject.cpp
+        ../cpp/FOCV_Object.cpp
+        ../cpp/FOCV_Storage.cpp
+        ../cpp/FOCV_Storage.hpp
+        ../cpp/UUID.cpp
+        ../cpp/jsi/TypedArray.cpp
+        ../cpp/jsi/Promise.cpp
 
-add_library(react-native-fast-opencv            SHARED
-            ../cpp/react-native-fast-opencv.cpp
-            cpp-adapter.cpp
 )
 
 # Specifies a path to native header files.
 include_directories(
-            ../cpp
+          ../cpp
+          ../cpp/jsi
+          "${NODE_MODULES_DIR}/react-native/React"
+          "${NODE_MODULES_DIR}/react-native/React/Base"
+          "${NODE_MODULES_DIR}/react-native/ReactCommon"
+          "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi"
+          "${NODE_MODULES_DIR}/react-native/ReactCommon/callinvoker"
+          "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni/react/turbomodule"
+)
+
+target_link_libraries(
+        react-native-fast-opencv
+        log
+        android
+        ReactAndroid::folly_runtime
+        ReactAndroid::glog
+        ReactAndroid::jsi
+        ReactAndroid::reactnativejni
+        fbjni::fbjni
+        OpenCV::opencv_java4
 )

android/build.gradle

@@ -1,3 +1,5 @@
+import java.nio.file.Paths
+
 buildscript {
   // Buildscript is evaluated before everything else so we can't use getExtOrDefault
   def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["FastOpencv_kotlinVersion"]
@@ -47,6 +49,23 @@ def supportsNamespace() {
   return (major == 7 && minor >= 3) || major >= 8
 }
 
+static def findNodeModules(baseDir) {
+  def basePath = baseDir.toPath().normalize()
+  // Node's module resolution algorithm searches up to the root directory,
+  // after which the base path will be null
+  while (basePath) {
+    def nodeModulesPath = Paths.get(basePath.toString(), "node_modules")
+    def reactNativePath = Paths.get(nodeModulesPath.toString(), "react-native")
+    if (nodeModulesPath.toFile().exists() && reactNativePath.toFile().exists()) {
+      return nodeModulesPath.toString()
+    }
+    basePath = basePath.getParent()
+  }
+  throw new GradleException("react-native-fast-tflite: Failed to find node_modules/ path!")
+}
+
+def nodeModules = findNodeModules(projectDir)
+
 android {
   if (supportsNamespace()) {
     namespace "com.fastopencv"
@@ -66,13 +85,33 @@ android {
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
+    buildFeatures {
+      prefab=true
+    }
+
     externalNativeBuild {
       cmake {
+        arguments "-DANDROID_STL=c++_shared",
+          "-DNODE_MODULES_DIR=${nodeModules}"
         cppFlags "-O2 -frtti -fexceptions -Wall -fstack-protector-all"
         abiFilters (*reactNativeArchitectures())
       }
     }
   }
+  packagingOptions {
+    excludes = [
+      "META-INF",
+      "META-INF/**",
+      "**/libc++_shared.so",
+      "**/libfbjni.so",
+      "**/libjsi.so",
+      "**/libreactnativejni.so",
+      "**/libturbomodulejsijni.so",
+      "**/libreact_nativemodule_core.so",
+      "**/libfolly_runtime.so",
+      "**/libglog.so"
+    ]
+  }
 
   externalNativeBuild {
     cmake {
@@ -127,6 +166,7 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+  implementation 'org.opencv:opencv:4.9.0'
 }
 
 if (isNewArchitectureEnabled()) {

android/cpp-adapter.cpp

@@ -1,8 +1,22 @@
 #include <jni.h>
+#include <jsi/jsi.h>
+
 #include "react-native-fast-opencv.h"
+#include <ReactCommon/CallInvokerHolder.h>
+
+using namespace facebook;
 
 extern "C"
-JNIEXPORT jdouble JNICALL
-Java_com_fastopencv_FastOpencvModule_nativeMultiply(JNIEnv *env, jclass type, jdouble a, jdouble b) {
-    return fastopencv::multiply(a, b);
+JNIEXPORT void JNICALL
+Java_com_fastopencv_FastOpencvModule_nativeInstall(JNIEnv *env, jobject thiz, jlong jsi_runtime_ref,
+        jobject js_call_invoker_holder) {
+        auto jsiRuntime{ reinterpret_cast<jsi::Runtime*>(jsi_runtime_ref) };
+        auto jsCallInvoker{ jni::alias_ref<react::CallInvokerHolder::javaobject>{reinterpret_cast<react::CallInvokerHolder::javaobject>(js_call_invoker_holder) }->cthis()->getCallInvoker() };
+
+        //    RNWorklet::JsiWorkletContext::getDefaultInstance()->initialize(
+        //    "default", jsiRuntime, [=](std::function<void()> &&f) {
+        //        jsCallInvoker->invokeAsync(std::move(f));
+        //    });
+
+        OpenCVPlugin::installOpenCV(*jsiRuntime, jsCallInvoker);
 }

android/src/main/java/com/fastopencv/FastOpencvModule.kt

@@ -1,8 +1,10 @@
 package com.fastopencv
 
+import android.util.Log
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
-import com.facebook.react.bridge.Promise
+import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder
+
 
 class FastOpencvModule internal constructor(context: ReactApplicationContext) :
   FastOpencvSpec(context) {
@@ -11,14 +13,36 @@ class FastOpencvModule internal constructor(context: ReactApplicationContext) :
     return NAME
   }
 
-  // Example method
-  // See https://reactnative.dev/docs/native-modules-android
-  @ReactMethod
-  override fun multiply(a: Double, b: Double, promise: Promise) {
-    promise.resolve(a * b)
-  }
-
   companion object {
     const val NAME = "FastOpencv"
+
+    init {
+      System.loadLibrary("react-native-fast-opencv")
+    }
+  }
+
+  private external fun nativeInstall(jsiRuntimeRef: Long, jsCallInvokerHolder: CallInvokerHolder?)
+
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  override fun install(): Boolean {
+    val jsContext = reactApplicationContext.javaScriptContextHolder
+
+    try {
+      if (jsContext == null) {
+        Log.e(NAME, "React Application Context was null!")
+        return false
+      }
+      val jsiRuntimeRef = jsContext!!.get()
+      val jsCallInvokerHolder = reactApplicationContext.catalystInstance.jsCallInvokerHolder
+
+      nativeInstall(jsiRuntimeRef, jsCallInvokerHolder)
+
+      return true
+    } catch (exception: Exception) {
+      Log.e(NAME, "Failed to initialize react-native-worklets-core!", exception)
+
+    }
+
+    return false
   }
 }

android/src/oldarch/FastOpencvSpec.kt

@@ -7,5 +7,5 @@ import com.facebook.react.bridge.Promise
 abstract class FastOpencvSpec internal constructor(context: ReactApplicationContext) :
   ReactContextBaseJavaModule(context) {
 
-  abstract fun multiply(a: Double, b: Double, promise: Promise)
+  abstract fun install(): Boolean
 }