react-native-neural-wallet-lib 0.1.52 → 0.1.53

package/NeuralWalletLibFramework.xcframework/Info.plist

@@ -8,7 +8,7 @@
 			<key>BinaryPath</key>
 			<string>libwallet.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libwallet.a</string>
 			<key>SupportedArchitectures</key>
@@ -17,12 +17,14 @@
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libwallet.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libwallet.a</string>
 			<key>SupportedArchitectures</key>
@@ -31,8 +33,6 @@
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/README.md

@@ -44,6 +44,16 @@ A standalone `.a` commonly causes mixed-slice link failures between real device
 Also ensure the XCFramework is **real** (contains device/simulator slices), not a placeholder with only `Info.plist`.
 `npm pack` now runs `scripts/verify-ios-artifacts.js` to block publishing empty iOS artifacts.
 
+## Android JNI note (RN 0.82+)
+
+For React Native 0.82+, JNI install must **not** access `CallInvokerHolderImpl.mHybridData` by reflection.
+This repo now uses the fbjni bridge (`adopt_local + cthis()->getCallInvoker()`).
+
+- After regenerate, run: `npm run patch:android:jni`
+- Verify before publish: `npm run verify:android:jni`
+
+`prepack` now includes Android JNI compatibility verification.
+
 ## GitHub Actions release (macOS build + npm publish)
 
 Workflow: `.github/workflows/release-npm-ios.yml`

package/android/cpp-adapter.cpp

@@ -1,6 +1,7 @@
 // Generated by uniffi-bindgen-react-native
 #include <jni.h>
 #include <jsi/jsi.h>
+#include <fbjni/fbjni.h>
 #include <ReactCommon/CallInvokerHolder.h>
 #include "react-native-neural-wallet-lib.h"
 
@@ -24,34 +25,18 @@ Java_com_neuralwalletlib_NeuralWalletLibModule_nativeInstallRustCrate(
     jlong rtPtr,
     jobject callInvokerHolderJavaObj
 ) {
-    // https://github.com/realm/realm-js/blob/main/packages/realm/binding/android/src/main/cpp/io_realm_react_RealmReactModule.cpp#L122-L145
-    // React Native uses the fbjni library for handling JNI, which has the concept of "hybrid objects",
-    // which are Java objects containing a pointer to a C++ object. The CallInvokerHolder, which has the
-    // invokeAsync method we want access to, is one such hybrid object.
-    // Rather than reworking our code to use fbjni throughout, this code unpacks the C++ object from the Java
-    // object `callInvokerHolderJavaObj` manually, based on reverse engineering the fbjni code.
-
-    // 1. Get the Java object referred to by the mHybridData field of the Java holder object
-    auto callInvokerHolderClass = env->GetObjectClass(callInvokerHolderJavaObj);
-    auto hybridDataField = env->GetFieldID(callInvokerHolderClass, "mHybridData", "Lcom/facebook/jni/HybridData;");
-    auto hybridDataObj = env->GetObjectField(callInvokerHolderJavaObj, hybridDataField);
-
-    // 2. Get the destructor Java object referred to by the mDestructor field from the myHybridData Java object
-    auto hybridDataClass = env->FindClass("com/facebook/jni/HybridData");
-    auto destructorField =
-        env->GetFieldID(hybridDataClass, "mDestructor", "Lcom/facebook/jni/HybridData$Destructor;");
-    auto destructorObj = env->GetObjectField(hybridDataObj, destructorField);
-
-    // 3. Get the mNativePointer field from the mDestructor Java object
-    auto destructorClass = env->FindClass("com/facebook/jni/HybridData$Destructor");
-    auto nativePointerField = env->GetFieldID(destructorClass, "mNativePointer", "J");
-    auto nativePointerValue = env->GetLongField(destructorObj, nativePointerField);
+    auto runtime = reinterpret_cast<jsi::Runtime *>(rtPtr);
+    if (runtime == nullptr || callInvokerHolderJavaObj == nullptr) {
+        return JNI_FALSE;
+    }
 
-    // 4. Cast the mNativePointer back to its C++ type
-    auto nativePointer = reinterpret_cast<facebook::react::CallInvokerHolder*>(nativePointerValue);
-    auto jsCallInvoker = nativePointer->getCallInvoker();
+    auto callInvokerHolder = facebook::jni::adopt_local(
+        reinterpret_cast<facebook::react::CallInvokerHolder::javaobject>(callInvokerHolderJavaObj));
+    auto jsCallInvoker = callInvokerHolder->cthis()->getCallInvoker();
+    if (jsCallInvoker == nullptr) {
+        return JNI_FALSE;
+    }
 
-    auto runtime = reinterpret_cast<jsi::Runtime *>(rtPtr);
     return neuralwalletlib::installRustCrate(*runtime, jsCallInvoker);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-neural-wallet-lib",
-  "version": "0.1.52",
+  "version": "0.1.53",
   "description": "Neural wallet native lib",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -35,7 +35,7 @@
   ],
   "scripts": {
     "ubrn:ios": "ubrn build ios --release --and-generate",
-    "ubrn:android": "ubrn build android --release --and-generate ",
+    "ubrn:android": "ubrn build android --release --and-generate && npm run patch:android:jni",
     "ubrn:web": "ubrn build web",
     "ubrn:checkout": "ubrn checkout",
     "ubrn:clean": "rm -rfv cpp/ android/CMakeLists.txt android/src/main/java android/*.cpp ios/ src/Native* src/index.*ts* src/generated/",
@@ -45,7 +45,9 @@
     "lint": "eslint \"**/*.{js,ts,tsx}\"",
     "clean": "del-cli android/build NeuralWallet/android/build NeuralWallet/android/app/build NeuralWallet/ios/build lib",
     "prepare": "bob build",
-    "prepack": "node scripts/verify-ios-artifacts.js",
+    "patch:android:jni": "node scripts/patch-android-cpp-adapter.js",
+    "verify:android:jni": "node scripts/verify-android-jni-compat.js",
+    "prepack": "node scripts/verify-ios-artifacts.js && node scripts/verify-android-jni-compat.js",
     "release": "release-it --only-version"
   },
   "keywords": [