Update react-native-update version to 10.32.0 in package.json for the latest features and improvements.

* modify harmony download logic to async

* fix harmony image assets load fail issue

.gitignore

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

.npmignore

@@ -6,6 +6,7 @@
 Example
 android/build
 .vscode
+.github/
 
 # OSX
 #
@@ -51,4 +52,6 @@ domains.json
 endpoints.json
 endpoints_cresc.json
 
-tea.yaml
+tea.yaml
+
+e2e/

.yarnrc.yml

@@ -1 +0,0 @@
-nodeLinker: node-modules

Example/expoUsePushy/.gitignore

@@ -0,0 +1,36 @@
+# Learn more https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files
+
+# dependencies
+node_modules/
+
+# Expo
+.expo/
+dist/
+web-build/
+expo-env.d.ts
+
+# Native
+*.orig.*
+*.jks
+*.p8
+*.p12
+*.key
+*.mobileprovision
+
+# Metro
+.metro-health-check*
+
+# debug
+npm-debug.*
+yarn-debug.*
+yarn-error.*
+
+# macOS
+.DS_Store
+*.pem
+
+# local env files
+.env*.local
+
+# typescript
+*.tsbuildinfo

Example/expoUsePushy/App.tsx

@@ -0,0 +1,221 @@
+/* eslint-disable react/no-unstable-nested-components */
+/* eslint-disable react-native/no-inline-styles */
+import React, {useState} from 'react';
+import {StyleSheet, Text, View, TouchableOpacity, Image} from 'react-native';
+
+import TestConsole from './TestConsole';
+
+import _updateConfig from './update.json';
+import {PushyProvider, Pushy, usePushy} from 'react-native-update';
+const {appKey} = _updateConfig.android;
+
+function Home() {
+  const {
+    client,
+    checkUpdate,
+    downloadUpdate,
+    switchVersionLater,
+    switchVersion,
+    updateInfo,
+    packageVersion,
+    currentHash,
+    progress: {received, total} = {},
+  } = usePushy();
+  const [useDefaultAlert, setUseDefaultAlert] = useState(false);
+  const [showTestConsole, setShowTestConsole] = useState(false);
+  const [showUpdateBanner, setShowUpdateBanner] = useState(false);
+  const [showUpdateSnackbar, setShowUpdateSnackbar] = useState(false);
+  // if (updateInfo) {
+  //   updateInfo!.name = 'name';
+  //   updateInfo!.update = true;
+  // }
+  const snackbarVisible =
+    !useDefaultAlert && showUpdateSnackbar && updateInfo?.update;
+
+  if (showTestConsole) {
+    return (
+      <TestConsole visible={true} onClose={() => setShowTestConsole(false)} />
+    );
+  }
+
+  return (
+    <View style={styles.container}>
+      <Text style={styles.welcome}>欢迎使用Pushy热更新服务</Text>
+      {/* <Text style={styles.welcome}>😁hdiffFromAPP更新成功！！！</Text> */}
+      {/* <Text style={styles.welcome}>😁hdiffFromPPk更新成功！！！</Text> */}
+      <View style={{flexDirection: 'row'}}>
+        <TouchableOpacity
+          onPress={() => {
+            client?.setOptions({
+              updateStrategy: !useDefaultAlert ? null : 'alwaysAlert',
+            });
+            setShowUpdateSnackbar(useDefaultAlert);
+            setUseDefaultAlert(!useDefaultAlert);
+          }}
+          style={{
+            flexDirection: 'row',
+            alignItems: 'center',
+          }}>
+          <View
+            style={{
+              width: 20,
+              height: 20,
+              borderWidth: 1,
+              borderColor: '#999',
+              backgroundColor: useDefaultAlert ? 'blue' : 'white',
+              justifyContent: 'center',
+              alignItems: 'center',
+            }}>
+            {useDefaultAlert && <Text style={{color: 'white'}}>✓</Text>}
+          </View>
+          <Text style={{marginLeft: 8}}>
+            {' '}
+            {useDefaultAlert ? '当前使用' : '当前不使用'}默认的alert更新提示
+          </Text>
+        </TouchableOpacity>
+      </View>
+      <Image
+        resizeMode={'contain'}
+        source={require('./assets/shezhi.png')}
+        style={styles.image}
+      />
+      <Text style={styles.instructions}>
+        这是版本一 {'\n'}
+        当前原生包版本号: {packageVersion}
+        {'\n'}
+        当前热更新版本Hash: {currentHash || '(空)'}
+        {'\n'}
+      </Text>
+      <Text>
+        下载进度：{received} / {total}
+      </Text>
+      <TouchableOpacity
+        onPress={() => {
+          checkUpdate();
+          setShowUpdateSnackbar(true);
+        }}>
+        <Text style={styles.instructions}>点击这里检查更新</Text>
+      </TouchableOpacity>
+
+      <TouchableOpacity
+        testID="testcase"
+        style={{marginTop: 15}}
+        onPress={() => {
+          setShowTestConsole(true);
+        }}>
+        <Text style={styles.instructions}>
+          react-native-update版本：{client?.version}
+        </Text>
+      </TouchableOpacity>
+      {snackbarVisible && (
+        <View style={styles.overlay}>
+          <View
+            style={{
+              width: '100%',
+              backgroundColor: '#333',
+              padding: 16,
+              flexDirection: 'row',
+              justifyContent: 'space-between',
+              alignItems: 'center',
+            }}>
+            <Text style={{color: 'white'}}>
+              有新版本({updateInfo.name})可用，是否更新？
+            </Text>
+            <View style={{flexDirection: 'row'}}>
+              <TouchableOpacity
+                onPress={() => setShowUpdateSnackbar(false)}
+                style={{marginRight: 10}}>
+                <Text style={{color: 'white'}}>取消</Text>
+              </TouchableOpacity>
+              <TouchableOpacity
+                onPress={async () => {
+                  setShowUpdateSnackbar(false);
+                  await downloadUpdate();
+                  setShowUpdateBanner(true);
+                }}>
+                <Text style={{color: '#2196F3'}}>更新</Text>
+              </TouchableOpacity>
+            </View>
+          </View>
+        </View>
+      )}
+      {showUpdateBanner && (
+        <View style={styles.overlay}>
+          <View
+            style={{
+              width: '100%',
+              backgroundColor: '#fff',
+              padding: 16,
+              borderBottomWidth: 1,
+              borderBottomColor: '#eee',
+            }}>
+            <View style={{flexDirection: 'row', alignItems: 'center'}}>
+              <Text>更新已完成，是否立即重启？</Text>
+            </View>
+            <View
+              style={{
+                flexDirection: 'row',
+                justifyContent: 'flex-end',
+                marginTop: 10,
+              }}>
+              <TouchableOpacity
+                onPress={() => {
+                  switchVersionLater();
+                  setShowUpdateBanner(false);
+                }}
+                style={{marginRight: 20}}>
+                <Text style={{color: '#2196F3'}}>下次再说</Text>
+              </TouchableOpacity>
+              <TouchableOpacity onPress={switchVersion}>
+                <Text style={{color: '#2196F3'}}>立即重启</Text>
+              </TouchableOpacity>
+            </View>
+          </View>
+        </View>
+      )}
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  overlay: {
+    position: 'absolute',
+    top: 0,
+    left: 0,
+    right: 0,
+    bottom: 0,
+    backgroundColor: 'rgba(0, 0, 0, 0.5)',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: '#F5FCFF',
+  },
+  welcome: {
+    fontSize: 20,
+    textAlign: 'center',
+    margin: 10,
+  },
+  instructions: {
+    textAlign: 'center',
+    color: '#333333',
+    marginBottom: 5,
+  },
+  image: {},
+});
+
+const pushyClient = new Pushy({
+  appKey,
+  debug: true,
+});
+
+export default function HomeScreen() {
+  return (
+    <PushyProvider client={pushyClient}>
+      <Home />
+    </PushyProvider>
+  );
+}

Example/expoUsePushy/TestConsole.js

