@hot-updater/react-native 0.25.10 → 0.25.13

package/android/src/main/java/com/hotupdater/HotUpdaterImpl.kt

@@ -99,7 +99,7 @@ class HotUpdaterImpl {
          */
         private fun getIsolationKey(context: Context): String {
             // Get fingerprint hash directly from resources
-            val fingerprintId = context.resources.getIdentifier("hot_updater_fingerprint_hash", "string", context.packageName)
+            val fingerprintId = StringResourceUtils.getIdentifier(context, "hot_updater_fingerprint_hash")
             val fingerprintHash =
                 if (fingerprintId != 0) {
                     context.getString(fingerprintId).takeIf { it.isNotEmpty() }
@@ -141,7 +141,7 @@ class HotUpdaterImpl {
             }
 
         fun getChannel(context: Context): String {
-            val id = context.resources.getIdentifier("hot_updater_channel", "string", context.packageName)
+            val id = StringResourceUtils.getIdentifier(context, "hot_updater_channel")
             return if (id != 0) {
                 context.getString(id).takeIf { it.isNotEmpty() } ?: DEFAULT_CHANNEL
             } else {
@@ -215,7 +215,7 @@ class HotUpdaterImpl {
          * @return The fingerprint hash or null if not set
          */
         fun getFingerprintHash(context: Context): String? {
-            val id = context.resources.getIdentifier("hot_updater_fingerprint_hash", "string", context.packageName)
+            val id = StringResourceUtils.getIdentifier(context, "hot_updater_fingerprint_hash")
             return if (id != 0) {
                 context.getString(id).takeIf { it.isNotEmpty() }
             } else {
@@ -229,7 +229,7 @@ class HotUpdaterImpl {
      * @return The fingerprint hash or null if not set
      */
     fun getFingerprintHash(): String? {
-        val id = context.resources.getIdentifier("hot_updater_fingerprint_hash", "string", context.packageName)
+        val id = StringResourceUtils.getIdentifier(context, "hot_updater_fingerprint_hash")
         return if (id != 0) {
             context.getString(id).takeIf { it.isNotEmpty() }
         } else {
@@ -242,7 +242,7 @@ class HotUpdaterImpl {
      * @return The channel name or null if not set
      */
     fun getChannel(): String {
-        val id = context.resources.getIdentifier("hot_updater_channel", "string", context.packageName)
+        val id = StringResourceUtils.getIdentifier(context, "hot_updater_channel")
         return if (id != 0) {
             context.getString(id).takeIf { it.isNotEmpty() } ?: DEFAULT_CHANNEL
         } else {

package/android/src/main/java/com/hotupdater/SignatureVerifier.kt

@@ -97,12 +97,7 @@ object SignatureVerifier {
      * @return Public key PEM string or null if not configured
      */
     private fun getPublicKeyFromConfig(context: Context): String? {
-        val resourceId =
-            context.resources.getIdentifier(
-                "hot_updater_public_key",
-                "string",
-                context.packageName,
-            )
+        val resourceId = StringResourceUtils.getIdentifier(context, "hot_updater_public_key")
 
         if (resourceId == 0) {
             Log.d(TAG, "hot_updater_public_key not found in strings.xml")

package/android/src/main/java/com/hotupdater/StringResourceUtils.kt

@@ -0,0 +1,45 @@
+package com.hotupdater
+
+import android.content.Context
+
+/**
+ * Utility class for string resource lookup operations
+ */
+object StringResourceUtils {
+    /**
+     * Resolves a string resource ID with namespace fallback.
+     * Handles AGP 7.0+ where namespace and applicationId are decoupled.
+     * @param context Application context
+     * @param resourceName The string resource name to resolve
+     * @return The resolved resource ID, or 0 if not found
+     */
+    fun getIdentifier(
+        context: Context,
+        resourceName: String,
+    ): Int {
+        var resourceId =
+            context.resources.getIdentifier(
+                resourceName,
+                "string",
+                context.packageName,
+            )
+
+        // Fallback: try namespace derived from Application class package
+        if (resourceId == 0) {
+            val appClassName = context.applicationInfo.className
+            if (appClassName != null) {
+                val namespace = appClassName.substringBeforeLast('.')
+                if (namespace != context.packageName) {
+                    resourceId =
+                        context.resources.getIdentifier(
+                            resourceName,
+                            "string",
+                            namespace,
+                        )
+                }
+            }
+        }
+
+        return resourceId
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/react-native",
-  "version": "0.25.10",
+  "version": "0.25.13",
   "description": "React Native OTA solution for self-hosted",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -120,14 +120,14 @@
     "react-native": "0.79.1",
     "react-native-builder-bob": "^0.40.10",
     "typescript": "^5.8.3",
-    "hot-updater": "0.25.10"
+    "hot-updater": "0.25.13"
   },
   "dependencies": {
     "use-sync-external-store": "1.5.0",
-    "@hot-updater/core": "0.25.10",
-    "@hot-updater/js": "0.25.10",
-    "@hot-updater/cli-tools": "0.25.10",
-    "@hot-updater/plugin-core": "0.25.10"
+    "@hot-updater/cli-tools": "0.25.13",
+    "@hot-updater/js": "0.25.13",
+    "@hot-updater/plugin-core": "0.25.13",
+    "@hot-updater/core": "0.25.13"
   },
   "scripts": {
     "build": "bob build && tsc -p plugin/tsconfig.build.json",

package/plugin/build/transformers.js

@@ -15,6 +15,23 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformAndroid = transformAndroid;
 exports.transformIOS = transformIOS;
+function findMatchingClosingParen(source, openParenIndex) {
+    var depth = 0;
+    for (var i = openParenIndex; i < source.length; i += 1) {
+        var char = source[i];
+        if (char === "(") {
+            depth += 1;
+            continue;
+        }
+        if (char === ")") {
+            depth -= 1;
+            if (depth === 0) {
+                return i;
+            }
+        }
+    }
+    return -1;
+}
 /**
  * Helper to add lines if they don't exist, anchored by a specific string.
  */
@@ -38,7 +55,6 @@ function addLinesOnce(contents, anchor, linesToAdd) {
 function transformAndroidReactHost(contents) {
     var kotlinImport = "import com.hotupdater.HotUpdater";
     var kotlinImportAnchor = "import com.facebook.react.ReactApplication";
-    var kotlinMethodCheck = "HotUpdater.getJSBundleFile(applicationContext)";
     // Quick pattern detection: only touch files using getDefaultReactHost
     // with the new RN 0.82+ parameter style.
     if (!contents.includes("getDefaultReactHost(") ||
@@ -47,22 +63,25 @@ function transformAndroidReactHost(contents) {
     }
     // 1. Ensure HotUpdater import exists (idempotent via addLinesOnce)
     var result = addLinesOnce(contents, kotlinImportAnchor, [kotlinImport]);
-    // 2. If jsBundleFilePath is already wired to HotUpdater, do nothing
-    if (result.includes(kotlinMethodCheck) &&
-        result.includes("jsBundleFilePath")) {
+    var callNeedle = "getDefaultReactHost(";
+    var callStartIndex = result.indexOf(callNeedle);
+    if (callStartIndex === -1) {
         return result;
     }
-    var lines = result.split("\n");
-    var callIndex = lines.findIndex(function (line) {
-        return line.includes("getDefaultReactHost(");
-    });
-    if (callIndex === -1) {
+    var openParenIndex = callStartIndex + callNeedle.length - 1;
+    var closeParenIndex = findMatchingClosingParen(result, openParenIndex);
+    if (closeParenIndex === -1) {
         return result;
     }
+    var callContents = result.slice(callStartIndex, closeParenIndex + 1);
+    if (callContents.includes("jsBundleFilePath")) {
+        return result;
+    }
+    var callLines = callContents.split("\n");
     // Determine the indentation used for parameters (e.g. "      ")
     var paramIndent = "";
-    for (var i = callIndex + 1; i < lines.length; i += 1) {
-        var line = lines[i];
+    for (var i = 1; i < callLines.length; i += 1) {
+        var line = callLines[i];
         var trimmed = line.trim();
         if (trimmed.length === 0) {
             continue;
@@ -78,26 +97,22 @@ function transformAndroidReactHost(contents) {
     if (!paramIndent) {
         return result;
     }
-    // Find the closing line of the call (a line that is just ")" with indentation).
-    var closingIndex = -1;
-    for (var i = callIndex + 1; i < lines.length; i += 1) {
-        if (lines[i].trim() === ")") {
-            closingIndex = i;
-            break;
-        }
+    var closingLineStartIndex = result.lastIndexOf("\n", closeParenIndex);
+    var insertionIndex = closingLineStartIndex === -1 ? 0 : closingLineStartIndex + 1;
+    var prefix = result.slice(0, insertionIndex);
+    var suffix = result.slice(insertionIndex);
+    var prevNonWhitespaceIndex = prefix.length - 1;
+    while (prevNonWhitespaceIndex >= 0 &&
+        /\s/.test(prefix[prevNonWhitespaceIndex])) {
+        prevNonWhitespaceIndex -= 1;
     }
-    if (closingIndex === -1) {
-        return result;
-    }
-    // Avoid inserting twice if jsBundleFilePath already added somewhere in the call.
-    for (var i = callIndex; i < closingIndex; i += 1) {
-        if (lines[i].includes("jsBundleFilePath")) {
-            return result;
-        }
+    if (prevNonWhitespaceIndex >= 0 &&
+        prefix[prevNonWhitespaceIndex] !== "," &&
+        prefix[prevNonWhitespaceIndex] !== "(") {
+        prefix = "".concat(prefix.slice(0, prevNonWhitespaceIndex + 1), ",").concat(prefix.slice(prevNonWhitespaceIndex + 1));
     }
     var jsBundleLine = "".concat(paramIndent, "jsBundleFilePath = HotUpdater.getJSBundleFile(applicationContext),");
-    lines.splice(closingIndex, 0, jsBundleLine);
-    return lines.join("\n");
+    return "".concat(prefix).concat(jsBundleLine, "\n").concat(suffix);
 }
 /**
  * Android: DefaultReactNativeHost pattern (RN 0.81 / Expo 54).