fix harmony build

Increment version in package.json to 10.34.7 and update podspec to simplify public header files for Expo dependency.
bump
2025-11-22 23:46:10 +08:00 · 2025-10-23 11:30:13 +08:00 · 2025-10-22 16:03:54 +08:00 · 2025-10-22 14:53:59 +08:00 · 2025-10-22 14:19:40 +08:00 · 2025-10-21 22:23:49 +08:00
41 changed files with 1263 additions and 959 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,9 @@ Example/testHotUpdate/harmony
 Example/testHotUpdate/android/app/.cxx
 Example/harmony_use_pushy/libs
 **/mcp.json
+
+
+harmony/package
+**/oh_modules
+harmony/pushy/.preview
+Example/harmony_use_pushy/harmony/entry/src/main/resources/rawfile/meta.json
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,3 @@
 [submodule "android/jni/HDiffPatch"]
 	path = android/jni/HDiffPatch
 	url = https://github.com/sisong/HDiffPatch.git
-[submodule "harmony/src/main/cpp/HDiffPatch"]
-	path = harmony/src/main/cpp/HDiffPatch
-	url = https://github.com/sisong/HDiffPatch.git
-[submodule "harmony/src/main/cpp/lzma"]
-	path = harmony/src/main/cpp/lzma
-	url = https://github.com/sisong/lzma.git
--- a/Example/expoUsePushy/app.json
+++ b/Example/expoUsePushy/app.json
@@ -20,7 +20,8 @@
      "adaptiveIcon": {
        "foregroundImage": "./assets/adaptive-icon.png",
        "backgroundColor": "#ffffff"
-      }
+      },
+      "package": "com.anonymous.expoUsePushy"
    },
    "web": {
      "favicon": "./assets/favicon.png"
--- a/Example/expoUsePushy/bun.lock
+++ b/Example/expoUsePushy/bun.lock
--- a/Example/expoUsePushy/index.js
+++ b/Example/expoUsePushy/index.js
@@ -1,8 +1 @@
-import { registerRootComponent } from 'expo';
-
-import App from './App';
-
-// registerRootComponent calls AppRegistry.registerComponent('main', () => App);
-// It also ensures that whether you load the app in Expo Go or in a native build,
-// the environment is set up appropriately
-registerRootComponent(App);
+import 'expo-router/entry';
--- a/Example/expoUsePushy/package.json
+++ b/Example/expoUsePushy/package.json
@@ -1,27 +1,50 @@
 {
  "name": "expousepushy",
-  "version": "1.0.0",
  "main": "index.js",
+  "version": "1.0.0",
  "scripts": {
    "start": "expo start",
+    "reset-project": "node ./scripts/reset-project.js",
    "android": "expo run:android",
    "ios": "expo run:ios",
-    "web": "expo start --web"
+    "web": "expo start --web",
+    "lint": "expo lint"
  },
  "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.30.3",
-    "react-native-web": "~0.19.13"
+    "@expo/vector-icons": "^14.1.0",
+    "@react-navigation/bottom-tabs": "^7.3.10",
+    "@react-navigation/elements": "^2.3.8",
+    "@react-navigation/native": "^7.1.6",
+    "expo": "~53.0.22",
+    "expo-blur": "~14.1.5",
+    "expo-constants": "~17.1.7",
+    "expo-font": "~13.3.2",
+    "expo-haptics": "~14.1.4",
+    "expo-image": "~2.4.0",
+    "expo-linking": "~7.1.7",
+    "expo-router": "~5.1.5",
+    "expo-splash-screen": "~0.30.10",
+    "expo-status-bar": "~2.2.3",
+    "expo-symbols": "~0.4.5",
+    "expo-system-ui": "~5.0.11",
+    "expo-web-browser": "~14.2.0",
+    "react": "19.0.0",
+    "react-dom": "19.0.0",
+    "react-native": "0.79.6",
+    "react-native-gesture-handler": "~2.24.0",
+    "react-native-reanimated": "~3.17.4",
+    "react-native-safe-area-context": "5.4.0",
+    "react-native-screens": "~4.11.1",
+    "react-native-update": "^10.34.4",
+    "react-native-web": "~0.20.0",
+    "react-native-webview": "13.13.5"
  },
  "devDependencies": {
    "@babel/core": "^7.25.2",
-    "@types/react": "~18.3.12",
-    "typescript": "^5.3.3"
+    "@types/react": "~19.0.10",
+    "typescript": "~5.8.3",
+    "eslint": "^9.25.0",
+    "eslint-config-expo": "~9.2.0"
  },
  "private": true
 }
