react-native-quick-crypto 0.7.11 → 1.0.0-beta.10

package/QuickCrypto.podspec

@@ -0,0 +1,47 @@
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+
+Pod::UI.puts "[QuickCrypto]  💨 crypto just got quicker"
+
+Pod::Spec.new do |s|
+  s.name         = "QuickCrypto"
+  s.version      = package["version"]
+  s.summary      = package["description"]
+  s.homepage     = package["homepage"]
+  s.license      = package["license"]
+  s.authors      = package["authors"]
+
+  s.ios.deployment_target = 16.0 # min_ios_version_supported (see https://github.com/Expensify/App/pull/53149#issuecomment-2562786065)
+  s.visionos.deployment_target = 1.0
+  s.macos.deployment_target = 10.13
+  s.tvos.deployment_target = 13.4
+
+  s.source       = { :git => "https://github.com/margelo/react-native-quick-crypto.git", :tag => "#{s.version}" }
+
+  s.source_files = [
+    # implementation (Swift)
+    "ios/**/*.{swift}",
+    # ios (Objective-C++)
+    "ios/**/*.{h,m,mm}",
+    # implementation (C++)
+    "cpp/**/*.{hpp,cpp}",
+    # dependencies (C++)
+    "deps/**/*.{hpp,cpp}",
+    # dependencies (C)
+    "deps/**/*.{h,c}",
+  ]
+
+  if ENV["USE_FRAMEWORKS"]
+    s.dependency "React-Core"
+    add_dependency(s, "React-jsinspector", :framework_name => "jsinspector_modern")
+    add_dependency(s, "React-rendererconsistency", :framework_name => "React_rendererconsistency")
+  end
+
+  # Add all files generated by Nitrogen
+  load 'nitrogen/generated/ios/QuickCrypto+autolinking.rb'
+  add_nitrogen_files(s)
+
+  s.dependency "OpenSSL-Universal"
+  install_modules_dependencies(s)
+end

package/README.md

@@ -6,7 +6,9 @@
 
 A fast implementation of Node's `crypto` module.
 
