feat: v1

Author: niranjannitesh

android/CMakeLists.txt

@@ -1,15 +1,36 @@
-cmake_minimum_required(VERSION 3.4.1)
+project(ReactNativeMsgPack)
+cmake_minimum_required(VERSION 3.9.0)
 
+set (PACKAGE_NAME "react-native-msgpack")
+set (BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
 set (CMAKE_VERBOSE_MAKEFILE ON)
-set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_CXX_STANDARD 17)
+
+include_directories(
+        ../cpp
+)
 
 add_library(cpp
             SHARED
-            ../cpp/react-native-msgpack.cpp
             cpp-adapter.cpp
+            ../cpp/react-native-msgpack.hpp
+            ../cpp/cmp.c
+            ../cpp/cmp.h
+            ../cpp/msgpack.hpp
 )
 
-# Specifies a path to native header files.
-include_directories(
-            ../cpp
+set_target_properties(
+        cpp PROPERTIES
+        CXX_STANDARD 17
+        CXX_EXTENSIONS OFF
+        POSITION_INDEPENDENT_CODE ON
+)
+
+
+find_package(ReactAndroid REQUIRED CONFIG)
+
+target_link_libraries(
+        cpp
+        ReactAndroid::jsi
+        android
 )

android/build.gradle

@@ -27,32 +27,51 @@ def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["Msgpack_" + name]).toInteger()
 }
 
+def resolveBuildType() {
+  Gradle gradle = getGradle()
+  String tskReqStr = gradle.getStartParameter().getTaskRequests()['args'].toString()
+
+  return tskReqStr.contains('Release') ? 'release' : 'debug'
+}
+
 android {
   ndkVersion getExtOrDefault("ndkVersion")
+  ndkPath getExtOrDefault("ndkPath")
   compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
+  buildFeatures {
+    prefab true
+  }
+
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
     externalNativeBuild {
       cmake {
-        cppFlags "-O2 -frtti -fexceptions -Wall -fstack-protector-all"
+        cppFlags "-O2 -frtti -fexceptions -Wall -Wno-unused-variable -fstack-protector-all"
+        arguments "-DANDROID_STL=c++_shared"
         abiFilters "x86", "x86_64", "armeabi-v7a", "arm64-v8a"
       }
     }
   }
+
   externalNativeBuild {
     cmake {
       path "CMakeLists.txt"
     }
   }
-  buildTypes {
-    release {
-      minifyEnabled false
-    }
+
+  packagingOptions {
+    doNotStrip resolveBuildType() == 'debug' ? "**/**/*.so" : ''
+    excludes = [
+      "META-INF",
+      "META-INF/**",
+      "**/libjsi.so",
+    ]
   }
 
+
   lintOptions {
     disable "GradleCompatible"
   }
@@ -84,3 +103,18 @@ if (isNewArchitectureEnabled()) {
     codegenJavaPackageName = "com.msgpack"
   }
 }
+
+
+tasks.whenTaskAdded { task ->
+  if (task.name.contains("configureCMakeDebug")) {
+    rootProject.getTasksByName("packageReactNdkDebugLibs", true).forEach {
+      task.dependsOn(it)
+    }
+  }
+  // We want to add a dependency for both configureCMakeRelease and configureCMakeRelWithDebInfo
+  if (task.name.contains("configureCMakeRel")) {
+    rootProject.getTasksByName("packageReactNdkReleaseLibs", true).forEach {
+      task.dependsOn(it)
+    }
+  }
+}

android/cpp-adapter.cpp

@@ -1,8 +1,9 @@
 #include <jni.h>
-#include "react-native-msgpack.h"
+#include "react-native-msgpack.hpp"
 
-extern "C"
-JNIEXPORT jint JNICALL
-Java_com_msgpack_MsgpackModule_nativeMultiply(JNIEnv *env, jclass type, jdouble a, jdouble b) {
-    return msgpack::multiply(a, b);
+extern "C" JNIEXPORT void JNICALL
+Java_com_msgpack_MsgpackModule_nativeInstall(JNIEnv *env, jobject thiz, jlong jsi)
+{
+  auto runtime = reinterpret_cast<jsi::Runtime *>(jsi);
+  install(*runtime);
 }

android/src/main/java/com/msgpack/MsgpackModule.java

@@ -1,12 +1,15 @@
 package com.msgpack;
 
+import android.util.Log;
+
 import androidx.annotation.NonNull;
 
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.module.annotations.ReactModule;
+import com.facebook.react.bridge.JavaScriptContextHolder;
 
 @ReactModule(name = MsgpackModule.NAME)
 public class MsgpackModule extends ReactContextBaseJavaModule {
@@ -23,15 +26,24 @@ public String getName() {
   }
 
   static {
+    Log.i(NAME, "Loading C++ library...");
     System.loadLibrary("cpp");
   }
 
-  private static native double nativeMultiply(double a, double b);
-
-  // Example method
-  // See https://reactnative.dev/docs/native-modules-android
-  @ReactMethod
-  public void multiply(double a, double b, Promise promise) {
-    promise.resolve(nativeMultiply(a, b));
+  private native void nativeInstall(long jsi);
+
+
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  public boolean install() {
+    try {
+      ReactApplicationContext reactContext = getReactApplicationContext();
+      JavaScriptContextHolder contextHolder = reactContext.getJavaScriptContextHolder();
+      this.nativeInstall(contextHolder.get());
+      Log.i(NAME, "Successfully installed!");
+      return true;
+    } catch (Exception exception) {
+      Log.e(NAME, "Failed to install JSI Bindings!", exception);
+      return false;
+    }
   }
 }