@vanikya/ota-react-native 0.2.7 → 0.2.9

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

@@ -1,11 +1,30 @@
 package com.otaupdate
 
+import android.content.Context
+import android.util.Log
 import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.ViewManager
+import expo.modules.core.interfaces.Package
+import expo.modules.core.interfaces.ReactNativeHostHandler
 
-class OTAUpdatePackage : ReactPackage {
+/**
+ * OTAUpdatePackage implements both React Native's ReactPackage and Expo's Package interfaces.
+ *
+ * The Expo Package interface is critical for bundle loading with Expo's new architecture.
+ * It provides ReactNativeHostHandler which allows us to override:
+ * - getJSBundleFile: Returns path to downloaded OTA bundle
+ * - getBundleAssetName: Returns null when OTA bundle exists to force using getJSBundleFile
+ */
+class OTAUpdatePackage : ReactPackage, Package {
+
+    companion object {
+        private const val TAG = "OTAUpdatePackage"
+    }
+
+    // ReactPackage implementation
     override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
         return listOf(OTAUpdateModule(reactContext))
     }
@@ -13,4 +32,66 @@ class OTAUpdatePackage : ReactPackage {
     override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
         return emptyList()
     }
+
+    // Expo Package implementation - this is the key for Expo new architecture support
+    override fun createReactNativeHostHandlers(context: Context): List<ReactNativeHostHandler> {
+        Log.d(TAG, "=== createReactNativeHostHandlers called ===")
+
+        val handler = object : ReactNativeHostHandler {
+
+            override fun getJSBundleFile(useDeveloperSupport: Boolean): String? {
+                Log.d(TAG, "=== getJSBundleFile called (useDeveloperSupport=$useDeveloperSupport) ===")
+
+                // In development mode, let Metro bundler handle it
+                if (useDeveloperSupport) {
+                    Log.d(TAG, "Developer support enabled, returning null")
+                    return null
+                }
+
+                // Get the bundle path from OTAUpdateHelper
+                val bundlePath = OTAUpdateHelper.getJSBundleFile(context)
+                Log.d(TAG, "OTAUpdateHelper returned bundle path: $bundlePath")
+                return bundlePath
+            }
+
+            override fun getBundleAssetName(useDeveloperSupport: Boolean): String? {
+                Log.d(TAG, "=== getBundleAssetName called (useDeveloperSupport=$useDeveloperSupport) ===")
+
+                // In development mode, use default behavior
+                if (useDeveloperSupport) {
+                    Log.d(TAG, "Developer support enabled, returning null (use default)")
+                    return null
+                }
+
+                // Check if we have an OTA bundle
+                val bundlePath = OTAUpdateHelper.getJSBundleFile(context)
+                if (bundlePath != null) {
+                    // Return null to force React Native to use getJSBundleFile instead of bundled assets
+                    Log.d(TAG, "OTA bundle exists at $bundlePath, returning null to force getJSBundleFile")
+                    return null
+                }
+
+                // No OTA bundle, use default bundled assets
+                Log.d(TAG, "No OTA bundle, returning null (use default bundled assets)")
+                return null
+            }
+
+            override fun onWillCreateReactInstance(useDeveloperSupport: Boolean) {
+                Log.d(TAG, "=== onWillCreateReactInstance called (useDeveloperSupport=$useDeveloperSupport) ===")
+            }
+
+            override fun onDidCreateReactInstance(useDeveloperSupport: Boolean, reactContext: ReactContext) {
+                Log.d(TAG, "=== onDidCreateReactInstance called ===")
+            }
+
+            override fun onReactInstanceException(useDeveloperSupport: Boolean, exception: Exception) {
+                Log.e(TAG, "=== onReactInstanceException called ===", exception)
+                // If there's an exception with OTA bundle, we could clear it here
+                // For now, just log the exception
+            }
+        }
+
+        Log.d(TAG, "Returning ReactNativeHostHandler")
+        return listOf(handler)
+    }
 }

package/app.plugin.js

