@vanikya/ota-react-native 0.2.4 → 0.2.6

package/android/build.gradle

@@ -49,4 +49,6 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-android:+"
+    // ProcessPhoenix for graceful app restart
+    implementation "com.jakewharton:process-phoenix:3.0.0"
 }

package/android/src/main/java/com/otaupdate/OTAUpdateHelper.kt

@@ -2,17 +2,22 @@ package com.otaupdate
 
 import android.content.Context
 import android.content.SharedPreferences
+import android.content.pm.PackageInfo
+import android.os.Build
 import android.util.Log
 import java.io.File
 
 /**
  * Helper object for OTA Update bundle loading.
  * This is called from MainApplication.getJSBundleFile() to get the OTA bundle path.
+ *
+ * Based on patterns from react-native-ota-hot-update and hot-updater libraries.
  */
 object OTAUpdateHelper {
     private const val TAG = "OTAUpdate"
     private const val PREFS_NAME = "OTAUpdate"
     private const val KEY_BUNDLE_PATH = "BundlePath"
+    private const val KEY_APP_VERSION = "AppVersion"
 
     /**
      * Get the JS bundle file path for React Native to load.
@@ -24,10 +29,25 @@ object OTAUpdateHelper {
     @JvmStatic
     fun getJSBundleFile(context: Context): String? {
         return try {
+            Log.d(TAG, "=== OTAUpdateHelper.getJSBundleFile called ===")
+
             val prefs: SharedPreferences = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
             val bundlePath = prefs.getString(KEY_BUNDLE_PATH, null)
+            val savedAppVersion = prefs.getString(KEY_APP_VERSION, null)
+            val currentAppVersion = getAppVersionCode(context)
+
+            Log.d(TAG, "Stored bundle path: $bundlePath")
+            Log.d(TAG, "Saved app version: $savedAppVersion, Current app version: $currentAppVersion")
 
-            Log.d(TAG, "getJSBundleFile called, stored path: $bundlePath")
+            // Clear bundle if app version changed (user updated the app)
+            if (savedAppVersion != null && savedAppVersion != currentAppVersion.toString()) {
+                Log.w(TAG, "App version changed from $savedAppVersion to $currentAppVersion, clearing OTA bundle")
+                prefs.edit()
+                    .remove(KEY_BUNDLE_PATH)
+                    .remove(KEY_APP_VERSION)
+                    .commit()
+                return null
+            }
 
             if (bundlePath.isNullOrEmpty()) {
                 Log.d(TAG, "No OTA bundle path stored, loading default bundle")
@@ -35,6 +55,9 @@ object OTAUpdateHelper {
             }
 
             val file = File(bundlePath)
+            Log.d(TAG, "Checking file: ${file.absolutePath}")
+            Log.d(TAG, "File exists: ${file.exists()}, canRead: ${file.canRead()}")
+
             if (!file.exists()) {
                 Log.w(TAG, "OTA bundle file does not exist: $bundlePath")
                 // Clear invalid path
@@ -44,6 +67,7 @@ object OTAUpdateHelper {
 
             if (!file.canRead()) {
                 Log.w(TAG, "OTA bundle file is not readable: $bundlePath")
+                prefs.edit().remove(KEY_BUNDLE_PATH).commit()
                 return null
             }
 
@@ -54,7 +78,23 @@ object OTAUpdateHelper {
                 return null
             }
 
-            Log.d(TAG, "Loading OTA bundle: $bundlePath ($fileSize bytes)")
+            // Verify it looks like a JS file by checking first bytes
+            try {
+                val firstBytes = file.inputStream().use { it.readNBytes(50) }
+                val preview = String(firstBytes, Charsets.UTF_8)
+                Log.d(TAG, "Bundle preview: ${preview.take(30)}...")
+
+                // Check for HTML (error pages)
+                if (preview.contains("<!DOCTYPE") || preview.contains("<html") || preview.contains("<HTML")) {
+                    Log.e(TAG, "OTA bundle appears to be HTML, not JavaScript - clearing")
+                    prefs.edit().remove(KEY_BUNDLE_PATH).commit()
+                    return null
+                }
+            } catch (e: Exception) {
+                Log.w(TAG, "Could not verify bundle content: ${e.message}")
+            }
+
+            Log.d(TAG, "✓ Loading OTA bundle: $bundlePath ($fileSize bytes)")
             bundlePath
         } catch (e: Exception) {
             Log.e(TAG, "Error getting JS bundle file: ${e.message}", e)
@@ -62,6 +102,31 @@ object OTAUpdateHelper {
         }
     }
 
+    /**
+     * Get app version code for cache invalidation
+     */
+    @JvmStatic
+    fun getAppVersionCode(context: Context): Long {
+        return try {
+            val packageInfo: PackageInfo = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                context.packageManager.getPackageInfo(context.packageName, android.content.pm.PackageManager.PackageInfoFlags.of(0))
+            } else {
+                @Suppress("DEPRECATION")
+                context.packageManager.getPackageInfo(context.packageName, 0)
+            }
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                packageInfo.longVersionCode
+            } else {
+                @Suppress("DEPRECATION")
+                packageInfo.versionCode.toLong()
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Error getting app version: ${e.message}")
+            0L
+        }
+    }
+
     /**
      * Check if an OTA bundle is pending to be loaded.
      *
@@ -84,7 +149,24 @@ object OTAUpdateHelper {
     @JvmStatic
     fun clearPendingBundle(context: Context) {
         val prefs: SharedPreferences = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
-        prefs.edit().remove(KEY_BUNDLE_PATH).commit()
+        prefs.edit()
+            .remove(KEY_BUNDLE_PATH)
+            .remove(KEY_APP_VERSION)
+            .commit()
         Log.d(TAG, "Pending bundle cleared")
     }
+
+    /**
+     * Save the bundle path with app version for cache invalidation
+     */
+    @JvmStatic
+    fun saveBundlePath(context: Context, bundlePath: String) {
+        val prefs: SharedPreferences = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
+        val appVersion = getAppVersionCode(context)
+        prefs.edit()
+            .putString(KEY_BUNDLE_PATH, bundlePath)
+            .putString(KEY_APP_VERSION, appVersion.toString())
+            .commit()
+        Log.d(TAG, "Bundle path saved: $bundlePath (app version: $appVersion)")
+    }
 }

