@vanikya/ota-react-native 0.2.9 → 0.2.10

package/android/build.gradle

@@ -36,7 +36,7 @@ android {
         }
     }
 
-    lintOptions {
+    lint {
         abortOnError false
     }
 }

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

@@ -1,30 +1,11 @@
 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
 
-/**
- * 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
+class OTAUpdatePackage : ReactPackage {
     override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
         return listOf(OTAUpdateModule(reactContext))
     }
@@ -32,66 +13,4 @@ class OTAUpdatePackage : ReactPackage, Package {
     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,23 +1,116 @@
-const { withAppDelegate } = require('@expo/config-plugins');
+const { withMainApplication, withAppDelegate } = require('@expo/config-plugins');
 
 /**
  * OTA Update Expo Config Plugin
  *
  * This plugin modifies the native code to enable OTA bundle loading:
- * - Android: Uses Expo's Package interface (ReactNativeHostHandler) - no modification needed
+ * - Android: Modifies MainApplication.kt to override getJSBundleFile and getBundleAssetName
  * - iOS: Modifies bundleURL() in AppDelegate.swift
- *
- * 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) {
-  // 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;
+  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;
+  });
 }
 
 function withOTAUpdateIOS(config) {

package/lib/commonjs/index.js

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

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_OTAProvider","require","_OTADebugPanel","_useOTAUpdate","_api","_storage","_verification","VERSION","exports"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AAIA,IAAAC,cAAA,GAAAD,OAAA;AAGA,IAAAE,aAAA,GAAAF,OAAA;AAUA,IAAAG,IAAA,GAAAH,OAAA;AAQA,IAAAI,QAAA,GAAAJ,OAAA;AAGA,IAAAK,aAAA,GAAAL,OAAA;AA7BA;;AAIA;;AAGA;;AAUA;;AAoBA;AACO,MAAMM,OAAO,GAAAC,OAAA,CAAAD,OAAA,GAAG,OAAO","ignoreList":[]}
+{"version":3,"names":["_OTAProvider","require","_OTADebugPanel","_useOTAUpdate","_api","_storage","_verification","VERSION","exports"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AAIA,IAAAC,cAAA,GAAAD,OAAA;AAGA,IAAAE,aAAA,GAAAF,OAAA;AAUA,IAAAG,IAAA,GAAAH,OAAA;AAQA,IAAAI,QAAA,GAAAJ,OAAA;AAGA,IAAAK,aAAA,GAAAL,OAAA;AA7BA;;AAIA;;AAGA;;AAUA;;AAoBA;AACO,MAAMM,OAAO,GAAAC,OAAA,CAAAD,OAAA,GAAG,QAAQ","ignoreList":[]}

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.9';
+export const VERSION = '0.2.10';
 //# sourceMappingURL=index.js.map

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["OTAProvider","useOTA","withOTA","UpdateBanner","OTADebugPanel","useOTAUpdate","OTAApiClient","getDeviceInfo","UpdateStorage","getStorageAdapter","calculateHash","verifyBundleHash","verifySignature","verifyBundle","VERSION"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"AAAA;AACA,SAASA,WAAW,EAAEC,MAAM,EAAEC,OAAO,EAAEC,YAAY,QAAQ,eAAe;AAG1E;AACA,SAASC,aAAa,QAAQ,4BAA4B;;AAE1D;AACA,SAASC,YAAY,QAAQ,sBAAsB;AASnD;AACA,SAASC,YAAY,EAAEC,aAAa,QAAQ,aAAa;AAQzD,SAASC,aAAa,EAAEC,iBAAiB,QAAQ,iBAAiB;AAGlE,SACEC,aAAa,EACbC,gBAAgB,EAChBC,eAAe,EACfC,YAAY,QACP,sBAAsB;AAG7B;AACA,OAAO,MAAMC,OAAO,GAAG,OAAO","ignoreList":[]}
+{"version":3,"names":["OTAProvider","useOTA","withOTA","UpdateBanner","OTADebugPanel","useOTAUpdate","OTAApiClient","getDeviceInfo","UpdateStorage","getStorageAdapter","calculateHash","verifyBundleHash","verifySignature","verifyBundle","VERSION"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"AAAA;AACA,SAASA,WAAW,EAAEC,MAAM,EAAEC,OAAO,EAAEC,YAAY,QAAQ,eAAe;AAG1E;AACA,SAASC,aAAa,QAAQ,4BAA4B;;AAE1D;AACA,SAASC,YAAY,QAAQ,sBAAsB;AASnD;AACA,SAASC,YAAY,EAAEC,aAAa,QAAQ,aAAa;AAQzD,SAASC,aAAa,EAAEC,iBAAiB,QAAQ,iBAAiB;AAGlE,SACEC,aAAa,EACbC,gBAAgB,EAChBC,eAAe,EACfC,YAAY,QACP,sBAAsB;AAG7B;AACA,OAAO,MAAMC,OAAO,GAAG,QAAQ","ignoreList":[]}

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.9";
+export declare const VERSION = "0.2.10";
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC3E,YAAY,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAGzE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG3D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,YAAY,EACV,eAAe,EACf,UAAU,EACV,gBAAgB,EAChB,YAAY,EACZ,kBAAkB,GACnB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC1D,YAAY,EACV,kBAAkB,EAClB,mBAAmB,EACnB,WAAW,EACX,kBAAkB,GACnB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEpE,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,YAAY,GACb,MAAM,sBAAsB,CAAC;AAC9B,YAAY,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG/D,eAAO,MAAM,OAAO,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC3E,YAAY,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAGzE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG3D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,YAAY,EACV,eAAe,EACf,UAAU,EACV,gBAAgB,EAChB,YAAY,EACZ,kBAAkB,GACnB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC1D,YAAY,EACV,kBAAkB,EAClB,mBAAmB,EACnB,WAAW,EACX,kBAAkB,GACnB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEpE,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,YAAY,GACb,MAAM,sBAAsB,CAAC;AAC9B,YAAY,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG/D,eAAO,MAAM,OAAO,WAAW,CAAC"}

package/package.json

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

package/expo-module.config.json

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