@@ -0,0 +1,274 @@
+/* eslint-disable react-native/no-inline-styles */
+/* eslint-disable react/react-in-jsx-scope */
+import {useCallback, useMemo, useState} from 'react';
+import {
+  ActivityIndicator,
+  TextInput,
+  Button,
+  StyleSheet,
+  SafeAreaView,
+  Text,
+  View,
+  TouchableOpacity,
+} from 'react-native';
+
+import {PushyModule} from 'react-native-update';
+const Hash = '9D5CE6EBA420717BE7E7D308B11F8207681B066C951D68F3994D19828F342474';
+const UUID = '00000000-0000-0000-0000-000000000000';
+const DownloadUrl = 'https://localhost:3000/diff.ppk-patch';
+const AppPatchDownloadUrl = 'https://github.com/bozaigao/test_pushy_server/raw/refs/heads/main/hdiff.app-patch';
+const AppPatchHash = 'f5ba92c7c04250d4b8a446c8267ef459';
+const PPKDownloadUrl = 'https://github.com/bozaigao/test_pushy_server/raw/refs/heads/main/hdiff.ppk-patch';
+const PPKPatchHash = '6b3d26b7d868d1f67aedadb7f0b342d9';
+const OriginHash = 'f5ba92c7c04250d4b8a446c8267ef459';
+
+
+const CustomDialog = ({title, visible, onConfirm}) => {
+  if (!visible) {
+    return null;
+  }
+
+  return (
+    <View style={styles.overlay}>
+      <View style={styles.dialog}>
+        <Text style={styles.title}>{title}</Text>
+        <TouchableOpacity
+          testID="done"
+          style={styles.button}
+          onPress={onConfirm}>
+          <Text style={styles.buttonText}>确认</Text>
+        </TouchableOpacity>
+      </View>
+    </View>
+  );
+};
+export default function TestConsole({visible, onClose}) {
+  const [text, setText] = useState('');
+  const [running, setRunning] = useState(false);
+  const [options, setOptions] = useState();
+  const [alertVisible, setAlertVisible] = useState(false);
+  const [alertMsg, setAlertMsg] = useState('');
+  const NativeTestMethod = useMemo(() => {
+    return [
+      {
+        name: 'setLocalHashInfo',
+        invoke: () => {
+          setText(
+            `setLocalHashInfo\n${Hash}\n{\"version\":\"1.0.0\",\"size\":\"19M\"}`,
+          );
+        },
+      },
+      {
+        name: 'getLocalHashInfo',
+        invoke: () => {
+          setText(`getLocalHashInfo\n${Hash}`);
+        },
+      },
+      {
+        name: 'setUuid',
+        invoke: () => {
+          setText(`setUuid\n${UUID}`);
+        },
+      },
+      {
+        name: 'reloadUpdate',
+        invoke: () => {
+          setText('reloadUpdate');
+          setOptions({hash: Hash});
+        },
+      },
+      {
+        name: 'setNeedUpdateForApp',
+        invoke: () => {
+          setText('setNeedUpdate');
+          setOptions({hash: AppPatchHash});
+        },
+      },
+      {
+        name: 'setNeedUpdateForPPK',
+        invoke: () => {
+          setText('setNeedUpdate');
+          setOptions({hash: PPKPatchHash});
+        },
+      },
+      {
+        name: 'markSuccess',
+        invoke: () => {
+          setText('markSuccess');
+          setOptions(undefined);
+        },
+      },
+      {
+        name: 'downloadPatchFromPpk',
+        invoke: () => {
+          setText('downloadPatchFromPpk');
+          setOptions({updateUrl: PPKDownloadUrl, hash: PPKPatchHash, originHash: OriginHash});
+        },
+      },
+      {
+        name: 'downloadPatchFromPackage',
+        invoke: () => {
+          setText('downloadPatchFromPackage');
+          setOptions({updateUrl: AppPatchDownloadUrl, hash: AppPatchHash});
+        },
+      },
+      {
+        name: 'downloadFullUpdate',
+        invoke: () => {
+          setText('downloadFullUpdate');
+          setOptions({updateUrl: DownloadUrl, hash: Hash});
+        },
+      },
+      {
+        name: 'downloadAndInstallApk',
+        invoke: () => {
+          setText('downloadAndInstallApk');
+          setOptions({url: DownloadUrl, target: Hash, hash: Hash});
+        },
+      },
+    ];
+  }, []);
+
+  const renderTestView = useCallback(() => {
+    const views = [];
+    for (let i = 0; i < NativeTestMethod.length; i++) {
+      views.push(
+        <TouchableOpacity
+          key={i}
+          testID={NativeTestMethod[i].name}
+          onPress={() => {
+            NativeTestMethod[i].invoke();
+          }}>
+          <Text>{NativeTestMethod[i].name}</Text>
+        </TouchableOpacity>,
+      );
+    }
+    return <View>{views}</View>;
+  }, [NativeTestMethod]);
+  if (!visible) {
+    return null;
+  }
+
+  return (
+    <SafeAreaView style={{flex: 1, padding: 10}}>
+      <View
+        style={{
+          flexDirection: 'row',
+          alignItems: 'center',
+          justifyContent: 'space-between',
+          padding: 10,
+        }}>
+        <Text>调试Pushy方法（方法名，参数，值换行）</Text>
+        <Button title="关闭" onPress={() => onClose()} />
+      </View>
+      <TextInput
+        autoCorrect={false}
+        autoCapitalize="none"
+        style={{
+          borderWidth: StyleSheet.hairlineWidth * 4,
+          borderColor: 'black',
+          height: '30%',
+          marginTop: 20,
+          marginBottom: 20,
+          padding: 10,
+          fontSize: 20,
+        }}
+        textAlignVertical="top"
+        multiline={true}
+        value={text}
+        onChangeText={setText}
+      />
+      {running && <ActivityIndicator />}
+      <TouchableOpacity
+        style={{
+          backgroundColor: 'rgb(0,140,237)',
+          justifyContent: 'center',
+          alignItems: 'center',
+          paddingTop: 10,
+          paddingBottom: 10,
+          marginBottom: 5,
+        }}
+        testID="submit"
+        onPress={async () => {
+          setRunning(true);
+          try {
+            const inputs = text.split('\n');
+            const methodName = inputs[0];
+            let params = [];
+            if (inputs.length === 1) {
+              if (options) {
+                await PushyModule[methodName](options);
+              } else {
+                await PushyModule[methodName]();
+              }
+            } else {
+              if (inputs.length === 2) {
+                params = [inputs[1]];
+              } else {
+                params = [inputs[1], inputs[2]];
+                console.log({inputs, params});
+              }
+              await PushyModule[methodName](...params);
+            }
+            setAlertVisible(true);
+            setAlertMsg('done');
+          } catch (e) {
+            setAlertVisible(true);
+            setAlertMsg(e.message);
+          }
+          setRunning(false);
+        }}>
+        <Text style={{color: 'white'}}>执行</Text>
+      </TouchableOpacity>
+      <Button title="重置" onPress={() => setText('')} />
+      {renderTestView()}
+      <CustomDialog
+        title={alertMsg}
+        visible={alertVisible}
+        onConfirm={() => {
+          setAlertVisible(false);
+        }}
+      />
+    </SafeAreaView>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  overlay: {
+    position: 'absolute',
+    top: 0,
+    left: 0,
+    right: 0,
+    bottom: 0,
+    backgroundColor: 'rgba(0, 0, 0, 0.5)',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  dialog: {
+    backgroundColor: 'white',
+    borderRadius: 10,
+    padding: 20,
+    width: '80%',
+    alignItems: 'center',
+  },
+  title: {
+    fontSize: 18,
+    fontWeight: 'bold',
+    marginBottom: 20,
+  },
+  button: {
+    backgroundColor: '#2196F3',
+    borderRadius: 5,
+    paddingVertical: 10,
+    paddingHorizontal: 20,
+  },
+  buttonText: {
+    color: 'white',
+    fontWeight: 'bold',
+  },
+});

Example/expoUsePushy/app.json

@@ -0,0 +1,29 @@
+{
+  "expo": {
+    "name": "expoUsePushy",
+    "slug": "expoUsePushy",
+    "version": "1.0.0",
+    "orientation": "portrait",
+    "icon": "./assets/icon.png",
+    "userInterfaceStyle": "light",
+    "newArchEnabled": true,
+    "splash": {
+      "image": "./assets/splash-icon.png",
+      "resizeMode": "contain",
+      "backgroundColor": "#ffffff"
+    },
+    "ios": {
+      "supportsTablet": true,
+      "bundleIdentifier": "com.anonymous.expoUsePushy"
+    },
+    "android": {
+      "adaptiveIcon": {
+        "foregroundImage": "./assets/adaptive-icon.png",
+        "backgroundColor": "#ffffff"
+      }
+    },
+    "web": {
+      "favicon": "./assets/favicon.png"
+    }
+  }
+}

Example/expoUsePushy/index.js

@@ -0,0 +1,8 @@
+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);

Example/expoUsePushy/package.json