package/android/src/main/java/com/otaupdate/OTAUpdateModule.kt

@@ -6,6 +6,7 @@ import android.os.Handler
 import android.os.Looper
 import android.util.Base64
 import com.facebook.react.bridge.*
+import com.jakewharton.processphoenix.ProcessPhoenix
 import java.io.File
 import java.io.FileOutputStream
 import java.io.InputStream
@@ -303,26 +304,35 @@ class OTAUpdateModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
             }
 
             if (restart) {
-                android.util.Log.d("OTAUpdate", "Restarting app to apply bundle...")
+                android.util.Log.d("OTAUpdate", "Restarting app to apply bundle using ProcessPhoenix...")
 
                 // Resolve promise before restarting so JS knows it succeeded
                 promise.resolve(null)
 
                 // Give a small delay to ensure the promise is sent back to JS
                 mainHandler.postDelayed({
-                    // Restart the app
-                    val context = reactApplicationContext
-                    val intent = context.packageManager.getLaunchIntentForPackage(context.packageName)
-                    intent?.addFlags(android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP)
-                    intent?.addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK)
-                    intent?.addFlags(android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK)
-                    context.startActivity(intent)
-
-                    // Small delay before killing to allow activity to start
-                    mainHandler.postDelayed({
+                    try {
+                        // Use ProcessPhoenix for graceful app restart
+                        // This properly kills the current process and starts a new one
+                        val activity = currentActivity
+                        if (activity != null) {
+                            ProcessPhoenix.triggerRebirth(activity)
+                        } else {
+                            // Fallback to context-based restart
+                            ProcessPhoenix.triggerRebirth(reactApplicationContext)
+                        }
+                    } catch (e: Exception) {
+                        android.util.Log.e("OTAUpdate", "ProcessPhoenix restart failed: ${e.message}, using fallback")
+                        // Fallback to manual restart
+                        val context = reactApplicationContext
+                        val intent = context.packageManager.getLaunchIntentForPackage(context.packageName)
+                        intent?.addFlags(android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                        intent?.addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK)
+                        intent?.addFlags(android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK)
+                        context.startActivity(intent)
                         android.os.Process.killProcess(android.os.Process.myPid())
-                    }, 100)
-                }, 100)
+                    }
+                }, 200)
             } else {
                 promise.resolve(null)
             }
