@hot-updater/react-native 0.16.6 → 0.17.0

package/android/src/newarch/ReactIntegrationManager.kt

@@ -3,7 +3,9 @@ package com.hotupdater
 import android.content.Context
 import android.util.Log
 import com.facebook.react.ReactApplication
+import com.facebook.react.bridge.JSBundleLoader
 import com.facebook.react.common.LifecycleState
+import java.lang.reflect.Field
 
 class ReactIntegrationManager(
     context: Context,
@@ -25,8 +27,22 @@ class ReactIntegrationManager(
             jsBundleLoaderField.isAccessible = true
             jsBundleLoaderField.set(reactHostDelegate, getJSBundlerLoader(bundleURL))
         } catch (e: Exception) {
+            try {
+                val instanceManager = application.reactNativeHost.reactInstanceManager
+                val bundleLoader: JSBundleLoader? = this.getJSBundlerLoader(bundleURL)
+                val bundleLoaderField: Field =
+                    instanceManager::class.java.getDeclaredField("mBundleLoader")
+                bundleLoaderField.isAccessible = true
+
+                if (bundleLoader != null) {
+                    bundleLoaderField.set(instanceManager, bundleLoader)
+                } else {
+                    bundleLoaderField.set(instanceManager, null)
+                }
+            } catch (e: Exception) {
+                Log.d("HotUpdater", "Failed to setJSBundle (fallback): ${e.message}")
+            }
             Log.d("HotUpdater", "Failed to setJSBundle: ${e.message}")
-            throw IllegalAccessException("Could not setJSBundle")
         }
     }
 
@@ -57,12 +73,10 @@ class ReactIntegrationManager(
                     }
                 } catch (e: Exception) {
                     Log.d("HotUpdater", "Failed to reload: ${e.message}")
-                    throw e
                 }
             }
         } catch (e: Exception) {
             Log.d("HotUpdater", "Failed to reload: ${e.message}")
-            throw e
         }
     }
 }

package/android/src/oldarch/ReactIntegrationManager.kt

@@ -27,7 +27,6 @@ class ReactIntegrationManager(
             }
         } catch (e: Exception) {
             Log.d("HotUpdater", "Failed to setJSBundle: ${e.message}")
-            throw IllegalAccessException("Could not setJSBundle")
         }
     }
 
@@ -49,7 +48,6 @@ class ReactIntegrationManager(
             }
         } catch (e: Exception) {
             Log.d("HotUpdater", "Failed to reload: ${e.message}")
-            throw e
         }
     }
 }

package/app.plugin.js

@@ -0,0 +1 @@
+module.exports = require("./plugin/build/withHotUpdater");

package/dist/index.js

