fix: project init and android settings

Author: JimmyDaddy

.gitignore

@@ -67,6 +67,7 @@ android/keystores/debug.keystore
 !.yarn/releases
 !.yarn/sdks
 !.yarn/versions
+yarn.lock
 
 # Expo
 .expo/

android/CMakeLists.txt

@@ -4,12 +4,15 @@ project(BsDiffPatch)
 set (CMAKE_VERBOSE_MAKEFILE ON)
 set (CMAKE_CXX_STANDARD 11)
 
+file(GLOB_RECURSE SOURCES "../cpp/*.c" "../cpp/*.cpp" "../cpp/bzlib/*.c" "../cpp/bzlib/*.cpp")
+
 add_library(react-native-bs-diff-patch            SHARED
-            ../cpp/react-native-bs-diff-patch.cpp
+            ${SOURCES}
             cpp-adapter.cpp
 )
 
 # Specifies a path to native header files.
 include_directories(
             ../cpp
+            ../cpp/bzlib
 )

android/build.gradle

@@ -1,11 +1,13 @@
 buildscript {
+  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["BsDiffPatch_kotlinVersion"]
   repositories {
     google()
     mavenCentral()
   }
 
   dependencies {
     classpath "com.android.tools.build:gradle:7.2.1"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
 }
 
@@ -14,6 +16,7 @@ def isNewArchitectureEnabled() {
 }
 
 apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
 
 if (isNewArchitectureEnabled()) {
   apply plugin: "com.facebook.react"
@@ -38,7 +41,7 @@ def supportsNamespace() {
 
 android {
   if (supportsNamespace()) {
-    namespace "com.bsdiffpatch"
+    namespace "com.jimmydaddy.bsdiffpatch"
 
     sourceSets {
       main {
@@ -88,11 +91,13 @@ repositories {
   google()
 }
 
+def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
   // For < 0.71, this will be from the local maven repo
   // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 

android/cpp-adapter.cpp

@@ -2,7 +2,37 @@
 #include "react-native-bs-diff-patch.h"
 
 extern "C"
-JNIEXPORT jdouble JNICALL
-Java_com_bsdiffpatch_BsDiffPatchModule_nativeMultiply(JNIEnv *env, jclass type, jdouble a, jdouble b) {
-    return bsdiffpatch::multiply(a, b);
+
+JNIEXPORT jint JNICALL
+Java_com_jimmydaddy_bsdiffpatch_BsDiffPatchModule_00024Companion_bsDiffFile(JNIEnv *env,
+                                                                            jobject type, jstring oldFile_,
+                                                  jstring newFile_, jstring patchFile_) {
+    const char *oldFile = env->GetStringUTFChars(oldFile_, 0);
+    const char *newFile = env->GetStringUTFChars(newFile_, 0);
+    const char *patchFile = env->GetStringUTFChars(patchFile_, 0);
+
+    int result = bsdiffpatch::diffFile(oldFile, newFile, patchFile);
+
+    env->ReleaseStringUTFChars(oldFile_, oldFile);
+    env->ReleaseStringUTFChars(newFile_, newFile);
+    env->ReleaseStringUTFChars(patchFile_, patchFile);
+
+    return result;
+}
+
+extern "C" JNIEXPORT jint JNICALL
+Java_com_jimmydaddy_bsdiffpatch_BsDiffPatchModule_00024Companion_bsPatchFile(JNIEnv *env,
+                                                                             jobject type, jstring oldFile_,
+                                                   jstring newFile_, jstring patchFile_) {
+    const char *oldFile = env->GetStringUTFChars(oldFile_, 0);
+    const char *newFile = env->GetStringUTFChars(newFile_, 0);
+    const char *patchFile = env->GetStringUTFChars(patchFile_, 0);
+
+    int result = bsdiffpatch::patchFile(oldFile, newFile, patchFile);
+
+    env->ReleaseStringUTFChars(oldFile_, oldFile);
+    env->ReleaseStringUTFChars(newFile_, newFile);
+    env->ReleaseStringUTFChars(patchFile_, patchFile);
+
+    return result;
 }

android/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.bsdiffpatch">
+          package="com.jimmydaddy.bsdiffpatch">
 </manifest>

android/src/main/java/com/bsdiffpatch/BsDiffPatchModule.java

@@ -0,0 +1,107 @@
+package com.jimmydaddy.bsdiffpatch
+
+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.jimmydaddy.bsdiffpatch.BsDiffPatchModule
+import java.io.File
+
+@ReactModule(name = BsDiffPatchModule.NAME)
+class BsDiffPatchModule(reactContext: ReactApplicationContext?) :
+    ReactContextBaseJavaModule(reactContext) {
+    override fun getName(): String {
+        return NAME
+    }
+
+    fun getFileDir(dir: String): String {
+        if (dir.startsWith("file://")) {
+            return dir.substring(7)
+        }
+        return dir
+    }
+
+    // Example method
+    // See https://reactnative.dev/docs/native-modules-android
+    @ReactMethod
+    fun patch(oldFile: String?, newFile: String?, patchFile: String?, promise: Promise) {
+        if (oldFile == null || newFile == null || patchFile == null || oldFile.isEmpty() || newFile.isEmpty() || patchFile.isEmpty()) {
+            promise.reject("error", "oldFile, newFile, patchFile can not be null or empty")
+            return
+        }
+        if (oldFile == newFile || oldFile == patchFile || newFile == patchFile) {
+            promise.reject("error", "oldFile, newFile, patchFile can not be the same")
+            return
+        }
+        val oldFileObj = File(getFileDir(oldFile))
+        if (!oldFileObj.exists()) {
+            promise.reject("error", "oldFile not exist")
+            return
+        }
+        val patchFileObj = File(getFileDir(patchFile))
+        if (!patchFileObj.exists()) {
+            promise.reject("error", "patchFile not exist")
+            return
+        }
+        val newFileObj = File(getFileDir(newFile))
+        if (newFileObj.exists()) {
+            promise.reject("error", "newFile already exist")
+            return
+        }
+        try {
+            val result = bsPatchFile(oldFileObj.absolutePath, newFileObj.absolutePath, patchFileObj.absolutePath)
+            promise.resolve(result)
+        } catch (e: Exception) {
+            promise.reject("error", e.message)
+        }
+    }
+
+    @ReactMethod
+    fun diff(oldFile: String?, newFile: String?, patchFile: String?, promise: Promise) {
+        if (oldFile == null || newFile == null || patchFile == null || oldFile.isEmpty() || newFile.isEmpty() || patchFile.isEmpty()) {
+            promise.reject("error", "oldFile, newFile, patchFile can not be null or empty")
+            return
+        }
+        if (oldFile == newFile || oldFile == patchFile || newFile == patchFile) {
+            promise.reject("error", "oldFile, newFile, patchFile can not be the same")
+            return
+        }
+        val oldFileObj = File(getFileDir(oldFile))
+        if (!oldFileObj.exists()) {
+            promise.reject("error", "oldFile not exist")
+            return
+        }
+        val newFileObj = File(getFileDir(newFile))
+        if (!newFileObj.exists()) {
+            promise.reject("error", "newFile not exist")
+            return
+        }
+        val patchFileObj = File(getFileDir(patchFile))
+        if (patchFileObj.exists()) {
+            promise.reject("error", "patchFile already exist")
+            return
+        }
+        try {
+            val result = bsDiffFile(oldFileObj.absolutePath, newFileObj.absolutePath, patchFileObj.absolutePath)
+            promise.resolve(result)
+        } catch (e: Exception) {
+            promise.reject("error", e.message)
+        }
+    }
+
+    companion object {
+        const val NAME = "BsDiffPatch"
+
+        init {
+            System.loadLibrary("react-native-bs-diff-patch")
+        }
+
+        // Used to load the 'native-lib' library on application startup.
+        // get new file from old file and patch file
+        private external fun bsPatchFile(oldFile: String, newFile: String, patchFile: String): Int
+
+        // generate patch file
+        private external fun bsDiffFile(oldFile: String, newFile: String, patchFile: String): Int
+    }
+}

android/src/main/java/com/bsdiffpatch/BsDiffPatchPackage.java

@@ -0,0 +1,18 @@
+package com.jimmydaddy.bsdiffpatch
+
+import com.facebook.react.ReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ViewManager
+
+class BsDiffPatchPackage : ReactPackage {
+    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
+        val modules: MutableList<NativeModule> = ArrayList()
+        modules.add(BsDiffPatchModule(reactContext))
+        return modules
+    }
+
+    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+        return emptyList()
+    }
+}