-> Note: This version `0.x` is the Old Architecture, Bridged version for React Native.  The `1.x` and higher branches are refactored to work with the New Architecture, Bridgeless, and [`Nitro Modules`](https://github.com/mrousavy/react-native-nitro).  Status, as always, will be represented in [implementation-coverage.md](../0.x/docs/implementation-coverage.md).
+> Note: This version `1.x` is undergoing a major refactor, porting to New Architecture, Bridgeless, and [`Nitro Modules`](https://github.com/mrousavy/react-native-nitro) and is incomplete compared to the `0.x` version.  Status, as always, will be represented in [implementation-coverage.md](../main/docs/implementation-coverage.md).
+
+> Note: Minimum supported version of React Native is `0.75`.  If you need to use earlier versions, please use `0.x` versions of this library.
 
 ## Features
 
@@ -24,8 +26,8 @@ QuickCrypto can be used as a drop-in replacement for your Web3/Crypto apps to sp
 
 | Version | RN Architecture | Modules |
 | ------- | ------ | ------- |
-| `0.x` (you are here) | old  | Bridge & JSI |
-| `1.x`+     | new [->](https://github.com/reactwg/react-native-new-architecture/blob/main/docs/enable-apps.md)  | Nitro Modules [->](https://github.com/margelo/react-native-nitro) |
+| `1.x`     | new [->](https://github.com/reactwg/react-native-new-architecture/blob/main/docs/enable-apps.md)  | Nitro Modules [->](https://github.com/margelo/react-native-nitro) |
+| `0.x`     | old  | Bridge & JSI |
 
 ## Benchmarks
 
@@ -59,7 +61,7 @@ Creating a Wallet took 289 ms
 </h3>
 
 ```sh
-yarn add react-native-quick-crypto
+bun add react-native-quick-crypto react-native-nitro-modules
 cd ios && pod install
 ```
 

package/android/CMakeLists.txt

@@ -1,84 +1,55 @@
-project(ReactNativeQuickCrypto)
+project(QuickCrypto)
 cmake_minimum_required(VERSION 3.9.0)
 
-set(PACKAGE_NAME "reactnativequickcrypto")
-set(BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
+set(PACKAGE_NAME QuickCrypto)
 set(CMAKE_VERBOSE_MAKEFILE ON)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 # Define C++ library and add all sources
 add_library(
   ${PACKAGE_NAME} SHARED
   src/main/cpp/cpp-adapter.cpp
-  ../cpp/MGLQuickCryptoHostObject.cpp
-  ../cpp/JSIUtils/MGLTypedArray.cpp
-  ../cpp/Utils/MGLDispatchQueue.cpp
-  ../cpp/JSIUtils/MGLThreadAwareHostObject.cpp
-  ../cpp/JSIUtils/MGLSmartHostObject.cpp
-  ../cpp/HMAC/MGLHmacInstaller.cpp
-  ../cpp/HMAC/MGLHmacHostObject.cpp
-  ../cpp/fastpbkdf2/MGLPbkdf2HostObject.cpp
-  ../cpp/fastpbkdf2/fastpbkdf2.c
-  ../cpp/Random/MGLRandomHostObject.cpp
-  ../cpp/Hash/MGLHashInstaller.cpp
-  ../cpp/Hash/MGLHashHostObject.cpp
-  ../cpp/Cipher/MGLCipherHostObject.cpp
-  ../cpp/Cipher/MGLCreateCipherInstaller.cpp
-  ../cpp/Cipher/MGLCreateDecipherInstaller.cpp
-  ../cpp/MGLKeys.cpp
-  ../cpp/Utils/MGLUtils.cpp
-  ../cpp/Cipher/MGLRsa.cpp
-  ../cpp/Cipher/MGLGenerateKeyPairInstaller.cpp
-  ../cpp/Cipher/MGLGenerateKeyPairSyncInstaller.cpp
-  ../cpp/Sig/MGLSignInstaller.cpp
-  ../cpp/Sig/MGLVerifyInstaller.cpp
-  ../cpp/Sig/MGLSignHostObjects.cpp
-  ../cpp/webcrypto/MGLWebCrypto.cpp
-  ../cpp/webcrypto/crypto_aes.cpp
-  ../cpp/webcrypto/crypto_ec.cpp
-  ../cpp/webcrypto/crypto_keygen.cpp
+  ../cpp/ed25519/HybridEdKeyPair.cpp
+  ../cpp/pbkdf2/HybridPbkdf2.cpp
+  ../cpp/random/HybridRandom.cpp
+  ../deps/fastpbkdf2/fastpbkdf2.c
 )
 
+# add Nitrogen specs
+include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/QuickCrypto+autolinking.cmake)
+
 # local includes
 include_directories(
-  src/main/cpp
-  ../cpp
-  ../cpp/Cipher
-  ../cpp/fastpbkdf2
-  ../cpp/Hash
-  ../cpp/HMAC
-  ../cpp/JSIUtils
-  ../cpp/Random
-  ../cpp/Sig
-  ../cpp/Utils
-  ../cpp/webcrypto
+  "src/main/cpp"
+  "../cpp/ed25519"
+  "../cpp/pbkdf2"
+  "../cpp/random"
+  "../cpp/utils"
+  "../deps/fastpbkdf2"
 )
 
 # Third party libraries (Prefabs)
 find_library(LOG_LIB log)
-find_package(openssl REQUIRED CONFIG)
-find_package(fbjni REQUIRED CONFIG)
-find_package(ReactAndroid REQUIRED CONFIG)
 
+find_package(openssl REQUIRED CONFIG)
 
+# Link all libraries together
 target_link_libraries(
   ${PACKAGE_NAME}
-  ${LOG_LIB}                                  # <-- Logcat logger
-  android                                     # <-- Android JNI core
-  fbjni::fbjni                                # <-- Facebook C++ JNI helpers
-  ReactAndroid::jsi                           # <-- RN: JSI
-  openssl::crypto                             # <-- OpenSSL (Crypto)
-)
+  ${LOG_LIB}                             # <-- Logcat logger
+  android                                # <-- Android core
+  openssl::crypto                        # <-- OpenSSL (Crypto)
+  )
 
 if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
   target_link_libraries(
     ${PACKAGE_NAME}
-    ReactAndroid::reactnative                 # <-- RN: Native Modules umbrella prefab
+    ReactAndroid::reactnative             # <-- RN: Native Modules umbrella prefab
   )
 else()
   target_link_libraries(
     ${PACKAGE_NAME}
-    ReactAndroid::react_nativemodule_core     # <-- RN: TurboModules Core
-    ReactAndroid::turbomodulejsijni           # <-- RN: TurboModules utils (e.g. CallInvokerHolder)
-)
+    ReactAndroid::turbomodulejsijni
+    ReactAndroid::react_nativemodule_core  # <-- RN: React Native native module core
+  )
 endif()

package/android/build.gradle

@@ -1,119 +1,66 @@
-import java.nio.file.Paths
-import com.android.Version
-
-def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
-def agpVersionMajor = agpVersion.tokenize('.')[0].toInteger()
-def agpVersionMinor = agpVersion.tokenize('.')[1].toInteger()
-
 buildscript {
+  ext.kotlinVersion = '1.9.25'
+
   repositories {
     google()
     mavenCentral()
   }
 
   dependencies {
-    classpath("com.android.tools.build:gradle:8.7.3")
+    classpath "com.android.tools.build:gradle:8.7.3"
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
   }
 }
 
-def isNewArchitectureEnabled() {
-  // To opt-in for the New Architecture, you can either:
-  // - Set `newArchEnabled` to true inside the `gradle.properties` file
-  // - Invoke gradle with `-newArchEnabled=true`
-  // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
-  return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+def reactNativeArchitectures() {
+  def value = rootProject.getProperties().get("reactNativeArchitectures")
+  return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
-def resolveBuildType() {
-    Gradle gradle = getGradle()
-    String tskReqStr = gradle.getStartParameter().getTaskRequests()['args'].toString()
-
-    return tskReqStr.contains('Release') ? 'release' : 'debug'
+def isNewArchitectureEnabled() {
+  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
 }
 
-apply plugin: 'com.android.library'
+apply plugin: "com.android.library"
 apply plugin: "org.jetbrains.kotlin.android"
+apply from: "../nitrogen/generated/android/QuickCrypto+autolinking.gradle"
 
 if (isNewArchitectureEnabled()) {
   apply plugin: "com.facebook.react"
 }
 
-def safeExtGet(prop, fallback) {
-  rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-}
-
-def reactNativeArchitectures() {
-  def value = project.getProperties().get("reactNativeArchitectures")
-  return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
-}
-
-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-quick-crypto: Failed to find node_modules/ path!")
+def getExtOrDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["QuickCrypto_" + name]
 }
 
-def nodeModules = findNodeModules(projectDir)
-
-repositories {
-  google()
-  mavenCentral()
+def getExtOrIntegerDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["QuickCrypto_" + name]).toInteger()
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 31)
-
-  if ((agpVersionMajor == 7 && agpVersionMinor >= 3) || agpVersionMajor >= 8) {
-    // Namespace support was added in 7.3.0
-    namespace "com.margelo.quickcrypto"
-
-    sourceSets {
-      main {
-        manifest.srcFile "src/main/AndroidManifestNew.xml"
-      }
-    }
-  }
-
-  if (agpVersionMajor >= 8) {
-      buildFeatures {
-          buildConfig = true
-      }
-  }
-
-  // Used to override the NDK path/version on internal CI or by allowing
-  // users to customize the NDK path/version from their root project (e.g. for M1 support)
-  if (rootProject.hasProperty("ndkPath")) {
-    ndkPath rootProject.ext.ndkPath
-  }
-  if (rootProject.hasProperty("ndkVersion")) {
-    ndkVersion rootProject.ext.ndkVersion
-  }
-
-  buildFeatures {
-    prefab true
-  }
+  namespace "com.margelo.nitro.quickcrypto"
+  ndkVersion getExtOrDefault("ndkVersion")
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
   defaultConfig {
-    minSdkVersion safeExtGet('minSdkVersion', 23)
-    targetSdkVersion safeExtGet('targetSdkVersion', 31)
-    versionCode 1
-    versionName "1.0"
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+
     externalNativeBuild {
       cmake {
-        cppFlags "-O2 -frtti -fexceptions -Wall -Wno-unused-variable -fstack-protector-all -DANDROID"
+        cppFlags "-frtti -fexceptions -Wall -fstack-protector-all"
         arguments "-DANDROID_STL=c++_shared"
         abiFilters (*reactNativeArchitectures())
+
+        buildTypes {
+          debug {
+            cppFlags "-O1 -g"
+          }
+          release {
+            cppFlags "-O2"
+          }
+        }
       }
     }
   }
@@ -124,17 +71,29 @@ android {
     }
   }
 
-  packagingOptions {
-    doNotStrip resolveBuildType() == 'debug' ? "**/**/*.so" : ''
+  buildFeatures {
+    buildConfig true
+    prefab true
+  }
+
+packagingOptions {
     excludes = [
+            "META-INF",
+            "META-INF/**",
             "**/libc++_shared.so",
             "**/libfbjni.so",
-            "**/libreactnativejni.so",
             "**/libjsi.so",
-            "**/libreact_nativemodule_core.so",
-            "**/libturbomodulejsijni.so",
-            "**/MANIFEST.MF",
+            "**/libfolly_json.so",
+            "**/libfolly_runtime.so",
+            "**/libglog.so",
+            "**/libhermes.so",
+            "**/libhermes-executor-debug.so",
+            "**/libhermes_executor.so",
             "**/libreactnative.so",
+            "**/libreactnativejni.so",
+            "**/libturbomodulejsijni.so",
+            "**/libreact_nativemodule_core.so",
+            "**/libjscexecutor.so"
     ]
   }
 
@@ -142,25 +101,27 @@ android {
     release {
       minifyEnabled false
     }
-    debug {
-      packagingOptions {
-        doNotStrip '**/*.so'
-      }
-      minifyEnabled false
-      debuggable true
-      jniDebuggable true
-      renderscriptDebuggable true
-    }
   }
 
   lintOptions {
-    disable 'GradleCompatible'
+    disable "GradleCompatible"
   }
+
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
   }
 
+  sourceSets {
+    main {
+      if (isNewArchitectureEnabled()) {
+        java.srcDirs += [
+          // React Codegen files
+          "${project.buildDir}/generated/source/codegen/java"
+        ]
+      }
+    }
+  }
 }
 
 repositories {
@@ -168,25 +129,22 @@ repositories {
   google()
 }
 
+
 dependencies {
   //noinspection GradleDynamicVersion
-  implementation "com.facebook.react:react-android:+"
+  implementation "com.facebook.react:react-native:+"
+
+  // Add a dependency on NitroModules
+  implementation project(":react-native-nitro-modules")
 
   // Add a dependency on OpenSSL
   implementation 'io.github.ronickg:openssl:3.3.2'
 }
 
-// Resolves "LOCAL_SRC_FILES points to a missing file, Check that libfb.so exists or that its path is correct".
-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)
-    }
+if (isNewArchitectureEnabled()) {
+  react {
+    jsRootDir = file("../src/")
+    libraryName = "QuickCrypto"
+    codegenJavaPackageName = "com.margelo.nitro.quickcrypto"
   }
 }