@@ -0,0 +1,27 @@
+{
+  "name": "expousepushy",
+  "version": "1.0.0",
+  "main": "index.js",
+  "scripts": {
+    "start": "expo start",
+    "android": "expo run:android",
+    "ios": "expo run:ios",
+    "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.30.3",
+    "react-native-web": "~0.19.13"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.25.2",
+    "@types/react": "~18.3.12",
+    "typescript": "^5.3.3"
+  },
+  "private": true
+}

Example/expoUsePushy/tsconfig.json

@@ -0,0 +1,6 @@
+{
+  "extends": "expo/tsconfig.base",
+  "compilerOptions": {
+    "strict": true
+  }
+}

Example/expoUsePushy/update.json

@@ -0,0 +1,14 @@
+{
+  "ios": {
+    "appId": 29439,
+    "appKey": "jNA71vpFHTDpEqeZd9yx87zj"
+  },
+  "android": {
+    "appId": 29413,
+    "appKey": "vdZWPXU6eyaPE6Avk96-YvwK"
+  },
+  "harmony": {
+    "appId": 29140,
+    "appKey": "JLklGflGIRbY-cMebjQwm1J1"
+  }
+}

Example/harmony_use_pushy/bun.lock

@@ -4,7 +4,7 @@
     "": {
       "name": "harmony_use_pushy",
       "dependencies": {
-        "@react-native-oh/react-native-harmony": "^0.72.43",
+        "@react-native-oh/react-native-harmony": "^0.72.59",
         "react": "18.2.0",
         "react-native": "0.72.5",
         "react-native-update": "^10.26.4",

Example/harmony_use_pushy/harmony/build-profile.json5

@@ -36,10 +36,6 @@
           ]
         }
       ]
-    },
-    {
-      name: 'pushy',
-      srcPath: '../node_modules/react-native-update/harmony',
     }
   ]
 }

Example/harmony_use_pushy/harmony/entry/oh-package.json5

@@ -7,7 +7,7 @@
   "license": "",
   "dependencies": {
     "@rnoh/react-native-openharmony": "0.72.38",
-    "pushy": "file:../../node_modules/react-native-update/harmony"
+    "pushy": "file:../../node_modules/react-native-update/harmony/pushy.har",
   }
 }
 

Example/harmony_use_pushy/harmony/entry/src/main/ets/pages/Index.ets

@@ -1,4 +1,4 @@
-import { FileJSBundleProvider } from 'pushy/src/main/ets/FileJSBundleProvider';
+import { PushyFileJSBundleProvider  } from 'pushy/src/main/ets/PushyFileJSBundleProvider';
 import { ComponentBuilderContext, RNOHCoreContext,RNAbility,
   MetroJSBundleProvider } from '@rnoh/react-native-openharmony';
 import {
@@ -65,7 +65,7 @@ struct Index {
               // local debug mode
               new MetroJSBundleProvider(),
               // release mode
-              new FileJSBundleProvider(this.rnohCoreContext.uiAbilityContext),
+              new PushyFileJSBundleProvider(this.rnohCoreContext.uiAbilityContext),
               new ResourceJSBundleProvider(this.rnohCoreContext.uiAbilityContext.resourceManager, 'bundle.harmony.js')
             ]),
             this.rnohCoreContext.logger),

Example/harmony_use_pushy/harmony/entry/src/main/resources/rawfile/meta.json

@@ -1,4 +1,4 @@
 {
-    "pushy_build_time": "2025-04-12T11:12:43.423Z",
+    "pushy_build_time": "2025-04-30T02:46:33.340Z",
     "versionName": "1.0.0"
 }

Example/harmony_use_pushy/package.json

@@ -15,10 +15,10 @@
     "hash": "pushy hash /Users/yanbo.he/Desktop/HarmonyOS/react-native-pushy/Example/harmony_use_pushy/.pushy/output/harmony.1735048297258.ppk"
   },
   "dependencies": {
-    "@react-native-oh/react-native-harmony": "^0.72.43",
+    "@react-native-oh/react-native-harmony": "^0.72.59",
     "react": "18.2.0",
     "react-native": "0.72.5",
-    "react-native-update": "^10.26.4"
+    "react-native-update": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

Example/testHotUpdate/.gitignore

@@ -62,3 +62,7 @@ buck-out/
 # Ruby / CocoaPods
 /ios/Pods/
 /vendor/bundle/
+
+# react-native-update
+.update
+.pushy

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)
-    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-      // If you opted-in for the New Architecture, we load the native entry point for this app.
-      load()
-    }
+    loadReactNative(this)
   }
 }

Example/testHotUpdate/android/build.gradle

@@ -1,11 +1,11 @@
 buildscript {
     ext {
-        buildToolsVersion = "35.0.0"
+        buildToolsVersion = "36.0.0"
         minSdkVersion = 24
-        compileSdkVersion = 35
-        targetSdkVersion = 35
+        compileSdkVersion = 36
+        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.12-all.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/AppDelegate.mm

@@ -2,12 +2,14 @@
 #import "RCTPushy.h"
 
 #import <React/RCTBundleURLProvider.h>
+#import <ReactAppDependencyProvider/RCTAppDependencyProvider.h>
 
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
   self.moduleName = @"AwesomeProject";
+  self.dependencyProvider = [RCTAppDependencyProvider new];
   // You can add your custom initial props in the dictionary below.
   // They will be passed down to the ViewController used by React Native.
   self.initialProps = @{};

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,42 +14,42 @@
     "dev:harmony": "react-native bundle-harmony --dev"
   },
   "dependencies": {
-    "form-data": "^4.0.2",
+    "form-data": "^4.0.4",
     "patch-package": "^8.0.0",
-    "react": "19.0.0",
-    "react-native": "0.78.0",
-    "react-native-camera-kit": "^14.2.0",
-    "react-native-paper": "^5.13.1",
-    "react-native-safe-area-context": "^5.3.0",
-    "react-native-svg": "^15.11.2",
-    "react-native-update": "^10.26.4",
-    "react-native-vector-icons": "^10.2.0"
+    "react": "19.1.0",
+    "react-native": "0.81.4",
+    "react-native-camera-kit": "^16.1.2",
+    "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.2",
+    "react-native-vector-icons": "^10.3.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.26.0",
-    "@babel/preset-env": "^7.26.0",
-    "@babel/runtime": "^7.26.0",
-    "@react-native-community/cli": "15.0.1",
-    "@react-native-community/cli-platform-android": "15.0.1",
-    "@react-native-community/cli-platform-ios": "15.0.1",
-    "@react-native/babel-preset": "0.78.0",
-    "@react-native/eslint-config": "0.78.0",
-    "@react-native/metro-config": "0.78.0",
-    "@react-native/typescript-config": "0.78.0",
-    "@types/react": "^19.0.0",
-    "@types/react-test-renderer": "^19.0.0",
-    "detox": "^20.32.0",
-    "eslint": "^8.19.0",
+    "@babel/core": "^7.27.3",
+    "@babel/preset-env": "^7.27.2",
+    "@babel/runtime": "^7.27.3",
+    "@react-native-community/cli": "20.0.0",
+    "@react-native-community/cli-platform-android": "20.0.0",
+    "@react-native-community/cli-platform-ios": "20.0.0",
+    "@react-native/babel-preset": "0.81.4",
+    "@react-native/eslint-config": "0.81.4",
+    "@react-native/metro-config": "0.81.4",
+    "@react-native/typescript-config": "0.81.4",
+    "@types/react": "^19.1.13",
+    "@types/react-test-renderer": "^19.1.0",
+    "detox": "^20.41.2",
+    "eslint": "^9.35.0",
     "jest": "^29.6.3",
     "prettier": "2.8.8",
-    "react-test-renderer": "19.0.0",
-    "typescript": "5.8.2"
+    "react-test-renderer": "19.1.1",
+    "typescript": "5.8.3"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "trustedDependencies": [
     "detox",
     "dtrace-provider"
   ]
-}
+}

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 {LocalSvg} from 'react-native-svg/css';
+import { Camera } from 'react-native-camera-kit';
+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';
-const {appKey} = _updateConfig[Platform.OS];
+import { UpdateProvider, Pushy, Cresc, useUpdate } from 'react-native-update';
+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>
-      <View style={{flexDirection: 'row'}}>
+      <Text style={styles.welcome}>欢迎22使用Pushy热更新服务</Text>
+      <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"]
+}

Example/testHotUpdate/update.json

