fix(pr): address review feedback (async hkdf, polyfills, checkbox)

athexweb3 · athexweb3 · commit 838d080193ec · 2025-12-07T07:45:13.000+06:00
diff --git a/bun.lock b/bun.lock
diff --git a/example/index.ts b/example/index.ts
@@ -31,23 +31,13 @@ if (typeof global.structuredClone === 'undefined') {
 import 'event-target-polyfill';
 
 // readable-stream
-if (typeof global.process !== 'undefined') {
-  const descriptor = Object.getOwnPropertyDescriptor(global.process, 'version');
-  if (!descriptor || descriptor.writable || descriptor.configurable) {
-    try {
-      Object.defineProperty(global.process, 'version', {
-        value: 'v22.0.0',
-        writable: true,
-        enumerable: true,
-        configurable: true,
-      });
-    } catch (e) {
-      console.warn('Failed to define process.version:', e);
-    }
-  }
-} else {
+if (global.process == null) {
   // @ts-expect-error - process is not defined
-  global.process = { version: 'v22.0.0' };
+  global.process = {};
+}
+if (global.process.version == null) {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  (global.process as any).version = 'v22.0.0';
 }
 
 import { AppRegistry } from 'react-native';
diff --git a/example/package.json b/example/package.json
@@ -35,10 +35,11 @@
     "events": "3.3.0",
     "react": "19.1.0",
     "react-native": "0.81.1",
+    "react-native-bouncy-checkbox": "2.1.10",
     "react-native-fast-encoder": "0.3.1",
     "react-native-nitro-modules": "0.29.1",
     "react-native-quick-base64": "2.2.2",
-    "react-native-quick-crypto": "1.0.2",
+    "react-native-quick-crypto": "workspace:*",
     "react-native-safe-area-context": "^5.2.2",
     "react-native-screens": "4.18.0",
     "react-native-vector-icons": "^10.3.0",
@@ -75,4 +76,4 @@
   "engines": {
     "node": ">=18"
   }
-}
+}
diff --git a/example/src/components/BenchmarkItem.tsx b/example/src/components/BenchmarkItem.tsx
@@ -6,7 +6,7 @@ import {
   TouchableOpacity,
   ActivityIndicator,
 } from 'react-native';
-import { Checkbox } from './Checkbox';
+import BouncyCheckbox from 'react-native-bouncy-checkbox';
 import { useNavigation } from '@react-navigation/native';
 import { colors } from '../styles/colors';
 import type { BenchmarkSuite } from '../benchmarks/benchmarks';
@@ -60,11 +60,12 @@ export const BenchmarkItem: React.FC<BenchmarkItemProps> = ({
           <ActivityIndicator size="small" color={colors.blue} />
         </View>
       ) : (
-        <Checkbox
+        <BouncyCheckbox
           isChecked={suite.enabled}
           onPress={() => toggle()}
           fillColor={colors.blue}
           style={styles.checkbox}
+          disableBuiltInState={true}
         />
       )}
       <TouchableOpacity
diff --git a/example/src/components/Checkbox.tsx b/example/src/components/Checkbox.tsx
diff --git a/example/src/components/TestItem.tsx b/example/src/components/TestItem.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { View, Text, StyleSheet, TouchableOpacity } from 'react-native';
-import { Checkbox } from './Checkbox';
+import BouncyCheckbox from 'react-native-bouncy-checkbox';
 import type { TestResult } from '../types/Results';
 import { useNavigation } from '@react-navigation/native';
 import { colors } from '../styles/colors';
