@vanikya/ota-react-native 0.2.10 → 0.2.11

package/android/build.gradle

@@ -5,6 +5,12 @@ def safeExtGet(prop, fallback) {
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
+// Get expo-modules-core if available
+def expoModulesCore = null
+try {
+    expoModulesCore = project(':expo-modules-core')
+} catch (Exception ignored) {}
+
 android {
     namespace "com.otaupdate"
 
@@ -51,4 +57,10 @@ dependencies {
     implementation "com.facebook.react:react-android:+"
     // ProcessPhoenix for graceful app restart
     implementation "com.jakewharton:process-phoenix:3.0.0"
+
+    // Expo modules core - needed for ReactNativeHostHandler interface
+    // compileOnly so we don't bundle it (it's provided by the app)
+    if (expoModulesCore != null) {
+        compileOnly expoModulesCore
+    }
 }

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

@@ -0,0 +1,86 @@
+package com.otaupdate
+
+import android.content.Context
+import android.util.Log
+import com.facebook.react.bridge.ReactContext
+import expo.modules.core.interfaces.Package
+import expo.modules.core.interfaces.ReactNativeHostHandler
+
+/**
+ * Expo Package implementation that provides ReactNativeHostHandler.
+ * This is the key integration point for Expo's new architecture (bridgeless mode).
+ *
+ * In Expo's new architecture, bundle loading doesn't go through DefaultReactNativeHost.getJSBundleFile().
+ * Instead, Expo's core scans for packages implementing this interface and calls the handlers.
+ *
+ * This is exactly how expo-updates works.
+ */
+class OTAUpdateExpoPackage : Package {
+
+    companion object {
+        private const val TAG = "OTAUpdateExpoPackage"
+    }
+
+    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, using Metro bundler")
+                    return null
+                }
+
+                // Get the bundle path from OTAUpdateHelper
+                val bundlePath = OTAUpdateHelper.getJSBundleFile(context)
+                if (bundlePath != null) {
+                    Log.d(TAG, "Returning OTA bundle: $bundlePath")
+                } else {
+                    Log.d(TAG, "No OTA bundle, using default")
+                }
+                return bundlePath
+            }
+
+            override fun getBundleAssetName(useDeveloperSupport: Boolean): String? {
+                Log.d(TAG, "=== getBundleAssetName called (useDeveloperSupport=$useDeveloperSupport) ===")
+
+                // In development mode, use default behavior
+                if (useDeveloperSupport) {
+                    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, returning null to force getJSBundleFile")
+                    return null
+                }
+
+                // No OTA bundle, use default bundled assets
+                return null
+            }
+
+            override fun onWillCreateReactInstance(useDeveloperSupport: Boolean) {
+                Log.d(TAG, "=== onWillCreateReactInstance (useDeveloperSupport=$useDeveloperSupport) ===")
+            }
+
+            override fun onDidCreateReactInstance(useDeveloperSupport: Boolean, reactContext: ReactContext) {
+                Log.d(TAG, "=== onDidCreateReactInstance ===")
+            }
+
+            override fun onReactInstanceException(useDeveloperSupport: Boolean, exception: Exception) {
+                Log.e(TAG, "=== onReactInstanceException ===", exception)
+                // If there's an exception with OTA bundle, we could clear it here for recovery
+                // For now, just log it
+            }
+        }
+
+        Log.d(TAG, "Returning ReactNativeHostHandler")
+        return listOf(handler)
+    }
+}

package/app.plugin.js

@@ -1,116 +1,20 @@
-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: Modifies MainApplication.kt to override getJSBundleFile and getBundleAssetName
+ * - Android: Uses Expo Package interface (ReactNativeHostHandler) via expo-module.config.json
+ *            No MainApplication.kt modification needed!
  * - iOS: Modifies bundleURL() in AppDelegate.swift
  */
 
 function withOTAUpdateAndroid(config) {
-  return withMainApplication(config, (config) => {
-    let contents = config.modResults.contents;
-
-    // Check if already modified
-    if (contents.includes('OTAUpdateHelper')) {
-      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: Look for DefaultReactNativeHost and add overrides
-    // This works for both old and new architecture Expo apps
-    // ============================================================
-    const defaultHostPattern = /(object\s*:\s*DefaultReactNativeHost\s*\([^)]*\)\s*\{)/;
-    if (defaultHostPattern.test(contents)) {
-      console.log('[OTAUpdate] Android: Detected DefaultReactNativeHost');
-
-      const bundleOverride = `
-        override fun getJSBundleFile(): String? {
-          return OTAUpdateHelper.getJSBundleFile(applicationContext)
-        }
-
-        override fun getBundleAssetName(): String? {
-          // Return null if OTA bundle exists to force using getJSBundleFile
-          val otaBundle = OTAUpdateHelper.getJSBundleFile(applicationContext)
-          if (otaBundle != null) {
-            return null
-          }
-          return super.getBundleAssetName()
-        }
-`;
-      contents = contents.replace(defaultHostPattern, `$1${bundleOverride}`);
-      console.log('[OTAUpdate] Android: Injected getJSBundleFile and getBundleAssetName overrides');
-      injected = true;
-    }
-
-    // ============================================================
-    // Strategy 2: Look for 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 bundleOverride = `${indent}override fun getJSBundleFile(): String? {
-${indent}  return OTAUpdateHelper.getJSBundleFile(applicationContext)
-${indent}}
-
-${indent}override fun getBundleAssetName(): String? {
-${indent}  val otaBundle = OTAUpdateHelper.getJSBundleFile(applicationContext)
-${indent}  if (otaBundle != null) {
-${indent}    return null
-${indent}  }
-${indent}  return super.getBundleAssetName()
-${indent}}
-
-${indent}`;
-
-        contents = contents.replace(devSupportPattern, `${bundleOverride}$2`);
-        console.log('[OTAUpdate] Android: Injected bundle overrides before getUseDeveloperSupport');
-        injected = true;
-      }
-    }
-
-    if (!injected) {
-      console.warn('[OTAUpdate] Android: ⚠️ Could not find injection point!');
-      console.warn('[OTAUpdate] Android: Please manually add getJSBundleFile override');
-
-      // 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 OTAUpdateExpoPackage implementing
+  // expo.modules.core.interfaces.Package with ReactNativeHostHandler.
+  // This is registered via expo-module.config.json and discovered by Expo automatically.
+  console.log('[OTAUpdate] Android: Using Expo Package interface (ReactNativeHostHandler)');
+  return config;
 }
 
 function withOTAUpdateIOS(config) {

package/expo-module.config.json

@@ -0,0 +1,7 @@
+{
+  "platforms": ["android", "ios"],
+  "android": {
+    "package": "com.otaupdate.OTAUpdateExpoPackage"
+  },
+  "ios": {}
+}

package/lib/commonjs/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vanikya/ota-react-native",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "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.10';
+export const VERSION = '0.2.11';