@novastera-oss/nitro-metamask 0.7.7 → 0.7.9

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

@@ -1,8 +1,6 @@
-#include <fbjni/fbjni.h>
 #include <jni.h>
-
 #include "NitroMetamaskOnLoad.hpp"
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-  return facebook::jni::initialize(vm, []() { margelo::nitro::nitrometamask::registerAllNatives(); });
+  return margelo::nitro::nitrometamask::initialize(vm);
 }

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

@@ -37,9 +37,10 @@ class NitroMetamaskPackage : BaseReactPackage() {
                     "NitroMetamaskPackage",
                     false, // canOverrideExistingModule
                     true, // needsEagerInit
+                    true, // hasConstants
                     false, // isCxxModule
-                    true, // isTurboModule
-                ),
+                    true // isTurboModule
+                )
             )
         }
     }

package/app.plugin.js

@@ -6,109 +6,66 @@ const withMetamaskAppDelegate = (config) => {
     
     // Check if AppDelegate is Swift
     if (modResults.language === 'swift') {
-      // Migrate stale/incorrect import if present
-      if (modResults.contents.includes('import metamask_ios_sdk')) {
-        modResults.contents = modResults.contents.replace(
-          /import\s+metamask_ios_sdk/g,
-          'import NitroMetamask'
-        );
-      }
+      // Swift AppDelegate should not import Nitro/MetaMask modules directly.
+      // Cleanup legacy injected imports from previous plugin versions.
+      modResults.contents = modResults.contents.replace(
+        /^\s*import\s+metamask_ios_sdk\s*\n?/gm,
+        ''
+      );
+      modResults.contents = modResults.contents.replace(
+        /^\s*import\s+NitroMetamask\s*\n?/gm,
+        ''
+      );
 
-      // Add NitroMetamask import if not present
-      if (!modResults.contents.includes('import NitroMetamask')) {
-        // Find the last import statement and add after it
-        const importRegex = /^import\s+.*$/gm;
-        const imports = modResults.contents.match(importRegex);
-        if (imports && imports.length > 0) {
-          const lastImport = imports[imports.length - 1];
-          const lastImportIndex = modResults.contents.lastIndexOf(lastImport);
-          modResults.contents = 
-            modResults.contents.slice(0, lastImportIndex + lastImport.length) +
-            '\nimport NitroMetamask' +
-            modResults.contents.slice(lastImportIndex + lastImport.length);
-        } else {
-          // No imports found, add at the top after the first line
-          const firstLineIndex = modResults.contents.indexOf('\n');
-          modResults.contents = 
-            modResults.contents.slice(0, firstLineIndex + 1) +
-            'import NitroMetamask\n' +
-            modResults.contents.slice(firstLineIndex + 1);
-        }
-      }
+      // Optional migration cleanup: remove legacy injected MetaMask handler
+      // block if it exists in Swift AppDelegate files.
+      modResults.contents = modResults.contents.replace(
+        /\n\s*\/\/ Handle deep links from MetaMask wallet[\s\S]*?MetaMaskSDK\.sharedInstance\?\.handleUrl\(url\)[\s\S]*?return false\s*\n\s*\}/g,
+        ''
+      );
 
-      // Check if the method already exists
-      if (modResults.contents.includes('MetaMaskSDK.sharedInstance?.handleUrl')) {
-        return config;
-      }
-      
-      // Add the deep link handler method
-      const deepLinkHandler = `
-  // Handle deep links from MetaMask wallet
-  // MetaMask returns to the app via deep link after signing/connecting
-  // Added by @novastera-oss/nitro-metamask config plugin
-  func application(
-    _ app: UIApplication,
-    open url: URL,
-    options: [UIApplication.OpenURLOptionsKey: Any] = [:]
-  ) -> Bool {
-    // Check if this is a MetaMask deep link (host="mmsdk")
-    if let components = URLComponents(url: url, resolvingAgainstBaseURL: true),
-       components.host == "mmsdk" {
-      // Handle MetaMask deep link return
-      MetaMaskSDK.sharedInstance?.handleUrl(url)
-      return true
-    }
-    
-    // Handle other deep links (e.g., React Native Linking)
-    return false
-  }`;
-      
-      // Insert before the last closing brace of the AppDelegate class
-      // Try to find the closing brace of the class before @end or end of file
-      const classEndPattern = /(\s+)\}(?=\s*(?:@end|$))/;
-      const match = modResults.contents.match(classEndPattern);
-      if (match) {
-        const indent = match[1];
-        const insertIndex = match.index;
-        modResults.contents = 
-          modResults.contents.slice(0, insertIndex) +
-          deepLinkHandler.replace(/^  /gm, indent) +
-          '\n' + indent + '}' +
-          modResults.contents.slice(insertIndex + match[0].length);
-      } else {
-        // Fallback: append before @end
+      return config;
+    } else if (modResults.language === 'objc') {
+      // Handle Objective-C AppDelegate
+      // Remove stale direct SDK import if present. Importing MetaMaskSDK headers
+      // in Objective-C (.m) can pull C++ headers and fail non-ObjC++ builds.
+      modResults.contents = modResults.contents.replace(
+        /^\s*#import\s+<MetaMaskSDK\/MetaMaskSDK\.h>\s*\n?/gm,
+        ''
+      );
+
+      // Migrate legacy direct call to a runtime-safe invocation in Objective-C.
+      if (modResults.contents.includes('[[MetaMaskSDK sharedInstance] handleUrl:url];')) {
         modResults.contents = modResults.contents.replace(
-          /^(@end|}$)/m,
-          deepLinkHandler + '\n$1'
+          /\[\[MetaMaskSDK sharedInstance\] handleUrl:url\];/g,
+          `Class metaMaskSDKClass = NSClassFromString(@"MetaMaskSDK");
+    id sharedInstance = [metaMaskSDKClass respondsToSelector:@selector(sharedInstance)]
+      ? [metaMaskSDKClass performSelector:@selector(sharedInstance)]
+      : nil;
+    if (sharedInstance && [sharedInstance respondsToSelector:@selector(handleUrl:)]) {
+      [sharedInstance performSelector:@selector(handleUrl:) withObject:url];
+    }`
         );
       }
