@novastera-oss/nitro-metamask 0.2.5 → 0.2.7

package/android/src/main/java/com/margelo/nitro/nitrometamask/HybridMetamaskConnector.kt

@@ -1,7 +1,6 @@
 package com.margelo.nitro.nitrometamask
 
 import com.margelo.nitro.core.Promise
-import com.margelo.nitro.core.NitroRuntime
 import io.metamask.androidsdk.Ethereum
 import io.metamask.androidsdk.Result
 import io.metamask.androidsdk.DappMetadata
@@ -14,10 +13,10 @@ import kotlin.coroutines.resume
 class HybridMetamaskConnector : HybridMetamaskConnectorSpec() {
     // Initialize Ethereum SDK with Context, DappMetadata, and SDKOptions
     // Based on: https://github.com/MetaMask/metamask-android-sdk
-    // Using NitroRuntime for proper Nitro context access (survives reloads, no static leaks)
+    // Using MetamaskContextHolder for Context access (Nitro doesn't provide Context APIs)
+    // This pattern matches how other Nitro modules handle Context (VisionCamera, MMKV, etc.)
     private val ethereum: Ethereum by lazy {
-        val context = NitroRuntime.applicationContext
-            ?: throw IllegalStateException("Nitro application context not available")
+        val context = MetamaskContextHolder.get()
         
         val dappMetadata = DappMetadata(
             name = "Nitro MetaMask Connector",
@@ -56,12 +55,14 @@ class HybridMetamaskConnector : HybridMetamaskConnectorSpec() {
                         ?: throw IllegalStateException("MetaMask SDK returned no chainId after connection")
                     
                     // Parse chainId from hex string (e.g., "0x1") or decimal string to number
+                    // Nitro requires chainId to be Double (number in TS maps to Double in Kotlin)
                     val chainId = try {
-                        if (chainIdString.startsWith("0x") || chainIdString.startsWith("0X")) {
+                        val chainIdInt = if (chainIdString.startsWith("0x") || chainIdString.startsWith("0X")) {
                             chainIdString.substring(2).toLong(16).toInt()
                         } else {
                             chainIdString.toLong().toInt()
                         }
+                        chainIdInt.toDouble()
                     } catch (e: NumberFormatException) {
                         throw IllegalStateException("Invalid chainId format: $chainIdString")
                     }

package/android/src/main/java/com/margelo/nitro/nitrometamask/MetamaskContextHolder.kt

@@ -0,0 +1,36 @@
+package com.margelo.nitro.nitrometamask
+
+import android.content.Context
+
+/**
+ * Context holder for MetaMask SDK initialization.
+ * 
+ * Nitro does not provide Android Context access, so we must manage it ourselves.
+ * This pattern is used by all Nitro modules that need Context (VisionCamera, MMKV, etc.)
+ * 
+ * The context is initialized from NitroMetamaskPackage when React Native loads the module.
+ */
+object MetamaskContextHolder {
+    @Volatile
+    private var appContext: Context? = null
+
+    /**
+     * Initialize the context holder with the React Native application context.
+     * This should be called once from NitroMetamaskPackage.getModule()
+     */
+    fun initialize(context: Context) {
+        appContext = context.applicationContext
+    }
+
+    /**
+     * Get the application context.
+     * Throws if not initialized - this ensures we fail fast if the package wasn't loaded correctly.
+     */
+    fun get(): Context {
+        return appContext
+            ?: throw IllegalStateException(
+                "MetamaskContextHolder not initialized. " +
+                "Make sure NitroMetamaskPackage is properly registered in your React Native app."
+            )
+    }
+}

package/android/src/main/java/com/margelo/nitro/nitrometamask/NitroMetamaskPackage.kt

@@ -7,7 +7,10 @@ import com.facebook.react.BaseReactPackage
 
 class NitroMetamaskPackage : BaseReactPackage() {
     override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
-        // No need to store ReactApplicationContext - HybridMetamaskConnector uses NitroRuntime
+        // Initialize MetamaskContextHolder with React Native application context
+        // This is the ONLY way to get Context in Nitro modules - Nitro doesn't provide Context APIs
+        // The context is stored in our own holder and accessed by HybridMetamaskConnector
+        MetamaskContextHolder.initialize(reactContext)
         return null
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@novastera-oss/nitro-metamask",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "nitro-metamask",
   "main": "lib/index",
   "module": "lib/index",