@@ -1,171 +1,23 @@
-const { withMainApplication, withAppDelegate } = require('@expo/config-plugins');
+const { withAppDelegate } = require('@expo/config-plugins');
 
 /**
  * OTA Update Expo Config Plugin
  *
  * This plugin modifies the native code to enable OTA bundle loading:
- * - Android: Overrides getJSBundleFile() or sets jsBundleFilePath in MainApplication.kt
+ * - Android: Uses Expo's Package interface (ReactNativeHostHandler) - no modification needed
  * - iOS: Modifies bundleURL() in AppDelegate.swift
  *
- * Supports both old architecture (getJSBundleFile override) and
- * new architecture (jsBundleFilePath parameter in getDefaultReactHost).
+ * For Android, the OTAUpdatePackage implements expo.modules.core.interfaces.Package
+ * which provides ReactNativeHostHandler to hook into bundle loading.
+ * This is registered via expo-module.config.json.
  */
 
 function withOTAUpdateAndroid(config) {
-  return withMainApplication(config, (config) => {
-    let contents = config.modResults.contents;
-
-    // Check if already modified
-    if (contents.includes('OTAUpdateHelper') || contents.includes('com.otaupdate')) {
-      console.log('[OTAUpdate] Android: OTAUpdateHelper already present, skipping');
-      return config;
-    }
-
-    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;
-      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;
-      }
-    }
-
-    // ============================================================
-    // 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 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 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');
-
-        const match = contents.match(devSupportPattern);
-        const indent = match ? match[1] : '        ';
-
-        const getJSBundleFileOverride = `${indent}override fun getJSBundleFile(): String? {
-${indent}  return OTAUpdateHelper.getJSBundleFile(applicationContext)
-${indent}}
-
-${indent}`;
-
-        contents = contents.replace(devSupportPattern, `${getJSBundleFileOverride}$2`);
-        console.log('[OTAUpdate] Android: Injected getJSBundleFile before getUseDeveloperSupport');
-        injected = true;
-      }
-    }
-
-    // ============================================================
-    // 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.replace(anyHostPattern, `$1${getJSBundleFileOverride}`);
-        console.log('[OTAUpdate] Android: Injected getJSBundleFile in ReactNativeHost');
-        injected = true;
-      }
-    }
-
-    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;
-  });
+  // Android bundle loading is handled by OTAUpdatePackage implementing
+  // expo.modules.core.interfaces.Package with ReactNativeHostHandler.
+  // No MainApplication.kt modification is needed for Expo apps.
+  console.log('[OTAUpdate] Android: Using Expo Package interface for bundle loading');
+  return config;
 }
 
 function withOTAUpdateIOS(config) {
@@ -204,7 +56,7 @@ function withOTAUpdateIOS(config) {
   }
 `;
 
-      // Strategy 1: Look for bundleURL() with flexible pattern
+      // Strategy 1: Look for bundleURL()
       const bundleURLPattern1 = /(func\s+bundleURL\s*\(\s*\)\s*->\s*URL\?\s*\{)([\s\S]*?)(\n\s*\})/;
 
       if (bundleURLPattern1.test(contents)) {
@@ -227,7 +79,7 @@ ${funcBody}${funcEnd}${helperFunction}`;
         return config;
       }
 
-      // Strategy 2: Look for sourceURL(for bridge:) pattern
+      // Strategy 2: Look for sourceURL(for bridge:)
       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)) {

package/expo-module.config.json

@@ -0,0 +1,8 @@
+{
+  "platforms": ["android", "ios"],
+  "android": {
+    "modules": [],
+    "package": "com.otaupdate.OTAUpdatePackage"
+  },
+  "ios": {}
+}

package/lib/commonjs/index.js

@@ -103,5 +103,5 @@ var _verification = require("./utils/verification");
 // Utilities
 
 // Version info
-const VERSION = exports.VERSION = '0.2.7';
+const VERSION = exports.VERSION = '0.2.9';
 //# 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.7';
+export const VERSION = '0.2.9';
 //# 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.7";
+export declare const VERSION = "0.2.9";
 //# sourceMappingURL=index.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vanikya/ota-react-native",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "OTA Update SDK for React Native apps - self-hosted CodePush/EAS Updates alternative",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -15,6 +15,7 @@
     "*.podspec",
     "react-native.config.js",
     "app.plugin.js",
+    "expo-module.config.json",
     "README.md"
   ],
   "scripts": {

package/src/index.ts

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