@@ -1,7 +1,7 @@
 {
   "ios": {
-    "appId": 24794,
-    "appKey": "SqShg4Klnj2hG6LAFMW2PdcgSSuniz0T"
+    "appId": 28943,
+    "appKey": "d-OmPxIBivPrDfKhLHjxN-HS"
   },
   "android": {
     "appId": 27509,

android/build.gradle

@@ -22,21 +22,49 @@ def supportsNamespace() {
   return major >= 8
 }
 
-def isExpoProject() {
+def checkProjectInfo() {
     def hasExpoModulesCore = rootProject.subprojects.any { it.name == 'expo-modules-core' }
-
     def packageJsonFile = new File(rootProject.projectDir.parentFile, 'package.json')
+    
     def hasExpoDependency = false
+    def projectVersion = '1.0.0' // Default version
+
     if (packageJsonFile.exists()) {
         def packageJson = new groovy.json.JsonSlurper().parseText(packageJsonFile.text)
-        hasExpoDependency = (packageJson.dependencies?.expo != null) || 
-                           (packageJson.devDependencies?.expo != null)
+        projectVersion = packageJson.version ?: '1.0.0' // Get project version
+
+        // Check for expo dependency and version >= 50
+        String expoVersionString = packageJson.dependencies?.expo ?: packageJson.devDependencies?.expo
+        boolean expoVersionIsHighEnough = false
+        if (expoVersionString) {
+            try {
+                // Extract the first number sequence as the major version
+                def matcher = (expoVersionString =~ /(\d+)/)
+                if (matcher.find()) {
+                    int majorVersion = matcher[0][0].toInteger()
+                    if (majorVersion >= 50) {
+                        expoVersionIsHighEnough = true
+                    }
+                }
+            } catch (NumberFormatException e) {
+                // Handle error if version parsing fails, maybe log a warning
+                println "Warning: Could not parse Expo version string: ${expoVersionString}"
+            }
+        }
+        hasExpoDependency = expoVersionIsHighEnough // Update based on version check
     }
     
-    return hasExpoModulesCore || hasExpoDependency
+    def isExpo = hasExpoModulesCore && hasExpoDependency
+    
+    // Return a map containing both pieces of information
+    return [isExpo: isExpo, version: projectVersion]
 }
 
-def expoProject = isExpoProject()
+// Get project info map
+def projectInfo = checkProjectInfo()
+// Extract info into variables
+def projectVersion = projectInfo.version
+def expoProject = projectInfo.isExpo
 
 apply plugin: 'com.android.library'
 if (isNewArchitectureEnabled()) {
@@ -45,16 +73,16 @@ if (isNewArchitectureEnabled()) {
 
 if (expoProject) {
     group = 'expo.modules.pushy'
-    version = '1.0.0'
+    version = projectVersion
 
     def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
     apply from: expoModulesCorePlugin
     applyKotlinExpoModulesCorePlugin()
+    // useExpoPublishing()
     useCoreDependencies()
-    useExpoPublishing()
 } else {
     group = 'cn.reactnative.modules.update'
-    version = '1.0.0'
+    version = projectVersion
 }
 
 android {
@@ -73,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()
     }
@@ -120,7 +148,6 @@ repositories {
 dependencies {
     implementation 'com.facebook.react:react-native:+'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
-    implementation 'com.jakewharton:process-phoenix:3.0.0'
 }
 if (isNewArchitectureEnabled()) {
     react {

android/proguard.pro

@@ -1,3 +1,18 @@
+# Keep our update module classes
 -keepnames class cn.reactnative.modules.update.DownloadTask { *; }
 -keepnames class cn.reactnative.modules.update.UpdateModuleImpl { *; }
--keepnames class com.facebook.react.ReactInstanceManager { *; }
+-keepnames class cn.reactnative.modules.update.** { *; }
+
+# Keep React Native classes
+-keepnames class com.facebook.react.ReactInstanceManager { *; }
+-keepnames class com.facebook.react.** { *; }
+-keepnames class com.facebook.react.bridge.** { *; }
+-keepnames class com.facebook.react.devsupport.** { *; }
+
+# Keep fields used in reflection
+-keepclassmembers class com.facebook.react.ReactActivity { *; }
+-keepclassmembers class com.facebook.react.ReactInstanceManager { *; }
+-keepclassmembers class com.facebook.react.ReactDelegate { *; }
+-keepclassmembers class com.facebook.react.ReactHost { *; }
+
+-keepnames class expo.modules.ExpoReactHostFactory$ExpoReactHostDelegate { *; }

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();
@@ -169,17 +187,19 @@ public class UpdateContext {
     }
 
     public void markSuccess() {
-        SharedPreferences.Editor editor = sp.edit();
-        editor.putBoolean("firstTimeOk", true);
-        String lastVersion = sp.getString("lastVersion", null);
-        String curVersion = sp.getString("currentVersion", null);
-        if (lastVersion != null && !lastVersion.equals(curVersion)) {
-            editor.remove("lastVersion");
-            editor.remove("hash_" + lastVersion);
-        }
-        editor.apply();
+        if (!BuildConfig.DEBUG) {
+            SharedPreferences.Editor editor = sp.edit();
+            editor.putBoolean("firstTimeOk", true);
+            String lastVersion = sp.getString("lastVersion", null);
+            String curVersion = sp.getString("currentVersion", null);
+            if (lastVersion != null && !lastVersion.equals(curVersion)) {
+                editor.remove("lastVersion");
+                editor.remove("hash_" + lastVersion);
+            }
+            editor.apply();
 
-        this.cleanUp();
+            this.cleanUp();
+        }
     }
 
     public void clearFirstTime() {

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,17 +175,26 @@ 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);
 
-                        // Access the mReactHostDelegate field
-                        Field reactHostDelegateField = reactHost.getClass().getDeclaredField("mReactHostDelegate");
+                        Field devSupport = getCompatibleField(reactHost.getClass(), "useDevSupport");
+                        devSupport.setAccessible(true);
+                        devSupport.set(reactHost, false);
+
+                        // Access the ReactHostDelegate field (compatible with mReactHostDelegate/reactHostDelegate)
+                        Field reactHostDelegateField = getCompatibleField(reactHost.getClass(), "reactHostDelegate");
                         reactHostDelegateField.setAccessible(true);
                         Object reactHostDelegate = reactHostDelegateField.get(reactHost);
 
+                        String bundleFieldName = "jsBundleLoader";
+                        if (reactHostDelegate.getClass().getCanonicalName().equals("expo.modules.ExpoReactHostFactory.ExpoReactHostDelegate")) {
+                            bundleFieldName = "_jsBundleLoader";
+                        }
+
                         // Modify the jsBundleLoader field
-                        Field jsBundleLoaderField = reactHostDelegate.getClass().getDeclaredField("jsBundleLoader");
+                        Field jsBundleLoaderField = reactHostDelegate.getClass().getDeclaredField(bundleFieldName);
                         jsBundleLoaderField.setAccessible(true);
                         jsBundleLoaderField.set(reactHostDelegate, loader);
                         

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

@@ -4,6 +4,8 @@ import static androidx.core.content.FileProvider.getUriForFile;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Handler;
+import android.os.Looper;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
@@ -17,6 +19,7 @@ import java.util.Map;
 public class UpdateModule extends NativePushySpec {
     UpdateContext updateContext;
     public static ReactApplicationContext mContext;
+    private final Handler handler = new Handler(Looper.getMainLooper());
     public UpdateModule(ReactApplicationContext reactContext, UpdateContext updateContext) {
         super(reactContext);
         this.updateContext = updateContext;
@@ -32,18 +35,30 @@ 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();
         constants.put("isFirstTime", isFirstTime);
         if (isFirstTime) {
-            updateContext.clearFirstTime();
+            handler.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    updateContext.clearFirstTime();
+                }
+            }, 2000);
         }
         String rolledBackVersion = updateContext.rolledBackVersion();
         constants.put("rolledBackVersion", rolledBackVersion);
         if (rolledBackVersion != null) {
-            updateContext.clearRollbackMark();
+            handler.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    updateContext.clearRollbackMark();
+                }
+            }, 2000);
         }
         constants.put("uuid", updateContext.getKv("uuid"));
         return constants;

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

@@ -20,7 +20,6 @@ import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.JSBundleLoader;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.jakewharton.processphoenix.ProcessPhoenix;
 
 import java.io.File;
 import java.lang.reflect.Field;
@@ -49,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/oh_modules/@rnoh/react-native-openharmony

@@ -1 +0,0 @@
-../../../../../harmony/oh_modules/.ohpm/@rnoh+react-native-openharmony@0.72.38/oh_modules/@rnoh/react-native-openharmony

harmony/pushy/src/main/cpp/PushyTurboModule.cpp

@@ -73,7 +73,7 @@ static jsi::Value _hostFunction_PushyTurboModule_downloadPatchFromPpk(
     const jsi::Value* args,
     size_t count)
     {
-        return jsi::Value(static_cast<ArkTSTurboModule &> (turboModule).call(rt,"downloadPatchFromPpk", args, count));
+        return jsi::Value(static_cast<ArkTSTurboModule &> (turboModule).callAsync(rt,"downloadPatchFromPpk", args, count));
     }
 
 static jsi::Value _hostFunction_PushyTurboModule_downloadPatchFromPackage(
@@ -82,7 +82,7 @@ static jsi::Value _hostFunction_PushyTurboModule_downloadPatchFromPackage(
     const jsi::Value* args,
     size_t count)
     {
-        return jsi::Value(static_cast<ArkTSTurboModule &> (turboModule).call(rt,"downloadPatchFromPackage", args, count));
+        return jsi::Value(static_cast<ArkTSTurboModule &> (turboModule).callAsync(rt,"downloadPatchFromPackage", args, count));
     }
 
 static jsi::Value _hostFunction_PushyTurboModule_downloadFullUpdate(
@@ -91,7 +91,7 @@ static jsi::Value _hostFunction_PushyTurboModule_downloadFullUpdate(
     const jsi::Value* args,
     size_t count)
     {
-        return jsi::Value(static_cast<ArkTSTurboModule &> (turboModule).call(rt,"downloadFullUpdate", args, count));
+        return jsi::Value(static_cast<ArkTSTurboModule &> (turboModule).callAsync(rt,"downloadFullUpdate", args, count));
     }
 
 static jsi::Value _hostFunction_PushyTurboModule_downloadAndInstallApk(
@@ -100,7 +100,7 @@ static jsi::Value _hostFunction_PushyTurboModule_downloadAndInstallApk(
     const jsi::Value* args,
     size_t count)
     {
-        return jsi::Value(static_cast<ArkTSTurboModule &> (turboModule).call(rt,"downloadAndInstallApk", args, count));
+        return jsi::Value(static_cast<ArkTSTurboModule &> (turboModule).callAsync(rt,"downloadAndInstallApk", args, count));
     }
 
 

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);

harmony/pushy/src/main/ets/PushyFileJSBundleProvider.ets

@@ -3,7 +3,7 @@ import fileIo from '@ohos.file.fs';
 import common from '@ohos.app.ability.common';
 import { UpdateContext } from './UpdateContext';
 
-export class FileJSBundleProvider extends JSBundleProvider {
+export class PushyFileJSBundleProvider extends JSBundleProvider {
   private updateContext: UpdateContext;
   private filePath: string = ''
 
@@ -12,7 +12,7 @@ export class FileJSBundleProvider extends JSBundleProvider {
     this.updateContext = new UpdateContext(context);
   }
   getURL(): string {
-    return this.updateContext.getBundleUrl();
+    return this.updateContext.getBundleUrl().substring(1);
   }
 
   async getBundle(): Promise<ArrayBuffer> {

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> {
-    return UpdateModuleImpl.getLocalHashInfo(this.context,hash);
+  getLocalHashInfo(hash: string): string {
+    return UpdateModuleImpl.getLocalHashInfo(this.context, hash);
   }
 
   async setUuid(uuid: string): Promise<boolean>  {

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

@@ -0,0 +1,281 @@
+import preferences from '@ohos.data.preferences';
+import bundleManager from '@ohos.bundle.bundleManager';
+import fileIo from '@ohos.file.fs';
+import { DownloadTask } from './DownloadTask';
+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;
+
+  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}`);
+    }
+    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 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;
+  }
+
+  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;
+  }
+}
+
+export interface DownloadFileListener {
+  onDownloadCompleted(params: DownloadTaskParams): void;
+  onDownloadFailed(error: Error): void;
+}

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

harmony/src/main/ets/UpdateContext.ts

@@ -1,254 +0,0 @@
-import preferences from '@ohos.data.preferences';
-import bundleManager from '@ohos.bundle.bundleManager';
-import fileIo from '@ohos.file.fs';
-import { DownloadTask } from './DownloadTask';
-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;
-
-    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}`);
-        }
-        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 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 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;
-    }
-}
-
-export interface DownloadFileListener {
-    onDownloadCompleted(params: DownloadTaskParams): void;
-    onDownloadFailed(error: Error): void;
-}

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];
@@ -93,8 +110,7 @@ RCT_EXPORT_MODULE(RCTPushy);
             BOOL needRollback = (!ignoreRollback && isFirstTime == NO && isFirstLoadOK == NO) || loadVersion.length<=0;
             if (needRollback) {
                 loadVersion = [self rollback];
-            }
-            else if (isFirstTime && !ignoreRollback){
+            } else if (isFirstTime && !ignoreRollback){
                 // bundleURL may be called many times, ignore rollbacks before process restarted again.
                 ignoreRollback = true;
 
@@ -116,7 +132,6 @@ RCT_EXPORT_MODULE(RCTPushy);
                     loadVersion = [self rollback];
                 }
             }
-        }
     }
     
     return [RCTPushy binaryBundleURL];
@@ -128,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),
-                              paramPackageVersion:curPackageVersion}
+                              paramIsFirstLoadOk:@(YES)}
                      forKey:keyPushyInfo];
     }
     else {
@@ -163,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"]) {
@@ -297,39 +314,38 @@ RCT_EXPORT_METHOD(setNeedUpdate:(NSDictionary *)options
         newInfo[paramLastVersion] = lastVersion;
         newInfo[paramIsFirstTime] = @(YES);
         newInfo[paramIsFirstLoadOk] = @(NO);
-        newInfo[paramPackageVersion] = [RCTPushy packageVersion];
         [defaults setObject:newInfo forKey:keyPushyInfo];
         
         
         resolve(@true);
-    }else{
+    } else {
         reject(@"执行报错", nil, nil);
     }
 }
 
 RCT_EXPORT_METHOD(reloadUpdate:(NSDictionary *)options
                   resolver:(RCTPromiseResolveBlock)resolve
-                                    rejecter:(RCTPromiseRejectBlock)reject)
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
     @try {
         NSString *hash = options[@"hash"];
         if (hash.length) {
-            [self setNeedUpdate:options resolver:resolve rejecter:reject];
-            
-            // reload in earlier version
-            dispatch_async(dispatch_get_main_queue(), ^{
-                [self.bridge setValue:[[self class] bundleURL] forKey:@"bundleURL"];
-                [self.bridge reload];
-            });
-            
-            #if __has_include("RCTReloadCommand.h")
-                // reload 0.62+
-                RCTReloadCommandSetBundleURL([[self class] bundleURL]);
-                RCTTriggerReloadCommandListeners(@"pushy reload");
-            #endif
-
-            resolve(@true);
-        }else{
+            // 只在 setNeedUpdate 成功后 resolve
+            [self setNeedUpdate:options resolver:^(id result) {
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    #if __has_include("RCTReloadCommand.h")
+                        // reload 0.62+
+                        RCTReloadCommandSetBundleURL([[self class] bundleURL]);
+                        RCTTriggerReloadCommandListeners(@"pushy reloadUpdate");
+                    #else
+                        [self.bridge reload];
+                    #endif
+                });
+                resolve(@true);
+            } rejecter:^(NSString *code, NSString *message, NSError *error) {
+                reject(code, message, error);
+            }];
+        } else {
             reject(@"执行报错", nil, nil);
         }
     }