@@ -104,7 +104,7 @@ var __webpack_exports__ = {};
     const NIL_UUID = "00000000-0000-0000-0000-000000000000";
     const HotUpdater = {
         HOT_UPDATER_BUNDLE_ID: __HOT_UPDATER_BUNDLE_ID || NIL_UUID,
-        CHANNEL: __HOT_UPDATER_CHANNEL || "production"
+        CHANNEL: __HOT_UPDATER_CHANNEL || (__DEV__ ? null : "production")
     };
     const RCTNativeHotUpdater = __webpack_require__("./src/specs/NativeHotUpdater.ts").Z;
     const LINKING_ERROR = `The package '@hot-updater/react-native' doesn't seem to be linked. Make sure: \n\n` + external_react_native_.Platform.select({

package/dist/index.mjs

@@ -79,7 +79,7 @@ const fetchUpdateInfo = async (source, { appVersion, bundleId, platform, minBund
 const NIL_UUID = "00000000-0000-0000-0000-000000000000";
 const HotUpdater = {
     HOT_UPDATER_BUNDLE_ID: __HOT_UPDATER_BUNDLE_ID || NIL_UUID,
-    CHANNEL: __HOT_UPDATER_CHANNEL || "production"
+    CHANNEL: __HOT_UPDATER_CHANNEL || (__DEV__ ? null : "production")
 };
 const RCTNativeHotUpdater = __webpack_require__("./src/specs/NativeHotUpdater.ts").Z;
 const LINKING_ERROR = `The package '@hot-updater/react-native' doesn't seem to be linked. Make sure: \n\n` + external_react_native_.Platform.select({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/react-native",
-  "version": "0.16.6",
+  "version": "0.17.0",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -14,6 +14,8 @@
     "ios",
     "cpp",
     "*.podspec",
+    "app.plugin.js",
+    "plugin/build/withHotUpdater.js",
     "react-native.config.js",
     "!ios/build",
     "!android/build",
@@ -66,9 +68,15 @@
     },
     "includesGeneratedCode": true
   },
+  "peerDependenciesMeta": {
+    "expo": {
+      "optional": true
+    }
+  },
   "peerDependencies": {
     "react": "*",
-    "react-native": "*"
+    "react-native": "*",
+    "expo": ">=50.0.0"
   },
   "devDependencies": {
     "@react-native-community/cli": "15.0.1",
@@ -77,15 +85,17 @@
     "del-cli": "^6.0.0",
     "react": "18.3.1",
     "react-native": "0.76.2",
-    "react-native-builder-bob": "^0.33.1"
+    "react-native-builder-bob": "^0.33.1",
+    "expo": "^50.0.0"
   },
   "dependencies": {
     "use-sync-external-store": "1.4.0",
-    "@hot-updater/js": "0.16.6",
-    "@hot-updater/core": "0.16.6"
+    "@hot-updater/js": "0.17.0",
+    "@hot-updater/core": "0.17.0"
   },
   "scripts": {
-    "build": "rslib build",
+    "build": "rslib build && npm run build:plugin",
+    "build:plugin": "tsc -p plugin/tsconfig.json",
     "test:type": "tsc --noEmit",
     "test": "vitest",
     "clean": "del-cli android/build example/android/build example/android/app/build example/ios/build lib"

package/plugin/build/withHotUpdater.js

@@ -0,0 +1,146 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var config_plugins_1 = require("expo/config-plugins");
+var package_json_1 = __importDefault(require("../../package.json"));
+/**
+ * Helper to add lines if they don't exist, anchored by a specific string.
+ */
+function addLinesOnce(contents, anchor, linesToAdd) {
+    if (linesToAdd.every(function (line) { return contents.includes(line); })) {
+        // All lines already exist, do nothing
+        return contents;
+    }
+    // Check if the anchor exists
+    if (!contents.includes(anchor)) {
+        // Anchor not found, cannot add lines reliably.
+        // Consider logging a warning or throwing an error here if necessary.
+        return contents;
+    }
+    // Add lines after the anchor
+    // Ensure newline separation
+    return contents.replace(anchor, "".concat(anchor, "\n").concat(linesToAdd.join("\n")));
+}
+/**
+ * Helper to replace content only if the target content exists and hasn't been replaced yet.
+ */
+function replaceContentOnce(contents, searchRegex, replacement, checkIfAlreadyReplaced) {
+    // If the replacement content is already present, assume it's done.
+    if (contents.includes(checkIfAlreadyReplaced)) {
+        return contents;
+    }
+    // Otherwise, perform the replacement if the search target exists.
+    return contents.replace(searchRegex, replacement);
+}
+var withHotUpdater = function (config) {
+    var modifiedConfig = config;
+    // === iOS: Objective-C & Swift in AppDelegate ===
+    modifiedConfig = (0, config_plugins_1.withAppDelegate)(modifiedConfig, function (cfg) {
+        var contents = cfg.modResults.contents;
+        var iosImport = "#import <HotUpdater/HotUpdater.h>";
+        var iosBundleUrl = "[HotUpdater bundleURL]";
+        var iosOriginalBundleUrlRegex = /\[\[NSBundle mainBundle\] URLForResource:@"main" withExtension:@"jsbundle"\]/g;
+        var iosAppDelegateHeader = '#import "AppDelegate.h"'; // Anchor for import
+        var swiftImport = "import HotUpdater";
+        var swiftBundleUrl = "HotUpdater.bundleURL()";
+        var swiftOriginalBundleUrlRegex = /Bundle\.main\.url\(forResource: "?main"?, withExtension: "jsbundle"\)/g;
+        var swiftReactImport = "import React"; // Anchor for import
+        // --- Objective-C ---
+        if (contents.includes(iosAppDelegateHeader)) {
+            // Check if it's likely Obj-C
+            // 1. Add import if missing
+            contents = addLinesOnce(contents, iosAppDelegateHeader, [iosImport]);
+            // 2. Replace bundleURL provider if the original exists and hasn't been replaced
+            contents = replaceContentOnce(contents, iosOriginalBundleUrlRegex, iosBundleUrl, iosBundleUrl);
+        }
+        // --- Swift ---
+        if (contents.includes(swiftReactImport)) {
+            // Check if it's likely Swift
+            // 1. Add import if missing
+            contents = addLinesOnce(contents, swiftReactImport, [swiftImport]);
+            // 2. Replace bundleURL provider if the original exists and hasn't been replaced
+            contents = replaceContentOnce(contents, swiftOriginalBundleUrlRegex, swiftBundleUrl, swiftBundleUrl);
+        }
+        cfg.modResults.contents = contents;
+        return cfg;
+    });
+    // === Android: Kotlin & Java in MainApplication ===
+    modifiedConfig = (0, config_plugins_1.withMainApplication)(modifiedConfig, function (cfg) {
+        var contents = cfg.modResults.contents;
+        var kotlinImport = "import com.hotupdater.HotUpdater";
+        var kotlinImportAnchor = "import com.facebook.react.ReactApplication";
+        var kotlinReactNativeHostAnchor = "object : DefaultReactNativeHost(this) {"; // Start of block
+        var kotlinMethodCheck = "HotUpdater.getJSBundleFile(applicationContext)"; // Unique part of the method body
+        // Regex to find an existing getJSBundleFile override (non-greedy)
+        var kotlinExistingMethodRegex = /^\s*override fun getJSBundleFile\(\): String\?\s*\{[\s\S]*?^\s*\}/gm;
+        var kotlinHermesAnchor = "override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED";
+        var kotlinNewMethod = "\n          override fun getJSBundleFile(): String? {\n              return HotUpdater.getJSBundleFile(applicationContext)\n          }";
+        var javaImport = "import com.hotupdater.HotUpdater;";
+        var javaImportAnchor = "import com.facebook.react.ReactApplication;";
+        var javaReactNativeHostAnchor = "new DefaultReactNativeHost"; // Part of the instantiation
+        var javaMethodCheck = "HotUpdater.Companion.getJSBundleFile"; // Unique part of the method body
+        var javaMethodSignature = "protected String getJSBundleFile()";
+        // Regex to find an existing getJSBundleFile override (non-greedy)
+        var javaExistingMethodRegex = /^\s*@Override\s+protected String getJSBundleFile\(\)\s*\{[\s\S]*?^\s*\}/gm;
+        var javaHermesBlockEndAnchor = "return BuildConfig.IS_HERMES_ENABLED;\n        }"; // End of the isHermesEnabled method block
+        var javaNewMethod = "\n        @Override\n        protected String getJSBundleFile() {\n            return HotUpdater.Companion.getJSBundleFile(this.getApplication().getApplicationContext());\n        }";
+        // --- Kotlin ---
+        if (contents.includes(kotlinReactNativeHostAnchor)) {
+            // Check if likely Kotlin
+            // 1. Add import if missing
+            contents = addLinesOnce(contents, kotlinImportAnchor, [kotlinImport]);
+            // 2. Add/Replace getJSBundleFile method if needed
+            if (!contents.includes(kotlinMethodCheck)) {
+                // Desired method content not found
+                // Remove potentially existing (different) override first
+                contents = contents.replace(kotlinExistingMethodRegex, "");
+                // Add the new method after the isHermesEnabled property
+                if (contents.includes(kotlinHermesAnchor)) {
+                    contents = contents.replace(kotlinHermesAnchor, "".concat(kotlinHermesAnchor, "\n").concat(kotlinNewMethod));
+                }
+                else {
+                    // Fallback: Add before the closing brace of the object if anchor not found
+                    var rnHostEndRegex = /(\s*object\s*:\s*DefaultReactNativeHost\s*\([\s\S]*?\n)(\s*\})\s*$/m;
+                    if (rnHostEndRegex.test(contents)) {
+                        contents = contents.replace(rnHostEndRegex, "$1".concat(kotlinNewMethod, "\n$2"));
+                        throw new Error("[withHotUpdater] Kotlin: Could not find Hermes anchor. Added getJSBundleFile before closing brace.");
+                    }
+                    throw new Error("[withHotUpdater] Kotlin: Could not find Hermes anchor or closing brace to insert getJSBundleFile.");
+                }
+            }
+        }
+        // --- Java ---
+        if (contents.includes(javaReactNativeHostAnchor) &&
+            contents.includes("@Override")) {
+            // Check if likely Java
+            // 1. Add import if missing
+            contents = addLinesOnce(contents, javaImportAnchor, [javaImport]);
+            // 2. Add/Replace getJSBundleFile method if needed
+            if (!contents.includes(javaMethodCheck)) {
+                // Desired method content not found
+                // Remove potentially existing (different) override first
+                contents = contents.replace(javaExistingMethodRegex, "");
+                // Add the new method after the isHermesEnabled method block
+                if (contents.includes(javaHermesBlockEndAnchor)) {
+                    contents = contents.replace(javaHermesBlockEndAnchor, "".concat(javaHermesBlockEndAnchor, "\n").concat(javaNewMethod));
+                }
+                else {
+                    // Fallback: Add before the closing brace of the anonymous class
+                    var rnHostEndRegex = /(\s*new\s*DefaultReactNativeHost\s*\([\s\S]*?\n)(\s*\});\s*$/m;
+                    if (rnHostEndRegex.test(contents)) {
+                        contents = contents.replace(rnHostEndRegex, "$1".concat(javaNewMethod, "\n$2"));
+                        throw new Error("[withHotUpdater] Java: Could not find Hermes anchor. Added getJSBundleFile before closing brace.");
+                    }
+                    throw new Error("[withHotUpdater] Java: Could not find Hermes anchor or closing brace to insert getJSBundleFile.");
+                }
+            }
+        }
+        cfg.modResults.contents = contents;
+        return cfg;
+    });
+    return modifiedConfig;
+};
+// Export the plugin using createRunOncePlugin for idempotency at the plugin level
+exports.default = (0, config_plugins_1.createRunOncePlugin)(withHotUpdater, package_json_1.default.name, package_json_1.default.version);

package/src/native.ts

@@ -7,7 +7,7 @@ declare const __HOT_UPDATER_CHANNEL: string | undefined;
 
 const HotUpdater = {
   HOT_UPDATER_BUNDLE_ID: __HOT_UPDATER_BUNDLE_ID || NIL_UUID,
-  CHANNEL: __HOT_UPDATER_CHANNEL || "production",
+  CHANNEL: __HOT_UPDATER_CHANNEL || (!__DEV__ ? "production" : null),
 };
 
 const RCTNativeHotUpdater = require("./specs/NativeHotUpdater").default;