@novastera-oss/nitro-metamask 0.7.8 → 0.7.9

package/app.plugin.js

@@ -6,82 +6,25 @@ 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
-        modResults.contents = modResults.contents.replace(
-          /^(@end|}$)/m,
-          deepLinkHandler + '\n$1'
-        );
-      }
+      return config;
     } else if (modResults.language === 'objc') {
       // Handle Objective-C AppDelegate
       // Remove stale direct SDK import if present. Importing MetaMaskSDK headers

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@novastera-oss/nitro-metamask",
-  "version": "0.7.8",
+  "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

@@ -5,22 +5,15 @@ jest.mock('@expo/config-plugins', () => ({
 const withMetamaskAppDelegate = require('../../app.plugin.js')
 
 describe('app.plugin.js', () => {
-  it('replaces stale Swift import even if handler already exists', () => {
+  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 {
-  func application(
-    _ app: UIApplication,
-    open url: URL,
-    options: [UIApplication.OpenURLOptionsKey: Any] = [:]
-  ) -> Bool {
-    MetaMaskSDK.sharedInstance?.handleUrl(url)
-    return true
-  }
 }
 `,
       },
@@ -29,12 +22,12 @@ class AppDelegate: NSObject {
     const result = withMetamaskAppDelegate(config)
     const contents: string = result.modResults.contents
 
-    expect(contents).toContain('import NitroMetamask')
     expect(contents).not.toContain('import metamask_ios_sdk')
-    expect((contents.match(/MetaMaskSDK\.sharedInstance\?\.handleUrl\(url\)/g) || []).length).toBe(1)
+    expect(contents).not.toContain('import NitroMetamask')
+    expect(contents).not.toContain('MetaMaskSDK.sharedInstance?.handleUrl(url)')
   })
 
-  it('injects NitroMetamask Swift import when missing', () => {
+  it('keeps Swift AppDelegate untouched apart from cleanup', () => {
     const config = {
       modResults: {
         language: 'swift',
@@ -49,8 +42,9 @@ class AppDelegate: NSObject {
     const result = withMetamaskAppDelegate(config)
     const contents: string = result.modResults.contents
 
-    expect(contents).toContain('import NitroMetamask')
-    expect(contents).toContain('MetaMaskSDK.sharedInstance?.handleUrl(url)')
+    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', () => {