@filen/sdk-rs 0.3.22 → 0.3.25

package/android/CMakeLists.txt

@@ -0,0 +1,80 @@
+# Generated by uniffi-bindgen-react-native
+cmake_minimum_required(VERSION 3.9.0)
+project(SdkRs)
+
+set (CMAKE_VERBOSE_MAKEFILE ON)
+set (CMAKE_CXX_STANDARD 17)
+
+# Resolve the path to the uniffi-bindgen-react-native package
+execute_process(
+    COMMAND node -p "require.resolve('uniffi-bindgen-react-native/package.json')"
+    OUTPUT_VARIABLE UNIFFI_BINDGEN_PATH
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+# Get the directory; get_filename_component and cmake_path will normalize
+# paths with Windows path separators.
+get_filename_component(UNIFFI_BINDGEN_PATH "${UNIFFI_BINDGEN_PATH}" DIRECTORY)
+
+# Specifies a path to native header files.
+include_directories(
+    ../cpp
+    ../cpp/generated
+
+    ${UNIFFI_BINDGEN_PATH}/cpp/includes
+)
+
+add_library(filen-sdk-rs            SHARED
+    ../cpp/filen-sdk-rs.cpp
+    ../cpp/generated/filen_sdk_rs.cpp
+    ../cpp/generated/filen_types.cpp
+    cpp-adapter.cpp
+)
+
+# Set C++ compiler flags
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -frtti")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+
+# Set linker flags for 16KB page size alignment (required for Android 15+)
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,max-page-size=16384")
+
+cmake_path(
+  SET MY_RUST_LIB
+  ${CMAKE_SOURCE_DIR}/src/main/jniLibs/${ANDROID_ABI}/libfilen_sdk_rs.so
+  NORMALIZE
+)
+add_library(my_rust_lib SHARED IMPORTED)
+set_target_properties(my_rust_lib PROPERTIES IMPORTED_LOCATION ${MY_RUST_LIB} IMPORTED_NO_SONAME ON)
+
+# Add ReactAndroid libraries, being careful to account for different versions.
+find_package(ReactAndroid REQUIRED CONFIG)
+find_library(LOGCAT log)
+
+# REACTNATIVE_MERGED_SO seems to be only be set in a build.gradle.kt file,
+# which we don't use. Thus falling back to version number sniffing.
+if (ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
+  set(REACTNATIVE_MERGED_SO true)
+endif()
+
+# https://github.com/react-native-community/discussions-and-proposals/discussions/816
+# This if-then-else can be removed once this library does not support version below 0.76
+if (REACTNATIVE_MERGED_SO)
+  target_link_libraries(filen-sdk-rs ReactAndroid::reactnative)
+else()
+  target_link_libraries(filen-sdk-rs
+    ReactAndroid::turbomodulejsijni
+    ReactAndroid::react_nativemodule_core
+  )
+endif()
+
+find_package(fbjni REQUIRED CONFIG)
+target_link_libraries(
+  filen-sdk-rs
+  fbjni::fbjni
+  ReactAndroid::jsi
+  ${LOGCAT}
+  my_rust_lib
+)

package/android/build.gradle

@@ -0,0 +1,144 @@
+// Generated by uniffi-bindgen-react-native
+
+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["DummyLibForAndroid_kotlinVersion"]
+
+  repositories {
+    google()
+    mavenCentral()
+  }
+
+  dependencies {
+    classpath "com.android.tools.build:gradle:7.2.1"
+    // noinspection DifferentKotlinGradleVersion
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+  }
+}
+
+def reactNativeArchitectures() {
+  def value = rootProject.getProperties().get("reactNativeArchitectures")
+  return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
+}
+
+def isNewArchitectureEnabled() {
+  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
+}
+
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
+
+if (isNewArchitectureEnabled()) {
+  apply plugin: "com.facebook.react"
+}
+
+def getExtOrDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["SdkRs_" + name]
+}
+
+def getExtOrIntegerDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["SdkRs_" + name]).toInteger()
+}
+
+def supportsNamespace() {
+  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+  def major = parsed[0].toInteger()
+  def minor = parsed[1].toInteger()
+
+  // Namespace support was added in 7.3.0
+  return (major == 7 && minor >= 3) || major >= 8
+}
+
+android {
+  if (supportsNamespace()) {
+    namespace "io.filen.sdkrsturbomodule"
+
+    sourceSets {
+      main {
+        manifest.srcFile "src/main/AndroidManifestNew.xml"
+      }
+    }
+  }
+
+  ndkVersion getExtOrDefault("ndkVersion")
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+
+  defaultConfig {
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+    consumerProguardFiles 'proguard-rules.pro'
+
+    buildFeatures {
+      prefab true
+    }
+    externalNativeBuild {
+      cmake {
+        arguments '-DANDROID_STL=c++_shared'
+        abiFilters (*reactNativeArchitectures())
+      }
+    }
+    ndk {
+      abiFilters "arm64-v8a", "x86_64"
+    }
+  }
+
+  externalNativeBuild {
+    cmake {
+      path "CMakeLists.txt"
+    }
+  }
+
+  buildFeatures {
+    buildConfig true
+  }
+
+  buildTypes {
+    release {
+      minifyEnabled false
+    }
+  }
+
+  lintOptions {
+    disable "GradleCompatible"
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+
+  sourceSets {
+    main {
+      if (isNewArchitectureEnabled()) {
+          java.srcDirs += [
+            "generated/java",
+            "generated/jni"
+          ]
+      }
+    }
+  }
+}
+
+repositories {
+  mavenCentral()
+  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"
+}
+
+if (isNewArchitectureEnabled()) {
+  react {
+    jsRootDir = file("../src/")
+    libraryName = "SdkRs"
+    codegenJavaPackageName = "io.filen.sdkrsturbomodule"
+  }
+}

package/android/cpp-adapter.cpp

@@ -0,0 +1,43 @@
+// Generated by uniffi-bindgen-react-native
+#include <jni.h>
+#include <jsi/jsi.h>
+#include <ReactCommon/CallInvokerHolder.h>
+#include "filen-sdk-rs.h"
+
+namespace jsi = facebook::jsi;
+namespace react = facebook::react;
+
+// Automated testing checks Java_io_filen_sdkrsturbomodule_SdkRsModule and filen_sdkrs
+// by comparing the whole line here.
+/*
+Java_io_filen_sdkrsturbomodule_SdkRsModule_nativeMultiply(JNIEnv *env, jclass type, jdouble a, jdouble b) {
+    return filen_sdkrs::multiply(a, b);
+}
+*/
+
+// Installer coming from SdkRsModule
+extern "C"
+JNIEXPORT jboolean JNICALL
+Java_io_filen_sdkrsturbomodule_SdkRsModule_nativeInstallRustCrate(
+    JNIEnv *env,
+    jclass type,
+    jlong rtPtr,
+    jobject callInvokerHolderJavaObj
+) {
+    using JCallInvokerHolder = facebook::react::CallInvokerHolder;
+
+    auto holderLocal = facebook::jni::make_local(callInvokerHolderJavaObj);
+    auto holderRef = facebook::jni::static_ref_cast<JCallInvokerHolder::javaobject>(holderLocal);
+    auto* holderCxx = holderRef->cthis();
+    auto jsCallInvoker = holderCxx->getCallInvoker();
+    auto runtime = reinterpret_cast<jsi::Runtime *>(rtPtr);
+
+    return filen_sdkrs::installRustCrate(*runtime, jsCallInvoker);
+}
+
+extern "C"
+JNIEXPORT jboolean JNICALL
+Java_io_filen_sdkrsturbomodule_SdkRsModule_nativeCleanupRustCrate(JNIEnv *env, jclass type, jlong rtPtr) {
+    auto runtime = reinterpret_cast<jsi::Runtime *>(rtPtr);
+    return filen_sdkrs::cleanupRustCrate(*runtime);
+}

package/android/src/main/AndroidManifest.xml

@@ -0,0 +1,5 @@
+
+<!-- Generated by uniffi-bindgen-react-native -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="io.filen.sdkrsturbomodule">
+</manifest>

package/android/src/main/java/io/filen/sdkrsturbomodule/SdkRsModule.kt

@@ -0,0 +1,43 @@
+// Generated by uniffi-bindgen-react-native
+package io.filen.sdkrsturbomodule
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder
+
+@ReactModule(name = SdkRsModule.NAME)
+class SdkRsModule(reactContext: ReactApplicationContext) :
+  NativeSdkRsSpec(reactContext) {
+
+  override fun getName(): String {
+    return NAME
+  }
+
+  // Two native methods implemented in cpp-adapter.cpp, and ultimately
+  // filen-sdk-rs.cpp
+
+  external fun nativeInstallRustCrate(runtimePointer: Long, callInvoker: CallInvokerHolder): Boolean
+  external fun nativeCleanupRustCrate(runtimePointer: Long): Boolean
+
+  override fun installRustCrate(): Boolean {
+    val context = this.reactApplicationContext
+    return nativeInstallRustCrate(
+      context.javaScriptContextHolder!!.get(),
+      context.jsCallInvokerHolder!!
+    )
+  }
+
+  override fun cleanupRustCrate(): Boolean {
+    return nativeCleanupRustCrate(
+      this.reactApplicationContext.javaScriptContextHolder!!.get()
+    )
+  }
+
+  companion object {
+    const val NAME = "SdkRs"
+
+    init {
+      System.loadLibrary("filen-sdk-rs")
+    }
+  }
+}

package/android/src/main/java/io/filen/sdkrsturbomodule/SdkRsPackage.kt

@@ -0,0 +1,34 @@
+// Generated by uniffi-bindgen-react-native
+package io.filen.sdkrsturbomodule
+
+import com.facebook.react.TurboReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+import java.util.HashMap
+
+class SdkRsPackage : TurboReactPackage() {
+  override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+    return if (name == SdkRsModule.NAME) {
+      SdkRsModule(reactContext)
+    } else {
+      null
+    }
+  }
+
+  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+    return ReactModuleInfoProvider {
+      val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
+      moduleInfos[SdkRsModule.NAME] = ReactModuleInfo(
+        SdkRsModule.NAME,
+        SdkRsModule.NAME,
+        false,  // canOverrideExistingModule
+        false,  // needsEagerInit
+        false,  // isCxxModule
+        true // isTurboModule
+      )
+      moduleInfos
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@filen/sdk-rs",
-  "version": "0.3.22",
+  "version": "0.3.25",
   "description": "Filen JS SDK using filen-sdk-rs",
   "type": "module",
   "scripts": {
@@ -8,7 +8,7 @@
     "ubrn:ios": "ubrn build ios --and-generate",
     "ubrn:android": "ubrn build android --and-generate",
     "ubrn:checkout": "ubrn checkout",
-    "ubrn:release": "ubrn build ios --release --and-generate && ubrn build android --release"
+    "ubrn:release": "ubrn build ios --release --and-generate && ubrn build android --release --and-generate"
   },
   "homepage": "https://github.com/FilenCloudDienste/filen-rs",
   "author": "Filen",
@@ -16,9 +16,12 @@
     "Enduriel <endur1el@protonmail.com>"
   ],
   "files": [
-    "browser",
-    "filen-sdk-worker-thread.js",
+    "sdk-rs_bg.wasm",
+    "sdk-rs_bg.wasm.d.ts",
+    "sdk-rs.d.ts",
+    "sdk-rs.js",
     "snippets",
+    "filen-sdk-worker-thread.js",
     "android/src/main/",
     "android/build.gradle",
     "android/CMakeLists.txt",
@@ -29,7 +32,7 @@
     "src",
     "SdkRs.podspec"
   ],
-  "main": "./browser/sdk-rs.js",
+  "main": "./sdk-rs.js",
   "react-native": "./src/index.tsx",
   "exports": {
     ".": {
@@ -38,13 +41,16 @@
         "types": "./src/index.tsx"
       },
       "browser": {
-        "import": "./browser/sdk-rs.js",
-        "types": "./browser/sdk-rs.d.ts"
-      }
-    }
+        "import": "./sdk-rs.js",
+        "types": "./sdk-rs.d.ts"
+      },
+      "types": "./sdk-rs.d.ts",
+      "default": "./sdk-rs.js"
+    },
+    "./sdk-rs_bg.wasm": "./sdk-rs_bg.wasm"
   },
   "sideEffects": [
-    "/browser/sdk-rs.js"
+    "./sdk-rs.js"
   ],
   "license": "AGPL-3.0-only",
   "keywords": [