-    } else if (modResults.language === 'objc') {
-      // Handle Objective-C AppDelegate
-      if (modResults.contents.includes('MetaMaskSDK')) {
+
+      // Skip injection if handler already exists after migration.
+      if (modResults.contents.includes('[components.host isEqualToString:@"mmsdk"]')) {
         return config;
       }
       
-      // Add import
-      if (!modResults.contents.includes('#import <MetaMaskSDK/MetaMaskSDK.h>')) {
-        const importRegex = /^#import\s+.*$/gm;
-        const imports = modResults.contents.match(importRegex);
-        if (imports && imports.length > 0) {
-          const lastImport = imports[imports.length - 1];
-          const lastImportIndex = modResults.contents.lastIndexOf(lastImport);
-          modResults.contents = 
-            modResults.contents.slice(0, lastImportIndex + lastImport.length) +
-            '\n#import <MetaMaskSDK/MetaMaskSDK.h>' +
-            modResults.contents.slice(lastImportIndex + lastImport.length);
-        }
-      }
-      
       const objcHandler = `
 - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
   // Check if this is a MetaMask deep link (host="mmsdk")
   NSURLComponents *components = [NSURLComponents componentsWithURL:url resolvingAgainstBaseURL:YES];
   if ([components.host isEqualToString:@"mmsdk"]) {
     // Handle MetaMask deep link return
-    [[MetaMaskSDK sharedInstance] handleUrl:url];
+    Class metaMaskSDKClass = NSClassFromString(@"MetaMaskSDK");
+    id sharedInstance = [metaMaskSDKClass respondsToSelector:@selector(sharedInstance)]
+      ? [metaMaskSDKClass performSelector:@selector(sharedInstance)]
+      : nil;
+    if (sharedInstance && [sharedInstance respondsToSelector:@selector(handleUrl:)]) {
+      [sharedInstance performSelector:@selector(handleUrl:) withObject:url];
+    }
     return YES;
   }
   

package/lib/typescript/src/__tests__/appPlugin.test.d.ts

@@ -0,0 +1,2 @@
+declare const withMetamaskAppDelegate: any;
+//# sourceMappingURL=appPlugin.test.d.ts.map

package/lib/typescript/src/__tests__/appPlugin.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"appPlugin.test.d.ts","sourceRoot":"","sources":["../../../../src/__tests__/appPlugin.test.ts"],"names":[],"mappings":"AAIA,QAAA,MAAM,uBAAuB,KAAiC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@novastera-oss/nitro-metamask",
-  "version": "0.7.7",
+  "version": "0.7.9",
   "description": "Native mobile MetaMask wallet integration for React Native. Part of Novastera CRM/ERP platform ecosystem. Provides secure authentication and message signing for Web3 mobile applications.",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/module/index.js",

package/src/__tests__/appPlugin.test.ts

@@ -0,0 +1,79 @@
+jest.mock('@expo/config-plugins', () => ({
+  withAppDelegate: (config: any, action: (cfg: any) => any) => action(config),
+}))
+
+const withMetamaskAppDelegate = require('../../app.plugin.js')
+
+describe('app.plugin.js', () => {
+  it('removes stale Swift imports and does not inject handler', () => {
+    const config = {
+      modResults: {
+        language: 'swift',
+        contents: `import UIKit
+import metamask_ios_sdk
+import NitroMetamask
+
+class AppDelegate: NSObject {
+}
+`,
+      },
+    }
+
+    const result = withMetamaskAppDelegate(config)
+    const contents: string = result.modResults.contents
+
+    expect(contents).not.toContain('import metamask_ios_sdk')
+    expect(contents).not.toContain('import NitroMetamask')
+    expect(contents).not.toContain('MetaMaskSDK.sharedInstance?.handleUrl(url)')
+  })
+
+  it('keeps Swift AppDelegate untouched apart from cleanup', () => {
+    const config = {
+      modResults: {
+        language: 'swift',
+        contents: `import UIKit
+
+class AppDelegate: NSObject {
+}
+`,
+      },
+    }
+
+    const result = withMetamaskAppDelegate(config)
+    const contents: string = result.modResults.contents
+
+    expect(contents).toContain('import UIKit')
+    expect(contents).not.toContain('import NitroMetamask')
+    expect(contents).not.toContain('MetaMaskSDK.sharedInstance?.handleUrl(url)')
+  })
+
+  it('migrates Objective-C direct SDK usage to runtime-safe calls', () => {
+    const config = {
+      modResults: {
+        language: 'objc',
+        contents: `#import "AppDelegate.h"
+#import <MetaMaskSDK/MetaMaskSDK.h>
+
+@implementation AppDelegate
+- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
+  NSURLComponents *components = [NSURLComponents componentsWithURL:url resolvingAgainstBaseURL:YES];
+  if ([components.host isEqualToString:@"mmsdk"]) {
+    [[MetaMaskSDK sharedInstance] handleUrl:url];
+    return YES;
+  }
+  return NO;
+}
+@end
+`,
+      },
+    }
+
+    const result = withMetamaskAppDelegate(config)
+    const contents: string = result.modResults.contents
+
+    expect(contents).not.toContain('#import <MetaMaskSDK/MetaMaskSDK.h>')
+    expect(contents).toContain('NSClassFromString(@"MetaMaskSDK")')
+    expect(contents).toContain('[sharedInstance performSelector:@selector(handleUrl:) withObject:url]')
+    expect(contents).not.toContain('[[MetaMaskSDK sharedInstance] handleUrl:url];')
+  })
+})