@vanikya/ota-react-native 0.2.9 → 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"
 
@@ -36,7 +42,7 @@ android {
         }
     }
 
-    lintOptions {
+    lint {
         abortOnError false
     }
 }
@@ -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/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

@@ -4,19 +4,16 @@ const { 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: Uses Expo Package interface (ReactNativeHostHandler) via expo-module.config.json
+ *            No MainApplication.kt modification needed!
  * - 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
+  // Android bundle loading is handled by OTAUpdateExpoPackage 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');
+  // This is registered via expo-module.config.json and discovered by Expo automatically.
+  console.log('[OTAUpdate] Android: Using Expo Package interface (ReactNativeHostHandler)');
   return config;
 }
 

package/expo-module.config.json

@@ -1,8 +1,7 @@
 {
   "platforms": ["android", "ios"],
   "android": {
-    "modules": [],
-    "package": "com.otaupdate.OTAUpdatePackage"
+    "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.9';
+const VERSION = exports.VERSION = '0.2.11';
 //# 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.11';
 //# 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.11";
 //# 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.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",

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.11';