@@ -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,28 +1,29 @@
 {
   "name": "react-native-update",
-  "version": "10.28.4",
+  "version": "10.32.0",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {
-    "prepack": "yarn submodule && yarn lint",
+    "postinstall": "node scripts/check-expo-version.js",
+    "prepack": "bun submodule && bun lint",
     "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": "yarn 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:ios-debug": "cd Example/testHotUpdate && yarn && detox build --configuration ios.sim.debug",
-    "build:ios-release": "cd Example/testHotUpdate && yarn && detox build --configuration ios.sim.release",
+    "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: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",
-    "test:ios-release": "cd Example/testHotUpdate && yarn detox test --configuration ios.sim.release",
-    "build:android-debug": "cd Example/testHotUpdate && yarn && detox build --configuration android.emu.debug",
-    "build:android-release": "cd Example/testHotUpdate && yarn && detox build --configuration android.emu.release",
-    "test:android-release": "cd Example/testHotUpdate && yarn detox test --configuration android.emu.release --headless --record-logs all",
+    "test:ios-release": "cd Example/testHotUpdate && bun detox test --configuration ios.sim.release",
+    "build:android-debug": "cd Example/testHotUpdate && bun && detox build --configuration android.emu.debug",
+    "build:android-release": "cd Example/testHotUpdate && bun && detox build --configuration android.emu.release",
+    "test:android-release": "cd Example/testHotUpdate && bun detox test --configuration android.emu.release --headless --record-logs all",
     "test:android-debug": "cd Example/testHotUpdate && detox test --configuration android.emu.debug --headless --record-logs all",
-    "e2e:ios": "npm run build:ios-release && npm run test:ios-release",
-    "e2e:android": "npm run build:android-release && npm run test:android-release",
-    "tests:emulator:prepare": "cd .github/workflows/scripts/functions && yarn && yarn build",
-    "tests:emulator:start-ci": "yarn tests:emulator:prepare && cd ./.github/workflows/scripts && ./start-firebase-emulator.sh",
+    "e2e:ios": "bun build:ios-release && bun test:ios-release",
+    "e2e:android": "bun build:android-release && bun test:android-release",
+    "tests:emulator:prepare": "cd .github/workflows/scripts/functions && bun && bun build",
+    "tests:emulator:start-ci": "bun tests:emulator:prepare && cd ./.github/workflows/scripts && ./start-firebase-emulator.sh",
     "tests:packager:jet-ci": "cd Example/testHotUpdate && cross-env TMPDIR=$HOME/.metro REACT_DEBUGGER=\"echo nope\" node_modules/.bin/react-native start --no-interactive",
-    "tests:ios:pod:install": "cd Example/testHotUpdate && yarn && yarn pod-install"
+    "tests:ios:pod:install": "cd Example/testHotUpdate && bun && bun pod-install"
   },
   "repository": {
     "type": "git",
@@ -56,24 +57,20 @@
   "devDependencies": {
     "@babel/core": "^7.25.8",
     "@react-native/babel-preset": "^0.73.21",
-    "@react-native/eslint-config": "^0.73.2",
-    "@react-native/typescript-config": "^0.74.0",
-    "@types/fs-extra": "^11.0.4",
-    "@types/jest": "^29.5.13",
-    "@types/node": "^22.7.6",
+    "@react-native/eslint-config": "0.79.1",
+    "@react-native/typescript-config": "0.79.1",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^22.15.2",
     "@types/react": "^18.3.11",
-    "detox": "^20.27.3",
+    "detox": "^20.37.0",
     "eslint": "^8.57.0",
-    "eslint-plugin-ft-flow": "^3.0.7",
     "firebase-tools": "^13.22.1",
-    "fs-extra": "^11.2.0",
     "jest": "^29.7.0",
-    "pod-install": "^0.2.2",
+    "pod-install": "^0.3.7",
     "prettier": "^2",
     "react": "18.2.0",
     "react-native": "0.73",
-    "ts-jest": "^29.2.5",
+    "ts-jest": "^29.3.2",
     "typescript": "^5.6.3"
-  },
-  "packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
+  }
 }