@@ -345,6 +355,24 @@ class OTAUpdateModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
         promise.resolve(null)
     }
 
+    // Reload the app - used to apply pending updates
+    @ReactMethod
+    fun reload() {
+        android.util.Log.d("OTAUpdate", "Reload requested...")
+        mainHandler.postDelayed({
+            try {
+                val activity = currentActivity
+                if (activity != null) {
+                    ProcessPhoenix.triggerRebirth(activity)
+                } else {
+                    ProcessPhoenix.triggerRebirth(reactApplicationContext)
+                }
+            } catch (e: Exception) {
+                android.util.Log.e("OTAUpdate", "Reload failed: ${e.message}")
+            }
+        }, 100)
+    }
+
     // Utility functions
 
     private fun hexStringToByteArray(hex: String): ByteArray {

package/app.plugin.js

@@ -4,11 +4,11 @@ const { withMainApplication, withAppDelegate } = require('@expo/config-plugins')
  * OTA Update Expo Config Plugin
  *
  * This plugin modifies the native code to enable OTA bundle loading:
- * - Android: Overrides getJSBundleFile() in MainApplication.kt using OTAUpdateHelper
+ * - Android: Overrides getJSBundleFile() or sets jsBundleFilePath in MainApplication.kt
  * - iOS: Modifies bundleURL() in AppDelegate.swift
  *
- * The modifications check SharedPreferences (Android) / UserDefaults (iOS)
- * for a pending OTA bundle path and load it instead of the default bundle.
+ * Supports both old architecture (getJSBundleFile override) and
+ * new architecture (jsBundleFilePath parameter in getDefaultReactHost).
  */
 
 function withOTAUpdateAndroid(config) {
@@ -16,122 +16,152 @@ function withOTAUpdateAndroid(config) {
     let contents = config.modResults.contents;
 
     // Check if already modified
-    if (contents.includes('OTAUpdateHelper')) {
+    if (contents.includes('OTAUpdateHelper') || contents.includes('com.otaupdate')) {
       console.log('[OTAUpdate] Android: OTAUpdateHelper already present, skipping');
       return config;
     }
 
-    // Add import for OTAUpdateHelper
+    console.log('[OTAUpdate] Android: Analyzing MainApplication.kt structure...');
+
+    // Add import for OTAUpdateHelper at the top
     const packageMatch = contents.match(/^package\s+[\w.]+\s*\n/m);
     if (packageMatch) {
       const insertPos = packageMatch.index + packageMatch[0].length;
-      // Check if import section exists
-      if (!contents.includes('import com.otaupdate.OTAUpdateHelper')) {
-        const importStatement = `\nimport com.otaupdate.OTAUpdateHelper\n`;
-        contents = contents.slice(0, insertPos) + importStatement + contents.slice(insertPos);
+      const importStatement = `\nimport com.otaupdate.OTAUpdateHelper\n`;
+      contents = contents.slice(0, insertPos) + importStatement + contents.slice(insertPos);
+      console.log('[OTAUpdate] Android: Added import for OTAUpdateHelper');
+    }
+
+    let injected = false;
+
+    // ============================================================
+    // Strategy 1: React Native 0.82+ NEW ARCHITECTURE
+    // Look for: getDefaultReactHost(applicationContext, ...) and add jsBundleFilePath parameter
+    // ============================================================
+    const newArchPattern = /getDefaultReactHost\s*\(\s*\n?\s*applicationContext\s*,/;
+    if (newArchPattern.test(contents)) {
+      console.log('[OTAUpdate] Android: Detected React Native 0.82+ (new architecture)');
+
+      // Find the getDefaultReactHost call and add jsBundleFilePath parameter
+      // Pattern: getDefaultReactHost(applicationContext, packageList, ...)
+      const reactHostRegex = /(getDefaultReactHost\s*\(\s*\n?\s*)(applicationContext)(\s*,)/g;
+
+      if (reactHostRegex.test(contents)) {
+        contents = contents.replace(
+          /(getDefaultReactHost\s*\(\s*\n?\s*)(applicationContext)(\s*,)/,
+          '$1$2$3\n        jsBundleFilePath = OTAUpdateHelper.getJSBundleFile(applicationContext),'
+        );
+        console.log('[OTAUpdate] Android: Injected jsBundleFilePath parameter (new architecture)');
+        injected = true;
       }
     }
 
-    // The getJSBundleFile override that uses our helper
-    const getJSBundleFileOverride = `
-      override fun getJSBundleFile(): String? {
-        return OTAUpdateHelper.getJSBundleFile(applicationContext)
+    // ============================================================
+    // Strategy 2: Look for reactHost with getDefaultReactHost
+    // override val reactHost: ReactHost get() = getDefaultReactHost(...)
+    // ============================================================
+    if (!injected) {
+      const reactHostGetPattern = /(override\s+val\s+reactHost\s*:\s*ReactHost\s+get\s*\(\s*\)\s*=\s*getDefaultReactHost\s*\()([^)]*)\)/;
+      if (reactHostGetPattern.test(contents)) {
+        console.log('[OTAUpdate] Android: Detected reactHost with getDefaultReactHost');
+
+        contents = contents.replace(
+          reactHostGetPattern,
+          (match, prefix, params) => {
+            if (params.includes('jsBundleFilePath')) {
+              return match; // Already has it
+            }
+            // Add jsBundleFilePath to the parameters
+            const newParams = params.trim() + ',\n        jsBundleFilePath = OTAUpdateHelper.getJSBundleFile(applicationContext)';
+            return `${prefix}${newParams})`;
+          }
+        );
+        console.log('[OTAUpdate] Android: Injected jsBundleFilePath in reactHost getter');
+        injected = true;
       }
-`;
+    }
 
-    // Strategy 1: Look for "object : DefaultReactNativeHost" pattern
-    // This handles most Expo SDK 50+ apps
-    const defaultHostPattern = /(object\s*:\s*DefaultReactNativeHost\s*\([^)]*\)\s*\{)/;
-
-    if (defaultHostPattern.test(contents)) {
-      contents = contents.replace(
-        defaultHostPattern,
-        `$1${getJSBundleFileOverride}`
-      );
-      console.log('[OTAUpdate] Android: Successfully injected getJSBundleFile (DefaultReactNativeHost pattern)');
-      config.modResults.contents = contents;
-      return config;
+    // ============================================================
+    // Strategy 3: Old architecture - DefaultReactNativeHost with object block
+    // Look for: object : DefaultReactNativeHost(this) { ... }
+    // ============================================================
+    if (!injected) {
+      const defaultHostPattern = /(object\s*:\s*DefaultReactNativeHost\s*\([^)]*\)\s*\{)/;
+      if (defaultHostPattern.test(contents)) {
+        console.log('[OTAUpdate] Android: Detected DefaultReactNativeHost (old architecture)');
+
+        const getJSBundleFileOverride = `
+        override fun getJSBundleFile(): String? {
+          return OTAUpdateHelper.getJSBundleFile(applicationContext)
+        }
+`;
+        contents = contents.replace(defaultHostPattern, `$1${getJSBundleFileOverride}`);
+        console.log('[OTAUpdate] Android: Injected getJSBundleFile override');
+        injected = true;
+      }
     }
 
-    // Strategy 2: Look for "override val reactNativeHost" with object block
-    const reactNativeHostPattern = /(override\s+val\s+reactNativeHost[^=]*=\s*object[^{]*\{)/;
+    // ============================================================
+    // Strategy 4: Look for override fun getUseDeveloperSupport and insert before it
+    // ============================================================
+    if (!injected) {
+      const devSupportPattern = /([ \t]*)(override\s+fun\s+getUseDeveloperSupport\s*\(\s*\))/;
+      if (devSupportPattern.test(contents)) {
+        console.log('[OTAUpdate] Android: Found getUseDeveloperSupport, inserting before it');
 
-    if (reactNativeHostPattern.test(contents)) {
-      contents = contents.replace(
-        reactNativeHostPattern,
-        `$1${getJSBundleFileOverride}`
-      );
-      console.log('[OTAUpdate] Android: Successfully injected getJSBundleFile (reactNativeHost pattern)');
-      config.modResults.contents = contents;
-      return config;
-    }
+        const match = contents.match(devSupportPattern);
+        const indent = match ? match[1] : '        ';
 
-    // Strategy 3: Look for any ReactNativeHost object block
-    const anyHostPattern = /(ReactNativeHost\s*\([^)]*\)\s*\{)/;
+        const getJSBundleFileOverride = `${indent}override fun getJSBundleFile(): String? {
+${indent}  return OTAUpdateHelper.getJSBundleFile(applicationContext)
+${indent}}
 
-    if (anyHostPattern.test(contents)) {
-      contents = contents.replace(
-        anyHostPattern,
-        `$1${getJSBundleFileOverride}`
-      );
-      console.log('[OTAUpdate] Android: Successfully injected getJSBundleFile (generic ReactNativeHost pattern)');
-      config.modResults.contents = contents;
-      return config;
-    }
+${indent}`;
 
-    // Strategy 4: Find the class and look for the host definition more flexibly
-    // Look for "override fun getUseDeveloperSupport" and insert before it
-    const devSupportPattern = /([\t ]*)(override\s+fun\s+getUseDeveloperSupport)/;
-
-    if (devSupportPattern.test(contents)) {
-      const indentMatch = contents.match(devSupportPattern);
-      const indent = indentMatch ? indentMatch[1] : '      ';
-      const overrideCode = `${indent}override fun getJSBundleFile(): String? {\n${indent}  return OTAUpdateHelper.getJSBundleFile(applicationContext)\n${indent}}\n\n${indent}`;
-      contents = contents.replace(
-        devSupportPattern,
-        `${overrideCode}$2`
-      );
-      console.log('[OTAUpdate] Android: Successfully injected getJSBundleFile (before getUseDeveloperSupport)');
-      config.modResults.contents = contents;
-      return config;
+        contents = contents.replace(devSupportPattern, `${getJSBundleFileOverride}$2`);
+        console.log('[OTAUpdate] Android: Injected getJSBundleFile before getUseDeveloperSupport');
+        injected = true;
+      }
     }
 
-    // Strategy 5: Last resort - find any class with Application and inject
-    // Look for the ReactApplication interface implementation
-    const reactAppPattern = /(class\s+\w+\s*:\s*Application\s*\(\s*\)\s*,\s*ReactApplication\s*\{)/;
-
-    if (reactAppPattern.test(contents)) {
-      // Find where to inject - after the class opening
-      const classMatch = contents.match(reactAppPattern);
-      if (classMatch) {
-        const insertPos = classMatch.index + classMatch[0].length;
-        const helperComment = `
-  // OTA Update: Override to load OTA bundle if available
-  private fun getOTABundleFile(): String? {
-    return OTAUpdateHelper.getJSBundleFile(applicationContext)
-  }
+    // ============================================================
+    // Strategy 5: Look for ReactNativeHost in any form
+    // ============================================================
+    if (!injected) {
+      const anyHostPattern = /(:\s*ReactNativeHost\s*\{)/;
+      if (anyHostPattern.test(contents)) {
+        console.log('[OTAUpdate] Android: Found ReactNativeHost block');
+
+        const getJSBundleFileOverride = `
+        override fun getJSBundleFile(): String? {
+          return OTAUpdateHelper.getJSBundleFile(applicationContext)
+        }
 `;
-        contents = contents.slice(0, insertPos) + helperComment + contents.slice(insertPos);
-        console.log('[OTAUpdate] Android: Added OTA helper method to Application class');
-        console.log('[OTAUpdate] Android: WARNING - You may need to manually wire getJSBundleFile() override');
+        contents = contents.replace(anyHostPattern, `$1${getJSBundleFileOverride}`);
+        console.log('[OTAUpdate] Android: Injected getJSBundleFile in ReactNativeHost');
+        injected = true;
       }
     }
 
-    // Log the current MainApplication structure for debugging
-    console.warn('[OTAUpdate] Android: Could not find standard injection point');
-    console.warn('[OTAUpdate] Android: Please ensure your MainApplication.kt has a ReactNativeHost definition');
-    console.warn('[OTAUpdate] Android: You may need to manually add the getJSBundleFile override');
-    console.warn('[OTAUpdate] Android: See https://vanikya.github.io/ota-update/ for manual setup instructions');
-
-    // Log first 100 lines for debugging
-    const lines = contents.split('\n').slice(0, 100);
-    console.log('[OTAUpdate] Android: First 100 lines of MainApplication.kt:');
-    lines.forEach((line, i) => {
-      if (line.includes('ReactNativeHost') || line.includes('DefaultReactNativeHost') ||
-          line.includes('getJSBundleFile') || line.includes('override')) {
-        console.log(`  ${i + 1}: ${line}`);
-      }
-    });
+    if (!injected) {
+      console.warn('[OTAUpdate] Android: ⚠️ Could not find injection point!');
+      console.warn('[OTAUpdate] Android: Please manually add getJSBundleFile override');
+      console.warn('[OTAUpdate] Android: See documentation for manual setup');
+
+      // Log relevant lines for debugging
+      const lines = contents.split('\n');
+      console.log('[OTAUpdate] Android: Relevant lines in MainApplication.kt:');
+      lines.forEach((line, i) => {
+        if (line.includes('ReactNativeHost') ||
+            line.includes('DefaultReactNativeHost') ||
+            line.includes('getDefaultReactHost') ||
+            line.includes('reactHost') ||
+            line.includes('getJSBundleFile') ||
+            line.includes('jsBundleFilePath')) {
+          console.log(`  ${i + 1}: ${line.trim()}`);
+        }
+      });
+    }
 
     config.modResults.contents = contents;
     return config;
@@ -165,8 +195,7 @@ function withOTAUpdateIOS(config) {
         }
         return URL(fileURLWithPath: path)
       } else {
-        NSLog("[OTAUpdate] OTA bundle not found at path: %@", path)
-        // Clear invalid path
+        NSLog("[OTAUpdate] OTA bundle not found at path: %@, clearing", path)
         UserDefaults.standard.removeObject(forKey: "OTAUpdateBundlePath")
       }
     }
@@ -193,12 +222,12 @@ function withOTAUpdateIOS(config) {
 ${funcBody}${funcEnd}${helperFunction}`;
           }
         );
-        console.log('[OTAUpdate] iOS: Successfully modified bundleURL (pattern 1)');
+        console.log('[OTAUpdate] iOS: Successfully modified bundleURL');
         config.modResults.contents = contents;
         return config;
       }
 
-      // Strategy 2: Look for sourceURL(for bridge:) pattern (older Expo versions)
+      // Strategy 2: Look for sourceURL(for bridge:) pattern
       const sourceURLPattern = /(func\s+sourceURL\s*\(\s*for\s+bridge\s*:\s*RCTBridge\s*\)\s*->\s*URL\?\s*\{)([\s\S]*?)(\n\s*\})/;
 
       if (sourceURLPattern.test(contents)) {
@@ -216,49 +245,19 @@ ${funcBody}${funcEnd}${helperFunction}`;
 ${funcBody}${funcEnd}${helperFunction}`;
           }
         );
-        console.log('[OTAUpdate] iOS: Successfully modified sourceURL (pattern 2)');
-        config.modResults.contents = contents;
-        return config;
-      }
-
-      // Strategy 3: Add bundleURL method if it doesn't exist but class exists
-      const appDelegateClassPattern = /(class\s+AppDelegate\s*[^{]*\{)/;
-
-      if (appDelegateClassPattern.test(contents) && !contents.includes('func bundleURL')) {
-        const newBundleURLMethod = `
-  // OTA Update: Bundle URL with OTA support
-  func bundleURL() -> URL? {
-    // Check for downloaded OTA bundle first
-    if let otaBundle = getOTABundleURL() {
-      return otaBundle
-    }
-    #if DEBUG
-    return RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
-    #else
-    return Bundle.main.url(forResource: "main", withExtension: "jsbundle")
-    #endif
-  }
-${helperFunction}
-`;
-        contents = contents.replace(
-          appDelegateClassPattern,
-          `$1${newBundleURLMethod}`
-        );
-        console.log('[OTAUpdate] iOS: Successfully added bundleURL method (pattern 3)');
+        console.log('[OTAUpdate] iOS: Successfully modified sourceURL');
         config.modResults.contents = contents;
         return config;
       }
 
-      console.warn('[OTAUpdate] iOS: Could not find suitable injection point');
-      console.warn('[OTAUpdate] iOS: Please manually modify AppDelegate.swift');
-      console.warn('[OTAUpdate] iOS: See https://vanikya.github.io/ota-update/ for manual setup instructions');
+      console.warn('[OTAUpdate] iOS: Could not find bundleURL or sourceURL method');
     } else if (config.modResults.language === 'objc' || config.modResults.language === 'objcpp') {
-      // Objective-C AppDelegate (older Expo versions)
+      // Objective-C AppDelegate
       const sourceURLPattern = /(- \(NSURL \*\)sourceURLForBridge:\(RCTBridge \*\)bridge\s*\{)([\s\S]*?)(\n\})/;
 
       if (sourceURLPattern.test(contents)) {
         const helperCode = `
-  // Check for OTA bundle
+  // OTA Update: Check for OTA bundle
   NSString *bundlePath = [[NSUserDefaults standardUserDefaults] stringForKey:@"OTAUpdateBundlePath"];
   if (bundlePath && [[NSFileManager defaultManager] fileExistsAtPath:bundlePath]) {
     NSLog(@"[OTAUpdate] Loading OTA bundle: %@", bundlePath);
@@ -292,6 +291,5 @@ module.exports = function withOTAUpdate(config) {
   return config;
 };
 
-// Export individual functions for testing
 module.exports.withOTAUpdateAndroid = withOTAUpdateAndroid;
 module.exports.withOTAUpdateIOS = withOTAUpdateIOS;

package/lib/commonjs/index.js

@@ -103,5 +103,5 @@ var _verification = require("./utils/verification");
 // Utilities
 
 // Version info
-const VERSION = exports.VERSION = '0.2.4';
+const VERSION = exports.VERSION = '0.2.6';
 //# sourceMappingURL=index.js.map

package/lib/module/index.js

@@ -10,5 +10,5 @@ export { OTAApiClient, getDeviceInfo } from './utils/api';
 export { UpdateStorage, getStorageAdapter } from './utils/storage';
 export { calculateHash, verifyBundleHash, verifySignature, verifyBundle } from './utils/verification';
 // Version info
-export const VERSION = '0.2.4';
+export const VERSION = '0.2.6';
 //# sourceMappingURL=index.js.map

package/lib/typescript/index.d.ts

@@ -9,5 +9,5 @@ export { UpdateStorage, getStorageAdapter } from './utils/storage';
 export type { StoredUpdate, StorageAdapter } from './utils/storage';
 export { calculateHash, verifyBundleHash, verifySignature, verifyBundle, } from './utils/verification';
 export type { VerificationResult } from './utils/verification';
-export declare const VERSION = "0.2.4";
+export declare const VERSION = "0.2.6";
 //# sourceMappingURL=index.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vanikya/ota-react-native",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "OTA Update SDK for React Native apps - self-hosted CodePush/EAS Updates alternative",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",

package/src/index.ts

@@ -36,4 +36,4 @@ export {
 export type { VerificationResult } from './utils/verification';
 
 // Version info
-export const VERSION = '0.2.4';
+export const VERSION = '0.2.6';