react-native-quick-crypto 0.4.6 → 0.6.0

package/android/CMakeLists.txt

@@ -1,36 +1,30 @@
+project(react-native-quick-crypto)
 cmake_minimum_required(VERSION 3.9.0)
 
-set (PACKAGE_NAME "react-native-quick-crypto")
-set (BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
-file (GLOB LIBFBJNI_INCLUDES "${BUILD_DIR}/fbjni-*-headers.jar/")
-file (GLOB LIBRN_SO "${BUILD_DIR}/react-native-0*/jni/${ANDROID_ABI}")
-set (CMAKE_CXX_STANDARD 17)
+set(PACKAGE_NAME "reactnativequickcrypto")
+set(BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
+set(CMAKE_CXX_STANDARD 17)
+
 # TODO(osp) remove before release
-#set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
-#set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
+# set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
+# set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
+
+# Consume shared libraries and headers from prefabs
+find_package(fbjni REQUIRED CONFIG)
+find_package(ReactAndroid REQUIRED CONFIG)
 
 include_directories(
         ../cpp
-        "${NODE_MODULES_DIR}/react-native/React"
-        "${NODE_MODULES_DIR}/react-native/React/Base"
-        "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni"
-        "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni"
+        "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni/react/turbomodule"
         "${NODE_MODULES_DIR}/react-native/ReactCommon"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/callinvoker"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/turbomodule/core"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/react/nativemodule/core"
-        "${LIBFBJNI_INCLUDES}"
 )
 
-if(${REACT_NATIVE_VERSION} LESS 66)
-        set (
-                INCLUDE_JSI_CPP
-                "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi/jsi/jsi.cpp"
-        )
-endif()
-
-add_library(reactnativequickcrypto  # <-- Library name
+add_library(
+        ${PACKAGE_NAME}
         SHARED
         "src/main/cpp/cpp-adapter.cpp"
         "../cpp/MGLQuickCryptoHostObject.cpp"
@@ -56,70 +50,33 @@ add_library(reactnativequickcrypto  # <-- Library name
         "../cpp/Sig/MGLSignInstaller.cpp"
         "../cpp/Sig/MGLVerifyInstaller.cpp"
         "../cpp/Sig/MGLSignHostObjects.cpp"
-        ${INCLUDE_JSI_CPP} # only on older RN versions
 )
 
 set_target_properties(
-        reactnativequickcrypto PROPERTIES
+        ${PACKAGE_NAME}
+        PROPERTIES
         CXX_STANDARD 17
         CXX_EXTENSIONS OFF
         POSITION_INDEPENDENT_CODE ON
 )
 
-file (GLOB LIBRN_DIR "${PREBUILT_DIR}/${ANDROID_ABI}")
+file(GLOB LIBRN_DIR "${BUILD_DIR}/react-native-0*/jni/${ANDROID_ABI}")
 
 find_library(
         log-lib
         log
 )
-find_library(
-        REACT_NATIVE_JNI_LIB
-        reactnativejni
-        PATHS ${LIBRN_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-)
-find_library(
-        FBJNI_LIB
-        fbjni
-        PATHS ${LIBRN_SO}
-        NO_CMAKE_FIND_ROOT_PATH
-)
-find_library(
-        TURBOMODULES_LIB
-        turbomodulejsijni
-        PATHS ${LIBRN_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-)
-find_library(
-        REACT_LIB
-        react_nativemodule_core
-        PATHS ${LIBRN_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-)
-
-if(${REACT_NATIVE_VERSION} LESS 66)
-        # JSI lib didn't exist on RN 0.65 and before. Simply omit it.
-        set (JSI_LIB "")
-else()
-        # RN 0.66 distributes libjsi.so, can be used instead of compiling jsi.cpp manually.
-        find_library(
-                JSI_LIB
-                jsi
-                PATHS ${LIBRN_DIR}
-                NO_CMAKE_FIND_ROOT_PATH
-        )
-endif()
 
 find_package(openssl REQUIRED CONFIG)
 
 target_link_libraries(
-        reactnativequickcrypto
-        ${TURBOMODULES_LIB}
-        ${FBJNI_LIB}
+        ${PACKAGE_NAME}
+        ReactAndroid::turbomodulejsijni
+        fbjni::fbjni
         ${log-lib}
-        ${JSI_LIB}
-        ${REACT_NATIVE_JNI_LIB}
-        ${REACT_LIB}
+        ReactAndroid::jsi
+        ReactAndroid::reactnativejni
+        ReactAndroid::react_nativemodule_core
         android
         openssl::crypto
 )

package/android/build.gradle

@@ -1,5 +1,3 @@
-import groovy.json.JsonSlurper
-import org.apache.tools.ant.filters.ReplaceTokens
 import java.nio.file.Paths
 
 static def findNodeModules(baseDir) {
@@ -31,12 +29,10 @@ buildscript {
 
   dependencies {
     classpath 'com.android.tools.build:gradle:4.2.2'
-    classpath 'de.undercouch:gradle-download-task:4.1.2'
   }
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'de.undercouch.download'
 
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['QuickCrypto_' + name]
@@ -51,43 +47,18 @@ def reactNativeArchitectures() {
     return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
-def sourceBuild = false
-def defaultDir = null
-def androidSourcesDir = null
-def androidSourcesName = 'React Native sources'
-
-if (rootProject.ext.has('reactNativeAndroidRoot')) {
-  defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
-  androidSourcesDir = defaultDir.parentFile.toString()
-} else if (findProject(':ReactAndroid') != null) {
-    sourceBuild = true
-    defaultDir = project(':ReactAndroid').projectDir
-    androidSourcesDir = defaultDir.parentFile.toString()
-} else {
-  defaultDir = file("$nodeModules/react-native/android")
-  androidSourcesDir = defaultDir.parentFile.toString()
-}
-
-if (!defaultDir.exists()) {
-    throw new GradleException(
-      "${project.name}: React Native android directory (node_modules/react-native/android) does not exist! Resolved node_modules to: ${nodeModules}"
-    )
-}
-
-def prebuiltDir = sourceBuild
-    ? "$nodeModules/react-native/ReactAndroid/src/main/jni/prebuilt/lib"
-    : "$buildDir/react-native-0*/jni"
-
-
 def reactProperties = new Properties()
 file("$nodeModules/react-native/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
-def REACT_NATIVE_VERSION = reactProperties.getProperty("VERSION_NAME").split("\\.")[1].toInteger()
 
 android {
   compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
   buildToolsVersion getExtOrDefault('buildToolsVersion')
   ndkVersion getExtOrDefault('ndkVersion')
 
+  buildFeatures {
+    prefab true
+  }
+
   defaultConfig {
     minSdkVersion 21
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
@@ -95,11 +66,9 @@ android {
     versionName "1.0"
     externalNativeBuild {
       cmake {
-        cppFlags "-fexceptions", "-frtti", "-std=c++1y", "-DONANDROID"
+        cppFlags "-fexceptions", "-frtti", "-std=c++1y", "-DONANDROID", "-DANDROID"
         arguments '-DANDROID_STL=c++_shared',
-                  "-DREACT_NATIVE_VERSION=${REACT_NATIVE_VERSION}",
-                  "-DNODE_MODULES_DIR=${nodeModules}",
-                  "-DPREBUILT_DIR=${prebuiltDir}"
+                  "-DNODE_MODULES_DIR=${nodeModules}"
       }
     }
     ndk {
@@ -107,10 +76,6 @@ android {
     }
   }
 
-  dexOptions {
-    javaMaxHeapSize "4g"
-  }
-
   externalNativeBuild {
     cmake {
       path "CMakeLists.txt"
@@ -118,7 +83,16 @@ android {
   }
 
   packagingOptions {
-    excludes = ["**/libc++_shared.so", "**/libfbjni.so", "**/libreactnativejni.so", "**/libjsi.so", "**/MANIFEST.MF", ""]
+    excludes = [
+            "**/libc++_shared.so",
+            "**/libfbjni.so",
+            "**/libreactnativejni.so",
+            "**/libjsi.so",
+            "**/libreact_nativemodule_core.so",
+            "**/libturbomodulejsijni.so",
+            "**/MANIFEST.MF",
+            ""
+    ]
     doNotStrip '**/*.so'
   }
 
@@ -145,11 +119,6 @@ android {
     targetCompatibility JavaVersion.VERSION_1_8
   }
 
-  configurations {
-    extractHeaders
-    extractJNI
-  }
-
   buildFeatures {
     prefab true
   }
@@ -158,225 +127,12 @@ android {
 repositories {
   mavenCentral()
   google()
-
-  maven {
-    url defaultDir.toString()
-    name androidSourcesName
-  }
 }
 
 dependencies {
   // https://mvnrepository.com/artifact/com.android.ndk.thirdparty/openssl
   implementation 'com.android.ndk.thirdparty:openssl:1.1.1l-beta-1'
-  // noinspection GradleDynamicVersion
-  implementation 'com.facebook.react:react-native:+'
-
-  //noinspection GradleDynamicVersion
-  extractHeaders("com.facebook.fbjni:fbjni:+:headers")
-  //noinspection GradleDynamicVersion
-  extractJNI("com.facebook.fbjni:fbjni:+")
-
-  if (!sourceBuild) {
-    def buildType = "debug"
-    tasks.all({ task ->
-      if (task.name == "buildCMakeRelease") {
-        buildType = "release"
-      }
-    })
-    def rnAarMatcher = "**/react-native/**/*${buildType}.aar"
-    if (REACT_NATIVE_VERSION < 69) {
-      rnAarMatcher = "**/**/*.aar"
-    }
-    def rnAAR = fileTree("${defaultDir.toString()}").matching({ it.include rnAarMatcher }).singleFile
-    extractJNI(files(rnAAR))
-  }
-}
-
-// third-party-ndk deps headers
-// mostly a copy of https://github.com/software-mansion/react-native-reanimated/blob/master/android/build.gradle#L115
-
-def downloadsDir = new File("$buildDir/downloads")
-def thirdPartyNdkDir = new File("$buildDir/third-party-ndk")
-def thirdPartyVersionsFile = new File("${androidSourcesDir.toString()}/ReactAndroid/gradle.properties")
-def thirdPartyVersions = new Properties()
-thirdPartyVersions.load(new FileInputStream(thirdPartyVersionsFile))
-
-def BOOST_VERSION = thirdPartyVersions["BOOST_VERSION"]
-def boost_file = new File(downloadsDir, "boost_${BOOST_VERSION}.tar.gz")
-def DOUBLE_CONVERSION_VERSION = thirdPartyVersions["DOUBLE_CONVERSION_VERSION"]
-def double_conversion_file = new File(downloadsDir, "double-conversion-${DOUBLE_CONVERSION_VERSION}.tar.gz")
-def FOLLY_VERSION = thirdPartyVersions["FOLLY_VERSION"]
-def folly_file = new File(downloadsDir, "folly-${FOLLY_VERSION}.tar.gz")
-def GLOG_VERSION = thirdPartyVersions["GLOG_VERSION"]
-def glog_file = new File(downloadsDir, "glog-${GLOG_VERSION}.tar.gz")
-
-task createNativeDepsDirectories {
-  doLast {
-    downloadsDir.mkdirs()
-    thirdPartyNdkDir.mkdirs()
-  }
-}
-
-task downloadBoost(dependsOn: createNativeDepsDirectories, type: Download) {
-  def transformedVersion = BOOST_VERSION.replace("_", ".")
-  def srcUrl = "https://boostorg.jfrog.io/artifactory/main/release/${transformedVersion}/source/boost_${BOOST_VERSION}.tar.gz"
-  if (REACT_NATIVE_VERSION < 69) {
-    srcUrl = "https://github.com/react-native-community/boost-for-react-native/releases/download/v${transformedVersion}-0/boost_${BOOST_VERSION}.tar.gz"
-  }
-  src(srcUrl)
-  onlyIfNewer(true)
-  overwrite(false)
-  dest(boost_file)
-}
-
-task prepareBoost(dependsOn: downloadBoost, type: Copy) {
-  from(tarTree(resources.gzip(downloadBoost.dest)))
-  from("src/main/jni/third-party/boost/Android.mk")
-  include("Android.mk", "boost_${BOOST_VERSION}/boost/**/*.hpp", "boost/boost/**/*.hpp")
-  includeEmptyDirs = false
-  into("$thirdPartyNdkDir") // /boost_X_XX_X
-  doLast {
-    file("$thirdPartyNdkDir/boost_${BOOST_VERSION}").renameTo("$thirdPartyNdkDir/boost")
-  }
-}
-
-task downloadDoubleConversion(dependsOn: createNativeDepsDirectories, type: Download) {
-  src("https://github.com/google/double-conversion/archive/v${DOUBLE_CONVERSION_VERSION}.tar.gz")
-  onlyIfNewer(true)
-  overwrite(false)
-  dest(double_conversion_file)
-}
 
-task prepareDoubleConversion(dependsOn: downloadDoubleConversion, type: Copy) {
-  from(tarTree(downloadDoubleConversion.dest))
-  from("src/main/jni/third-party/double-conversion/Android.mk")
-  include("double-conversion-${DOUBLE_CONVERSION_VERSION}/src/**/*", "Android.mk")
-  filesMatching("*/src/**/*", { fname -> fname.path = "double-conversion/${fname.name}" })
-  includeEmptyDirs = false
-  into("$thirdPartyNdkDir/double-conversion")
-}
-
-task downloadFolly(dependsOn: createNativeDepsDirectories, type: Download) {
-  src("https://github.com/facebook/folly/archive/v${FOLLY_VERSION}.tar.gz")
-  onlyIfNewer(true)
-  overwrite(false)
-  dest(folly_file)
-}
-
-task prepareFolly(dependsOn: downloadFolly, type: Copy) {
-  from(tarTree(downloadFolly.dest))
-  from("src/main/jni/third-party/folly/Android.mk")
-  include("folly-${FOLLY_VERSION}/folly/**/*", "Android.mk")
-  eachFile { fname -> fname.path = (fname.path - "folly-${FOLLY_VERSION}/") }
-  includeEmptyDirs = false
-  into("$thirdPartyNdkDir/folly")
-}
-
-task downloadGlog(dependsOn: createNativeDepsDirectories, type: Download) {
-  src("https://github.com/google/glog/archive/v${GLOG_VERSION}.tar.gz")
-  onlyIfNewer(true)
-  overwrite(false)
-  dest(glog_file)
-}
-
-task prepareGlog(dependsOn: downloadGlog, type: Copy) {
-  from(tarTree(downloadGlog.dest))
-  from("src/main/jni/third-party/glog/")
-  include("glog-${GLOG_VERSION}/src/**/*", "Android.mk", "config.h")
-  includeEmptyDirs = false
-  filesMatching("**/*.h.in") {
-    filter(ReplaceTokens, tokens: [
-      ac_cv_have_unistd_h           : "1",
-      ac_cv_have_stdint_h           : "1",
-      ac_cv_have_systypes_h         : "1",
-      ac_cv_have_inttypes_h         : "1",
-      ac_cv_have_libgflags          : "0",
-      ac_google_start_namespace     : "namespace google {",
-      ac_cv_have_uint16_t           : "1",
-      ac_cv_have_u_int16_t          : "1",
-      ac_cv_have___uint16           : "0",
-      ac_google_end_namespace       : "}",
-      ac_cv_have___builtin_expect   : "1",
-      ac_google_namespace           : "google",
-      ac_cv___attribute___noinline  : "__attribute__ ((noinline))",
-      ac_cv___attribute___noreturn  : "__attribute__ ((noreturn))",
-      ac_cv___attribute___printf_4_5: "__attribute__((__format__ (__printf__, 4, 5)))"
-    ])
-    it.path = (it.name - ".in")
-  }
-  into("$thirdPartyNdkDir/glog")
-
-  doLast {
-    copy {
-      from(fileTree(dir: "$thirdPartyNdkDir/glog", includes: ["stl_logging.h", "logging.h", "raw_logging.h", "vlog_is_on.h", "**/src/glog/log_severity.h"]).files)
-      includeEmptyDirs = false
-      into("$thirdPartyNdkDir/glog/exported/glog")
-    }
-  }
-}
-
-task prepareThirdPartyNdkHeaders {
-  if (!boost_file.exists()) {
-    dependsOn(prepareBoost)
-  }
-  if (!double_conversion_file.exists()) {
-    dependsOn(prepareDoubleConversion)
-  }
-  if (!folly_file.exists()) {
-    dependsOn(prepareFolly)
-  }
-  if (!glog_file.exists()) {
-    dependsOn(prepareGlog)
-  }
-}
-
-prepareThirdPartyNdkHeaders.mustRunAfter createNativeDepsDirectories
-
-task extractAARHeaders {
-  doLast {
-    configurations.extractHeaders.files.each {
-      def file = it.absoluteFile
-      copy {
-        from zipTree(file)
-        into "$buildDir/$file.name"
-        include "**/*.h"
-      }
-    }
-  }
-}
-extractAARHeaders.mustRunAfter prepareThirdPartyNdkHeaders
-
-task extractJNIFiles {
-  doLast {
-    configurations.extractJNI.files.each {
-      def file = it.absoluteFile
-
-      copy {
-        from zipTree(file)
-        into "$buildDir/$file.name"
-        include "jni/**/*"
-      }
-    }
-  }
-}
-extractJNIFiles.mustRunAfter extractAARHeaders
-
-def nativeBuildDependsOn(dependsOnTask, variant) {
-  def buildTasks = tasks.findAll({ task ->
-      !task.name.contains("Clean") && (task.name.contains("externalNative") || task.name.contains("CMake")) })
-  if (variant != null) {
-    buildTasks = buildTasks.findAll({ task -> task.name.contains(variant) })
-  }
-  buildTasks.forEach { task -> task.dependsOn(dependsOnTask) }
-}
-
-afterEvaluate {
-  if (sourceBuild) {
-    nativeBuildDependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck", "Debug")
-    nativeBuildDependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck", "Rel")
-  } else {
-    nativeBuildDependsOn(extractAARHeaders, null)
-    nativeBuildDependsOn(extractJNIFiles, null)
-    nativeBuildDependsOn(prepareThirdPartyNdkHeaders, null)
-  }
+  implementation "com.facebook.react:react-android:"
+  implementation "com.facebook.react:hermes-android:"
 }

package/cpp/Cipher/MGLCipherHostObject.cpp

@@ -451,9 +451,6 @@ void MGLCipherHostObject::installMethods() {
       "setAuthTag", JSIF([=]) {
         if (count != 1 || !arguments[0].isObject() ||
             !arguments[0].asObject(runtime).isArrayBuffer(runtime)) {
-          jsi::detail::throwJSError(
-              runtime,
-              "cipher.setAuthTag requires an ArrayBuffer tag argument");
           throw jsi::JSError(
               runtime,
               "cipher.setAuthTag requires an ArrayBuffer tag argument");
@@ -467,9 +464,6 @@ void MGLCipherHostObject::installMethods() {
         auto authTagArrayBuffer =
             arguments[0].asObject(runtime).getArrayBuffer(runtime);
         if (!CheckSizeInt32(runtime, authTagArrayBuffer)) {
-          jsi::detail::throwJSError(
-              runtime,
-              "cipher.setAuthTag requires an ArrayBuffer tag argument");
           throw jsi::JSError(
               runtime,
               "cipher.setAuthTag requires an ArrayBuffer tag argument");
@@ -502,8 +496,6 @@ void MGLCipherHostObject::installMethods() {
         }
 
         if (!is_valid) {
-          jsi::detail::throwJSError(runtime,
-                                    "Invalid authentication tag length");
           throw jsi::JSError(runtime, "Invalid authentication tag length");
         }
 

package/cpp/Cipher/MGLPublicCipherInstaller.h

@@ -57,20 +57,17 @@ FieldDefinition getPublicCipherFieldDefinition(
             runtime, arguments, &offset);
 
         if (!pkey) {
-          jsi::detail::throwJSError(runtime, "Could not generate key");
           throw new jsi::JSError(runtime, "Could not generate key");
         }
 
         auto buf = arguments[offset].asObject(runtime).getArrayBuffer(runtime);
         if (!CheckSizeInt32(runtime, buf)) {
-          jsi::detail::throwJSError(runtime, "Data buffer is too long");
           throw new jsi::JSError(runtime, "Data buffer is too long");
         }
 
         uint32_t padding =
             static_cast<uint32_t>(arguments[offset + 1].getNumber());
         if (!padding) {
-          jsi::detail::throwJSError(runtime, "Invalid padding");
           throw new jsi::JSError(runtime, "Invalid padding");
         }
 
@@ -81,7 +78,6 @@ FieldDefinition getPublicCipherFieldDefinition(
 
           digest = EVP_get_digestbyname(oaep_str.c_str());
           if (digest == nullptr) {
-            jsi::detail::throwJSError(runtime, "Invalid digest (oaep_str)");
             throw new jsi::JSError(runtime, "Invalid digest (oaep_str)");
           }
         }
@@ -90,7 +86,6 @@ FieldDefinition getPublicCipherFieldDefinition(
           auto oaep_label_buffer =
               arguments[offset + 3].getObject(runtime).getArrayBuffer(runtime);
           if (!CheckSizeInt32(runtime, oaep_label_buffer)) {
-            jsi::detail::throwJSError(runtime, "oaep_label buffer is too long");
             throw new jsi::JSError(runtime, "oaep_label buffer is too long");
           }
         }
@@ -101,7 +96,6 @@ FieldDefinition getPublicCipherFieldDefinition(
                 runtime, pkey, padding, digest, arguments[offset + 3], buf);
 
         if (!out.has_value()) {
-          jsi::detail::throwJSError(runtime, "Failed to decrypt");
           throw new jsi::JSError(runtime, "Failed to decrypt");
         }
 

package/cpp/Cipher/MGLRsa.cpp

@@ -108,7 +108,6 @@ RsaKeyPairGenConfig prepareRsaKeyGenConfig(jsi::Runtime& runtime,
           arguments[offset].asString(runtime).utf8(runtime).c_str());
 
       if (config.md == nullptr) {
-        jsi::detail::throwJSError(runtime, "invalid digest");
         throw new jsi::JSError(runtime, "invalid digest");
       }
     }
@@ -119,7 +118,6 @@ RsaKeyPairGenConfig prepareRsaKeyGenConfig(jsi::Runtime& runtime,
           arguments[offset + 1].asString(runtime).utf8(runtime).c_str());
 
       if (config.mgf1_md == nullptr) {
-        jsi::detail::throwJSError(runtime, "invalid digest");
         throw new jsi::JSError(runtime, "invalid digest");
       }
     }
@@ -129,7 +127,6 @@ RsaKeyPairGenConfig prepareRsaKeyGenConfig(jsi::Runtime& runtime,
       config.saltlen = static_cast<int>(arguments[offset + 2].asNumber());
 
       if (config.saltlen < 0) {
-        jsi::detail::throwJSError(runtime, "salt length is out of range");
         throw new jsi::JSError(runtime, "salt length is out of range");
       }
     }
@@ -157,14 +154,12 @@ std::pair<StringOrBuffer, StringOrBuffer> generateRSAKeyPair(
   EVPKeyCtxPointer ctx = setup(config);
 
   if (!ctx) {
-    jsi::detail::throwJSError(runtime, "Error on key generation job");
     throw new jsi::JSError(runtime, "Error on key generation job");
   }
 
   // Generate the key
   EVP_PKEY* pkey = nullptr;
   if (!EVP_PKEY_keygen(ctx.get(), &pkey)) {
-    jsi::detail::throwJSError(runtime, "Error generating key");
     throw new jsi::JSError(runtime, "Error generating key");
   }
 
@@ -178,7 +173,7 @@ std::pair<StringOrBuffer, StringOrBuffer> generateRSAKeyPair(
                                           config->private_key_encoding);
 
   if (!publicBuffer.has_value() || !privateBuffer.has_value()) {
-    jsi::detail::throwJSError(runtime,
+    throw jsi::JSError(runtime,
                               "Failed to encode public and/or private key");
   }
 

package/cpp/MGLKeys.cpp

@@ -348,8 +348,7 @@ std::optional<StringOrBuffer> WritePrivateKey(
   }
 
   if (err) {
-    jsi::detail::throwJSError(runtime, "Failed to encode private key");
-    return {};
+    throw jsi::JSError(runtime, "Failed to encode private key");
   }
 
   return BIOToStringOrBuffer(bio.get(), config.format_);
@@ -389,8 +388,7 @@ std::optional<StringOrBuffer> WritePublicKey(
   //  CHECK(bio);
 
   if (!WritePublicKeyInner(pkey, bio, config)) {
-    jsi::detail::throwJSError(runtime, "Failed to encode public key");
-    return std::nullopt;
+    throw jsi::JSError(runtime, "Failed to encode public key");
   }
 
   return BIOToStringOrBuffer(bio.get(), config.format_);
@@ -648,8 +646,7 @@ ManagedEVPPKey::GetPrivateKeyEncodingFromJs(jsi::Runtime& runtime,
         auto cipher_name = arguments[*offset].getString(runtime).utf8(runtime);
         result.cipher_ = EVP_get_cipherbyname(cipher_name.c_str());
         if (result.cipher_ == nullptr) {
-          jsi::detail::throwJSError(runtime, "Unknown cipher");
-          return NonCopyableMaybe<PrivateKeyEncodingConfig>();
+          throw jsi::JSError(runtime, "Unknown cipher");
         }
         needs_passphrase = true;
       } else {
@@ -666,7 +663,7 @@ ManagedEVPPKey::GetPrivateKeyEncodingFromJs(jsi::Runtime& runtime,
       jsi::ArrayBuffer passphrase =
           arguments[*offset].asObject(runtime).getArrayBuffer(runtime);
       if (!CheckSizeInt32(runtime, passphrase)) {
-        jsi::detail::throwJSError(runtime, "passphrase is too long");
+        throw jsi::JSError(runtime, "passphrase is too long");
       }
 
       result.passphrase_ = NonCopyableMaybe<ByteSource>(
@@ -674,7 +671,7 @@ ManagedEVPPKey::GetPrivateKeyEncodingFromJs(jsi::Runtime& runtime,
     } else {
       if (needs_passphrase &&
           (arguments[*offset].isNull() || arguments[*offset].isUndefined())) {
-        jsi::detail::throwJSError(
+        throw jsi::JSError(
             runtime, "passphrase is null or unfedined but it is required");
       }
     }
@@ -728,7 +725,7 @@ ManagedEVPPKey ManagedEVPPKey::GetPublicOrPrivateKeyFromJs(
         args[(*offset)++].asObject(runtime).getArrayBuffer(runtime);
 
     if (!CheckSizeInt32(runtime, dataArrayBuffer)) {
-      jsi::detail::throwJSError(runtime, "data is too big");
+      throw jsi::JSError(runtime, "data is too big");
     }
 
     NonCopyableMaybe<PrivateKeyEncodingConfig> config_ =
@@ -766,7 +763,6 @@ ManagedEVPPKey ManagedEVPPKey::GetPublicOrPrivateKeyFromJs(
           is_public = false;
           break;
         default:
-          jsi::detail::throwJSError(runtime, "Invalid key encoding type");
           throw new jsi::JSError(runtime, "Invalid key encoding type");
       }
 
@@ -784,9 +780,6 @@ ManagedEVPPKey ManagedEVPPKey::GetPublicOrPrivateKeyFromJs(
     return ManagedEVPPKey::GetParsedKey(runtime, std::move(pkey), ret,
                                         "Failed to read asymmetric key");
   } else {
-    jsi::detail::throwJSError(runtime,
-                              "publicEncrypt api only supports ArrayBuffer keys"
-                              "for now");
     throw new jsi::JSError(
         runtime, "public encrypt only supports ArrayBuffer at the moment");
     //    CHECK(args[*offset]->IsObject());
@@ -808,11 +801,10 @@ ManagedEVPPKey ManagedEVPPKey::GetParsedKey(jsi::Runtime& runtime,
       //       CHECK(pkey);
       break;
     case ParseKeyResult::kParseKeyNeedPassphrase:
-      jsi::detail::throwJSError(runtime,
+      throw jsi::JSError(runtime,
                                 "Passphrase required for encrypted key");
       break;
     default:
-      jsi::detail::throwJSError(runtime, default_msg);
       throw new jsi::JSError(runtime, default_msg);
   }