Update react-native-update to version 10.31.2 in package.json and enhance currentVersionInfo retrieval in RCTPushy.mm for improved data handling.

.gitignore

@@ -51,3 +51,4 @@ android/bin
 Example/testHotUpdate/harmony
 Example/testHotUpdate/android/app/.cxx
 Example/harmony_use_pushy/libs
+**/mcp.json

Example/expoUsePushy/bun.lock

@@ -4,11 +4,14 @@
     "": {
       "name": "expousepushy",
       "dependencies": {
+        "@expo/metro-runtime": "~4.0.1",
         "expo": "~52.0.46",
         "expo-status-bar": "~2.0.1",
         "react": "18.3.1",
+        "react-dom": "18.3.1",
         "react-native": "0.76.9",
-        "react-native-update": "^10.28.7",
+        "react-native-update": "^10.30.3",
+        "react-native-web": "~0.19.13",
       },
       "devDependencies": {
         "@babel/core": "^7.25.2",
@@ -302,6 +305,8 @@
 
     "@expo/metro-config": ["@expo/metro-config@0.19.12", "", { "dependencies": { "@babel/core": "^7.20.0", "@babel/generator": "^7.20.5", "@babel/parser": "^7.20.0", "@babel/types": "^7.20.0", "@expo/config": "~10.0.11", "@expo/env": "~0.4.2", "@expo/json-file": "~9.0.2", "@expo/spawn-async": "^1.7.2", "chalk": "^4.1.0", "debug": "^4.3.2", "fs-extra": "^9.1.0", "getenv": "^1.0.0", "glob": "^10.4.2", "jsc-safe-url": "^0.2.4", "lightningcss": "~1.27.0", "minimatch": "^3.0.4", "postcss": "~8.4.32", "resolve-from": "^5.0.0" } }, "sha512-fhT3x1ikQWHpZgw7VrEghBdscFPz1laRYa8WcVRB18nTTqorF6S8qPYslkJu1faEziHZS7c2uyDzTYnrg/CKbg=="],
 
+    "@expo/metro-runtime": ["@expo/metro-runtime@4.0.1", "", { "peerDependencies": { "react-native": "*" } }, "sha512-CRpbLvdJ1T42S+lrYa1iZp1KfDeBp4oeZOK3hdpiS5n0vR0nhD6sC1gGF0sTboCTp64tLteikz5Y3j53dvgOIw=="],
+
     "@expo/osascript": ["@expo/osascript@2.1.6", "", { "dependencies": { "@expo/spawn-async": "^1.7.2", "exec-async": "^2.2.0" } }, "sha512-SbMp4BUwDAKiFF4zZEJf32rRYMeNnLK9u4FaPo0lQRer60F+SKd20NTSys0wgssiVeQyQz2OhGLRx3cxYowAGw=="],
 
     "@expo/package-manager": ["@expo/package-manager@1.7.2", "", { "dependencies": { "@expo/json-file": "^9.0.2", "@expo/spawn-async": "^1.7.2", "ansi-regex": "^5.0.0", "chalk": "^4.0.0", "find-up": "^5.0.0", "js-yaml": "^3.13.1", "micromatch": "^4.0.8", "npm-package-arg": "^11.0.0", "ora": "^3.4.0", "resolve-workspace-root": "^2.0.0", "split": "^1.0.1", "sudo-prompt": "9.1.1" } }, "sha512-wT/qh9ebNjl6xr00bYkSh93b6E/78J3JPlT6WzGbxbsnv5FIZKB/nr522oWqVe1E+ML7BpXs8WugErWDN9kOFg=="],
@@ -600,6 +605,8 @@
 
     "crypto-random-string": ["crypto-random-string@2.0.0", "", {}, "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="],
 
+    "css-in-js-utils": ["css-in-js-utils@3.1.0", "", { "dependencies": { "hyphenate-style-name": "^1.0.3" } }, "sha512-fJAcud6B3rRu+KHYk+Bwf+WFL2MDCJJ1XG9x137tJQ0xYxor7XziQtuGFbWNdqrvF4Tk26O3H73nfVqXt/fW1A=="],
+
     "csstype": ["csstype@3.1.3", "", {}, "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="],
 
     "debug": ["debug@4.4.0", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA=="],
@@ -700,6 +707,8 @@
 
     "fast-json-stable-stringify": ["fast-json-stable-stringify@2.1.0", "", {}, "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="],
 
+    "fast-loops": ["fast-loops@1.1.4", "", {}, "sha512-8dbd3XWoKCTms18ize6JmQF1SFnnfj5s0B7rRry22EofgMu7B6LKHVh+XfFqFGsqnbH54xgeO83PzpKI+ODhlg=="],
+
     "fastq": ["fastq@1.19.1", "", { "dependencies": { "reusify": "^1.0.4" } }, "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ=="],
 
     "fb-watchman": ["fb-watchman@2.0.2", "", { "dependencies": { "bser": "2.1.1" } }, "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA=="],
@@ -788,6 +797,8 @@
 
     "human-signals": ["human-signals@2.1.0", "", {}, "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="],
 
+    "hyphenate-style-name": ["hyphenate-style-name@1.1.0", "", {}, "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw=="],
+
     "ieee754": ["ieee754@1.2.1", "", {}, "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="],
 
     "ignore": ["ignore@5.3.2", "", {}, "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="],
@@ -806,6 +817,8 @@
 
     "ini": ["ini@1.3.8", "", {}, "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="],
 
+    "inline-style-prefixer": ["inline-style-prefixer@6.0.4", "", { "dependencies": { "css-in-js-utils": "^3.1.0", "fast-loops": "^1.1.3" } }, "sha512-FwXmZC2zbeeS7NzGjJ6pAiqRhXR0ugUShSNb6GApMl6da0/XGc4MOJsoWAywia52EEWbXNSy0pzkwz/+Y+swSg=="],
+
     "internal-ip": ["internal-ip@4.3.0", "", { "dependencies": { "default-gateway": "^4.2.0", "ipaddr.js": "^1.9.0" } }, "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="],
 
     "invariant": ["invariant@2.2.4", "", { "dependencies": { "loose-envify": "^1.0.0" } }, "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA=="],
@@ -1102,6 +1115,8 @@
 
     "postcss": ["postcss@8.4.49", "", { "dependencies": { "nanoid": "^3.3.7", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA=="],
 
+    "postcss-value-parser": ["postcss-value-parser@4.2.0", "", {}, "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="],
+
     "pretty-bytes": ["pretty-bytes@5.6.0", "", {}, "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg=="],
 
     "pretty-format": ["pretty-format@29.7.0", "", { "dependencies": { "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", "react-is": "^18.0.0" } }, "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ=="],
@@ -1132,14 +1147,18 @@
 
     "react-devtools-core": ["react-devtools-core@5.3.2", "", { "dependencies": { "shell-quote": "^1.6.1", "ws": "^7" } }, "sha512-crr9HkVrDiJ0A4zot89oS0Cgv0Oa4OG1Em4jit3P3ZxZSKPMYyMjfwMqgcJna9o625g8oN87rBm8SWWrSTBZxg=="],
 
+    "react-dom": ["react-dom@18.3.1", "", { "dependencies": { "loose-envify": "^1.1.0", "scheduler": "^0.23.2" }, "peerDependencies": { "react": "^18.3.1" } }, "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw=="],
+
     "react-is": ["react-is@18.3.1", "", {}, "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="],
 
     "react-native": ["react-native@0.76.9", "", { "dependencies": { "@jest/create-cache-key-function": "^29.6.3", "@react-native/assets-registry": "0.76.9", "@react-native/codegen": "0.76.9", "@react-native/community-cli-plugin": "0.76.9", "@react-native/gradle-plugin": "0.76.9", "@react-native/js-polyfills": "0.76.9", "@react-native/normalize-colors": "0.76.9", "@react-native/virtualized-lists": "0.76.9", "abort-controller": "^3.0.0", "anser": "^1.4.9", "ansi-regex": "^5.0.0", "babel-jest": "^29.7.0", "babel-plugin-syntax-hermes-parser": "^0.23.1", "base64-js": "^1.5.1", "chalk": "^4.0.0", "commander": "^12.0.0", "event-target-shim": "^5.0.1", "flow-enums-runtime": "^0.0.6", "glob": "^7.1.1", "invariant": "^2.2.4", "jest-environment-node": "^29.6.3", "jsc-android": "^250231.0.0", "memoize-one": "^5.0.0", "metro-runtime": "^0.81.0", "metro-source-map": "^0.81.0", "mkdirp": "^0.5.1", "nullthrows": "^1.1.1", "pretty-format": "^29.7.0", "promise": "^8.3.0", "react-devtools-core": "^5.3.1", "react-refresh": "^0.14.0", "regenerator-runtime": "^0.13.2", "scheduler": "0.24.0-canary-efb381bbf-20230505", "semver": "^7.1.3", "stacktrace-parser": "^0.1.10", "whatwg-fetch": "^3.0.0", "ws": "^6.2.3", "yargs": "^17.6.2" }, "peerDependencies": { "@types/react": "^18.2.6", "react": "^18.2.0" }, "optionalPeers": ["@types/react"], "bin": { "react-native": "cli.js" } }, "sha512-+LRwecWmTDco7OweGsrECIqJu0iyrREd6CTCgC/uLLYipiHvk+MH9nd6drFtCw/6Blz6eoKTcH9YTTJusNtrWg=="],
 
-    "react-native-update": ["react-native-update@10.28.7", "", { "dependencies": { "nanoid": "^3.3.3", "react-native-url-polyfill": "^2.0.0" }, "peerDependencies": { "react": ">=16.8.0", "react-native": ">=0.59.0" } }, "sha512-/KeBMqNEKoCWs2sTE5hG/uJ8PtYp9cMts9OcotVBcTnkKZ/Ix4pNNoMzoxQmOGGMHykElk+3sDu0JWzLz7T1fw=="],
+    "react-native-update": ["react-native-update@10.30.3", "", { "dependencies": { "nanoid": "^3.3.3", "react-native-url-polyfill": "^2.0.0" }, "peerDependencies": { "react": ">=16.8.0", "react-native": ">=0.59.0" } }, "sha512-ImSWIqJZ8rvxotTxHC5/yc5KLDyYuRk3maNxmphh37A6hODPiTxL+ahPTu3ghrHK3vyJtS7xrIeTM5gnJWYFcA=="],
 
     "react-native-url-polyfill": ["react-native-url-polyfill@2.0.0", "", { "dependencies": { "whatwg-url-without-unicode": "8.0.0-3" }, "peerDependencies": { "react-native": "*" } }, "sha512-My330Do7/DvKnEvwQc0WdcBnFPploYKp9CYlefDXzIdEaA+PAhDYllkvGeEroEzvc4Kzzj2O4yVdz8v6fjRvhA=="],
 
+    "react-native-web": ["react-native-web@0.19.13", "", { "dependencies": { "@babel/runtime": "^7.18.6", "@react-native/normalize-colors": "^0.74.1", "fbjs": "^3.0.4", "inline-style-prefixer": "^6.0.1", "memoize-one": "^6.0.0", "nullthrows": "^1.1.1", "postcss-value-parser": "^4.2.0", "styleq": "^0.1.3" }, "peerDependencies": { "react": "^18.0.0", "react-dom": "^18.0.0" } }, "sha512-etv3bN8rJglrRCp/uL4p7l8QvUNUC++QwDbdZ8CB7BvZiMvsxfFIRM1j04vxNldG3uo2puRd6OSWR3ibtmc29A=="],
+
     "react-refresh": ["react-refresh@0.14.2", "", {}, "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA=="],
 
     "readline": ["readline@1.3.0", "", {}, "sha512-k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg=="],
@@ -1188,7 +1207,7 @@
 
     "sax": ["sax@1.4.1", "", {}, "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg=="],
 
-    "scheduler": ["scheduler@0.24.0-canary-efb381bbf-20230505", "", { "dependencies": { "loose-envify": "^1.1.0" } }, "sha512-ABvovCDe/k9IluqSh4/ISoq8tIJnW8euVAWYt5j/bg6dRnqwQwiGO1F/V4AyK96NGF/FB04FhOUDuWj8IKfABA=="],
+    "scheduler": ["scheduler@0.23.2", "", { "dependencies": { "loose-envify": "^1.1.0" } }, "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ=="],
 
     "selfsigned": ["selfsigned@2.4.1", "", { "dependencies": { "@types/node-forge": "^1.3.0", "node-forge": "^1" } }, "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q=="],
 
@@ -1260,6 +1279,8 @@
 
     "structured-headers": ["structured-headers@0.4.1", "", {}, "sha512-0MP/Cxx5SzeeZ10p/bZI0S6MpgD+yxAhi1BOQ34jgnMXsCq3j1t6tQnZu+KdlL7dvJTLT3g9xN8tl10TqgFMcg=="],
 
+    "styleq": ["styleq@0.1.3", "", {}, "sha512-3ZUifmCDCQanjeej1f6kyl/BeP/Vae5EYkQ9iJfUm/QwZvlgnZzyflqAsAWYURdtea8Vkvswu2GrC57h3qffcA=="],
+
     "sucrase": ["sucrase@3.35.0", "", { "dependencies": { "@jridgewell/gen-mapping": "^0.3.2", "commander": "^4.0.0", "glob": "^10.3.10", "lines-and-columns": "^1.1.6", "mz": "^2.7.0", "pirates": "^4.0.1", "ts-interface-checker": "^0.1.9" }, "bin": { "sucrase": "bin/sucrase", "sucrase-node": "bin/sucrase-node" } }, "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA=="],
 
     "sudo-prompt": ["sudo-prompt@9.1.1", "", {}, "sha512-es33J1g2HjMpyAhz8lOR+ICmXXAqTuKbuXuUWLhOLew20oN9oUCgCJx615U/v7aioZg7IX5lIh9x34vwneu4pA=="],
@@ -1544,8 +1565,14 @@
 
     "react-devtools-core/ws": ["ws@7.5.10", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": "^5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="],
 
+    "react-native/scheduler": ["scheduler@0.24.0-canary-efb381bbf-20230505", "", { "dependencies": { "loose-envify": "^1.1.0" } }, "sha512-ABvovCDe/k9IluqSh4/ISoq8tIJnW8euVAWYt5j/bg6dRnqwQwiGO1F/V4AyK96NGF/FB04FhOUDuWj8IKfABA=="],
+
     "react-native/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="],
 
+    "react-native-web/@react-native/normalize-colors": ["@react-native/normalize-colors@0.74.89", "", {}, "sha512-qoMMXddVKVhZ8PA1AbUCk83trpd6N+1nF2A6k1i6LsQObyS92fELuk8kU/lQs6M7BsMHwqyLCpQJ1uFgNvIQXg=="],
+
+    "react-native-web/memoize-one": ["memoize-one@6.0.0", "", {}, "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="],
+
     "recast/source-map": ["source-map@0.6.1", "", {}, "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="],
 
     "regjsparser/jsesc": ["jsesc@3.0.2", "", { "bin": { "jsesc": "bin/jsesc" } }, "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="],

Example/expoUsePushy/package.json

@@ -9,11 +9,14 @@
     "web": "expo start --web"
   },
   "dependencies": {
+    "@expo/metro-runtime": "~4.0.1",
     "expo": "~52.0.46",
     "expo-status-bar": "~2.0.1",
     "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-native": "0.76.9",
-    "react-native-update": "^10.28.7"
+    "react-native-update": "^10.30.3",
+    "react-native-web": "~0.19.13"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",

Example/testHotUpdate/.prettierrc.js

@@ -1,7 +1,5 @@
 module.exports = {
   arrowParens: 'avoid',
-  bracketSameLine: true,
-  bracketSpacing: false,
   singleQuote: true,
   trailingComma: 'all',
 };

Example/testHotUpdate/android/app/build.gradle

@@ -81,7 +81,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "1.0"
+        versionName "1.81.4"
     }
     signingConfigs {
         debug {

Example/testHotUpdate/android/app/src/main/java/com/awesomeproject/MainApplication.kt

@@ -5,13 +5,11 @@ import cn.reactnative.modules.update.UpdateContext
 import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication
 import com.facebook.react.ReactHost
+import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
-import com.facebook.react.soloader.OpenSourceMergedSoMapping
-import com.facebook.soloader.SoLoader
 
 class MainApplication : Application(), ReactApplication {
 
@@ -39,10 +37,6 @@ class MainApplication : Application(), ReactApplication {
 
   override fun onCreate() {
     super.onCreate()
-    SoLoader.init(this, OpenSourceMergedSoMapping)
+    loadReactNative(this)
-    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-      // If you opted-in for the New Architecture, we load the native entry point for this app.
-      load()
-    }
   }
 }

Example/testHotUpdate/android/build.gradle

@@ -1,11 +1,11 @@
 buildscript {
     ext {
-        buildToolsVersion = "35.0.0"
+        buildToolsVersion = "36.0.0"
         minSdkVersion = 24
-        compileSdkVersion = 35
+        compileSdkVersion = 36
-        targetSdkVersion = 35
+        targetSdkVersion = 36
         ndkVersion = "27.1.12297006"
-        kotlinVersion = "2.0.21"
+        kotlinVersion = "2.1.20"
     }
     repositories {
         google()

Example/testHotUpdate/android/gradle.properties

@@ -25,7 +25,8 @@ android.useAndroidX=true
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using
 # ./gradlew <task> -PreactNativeArchitectures=x86_64
-reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
+# reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
+reactNativeArchitectures=arm64-v8a
 
 # Use this property to enable support to the new architecture.
 # This will allow you to use TurboModules and the Fabric render in

Example/testHotUpdate/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

Example/testHotUpdate/android/gradlew

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
@@ -248,4 +248,4 @@ eval "set -- $(
         tr '\n' ' '
     )" '"$@"'
 
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"

Example/testHotUpdate/android/gradlew.bat

@@ -1,3 +1,8 @@
+@REM Copyright (c) Meta Platforms, Inc. and affiliates.
+@REM
+@REM This source code is licensed under the MIT license found in the
+@REM LICENSE file in the root directory of this source tree.
+
 @rem
 @rem Copyright 2015 the original author or authors.
 @rem
@@ -70,11 +75,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
@@ -91,4 +96,4 @@ exit /b %EXIT_CODE%
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
+:omega

Example/testHotUpdate/ios/AwesomeProject/Info.plist

@@ -37,8 +37,14 @@
 			</dict>
 		</dict>
 	</dict>
+	<key>NSCameraUsageDescription</key>
+	<string>For taking photos</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string></string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>For saving photos</string>
+	<key>RCTNewArchEnabled</key>
+	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
@@ -53,10 +59,5 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>NSCameraUsageDescription</key>
-	<string>For taking photos</string>
-
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>For saving photos</string>		
 </dict>
 </plist>

Example/testHotUpdate/package.json

@@ -14,39 +14,39 @@
     "dev:harmony": "react-native bundle-harmony --dev"
   },
   "dependencies": {
-    "form-data": "^4.0.3",
+    "form-data": "^4.0.4",
     "patch-package": "^8.0.0",
-    "react": "19.0.0",
+    "react": "19.1.0",
-    "react-native": "0.79.2",
+    "react-native": "0.81.4",
-    "react-native-camera-kit": "^15.1.0",
+    "react-native-camera-kit": "^16.1.2",
     "react-native-paper": "^5.14.5",
-    "react-native-safe-area-context": "^5.5.0",
+    "react-native-safe-area-context": "^5.6.1",
-    "react-native-svg": "^15.12.0",
+    "react-native-svg": "^15.13.0",
-    "react-native-update": "^10.29.4",
+    "react-native-update": "^10.31.1",
-    "react-native-vector-icons": "^10.2.0"
+    "react-native-vector-icons": "^10.3.0"
   },
   "devDependencies": {
     "@babel/core": "^7.27.3",
     "@babel/preset-env": "^7.27.2",
     "@babel/runtime": "^7.27.3",
-    "@react-native-community/cli": "18.0.0",
+    "@react-native-community/cli": "20.0.0",
-    "@react-native-community/cli-platform-android": "18.0.0",
+    "@react-native-community/cli-platform-android": "20.0.0",
-    "@react-native-community/cli-platform-ios": "18.0.0",
+    "@react-native-community/cli-platform-ios": "20.0.0",
-    "@react-native/babel-preset": "0.79.2",
+    "@react-native/babel-preset": "0.81.4",
-    "@react-native/eslint-config": "0.79.2",
+    "@react-native/eslint-config": "0.81.4",
-    "@react-native/metro-config": "0.79.2",
+    "@react-native/metro-config": "0.81.4",
-    "@react-native/typescript-config": "0.79.2",
+    "@react-native/typescript-config": "0.81.4",
-    "@types/react": "^19.0.0",
+    "@types/react": "^19.1.13",
-    "@types/react-test-renderer": "^19.0.0",
+    "@types/react-test-renderer": "^19.1.0",
-    "detox": "^20.39.0",
+    "detox": "^20.41.2",
-    "eslint": "^8.19.0",
+    "eslint": "^9.35.0",
     "jest": "^29.6.3",
     "prettier": "2.8.8",
-    "react-test-renderer": "19.0.0",
+    "react-test-renderer": "19.1.1",
     "typescript": "5.8.3"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "trustedDependencies": [
     "detox",

Example/testHotUpdate/src/index.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable react/no-unstable-nested-components */
 /* eslint-disable react-native/no-inline-styles */
-import React, {useRef, useState} from 'react';
+import React, { useRef, useState } from 'react';
 import {
   StyleSheet,
   Platform,
@@ -19,14 +19,14 @@ import {
   Modal,
   Portal,
 } from 'react-native-paper';
-import {Camera} from 'react-native-camera-kit';
+import { Camera } from 'react-native-camera-kit';
-import {LocalSvg} from 'react-native-svg/css';
+import { LocalSvg } from 'react-native-svg/css';
 
 import TestConsole from './TestConsole';
 
 import _updateConfig from '../update.json';
-import {UpdateProvider, Pushy, Cresc, useUpdate} from 'react-native-update';
+import { UpdateProvider, Pushy, Cresc, useUpdate } from 'react-native-update';
-const {appKey} = _updateConfig[Platform.OS];
+const { appKey } = _updateConfig[Platform.OS];
 
 function App() {
   const {
@@ -39,7 +39,8 @@ function App() {
     packageVersion,
     currentHash,
     parseTestQrCode,
-    progress: {received, total} = {},
+    progress: { received, total } = {},
+    currentVersionInfo,
   } = useUpdate();
   const [useDefaultAlert, setUseDefaultAlert] = useState(true);
   const [showTestConsole, setShowTestConsole] = useState(false);
@@ -52,8 +53,8 @@ function App() {
 
   return (
     <View style={styles.container}>
-      <Text style={styles.welcome}>欢迎使用Pushy热更新服务</Text>
+      <Text style={styles.welcome}>欢迎22使用Pushy热更新服务</Text>
-      <View style={{flexDirection: 'row'}}>
+      <View style={{ flexDirection: 'row' }}>
         <Text>
           {useDefaultAlert ? '当前使用' : '当前不使用'}默认的alert更新提示
         </Text>
@@ -72,9 +73,9 @@ function App() {
       <Portal>
         <Modal visible={showCamera} onDismiss={() => setShowCamera(false)}>
           <Camera
-            style={{minHeight: 320}}
+            style={{ minHeight: 320 }}
             scanBarcode={true}
-            onReadCode={({nativeEvent: {codeStringValue}}) => {
+            onReadCode={({ nativeEvent: { codeStringValue } }) => {
               // 防止重复扫码
               if (lastParsedCode.current === codeStringValue) {
                 return;
@@ -92,7 +93,7 @@ function App() {
           />
         </Modal>
       </Portal>
-      <View style={{flexDirection: 'row', alignItems: 'center', gap: 10}}>
+      <View style={{ flexDirection: 'row', alignItems: 'center', gap: 10 }}>
         <Text>png:</Text>
         <Image
           resizeMode={'contain'}
@@ -100,11 +101,11 @@ function App() {
           style={styles.image}
         />
       </View>
-      <View style={{flexDirection: 'row', alignItems: 'center', gap: 10}}>
+      <View style={{ flexDirection: 'row', alignItems: 'center', gap: 10 }}>
         <Text>svg:</Text>
         <LocalSvg
           asset={require('./assets/react-logo.svg')}
-          style={{width: 30, height: 30}}
+          style={{ width: 30, height: 30 }}
         />
       </View>
       <Text style={styles.instructions}>
@@ -113,6 +114,7 @@ function App() {
         {'\n'}
         当前热更新版本Hash: {currentHash || '(空)'}
         {'\n'}
+        当前热更新版本信息: {JSON.stringify(currentVersionInfo) || '(空)'}
       </Text>
       <Text>
         下载进度：{received} / {total}
@@ -121,16 +123,18 @@ function App() {
         onPress={() => {
           checkUpdate();
           setShowUpdateSnackbar(true);
-        }}>
+        }}
+      >
         <Text style={styles.instructions}>点击这里检查更新</Text>
       </TouchableOpacity>
 
       <TouchableOpacity
         testID="testcase"
-        style={{marginTop: 15}}
+        style={{ marginTop: 15 }}
         onLongPress={() => {
           setShowTestConsole(true);
-        }}>
+        }}
+      >
         <Text style={styles.instructions}>
           react-native-update版本：{client?.version}
         </Text>
@@ -152,14 +156,15 @@ function App() {
               await downloadUpdate();
               setShowUpdateBanner(true);
             },
-          }}>
+          }}
-          <Text style={{color: 'white'}}>
+        >
+          <Text style={{ color: 'white' }}>
             有新版本({updateInfo.name})可用，是否更新？
           </Text>
         </Snackbar>
       )}
       <Banner
-        style={{width: '100%', position: 'absolute', top: 0}}
+        style={{ width: '100%', position: 'absolute', top: 0 }}
         visible={showUpdateBanner}
         actions={[
           {
@@ -174,9 +179,10 @@ function App() {
             },
           },
         ]}
-        icon={({size}) => (
+        icon={({ size }) => (
           <Icon name="checkcircleo" size={size} color="#00f" />
-        )}>
+        )}
+      >
         更新已完成，是否立即重启？
       </Banner>
     </View>
@@ -224,4 +230,4 @@ export default function Root() {
       </PaperProvider>
     </UpdateProvider>
   );
-}
+}

Example/testHotUpdate/tsconfig.json

@@ -0,0 +1,5 @@
+{
+  "extends": "@react-native/typescript-config",
+  "include": ["**/*.ts", "**/*.tsx"],
+  "exclude": ["**/node_modules", "**/Pods"]
+}

android/build.gradle

@@ -101,7 +101,7 @@ android {
         minSdkVersion safeExtGet('minSdkVersion', 16)
         targetSdkVersion safeExtGet('targetSdkVersion', 27)
         versionCode 1
-        versionName "1.0"
+        versionName "1.81.4"
         consumerProguardFiles "proguard.pro"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
     }

android/src/main/java/cn/reactnative/modules/update/UpdateContext.java

@@ -36,10 +36,28 @@ public class UpdateContext {
         this.sp = context.getSharedPreferences("update", Context.MODE_PRIVATE);
 
         String packageVersion = getPackageVersion();
-        if (!packageVersion.equals(this.sp.getString("packageVersion", null))) {
+        String buildTime = getBuildTime();
+        String storedPackageVersion = this.sp.getString("packageVersion", null);
+        String storedBuildTime = this.sp.getString("buildTime", null);
+        
+        // If stored versions don't exist, write current versions first
+        if (storedPackageVersion == null || storedBuildTime == null) {
+            SharedPreferences.Editor editor = sp.edit();
+            editor.putString("packageVersion", packageVersion);
+            editor.putString("buildTime", buildTime);
+            editor.apply();
+            storedPackageVersion = packageVersion;
+            storedBuildTime = buildTime;
+        }
+        
+        boolean packageVersionChanged = !packageVersion.equals(storedPackageVersion);
+        boolean buildTimeChanged = !buildTime.equals(storedBuildTime);
+        
+        if (packageVersionChanged || buildTimeChanged) {
             SharedPreferences.Editor editor = sp.edit();
             editor.clear();
             editor.putString("packageVersion", packageVersion);
+            editor.putString("buildTime", buildTime);
             editor.apply();
 
             this.cleanUp();

android/src/main/java/cn/reactnative/modules/update/UpdateModuleImpl.java

@@ -23,6 +23,38 @@ import java.util.Map;
 public class UpdateModuleImpl {
 
     public static final String NAME = "Pushy";
+    
+    /**
+     * 获取字段的兼容性方法，尝试带m前缀和不带m前缀的字段名
+     * @param clazz 目标类
+     * @param fieldName 基础字段名（不带m前缀）
+     * @return 找到的字段对象
+     * @throws NoSuchFieldException 如果两种命名都找不到字段
+     */
+    private static Field getCompatibleField(Class<?> clazz, String fieldName) throws NoSuchFieldException {
+        // 首先尝试带m前缀的字段名
+        try {
+            return clazz.getDeclaredField("m" + capitalize(fieldName));
+        } catch (NoSuchFieldException e) {
+            // 如果找不到带m前缀的，尝试不带m前缀的
+            try {
+                return clazz.getDeclaredField(fieldName);
+            } catch (NoSuchFieldException e2) {
+                // 如果都找不到，抛出异常并包含两种尝试的信息
+                throw new NoSuchFieldException("Field not found with either name: m" + capitalize(fieldName) + " or " + fieldName);
+            }
+        }
+    }
+    
+    /**
+     * 首字母大写的辅助方法
+     */
+    private static String capitalize(String str) {
+        if (str == null || str.length() == 0) {
+            return str;
+        }
+        return str.substring(0, 1).toUpperCase() + str.substring(1);
+    }
 
     public static void downloadFullUpdate(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
         String url = options.getString("updateUrl");
@@ -143,16 +175,16 @@ public class UpdateModuleImpl {
                         ReactDelegate reactDelegate = (ReactDelegate) 
                             getReactDelegateMethod.invoke(currentActivity);
 
-                        Field reactHostField = ReactDelegate.class.getDeclaredField("mReactHost");
+                        Field reactHostField = getCompatibleField(ReactDelegate.class, "reactHost");
                         reactHostField.setAccessible(true);
                         Object reactHost = reactHostField.get(reactDelegate);
 
-                        Field devSupport = reactHost.getClass().getDeclaredField("mUseDevSupport");
+                        Field devSupport = getCompatibleField(reactHost.getClass(), "useDevSupport");
                         devSupport.setAccessible(true);
                         devSupport.set(reactHost, false);
 
-                        // Access the mReactHostDelegate field
+                        // Access the ReactHostDelegate field (compatible with mReactHostDelegate/reactHostDelegate)
-                        Field reactHostDelegateField = reactHost.getClass().getDeclaredField("mReactHostDelegate");
+                        Field reactHostDelegateField = getCompatibleField(reactHost.getClass(), "reactHostDelegate");
                         reactHostDelegateField.setAccessible(true);
                         Object reactHostDelegate = reactHostDelegateField.get(reactHost);
 

android/src/newarch/cn/reactnative/modules/update/UpdateModule.java

@@ -35,7 +35,9 @@ public class UpdateModule extends NativePushySpec {
         final Map<String, Object> constants = new HashMap<>();
         constants.put("downloadRootDir", updateContext.getRootDir());
         constants.put("packageVersion", updateContext.getPackageVersion());
-        constants.put("currentVersion", updateContext.getCurrentVersion());
+        String currentVersion = updateContext.getCurrentVersion();
+        constants.put("currentVersion", currentVersion);
+        constants.put("currentVersionInfo", updateContext.getKv("hash_" + currentVersion));
         constants.put("buildTime", updateContext.getBuildTime());
         constants.put("isUsingBundleUrl", updateContext.getIsUsingBundleUrl());
         boolean isFirstTime = updateContext.isFirstTime();

android/src/oldarch/cn/reactnative/modules/update/UpdateModule.java

@@ -48,7 +48,9 @@ public class UpdateModule extends ReactContextBaseJavaModule {
         final Map<String, Object> constants = new HashMap<>();
         constants.put("downloadRootDir", updateContext.getRootDir());
         constants.put("packageVersion", updateContext.getPackageVersion());
-        constants.put("currentVersion", updateContext.getCurrentVersion());
+        String currentVersion = updateContext.getCurrentVersion();
+        constants.put("currentVersion", currentVersion);
+        constants.put("currentVersionInfo", updateContext.getKv("hash_" + currentVersion));
         constants.put("buildTime", updateContext.getBuildTime());
         constants.put("isUsingBundleUrl", updateContext.getIsUsingBundleUrl());
         boolean isFirstTime = updateContext.isFirstTime();

endpoints.json

@@ -1 +1 @@
-["https://pushy-koa-qgbgqmcpis.cn-beijing.fcapp.run", "https://p.reactnative.cn/api"]
+["https://p.reactnative.cn/api"]

harmony/pushy/src/main/ets/PushyTurboModule.ts

@@ -32,6 +32,7 @@ getConstants(): Object {
   const rolledBackVersion = preferencesManager.getSync("rolledBackVersion", "") as string;
   const uuid = preferencesManager.getSync("uuid", "") as string;
   const currentVersion = preferencesManager.getSync("currentVersion", "") as string;
+  const currentVersionInfo = this.context.getKv(`hash_${currentVersion}`);
   const buildTime = preferencesManager.getSync("buildTime", "") as string;
   const isUsingBundleUrl = this.context.getIsUsingBundleUrl();
   let bundleFlags = bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_REQUESTED_PERMISSION;
@@ -53,6 +54,7 @@ getConstants(): Object {
 
   return {
     downloadRootDir: `${context.filesDir}/_update`,
+    currentVersionInfo,
     packageVersion,
     currentVersion,
     buildTime,
@@ -64,13 +66,13 @@ getConstants(): Object {
 }
 
 
-  async setLocalHashInfo(hash: string, info: string): Promise<boolean>  {
+  setLocalHashInfo(hash: string, info: string): boolean  {
     logger.debug(TAG, ",call setLocalHashInfo");
-    return UpdateModuleImpl.setLocalHashInfo(this.context,hash,info);
+    return UpdateModuleImpl.setLocalHashInfo(this.context, hash, info);
   }
 
-  async getLocalHashInfo(hash: string): Promise<string> {
+  getLocalHashInfo(hash: string): string {
-    return UpdateModuleImpl.getLocalHashInfo(this.context,hash);
+    return UpdateModuleImpl.getLocalHashInfo(this.context, hash);
   }
 
   async setUuid(uuid: string): Promise<boolean>  {

harmony/pushy/src/main/ets/UpdateContext.ts

@@ -50,8 +50,8 @@ export class UpdateContext {
          this.preferences.flush();
     }
 
-    public  getKv(key: string): string {
+    public getKv(key: string): string {
-        return  this.preferences.getSync(key, '') as string;
+        return this.preferences.getSync(key, '') as string;
     }
 
     public  isFirstTime(): boolean {

harmony/pushy/src/main/ets/UpdateModuleImpl.ts

@@ -171,27 +171,20 @@ export class UpdateModuleImpl {
     }
   }
 
-  static async setLocalHashInfo(
+  static setLocalHashInfo(
     updateContext: UpdateContext,
     hash: string,
     info: string
-  ): Promise<boolean> {
+  ): boolean {
-    if (!this.checkJson(info)) {
+    updateContext.setKv(`hash_${hash}`, info);
-      await updateContext.setKv(`hash_${hash}`, info);
-      throw new Error('校验报错:json字符串格式错误');
-    }
-    await updateContext.setKv(`hash_${hash}`, info);
     return true;
   }
 
-  static async getLocalHashInfo(
+  static getLocalHashInfo(
     updateContext: UpdateContext,
     hash: string
-  ): Promise<string> {
+  ): string {
-    const value = await updateContext.getKv(`hash_${hash}`);
+    const value = updateContext.getKv(`hash_${hash}`);
-    if (!this.checkJson(value)) {
-      throw new Error('校验报错:json字符串格式错误');
-    }
     return value;
   }
 }

ios/ImportReact.h

@@ -0,0 +1,2 @@
+@import React;
+

ios/RCTPushy/RCTPushy.mm

@@ -16,6 +16,7 @@
 
 static NSString *const keyPushyInfo = @"REACTNATIVECN_PUSHY_INFO_KEY";
 static NSString *const paramPackageVersion = @"packageVersion";
+static NSString *const paramBuildTime = @"buildTime";
 static NSString *const paramLastVersion = @"lastVersion";
 static NSString *const paramCurrentVersion = @"currentVersion";
 static NSString *const paramIsFirstTime = @"isFirstTime";
@@ -70,20 +71,36 @@ RCT_EXPORT_MODULE(RCTPushy);
 {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     
+    // Check for version changes first 
+    NSString *curPackageVersion = [RCTPushy packageVersion];
+    NSString *curBuildTime = [RCTPushy buildTime];
+    NSString *storedPackageVersion = [defaults stringForKey:paramPackageVersion];
+    NSString *storedBuildTime = [defaults stringForKey:paramBuildTime];
+    
+    // If stored versions don't exist, write current versions first
+    if (!storedPackageVersion || !storedBuildTime) {
+        [defaults setObject:curPackageVersion forKey:paramPackageVersion];
+        [defaults setObject:curBuildTime forKey:paramBuildTime];
+        storedPackageVersion = curPackageVersion;
+        storedBuildTime = curBuildTime;
+    }
+    
+    BOOL packageVersionChanged = ![curPackageVersion isEqualToString:storedPackageVersion];
+    BOOL buildTimeChanged = ![curBuildTime isEqualToString:storedBuildTime];
+    
+    if (packageVersionChanged || buildTimeChanged) {
+        // Clear all update data and store new versions
+        [defaults setObject:nil forKey:keyPushyInfo];
+        [defaults setObject:nil forKey:keyHashInfo];
+        [defaults setObject:@(YES) forKey:KeyPackageUpdatedMarked];
+        [defaults setObject:curPackageVersion forKey:paramPackageVersion];
+        [defaults setObject:curBuildTime forKey:paramBuildTime];
+        
+        // ...need clear files later
+    }
+    
     NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo];
     if (pushyInfo) {
-        NSString *curPackageVersion = [RCTPushy packageVersion];
-        NSString *packageVersion = [pushyInfo objectForKey:paramPackageVersion];
-        
-        BOOL needClearPushyInfo = ![curPackageVersion isEqualToString:packageVersion];
-        if (needClearPushyInfo) {
-            [defaults setObject:nil forKey:keyPushyInfo];
-            [defaults setObject:nil forKey:keyHashInfo];
-            [defaults setObject:@(YES) forKey:KeyPackageUpdatedMarked];
-            
-            // ...need clear files later
-        }
-        else {
             NSString *curVersion = pushyInfo[paramCurrentVersion];
             
             BOOL isFirstTime = [pushyInfo[paramIsFirstTime] boolValue];
@@ -115,7 +132,6 @@ RCT_EXPORT_MODULE(RCTPushy);
                     loadVersion = [self rollback];
                 }
             }
-        }
     }
     
     return [RCTPushy binaryBundleURL];
@@ -127,13 +143,11 @@ RCT_EXPORT_MODULE(RCTPushy);
     NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo];
     NSString *lastVersion = pushyInfo[paramLastVersion];
     NSString *curVersion = pushyInfo[paramCurrentVersion]; 
-    NSString *curPackageVersion = [RCTPushy packageVersion];
     if (lastVersion.length) {
         // roll back to last version
         [defaults setObject:@{paramCurrentVersion:lastVersion,
                               paramIsFirstTime:@(NO),
-                              paramIsFirstLoadOk:@(YES),
+                              paramIsFirstLoadOk:@(YES)}
-                              paramPackageVersion:curPackageVersion}
                      forKey:keyPushyInfo];
     }
     else {
@@ -162,7 +176,11 @@ RCT_EXPORT_MODULE(RCTPushy);
     ret[@"isFirstTime"] = [defaults objectForKey:keyFirstLoadMarked];
     ret[@"uuid"] = [defaults objectForKey:keyUuid];
     NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo];
-    ret[@"currentVersion"] = [pushyInfo objectForKey:paramCurrentVersion];
+    NSString *currentVersion = [pushyInfo objectForKey:paramCurrentVersion];
+    ret[@"currentVersion"] = currentVersion;
+    if (currentVersion != nil) {
+        ret[@"currentVersionInfo"] = [defaults objectForKey:[keyHashInfo stringByAppendingString:currentVersion]];
+    }
     
     // clear isFirstTimemarked
     if (ret[@"isFirstTime"]) {
@@ -296,7 +314,6 @@ RCT_EXPORT_METHOD(setNeedUpdate:(NSDictionary *)options
         newInfo[paramLastVersion] = lastVersion;
         newInfo[paramIsFirstTime] = @(YES);
         newInfo[paramIsFirstLoadOk] = @(NO);
-        newInfo[paramPackageVersion] = [RCTPushy packageVersion];
         [defaults setObject:newInfo forKey:keyPushyInfo];
         
         
@@ -315,16 +332,15 @@ RCT_EXPORT_METHOD(reloadUpdate:(NSDictionary *)options
         if (hash.length) {
             // 只在 setNeedUpdate 成功后 resolve
             [self setNeedUpdate:options resolver:^(id result) {
-                // reload in earlier version
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    [self.bridge setValue:[[self class] bundleURL] forKey:@"bundleURL"];
+                    #if __has_include("RCTReloadCommand.h")
-                    [self.bridge reload];
+                        // reload 0.62+
+                        RCTReloadCommandSetBundleURL([[self class] bundleURL]);
+                        RCTTriggerReloadCommandListeners(@"pushy reloadUpdate");
+                    #else
+                        [self.bridge reload];
+                    #endif
                 });
-                #if __has_include("RCTReloadCommand.h")
-                    // reload 0.62+
-                    RCTReloadCommandSetBundleURL([[self class] bundleURL]);
-                    RCTTriggerReloadCommandListeners(@"pushy reload");
-                #endif
                 resolve(@true);
             } rejecter:^(NSString *code, NSString *message, NSError *error) {
                 reject(code, message, error);
@@ -343,13 +359,14 @@ RCT_EXPORT_METHOD(restartApp:(RCTPromiseResolveBlock)resolve
 {
     @try {
         dispatch_async(dispatch_get_main_queue(), ^{
-            [self.bridge reload];
+            #if __has_include("RCTReloadCommand.h")
+                // reload 0.62+
+                RCTReloadCommandSetBundleURL([[self class] bundleURL]);
+                RCTTriggerReloadCommandListeners(@"pushy restartApp");
+            #else
+                [self.bridge reload];
+            #endif
         });
-        #if __has_include("RCTReloadCommand.h")
-            // reload 0.62+
-            RCTReloadCommandSetBundleURL([[self class] bundleURL]);
-            RCTTriggerReloadCommandListeners(@"pushy restartApp");
-        #endif
 
         resolve(@true);
     }
@@ -361,6 +378,9 @@ RCT_EXPORT_METHOD(restartApp:(RCTPromiseResolveBlock)resolve
 RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
                                     rejecter:(RCTPromiseRejectBlock)reject)
 {
+    #if DEBUG
+    resolve(@true);
+    #else
     
     @try {
         // up package info
@@ -384,6 +404,7 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
     @catch (NSException *exception) {
         reject(@"执行报错", nil, nil);
     }
+    #endif
 }
 
 
@@ -542,7 +563,15 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
             callback([self errorWithMessage:ERROR_HDIFFPATCH]);
         }
     };
-    [_fileManager hdiffFileAtPath:bundlePatch fromOrigin:bundleOrigin toDestination:destination completionHandler:completionHandler];
+    
+    @try {
+        [_fileManager hdiffFileAtPath:bundlePatch fromOrigin:bundleOrigin toDestination:destination completionHandler:completionHandler];
+    }
+    @catch (NSException *exception) {
+        NSLog(@"Pushy _dopatch error: exception occurred during hdiffFileAtPath: %@, reason: %@", 
+              exception.name, exception.reason);
+        callback([self errorWithMessage:ERROR_HDIFFPATCH]);
+    }
 }
 
 - (void)patch:(NSString *)hash fromBundle:(NSString *)bundleOrigin source:(NSString *)sourceOrigin callback:(void (^)(NSError *error))callback

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.29.5",
+  "version": "10.31.2",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {
@@ -72,5 +72,6 @@
     "react-native": "0.73",
     "ts-jest": "^29.3.2",
     "typescript": "^5.6.3"
-  }
+  },
+  "packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
 }

react-native-update.podspec

@@ -90,13 +90,6 @@ Pod::Spec.new do |s|
 
   s.source = { :git => 'https://github.com/reactnativecn/react-native-update.git', :tag => '#{s.version}' }
 
-  # Conditionally set source files
-  if valid_expo_project
-    s.source_files = Dir.glob("ios/**/*.{h,m,mm,swift}") # Include Expo files
-  else
-    s.source_files = Dir.glob("ios/**/*.{h,m,mm,swift}").reject { |f| f.start_with?("ios/Expo/") } # Exclude Expo files
-  end
-
   s.libraries = 'bz2', 'z'
   s.vendored_libraries = 'RCTPushy/libRCTPushy.a'
   s.pod_target_xcconfig = { 
@@ -112,22 +105,18 @@ Pod::Spec.new do |s|
 
   # Conditionally add Expo dependency
   if valid_expo_project
+    s.public_header_files = ['ios/ImportReact.h']
     s.dependency 'ExpoModulesCore'
   end
 
   s.subspec 'RCTPushy' do |ss|
-    ss.source_files = 'ios/RCTPushy/*.{h,m,mm,swift}'
+    ss.source_files = ['ios/RCTPushy/**/*.{h,m,mm,c}',
-    ss.public_header_files = ['ios/RCTPushy/*.h']
-  end
-
-  s.subspec 'HDiffPatch' do |ss|
-    ss.source_files = ['ios/RCTPushy/HDiffPatch/**/*.{h,m,c}',
                        'android/jni/hpatch.{h,c}',
                        'android/jni/HDiffPatch/libHDiffPatch/HPatch/*.{h,c}',
                        'android/jni/HDiffPatch/file_for_patch.{h,c}',
                        'android/jni/lzma/C/LzmaDec.{h,c}',
                        'android/jni/lzma/C/Lzma2Dec.{h,c}']
-    ss.public_header_files = 'ios/RCTPushy/HDiffPatch/**/*.h'
+    ss.public_header_files = ['ios/RCTPushy/**/*.h']
   end
 
   # Conditionally add Expo subspec and check ExpoModulesCore version

src/NativePushy.ts

@@ -10,6 +10,7 @@ export interface Spec extends TurboModule {
     buildTime: string;
     uuid: string;
     isUsingBundleUrl: boolean;
+    currentVersionInfo: string;
   };
   setLocalHashInfo(hash: string, info: string): Promise<void>;
   getLocalHashInfo(hash: string): Promise<string>;

src/client.ts

@@ -28,6 +28,7 @@ import {
   promiseAny,
   testUrls,
 } from './utils';
+import i18n from './i18n';
 
 const SERVER_PRESETS = {
   // cn
@@ -91,7 +92,8 @@ export class Pushy {
   options = defaultClientOptions;
   clientType: 'Pushy' | 'Cresc' = 'Pushy';
   lastChecking?: number;
-  lastRespJson?: Promise<any>;
+  lastRespJson?: Promise<CheckResult>;
+  lastRespText?: Promise<string>;
 
   version = cInfo.rnu;
   loggerPromise = (() => {
@@ -106,13 +108,18 @@ export class Pushy {
   })();
 
   constructor(options: ClientOptions, clientType?: 'Pushy' | 'Cresc') {
-    if (Platform.OS === 'ios' || Platform.OS === 'android') {
-      if (!options.appKey) {
-        throw new Error('appKey is required');
-      }
-    }
     this.clientType = clientType || 'Pushy';
     this.options.server = SERVER_PRESETS[this.clientType];
+
+    // Initialize i18n based on clientType
+    i18n.setLocale(this.clientType === 'Pushy' ? 'zh' : 'en');
+
+    if (Platform.OS === 'ios' || Platform.OS === 'android') {
+      if (!options.appKey) {
+        throw new Error(i18n.t('error_appkey_required'));
+      }
+    }
+
     this.setOptions(options);
     if (isRolledBack) {
       this.report({
@@ -135,6 +142,16 @@ export class Pushy {
     }
   };
 
+  /**
+   * Get translated text based on current clientType
+   * @param key - Translation key
+   * @param values - Values for interpolation (optional)
+   * @returns Translated string
+   */
+  t = (key: string, values?: Record<string, string | number>) => {
+    return i18n.t(key as any, values);
+  };
+
   report = async ({
     type,
     message = '',
@@ -148,6 +165,7 @@ export class Pushy {
     await this.loggerPromise.promise;
     const { logger = noop, appKey } = this.options;
     const info = await getCurrentVersionInfo();
+    const overridePackageVersion = this.options.overridePackageVersion;
     logger({
       type,
       data: {
@@ -155,6 +173,7 @@ export class Pushy {
         currentVersion,
         cInfo,
         packageVersion,
+        overridePackageVersion,
         buildTime,
         message,
         ...info,
@@ -172,11 +191,7 @@ export class Pushy {
   };
   assertDebug = (matter: string) => {
     if (__DEV__ && !this.options.debug) {
-      console.info(
+      console.info(this.t('dev_debug_disabled', { matter }));
-        `You are currently in the development environment and have not enabled debug mode. 
-        ${matter} will not be performed. 
-        If you need to debug ${matter} in the development environment, please set debug to true in the client.`,
-      );
       return false;
     }
     return true;
@@ -233,7 +248,7 @@ export class Pushy {
     }
     this.lastChecking = now;
     const fetchBody = {
-      packageVersion,
+      packageVersion: this.options.overridePackageVersion || packageVersion,
       hash: currentVersion,
       buildTime,
       cInfo,
@@ -267,7 +282,7 @@ export class Pushy {
     } catch (e: any) {
       this.report({
         type: 'errorChecking',
-        message: `Can not connect to update server: ${e.message}. Trying backup endpoints.`,
+        message: this.t('error_cannot_connect_backup', { message: e.message }),
       });
       const backupEndpoints = await this.getBackupEndpoints();
       if (backupEndpoints) {
@@ -287,25 +302,31 @@ export class Pushy {
     if (!resp) {
       this.report({
         type: 'errorChecking',
-        message: 'Can not connect to update server. Please check your network.',
+        message: this.t('error_cannot_connect_server'),
       });
       this.throwIfEnabled(new Error('errorChecking'));
       return this.lastRespJson ? await this.lastRespJson : emptyObj;
     }
+
+    if (resp.status !== 200) {
+      const errorMessage = this.t('error_http_status', {
+        status: resp.status,
+        statusText: resp.statusText,
+      });
+      this.report({
+        type: 'errorChecking',
+        message: errorMessage,
+      });
+      this.throwIfEnabled(new Error(errorMessage));
+      log('error checking response:', resp.status, await resp.text());
+      return this.lastRespJson ? await this.lastRespJson : emptyObj;
+    }
     this.lastRespJson = resp.json();
 
     const result: CheckResult = await this.lastRespJson;
 
     log('checking result:', result);
 
-    if (resp.status !== 200) {
-      this.report({
-        type: 'errorChecking',
-        message: result.message,
-      });
-      this.throwIfEnabled(new Error(result.message));
-    }
-
     return result;
   };
   getBackupEndpoints = async () => {
@@ -391,7 +412,12 @@ export class Pushy {
       }
     }
     let succeeded = '';
-    this.report({ type: 'downloading' });
+    this.report({
+      type: 'downloading',
+      data: {
+        newVersion: hash,
+      },
+    });
     let lastError: any;
     let errorMessages: string[] = [];
     const diffUrl = await testUrls(joinUrls(paths, diff));
@@ -405,7 +431,9 @@ export class Pushy {
         });
         succeeded = 'diff';
       } catch (e: any) {
-        const errorMessage = `diff error: ${e.message}`;
+        const errorMessage = this.t('error_diff_failed', {
+          message: e.message,
+        });
         errorMessages.push(errorMessage);
         lastError = new Error(errorMessage);
         log(errorMessage);
@@ -422,7 +450,9 @@ export class Pushy {
           });
           succeeded = 'pdiff';
         } catch (e: any) {
-          const errorMessage = `pdiff error: ${e.message}`;
+          const errorMessage = this.t('error_pdiff_failed', {
+            message: e.message,
+          });
           errorMessages.push(errorMessage);
           lastError = new Error(errorMessage);
           log(errorMessage);
@@ -440,17 +470,15 @@ export class Pushy {
           });
           succeeded = 'full';
         } catch (e: any) {
-          const errorMessage = `full patch error: ${e.message}`;
+          const errorMessage = this.t('error_full_patch_failed', {
+            message: e.message,
+          });
           errorMessages.push(errorMessage);
           lastError = new Error(errorMessage);
           log(errorMessage);
         }
       } else if (__DEV__) {
-        log(
+        log(this.t('dev_incremental_update_disabled'));
-          `当前是开发环境，无法执行增量式热更新，重启不会生效。
-          如果需要在开发环境中测试可生效的全量热更新（但也会在再次重启后重新连接 metro），
-          请打开“忽略时间戳”开关再重试。`,
-        );
         succeeded = 'full';
       }
     }

src/context.ts

@@ -18,6 +18,7 @@ export const defaultContext = {
   parseTestQrCode: () => false,
   currentHash: '',
   packageVersion: '',
+  currentVersionInfo: {},
 };
 
 export const UpdateContext = createContext<{
@@ -28,11 +29,17 @@ export const UpdateContext = createContext<{
   dismissError: () => void;
   downloadUpdate: () => Promise<boolean | void>;
   downloadAndInstallApk: (url: string) => Promise<void>;
+  // @deprecated use currentVersionInfo instead
   getCurrentVersionInfo: () => Promise<{
     name?: string;
     description?: string;
     metaInfo?: string;
   }>;
+  currentVersionInfo: {
+    name?: string;
+    description?: string;
+    metaInfo?: string;
+  } | null;
   parseTestQrCode: (code: string) => boolean;
   restartApp: () => Promise<void>;
   currentHash: string;

src/core.ts

@@ -30,6 +30,21 @@ const PushyConstants = isTurboModuleEnabled
 export const downloadRootDir: string = PushyConstants.downloadRootDir;
 export const packageVersion: string = PushyConstants.packageVersion;
 export const currentVersion: string = PushyConstants.currentVersion;
+
+const currentVersionInfoString: string = PushyConstants.currentVersionInfo;
+let _currentVersionInfo = {};
+if (currentVersionInfoString) {
+  try {
+    _currentVersionInfo = JSON.parse(currentVersionInfoString);
+  } catch (error) {
+    console.error(
+      'Failed to parse currentVersionInfo:',
+      currentVersionInfoString,
+    );
+  }
+}
+export const currentVersionInfo = _currentVersionInfo;
+
 export const isFirstTime: boolean = PushyConstants.isFirstTime;
 export const rolledBackVersion: string = PushyConstants.rolledBackVersion;
 export const isRolledBack: boolean = typeof rolledBackVersion === 'string';
@@ -45,6 +60,7 @@ async function getLocalHashInfo(hash: string) {
   return JSON.parse(await PushyModule.getLocalHashInfo(hash));
 }
 
+// @deprecated use currentVersionInfo instead
 export async function getCurrentVersionInfo(): Promise<{
   name?: string;
   description?: string;

src/i18n.ts

@@ -0,0 +1,108 @@
+import zhTranslations from './locales/zh';
+import enTranslations from './locales/en';
+
+type TranslationKey = keyof typeof zhTranslations | keyof typeof enTranslations;
+type TranslationValues = Record<string, string | number>;
+
+class I18n {
+  private currentLocale: 'zh' | 'en' = 'en';
+  private translations = {
+    zh: zhTranslations,
+    en: enTranslations,
+  };
+
+  /**
+   * Set locale directly
+   * @param locale - 'zh' or 'en'
+   */
+  setLocale(locale: 'zh' | 'en') {
+    this.currentLocale = locale;
+  }
+
+  /**
+   * Get current locale
+   */
+  getLocale(): 'zh' | 'en' {
+    return this.currentLocale;
+  }
+
+  /**
+   * Translate a key with optional interpolation
+   * @param key - Translation key
+   * @param values - Values for interpolation (optional)
+   * @returns Translated string with interpolated values
+   */
+  t(key: TranslationKey, values?: TranslationValues): string {
+    const translation =
+      this.translations[this.currentLocale][
+        key as keyof (typeof this.translations)[typeof this.currentLocale]
+      ];
+
+    if (!translation) {
+      // Fallback to the other locale if key not found
+      const fallbackLocale = this.currentLocale === 'zh' ? 'en' : 'zh';
+      const fallbackTranslation =
+        this.translations[fallbackLocale][
+          key as keyof (typeof this.translations)[typeof fallbackLocale]
+        ];
+
+      if (!fallbackTranslation) {
+        // If still not found, return the key itself
+        return String(key);
+      }
+
+      return this.interpolate(fallbackTranslation, values);
+    }
+
+    return this.interpolate(translation, values);
+  }
+
+  /**
+   * Interpolate values into a string template
+   * Supports {{key}} syntax
+   * @param template - String template with {{key}} placeholders
+   * @param values - Values to interpolate
+   * @returns Interpolated string
+   */
+  private interpolate(template: string, values?: TranslationValues): string {
+    if (!values) {
+      return template;
+    }
+
+    return template.replace(/\{\{(\w+)\}\}/g, (match, key) => {
+      const value = values[key];
+      return value !== undefined ? String(value) : match;
+    });
+  }
+
+  /**
+   * Add or update translations for a specific locale
+   * @param locale - Target locale
+   * @param translations - Translation object to merge
+   */
+  addTranslations(locale: 'zh' | 'en', translations: Record<string, string>) {
+    this.translations[locale] = {
+      ...this.translations[locale],
+      ...translations,
+    };
+  }
+}
+
+// Create singleton instance
+const i18n = new I18n();
+
+// Export both the instance and the class for flexibility
+export { i18n, I18n };
+export default i18n;
+
+/**
+ * Usage examples:
+ *
+ * // Direct locale setting (new preferred method)
+ * i18n.setLocale('zh'); // Chinese
+ * i18n.setLocale('en'); // English
+ *
+ * // Get translations
+ * i18n.t('checking_update'); // Based on current locale
+ * i18n.t('download_progress', { progress: 50 }); // With interpolation
+ */

src/locales/en.ts

@@ -0,0 +1,74 @@
+export default {
+  // Common messages
+  checking_update: 'Checking for updates...',
+  downloading_update: 'Downloading update package...',
+  installing_update: 'Installing update...',
+  update_available: 'Update available',
+  update_downloaded: 'Update downloaded successfully',
+  update_installed: 'Update installed successfully',
+  no_update_available: 'You are up to date',
+  update_failed: 'Update failed',
+  network_error: 'Network connection error',
+  download_failed: 'Download failed',
+  install_failed: 'Installation failed',
+
+  // Progress messages with interpolation
+  download_progress: 'Download progress: {{progress}}%',
+  download_speed: 'Download speed: {{speed}}/s',
+  file_size: 'File size: {{size}}',
+  time_remaining: 'Time remaining: {{time}}',
+
+  // Error messages
+  error_code: 'Error code: {{code}}',
+  error_message: 'Error message: {{message}}',
+  retry_count: 'Retry attempt: {{count}}/{{max}}',
+
+  // Update info
+  version_info: 'Version {{version}} ({{build}})',
+  release_notes: 'Release notes: {{notes}}',
+  update_size: 'Update size: {{size}}MB',
+
+  // Alert messages
+  alert_title: 'Notice',
+  alert_update_ready: 'Download completed. Update now?',
+  alert_next_time: 'Later',
+  alert_update_now: 'Update Now',
+  alert_app_updated:
+    'Your app version has been updated. Click update to download and install the new version',
+  alert_update_button: 'Update',
+  alert_cancel: 'Cancel',
+  alert_confirm: 'OK',
+  alert_info: 'Info',
+  alert_no_update_wait:
+    'No update found, please wait 10s for the server to generate the patch package',
+
+  // Error messages
+  error_appkey_required: 'appKey is required',
+  error_update_check_failed: 'Update check failed',
+  error_cannot_connect_server:
+    'Can not connect to update server. Please check your network.',
+  error_cannot_connect_backup:
+    'Can not connect to update server: {{message}}. Trying backup endpoints.',
+  error_diff_failed: 'diff error: {{message}}',
+  error_pdiff_failed: 'pdiff error: {{message}}',
+  error_full_patch_failed: 'full patch error: {{message}}',
+  error_all_promises_rejected: 'All promises were rejected',
+  error_ping_failed: 'Ping failed',
+  error_ping_timeout: 'Ping timeout',
+  error_http_status: '{{status}} {{statusText}}',
+
+  // Development messages
+  dev_debug_disabled:
+    'You are currently in the development environment and have not enabled debug mode. {{matter}} will not be performed. If you need to debug {{matter}} in the development environment, please set debug to true in the client.',
+  dev_log_prefix: 'react-native-update: ',
+  dev_web_not_supported:
+    'react-native-update does not support the Web platform and will not perform any operations',
+
+  // More alert messages
+  alert_new_version_found:
+    'New version {{name}} found. Download now?\n{{description}}',
+
+  // Development environment messages
+  dev_incremental_update_disabled:
+    'Currently in development environment, incremental hot update cannot be executed and restart will not take effect. If you need to test effective full hot update in development environment (but will reconnect to metro after restart), please enable "ignore timestamp" switch and retry.',
+};

src/locales/zh.ts

@@ -0,0 +1,71 @@
+export default {
+  // Common messages
+  checking_update: '正在检查更新...',
+  downloading_update: '正在下载更新包...',
+  installing_update: '正在安装更新...',
+  update_available: '发现新版本',
+  update_downloaded: '更新包下载完成',
+  update_installed: '更新安装完成',
+  no_update_available: '已是最新版本',
+  update_failed: '更新失败',
+  network_error: '网络连接错误',
+  download_failed: '下载失败',
+  install_failed: '安装失败',
+
+  // Progress messages with interpolation
+  download_progress: '下载进度: {{progress}}%',
+  download_speed: '下载速度: {{speed}}/s',
+  file_size: '文件大小: {{size}}',
+  time_remaining: '剩余时间: {{time}}',
+
+  // Error messages
+  error_code: '错误代码: {{code}}',
+  error_message: '错误信息: {{message}}',
+  retry_count: '重试次数: {{count}}/{{max}}',
+
+  // Update info
+  version_info: '版本 {{version}} ({{build}})',
+  release_notes: '更新说明: {{notes}}',
+  update_size: '更新包大小: {{size}}MB',
+
+  // Alert messages
+  alert_title: '提示',
+  alert_update_ready: '下载完毕，是否立即更新?',
+  alert_next_time: '下次再说',
+  alert_update_now: '立即更新',
+  alert_app_updated: '您的应用版本已更新，点击更新下载安装新版本',
+  alert_update_button: '更新',
+  alert_cancel: '取消',
+  alert_confirm: '确定',
+  alert_info: '信息',
+  alert_no_update_wait: '未发现更新，请等待10秒让服务器生成补丁包',
+
+  // Error messages
+  error_appkey_required: '需要提供 appKey',
+  error_update_check_failed: '更新检查失败',
+  error_cannot_connect_server: '无法连接到更新服务器。请检查网络连接。',
+  error_cannot_connect_backup:
+    '无法连接到更新服务器: {{message}}。正在尝试备用端点。',
+  error_diff_failed: 'diff 错误: {{message}}',
+  error_pdiff_failed: 'pdiff 错误: {{message}}',
+  error_full_patch_failed: '完整补丁错误: {{message}}',
+  error_all_promises_rejected: '所有请求都被拒绝',
+  error_ping_failed: 'Ping 失败',
+  error_ping_timeout: 'Ping 超时',
+  error_http_status: '{{status}} {{statusText}}',
+
+  // Development messages
+  dev_debug_disabled:
+    '您当前处于开发环境且未启用调试模式。{{matter}} 将不会执行。如需在开发环境中调试 {{matter}}，请在客户端中将 debug 设为 true。',
+  dev_log_prefix: 'react-native-update: ',
+  dev_web_not_supported:
+    'react-native-update 不支持 Web 平台，不会执行任何操作',
+
+  // More alert messages
+  alert_new_version_found:
+    '检查到新的版本{{name}}，是否下载？\n{{description}}',
+
+  // Development environment messages
+  dev_incremental_update_disabled:
+    '当前是开发环境，无法执行增量式热更新，重启不会生效。如果需要在开发环境中测试可生效的全量热更新（但也会在再次重启后重新连接 metro），请打开"忽略时间戳"开关再重试。',
+};

src/provider.tsx

@@ -13,12 +13,17 @@ import {
   Linking,
 } from 'react-native';
 import { Pushy, Cresc, sharedState } from './client';
-import { currentVersion, packageVersion, getCurrentVersionInfo } from './core';
+import { currentVersion, packageVersion, getCurrentVersionInfo, currentVersionInfo } from './core';
-import { CheckResult, ProgressData, UpdateTestPayload } from './type';
+import {
+  CheckResult,
+  MixedCheckResult,
+  ProgressData,
+  UpdateTestPayload,
+} from './type';
 import { UpdateContext } from './context';
 import { URL } from 'react-native-url-polyfill';
 import { isInRollout } from './isInRollout';
-import { log } from './utils';
+import { assertWeb, log } from './utils';
 
 export const UpdateProvider = ({
   client,
@@ -30,7 +35,7 @@ export const UpdateProvider = ({
   client = useRef(client).current;
   const { options } = client;
 
-  const stateListener = useRef<NativeEventSubscription>();
+  const stateListener = useRef<NativeEventSubscription>(undefined);
   const [updateInfo, setUpdateInfo] = useState<CheckResult>();
   const updateInfoRef = useRef(updateInfo);
   const [progress, setProgress] = useState<ProgressData>();
@@ -115,16 +120,16 @@ export const UpdateProvider = ({
           client.switchVersionLater(hash);
           return true;
         }
-        alertUpdate('提示', '下载完毕，是否立即更新?', [
+        alertUpdate(client.t('alert_title'), client.t('alert_update_ready'), [
           {
-            text: '下次再说',
+            text: client.t('alert_next_time'),
             style: 'cancel',
             onPress: () => {
               client.switchVersionLater(hash);
             },
           },
           {
-            text: '立即更新',
+            text: client.t('alert_update_now'),
             style: 'default',
             onPress: () => {
               client.switchVersion(hash);
@@ -134,7 +139,7 @@ export const UpdateProvider = ({
         return true;
       } catch (e: any) {
         setLastError(e);
-        alertError('更新失败', e.message);
+        alertError(client.t('update_failed'), e.message);
         throwErrorIfEnabled(e);
         return false;
       }
@@ -158,84 +163,102 @@ export const UpdateProvider = ({
         return;
       }
       lastChecking.current = now;
-      let info: CheckResult;
+      let rootInfo: MixedCheckResult | undefined;
       try {
-        info = await client.checkUpdate(extra);
+        rootInfo = await client.checkUpdate(extra);
       } catch (e: any) {
         setLastError(e);
-        alertError('更新检查失败', e.message);
+        alertError(client.t('error_update_check_failed'), e.message);
         throwErrorIfEnabled(e);
         return;
       }
-      if (!info) {
+      if (!rootInfo) {
         return;
       }
-      const rollout = info.config?.rollout?.[packageVersion];
+      const versions = rootInfo.versions || [rootInfo as CheckResult];
-      if (info.update && rollout) {
+      delete rootInfo.versions;
-        if (!isInRollout(rollout)) {
+      for (const versionInfo of versions) {
-          log(`not in ${rollout}% rollout, ignored`);
+        const info: CheckResult = {
-          return;
+          ...versionInfo,
+          ...rootInfo,
+        };
+        const rollout = info.config?.rollout?.[packageVersion];
+        if (info.update && rollout) {
+          if (!isInRollout(rollout)) {
+            log(`${info.name} not in ${rollout}% rollout, ignored`);
+            continue;
+          }
+          log(`${info.name} in ${rollout}% rollout, continue`);
         }
-        log(`in ${rollout}% rollout, continue`);
+        info.description = info.description ?? '';
-      }
+        updateInfoRef.current = info;
-      info.description = info.description ?? '';
+        setUpdateInfo(info);
-      updateInfoRef.current = info;
+        if (info.expired) {
-      setUpdateInfo(info);
+          if (
-      if (info.expired) {
+            options.onPackageExpired &&
-        if (
+            (await options.onPackageExpired(info)) === false
-          options.onPackageExpired &&
+          ) {
-          (await options.onPackageExpired(info)) === false
+            log('onPackageExpired returned false, skipping');
-        ) {
+            return;
-          log('onPackageExpired returned false, skipping');
+          }
-          return;
+          const { downloadUrl } = info;
-        }
+          if (downloadUrl && sharedState.apkStatus === null) {
-        const { downloadUrl } = info;
+            if (options.updateStrategy === 'silentAndNow') {
-        if (downloadUrl && sharedState.apkStatus === null) {
+              if (Platform.OS === 'android' && downloadUrl.endsWith('.apk')) {
-          if (options.updateStrategy === 'silentAndNow') {
+                downloadAndInstallApk(downloadUrl);
-            if (Platform.OS === 'android' && downloadUrl.endsWith('.apk')) {
+              } else {
-              downloadAndInstallApk(downloadUrl);
+                Linking.openURL(downloadUrl);
-            } else {
+              }
-              Linking.openURL(downloadUrl);
+              return info;
             }
+            alertUpdate(
+              client.t('alert_title'),
+              client.t('alert_app_updated'),
+              [
+                {
+                  text: client.t('alert_update_button'),
+                  onPress: () => {
+                    if (
+                      Platform.OS === 'android' &&
+                      downloadUrl.endsWith('.apk')
+                    ) {
+                      downloadAndInstallApk(downloadUrl);
+                    } else {
+                      Linking.openURL(downloadUrl);
+                    }
+                  },
+                },
+              ],
+            );
+          }
+        } else if (info.update) {
+          if (
+            options.updateStrategy === 'silentAndNow' ||
+            options.updateStrategy === 'silentAndLater'
+          ) {
+            downloadUpdate(info);
             return info;
           }
-          alertUpdate('提示', '您的应用版本已更新，点击更新下载安装新版本', [
+          alertUpdate(
-            {
+            client.t('alert_title'),
-              text: '更新',
+            client.t('alert_new_version_found', {
-              onPress: () => {
+              name: info.name,
-                if (Platform.OS === 'android' && downloadUrl.endsWith('.apk')) {
+              description: info.description,
-                  downloadAndInstallApk(downloadUrl);
+            }),
-                } else {
+            [
-                  Linking.openURL(downloadUrl);
+              { text: client.t('alert_cancel'), style: 'cancel' },
-                }
+              {
+                text: client.t('alert_confirm'),
+                style: 'default',
+                onPress: () => {
+                  downloadUpdate();
+                },
               },
-            },
+            ],
-          ]);
+          );
         }
-      } else if (info.update) {
+        return info;
-        if (
-          options.updateStrategy === 'silentAndNow' ||
-          options.updateStrategy === 'silentAndLater'
-        ) {
-          downloadUpdate(info);
-          return info;
-        }
-        alertUpdate(
-          '提示',
-          '检查到新的版本' + info.name + ',是否下载?\n' + info.description,
-          [
-            { text: '取消', style: 'cancel' },
-            {
-              text: '确定',
-              style: 'default',
-              onPress: () => {
-                downloadUpdate();
-              },
-            },
-          ],
-        );
       }
-      return info;
     },
     [
       client,
@@ -254,6 +277,9 @@ export const UpdateProvider = ({
     if (!client.assertDebug('checkUpdate()')) {
       return;
     }
+    if (!assertWeb()) {
+      return;
+    }
     const { checkStrategy, dismissErrorAfter, autoMarkSuccess } = options;
     if (autoMarkSuccess) {
       setTimeout(() => {
@@ -297,8 +323,8 @@ export const UpdateProvider = ({
           checkUpdate({ extra: { toHash: payload.data } }).then(() => {
             if (updateInfoRef.current && updateInfoRef.current.upToDate) {
               Alert.alert(
-                'Info',
+                client.t('alert_info'),
-                'No update found, please wait 10s for the server to generate the patch package',
+                client.t('alert_no_update_wait'),
               );
             }
             options.logger = logger;
@@ -308,7 +334,7 @@ export const UpdateProvider = ({
       }
       return false;
     },
-    [checkUpdate, options],
+    [checkUpdate, options, client],
   );
 
   const parseTestQrCode = useCallback(
@@ -328,6 +354,9 @@ export const UpdateProvider = ({
   }, [client]);
 
   useEffect(() => {
+    if (!assertWeb()) {
+      return;
+    }
     const parseLinking = (url: string | null) => {
       if (!url) {
         return;
@@ -371,6 +400,7 @@ export const UpdateProvider = ({
         progress,
         downloadAndInstallApk,
         getCurrentVersionInfo,
+        currentVersionInfo,
         parseTestQrCode,
         restartApp,
       }}>

src/type.ts

@@ -1,14 +1,10 @@
-export interface CheckResult {
+export interface VersionInfo {
-  upToDate?: true;
+  name: string;
-  expired?: true;
+  hash: string;
-  downloadUrl?: string;
+  description: string;
-  update?: true;
+  metaInfo: string;
-  name?: string; // version name
+  config: {
-  hash?: string;
+    rollout: {
-  description?: string;
-  metaInfo?: string;
-  config?: {
-    rollout?: {
       [packageVersion: string]: number;
     };
     [key: string]: any;
@@ -16,11 +12,27 @@ export interface CheckResult {
   pdiff?: string;
   diff?: string;
   full?: string;
-  paths?: string[];
+}
+
+interface RootResult {
+  upToDate?: true;
+  expired?: true;
+  downloadUrl?: string;
+  update?: true;
   paused?: 'app' | 'package';
   message?: string;
+  paths?: string[];
 }
 
+export type CheckResult = RootResult & VersionInfo;
+
+export type CheckResultV2 = RootResult & {
+  versions?: VersionInfo[];
+};
+
+export type MixedCheckResult = CheckResult | CheckResultV2;
+
+
 export interface ProgressData {
   hash: string;
   received: number;
@@ -93,6 +105,7 @@ export interface ClientOptions {
   beforeDownloadUpdate?: (info: CheckResult) => Promise<boolean>;
   afterDownloadUpdate?: (info: CheckResult) => Promise<boolean>;
   onPackageExpired?: (info: CheckResult) => Promise<boolean>;
+  overridePackageVersion?: string;
 }
 
 export interface UpdateTestPayload {

src/utils.ts

@@ -1,9 +1,12 @@
 import { Platform } from 'react-native';
+import i18n from './i18n';
 
 export function log(...args: any[]) {
-  console.log('react-native-update: ', ...args);
+  console.log(i18n.t('dev_log_prefix'), ...args);
 }
 
+export const isWeb = Platform.OS === 'web';
+
 export function promiseAny<T>(promises: Promise<T>[]) {
   return new Promise<T>((resolve, reject) => {
     let count = 0;
@@ -14,7 +17,7 @@ export function promiseAny<T>(promises: Promise<T>[]) {
         .catch(() => {
           count++;
           if (count === promises.length) {
-            reject(new Error('All promises were rejected'));
+            reject(new Error(i18n.t('error_all_promises_rejected')));
           }
         });
     });
@@ -34,38 +37,37 @@ class EmptyModule {
 }
 export const emptyModule = new EmptyModule();
 
-const ping =
+const ping = isWeb
-  Platform.OS === 'web'
+  ? Promise.resolve
-    ? Promise.resolve
+  : async (url: string) => {
-    : async (url: string) => {
+      let pingFinished = false;
-        let pingFinished = false;
+      return Promise.race([
-        return Promise.race([
+        enhancedFetch(url, {
-          enhancedFetch(url, {
+          method: 'HEAD',
-            method: 'HEAD',
+        })
+          .then(({ status, statusText, url: finalUrl }) => {
+            pingFinished = true;
+            if (status === 200) {
+              return finalUrl;
+            }
+            log('ping failed', url, status, statusText);
+            throw new Error(i18n.t('error_ping_failed'));
           })
-            .then(({ status, statusText, url: finalUrl }) => {
+          .catch(e => {
-              pingFinished = true;
+            pingFinished = true;
-              if (status === 200) {
+            log('ping error', url, e);
-                return finalUrl;
+            throw e;
-              }
+          }),
-              log('ping failed', url, status, statusText);
+        new Promise((_, reject) =>
-              throw new Error('Ping failed');
+          setTimeout(() => {
-            })
+            reject(new Error(i18n.t('error_ping_timeout')));
-            .catch(e => {
+            if (!pingFinished) {
-              pingFinished = true;
+              log('ping timeout', url);
-              log('ping error', url, e);
+            }
-              throw e;
+          }, 5000),
-            }),
+        ),
-          new Promise((_, reject) =>
+      ]);
-            setTimeout(() => {
+    };
-              reject(new Error('Ping timeout'));
-              if (!pingFinished) {
-                log('ping timeout', url);
-              }
-            }, 5000),
-          ),
-        ]);
-      };
 
 export function joinUrls(paths: string[], fileName?: string) {
   if (fileName) {
@@ -90,10 +92,8 @@ export const testUrls = async (urls?: string[]) => {
 };
 
 export const assertWeb = () => {
-  if (Platform.OS === 'web') {
+  if (isWeb) {
-    console.warn(
+    console.warn(i18n.t('dev_web_not_supported'));
-      'react-native-update does not support the Web platform and will not perform any operations',
-    );
     return false;
   }
   return true;
@@ -108,10 +108,26 @@ export const assertWeb = () => {
 export const enhancedFetch = async (
   url: string,
   params: Parameters<typeof fetch>[1],
-) => {
+  isRetry = false,
-  return fetch(url, params).catch(e => {
+): Promise<Response> => {
-    log('fetch error', url, e);
+  return fetch(url, params)
-    log('trying fallback to http');
+    .then(r => {
-    return fetch(url.replace('https', 'http'), params);
+      if (r.ok) {
-  });
+        return r;
+      }
+      throw new Error(
+        i18n.t('error_http_status', {
+          status: r.status,
+          statusText: r.statusText,
+        }),
+      );
+    })
+    .catch(e => {
+      log('fetch error', url, e);
+      if (isRetry) {
+        throw e;
+      }
+      log('trying fallback to http');
+      return enhancedFetch(url.replace('https', 'http'), params, true);
+    });
 };

tsconfig.json

@@ -1,4 +1,5 @@
 {
-  "extends": "@react-native/typescript-config/tsconfig.json",
+  "extends": "@react-native/typescript-config",
-  "include": ["src/**/*"]
+  "include": ["**/*.ts", "**/*.tsx"],
+  "exclude": ["**/node_modules", "**/Pods", "**/harmony", "**/Example"]
 }