package/android/gradle.properties

@@ -1,6 +1,6 @@
-QuickCrypto_compileSdkVersion=31
-QuickCrypto_targetSdkVersion=31
-QuickCrypto_ndkversion=21.4.7075529
+QuickCrypto_compileSdkVersion=34
+QuickCrypto_targetSdkVersion=34
 QuickCrypto_minSdkVersion=23
+QuickCrypto_ndkVersion=21.4.7075529
 
 android.useAndroidX=true

package/android/src/main/cpp/cpp-adapter.cpp

@@ -1,69 +1,8 @@
-#include <ReactCommon/CallInvokerHolder.h>
 #include <fbjni/fbjni.h>
 #include <jni.h>
-#include <jsi/jsi.h>
-#include <memory>
 
-#include "MGLQuickCryptoHostObject.h"
-#include "JSIUtils/MGLTypedArray.h"
+#include "QuickCryptoOnLoad.hpp"
 
-using namespace facebook;
-
-class CryptoCppAdapter : public jni::HybridClass<CryptoCppAdapter> {
- public:
-  static auto constexpr kJavaDescriptor =
-      "Lcom/margelo/quickcrypto/QuickCryptoModule;";
-
-  static jni::local_ref<jni::HybridClass<CryptoCppAdapter>::jhybriddata>
-  initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance();
-  }
-
-  CryptoCppAdapter() {}
-
-  void install(jsi::Runtime &runtime,
-               std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker) {
-    auto workerQueue = std::make_shared<margelo::DispatchQueue::dispatch_queue>(
-        "margelo crypto worker thread");
-    auto hostObject = std::make_shared<margelo::MGLQuickCryptoHostObject>(
-        jsCallInvoker, workerQueue);
-    auto object = jsi::Object::createFromHostObject(runtime, hostObject);
-    runtime.global().setProperty(runtime, "__QuickCryptoProxy",
-                                 std::move(object));
-    // Adds the PropNameIDCache object to the Runtime. If the Runtime gets destroyed, the Object gets destroyed and the cache gets invalidated.
-    auto propNameIdCache = std::make_shared<InvalidateCacheOnDestroy>(runtime);
-    runtime.global().setProperty(
-      runtime,
-      "rnqcArrayBufferPropNameIdCache",
-      jsi::Object::createFromHostObject(runtime, propNameIdCache)
-    );
-  }
-
-  void nativeInstall(
-      jlong jsiPtr,
-      jni::alias_ref<facebook::react::CallInvokerHolder::javaobject>
-          jsCallInvokerHolder) {
-    auto jsCallInvoker = jsCallInvokerHolder->cthis()->getCallInvoker();
-    auto runtime = reinterpret_cast<jsi::Runtime *>(jsiPtr);
-    if (runtime) {
-      install(*runtime, jsCallInvoker);
-    }
-    // if runtime was nullptr, QuickCrypto will not be installed. This should
-    // only happen while Remote Debugging (Chrome), but will be weird either
-    // way.
-  }
-
-  static void registerNatives() {
-    registerHybrid(
-        {makeNativeMethod("initHybrid", CryptoCppAdapter::initHybrid),
-         makeNativeMethod("nativeInstall", CryptoCppAdapter::nativeInstall)});
-  }
-
- private:
-  friend HybridBase;
-};
-
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
-  return facebook::jni::initialize(vm,
-                                   [] { CryptoCppAdapter::registerNatives(); });
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
+  return facebook::jni::initialize(vm, [=] { margelo::nitro::crypto::initialize(vm); });
 }

package/android/src/main/java/com/margelo/nitro/quickcrypto/QuickCryptoPackage.java

@@ -0,0 +1,43 @@
+package com.margelo.nitro.quickcrypto;
+
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
+import com.facebook.react.TurboReactPackage;
+import com.margelo.nitro.core.HybridObject;
+import com.margelo.nitro.core.HybridObjectRegistry;
+
+import java.util.HashMap;
+import java.util.function.Supplier;
+
+public class QuickCryptoPackage extends TurboReactPackage {
+  private static final String TAG = "QuickCrypto";
+
+  @Nullable
+  @Override
+  public NativeModule getModule(String name, ReactApplicationContext reactContext) {
+    return null;
+  }
+
+  @Override
+  public ReactModuleInfoProvider getReactModuleInfoProvider() {
+    return () -> {
+      return new HashMap<>();
+    };
+  }
+
+  static {
+    try {
+      Log.i(TAG, "Loading C++ library...");
+      System.loadLibrary(TAG);
+      Log.i(TAG, "Successfully loaded C++ library!");
+    } catch (Throwable e) {
+      Log.e(TAG, "Failed to load C++ library! Is it properly installed and linked?", e);
+      throw e;
+    }
+  }
+}