react-native-update.podspec

@@ -1,13 +1,83 @@
 require 'json'
 require 'rubygems' # Required for version comparison
 
+
 new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
-
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
-
 podspec_dir = File.dirname(__FILE__)
 
 Pod::Spec.new do |s|
+
+  is_expo_in_podfile = false
+  begin
+    # Check Podfile for use_expo_modules!
+    podfile_path = File.join(Pod::Config.instance.installation_root, 'Podfile')
+    if File.exist?(podfile_path)
+      podfile_content = File.read(podfile_path)
+      is_expo_in_podfile = podfile_content.include?('use_expo_modules!')
+    end
+  rescue => e
+     # Silently ignore errors during check
+  end
+
+  # Determine final validity by checking Podfile presence AND Expo version
+  valid_expo_project = false # Default
+  if is_expo_in_podfile
+    # Only check expo version if use_expo_modules! is present
+    is_version_sufficient = false
+    begin
+        expo_version_str = `node --print \"require('expo/package.json').version\"`.strip
+        if expo_version_str && !expo_version_str.empty?
+          match = expo_version_str.match(/^\d+/)
+          if match
+            major_version = match[0].to_i
+            is_version_sufficient = major_version >= 50
+          end
+        end
+    rescue
+        # Node command failed, version remains insufficient
+    end
+    
+    # Final check
+    valid_expo_project = is_version_sufficient
+  end
+
+  # Set platform based on whether it's a valid Expo project and if we can parse its target
+  final_ios_deployment_target = '11.0' # Default target
+
+  if valid_expo_project
+    # --- Try to find and parse ExpoModulesCore.podspec only if it's an Expo project ---
+    parsed_expo_ios_target = nil
+    expo_modules_core_podspec_path = begin
+        package_json_path = `node -p "require.resolve('expo-modules-core/package.json')"`.strip
+        File.join(File.dirname(package_json_path), 'ExpoModulesCore.podspec') if $?.success? && package_json_path && !package_json_path.empty?
+    rescue
+        nil
+    end
+
+    if expo_modules_core_podspec_path && File.exist?(expo_modules_core_podspec_path)
+      begin
+        content = File.read(expo_modules_core_podspec_path)
+        match = content.match(/s\.platforms\s*=\s*\{[\s\S]*?:ios\s*=>\s*'([^\']+)'/) # Match within s.platforms hash
+        if match && match[1]
+          parsed_expo_ios_target = match[1]
+        else
+          match = content.match(/s\.platform\s*=\s*:ios,\s*'([^\']+)'/) # Fallback to s.platform = :ios, 'version'
+          if match && match[1]
+            parsed_expo_ios_target = match[1]
+          end
+        end
+      rescue => e
+        # Pod::UI.warn "Failed to read or parse ExpoModulesCore.podspec content: #{e.message}"
+      end
+    end
+    if parsed_expo_ios_target
+        final_ios_deployment_target = parsed_expo_ios_target
+    end
+  end
+
+  s.platforms = { :ios => final_ios_deployment_target }
+
   s.name         = package['name']
   s.version      = package['version']
   s.summary      = package['description']
@@ -17,10 +87,9 @@ Pod::Spec.new do |s|
   s.homepage     = package['homepage']
 
   s.cocoapods_version = '>= 1.6.0'
-  s.platform = :ios, "8.0"
-  s.platforms = { :ios => "11.0" }
+
   s.source = { :git => 'https://github.com/reactnativecn/react-native-update.git', :tag => '#{s.version}' }
-  s.source_files    = Dir.glob("ios/**/*.{h,m,mm,swift}").reject { |f| f.start_with?("ios/Expo/") }
+
   s.libraries = 'bz2', 'z'
   s.vendored_libraries = 'RCTPushy/libRCTPushy.a'
   s.pod_target_xcconfig = { 
@@ -34,64 +103,47 @@ Pod::Spec.new do |s|
   s.dependency "React-Core"
   s.dependency 'SSZipArchive'
 
-  is_expo_project = false
-  expo_dependency_added = false
-  supports_bundle_url_final = false
-
-  # Use CocoaPods mechanism to find Podfile
-  begin
-    podfile_path = File.join(Pod::Config.instance.installation_root, 'Podfile')
-    if File.exist?(podfile_path)
-      podfile_content = File.read(podfile_path)
-      is_expo_project = podfile_content.include?('use_expo_modules!')
-    end
-  rescue
-    # Silently skip if CocoaPods config is not available
-  end
-
-  if is_expo_project
+  # Conditionally add Expo dependency
+  if valid_expo_project
+    s.public_header_files = ['ios/ImportReact.h']
     s.dependency 'ExpoModulesCore'
-    expo_dependency_added = true
-
-    # Current directory is in node_modules/react-native-update, so parent is node_modules
-    expo_core_package_json_path = File.join(__dir__, '..', 'expo-modules-core', 'package.json')
-
-    if File.exist?(expo_core_package_json_path)
-      begin
-        core_package_json = JSON.parse(File.read(expo_core_package_json_path))
-        installed_version_str = core_package_json['version']
-
-        if installed_version_str
-          begin
-            installed_version = Gem::Version.new(installed_version_str)
-            target_version = Gem::Version.new('1.12.0')
-            supports_bundle_url_final = installed_version >= target_version
-          rescue ArgumentError
-            # Silently skip version parsing errors
-          end
-        end
-      rescue JSON::ParserError, StandardError
-        # Silently skip file reading and parsing errors
-      end
-    end
   end
 
   s.subspec 'RCTPushy' do |ss|
-    ss.source_files = 'ios/RCTPushy/*.{h,m,mm,swift}'
-    ss.public_header_files = ['ios/RCTPushy/RCTPushy.h']
-  end
-
-  s.subspec 'HDiffPatch' do |ss|
-    ss.source_files = ['ios/RCTPushy/HDiffPatch/**/*.{h,m,c}',
+    ss.source_files = ['ios/RCTPushy/**/*.{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/HDiffPatch/**/*.h'
+    ss.public_header_files = ['ios/RCTPushy/**/*.h']
   end
 
-  if expo_dependency_added
+  # Conditionally add Expo subspec and check ExpoModulesCore version
+  if valid_expo_project
+    supports_bundle_url_final = false # Default
+
+    # 1. Try executing node to get the version string
+    expo_modules_core_version_str = begin
+      # Use node to directly require expo-modules-core/package.json and get its version
+      `node --print \"require('expo-modules-core/package.json').version\"` # Execute, keep raw output
+    rescue
+      # Node command failed (e.g., node not found, package not found). Return empty string.
+      ''
+    end
+
+    # 2. Process the obtained version string (if not empty)
+    if expo_modules_core_version_str && !expo_modules_core_version_str.empty?
+        begin
+            # Compare versions using Gem::Version (handles trailing newline)
+            installed_version = Gem::Version.new(expo_modules_core_version_str)
+            target_version = Gem::Version.new('1.12.0')
+            supports_bundle_url_final = installed_version >= target_version
+        rescue ArgumentError
+            # If Gem::Version fails parsing, supports_bundle_url_final remains false.
+        end
+    end
+
     s.subspec 'Expo' do |ss|
       ss.source_files = 'ios/Expo/**/*.{h,m,mm,swift}'
       if supports_bundle_url_final

scripts/check-expo-version.js

@@ -0,0 +1,92 @@
+const ownPackageJson = require('../package.json');
+
+if (process.env.npm_package_name === ownPackageJson.name) {
+  console.log('Skipping postinstall during local development.');
+  process.exit(0);
+}
+
+const fs = require('fs');
+const path = require('path');
+
+const projectRoot = path.resolve(__dirname, '..'); // react-native-update module root
+const expoConfigPath = path.resolve(projectRoot, 'expo-module.config.json');
+
+function getExpoMajorVersion() {
+  let resolvedExpoPackagePath;
+  try {
+    // Use require.resolve to find expo's package.json from the host project's perspective
+    resolvedExpoPackagePath = require.resolve('expo/package.json', {
+      paths: [path.resolve(projectRoot, '..', '..')],
+    });
+  } catch (e) {
+    console.log(
+      'Expo not found in project node_modules (via require.resolve).',
+    );
+    return null; // Expo not found or resolvable
+  }
+
+  // Check if the resolved path actually exists (belt-and-suspenders)
+  if (!fs.existsSync(resolvedExpoPackagePath)) {
+    console.log(
+      `Expo package.json path resolved to ${resolvedExpoPackagePath}, but file does not exist.`,
+    );
+    return null;
+  }
+
+  try {
+    const packageJson = JSON.parse(
+      fs.readFileSync(resolvedExpoPackagePath, 'utf8'),
+    );
+    const version = packageJson.version;
+    if (!version) {
+      console.log('Expo package.json does not contain a version.');
+      return null; // Version not found
+    }
+
+    // Extract the first number sequence as the major version
+    const match = version.match(/\d+/);
+    if (!match) {
+      console.log(
+        `Could not parse major version from Expo version string: ${version}`,
+      );
+      return null; // Cannot parse version
+    }
+
+    return parseInt(match[0], 10);
+  } catch (error) {
+    console.error('Error reading or parsing Expo package.json:', error);
+    return null; // Error during processing
+  }
+}
+
+function checkAndCleanExpoConfig() {
+  const majorVersion = getExpoMajorVersion();
+
+  // Condition: Expo not found OR major version is less than 50
+  if (majorVersion === null || majorVersion < 50) {
+    if (fs.existsSync(expoConfigPath)) {
+      try {
+        fs.unlinkSync(expoConfigPath);
+        console.log(
+          `Expo version (${
+            majorVersion !== null ? majorVersion : 'not found'
+          }) is < 50 or Expo not found. Deleted ${expoConfigPath}`,
+        );
+      } catch (error) {
+        console.error(`Failed to delete ${expoConfigPath}:`, error);
+      }
+    } else {
+      console.log(
+        `Expo version (${
+          majorVersion !== null ? majorVersion : 'not found'
+        }) is < 50 or Expo not found. ${expoConfigPath} does not exist, no action needed.`,
+      );
+    }
+  } else {
+    console.log(
+      `Expo version (${majorVersion}) is >= 50. Kept ${expoConfigPath}`,
+    );
+  }
+}
+
+checkAndCleanExpoConfig();

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

@@ -1,33 +1,34 @@
-import { CheckResult, ClientOptions, ProgressData, EventType } from './type';
 import {
-  assertDev,
+  DeviceEventEmitter,
+  EmitterSubscription,
+  Platform,
+} from 'react-native';
+import {
+  PushyModule,
+  buildTime,
+  cInfo,
+  currentVersion,
+  getCurrentVersionInfo,
+  isFirstTime,
+  isRolledBack,
+  packageVersion,
+  pushyNativeEventEmitter,
+  rolledBackVersion,
+  setLocalHashInfo,
+} from './core';
+import { PermissionsAndroid } from './permissions';
+import { CheckResult, ClientOptions, EventType, ProgressData } from './type';
+import {
   assertWeb,
   emptyObj,
+  enhancedFetch,
   joinUrls,
   log,
   noop,
   promiseAny,
   testUrls,
 } from './utils';
-import {
-  EmitterSubscription,
-  Platform,
-  DeviceEventEmitter,
-} from 'react-native';
-import { PermissionsAndroid } from './permissions';
-import {
-  PushyModule,
-  buildTime,
-  cInfo,
-  pushyNativeEventEmitter,
-  currentVersion,
-  packageVersion,
-  rolledBackVersion,
-  setLocalHashInfo,
-  isFirstTime,
-  isRolledBack,
-  getCurrentVersionInfo,
-} from './core';
+import i18n from './i18n';
 
 const SERVER_PRESETS = {
   // cn
@@ -91,7 +92,7 @@ export class Pushy {
   options = defaultClientOptions;
   clientType: 'Pushy' | 'Cresc' = 'Pushy';
   lastChecking?: number;
-  lastRespJson?: Promise<any>;
+  lastRespJson?: Promise<CheckResult>;
 
   version = cInfo.rnu;
   loggerPromise = (() => {
@@ -106,13 +107,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 Error(i18n.t('error_appkey_required'));
+      }
+    }
+
     this.setOptions(options);
     if (isRolledBack) {
       this.report({
@@ -135,6 +141,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 +164,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 +172,7 @@ export class Pushy {
         currentVersion,
         cInfo,
         packageVersion,
+        overridePackageVersion,
         buildTime,
         message,
         ...info,
@@ -170,11 +188,9 @@ export class Pushy {
   getCheckUrl = (endpoint: string = this.options.server!.main) => {
     return `${endpoint}/checkUpdate/${this.options.appKey}`;
   };
-  assertDebug = () => {
+  assertDebug = (matter: string) => {
     if (__DEV__ && !this.options.debug) {
-      console.info(
-        'You are currently in the development environment and have not enabled debug mode. The hot update check will not be performed. If you need to debug hot updates in the development environment, please set debug to true in the client.',
-      );
+      console.info(this.t('dev_debug_disabled', { matter }));
       return false;
     }
     return true;
@@ -188,7 +204,7 @@ export class Pushy {
     this.report({ type: 'markSuccess' });
   };
   switchVersion = async (hash: string) => {
-    if (!assertDev('switchVersion()')) {
+    if (!this.assertDebug('switchVersion()')) {
       return;
     }
     if (assertHash(hash) && !sharedState.applyingUpdate) {
@@ -199,7 +215,7 @@ export class Pushy {
   };
 
   switchVersionLater = async (hash: string) => {
-    if (!assertDev('switchVersionLater()')) {
+    if (!this.assertDebug('switchVersionLater()')) {
       return;
     }
     if (assertHash(hash)) {
@@ -208,7 +224,7 @@ export class Pushy {
     }
   };
   checkUpdate = async (extra?: Record<string, any>) => {
-    if (!this.assertDebug()) {
+    if (!this.assertDebug('checkUpdate()')) {
       return;
     }
     if (!assertWeb()) {
@@ -231,7 +247,7 @@ export class Pushy {
     }
     this.lastChecking = now;
     const fetchBody = {
-      packageVersion,
+      packageVersion: this.options.overridePackageVersion || packageVersion,
       hash: currentVersion,
       buildTime,
       cInfo,
@@ -261,33 +277,47 @@ export class Pushy {
         type: 'checking',
         message: this.options.appKey + ': ' + stringifyBody,
       });
-      resp = await fetch(this.getCheckUrl(), fetchPayload);
+      resp = await enhancedFetch(this.getCheckUrl(), fetchPayload);
     } 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) {
         try {
           resp = await promiseAny(
             backupEndpoints.map(endpoint =>
-              fetch(this.getCheckUrl(endpoint), fetchPayload),
+              enhancedFetch(this.getCheckUrl(endpoint), fetchPayload),
             ),
           );
         } catch (err: any) {
-          this.throwIfEnabled(new Error('errorCheckingUseBackup'));
+          this.throwIfEnabled(Error('errorCheckingUseBackup'));
         }
       } else {
-        this.throwIfEnabled(new Error('errorCheckingGetBackup'));
+        this.throwIfEnabled(Error('errorCheckingGetBackup'));
       }
     }
     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'));
+      this.throwIfEnabled(Error('errorChecking'));
+      return this.lastRespJson ? await this.lastRespJson : emptyObj;
+    }
+
+    if (!resp.ok) {
+      const respText = await resp.text();
+      const errorMessage = this.t('error_http_status', {
+        status: resp.status,
+        statusText: respText,
+      });
+      this.report({
+        type: 'errorChecking',
+        message: errorMessage,
+      });
+      this.throwIfEnabled(Error(errorMessage));
       return this.lastRespJson ? await this.lastRespJson : emptyObj;
     }
     this.lastRespJson = resp.json();
@@ -296,14 +326,6 @@ export class Pushy {
 
     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 () => {
@@ -389,11 +411,16 @@ 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));
-    if (diffUrl) {
+    if (diffUrl && !__DEV__) {
       log('downloading diff');
       try {
         await PushyModule.downloadPatchFromPpk({
@@ -403,63 +430,61 @@ 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);
-        if (__DEV__) {
-          succeeded = 'diff';
-        } else {
-          log(errorMessage);
-        }
+        lastError = Error(errorMessage);
+        log(errorMessage);
       }
     }
-    const pdiffUrl = await testUrls(joinUrls(paths, pdiff));
-    if (!succeeded && pdiffUrl) {
-      log('downloading pdiff');
-      try {
-        await PushyModule.downloadPatchFromPackage({
-          updateUrl: pdiffUrl,
-          hash,
-        });
-        succeeded = 'pdiff';
-      } catch (e: any) {
-        const errorMessage = `pdiff error: ${e.message}`;
-        errorMessages.push(errorMessage);
-        lastError = new Error(errorMessage);
-        if (__DEV__) {
+    if (!succeeded) {
+      const pdiffUrl = await testUrls(joinUrls(paths, pdiff));
+      if (pdiffUrl && !__DEV__) {
+        log('downloading pdiff');
+        try {
+          await PushyModule.downloadPatchFromPackage({
+            updateUrl: pdiffUrl,
+            hash,
+          });
           succeeded = 'pdiff';
-        } else {
+        } catch (e: any) {
+          const errorMessage = this.t('error_pdiff_failed', {
+            message: e.message,
+          });
+          errorMessages.push(errorMessage);
+          lastError = Error(errorMessage);
           log(errorMessage);
         }
       }
     }
-    const fullUrl = await testUrls(joinUrls(paths, full));
-    if (!succeeded && fullUrl) {
-      log('downloading full patch');
-      try {
-        await PushyModule.downloadFullUpdate({
-          updateUrl: fullUrl,
-          hash,
-        });
-        succeeded = 'full';
-      } catch (e: any) {
-        const errorMessage = `full patch error: ${e.message}`;
-        errorMessages.push(errorMessage);
-        lastError = new Error(errorMessage);
-        if (__DEV__) {
+    if (!succeeded) {
+      const fullUrl = await testUrls(joinUrls(paths, full));
+      if (fullUrl) {
+        log('downloading full patch');
+        try {
+          await PushyModule.downloadFullUpdate({
+            updateUrl: fullUrl,
+            hash,
+          });
           succeeded = 'full';
-        } else {
+        } catch (e: any) {
+          const errorMessage = this.t('error_full_patch_failed', {
+            message: e.message,
+          });
+          errorMessages.push(errorMessage);
+          lastError = Error(errorMessage);
           log(errorMessage);
         }
+      } else if (__DEV__) {
+        log(this.t('dev_incremental_update_disabled'));
+        succeeded = 'full';
       }
     }
     if (sharedState.progressHandlers[hash]) {
       sharedState.progressHandlers[hash].remove();
       delete sharedState.progressHandlers[hash];
     }
-    if (__DEV__) {
-      return hash;
-    }
     if (!succeeded) {
       this.report({
         type: 'errorUpdate',
@@ -506,7 +531,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) {
@@ -516,7 +541,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) {
@@ -549,7 +574,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]) {

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

@@ -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',
   );
 }
@@ -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 { CheckResult, ProgressData, UpdateTestPayload } from './type';
+import { currentVersion, packageVersion, getCurrentVersionInfo, currentVersionInfo } from './core';
+import {
+  CheckResult,
+  ProgressData,
+  UpdateTestPayload,
+  VersionInfo,
+} 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: CheckResult | 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];
-      if (info.update && rollout) {
-        if (!isInRollout(rollout)) {
-          log(`not in ${rollout}% rollout, ignored`);
-          return;
+      const versions = [rootInfo.expVersion, rootInfo].filter(Boolean) as VersionInfo[];
+      delete rootInfo.expVersion;
+      for (const versionInfo of versions) {
+        const info: CheckResult = {
+          ...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;
-      setUpdateInfo(info);
-      if (info.expired) {
-        if (
-          options.onPackageExpired &&
-          (await options.onPackageExpired(info)) === false
-        ) {
-          log('onPackageExpired returned false, skipping');
-          return;
-        }
-        const { downloadUrl } = info;
-        if (downloadUrl && sharedState.apkStatus === null) {
-          if (options.updateStrategy === 'silentAndNow') {
-            if (Platform.OS === 'android' && downloadUrl.endsWith('.apk')) {
-              downloadAndInstallApk(downloadUrl);
-            } else {
-              Linking.openURL(downloadUrl);
+        info.description = info.description ?? '';
+        updateInfoRef.current = info;
+        setUpdateInfo(info);
+        if (info.expired) {
+          if (
+            options.onPackageExpired &&
+            (await options.onPackageExpired(info)) === false
+          ) {
+            log('onPackageExpired returned false, skipping');
+            return;
+          }
+          const { downloadUrl } = info;
+          if (downloadUrl && sharedState.apkStatus === null) {
+            if (options.updateStrategy === 'silentAndNow') {
+              if (Platform.OS === 'android' && downloadUrl.endsWith('.apk')) {
+                downloadAndInstallApk(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('提示', '您的应用版本已更新，点击更新下载安装新版本', [
-            {
-              text: '更新',
-              onPress: () => {
-                if (Platform.OS === 'android' && downloadUrl.endsWith('.apk')) {
-                  downloadAndInstallApk(downloadUrl);
-                } else {
-                  Linking.openURL(downloadUrl);
-                }
+          alertUpdate(
+            client.t('alert_title'),
+            client.t('alert_new_version_found', {
+              name: info.name!,
+              description: info.description,
+            }),
+            [
+              { text: client.t('alert_cancel'), style: 'cancel' },
+              {
+                text: client.t('alert_confirm'),
+                style: 'default',
+                onPress: () => {
+                  downloadUpdate();
+                },
               },
-            },
-          ]);
+            ],
+          );
         }
-      } else if (info.update) {
-        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;
       }
-      return info;
     },
     [
       client,
@@ -251,7 +274,10 @@ export const UpdateProvider = ({
   const markSuccess = client.markSuccess;
 
   useEffect(() => {
-    if (!client.assertDebug()) {
+    if (!client.assertDebug('checkUpdate()')) {
+      return;
+    }
+    if (!assertWeb()) {
       return;
     }
     const { checkStrategy, dismissErrorAfter, autoMarkSuccess } = options;
@@ -297,8 +323,8 @@ export const UpdateProvider = ({
           checkUpdate({ extra: { toHash: payload.data } }).then(() => {
             if (updateInfoRef.current && updateInfoRef.current.upToDate) {
               Alert.alert(
-                'Info',
-                'No update found, please wait 10s for the server to generate the patch package',
+                client.t('alert_info'),
+                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,
       }}>