--- a/Example/harmony_use_pushy/harmony/build-profile.json5
+++ b/Example/harmony_use_pushy/harmony/build-profile.json5
@@ -1,41 +1,43 @@
 {
-  "app": {
-    "signingConfigs": [],
-    "products": [
+  app: {
+    signingConfigs: [],
+    products: [
      {
-        "name": "default",
-        "signingConfig": "default",
-        "compatibleSdkVersion": "5.0.0(12)",
-        "runtimeOS": "HarmonyOS",
-        "buildOption": {
-          "strictMode": {
-            "caseSensitiveCheck": true,
-            "useNormalizedOHMUrl": true
-          }
-        }
-      }
+        name: 'default',
+        signingConfig: 'default',
+        compatibleSdkVersion: '5.0.0(12)',
+        runtimeOS: 'HarmonyOS',
+        buildOption: {
+          strictMode: {
+            caseSensitiveCheck: true,
+            useNormalizedOHMUrl: true,
+          },
+        },
+      },
    ],
-    "buildModeSet": [
+    buildModeSet: [
      {
-        "name": "debug",
+        name: 'debug',
      },
      {
-        "name": "release"
-      }
-    ]
+        name: 'release',
+      },
+    ],
  },
-  "modules": [
+  modules: [
    {
-      "name": "entry",
-      "srcPath": "./entry",
-      "targets": [
+      name: 'entry',
+      srcPath: './entry',
+      targets: [
        {
-          "name": "default",
-          "applyToProducts": [
-            "default"
-          ]
-        }
-      ]
-    }
-  ]
-}
+          name: 'default',
+          applyToProducts: ['default'],
+        },
+      ],
+    },
+    {
+      name: 'pushy',
+      srcPath: '../node_modules/react-native-update/harmony/pushy',
+    },
+  ],
+}
--- a/Example/harmony_use_pushy/harmony/entry/oh-package-lock.json5
+++ b/Example/harmony_use_pushy/harmony/entry/oh-package-lock.json5
@@ -1,25 +1,26 @@
 {
  "meta": {
-    "stableOrder": true
+    "stableOrder": true,
+    "enableUnifiedLockfile": false
  },
  "lockfileVersion": 3,
  "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
  "specifiers": {
    "@rnoh/react-native-openharmony@0.72.38": "@rnoh/react-native-openharmony@0.72.38",
-    "pushy@../../node_modules/react-native-update/harmony": "pushy@../../node_modules/react-native-update/harmony"
+    "pushy@../../node_modules/react-native-update/harmony/pushy": "pushy@../../node_modules/react-native-update/harmony/pushy"
  },
  "packages": {
    "@rnoh/react-native-openharmony@0.72.38": {
-      "name": "@rnoh/react-native-openharmony",
+      "name": "",
      "version": "0.72.38",
      "integrity": "sha512-br5SIrbB0OarSLirenleE7eTOX1lNccMJ7nb/G7qWTyJ7kW4DalmTXVKYpoT2qaOLls1uEE7McD1OjbZZM9jug==",
      "resolved": "https://ohpm.openharmony.cn/ohpm/@rnoh/react-native-openharmony/-/react-native-openharmony-0.72.38.har",
      "registryType": "ohpm"
    },
-    "pushy@../../node_modules/react-native-update/harmony": {
+    "pushy@../../node_modules/react-native-update/harmony/pushy": {
      "name": "pushy",
      "version": "3.1.0-0.0.7",
-      "resolved": "../../node_modules/react-native-update/harmony",
+      "resolved": "",
      "registryType": "local",
      "dependencies": {
        "@rnoh/react-native-openharmony": "^0.72.38"
--- a/Example/harmony_use_pushy/harmony/entry/oh-package.json5
+++ b/Example/harmony_use_pushy/harmony/entry/oh-package.json5
@@ -1,13 +1,12 @@
 {
-  "name": "entry",
-  "version": "1.0.0",
-  "description": "Please describe the basic information.",
-  "main": "",
-  "author": "",
-  "license": "",
-  "dependencies": {
-    "@rnoh/react-native-openharmony": "0.72.38",
-    "pushy": "file:../../node_modules/react-native-update/harmony/pushy.har",
-  }
+  name: 'entry',
+  version: '1.0.0',
+  description: 'Please describe the basic information.',
+  main: '',
+  author: '',
+  license: '',
+  dependencies: {
+    '@rnoh/react-native-openharmony': '0.72.38',
+    pushy: 'file:../../node_modules/react-native-update/harmony/pushy',
+  },
 }
-
--- a/Example/harmony_use_pushy/harmony/entry/src/main/resources/rawfile/meta.json
+++ b/Example/harmony_use_pushy/harmony/entry/src/main/resources/rawfile/meta.json
@@ -1,4 +0,0 @@
-{
-    "pushy_build_time": "2025-04-30T02:46:33.340Z",
-    "versionName": "1.0.0"
-}
--- a/Example/harmony_use_pushy/harmony/hvigorfile.ts
+++ b/Example/harmony_use_pushy/harmony/hvigorfile.ts
@@ -1,6 +1,6 @@
-import { appTasks } from '@ohos/hvigor-ohos-plugin';
+import {appTasks} from '@ohos/hvigor-ohos-plugin';

 export default {
-    system: appTasks,  /* Built-in plugin of Hvigor. It cannot be modified. */
-    plugins:[]         /* Custom plugin to extend the functionality of Hvigor. */
-}
+  system: appTasks /* Built-in plugin of Hvigor. It cannot be modified. */,
+  plugins: [] /* Custom plugin to extend the functionality of Hvigor. */,
+};
--- a/Example/harmony_use_pushy/harmony/oh-package-lock.json5
+++ b/Example/harmony_use_pushy/harmony/oh-package-lock.json5
@@ -1,23 +1,16 @@
 {
  "meta": {
-    "stableOrder": true
+    "stableOrder": true,
+    "enableUnifiedLockfile": false
  },
  "lockfileVersion": 3,
  "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
  "specifiers": {
-    "@ohos/hamock@1.0.0": "@ohos/hamock@1.0.0",
    "@ohos/hypium@1.0.19": "@ohos/hypium@1.0.19"
  },
  "packages": {
-    "@ohos/hamock@1.0.0": {
-      "name": "@ohos/hamock",
-      "version": "1.0.0",
-      "integrity": "sha512-K6lDPYc6VkKe6ZBNQa9aoG+ZZMiwqfcR/7yAVFSUGIuOAhPvCJAo9+t1fZnpe0dBRBPxj2bxPPbKh69VuyAtDg==",
-      "resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hamock/-/hamock-1.0.0.har",
-      "registryType": "ohpm"
-    },
    "@ohos/hypium@1.0.19": {
-      "name": "@ohos/hypium",
+      "name": "",
      "version": "1.0.19",
      "integrity": "sha512-cEjDgLFCm3cWZDeRXk7agBUkPqjWxUo6AQeiu0gEkb3J8ESqlduQLSIXeo3cCsm8U/asL7iKjF85ZyOuufAGSQ==",
      "resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hypium/-/hypium-1.0.19.har",
--- a/Example/harmony_use_pushy/harmony/oh-package.json5
+++ b/Example/harmony_use_pushy/harmony/oh-package.json5
@@ -1,20 +1,18 @@
 {
-  "modelVersion": "5.0.0",
-  "description": "Please describe the basic information.",
-  "dependencies": {
+  modelVersion: '5.0.0',
+  description: 'Please describe the basic information.',
+  dependencies: {},
+  devDependencies: {
+    '@ohos/hypium': '1.0.19'
  },
-  "devDependencies": {
-    "@ohos/hypium": "1.0.19",
-    "@ohos/hamock": "1.0.0"
+  arkTs: {
+    compilerOptions: {
+      noImplicitAny: false,
+      suppressImplicitAnyIndexErrors: true,
+      strict: false,
+    },
  },
-  "arkTs": {
-    "compilerOptions": {
-      "noImplicitAny": false,
-      "suppressImplicitAnyIndexErrors": true,
-      "strict": false
-    }
+  overrides: {
+    '@rnoh/react-native-openharmony': '0.72.38',
  },
-  "overrides": {
-    "@rnoh/react-native-openharmony": "0.72.38"
-  }
 }
--- a/Example/testHotUpdate/bun.lock
+++ b/Example/testHotUpdate/bun.lock
@@ -12,7 +12,7 @@
        "react-native-paper": "^5.14.5",
        "react-native-safe-area-context": "^5.6.1",
        "react-native-svg": "^15.13.0",
-        "react-native-update": "^10.31.0-beta.4",
+        "react-native-update": "^10.34.4",
        "react-native-vector-icons": "^10.3.0",
      },
      "devDependencies": {
@@ -1430,7 +1430,7 @@

    "react-native-svg": ["react-native-svg@15.13.0", "", { "dependencies": { "css-select": "^5.1.0", "css-tree": "^1.1.3", "warn-once": "0.1.1" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-/YPK+PAAXg4T0x2d2vYPvqqAhOYid2bRKxUVT7STIyd1p2JxWmsGQkfZxXCkEFN7TwLfIyVlT5RimT91Pj/qXw=="],

-    "react-native-update": ["react-native-update@10.31.0-beta.4", "", { "dependencies": { "nanoid": "^3.3.3", "react-native-url-polyfill": "^2.0.0" }, "peerDependencies": { "react": ">=16.8.0", "react-native": ">=0.59.0" } }, "sha512-6TdSq9PdxH07IHFcMkhMaPxA81teike++PZtgVWbL1GJiZJ5MXpLhwsxD2Nd4x+eHJY8pj4wgMBC8iCAfqVJlg=="],
+    "react-native-update": ["react-native-update@10.34.4", "", { "dependencies": { "nanoid": "^3.3.3", "react-native-url-polyfill": "^2.0.0" }, "peerDependencies": { "react": ">=16.8.0", "react-native": ">=0.59.0" } }, "sha512-yuXlff7EMUDyp1js2NylOw9jT0sVXoc5rpaRhzoYYcwfQTQq1Qp53qpyupDuUj43MEv5ikfJ6xBd/iRpXuanNg=="],

    "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=="],

--- a/Example/testHotUpdate/ios/AwesomeProject.xcodeproj/project.pbxproj
+++ b/Example/testHotUpdate/ios/AwesomeProject.xcodeproj/project.pbxproj
@@ -403,6 +403,8 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
+					"-DFOLLY_HAVE_CLOCK_GETTIME=1",
 				);
 				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
@@ -475,6 +477,8 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
+					"-DFOLLY_HAVE_CLOCK_GETTIME=1",
 				);
 				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
--- a/Example/testHotUpdate/ios/Podfile.lock
+++ b/Example/testHotUpdate/ios/Podfile.lock
@@ -1835,7 +1835,7 @@ PODS:
    - ReactCommon/turbomodule/core
    - SocketRocket
    - Yoga
-  - react-native-update (10.31.0-beta.4):
+  - react-native-update (10.34.4):
    - boost
    - DoubleConversion
    - fast_float
@@ -1854,7 +1854,7 @@ PODS:
    - React-graphics
    - React-ImageManager
    - React-jsi
-    - react-native-update/RCTPushy (= 10.31.0-beta.4)
+    - react-native-update/RCTPushy (= 10.34.4)
    - React-NativeModulesApple
    - React-RCTFabric
    - React-renderercss
@@ -1866,7 +1866,7 @@ PODS:
    - SocketRocket
    - SSZipArchive
    - Yoga
-  - react-native-update/RCTPushy (10.31.0-beta.4):
+  - react-native-update/RCTPushy (10.34.4):
    - boost
    - DoubleConversion
    - fast_float
@@ -2800,7 +2800,7 @@ SPEC CHECKSUMS:
  React-Mapbuffer: 9d2434a42701d6144ca18f0ca1c4507808ca7696
  React-microtasksnativemodule: 75b6604b667d297292345302cc5bfb6b6aeccc1b
  react-native-safe-area-context: c6e2edd1c1da07bdce287fa9d9e60c5f7b514616
-  react-native-update: 66be7f3c9572c483d6f43405097cdf8fd5c93d84
+  react-native-update: 822780a6d3c8482d47ba50b5801ed295c0dfcaff
  React-NativeModulesApple: 879fbdc5dcff7136abceb7880fe8a2022a1bd7c3
  React-oscompat: 93b5535ea7f7dff46aaee4f78309a70979bdde9d
  React-perflogger: 5536d2df3d18fe0920263466f7b46a56351c0510
--- a/Example/testHotUpdate/package.json
+++ b/Example/testHotUpdate/package.json
@@ -10,8 +10,7 @@
    "test:e2e": "detox test --configuration android.emu.debug",
    "lint": "eslint .",
    "postinstall": "patch-package",
-    "apk": "cd android && ./gradlew assembleRelease",
-    "dev:harmony": "react-native bundle-harmony --dev"
+    "apk": "cd android && ./gradlew assembleRelease"
  },
  "dependencies": {
    "form-data": "^4.0.4",
@@ -22,7 +21,7 @@
    "react-native-paper": "^5.14.5",
    "react-native-safe-area-context": "^5.6.1",
    "react-native-svg": "^15.13.0",
-    "react-native-update": "^10.31.0-beta.4",
+    "react-native-update": "^10.34.4",
    "react-native-vector-icons": "^10.3.0"
  },
  "devDependencies": {
--- a/android/lib/arm64-v8a/librnupdate.so
+++ b/android/lib/arm64-v8a/librnupdate.so
--- a/android/lib/armeabi-v7a/librnupdate.so
+++ b/android/lib/armeabi-v7a/librnupdate.so
--- a/android/lib/x86/librnupdate.so
+++ b/android/lib/x86/librnupdate.so
--- a/android/lib/x86_64/librnupdate.so
+++ b/android/lib/x86_64/librnupdate.so
--- a/android/proguard.pro
+++ b/android/proguard.pro
@@ -10,28 +10,9 @@
 -keepnames class com.facebook.react.devsupport.** { *; }

 # Keep fields used in reflection
-keepclassmembers class com.facebook.react.ReactInstanceManager {
-    private JSBundleLoader mBundleLoader;
-    private String mJSBundleFile;
-}
+-keepclassmembers class com.facebook.react.ReactActivity { *; }
+-keepclassmembers class com.facebook.react.ReactInstanceManager { *; }
+-keepclassmembers class com.facebook.react.ReactDelegate { *; }
+-keepclassmembers class com.facebook.react.ReactHost { *; }

-keepclassmembers class com.facebook.react.ReactDelegate {
-    private ReactHost mReactHost;
-}
-
-keepclassmembers class com.facebook.react.ReactHost {
-    private boolean mUseDevSupport;
-    private ReactHostDelegate mReactHostDelegate;
-}
-
-# Keep Expo related classes
 -keepnames class expo.modules.ExpoReactHostFactory$ExpoReactHostDelegate { *; }
-
-# Keep methods used in reflection
-keepclassmembers class com.facebook.react.ReactActivity {
-    public ReactDelegate getReactDelegate();
-}
-
-keepclassmembers class com.facebook.react.ReactHost {
-    public void reload(java.lang.String);
-}
--- a/android/src/main/java/cn/reactnative/modules/update/DownloadTask.java
+++ b/android/src/main/java/cn/reactnative/modules/update/DownloadTask.java
@@ -25,6 +25,7 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.zip.ZipEntry;
+import java.util.zip.CRC32;
 import java.util.HashMap;

 import okio.BufferedSink;
@@ -100,7 +101,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
            if (UpdateContext.DEBUG) {
                Log.d("react-native-update", "Progress " + received + "/" + contentLength);
            }
-            
+
            int percentage = (int)(received * 100.0 / contentLength + 0.5);
            if (percentage > currentPercentage) {
                currentPercentage = percentage;
@@ -198,6 +199,10 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
        return fout.toByteArray();
    }

+    private String getCRC32AsDecimal(long crc32Value) {
+        return String.valueOf(crc32Value & 0xFFFFFFFFL);
+    }
+
    private void copyFilesWithBlacklist(String current, File from, File to, JSONObject blackList) throws IOException {
        File[] files = from.listFiles();
        for (File file : files) {
@@ -273,12 +278,41 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
        zipFile.close();
    }

+    private void copyFromResourceV2(HashMap<String, ArrayList<File>> resToCopy2) throws IOException {
+        SafeZipFile zipFile = new SafeZipFile(new File(context.getPackageResourcePath()));
+        Enumeration<? extends ZipEntry> entries = zipFile.entries();
+        while (entries.hasMoreElements()) {
+            ZipEntry ze = entries.nextElement();
+            String fn = ze.getName();
+            long zipCrc32 = ze.getCrc();
+            String crc32Decimal = getCRC32AsDecimal(zipCrc32);
+            ArrayList<File> targets = resToCopy2.get(crc32Decimal);
+            if (targets != null) {
+                File lastTarget = null;
+                for (File target: targets) {
+                    if (UpdateContext.DEBUG) {
+                        Log.d("react-native-update", "Copying from resource " + fn + " to " + target);
+                    }
+                    if (lastTarget != null) {
+                        copyFile(lastTarget, target);
+                    } else {
+                        zipFile.unzipToFile(ze, target);
+                        lastTarget = target;
+                    }
+                }
+            }
+        }
+        zipFile.close();
+    }
+
    private void doPatchFromApk(DownloadTaskParams param) throws IOException, JSONException {
        downloadFile(param);

        removeDirectory(param.unzipDirectory);
        param.unzipDirectory.mkdirs();
        HashMap<String, ArrayList<File>> copyList = new HashMap<String, ArrayList<File>>();
+        HashMap<String, ArrayList<File>> copiesv2List = new HashMap<String, ArrayList<File>>();
+        Boolean isV2 = false;

        boolean foundDiff = false;
        boolean foundBundlePatch = false;
@@ -297,29 +331,58 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
                JSONObject obj = (JSONObject)new JSONTokener(json).nextValue();

                JSONObject copies = obj.getJSONObject("copies");
+                JSONObject copiesv2 = obj.getJSONObject("copiesv2");
                Iterator<?> keys = copies.keys();
-                while( keys.hasNext() ) {
-                    String to = (String)keys.next();
-                    String from = copies.getString(to);
-                    if (from.isEmpty()) {
-                        from = to;
-                    }
-                    ArrayList<File> target = null;
-                    if (!copyList.containsKey(from)) {
-                        target = new ArrayList<File>();
-                        copyList.put(from, target);
-                    } else {
-                        target = copyList.get((from));
-                    }
-                    File toFile = new File(param.unzipDirectory, to);
+                Iterator<?> keysV2 = copiesv2.keys();
+                if(keysV2.hasNext()){
+                    isV2 = true;
+                    while( keysV2.hasNext() ) {
+                        String from = (String)keysV2.next();
+                        String to = copiesv2.getString(from);
+                        if (from.isEmpty()) {
+                            from = to;
+                        }
+                        ArrayList<File> target = null;
+                        if (!copiesv2List.containsKey(from)) {
+                            target = new ArrayList<File>();
+                            copiesv2List.put(from, target);
+                        } else {
+                            target = copiesv2List.get((from));
+                        }
+                        File toFile = new File(param.unzipDirectory, to);

-                    // Fixing a Zip Path Traversal Vulnerability
-                    // https://support.google.com/faqs/answer/9294009
-                    String canonicalPath = toFile.getCanonicalPath();
-                    if (!canonicalPath.startsWith(param.unzipDirectory.getCanonicalPath() + File.separator)) {
-                        throw new SecurityException("Illegal name: " + to);
+                        // Fixing a Zip Path Traversal Vulnerability
+                        // https://support.google.com/faqs/answer/9294009
+                        String canonicalPath = toFile.getCanonicalPath();
+                        if (!canonicalPath.startsWith(param.unzipDirectory.getCanonicalPath() + File.separator)) {
+                            throw new SecurityException("Illegal name: " + to);
+                        }
+                        target.add(toFile);
+                    }
+                }else{
+                    while( keys.hasNext() ) {
+                        String to = (String)keys.next();
+                        String from = copies.getString(to);
+                        if (from.isEmpty()) {
+                            from = to;
+                        }
+                        ArrayList<File> target = null;
+                        if (!copyList.containsKey(from)) {
+                            target = new ArrayList<File>();
+                            copyList.put(from, target);
+                        } else {
+                            target = copyList.get((from));
+                        }
+                        File toFile = new File(param.unzipDirectory, to);
+
+                        // Fixing a Zip Path Traversal Vulnerability
+                        // https://support.google.com/faqs/answer/9294009
+                        String canonicalPath = toFile.getCanonicalPath();
+                        if (!canonicalPath.startsWith(param.unzipDirectory.getCanonicalPath() + File.separator)) {
+                            throw new SecurityException("Illegal name: " + to);
+                        }
+                        target.add(toFile);
                    }
-                    target.add(toFile);
                }
                continue;
            }
@@ -348,7 +411,11 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
            throw new Error("bundle patch not found");
        }

-        copyFromResource(copyList);
+        if(isV2){
+            copyFromResourceV2(copiesv2List);
+        }else{
+            copyFromResource(copyList);
+        }

        if (UpdateContext.DEBUG) {
            Log.d("react-native-update", "Unzip finished");
--- a/harmony/pushy.har
+++ b/harmony/pushy.har
--- a/harmony/pushy/oh-package-lock.json5
+++ b/harmony/pushy/oh-package-lock.json5
@@ -1,6 +1,7 @@
 {
  "meta": {
-    "stableOrder": true
+    "stableOrder": true,
+    "enableUnifiedLockfile": false
  },
  "lockfileVersion": 3,
  "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
@@ -9,7 +10,7 @@
  },
  "packages": {
    "@rnoh/react-native-openharmony@0.72.38": {
-      "name": "@rnoh/react-native-openharmony",
+      "name": "",
      "version": "0.72.38",
      "integrity": "sha512-br5SIrbB0OarSLirenleE7eTOX1lNccMJ7nb/G7qWTyJ7kW4DalmTXVKYpoT2qaOLls1uEE7McD1OjbZZM9jug==",
      "resolved": "https://ohpm.openharmony.cn/ohpm/@rnoh/react-native-openharmony/-/react-native-openharmony-0.72.38.har",
--- a/harmony/pushy/oh-package.json5
+++ b/harmony/pushy/oh-package.json5
@@ -1,5 +1,5 @@
 {
-  "license": "ISC",
+  "license": "MIT",
  "types": "",
  "devDependencies": {},
  "name": "pushy",
@@ -8,5 +8,6 @@
  "version": "3.1.0-0.0.7",
  "dependencies": {
    "@rnoh/react-native-openharmony":"^0.72.38"
-  }
+  },
+  "modelVersion": "5.0.0"
 }
--- a/harmony/pushy/src/main/cpp/CMakeLists.txt
+++ b/harmony/pushy/src/main/cpp/CMakeLists.txt
@@ -1,8 +1,10 @@
 cmake_minimum_required(VERSION 3.13)
 project(rnupdate)

-set(HDIFFPATCH_DIR ${CMAKE_CURRENT_SOURCE_DIR}/HDiffPatch)
-set(LZMA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lzma)
+# Point to android/jni directory for shared source code
+set(ANDROID_JNI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../../../node_modules/react-native-update/android/jni)
+set(HDIFFPATCH_DIR ${ANDROID_JNI_DIR}/HDiffPatch)
+set(LZMA_DIR ${ANDROID_JNI_DIR}/lzma)
 set(HDP_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/pushy.c
     ${CMAKE_CURRENT_SOURCE_DIR}/hpatch.c
--- a/harmony/pushy/src/main/ets/DownloadTask.ts
+++ b/harmony/pushy/src/main/ets/DownloadTask.ts
@@ -60,13 +60,13 @@ export class DownloadTask {
        const exists = fileIo.accessSync(params.targetFile);
        if (exists) {
          await fileIo.unlink(params.targetFile);
-        }else{
+        } else {
          const targetDir = params.targetFile.substring(
            0,
            params.targetFile.lastIndexOf('/'),
          );
          const exists = fileIo.accessSync(targetDir);
-          if(!exists){
+          if (!exists) {
            await fileIo.mkdir(targetDir);
          }
        }
@@ -83,7 +83,7 @@ export class DownloadTask {
        },
      });
      if (response.responseCode > 299) {
-        throw new Error(`Server error: ${response.responseCode}`);
+        throw Error(`Server error: ${response.responseCode}`);
      }

      const contentLength = parseInt(response.header['content-length'] || '0');
@@ -108,9 +108,10 @@ export class DownloadTask {
      const stats = await fileIo.stat(params.targetFile);
      const fileSize = stats.size;
      if (fileSize !== contentLength) {
-        throw new Error(`Download incomplete: expected ${contentLength} bytes but got ${stats.size} bytes`);
+        throw Error(
+          `Download incomplete: expected ${contentLength} bytes but got ${stats.size} bytes`,
+        );
      }
-
    } catch (error) {
      console.error('Download failed:', error);
      throw error;
@@ -142,7 +143,7 @@ export class DownloadTask {
        bytesRead = await fileIo
          .read(reader.fd, arrayBuffer)
          .catch((err: BusinessError) => {
-            throw new Error(
+            throw Error(
              `Error reading file: ${err.message}, code: ${err.code}`,
            );
          });
@@ -154,7 +155,7 @@ export class DownloadTask {
              length: bytesRead,
            })
            .catch((err: BusinessError) => {
-              throw new Error(
+              throw Error(
                `Error writing file: ${err.message}, code: ${err.code}`,
              );
            });
@@ -295,16 +296,16 @@ export class DownloadTask {
        }
      }

-      if(fn !== '.DS_Store'){
+      if (fn !== '.DS_Store') {
        await zip.decompressFile(fn, params.unzipDirectory);
      }
    }

    if (!foundDiff) {
-      throw new Error('diff.json not found');
+      throw Error('diff.json not found');
    }
    if (!foundBundlePatch) {
-      throw new Error('bundle patch not found');
+      throw Error('bundle patch not found');
    }
    await this.copyFromResource(copyList);
  }
@@ -366,12 +367,18 @@ export class DownloadTask {
              new Uint8Array(entry.content),
            );
            const outputFile = `${params.unzipDirectory}/bundle.harmony.js`;
-            const writer = await fileIo.open(outputFile, fileIo.OpenMode.CREATE | fileIo.OpenMode.WRITE_ONLY);
+            const writer = await fileIo.open(
+              outputFile,
+              fileIo.OpenMode.CREATE | fileIo.OpenMode.WRITE_ONLY,
+            );
            const chunkSize = 4096;
            let bytesWritten = 0;
            const totalLength = patched.byteLength;
            while (bytesWritten < totalLength) {
-              const chunk = patched.slice(bytesWritten, bytesWritten + chunkSize);
+              const chunk = patched.slice(
+                bytesWritten,
+                bytesWritten + chunkSize,
+              );
              await fileIo.write(writer.fd, chunk);
              bytesWritten += chunk.byteLength;
            }
@@ -387,10 +394,10 @@ export class DownloadTask {
    }

    if (!foundDiff) {
-      throw new Error('diff.json not found');
+      throw Error('diff.json not found');
    }
    if (!foundBundlePatch) {
-      throw new Error('bundle patch not found');
+      throw Error('bundle patch not found');
    }
    console.info('Patch from PPK completed');
  }
@@ -478,7 +485,7 @@ export class DownloadTask {
          await this.downloadFile(params);
          break;
        default:
-          throw new Error(`Unknown task type: ${params.type}`);
+          throw Error(`Unknown task type: ${params.type}`);
      }

      params.listener?.onDownloadCompleted(params);
--- a/harmony/pushy/src/main/ets/PushyFileJSBundleProvider.ets
+++ b/harmony/pushy/src/main/ets/PushyFileJSBundleProvider.ets
@@ -12,7 +12,7 @@ export class PushyFileJSBundleProvider extends JSBundleProvider {
    this.updateContext = new UpdateContext(context);
  }
  getURL(): string {
-    return this.updateContext.getBundleUrl().substring(1);
+    return this.updateContext.getBundleUrl()?.substring(1);
  }

  async getBundle(): Promise<ArrayBuffer> {
--- a/harmony/pushy/src/main/ets/PushyTurboModule.ts
+++ b/harmony/pushy/src/main/ets/PushyTurboModule.ts
@@ -9,47 +9,47 @@ import { UpdateModuleImpl } from './UpdateModuleImpl';
 import { UpdateContext } from './UpdateContext';
 import { EventHub } from './EventHub';

-const TAG = "PushyTurboModule"
+const TAG = 'PushyTurboModule';

 export class PushyTurboModule extends TurboModule {
-  mUiCtx: common.UIAbilityContext
-  context: UpdateContext
+  mUiCtx: common.UIAbilityContext;
+  context: UpdateContext;

  constructor(protected ctx: TurboModuleContext) {
    super(ctx);
-    logger.debug(TAG, ",PushyTurboModule constructor");
-    this.mUiCtx = ctx.uiAbilityContext
-    this.context = new UpdateContext(this.mUiCtx)
-    EventHub.getInstance().setRNInstance(ctx.rnInstance)
+    logger.debug(TAG, ',PushyTurboModule constructor');
+    this.mUiCtx = ctx.uiAbilityContext;
+    this.context = new UpdateContext(this.mUiCtx);
+    EventHub.getInstance().setRNInstance(ctx.rnInstance);
  }


 getConstants(): Object {
-  logger.debug(TAG, ",call getConstants");
+  logger.debug(TAG, ',call getConstants');
  const context = this.mUiCtx;
  const preferencesManager = dataPreferences.getPreferencesSync(context,{ name: 'update' });
-  const isFirstTime = preferencesManager.getSync("isFirstTime", false) as boolean;
-  const rolledBackVersion = preferencesManager.getSync("rolledBackVersion", "") as string;
-  const uuid = preferencesManager.getSync("uuid", "") as string;
-  const currentVersion = preferencesManager.getSync("currentVersion", "") as string;
+  const isFirstTime = preferencesManager.getSync('isFirstTime', false) as boolean;
+  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 buildTime = preferencesManager.getSync('buildTime', '') as string;
  const isUsingBundleUrl = this.context.getIsUsingBundleUrl();
  let bundleFlags = bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_REQUESTED_PERMISSION;
  let packageVersion = '';
  try {
    const bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleFlags);
-    packageVersion = bundleInfo?.versionName || "Unknown"
+    packageVersion = bundleInfo?.versionName || 'Unknown';
  } catch (error) {
-    console.error("Failed to get bundle info:", error);
+    console.error('Failed to get bundle info:', error);
  }

  if (isFirstTime) {
-    preferencesManager.deleteSync("isFirstTime");
+    preferencesManager.deleteSync('isFirstTime');
  }

  if (rolledBackVersion) {
-    preferencesManager.deleteSync("rolledBackVersion");
+    preferencesManager.deleteSync('rolledBackVersion');
  }

  return {
@@ -62,12 +62,12 @@ getConstants(): Object {
    isFirstTime,
    rolledBackVersion,
    uuid,
-  }
+  };
 }


  setLocalHashInfo(hash: string, info: string): boolean  {
-    logger.debug(TAG, ",call setLocalHashInfo");
+    logger.debug(TAG, ',call setLocalHashInfo');
    return UpdateModuleImpl.setLocalHashInfo(this.context, hash, info);
  }

@@ -76,50 +76,50 @@ getConstants(): Object {
  }

  async setUuid(uuid: string): Promise<boolean>  {
-    logger.debug(TAG, `,call setUuid`);
+    logger.debug(TAG, ',call setUuid');
    return UpdateModuleImpl.setUuid(this.context,uuid);
  }

  async reloadUpdate(options: { hash: string }): Promise<void> {
-    logger.debug(TAG, `,call reloadUpdate`);
+    logger.debug(TAG, ',call reloadUpdate');
    return UpdateModuleImpl.reloadUpdate(this.context, this.mUiCtx, options);
  }

  async setNeedUpdate(options: { hash: string }): Promise<boolean> {
-    logger.debug(TAG, `,call setNeedUpdate`);
+    logger.debug(TAG, ',call setNeedUpdate');
    return UpdateModuleImpl.setNeedUpdate(this.context, options);
  }

  async markSuccess(): Promise<boolean> {
-    logger.debug(TAG, `,call markSuccess`);
+    logger.debug(TAG, ',call markSuccess');
    return UpdateModuleImpl.markSuccess(this.context);
  }

  async downloadPatchFromPpk(options: { updateUrl: string; hash: string; originHash: string }): Promise<void> {
-    logger.debug(TAG, `,call downloadPatchFromPpk`);
+    logger.debug(TAG, ',call downloadPatchFromPpk');
    return UpdateModuleImpl.downloadPatchFromPpk(this.context, options);
  }

  async downloadPatchFromPackage(options: { updateUrl: string; hash: string }): Promise<void>  {
-    logger.debug(TAG, `,call downloadPatchFromPackage`);
+    logger.debug(TAG, ',call downloadPatchFromPackage');
    return UpdateModuleImpl.downloadPatchFromPackage(this.context, options);
  }

  async downloadFullUpdate(options: { updateUrl: string; hash: string }): Promise<void> {
-    logger.debug(TAG, `,call downloadFullUpdate`);
+    logger.debug(TAG, ',call downloadFullUpdate');
    return UpdateModuleImpl.downloadFullUpdate(this.context, options);
  }

  async downloadAndInstallApk(options: { url: string; target: string; hash: string }): Promise<void> {
-    logger.debug(TAG, `,call downloadAndInstallApk`);
+    logger.debug(TAG, ',call downloadAndInstallApk');
    return UpdateModuleImpl.downloadAndInstallApk(this.mUiCtx, options);
  }

  addListener(eventName: string): void {
-    logger.debug(TAG, `,call addListener`);
+    logger.debug(TAG, ',call addListener');
  }

  removeListeners(count: number): void {
-    logger.debug(TAG, `,call removeListeners`);
+    logger.debug(TAG, ',call removeListeners');
  }
-}
+}
--- a/harmony/pushy/src/main/ets/UpdateContext.ts
+++ b/harmony/pushy/src/main/ets/UpdateContext.ts
@@ -6,249 +6,276 @@ import common from '@ohos.app.ability.common';
 import { DownloadTaskParams } from './DownloadTaskParams';

 export class UpdateContext {
-    private context: common.UIAbilityContext;
-    private rootDir: string;
-    private preferences: preferences.Preferences;
-    private static DEBUG: boolean = false;
-    private static isUsingBundleUrl: boolean = false;
+  private context: common.UIAbilityContext;
+  private rootDir: string;
+  private preferences: preferences.Preferences;
+  private static DEBUG: boolean = false;
+  private static isUsingBundleUrl: boolean = false;

-    constructor(context: common.UIAbilityContext) {
-        this.context = context;
-        this.rootDir = context.filesDir + '/_update';
-        
-        try {
-            if (!fileIo.accessSync(this.rootDir)) {
-                fileIo.mkdirSync(this.rootDir);
-            }
-        } catch (e) {
-            console.error('Failed to create root directory:', e);
-        }
-        this.initPreferences();
+  constructor(context: common.UIAbilityContext) {
+    this.context = context;
+    this.rootDir = context.filesDir + '/_update';
+
+    try {
+      if (!fileIo.accessSync(this.rootDir)) {
+        fileIo.mkdirSync(this.rootDir);
+      }
+    } catch (e) {
+      console.error('Failed to create root directory:', e);
    }
+    this.initPreferences();
+  }

-    private initPreferences() {
-        try {
-            this.preferences = preferences.getPreferencesSync(this.context, {name:'update'});
-            const packageVersion =  this.getPackageVersion();
-            const storedVersion =  this.preferences.getSync('packageVersion', '');
-            if(!storedVersion){
-                this.preferences.putSync('packageVersion', packageVersion);
-                this.preferences.flush();
-            } else if (storedVersion && packageVersion !== storedVersion) {
-                this.preferences.clear();
-                this.preferences.putSync('packageVersion', packageVersion);
-                this.preferences.flush();
-                this.cleanUp();
-            }
-        } catch (e) {
-            console.error('Failed to init preferences:', e);
-        }
-    }
-
-    public setKv(key: string, value: string): void {
-         this.preferences.putSync(key, value);
-         this.preferences.flush();
-    }
-
-    public getKv(key: string): string {
-        return this.preferences.getSync(key, '') as string;
-    }
-
-    public  isFirstTime(): boolean {
-        return  this.preferences.getSync('firstTime', false) as boolean;
-    }
-
-    public  rolledBackVersion(): string {
-        return  this.preferences.getSync('rolledBackVersion', '') as string;
-    }
-
-    public markSuccess(): void {
-        this.preferences.putSync('firstTimeOk', true);
-        const lastVersion = this.preferences.getSync('lastVersion', '') as string;
-        const curVersion =  this.preferences.getSync('currentVersion', '') as string;
-        
-        if (lastVersion && lastVersion !== curVersion) {
-             this.preferences.deleteSync('lastVersion');
-             this.preferences.deleteSync(`hash_${lastVersion}`);
-        }
+  private initPreferences() {
+    try {
+      this.preferences = preferences.getPreferencesSync(this.context, {
+        name: 'update',
+      });
+      const packageVersion = this.getPackageVersion();
+      const storedVersion = this.preferences.getSync('packageVersion', '');
+      if (!storedVersion) {
+        this.preferences.putSync('packageVersion', packageVersion);
+        this.preferences.flush();
+      } else if (storedVersion && packageVersion !== storedVersion) {
+        this.preferences.clear();
+        this.preferences.putSync('packageVersion', packageVersion);
        this.preferences.flush();
        this.cleanUp();
+      }
+    } catch (e) {
+      console.error('Failed to init preferences:', e);
    }
+  }

-    public clearFirstTime(): void {
-        this.preferences.putSync('firstTime', false);
-        this.preferences.flush();
-        this.cleanUp();
+  public setKv(key: string, value: string): void {
+    this.preferences.putSync(key, value);
+    this.preferences.flush();
+  }
+
+  public getKv(key: string): string {
+    return this.preferences.getSync(key, '') as string;
+  }
+
+  public isFirstTime(): boolean {
+    return this.preferences.getSync('firstTime', false) as boolean;
+  }
+
+  public rolledBackVersion(): string {
+    return this.preferences.getSync('rolledBackVersion', '') as string;
+  }
+
+  public markSuccess(): void {
+    this.preferences.putSync('firstTimeOk', true);
+    const lastVersion = this.preferences.getSync('lastVersion', '') as string;
+    const curVersion = this.preferences.getSync('currentVersion', '') as string;
+
+    if (lastVersion && lastVersion !== curVersion) {
+      this.preferences.deleteSync('lastVersion');
+      this.preferences.deleteSync(`hash_${lastVersion}`);
    }
+    this.preferences.flush();
+    this.cleanUp();
+  }

-    public clearRollbackMark(): void {
-        this.preferences.putSync('rolledBackVersion', null);
-        this.preferences.flush();
-        this.cleanUp();
+  public clearFirstTime(): void {
+    this.preferences.putSync('firstTime', false);
+    this.preferences.flush();
+    this.cleanUp();
+  }
+
+  public clearRollbackMark(): void {
+    this.preferences.putSync('rolledBackVersion', null);
+    this.preferences.flush();
+    this.cleanUp();
+  }
+
+  public async downloadFullUpdate(
+    url: string,
+    hash: string,
+    listener: DownloadFileListener,
+  ): Promise<void> {
+    try {
+      const params = new DownloadTaskParams();
+      params.type = DownloadTaskParams.TASK_TYPE_PATCH_FULL;
+      params.url = url;
+      params.hash = hash;
+      params.listener = listener;
+      params.targetFile = `${this.rootDir}/${hash}.ppk`;
+      const downloadTask = new DownloadTask(this.context);
+      await downloadTask.execute(params);
+    } catch (e) {
+      console.error('Failed to download full update:', e);
    }
+  }

-    public async downloadFullUpdate(url: string, hash: string, listener: DownloadFileListener): Promise<void> {
-        try {
-            const params = new DownloadTaskParams();
-            params.type = DownloadTaskParams.TASK_TYPE_PATCH_FULL;
-            params.url = url;
-            params.hash = hash;
-            params.listener = listener;
-            params.targetFile = `${this.rootDir}/${hash}.ppk`;
-            const downloadTask = new DownloadTask(this.context);
-            await downloadTask.execute(params);
-        } catch (e) {
-            console.error('Failed to download full update:', e);
+  public async downloadFile(
+    url: string,
+    hash: string,
+    fileName: string,
+    listener: DownloadFileListener,
+  ): Promise<void> {
+    const params = new DownloadTaskParams();
+    params.type = DownloadTaskParams.TASK_TYPE_PLAIN_DOWNLOAD;
+    params.url = url;
+    params.hash = hash;
+    params.listener = listener;
+    params.targetFile = this.rootDir + '/' + fileName;
+
+    const downloadTask = new DownloadTask(this.context);
+    await downloadTask.execute(params);
+  }
+
+  public async downloadPatchFromPpk(
+    url: string,
+    hash: string,
+    originHash: string,
+    listener: DownloadFileListener,
+  ): Promise<void> {
+    const params = new DownloadTaskParams();
+    params.type = DownloadTaskParams.TASK_TYPE_PATCH_FROM_PPK;
+    params.url = url;
+    params.hash = hash;
+    params.originHash = originHash;
+    params.listener = listener;
+    params.targetFile = `${this.rootDir}/${originHash}_${hash}.ppk.patch`;
+    params.unzipDirectory = `${this.rootDir}/${hash}`;
+    params.originDirectory = `${this.rootDir}/${params.originHash}`;
+
+    const downloadTask = new DownloadTask(this.context);
+    await downloadTask.execute(params);
+  }
+
+  public async downloadPatchFromPackage(
+    url: string,
+    hash: string,
+    listener: DownloadFileListener,
+  ): Promise<void> {
+    try {
+      const params = new DownloadTaskParams();
+      params.type = DownloadTaskParams.TASK_TYPE_PATCH_FROM_APP;
+      params.url = url;
+      params.hash = hash;
+      params.listener = listener;
+      params.targetFile = `${this.rootDir}/${hash}.app.patch`;
+      params.unzipDirectory = `${this.rootDir}/${hash}`;
+
+      const downloadTask = new DownloadTask(this.context);
+      return await downloadTask.execute(params);
+    } catch (e) {
+      throw e;
+      console.error('Failed to download APK patch:', e);
+    }
+  }
+
+  public switchVersion(hash: string): void {
+    try {
+      const bundlePath = `${this.rootDir}/${hash}/bundle.harmony.js`;
+      if (!fileIo.accessSync(bundlePath)) {
+        throw Error(`Bundle version ${hash} not found.`);
+      }
+
+      const lastVersion = this.getKv('currentVersion');
+      this.setKv('currentVersion', hash);
+      if (lastVersion && lastVersion !== hash) {
+        this.setKv('lastVersion', lastVersion);
+      }
+
+      this.setKv('firstTime', 'true');
+      this.setKv('firstTimeOk', 'false');
+      this.setKv('rolledBackVersion', '');
+    } catch (e) {
+      console.error('Failed to switch version:', e);
+    }
+  }
+
+  public static getBundleUrl(
+    context: common.UIAbilityContext,
+    defaultAssetsUrl?: string,
+  ): string {
+    return new UpdateContext(context).getBundleUrl(defaultAssetsUrl);
+  }
+
+  public getBundleUrl(defaultAssetsUrl?: string): string {
+    UpdateContext.isUsingBundleUrl = true;
+    const currentVersion = this.getCurrentVersion();
+    if (!currentVersion) {
+      return defaultAssetsUrl;
+    }
+    if (!this.isFirstTime()) {
+      if (!this.preferences.getSync('firstTimeOk', true)) {
+        return this.rollBack();
+      }
+    }
+    let version = currentVersion;
+    while (version) {
+      const bundleFile = `${this.rootDir}/${version}/bundle.harmony.js`;
+      try {
+        if (!fileIo.accessSync(bundleFile)) {
+          console.error(`Bundle version ${version} not found.`);
+          version = this.rollBack();
+          continue;
        }
+        return bundleFile;
+      } catch (e) {
+        console.error('Failed to access bundle file:', e);
+        version = this.rollBack();
+      }
    }
+    return defaultAssetsUrl;
+  }

-    public async downloadFile(url: string, hash: string, fileName: string, listener: DownloadFileListener): Promise<void> {
-        const params = new DownloadTaskParams();
-        params.type = DownloadTaskParams.TASK_TYPE_PLAIN_DOWNLOAD;
-        params.url = url;
-        params.hash = hash;
-        params.listener = listener;
-        params.targetFile = this.rootDir + '/' + fileName;
-
-        const downloadTask = new DownloadTask(this.context);
-        await downloadTask.execute(params);
+  getPackageVersion(): string {
+    let bundleFlags =
+      bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_REQUESTED_PERMISSION;
+    let packageVersion = '';
+    try {
+      const bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleFlags);
+      packageVersion = bundleInfo?.versionName || 'Unknown';
+    } catch (error) {
+      console.error('获取包信息失败:', error);
    }
+    return packageVersion;
+  }

-    public async downloadPatchFromPpk(url: string, hash: string, originHash: string, listener: DownloadFileListener): Promise<void> {
-        const params = new DownloadTaskParams();
-        params.type = DownloadTaskParams.TASK_TYPE_PATCH_FROM_PPK;
-        params.url = url;
-        params.hash = hash;
-        params.originHash = originHash;
-        params.listener = listener;
-        params.targetFile = `${this.rootDir}/${originHash}_${hash}.ppk.patch`;
-        params.unzipDirectory = `${this.rootDir}/${hash}`;
-        params.originDirectory = `${this.rootDir}/${params.originHash}`;
-        
-        const downloadTask = new DownloadTask(this.context);
-        await downloadTask.execute(params);
+  public getCurrentVersion(): string {
+    const currentVersion = this.getKv('currentVersion');
+    return currentVersion;
+  }
+
+  private rollBack(): string {
+    const lastVersion = this.preferences.getSync('lastVersion', '') as string;
+    const currentVersion = this.preferences.getSync(
+      'currentVersion',
+      '',
+    ) as string;
+    if (!lastVersion) {
+      this.preferences.deleteSync('currentVersion');
+    } else {
+      this.preferences.putSync('currentVersion', lastVersion);
    }
+    this.preferences.putSync('firstTimeOk', true);
+    this.preferences.putSync('firstTime', false);
+    this.preferences.putSync('rolledBackVersion', currentVersion);
+    this.preferences.flush();
+    return lastVersion;
+  }

-    public async downloadPatchFromPackage(url: string, hash: string, listener: DownloadFileListener): Promise<void> {
-        try {
-            const params = new DownloadTaskParams();
-            params.type = DownloadTaskParams.TASK_TYPE_PATCH_FROM_APP;
-            params.url = url;
-            params.hash = hash;
-            params.listener = listener;
-            params.targetFile = `${this.rootDir}/${hash}.app.patch`;
-            params.unzipDirectory = `${this.rootDir}/${hash}`;
+  private cleanUp(): void {
+    const params = new DownloadTaskParams();
+    params.type = DownloadTaskParams.TASK_TYPE_CLEANUP;
+    params.hash = this.preferences.getSync('currentVersion', '') as string;
+    params.originHash = this.preferences.getSync('lastVersion', '') as string;
+    params.unzipDirectory = this.rootDir;
+    const downloadTask = new DownloadTask(this.context);
+    downloadTask.execute(params);
+  }

-            const downloadTask = new DownloadTask(this.context);
-            return  await downloadTask.execute(params);
-        } catch (e) {
-            throw e;
-            console.error('Failed to download APK patch:', e);
-        }
-    }
-
-    public switchVersion(hash: string): void {
-        try {
-            const bundlePath = `${this.rootDir}/${hash}/bundle.harmony.js`;
-            if (!fileIo.accessSync(bundlePath)) {
-                throw new Error(`Bundle version ${hash} not found.`);
-            }
-
-            const lastVersion = this.getKv('currentVersion');
-            this.setKv('currentVersion', hash);
-            if (lastVersion && lastVersion !== hash) {
-                this.setKv('lastVersion', lastVersion);
-            }
-
-             this.setKv('firstTime', 'true');
-             this.setKv('firstTimeOk', 'false');
-             this.setKv('rolledBackVersion', "");
-        } catch (e) {
-            console.error('Failed to switch version:', e);
-        }
-    }
-
-    public static getBundleUrl(context: common.UIAbilityContext, defaultAssetsUrl?: string): string {
-        return new UpdateContext(context).getBundleUrl(defaultAssetsUrl);
-    }
-
-    public getBundleUrl(defaultAssetsUrl?: string): string {
-        UpdateContext.isUsingBundleUrl = true;
-        const currentVersion = this.getCurrentVersion();
-        if (!currentVersion) {
-            return defaultAssetsUrl;
-        }
-        if (!this.isFirstTime()) {
-            if (!this.preferences.getSync('firstTimeOk', true)) {
-                return this.rollBack();
-            }
-        }
-        let version = currentVersion;
-        while (version) {
-            const bundleFile = `${this.rootDir}/${version}/bundle.harmony.js`;
-            try {
-                if (!fileIo.accessSync(bundleFile)) {
-                    console.error(`Bundle version ${version} not found.`);
-                    version = this.rollBack();
-                    continue;
-                }
-                return bundleFile;
-            } catch (e) {
-                console.error('Failed to access bundle file:', e);
-                version = this.rollBack();
-            }
-        }
-        return defaultAssetsUrl;
-    }
-
-    getPackageVersion(): string {
-        let bundleFlags = bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_REQUESTED_PERMISSION;
-        let packageVersion = '';
-        try {
-            const bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleFlags);
-            packageVersion = bundleInfo?.versionName || "Unknown";
-        } catch (error) {
-            console.error("获取包信息失败:", error);
-        }
-        return packageVersion;
-    }
-
-    public getCurrentVersion() : string {
-        const currentVersion = this.getKv('currentVersion');
-        return currentVersion;
-    }
-
-    private rollBack(): string {
-        const lastVersion = this.preferences.getSync('lastVersion', '') as string;
-        const currentVersion = this.preferences.getSync('currentVersion', '') as string;
-        if (!lastVersion) {
-            this.preferences.deleteSync('currentVersion');
-        } else {
-            this.preferences.putSync('currentVersion', lastVersion);
-        }
-         this.preferences.putSync('firstTimeOk', true);
-         this.preferences.putSync('firstTime', false);
-         this.preferences.putSync('rolledBackVersion', currentVersion);
-         this.preferences.flush();
-        return lastVersion;
-    }
-
-    private cleanUp(): void {
-        const params = new DownloadTaskParams();
-        params.type = DownloadTaskParams.TASK_TYPE_CLEANUP;
-        params.hash =  this.preferences.getSync('currentVersion', '') as string;
-        params.originHash =  this.preferences.getSync('lastVersion', '') as string;
-        params.unzipDirectory = this.rootDir;
-        const downloadTask = new DownloadTask(this.context);
-        downloadTask.execute(params);
-    }
-
-    public getIsUsingBundleUrl(): boolean {
-        return UpdateContext.isUsingBundleUrl;
-    }
+  public getIsUsingBundleUrl(): boolean {
+    return UpdateContext.isUsingBundleUrl;
+  }
 }

 export interface DownloadFileListener {
-    onDownloadCompleted(params: DownloadTaskParams): void;
-    onDownloadFailed(error: Error): void;
-}
+  onDownloadCompleted(params: DownloadTaskParams): void;
+  onDownloadFailed(error: Error): void;
+}
--- a/harmony/pushy/src/main/ets/UpdateModuleImpl.ts
+++ b/harmony/pushy/src/main/ets/UpdateModuleImpl.ts
@@ -4,14 +4,14 @@ import { UpdateContext } from './UpdateContext';
 import { DownloadTaskParams } from './DownloadTaskParams';
 import logger from './Logger';

-const TAG = "UpdateModuleImpl";
+const TAG = 'UpdateModuleImpl';

 export class UpdateModuleImpl {
-  static readonly NAME = "Pushy";
+  static readonly NAME = 'Pushy';

  static async downloadFullUpdate(
-    updateContext: UpdateContext, 
-    options: { updateUrl: string; hash: string }
+    updateContext: UpdateContext,
+    options: { updateUrl: string; hash: string },
  ): Promise<void> {
    try {
      await updateContext.downloadFullUpdate(options.updateUrl, options.hash, {
@@ -20,7 +20,7 @@ export class UpdateModuleImpl {
        },
        onDownloadFailed: (error: Error) => {
          return Promise.reject(error);
-        }
+        },
      });
    } catch (error) {
      logger.error(TAG, `downloadFullUpdate failed: ${error}`);
@@ -30,18 +30,18 @@ export class UpdateModuleImpl {

  static async downloadAndInstallApk(
    context: common.UIAbilityContext,
-    options: { url: string; hash: string; target: string }
+    options: { url: string; hash: string; target: string },
  ): Promise<void> {
    try {
      const want = {
        action: 'action.system.home',
        parameters: {
-          uri: 'appmarket://details'
-        }
+          uri: 'appmarket://details',
+        },
      };

      if (!context) {
-        throw new Error('获取context失败');
+        throw Error('获取context失败');
      }

      await context.startAbility(want);
@@ -53,17 +53,21 @@ export class UpdateModuleImpl {

  static async downloadPatchFromPackage(
    updateContext: UpdateContext,
-    options: { updateUrl: string; hash: string }
+    options: { updateUrl: string; hash: string },
  ): Promise<void> {
    try {
-     return await updateContext.downloadPatchFromPackage(options.updateUrl, options.hash, {
-        onDownloadCompleted: (params: DownloadTaskParams) => {
-          return Promise.resolve();
+      return await updateContext.downloadPatchFromPackage(
+        options.updateUrl,
+        options.hash,
+        {
+          onDownloadCompleted: (params: DownloadTaskParams) => {
+            return Promise.resolve();
+          },
+          onDownloadFailed: (error: Error) => {
+            return Promise.reject(error);
+          },
        },
-        onDownloadFailed: (error: Error) => {
-          return Promise.reject(error);
-        }
-      });
+      );
    } catch (error) {
      logger.error(TAG, `downloadPatchFromPackage failed: ${error}`);
      throw error;
@@ -72,7 +76,7 @@ export class UpdateModuleImpl {

  static async downloadPatchFromPpk(
    updateContext: UpdateContext,
-    options: { updateUrl: string; hash: string; originHash: string }
+    options: { updateUrl: string; hash: string; originHash: string },
  ): Promise<void> {
    try {
      await updateContext.downloadPatchFromPpk(
@@ -85,49 +89,49 @@ export class UpdateModuleImpl {
          },
          onDownloadFailed: (error: Error) => {
            return Promise.reject(error);
-          }
-        }
+          },
+        },
      );
    } catch (error) {
      logger.error(TAG, `downloadPatchFromPpk failed: ${error}`);
-      throw new Error(`执行报错: ${error.message}`);
+      throw Error(`执行报错: ${error.message}`);
    }
  }

  static async reloadUpdate(
    updateContext: UpdateContext,
    context: common.UIAbilityContext,
-    options: { hash: string }
+    options: { hash: string },
  ): Promise<void> {
    const hash = options.hash;
    if (!hash) {
-      throw new Error('hash不能为空');
+      throw Error('hash不能为空');
    }

    try {
      await updateContext.switchVersion(hash);
      const bundleInfo = await bundleManager.getBundleInfoForSelf(
-        bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_REQUESTED_PERMISSION
+        bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_REQUESTED_PERMISSION,
      );
      await context.terminateSelf();
      const want = {
        bundleName: bundleInfo.name,
-        abilityName: context.abilityInfo?.name
+        abilityName: context.abilityInfo?.name,
      };
      await context.startAbility(want);
    } catch (error) {
      logger.error(TAG, `reloadUpdate failed: ${error}`);
-      throw new Error(`pushy:switchVersion failed ${error.message}`);
+      throw Error(`pushy:switchVersion failed ${error.message}`);
    }
  }

  static async setNeedUpdate(
    updateContext: UpdateContext,
-    options: { hash: string }
+    options: { hash: string },
  ): Promise<boolean> {
    const hash = options.hash;
    if (!hash) {
-      throw new Error('hash不能为空');
+      throw Error('hash不能为空');
    }

    try {
@@ -135,7 +139,7 @@ export class UpdateModuleImpl {
      return true;
    } catch (error) {
      logger.error(TAG, `setNeedUpdate failed: ${error}`);
-      throw new Error(`switchVersionLater failed: ${error.message}`);
+      throw Error(`switchVersionLater failed: ${error.message}`);
    }
  }

@@ -145,20 +149,20 @@ export class UpdateModuleImpl {
      return true;
    } catch (error) {
      logger.error(TAG, `markSuccess failed: ${error}`);
-      throw new Error(`执行报错: ${error.message}`);
+      throw Error(`执行报错: ${error.message}`);
    }
  }

  static async setUuid(
    updateContext: UpdateContext,
-    uuid: string
+    uuid: string,
  ): Promise<boolean> {
    try {
      await updateContext.setKv('uuid', uuid);
      return true;
    } catch (error) {
      logger.error(TAG, `setUuid failed: ${error}`);
-      throw new Error(`执行报错: ${error.message}`);
+      throw Error(`执行报错: ${error.message}`);
    }
  }

@@ -174,17 +178,14 @@ export class UpdateModuleImpl {
  static setLocalHashInfo(
    updateContext: UpdateContext,
    hash: string,
-    info: string
+    info: string,
  ): boolean {
    updateContext.setKv(`hash_${hash}`, info);
    return true;
  }

-  static getLocalHashInfo(
-    updateContext: UpdateContext,
-    hash: string
-  ): string {
+  static getLocalHashInfo(updateContext: UpdateContext, hash: string): string {
    const value = updateContext.getKv(`hash_${hash}`);
    return value;
  }
-}
+}
--- a/ios/RCTPushy/RCTPushy.mm
+++ b/ios/RCTPushy/RCTPushy.mm
@@ -178,7 +178,9 @@ RCT_EXPORT_MODULE(RCTPushy);
    NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo];
    NSString *currentVersion = [pushyInfo objectForKey:paramCurrentVersion];
    ret[@"currentVersion"] = currentVersion;
-    ret[@"currentVersionInfo"] = [defaults objectForKey:[keyHashInfo stringByAppendingString:currentVersion]];
+    if (currentVersion != nil) {
+        ret[@"currentVersionInfo"] = [defaults objectForKey:[keyHashInfo stringByAppendingString:currentVersion]];
+    }
    
    // clear isFirstTimemarked
    if (ret[@"isFirstTime"]) {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "react-native-update",
-  "version": "10.31.1",
+  "version": "10.34.8",
  "description": "react-native hot update",
  "main": "src/index",
  "scripts": {
@@ -9,7 +9,7 @@
    "lint": "eslint \"src/*.@(ts|tsx|js|jsx)\" && tsc --noEmit",
    "submodule": "git submodule update --init --recursive",
    "test": "echo \"Error: no test specified\" && exit 1",
-    "build-lib": "bun submodule && $ANDROID_HOME/ndk/20.1.5948944/ndk-build NDK_PROJECT_PATH=android APP_BUILD_SCRIPT=android/jni/Android.mk NDK_APPLICATION_MK=android/jni/Application.mk NDK_LIBS_OUT=android/lib",
+    "build:so": "bun submodule && $ANDROID_HOME/ndk/28.2.13676358/ndk-build NDK_PROJECT_PATH=android APP_BUILD_SCRIPT=android/jni/Android.mk NDK_APPLICATION_MK=android/jni/Application.mk NDK_LIBS_OUT=android/lib",
    "build:ios-debug": "cd Example/testHotUpdate && bun && detox build --configuration ios.sim.debug",
    "build:ios-release": "cd Example/testHotUpdate && bun && detox build --configuration ios.sim.release",
    "test:ios-debug": "cd Example/testHotUpdate && detox test --configuration ios.sim.debug",
@@ -72,6 +72,5 @@
    "react-native": "0.73",
    "ts-jest": "^29.3.2",
    "typescript": "^5.6.3"
-  },
-  "packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
+  }
 }
--- a/react-native-update.podspec
+++ b/react-native-update.podspec
@@ -105,18 +105,17 @@ 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,c}',
+    ss.source_files = ['ios/**/*.{h,m,mm,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/**/*.h']
+    ss.public_header_files = ['ios/**/*.h']
  end

  # Conditionally add Expo subspec and check ExpoModulesCore version
--- a/react-native.config.js
+++ b/react-native.config.js
@@ -0,0 +1 @@
+module.exports = {};
--- a/src/client.ts
+++ b/src/client.ts
@@ -8,7 +8,7 @@ import {
  buildTime,
  cInfo,
  currentVersion,
-  getCurrentVersionInfo,
+  currentVersionInfo,
  isFirstTime,
  isRolledBack,
  packageVersion,
@@ -93,7 +93,6 @@ export class Pushy {
  clientType: 'Pushy' | 'Cresc' = 'Pushy';
  lastChecking?: number;
  lastRespJson?: Promise<CheckResult>;
-  lastRespText?: Promise<string>;

  version = cInfo.rnu;
  loggerPromise = (() => {
@@ -111,12 +110,11 @@ export class Pushy {
    this.clientType = clientType || 'Pushy';
    this.options.server = SERVER_PRESETS[this.clientType];

-    // Initialize i18n based on clientType
-    i18n.setLocale(this.clientType === 'Pushy' ? 'zh' : 'en');
+    i18n.setLocale(options.locale ?? this.clientType === 'Pushy' ? 'zh' : 'en');

    if (Platform.OS === 'ios' || Platform.OS === 'android') {
      if (!options.appKey) {
-        throw new Error(i18n.t('error_appkey_required'));
+        throw Error(i18n.t('error_appkey_required'));
      }
    }

@@ -164,7 +162,6 @@ export class Pushy {
    log(type + ' ' + message);
    await this.loggerPromise.promise;
    const { logger = noop, appKey } = this.options;
-    const info = await getCurrentVersionInfo();
    const overridePackageVersion = this.options.overridePackageVersion;
    logger({
      type,
@@ -176,7 +173,7 @@ export class Pushy {
        overridePackageVersion,
        buildTime,
        message,
-        ...info,
+        ...currentVersionInfo,
        ...data,
      },
    });
@@ -293,10 +290,10 @@ export class Pushy {
            ),
          );
        } catch (err: any) {
-          this.throwIfEnabled(new Error('errorCheckingUseBackup'));
+          this.throwIfEnabled(Error('errorCheckingUseBackup'));
        }
      } else {
-        this.throwIfEnabled(new Error('errorCheckingGetBackup'));
+        this.throwIfEnabled(Error('errorCheckingGetBackup'));
      }
    }
    if (!resp) {
@@ -304,21 +301,21 @@ export class Pushy {
        type: 'errorChecking',
        message: this.t('error_cannot_connect_server'),
      });
-      this.throwIfEnabled(new Error('errorChecking'));
+      this.throwIfEnabled(Error('errorChecking'));
      return this.lastRespJson ? await this.lastRespJson : emptyObj;
    }

-    if (resp.status !== 200) {
+    if (!resp.ok) {
+      const respText = await resp.text();
      const errorMessage = this.t('error_http_status', {
        status: resp.status,
-        statusText: resp.statusText,
+        statusText: respText,
      });
      this.report({
        type: 'errorChecking',
        message: errorMessage,
      });
-      this.throwIfEnabled(new Error(errorMessage));
-      log('error checking response:', resp.status, await resp.text());
+      this.throwIfEnabled(Error(errorMessage));
      return this.lastRespJson ? await this.lastRespJson : emptyObj;
    }
    this.lastRespJson = resp.json();
@@ -435,7 +432,7 @@ export class Pushy {
          message: e.message,
        });
        errorMessages.push(errorMessage);
-        lastError = new Error(errorMessage);
+        lastError = Error(errorMessage);
        log(errorMessage);
      }
    }
@@ -454,7 +451,7 @@ export class Pushy {
            message: e.message,
          });
          errorMessages.push(errorMessage);
-          lastError = new Error(errorMessage);
+          lastError = Error(errorMessage);
          log(errorMessage);
        }
      }
@@ -474,7 +471,7 @@ export class Pushy {
            message: e.message,
          });
          errorMessages.push(errorMessage);
-          lastError = new Error(errorMessage);
+          lastError = Error(errorMessage);
          log(errorMessage);
        }
      } else if (__DEV__) {
@@ -532,7 +529,7 @@ export class Pushy {
    }
    if (sharedState.apkStatus === 'downloaded') {
      this.report({ type: 'errorInstallApk' });
-      this.throwIfEnabled(new Error('errorInstallApk'));
+      this.throwIfEnabled(Error('errorInstallApk'));
      return;
    }
    if (Platform.Version <= 23) {
@@ -542,7 +539,7 @@ export class Pushy {
        );
        if (granted !== PermissionsAndroid.RESULTS.GRANTED) {
          this.report({ type: 'rejectStoragePermission' });
-          this.throwIfEnabled(new Error('rejectStoragePermission'));
+          this.throwIfEnabled(Error('rejectStoragePermission'));
          return;
        }
      } catch (e: any) {
@@ -575,7 +572,7 @@ export class Pushy {
    }).catch(() => {
      sharedState.apkStatus = null;
      this.report({ type: 'errorDownloadAndInstallApk' });
-      this.throwIfEnabled(new Error('errorDownloadAndInstallApk'));
+      this.throwIfEnabled(Error('errorDownloadAndInstallApk'));
    });
    sharedState.apkStatus = 'downloaded';
    if (sharedState.progressHandlers[progressKey]) {
--- a/src/core.ts
+++ b/src/core.ts
@@ -18,7 +18,7 @@ export const PushyModule =
 export const UpdateModule = PushyModule;

 if (!PushyModule) {
-  throw new Error(
+  throw Error(
    'Failed to load react-native-update native module, please try to recompile',
  );
 }
--- a/src/provider.tsx
+++ b/src/provider.tsx
@@ -16,9 +16,9 @@ import { Pushy, Cresc, sharedState } from './client';
 import { currentVersion, packageVersion, getCurrentVersionInfo, currentVersionInfo } from './core';
 import {
  CheckResult,
-  MixedCheckResult,
  ProgressData,
  UpdateTestPayload,
+  VersionInfo,
 } from './type';
 import { UpdateContext } from './context';
 import { URL } from 'react-native-url-polyfill';
@@ -163,7 +163,7 @@ export const UpdateProvider = ({
        return;
      }
      lastChecking.current = now;
-      let rootInfo: MixedCheckResult | undefined;
+      let rootInfo: CheckResult | undefined;
      try {
        rootInfo = await client.checkUpdate(extra);
      } catch (e: any) {
@@ -175,12 +175,12 @@ export const UpdateProvider = ({
      if (!rootInfo) {
        return;
      }
-      const versions = rootInfo.versions || [rootInfo as CheckResult];
-      delete rootInfo.versions;
+      const versions = [rootInfo.expVersion, rootInfo].filter(Boolean) as VersionInfo[];
+      delete rootInfo.expVersion;
      for (const versionInfo of versions) {
        const info: CheckResult = {
-          ...versionInfo,
          ...rootInfo,
+          ...versionInfo,
        };
        const rollout = info.config?.rollout?.[packageVersion];
        if (info.update && rollout) {
@@ -242,7 +242,7 @@ export const UpdateProvider = ({
          alertUpdate(
            client.t('alert_title'),
            client.t('alert_new_version_found', {
-              name: info.name,
+              name: info.name!,
              description: info.description,
            }),
            [
--- a/src/type.ts
+++ b/src/type.ts
@@ -24,14 +24,10 @@ interface RootResult {
  paths?: string[];
 }

-export type CheckResult = RootResult & VersionInfo;
-
-export type CheckResultV2 = RootResult & {
-  versions?: VersionInfo[];
-};
-
-export type MixedCheckResult = CheckResult | CheckResultV2;
-
+export type CheckResult = RootResult &
+  Partial<VersionInfo> & {
+    expVersion?: VersionInfo;
+  };

 export interface ProgressData {
  hash: string;
@@ -90,6 +86,7 @@ export interface ClientOptions {
  appKey: string;
  server?: UpdateServerConfig;
  logger?: UpdateEventsLogger;
+  locale?: 'zh' | 'en';
  updateStrategy?:
    | 'alwaysAlert'
    | 'alertUpdateAndIgnoreError'
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -17,7 +17,7 @@ export function promiseAny<T>(promises: Promise<T>[]) {
        .catch(() => {
          count++;
          if (count === promises.length) {
-            reject(new Error(i18n.t('error_all_promises_rejected')));
+            reject(Error(i18n.t('error_all_promises_rejected')));
          }
        });
    });
@@ -51,7 +51,7 @@ const ping = isWeb
              return finalUrl;
            }
            log('ping failed', url, status, statusText);
-            throw new Error(i18n.t('error_ping_failed'));
+            throw Error(i18n.t('error_ping_failed'));
          })
          .catch(e => {
            pingFinished = true;
@@ -60,7 +60,7 @@ const ping = isWeb
          }),
        new Promise((_, reject) =>
          setTimeout(() => {
-            reject(new Error(i18n.t('error_ping_timeout')));
+            reject(Error(i18n.t('error_ping_timeout')));
            if (!pingFinished) {
              log('ping timeout', url);
            }
@@ -115,7 +115,7 @@ export const enhancedFetch = async (
      if (r.ok) {
        return r;
      }
-      throw new Error(
+      throw Error(
        i18n.t('error_http_status', {
          status: r.status,
          statusText: r.statusText,
Author	SHA1	Message	Date
sunnylqm	d458371f54	fix harmony build	2025-10-23 11:30:13 +08:00
sunnylqm	84381e5ed7	Increment version in package.json to 10.34.7 and update podspec to simplify public header files for Expo dependency.	2025-10-22 16:03:54 +08:00
sunnylqm	8970fd406d	bump	2025-10-22 14:53:59 +08:00
sunnylqm	34d6fef493	revert react header	2025-10-22 14:19:40 +08:00
sunnylqm	84b71e33a8	support expo 54	2025-10-21 22:23:49 +08:00
sunnylqm	6cd99dece0	Increment version in package.json to 10.34.5, remove obsolete ImportReact.h file, and update podspec to eliminate unnecessary public header files for Expo dependency.	2025-10-21 11:57:09 +08:00
sunnylqm	d726f3602b	Update app.json to include package name, modify index.js to use expo-router, and upgrade dependencies in package.json for improved compatibility and features.	2025-10-19 17:40:18 +08:00
sunnylqm	da21c99bcc	Update react-native-update dependency to version 10.34.4 in package.json, bun.lock, and Podfile.lock. Add additional flags for Folly configuration in Xcode project settings.	2025-10-18 23:18:23 +08:00
sunnylqm	1f8748375c	Enhance Pushy class to support locale configuration in i18n initialization by adding optional locale property to ClientOptions interface.	2025-10-17 16:03:54 +08:00
sunnylqm	fa731cd583	Increment version in package.json to 10.34.4.	2025-10-16 12:56:53 +08:00
sunnylqm	d077dcb6d3	Update submodule references for HDiffPatch and lzma to v3.1.1 commits.	2025-10-16 12:49:59 +08:00
sunnylqm	59b60fdc6d	Update .gitmodules to reflect new submodule paths for HDiffPatch and lzma, and increment version in package.json to 10.34.3.	2025-10-16 11:35:39 +08:00
sunnylqm	c768705221	Update .gitmodules to add new submodules for HDiffPatch and lzma, and increment version in package.json to 10.34.2.	2025-10-16 11:13:22 +08:00
sunnylqm	57206dd2f1	Update .gitignore to exclude new harmony package files, remove submodule entries from .gitmodules, and increment version in package.json to 10.34.1. Refactor build-profile.json5 for consistency and update PushyFileJSBundleProvider to handle optional chaining. Remove obsolete pushy.har file and adjust dependencies in oh-package.json5 for clarity.	2025-10-16 00:48:17 +08:00
sunnylqm	4e27d906c3	Reorder properties in CheckResult object for consistency in UpdateProvider component.	2025-09-28 23:23:16 +08:00
sunnylqm	c24f469475	Refactor Pushy class to replace getCurrentVersionInfo with currentVersionInfo for improved clarity and consistency.	2025-09-28 21:57:56 +08:00
sunnylqm	8f8a29eda8	Update version in package.json from 10.34.0-beta.0 to 10.34.0 for stable release.	2025-09-24 16:56:28 +08:00
sunnylqm	a78542b214	Update version to 10.34.0-beta.0 in package.json and modify NDK version for build-lib script; update package manager to yarn@1.22.21.	2025-09-24 15:29:57 +08:00
Sunny Luo	8d9ae57a5f	Bump version from 10.32.1 to 10.33.0	2025-09-24 08:28:11 +08:00
Sunny Luo	2502935fc0	Update package.json	2025-09-24 08:27:57 +08:00
波仔糕	8e6d9bf460	update judge logic for v2 (#513 ) * update judge logic for v2 * udpate	2025-09-24 08:26:16 +08:00
波仔糕	897f334343	resolve aab package image hot update issue (#512 ) * modify harmony download logic to async * fix harmony image assets load fail issue * resolve aab package image hot update issue * update * udpate	2025-09-23 23:41:40 +08:00
sunnylqm	33bc69c3fb	Update react-native-update version to 10.32.0 in package.json for the latest features and improvements.	2025-09-20 12:08:03 +08:00
sunnylqm	5028ce31be	Update react-native-update to version 10.32.0 in package.json, refactor error handling in DownloadTask and UpdateContext for improved readability, and enhance type definitions in various files for better TypeScript support.	2025-09-20 12:07:53 +08:00
sunnylqm	d3a4007763	Refactor ProGuard rules for React Native classes to improve reflection handling and maintain compatibility with Expo modules.	2025-09-19 16:03:17 +08:00
sunnylqm	a4f3e3cc38	Update react-native-update to version 10.31.2 in bun.lock, package.json, and Podfile.lock for consistency across dependencies.	2025-09-19 14:58:47 +08:00
sunnylqm	9d51128ed3	Update react-native-update to version 10.31.2 in package.json and enhance currentVersionInfo retrieval in RCTPushy.mm for improved data handling.	2025-09-19 14:50:13 +08:00
sunnylqm	eddb072927	Update Podfile.lock to reflect react-native-update version 10.31.1, ensuring consistency with package dependencies.	2025-09-19 14:42:29 +08:00
sunnylqm	4f9417d620	Update react-native-update to version 10.31.1 in package.json and bun.lock for improved stability and features.	2025-09-19 14:41:52 +08:00