react-native-quick-crypto 0.7.8 → 0.7.10

package/android/build.gradle

@@ -171,8 +171,9 @@ repositories {
 dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-android:+"
-  // https://mvnrepository.com/artifact/com.android.ndk.thirdparty/openssl
-  implementation 'com.android.ndk.thirdparty:openssl:1.1.1q-beta-1'
+
+  // 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".

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

@@ -2,8 +2,10 @@
 #include <fbjni/fbjni.h>
 #include <jni.h>
 #include <jsi/jsi.h>
+#include <memory>
 
 #include "MGLQuickCryptoHostObject.h"
+#include "JSIUtils/MGLTypedArray.h"
 
 using namespace facebook;
 
@@ -28,6 +30,13 @@ class CryptoCppAdapter : public jni::HybridClass<CryptoCppAdapter> {
     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(

package/cpp/JSIUtils/MGLTypedArray.cpp

@@ -10,6 +10,8 @@
 
 #include <algorithm>
 #include <memory>
+#include <utility>
+#include <vector>
 #include <string>
 #include <unordered_map>
 
@@ -40,33 +42,37 @@ enum class Prop {
 class PropNameIDCache {
  public:
   const jsi::PropNameID &get(jsi::Runtime &runtime, Prop prop) {
-    if (!this->props[prop]) {
-      this->props[prop] =
-          std::make_unique<jsi::PropNameID>(createProp(runtime, prop));
+    auto key = reinterpret_cast<uintptr_t>(&runtime);
+    if (this->props.find(key) == this->props.end()) {
+      this->props[key] = std::unordered_map<Prop, std::unique_ptr<jsi::PropNameID>>();
     }
-    return *(this->props[prop]);
+    if (!this->props[key][prop]) {
+      this->props[key][prop] = std::make_unique<jsi::PropNameID>(createProp(runtime, prop));
+    }
+    return *(this->props[key][prop]);
   }
 
-  const jsi::PropNameID &getConstructorNameProp(jsi::Runtime &runtime,
-                                                MGLTypedArrayKind kind);
+  const jsi::PropNameID &getConstructorNameProp(jsi::Runtime &runtime, MGLTypedArrayKind kind);
 
-  void invalidate() {
-    /** This call (and attempts to use props.clear()) crash 💥 when the
-     *  JSI runtime has already been destroyed.  So we are commenting it out
-     *  and waiting for Nitro and 1.0 to fix this the proper way.
-     */
-    //props.erase(props.begin(), props.end());
+  void invalidate(uintptr_t key) {
+    if (props.find(key) != props.end()) {
+      props[key].clear();
+    }
   }
-
  private:
-  std::unordered_map<Prop, std::unique_ptr<jsi::PropNameID>> props;
+  std::unordered_map<uintptr_t, std::unordered_map<Prop, std::unique_ptr<jsi::PropNameID>>> props;
 
   jsi::PropNameID createProp(jsi::Runtime &runtime, Prop prop);
 };
 
 PropNameIDCache propNameIDCache;
 
-void invalidateJsiPropNameIDCache() { propNameIDCache.invalidate(); }
+InvalidateCacheOnDestroy::InvalidateCacheOnDestroy(jsi::Runtime &runtime) {
+  key = reinterpret_cast<uintptr_t>(&runtime);
+}
+InvalidateCacheOnDestroy::~InvalidateCacheOnDestroy() {
+  propNameIDCache.invalidate(key);
+}
 
 MGLTypedArrayKind getTypedArrayKindForName(const std::string &name);
 
@@ -75,8 +81,9 @@ MGLTypedArrayBase::MGLTypedArrayBase(jsi::Runtime &runtime, size_t size,
     : MGLTypedArrayBase(
           runtime,
           runtime.global()
-              .getProperty(runtime, propNameIDCache.getConstructorNameProp(
-                                        runtime, kind))
+              .getProperty(
+                runtime,
+                propNameIDCache.getConstructorNameProp(runtime, kind))
               .asObject(runtime)
               .asFunction(runtime)
               .callAsConstructor(runtime, {static_cast<double>(size)})
@@ -236,6 +243,20 @@ void MGLTypedArray<T>::update(jsi::Runtime &runtime,
             reinterpret_cast<ContentType<T> *>(rawData));
 }
 
+template <MGLTypedArrayKind T>
+void MGLTypedArray<T>::updateUnsafe(jsi::Runtime &runtime, ContentType<T> *data, size_t length) {
+    if (length != size(runtime)) {
+    throw jsi::JSError(runtime, "TypedArray can only be updated with an array of the same size");
+  }
+  uint8_t *rawData = getBuffer(runtime).data(runtime) + byteOffset(runtime);
+  memcpy(rawData, data, length);
+}
+
+template <MGLTypedArrayKind T>
+uint8_t* MGLTypedArray<T>::data(jsi::Runtime &runtime) {
+  return getBuffer(runtime).data(runtime) + byteOffset(runtime);
+}
+
 const jsi::PropNameID &PropNameIDCache::getConstructorNameProp(
     jsi::Runtime &runtime, MGLTypedArrayKind kind) {
   switch (kind) {

package/cpp/JSIUtils/MGLTypedArray.h

@@ -69,7 +69,24 @@ struct typedArrayTypeMap<MGLTypedArrayKind::Float64Array> {
   typedef double type;
 };
 
-void invalidateJsiPropNameIDCache();
+// Instance of this class will invalidate PropNameIDCache when destructor is called.
+// Attach this object to global in specific jsi::Runtime to make sure lifecycle of
+// the cache object is connected to the lifecycle of the js runtime
+class InvalidateCacheOnDestroy : public jsi::HostObject {
+ public:
+  explicit InvalidateCacheOnDestroy(jsi::Runtime &runtime);
+  virtual ~InvalidateCacheOnDestroy();
+  virtual jsi::Value get(jsi::Runtime &, const jsi::PropNameID &name) {
+    return jsi::Value::null();
+  }
+  virtual void set(jsi::Runtime &, const jsi::PropNameID &name, const jsi::Value &value) {}
+  virtual std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime &rt) {
+    return {};
+  }
+
+ private:
+  uintptr_t key;
+};
 
 class MGLTypedArrayBase : public jsi::Object {
  public:
@@ -126,6 +143,8 @@ class MGLTypedArray : public MGLTypedArrayBase {
 
   std::vector<ContentType<T>> toVector(jsi::Runtime &runtime);
   void update(jsi::Runtime &runtime, const std::vector<ContentType<T>> &data);
+  void updateUnsafe(jsi::Runtime &runtime, ContentType<T> *data, size_t length);
+  uint8_t* data(jsi::Runtime &runtime);
 };
 
 template <MGLTypedArrayKind T>

package/cpp/MGLQuickCryptoHostObject.h

@@ -22,7 +22,7 @@ class JSI_EXPORT MGLQuickCryptoHostObject : public MGLSmartHostObject {
       std::shared_ptr<react::CallInvoker> jsCallInvoker,
       std::shared_ptr<DispatchQueue::dispatch_queue> workerQueue);
 
-  virtual ~MGLQuickCryptoHostObject() { invalidateJsiPropNameIDCache(); }
+  virtual ~MGLQuickCryptoHostObject() {}
 };
 
 }  // namespace margelo

package/ios/QuickCrypto.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

package/ios/QuickCrypto.xcodeproj/xcuserdata/brad.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>QuickCrypto.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/ios/QuickCryptoModule.mm

@@ -6,6 +6,7 @@
 #import <jsi/jsi.h>
 
 #import "../cpp/MGLQuickCryptoHostObject.h"
+#import "../cpp/JSIUtils/MGLTypedArray.h"
 
 @implementation QuickCryptoModule
 
@@ -40,6 +41,15 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) {
   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)
+  );
+
   NSLog(@"Successfully installed JSI bindings for react-native-quick-crypto!");
   return @true;
 }

package/lib/commonjs/pbkdf2.js

@@ -20,6 +20,7 @@ function sanitizeInput(input, errorMsg) {
     throw new Error(errorMsg);
   }
 }
+const nativePbkdf2 = _NativeQuickCrypto.NativeQuickCrypto.pbkdf2;
 function pbkdf2(password, salt, iterations, keylen, digest, callback) {
   if (callback === undefined || typeof callback !== 'function') {
     throw new Error('No callback provided to pbkdf2');
@@ -27,7 +28,6 @@ function pbkdf2(password, salt, iterations, keylen, digest, callback) {
   const sanitizedPassword = sanitizeInput(password, WRONG_PASS);
   const sanitizedSalt = sanitizeInput(salt, WRONG_SALT);
   const normalizedDigest = (0, _Utils.normalizeHashName)(digest, _Utils.HashContext.Node);
-  const nativePbkdf2 = _NativeQuickCrypto.NativeQuickCrypto.pbkdf2;
   nativePbkdf2.pbkdf2(sanitizedPassword, sanitizedSalt, iterations, keylen, normalizedDigest).then(res => {
     callback(null, _reactNativeBuffer.Buffer.from(res));
   }, e => {
@@ -38,7 +38,6 @@ function pbkdf2Sync(password, salt, iterations, keylen, digest) {
   const sanitizedPassword = sanitizeInput(password, WRONG_PASS);
   const sanitizedSalt = sanitizeInput(salt, WRONG_SALT);
   const algo = digest ? (0, _Utils.normalizeHashName)(digest, _Utils.HashContext.Node) : 'sha1';
-  const nativePbkdf2 = _NativeQuickCrypto.NativeQuickCrypto.pbkdf2;
   const result = nativePbkdf2.pbkdf2Sync(sanitizedPassword, sanitizedSalt, iterations, keylen, algo);
   return _reactNativeBuffer.Buffer.from(result);
 }

package/lib/commonjs/pbkdf2.js.map

@@ -1 +1 @@
-{"version":3,"names":["_NativeQuickCrypto","require","_reactNativeBuffer","_Utils","_util","WRONG_PASS","WRONG_SALT","sanitizeInput","input","errorMsg","binaryLikeToArrayBuffer","_e","Error","pbkdf2","password","salt","iterations","keylen","digest","callback","undefined","sanitizedPassword","sanitizedSalt","normalizedDigest","normalizeHashName","HashContext","Node","nativePbkdf2","NativeQuickCrypto","then","res","Buffer","from","e","pbkdf2Sync","algo","result","pbkdf2WithDigest","pbkdf2Promise","promisify","pbkdf2DeriveBits","algorithm","baseKey","length","hash","normalizedHash","lazyDOMException","raw","keyObject","export","bufferLikeToArrayBuffer"],"sourceRoot":"../../src","sources":["pbkdf2.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_NativeQuickCrypto","require","_reactNativeBuffer","_Utils","_util","WRONG_PASS","WRONG_SALT","sanitizeInput","input","errorMsg","binaryLikeToArrayBuffer","_e","Error","nativePbkdf2","NativeQuickCrypto","pbkdf2","password","salt","iterations","keylen","digest","callback","undefined","sanitizedPassword","sanitizedSalt","normalizedDigest","normalizeHashName","HashContext","Node","then","res","Buffer","from","e","pbkdf2Sync","algo","result","pbkdf2WithDigest","pbkdf2Promise","promisify","pbkdf2DeriveBits","algorithm","baseKey","length","hash","normalizedHash","lazyDOMException","raw","keyObject","export","bufferLikeToArrayBuffer"],"sourceRoot":"../../src","sources":["pbkdf2.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/pbkdf2.js

@@ -14,6 +14,7 @@ function sanitizeInput(input, errorMsg) {
     throw new Error(errorMsg);
   }
 }
+const nativePbkdf2 = NativeQuickCrypto.pbkdf2;
 export function pbkdf2(password, salt, iterations, keylen, digest, callback) {
   if (callback === undefined || typeof callback !== 'function') {
     throw new Error('No callback provided to pbkdf2');
@@ -21,7 +22,6 @@ export function pbkdf2(password, salt, iterations, keylen, digest, callback) {
   const sanitizedPassword = sanitizeInput(password, WRONG_PASS);
   const sanitizedSalt = sanitizeInput(salt, WRONG_SALT);
   const normalizedDigest = normalizeHashName(digest, HashContext.Node);
-  const nativePbkdf2 = NativeQuickCrypto.pbkdf2;
   nativePbkdf2.pbkdf2(sanitizedPassword, sanitizedSalt, iterations, keylen, normalizedDigest).then(res => {
     callback(null, Buffer.from(res));
   }, e => {
@@ -32,7 +32,6 @@ export function pbkdf2Sync(password, salt, iterations, keylen, digest) {
   const sanitizedPassword = sanitizeInput(password, WRONG_PASS);
   const sanitizedSalt = sanitizeInput(salt, WRONG_SALT);
   const algo = digest ? normalizeHashName(digest, HashContext.Node) : 'sha1';
-  const nativePbkdf2 = NativeQuickCrypto.pbkdf2;
   const result = nativePbkdf2.pbkdf2Sync(sanitizedPassword, sanitizedSalt, iterations, keylen, algo);
   return Buffer.from(result);
 }

package/lib/module/pbkdf2.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeQuickCrypto","Buffer","binaryLikeToArrayBuffer","lazyDOMException","bufferLikeToArrayBuffer","normalizeHashName","HashContext","promisify","WRONG_PASS","WRONG_SALT","sanitizeInput","input","errorMsg","_e","Error","pbkdf2","password","salt","iterations","keylen","digest","callback","undefined","sanitizedPassword","sanitizedSalt","normalizedDigest","Node","nativePbkdf2","then","res","from","e","pbkdf2Sync","algo","result","pbkdf2WithDigest","pbkdf2Promise","pbkdf2DeriveBits","algorithm","baseKey","length","hash","normalizedHash","raw","keyObject","export"],"sourceRoot":"../../src","sources":["pbkdf2.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["NativeQuickCrypto","Buffer","binaryLikeToArrayBuffer","lazyDOMException","bufferLikeToArrayBuffer","normalizeHashName","HashContext","promisify","WRONG_PASS","WRONG_SALT","sanitizeInput","input","errorMsg","_e","Error","nativePbkdf2","pbkdf2","password","salt","iterations","keylen","digest","callback","undefined","sanitizedPassword","sanitizedSalt","normalizedDigest","Node","then","res","from","e","pbkdf2Sync","algo","result","pbkdf2WithDigest","pbkdf2Promise","pbkdf2DeriveBits","algorithm","baseKey","length","hash","normalizedHash","raw","keyObject","export"],"sourceRoot":"../../src","sources":["pbkdf2.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/pbkdf2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pbkdf2.d.ts","sourceRoot":"","sources":["../../../src/pbkdf2.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AACxD,OAAO,EACL,KAAK,UAAU,EAMhB,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EAAE,SAAS,EAAiB,eAAe,EAAE,MAAM,QAAQ,CAAC;AAQxE,KAAK,QAAQ,GAAG,UAAU,CAAC;AAC3B,KAAK,IAAI,GAAG,UAAU,CAAC;AACvB,KAAK,cAAc,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;AAWvE,wBAAgB,MAAM,CACpB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,cAAc,GACvB,IAAI,CAyBN;AAED,wBAAgB,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd,WAAW,CAeb;AAcD,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,eAAe,EAC1B,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,WAAW,CAAC,CAsCtB"}
+{"version":3,"file":"pbkdf2.d.ts","sourceRoot":"","sources":["../../../src/pbkdf2.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AACxD,OAAO,EACL,KAAK,UAAU,EAMhB,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EAAE,SAAS,EAAiB,eAAe,EAAE,MAAM,QAAQ,CAAC;AAQxE,KAAK,QAAQ,GAAG,UAAU,CAAC;AAC3B,KAAK,IAAI,GAAG,UAAU,CAAC;AACvB,KAAK,cAAc,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;AAavE,wBAAgB,MAAM,CACpB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,cAAc,GACvB,IAAI,CAwBN;AAED,wBAAgB,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd,WAAW,CAcb;AAcD,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,eAAe,EAC1B,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,WAAW,CAAC,CAsCtB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-quick-crypto",
-  "version": "0.7.8",
+  "version": "0.7.10",
   "description": "A fast implementation of Node's `crypto` module written in C/C++ JSI",
   "packageManager": "bun@1.1.26",
   "main": "lib/commonjs/index",

package/src/pbkdf2.ts

@@ -29,6 +29,8 @@ function sanitizeInput(input: BinaryLike, errorMsg: string): ArrayBuffer {
   }
 }
 
+const nativePbkdf2 = NativeQuickCrypto.pbkdf2;
+
 export function pbkdf2(
   password: Password,
   salt: Salt,
@@ -44,7 +46,6 @@ export function pbkdf2(
   const sanitizedSalt = sanitizeInput(salt, WRONG_SALT);
   const normalizedDigest = normalizeHashName(digest, HashContext.Node);
 
-  const nativePbkdf2 = NativeQuickCrypto.pbkdf2;
   nativePbkdf2
     .pbkdf2(
       sanitizedPassword,
@@ -74,7 +75,6 @@ export function pbkdf2Sync(
   const sanitizedSalt = sanitizeInput(salt, WRONG_SALT);
   const algo = digest ? normalizeHashName(digest, HashContext.Node) : 'sha1';
 
-  const nativePbkdf2 = NativeQuickCrypto.pbkdf2;
   const result: ArrayBuffer = nativePbkdf2.pbkdf2Sync(
     sanitizedPassword,
     sanitizedSalt,