@@ -41,13 +41,14 @@ export const TestItem: React.FC<TestItemProps> = ({
       style={styles.container}
       testID={`test-suite-${description.replace(/\s+/g, '-').toLowerCase()}`}
     >
-      <Checkbox
+      <BouncyCheckbox
         isChecked={value}
         onPress={() => {
           onToggle(description);
         }}
         fillColor={colors.blue}
         style={styles.checkbox}
+        disableBuiltInState={true}
       />
       <TouchableOpacity
         style={styles.touchable}
diff --git a/example/src/navigators/children/TestDetailsScreen.tsx b/example/src/navigators/children/TestDetailsScreen.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { SafeAreaView, ScrollView, StyleSheet, Text, View } from 'react-native';
-import { Checkbox } from '../../components/Checkbox';
+import BouncyCheckbox from 'react-native-bouncy-checkbox';
 import { CorrectResultItem } from '../../components/CorrectResultItem';
 import { IncorrectResultItem } from '../../components/IncorrectResultItem';
 import { Suite } from '../../components/Suite';
@@ -25,22 +25,24 @@ export const TestDetailsScreen = ({ route }) => {
       </View>
       <View style={styles.showMenu}>
         <View style={styles.showMenuItem}>
-          <Checkbox
+          <BouncyCheckbox
             isChecked={showFailed}
             onPress={() => setShowFailed(!showFailed)}
             fillColor="red"
             style={styles.checkbox}
             testID="show-failed-checkbox"
+            disableBuiltInState={true}
           />
           <Text style={styles.showMenuLabel}>Show Failed</Text>
         </View>
         <View style={styles.showMenuItem}>
-          <Checkbox
+          <BouncyCheckbox
             isChecked={showPassed}
             onPress={() => setShowPassed(!showPassed)}
             fillColor={colors.green}
             style={styles.checkbox}
             testID="show-passed-checkbox"
+            disableBuiltInState={true}
           />
           <Text style={styles.showMenuLabel}>Show Passed</Text>
         </View>
diff --git a/packages/react-native-quick-crypto/cpp/hkdf/HybridHkdf.cpp b/packages/react-native-quick-crypto/cpp/hkdf/HybridHkdf.cpp
@@ -8,10 +8,25 @@
 #include <vector>
 
 #include "HybridHkdf.hpp"
+#include "Utils.hpp"
 
 namespace margelo::nitro::crypto {
 
-std::shared_ptr<ArrayBuffer> HybridHkdf::deriveKey(const std::string& algorithm, const std::shared_ptr<ArrayBuffer>& key,
+std::shared_ptr<Promise<std::shared_ptr<ArrayBuffer>>> HybridHkdf::hkdf(const std::string& algorithm,
+                                                                        const std::shared_ptr<ArrayBuffer>& key,
+                                                                        const std::shared_ptr<ArrayBuffer>& salt,
+                                                                        const std::shared_ptr<ArrayBuffer>& info, double length) {
+  // get owned NativeArrayBuffers before passing to sync function
+  auto nativeKey = ToNativeArrayBuffer(key);
+  auto nativeSalt = ToNativeArrayBuffer(salt);
+  auto nativeInfo = ToNativeArrayBuffer(info);
+
+  return Promise<std::shared_ptr<ArrayBuffer>>::async([this, algorithm, nativeKey, nativeSalt, nativeInfo, length]() {
+    return this->deriveKey(algorithm, nativeKey, nativeSalt, nativeInfo, length);
+  });
+}
+
+std::shared_ptr<ArrayBuffer> HybridHkdf::deriveKey(const std::string& algorithm, const std::shared_ptr<ArrayBuffer>& baseKey,
                                                    const std::shared_ptr<ArrayBuffer>& salt, const std::shared_ptr<ArrayBuffer>& info,
                                                    double length) {
   EVP_KDF* kdf = EVP_KDF_fetch(nullptr, "HKDF", nullptr);
@@ -32,8 +47,8 @@ std::shared_ptr<ArrayBuffer> HybridHkdf::deriveKey(const std::string& algorithm,
   params[paramIndex++] = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST, const_cast<char*>(algorithm.c_str()), 0);
 
   // Key (Input Keying Material)
-  if (key && key->size() > 0) {
-    params[paramIndex++] = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, key->data(), key->size());
+  if (baseKey && baseKey->size() > 0) {
+    params[paramIndex++] = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, baseKey->data(), baseKey->size());
   } else {
     // Empty key is allowed in HKDF (defaults to zero string of hashLen) but explicit param usually expected if not null
     // If we want empty, we can pass generic empty buffer or handle it.
diff --git a/packages/react-native-quick-crypto/cpp/hkdf/HybridHkdf.hpp b/packages/react-native-quick-crypto/cpp/hkdf/HybridHkdf.hpp
@@ -20,6 +20,9 @@ class HybridHkdf : public HybridHkdfSpec {
   std::shared_ptr<ArrayBuffer> deriveKey(const std::string& algorithm, const std::shared_ptr<ArrayBuffer>& key,
                                          const std::shared_ptr<ArrayBuffer>& salt, const std::shared_ptr<ArrayBuffer>& info,
                                          double length) override;
+  std::shared_ptr<Promise<std::shared_ptr<ArrayBuffer>>> hkdf(const std::string& algorithm, const std::shared_ptr<ArrayBuffer>& key,
+                                                              const std::shared_ptr<ArrayBuffer>& salt,
+                                                              const std::shared_ptr<ArrayBuffer>& info, double length) override;
 };
 
 } // namespace margelo::nitro::crypto
diff --git a/packages/react-native-quick-crypto/nitrogen/generated/shared/c++/HybridHkdfSpec.cpp b/packages/react-native-quick-crypto/nitrogen/generated/shared/c++/HybridHkdfSpec.cpp
diff --git a/packages/react-native-quick-crypto/nitrogen/generated/shared/c++/HybridHkdfSpec.hpp b/packages/react-native-quick-crypto/nitrogen/generated/shared/c++/HybridHkdfSpec.hpp
diff --git a/packages/react-native-quick-crypto/src/hkdf.ts b/packages/react-native-quick-crypto/src/hkdf.ts
@@ -71,24 +71,22 @@ export function hkdf(
     }
 
     const nativeMod = getNative();
-    // Nitro methods are synchronous unless async is specified, but to match Node.js callback style we can wrap or if we want true async offloading we'd need Promise support in Native.
-    // The spec defined deriveKey as synchronous returning ArrayBuffer.
-    // Node.js hkdf is async (updates in thread pool).
-    // For now, we will execute synchronously and call callback.
-    // If we wanted true async, we should have defined it as Promise in Nitro spec.
-    // Given the task is to act like Node.js, and this is "Quick Crypto", we might want it to be fast.
-    // However, crypto ops can be heavy.
-    // Let's implement sync for now as per spec.
-
-    const result = nativeMod.deriveKey(
-      normalizedDigest,
-      sanitizedKey,
-      sanitizedSalt,
-      sanitizedInfo,
-      keylen,
-    );
-
-    callback(null, Buffer.from(result));
+    nativeMod
+      .hkdf(
+        normalizedDigest,
+        sanitizedKey,
+        sanitizedSalt,
+        sanitizedInfo,
+        keylen,
+      )
+      .then(
+        res => {
+          callback(null, Buffer.from(res));
+        },
+        err => {
+          callback(err);
+        },
+      );
   } catch (err) {
     callback(err as Error);
   }
diff --git a/packages/react-native-quick-crypto/src/index.ts b/packages/react-native-quick-crypto/src/index.ts
@@ -49,26 +49,12 @@ export const install = () => {
 };
 
 // random, cipher, hash use nextTick
-if (typeof global.process !== 'undefined') {
-  const descriptor = Object.getOwnPropertyDescriptor(
-    global.process,
-    'nextTick',
-  );
-  if (!descriptor || descriptor.writable || descriptor.configurable) {
-    try {
-      Object.defineProperty(global.process, 'nextTick', {
-        value: setImmediate,
-        writable: true,
-        enumerable: true,
-        configurable: true,
-      });
-    } catch (e) {
-      console.warn('Failed to define process.nextTick:', e);
-    }
-  }
-} else {
+if (global.process == null) {
   // @ts-expect-error - process is not defined
-  global.process = { nextTick: setImmediate };
+  global.process = {};
+}
+if (global.process.nextTick == null) {
+  global.process.nextTick = setImmediate;
 }
 
 // exports
diff --git a/packages/react-native-quick-crypto/src/specs/hkdf.nitro.ts b/packages/react-native-quick-crypto/src/specs/hkdf.nitro.ts
@@ -8,4 +8,12 @@ export interface Hkdf extends HybridObject<{ ios: 'c++'; android: 'c++' }> {
     info: ArrayBuffer,
     length: number,
   ): ArrayBuffer;
+
+  hkdf(
+    algorithm: string,
+    key: ArrayBuffer,
+    salt: ArrayBuffer,
+    info: ArrayBuffer,
+    length: number,
+  ): Promise<ArrayBuffer>;
 }
