skip postinstall during dev/publish

* add expoUsePushy demo

* update

.npmignore

@@ -6,6 +6,7 @@
 Example
 android/build
 .vscode
+.github/
 
 # OSX
 #
@@ -45,8 +46,12 @@ node_modules/
 npm-debug.log
 Example
 yarn.lock
+bun.lock
 
 domains.json
 endpoints.json
+endpoints_cresc.json
 
-tea.yaml
+tea.yaml
+
+e2e/

.nvmrc

@@ -1 +0,0 @@
-18

.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,24 @@
+{
+  "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": "~52.0.46",
+    "expo-status-bar": "~2.0.1",
+    "react": "18.3.1",
+    "react-native": "0.76.9",
+    "react-native-update": "^10.28.5"
+  },
+  "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/README.md

@@ -1,34 +1,26 @@
 ## 运行harmony_use_pushy项目步骤
 
-### 1.将项目克隆到本地后在项目根目录创建libs文件夹。
-
-### 2.然后将[`rnoh`](https://github.com/bozaigao/rnoh)克隆到libs文件夹中。
-
-说明：rnoh项目基于react-native 0.72.5版本适配，如果使用最新的RN版本可能会报错，项目适配RN新版本请关注[`gitee仓库`](https://gitee.com/openharmony-sig/ohos_react_native/tree/0.72.5-ohos-5.0-release/tester/harmony/react_native_openharmony/src/main)
-
-### 3.进入rnoh项目执行下面命令对rnoh项目依赖的C++库进行初始化；
+### 1. 在项目根目录执行下面命令安装第三方依赖。
 ```
-git submodule update --init --recursive
+bun install
 ```
 
-### 4. 确保在react-native-update根目录已经执行过yarn submodule命令。
-说明：这个命令会在harmony/src/main/cpp目录生成HDiffPatch和lzma的C++模块依赖。
+### 2. 本地debug 模式
+```
+bun run start
+```
+![image](./debug.png)
 
-### 5. 在项目根目录执行下面命令安装第三方依赖。
+### 3. release 模式: 在项目根目录执行下面命令生成bundle包文件。
 ```
-yarn install
-```
-
-### 6. 在项目根目录执行下面命令生成bundle包文件。
-```
-yarn build
+bun run build
 ```
 说明：这个命令会在harmony/entry/src/main/resources/rawfile目录生成Hbundle.harmony.js和assets文件，同时会基于该内容在.pushy/output目录生成ppk包。
 
 **注意⚠️**：在使用pushy bundle --platform harmony命令进行打包的默认bundle包名是Hbundle.harmony.js，不要随意修改包名，因为diff是匹配该包名进行生成的。
 
-### 7. 使用DevEco Studio IDE打开harmony目录然后执行sync运行项目
+### 4. 使用DevEco Studio IDE打开harmony目录然后执行sync运行项目
 ![image](./sync.png)
 
-### 8 运行效果图
-![image](./demo.png)
+### 5 运行效果图
+![image](./demo.png)

Example/harmony_use_pushy/harmony/build-profile.json5

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

Example/harmony_use_pushy/harmony/entry/hvigorfile.ts

@@ -41,4 +41,4 @@ export function generatePushyBuildTime(str?: string) {
 export default {
     system: hapTasks,  /* Built-in plugin of Hvigor. It cannot be modified. */
     plugins:[generatePushyBuildTime()]         /* Custom plugin to extend the functionality of Hvigor. */
-}
+}

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

@@ -5,24 +5,25 @@
   "lockfileVersion": 3,
   "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
   "specifiers": {
-    "pushy@../../node_modules/react-native-update/harmony": "pushy@../../node_modules/react-native-update/harmony",
-    "rnoh@../../libs/rnoh": "rnoh@../../libs/rnoh"
+    "@rnoh/react-native-openharmony@0.72.38": "@rnoh/react-native-openharmony@0.72.38",
+    "pushy@../../node_modules/react-native-update/harmony": "pushy@../../node_modules/react-native-update/harmony"
   },
   "packages": {
+    "@rnoh/react-native-openharmony@0.72.38": {
+      "name": "@rnoh/react-native-openharmony",
+      "version": "0.72.38",
+      "integrity": "sha512-br5SIrbB0OarSLirenleE7eTOX1lNccMJ7nb/G7qWTyJ7kW4DalmTXVKYpoT2qaOLls1uEE7McD1OjbZZM9jug==",
+      "resolved": "https://ohpm.openharmony.cn/ohpm/@rnoh/react-native-openharmony/-/react-native-openharmony-0.72.38.har",
+      "registryType": "ohpm"
+    },
     "pushy@../../node_modules/react-native-update/harmony": {
       "name": "pushy",
       "version": "3.1.0-0.0.7",
       "resolved": "../../node_modules/react-native-update/harmony",
       "registryType": "local",
       "dependencies": {
-        "rnoh": "file:../../../libs/rnoh"
+        "@rnoh/react-native-openharmony": "^0.72.38"
       }
-    },
-    "rnoh@../../libs/rnoh": {
-      "name": "rnoh",
-      "version": "0.72.12",
-      "resolved": "../../libs/rnoh",
-      "registryType": "local"
     }
   }
 }

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

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

Example/harmony_use_pushy/harmony/entry/src/main/cpp/CMakeLists.txt

@@ -2,12 +2,23 @@ cmake_minimum_required(VERSION 3.16)
 project(rnapp)
 set(RNOH_APP_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(NODE_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../node_modules")
-set(RNOH_CPP_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../libs/rnoh/src/main/cpp")
+set(OH_MODULE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../oh_modules")
+set(RNOH_CPP_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../oh_modules/@rnoh/react-native-openharmony/src/main/cpp")
 set(OH_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/../../../oh_modules")
-add_subdirectory("${OH_MODULES}/pushy/src/main/cpp" ./pushy)
+set(LOG_VERBOSITY_LEVEL 1)
+set(CMAKE_ASM_FLAGS "-Wno-error=unused-command-line-argument -Qunused-arguments")
+set(CMAKE_CXX_FLAGS "-fstack-protector-strong -Wl,-z,relro,-z,now,-z,noexecstack -s -fPIE -pie")
+set(OH_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/../../../oh_modules")
+set(WITH_HITRACE_SYSTRACE 1) # for other CMakeLists.txt files to use
+add_compile_definitions(WITH_HITRACE_SYSTRACE)
 
+add_subdirectory("${OH_MODULES}/pushy/src/main/cpp" ./pushy)
 add_subdirectory("${RNOH_CPP_DIR}" ./rn)
+
+file(GLOB GENERATED_CPP_FILES "${CMAKE_CURRENT_SOURCE_DIR}/generated/*.cpp") # this line is needed by codegen v1
+
 add_library(rnoh_app SHARED
+    ${GENERATED_CPP_FILES}
     "./PackageProvider.cpp"
     "${RNOH_CPP_DIR}/RNOHAppNapiBridge.cpp"
 )

Example/harmony_use_pushy/harmony/entry/src/main/cpp/generated/RNOHGeneratedPackage.h

@@ -0,0 +1,65 @@
+/**
+ * This code was generated by "react-native codegen-harmony"
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be
+ * lost once the code is regenerated.
+ *
+ * @generatorVersion: 1
+ */
+
+#pragma once
+
+#include "RNOH/Package.h"
+#include "RNOH/ArkTSTurboModule.h"
+
+namespace rnoh {
+
+class RNOHGeneratedPackageTurboModuleFactoryDelegate : public TurboModuleFactoryDelegate {
+  public:
+    SharedTurboModule createTurboModule(Context ctx, const std::string &name) const override {
+        return nullptr;
+    };
+};
+
+class GeneratedEventEmitRequestHandler : public EventEmitRequestHandler {
+  public:
+    void handleEvent(Context const &ctx) override {
+        auto eventEmitter = ctx.shadowViewRegistry->getEventEmitter<facebook::react::EventEmitter>(ctx.tag);
+        if (eventEmitter == nullptr) {
+            return;
+        }
+
+        std::vector<std::string> supportedEventNames = {
+        };
+        if (std::find(supportedEventNames.begin(), supportedEventNames.end(), ctx.eventName) != supportedEventNames.end()) {
+            eventEmitter->dispatchEvent(ctx.eventName, ArkJS(ctx.env).getDynamic(ctx.payload));
+        }    
+    }
+};
+
+class RNOHGeneratedPackage : public Package {
+  public:
+    RNOHGeneratedPackage(Package::Context ctx) : Package(ctx){};
+
+    std::unique_ptr<TurboModuleFactoryDelegate> createTurboModuleFactoryDelegate() override {
+        return std::make_unique<RNOHGeneratedPackageTurboModuleFactoryDelegate>();
+    }
+
+    std::vector<facebook::react::ComponentDescriptorProvider> createComponentDescriptorProviders() override {
+        return {
+        };
+    }
+
+    ComponentJSIBinderByString createComponentJSIBinderByName() override {
+        return {
+        };
+    };
+
+    EventEmitRequestHandlers createEventEmitRequestHandlers() override {
+        return {
+            std::make_shared<GeneratedEventEmitRequestHandler>(),
+        };
+    }
+};
+
+} // namespace rnoh

Example/harmony_use_pushy/harmony/entry/src/main/ets/RNPackagesFactory.ts

@@ -1,4 +1,4 @@
-import type {RNPackageContext, RNPackage} from 'rnoh/ts';
+import type {RNPackageContext, RNPackage} from '@rnoh/react-native-openharmony/ts';
 import {PushyPackage} from 'pushy/ts';
 
 export function createRNPackages(ctx: RNPackageContext): RNPackage[] {

Example/harmony_use_pushy/harmony/entry/src/main/ets/entryability/EntryAbility.ets

@@ -1,4 +1,4 @@
-import {RNAbility} from 'rnoh/ts';
+import {RNAbility} from '@rnoh/react-native-openharmony';
 
 export default class EntryAbility extends RNAbility {
   getPagePath() {

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

@@ -1,26 +1,33 @@
 import { FileJSBundleProvider } from 'pushy/src/main/ets/FileJSBundleProvider';
-import { ComponentBuilderContext, JSBundleProvider, RNOHLogger } from 'rnoh';
+import { ComponentBuilderContext, RNOHCoreContext,RNAbility,
+  MetroJSBundleProvider } from '@rnoh/react-native-openharmony';
 import {
   RNApp,
-  RNAbility,
   AnyJSBundleProvider,
   ResourceJSBundleProvider,
   TraceJSBundleProviderDecorator,
-} from 'rnoh'
+} from '@rnoh/react-native-openharmony'
 import { createRNPackages } from '../RNPackagesFactory'
+import preferences from '@ohos.data.preferences';
+
+const arkTsComponentNames: Array<string> = [];
 
 @Builder
-export function CustomComponentBuilder(ctx: ComponentBuilderContext) {
-
+export function buildCustomRNComponent(ctx: ComponentBuilderContext) {
+  // There seems to be a problem with the placement of ArkTS components in mixed mode. Nested Stack temporarily avoided.
+  Stack() {
+  }
+  .position({ x: 0, y: 0 })
 }
 
 
+const wrappedCustomRNComponentBuilder = wrapBuilder(buildCustomRNComponent)
+
 @Entry
 @Component
 struct Index {
-  @StorageLink('RNAbility') private rnAbility: RNAbility | undefined = undefined
+  @StorageLink('RNOHCoreContext') private rnohCoreContext: RNOHCoreContext | undefined = undefined
   @State shouldShow: boolean = false
-  @State message: string = 'Hello World';
 
   aboutToAppear(): void {
     this.shouldShow = true
@@ -30,28 +37,38 @@ struct Index {
     // NOTE: this is required since `Ability`'s `onBackPressed` function always
     // terminates or puts the app in the background, but we want Ark to ignore it completely
     // when handled by RN
-    return this.rnAbility?.onBackPress();
+    this.rnohCoreContext!.dispatchBackPress()
+
+    // this.preferences = preferences.getPreferencesSync(this.context, {name:'update'});
+    return true
   }
 
   build() {
     Column() {
-      if (this.rnAbility && this.shouldShow) {
+      if (this.rnohCoreContext && this.shouldShow) {
         RNApp({
-          rnInstanceConfig: { createRNPackages },
+          rnInstanceConfig: {
+            createRNPackages,
+            enableNDKTextMeasuring: true,
+            enableBackgroundExecutor: false,
+            enableCAPIArchitecture: true,
+            arkTsComponentNames: arkTsComponentNames,
+          },
           initialProps: { "foo": "bar" } as Record<string, string>,
           appKey: "harmony_use_pushy",
-          buildCustomComponent: CustomComponentBuilder,
+          wrappedCustomRNComponentBuilder: wrappedCustomRNComponentBuilder,
           onSetUp: (rnInstance) => {
             rnInstance.enableFeatureFlag("ENABLE_RN_INSTANCE_CLEAN_UP")
           },
           jsBundleProvider: new TraceJSBundleProviderDecorator(
             new AnyJSBundleProvider([
-              // MetroJSBundleProvider.fromServerIp('127.0.0.1'),
-              // new ResourceJSBundleProvider(this.rnAbility.context.resourceManager, 'hermes_bundle.hbc'),
-              new FileJSBundleProvider(this.rnAbility.context),
-              new ResourceJSBundleProvider(this.rnAbility.context.resourceManager, 'bundle.harmony.js')
+              // local debug mode
+              new MetroJSBundleProvider(),
+              // release mode
+              new FileJSBundleProvider(this.rnohCoreContext.uiAbilityContext),
+              new ResourceJSBundleProvider(this.rnohCoreContext.uiAbilityContext.resourceManager, 'bundle.harmony.js')
             ]),
-            this.rnAbility.getLogger()),
+            this.rnohCoreContext.logger),
         })
       }
     }

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

@@ -0,0 +1,4 @@
+{
+    "pushy_build_time": "2025-04-12T11:12:43.423Z",
+    "versionName": "1.0.0"
+}

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

@@ -0,0 +1,14 @@
+{
+  "ios": {
+    "appId": 24794,
+    "appKey": "SqShg4Klnj2hG6LAFMW2PdcgSSuniz0T"
+  },
+  "android": {
+    "appId": 27509,
+    "appKey": "aQz3Uc2pA7gt_prDaQ4rbWRY"
+  },
+  "harmony": {
+    "appId": 29140,
+    "appKey": "JLklGflGIRbY-cMebjQwm1J1"
+  }
+}

Example/harmony_use_pushy/harmony/oh-package.json5

@@ -13,5 +13,8 @@
       "suppressImplicitAnyIndexErrors": true,
       "strict": false
     }
+  },
+  "overrides": {
+    "@rnoh/react-native-openharmony": "0.72.38"
   }
 }

Example/harmony_use_pushy/harmony/react_native_openharmony/generated/components/ts.ts

@@ -0,0 +1,5 @@
+
+/**
+ */
+
+export {}

Example/harmony_use_pushy/harmony/react_native_openharmony/generated/index.ets

@@ -0,0 +1,8 @@
+/**
+ * This code was generated by "react-native codegen-harmony"
+ * 
+ * Do not edit this file as changes may cause incorrect behavior and will be
+ * lost once the code is regenerated.
+ */
+
+export * from "./ts"

Example/harmony_use_pushy/harmony/react_native_openharmony/generated/ts.ts

@@ -0,0 +1,9 @@
+/**
+ * This code was generated by "react-native codegen-harmony"
+ * 
+ * Do not edit this file as changes may cause incorrect behavior and will be
+ * lost once the code is regenerated.
+ */
+
+export * as RNC from "./components/ts"
+export * as TM from "./turboModules/ts"

Example/harmony_use_pushy/harmony/react_native_openharmony/generated/turboModules/ts.ts

@@ -0,0 +1,5 @@
+
+/**
+ */
+
+export {}

Example/harmony_use_pushy/package.json

@@ -6,7 +6,8 @@
     "android": "react-native run-android",
     "ios": "react-native run-ios",
     "lint": "eslint .",
-    "start": "react-native start",
+    "start": "npm run codegen && hdc rport tcp:8081 tcp:8081 && react-native start",
+    "codegen": "react-native codegen-harmony --rnoh-module-path ./harmony/react_native_openharmony",
     "build": "pushy bundle --platform harmony",
     "test": "jest",
     "hdiffFromPPK": "pushy hdiffFromPPK .pushy/output/harmony.1735052610653.ppk .pushy/output/harmony.1735052678646.ppk .pushy/output/hdiff.ppk-patch",
@@ -14,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": "18.2.0",
     "react-native": "0.72.5",
-    "react-native-update": "file:../../",
-    "@react-native-oh/react-native-harmony": "^0.72.43"
+    "react-native-update": "^10.26.4"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

Example/harmony_use_pushy/update.json

@@ -8,7 +8,7 @@
     "appKey": "aQz3Uc2pA7gt_prDaQ4rbWRY"
   },
   "harmony": {
-    "appId": 29040,
-    "appKey": "gdzeAqAFE5Jew15c5Df8EKU9"
+    "appId": 29140,
+    "appKey": "JLklGflGIRbY-cMebjQwm1J1"
   }
 }

Example/testHotUpdate/.gitignore

@@ -30,6 +30,7 @@ build/
 local.properties
 *.iml
 *.hprof
+.kotlin/
 
 # node.js
 #

Example/testHotUpdate/.nvmrc

@@ -1 +0,0 @@
-18

Example/testHotUpdate/android/app/build.gradle

@@ -68,7 +68,7 @@ def enableProguardInReleaseBuilds = false
  * give correct results when using with locales other than en-US. Note that
  * this variant is about 6MiB larger per architecture than default.
  */
-def jscFlavor = 'org.webkit:android-jsc:+'
+def jscFlavor = 'io.github.react-native-community:jsc-android:2026004.+'
 
 android {
     ndkVersion rootProject.ext.ndkVersion

Example/testHotUpdate/android/build.gradle

@@ -3,9 +3,9 @@ buildscript {
         buildToolsVersion = "35.0.0"
         minSdkVersion = 24
         compileSdkVersion = 35
-        targetSdkVersion = 34
-        ndkVersion = "26.1.10909125"
-        kotlinVersion = "1.9.24"
+        targetSdkVersion = 35
+        ndkVersion = "27.1.12297006"
+        kotlinVersion = "2.0.21"
     }
     repositories {
         google()

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.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

Example/testHotUpdate/android/gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

Example/testHotUpdate/metro.config.js

@@ -4,7 +4,7 @@ const {getDefaultConfig, mergeConfig} = require('@react-native/metro-config');
  * Metro configuration
  * https://reactnative.dev/docs/metro
  *
- * @type {import('metro-config').MetroConfig}
+ * @type {import('@react-native/metro-config').MetroConfig}
  */
 const config = {};
 

Example/testHotUpdate/package.json

@@ -14,15 +14,15 @@
     "dev:harmony": "react-native bundle-harmony --dev"
   },
   "dependencies": {
-    "form-data": "^4.0.1",
+    "form-data": "^4.0.2",
     "patch-package": "^8.0.0",
-    "postinstall-postinstall": "^2.1.0",
-    "react": "18.3.1",
-    "react-native": "0.76.6",
-    "react-native-camera-kit": "^14.1.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.1.0",
-    "react-native-update": "^10.22.0",
+    "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"
   },
   "devDependencies": {
@@ -32,26 +32,24 @@
     "@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.76.6",
-    "@react-native/eslint-config": "0.76.6",
-    "@react-native/metro-config": "0.76.6",
-    "@react-native/typescript-config": "0.76.6",
-    "@types/react": "^18.2.6",
-    "@types/react-test-renderer": "^18.0.0",
-    "babel-jest": "^29.6.3",
+    "@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",
     "jest": "^29.6.3",
     "prettier": "2.8.8",
-    "react-test-renderer": "18.3.1",
-    "typescript": "5.7.3"
+    "react-test-renderer": "19.0.0",
+    "typescript": "5.8.2"
   },
   "engines": {
     "node": ">=18"
   },
   "trustedDependencies": [
     "detox",
-    "dtrace-provider",
-    "postinstall-postinstall"
+    "dtrace-provider"
   ]
-}
+}

Example/testHotUpdate/src/assets/react-logo.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-11.5 -10.23174 23 20.46348">
+  <title>React Logo</title>
+  <circle cx="0" cy="0" r="2.05" fill="#61dafb"/>
+  <g stroke="#61dafb" stroke-width="1" fill="none">
+    <ellipse rx="11" ry="4.2"/>
+    <ellipse rx="11" ry="4.2" transform="rotate(60)"/>
+    <ellipse rx="11" ry="4.2" transform="rotate(120)"/>
+  </g>
+</svg>

Example/testHotUpdate/src/index.tsx

@@ -20,11 +20,12 @@ import {
   Portal,
 } from 'react-native-paper';
 import {Camera} from 'react-native-camera-kit';
+import {LocalSvg} from 'react-native-svg/css';
 
 import TestConsole from './TestConsole';
 
 import _updateConfig from '../update.json';
-import {PushyProvider, Pushy, usePushy} from 'react-native-update';
+import {UpdateProvider, Pushy, Cresc, useUpdate} from 'react-native-update';
 const {appKey} = _updateConfig[Platform.OS];
 
 function App() {
@@ -39,7 +40,7 @@ function App() {
     currentHash,
     parseTestQrCode,
     progress: {received, total} = {},
-  } = usePushy();
+  } = useUpdate();
   const [useDefaultAlert, setUseDefaultAlert] = useState(true);
   const [showTestConsole, setShowTestConsole] = useState(false);
   const [showUpdateBanner, setShowUpdateBanner] = useState(false);
@@ -91,11 +92,21 @@ function App() {
           />
         </Modal>
       </Portal>
-      <Image
-        resizeMode={'contain'}
-        source={require('./assets/shezhi.png')}
-        style={styles.image}
-      />
+      <View style={{flexDirection: 'row', alignItems: 'center', gap: 10}}>
+        <Text>png:</Text>
+        <Image
+          resizeMode={'contain'}
+          source={require('./assets/shezhi.png')}
+          style={styles.image}
+        />
+      </View>
+      <View style={{flexDirection: 'row', alignItems: 'center', gap: 10}}>
+        <Text>svg:</Text>
+        <LocalSvg
+          asset={require('./assets/react-logo.svg')}
+          style={{width: 30, height: 30}}
+        />
+      </View>
       <Text style={styles.instructions}>
         这是版本一 {'\n'}
         当前原生包版本号: {packageVersion}
@@ -192,17 +203,25 @@ const styles = StyleSheet.create({
   image: {},
 });
 
-const pushyClient = new Pushy({
+// use Pushy for China users
+const updateClient = new Pushy({
   appKey,
   debug: true,
+  // updateStrategy: 'silentAndLater',
 });
 
+// use Cresc for global users
+// const updateClient = new Cresc({
+//   appKey,
+//   debug: true,
+// });
+
 export default function Root() {
   return (
-    <PushyProvider client={pushyClient}>
+    <UpdateProvider client={updateClient}>
       <PaperProvider>
         <App />
       </PaperProvider>
-    </PushyProvider>
+    </UpdateProvider>
   );
-}
+}

Example/testHotUpdate/update.json

@@ -7,4 +7,4 @@
     "appId": 27509,
     "appKey": "aQz3Uc2pA7gt_prDaQ4rbWRY"
   }
-}
+}

README.md

@@ -22,7 +22,7 @@
 ### 本地开发
 
 ```
-$ git clone git@github.com:reactnativecn/react-native-pushy.git
+$ git clone git@github.com:reactnativecn/react-native-update.git
 $ cd react-native-pushy/Example/testHotUpdate
 $ yarn
 $ yarn start
@@ -34,4 +34,4 @@ $ yarn start
 
 本组件由[React Native 中文网](https://reactnative.cn/)独家发布，如有定制需求可以[联系我们](https://reactnative.cn/about.html#content)。
 
-关于此插件发现任何问题，可以前往[Issues](https://github.com/reactnativecn/react-native-pushy/issues)发帖提问。
+关于此插件发现任何问题，可以前往[Issues](https://github.com/reactnativecn/react-native-update/issues)发帖提问。

android/build.gradle

@@ -22,14 +22,70 @@ def supportsNamespace() {
   return major >= 8
 }
 
+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)
+        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
+    }
+    
+    def isExpo = hasExpoModulesCore && hasExpoDependency
+    
+    // Return a map containing both pieces of information
+    return [isExpo: isExpo, version: projectVersion]
+}
+
+// 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()) {
     apply plugin: 'com.facebook.react'
 }
 
+if (expoProject) {
+    group = 'expo.modules.pushy'
+    version = projectVersion
+
+    def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+    apply from: expoModulesCorePlugin
+    applyKotlinExpoModulesCorePlugin()
+    useExpoPublishing()
+    useCoreDependencies()
+} else {
+    group = 'cn.reactnative.modules.update'
+    version = projectVersion
+}
 
 android {
-
     if (supportsNamespace()) {
         namespace "cn.reactnative.modules.update"
 
@@ -41,7 +97,6 @@ android {
     }
     compileSdkVersion safeExtGet('compileSdkVersion', 28)
     buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
-
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 16)
         targetSdkVersion safeExtGet('targetSdkVersion', 27)
@@ -50,6 +105,7 @@ android {
         consumerProguardFiles "proguard.pro"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
     }
+    
     sourceSets {
         main {
             // let gradle pack the shared library into apk
@@ -59,6 +115,12 @@ android {
             } else {
                 java.srcDirs += ['src/oldarch']
             }
+            
+            if (expoProject) {
+                java.srcDirs += ['java/expo/modules/pushy']
+            } else {
+                java.exclude 'expo/modules/pushy/**'
+            }
         }
     }
 
@@ -70,6 +132,10 @@ android {
             resValue("string", "pushy_build_time", "0")
         }
     }
+    
+    lintOptions {
+        abortOnError false
+    }
 }
 
 repositories {

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

@@ -49,7 +49,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
 
     private void removeDirectory(File file) throws IOException {
         if (UpdateContext.DEBUG) {
-            Log.d("RNUpdate", "Removing " + file);
+            Log.d("react-native-update", "Removing " + file);
         }
         if (file.isDirectory()) {
             File[] files = file.listFiles();
@@ -88,7 +88,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
         BufferedSink sink = Okio.buffer(Okio.sink(writePath));
 
         if (UpdateContext.DEBUG) {
-            Log.d("RNUpdate", "Downloading " + url);
+            Log.d("react-native-update", "Downloading " + url);
         }
 
         long bytesRead = 0;
@@ -98,7 +98,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
             received += bytesRead;
             sink.emit();
             if (UpdateContext.DEBUG) {
-                Log.d("RNUpdate", "Progress " + received + "/" + contentLength);
+                Log.d("react-native-update", "Progress " + received + "/" + contentLength);
             }
             
             int percentage = (int)(received * 100.0 / contentLength + 0.5);
@@ -115,19 +115,18 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
         sink.close();
 
         if (UpdateContext.DEBUG) {
-            Log.d("RNUpdate", "Download finished");
+            Log.d("react-native-update", "Download finished");
         }
     }
 
     @Override
-    protected void onProgressUpdate(long[]... values) {
+    protected void onProgressUpdate(final long[]... values) {
         super.onProgressUpdate(values);
         WritableMap params = Arguments.createMap();
         params.putDouble("received", (values[0][0]));
         params.putDouble("total", (values[0][1]));
         params.putString("hash", this.hash);
         sendEvent("RCTPushyDownloadProgress", params);
-
     }
 
     byte[] buffer = new byte[1024*4];
@@ -244,7 +243,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
 
 
         if (UpdateContext.DEBUG) {
-            Log.d("RNUpdate", "Unzip finished");
+            Log.d("react-native-update", "Unzip finished");
         }
     }
 
@@ -260,7 +259,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
                 File lastTarget = null;
                 for (File target: targets) {
                     if (UpdateContext.DEBUG) {
-                        Log.d("RNUpdate", "Copying from resource " + fn + " to " + target);
+                        Log.d("react-native-update", "Copying from resource " + fn + " to " + target);
                     }
                     if (lastTarget != null) {
                         copyFile(lastTarget, target);
@@ -352,7 +351,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
         copyFromResource(copyList);
 
         if (UpdateContext.DEBUG) {
-            Log.d("RNUpdate", "Unzip finished");
+            Log.d("react-native-update", "Unzip finished");
         }
 
     }
@@ -418,12 +417,12 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
             throw new Error("bundle patch not found");
         }
         if (UpdateContext.DEBUG) {
-            Log.d("RNUpdate", "Unzip finished");
+            Log.d("react-native-update", "Unzip finished");
         }
     }
     private void doCleanUp(DownloadTaskParams param) throws IOException {
         if (UpdateContext.DEBUG) {
-            Log.d("RNUpdate", "Start cleaning up");
+            Log.d("react-native-update", "Start cleaning up");
         }
         File root = param.unzipDirectory;
         for (File sub : root.listFiles()) {
@@ -452,7 +451,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
     }
 
     @Override
-    protected Void doInBackground(DownloadTaskParams... params) {
+    protected Void doInBackground(final DownloadTaskParams... params) {
         int taskType = params[0].type;
         try {
             switch (taskType) {
@@ -499,7 +498,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
                 default:
                     break;
             }
-            Log.e("pushy", "download task failed", e);
+            Log.e("react-native-update", "download task failed", e);
 
             if (params[0].listener != null) {
                 params[0].listener.onDownloadFailed(e);

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

@@ -0,0 +1,13 @@
+package cn.reactnative.modules.update;
+
+import androidx.annotation.Nullable;
+
+public interface ReactNativeHostHandler {
+    @Nullable
+    String getJSBundleFile(boolean useDeveloperSupport);
+    
+    @Nullable
+    String getBundleAssetName(boolean useDeveloperSupport);
+    
+    void onWillCreateReactInstance(boolean useDeveloperSupport);
+} 

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

@@ -7,14 +7,11 @@ import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Environment;
 import android.util.Log;
-
 import com.facebook.react.ReactInstanceManager;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
-
 import java.io.File;
 
 public class UpdateContext {

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

@@ -24,7 +24,7 @@ public class UpdateModuleImpl {
 
     public static final String NAME = "Pushy";
 
-    public static void downloadFullUpdate(UpdateContext updateContext, ReadableMap options, Promise promise) {
+    public static void downloadFullUpdate(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
         String url = options.getString("updateUrl");
         String hash = options.getString("hash");
         updateContext.downloadFullUpdate(url, hash, new UpdateContext.DownloadFileListener() {
@@ -40,7 +40,7 @@ public class UpdateModuleImpl {
         });
     }
 
-    public static void downloadAndInstallApk(UpdateContext updateContext, ReadableMap options, Promise promise) {
+    public static void downloadAndInstallApk(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
         String url = options.getString("url");
         String hash = options.getString("hash");
         String target = options.getString("target");
@@ -63,7 +63,7 @@ public class UpdateModuleImpl {
         UpdateModule.installApk(toInstall);
     }
 
-    public static void downloadPatchFromPackage(UpdateContext updateContext, ReadableMap options, Promise promise) {
+    public static void downloadPatchFromPackage(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
         String url = options.getString("updateUrl");
         String hash = options.getString("hash");
         updateContext.downloadPatchFromApk(url, hash, new UpdateContext.DownloadFileListener() {
@@ -79,7 +79,7 @@ public class UpdateModuleImpl {
         });
     }
 
-    public static void downloadPatchFromPpk(UpdateContext updateContext, ReadableMap options, Promise promise) {
+    public static void downloadPatchFromPpk(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
         try {
             String url = options.getString("updateUrl");
             String hash = options.getString("hash");
@@ -98,23 +98,20 @@ public class UpdateModuleImpl {
                 }
             });
         }catch (Exception e){
-            promise.reject("执行报错:" + e.getMessage());
+            promise.reject("downloadPatchFromPpk failed: "+e.getMessage());
         }
     }
 
-    public static void reloadUpdate(UpdateContext updateContext, ReactApplicationContext mContext, ReadableMap options, Promise promise) {
+    public static void reloadUpdate(final UpdateContext updateContext,final ReactApplicationContext mContext, final ReadableMap options, final Promise promise) {
         final String hash = options.getString("hash");
-
-        if (hash == null || hash.isEmpty()) {
-            promise.reject("hash不能为空");
-            return;
-        }
         UiThreadUtil.runOnUiThread(new Runnable() {
             @Override
             public void run() {
+
+                updateContext.switchVersion(hash);
+                final Context application = mContext.getApplicationContext();
+                JSBundleLoader loader = JSBundleLoader.createFileLoader(UpdateContext.getBundleUrl(application));
                 try {
-                    updateContext.switchVersion(hash);
-                    final Context application = mContext.getApplicationContext();
                     ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager();
 
                     if (instanceManager == null) {
@@ -122,12 +119,10 @@ public class UpdateModuleImpl {
                     }
 
                     try {
-                        JSBundleLoader loader = JSBundleLoader.createFileLoader(UpdateContext.getBundleUrl(application));
                         Field loadField = instanceManager.getClass().getDeclaredField("mBundleLoader");
                         loadField.setAccessible(true);
                         loadField.set(instanceManager, loader);
                     } catch (Throwable err) {
-                        promise.reject("pushy:"+err.getMessage());
                         Field jsBundleField = instanceManager.getClass().getDeclaredField("mJSBundleFile");
                         jsBundleField.setAccessible(true);
                         jsBundleField.set(instanceManager, UpdateContext.getBundleUrl(application));
@@ -137,31 +132,36 @@ public class UpdateModuleImpl {
                     promise.resolve(true);
 
                 } catch (Throwable err) {
-                    promise.reject(err);
-                    Log.e("pushy", "switchVersion failed ", err);
                     final Activity currentActivity = mContext.getCurrentActivity();
                     if (currentActivity == null) {
                         return;
                     }
                     try {
-                        // Try to get getReactDelegate method using reflection
                         java.lang.reflect.Method getReactDelegateMethod = 
                             ReactActivity.class.getMethod("getReactDelegate");
-                        if (getReactDelegateMethod != null) {
-                            ReactDelegate reactDelegate = (ReactDelegate) 
-                                getReactDelegateMethod.invoke(currentActivity);
-                            
-                            // Try to get reload method using reflection
-                            java.lang.reflect.Method reloadMethod = 
-                                ReactDelegate.class.getMethod("reload");
-                            if (reloadMethod != null) {
-                                reloadMethod.invoke(reactDelegate);
-                            } else {
-                                throw new NoSuchMethodException();
-                            }
-                        } else {
-                            throw new NoSuchMethodException();
-                        }
+
+                        ReactDelegate reactDelegate = (ReactDelegate) 
+                            getReactDelegateMethod.invoke(currentActivity);
+
+                        Field reactHostField = ReactDelegate.class.getDeclaredField("mReactHost");
+                        reactHostField.setAccessible(true);
+                        Object reactHost = reactHostField.get(reactDelegate);
+
+                        // Access the mReactHostDelegate field
+                        Field reactHostDelegateField = reactHost.getClass().getDeclaredField("mReactHostDelegate");
+                        reactHostDelegateField.setAccessible(true);
+                        Object reactHostDelegate = reactHostDelegateField.get(reactHost);
+
+                        // Modify the jsBundleLoader field
+                        Field jsBundleLoaderField = reactHostDelegate.getClass().getDeclaredField("jsBundleLoader");
+                        jsBundleLoaderField.setAccessible(true);
+                        jsBundleLoaderField.set(reactHostDelegate, loader);
+                        
+                        // Get the reload method with a String parameter
+                        java.lang.reflect.Method reloadMethod = reactHost.getClass().getMethod("reload", String.class);
+
+                        // Invoke the reload method with a reason
+                        reloadMethod.invoke(reactHost, "react-native-update");
                     } catch (Throwable e) {
                         currentActivity.runOnUiThread(new Runnable() {
                             @Override
@@ -171,98 +171,109 @@ public class UpdateModuleImpl {
                         });
                     }
                 }
+                promise.resolve(true);
             }
         });
     }
 
+    public static void restartApp(final ReactApplicationContext mContext, final Promise promise) {
+          UiThreadUtil.runOnUiThread(new Runnable() {
+              @Override
+              public void run() {
+                  try {
+                      final Context application = mContext.getApplicationContext();
+                      ReactInstanceManager instanceManager = ((ReactApplication) application).getReactNativeHost().getReactInstanceManager();
 
-    public static void setNeedUpdate(UpdateContext updateContext, ReadableMap options,Promise promise) {
-        try {
-            final String hash = options.getString("hash");
-            if(hash==null || hash.isEmpty()){
-                promise.reject("hash不能为空");
-                return;
+                      instanceManager.recreateReactContextInBackground();
+                      promise.resolve(true);
+
+                  } catch (Throwable err) {
+                      promise.reject("restartApp failed: "+err.getMessage());
+                      Log.e("pushy", "restartApp failed", err);
+
+                      final Activity currentActivity = mContext.getCurrentActivity();
+                      if (currentActivity == null) {
+                          return;
+                      }
+                      currentActivity.runOnUiThread(new Runnable() {
+                          @Override
+                          public void run() {
+                              currentActivity.recreate();
+                          }
+                      });
+                  }
+              }
+          });
+      }
+
+    public static void setNeedUpdate(final UpdateContext updateContext, final ReadableMap options, final Promise promise) {
+        final String hash = options.getString("hash");
+        UiThreadUtil.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    updateContext.switchVersion(hash);
+                    promise.resolve(true);
+                } catch (Throwable err) {
+                    promise.reject("switchVersionLater failed: "+err.getMessage());
+                    Log.e("pushy", "switchVersionLater failed", err);
+                }
             }
-            UiThreadUtil.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        updateContext.switchVersion(hash);
-                        promise.resolve(true);
-                    } catch (Throwable err) {
-                        promise.reject("switchVersionLater failed:"+err.getMessage());
-                        Log.e("pushy", "switchVersionLater failed", err);
-                    }
-                }
-            });
-        } catch (Exception e){
-            promise.reject("执行报错:"+e.getMessage());
-        }
+        });
     }
 
-    public static void markSuccess(UpdateContext updateContext,Promise promise) {
-        try {
-            UiThreadUtil.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    updateContext.markSuccess();
-                    promise.resolve(true);
-                }
-            });
-        } catch (Exception e){
-            promise.reject("执行报错:"+e.getMessage());
-        }
+    public static void markSuccess(final UpdateContext updateContext, final Promise promise) {
+        UiThreadUtil.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                updateContext.markSuccess();
+                promise.resolve(true);
+            }
+        });
     }
 
-    public static void setUuid(UpdateContext updateContext, String uuid, Promise promise) {
-        try {
-            UiThreadUtil.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    updateContext.setKv("uuid", uuid);
-                    promise.resolve(true);
-                }
-            });
-        } catch (Exception e){
-            promise.reject("执行报错:"+e.getMessage());
-        }
-
+    public static void setUuid(final UpdateContext updateContext, final String uuid, final Promise promise) {
+        UiThreadUtil.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                updateContext.setKv("uuid", uuid);
+                promise.resolve(true);
+            }
+        });
     }
 
     public static boolean check(String json) {
         ObjectMapper mapper = new ObjectMapper();
         try {
             mapper.readValue(json, Map.class);
-            System.out.println("String can be converted to Map");
             return  true;
         } catch (IOException e) {
-            System.out.println("String cannot be converted to Map");
             return  false;
         }
     }
 
 
-    public static void setLocalHashInfo(UpdateContext updateContext, final String hash, final String info, Promise promise) {
+    public static void setLocalHashInfo(final UpdateContext updateContext, final String hash, final String info, final Promise promise) {
         UiThreadUtil.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                if(!check(info)){
-                    updateContext.setKv("hash_" + hash, info);
-                    promise.reject("校验报错:json字符串格式错误");
-                }else {
+                if (check(info)) {
                     updateContext.setKv("hash_" + hash, info);
                     promise.resolve(true);
+                } else {
+                    updateContext.setKv("hash_" + hash, info);
+                    promise.reject("setLocalHashInfo failed: invalid json string");
                 }
             }
         });
     }
 
-    public static void getLocalHashInfo(UpdateContext updateContext, final String hash, Promise promise) {
+    public static void getLocalHashInfo(UpdateContext updateContext, final String hash, final Promise promise) {
         String value = updateContext.getKv("hash_" + hash);
         if (check(value)) {
             promise.resolve(value);
         } else {
-            promise.reject("校验报错:json字符串格式错误");
+            promise.reject("getLocalHashInfo failed: invalid json string");
         }
 
     }

android/src/main/java/expo/modules/pushy/ExpoPushyModule.kt

@@ -0,0 +1,10 @@
+package expo.modules.pushy
+
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+
+class ExpoPushyModule : Module() {
+  override fun definition() = ModuleDefinition {
+    Name("ExpoPushy")
+  }
+}

android/src/main/java/expo/modules/pushy/ExpoPushyPackage.java

@@ -0,0 +1,27 @@
+package expo.modules.pushy;
+
+import android.content.Context;
+import android.util.Log;
+import androidx.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import cn.reactnative.modules.update.UpdateContext;
+import expo.modules.core.interfaces.Package;
+import expo.modules.core.interfaces.ReactNativeHostHandler;
+
+public class ExpoPushyPackage  implements Package {
+    @Override
+    public List<ReactNativeHostHandler> createReactNativeHostHandlers(Context context) {
+        List<ReactNativeHostHandler> handlers = new ArrayList<>();
+        handlers.add(new ReactNativeHostHandler() {
+            @Nullable
+            @Override
+            public String getJSBundleFile(boolean useDeveloperSupport) {
+                return UpdateContext.getBundleUrl(context);
+            }
+        });
+        return handlers;
+    }
+}

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

@@ -97,6 +97,11 @@ public class UpdateModule extends NativePushySpec {
         UpdateModuleImpl.reloadUpdate(updateContext, mContext, options,promise);
     }
 
+    @Override
+    public void restartApp(Promise promise) {
+        UpdateModuleImpl.restartApp(mContext, promise);
+    }
+
     @Override
     public void setNeedUpdate(ReadableMap options,Promise promise) {
         UpdateModuleImpl.setNeedUpdate(updateContext, options,promise);

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

@@ -224,6 +224,29 @@ public class UpdateModule extends ReactContextBaseJavaModule {
         });
     }
 
+    @ReactMethod
+    public void restartApp(final Promise promise) {
+
+        UiThreadUtil.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    final Context application = getReactApplicationContext().getApplicationContext();
+                    ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager();
+                    if (instanceManager == null) {
+                        instanceManager = ((ReactApplication) application).getReactNativeHost().getReactInstanceManager();
+                    }
+                    instanceManager.recreateReactContextInBackground();
+                    promise.resolve(true);
+
+                } catch (Throwable err) {
+                    promise.reject(err);
+                    Log.e("pushy", "restartApp failed ", err);
+                }
+            }
+        });
+    }
+
     @ReactMethod
     public void setNeedUpdate(ReadableMap options) {
         final String hash = options.getString("hash");

endpoints_cresc.json

@@ -0,0 +1 @@
+["https://cresc-server-pthxtmvcnf.ap-southeast-1.fcapp.run"]

expo-module.config.json

@@ -0,0 +1,13 @@
+{
+ "platforms": ["apple", "android"],
+  "apple": {
+    "modules": ["ExpoPushyModule"],
+    "reactDelegateHandlers": ["ExpoPushyReactDelegateHandler"],
+    "podspecPath":"react-native-update.podspec"
+  },
+  "android": {
+    "modules": [
+      "expo.modules.pushy.ExpoPushyModule"
+    ]
+  }
+}

harmony/oh-package-lock.json5

@@ -5,14 +5,15 @@
   "lockfileVersion": 3,
   "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
   "specifiers": {
-    "rnoh@../../../libs/rnoh": "rnoh@../../../libs/rnoh"
+    "@rnoh/react-native-openharmony@0.72.38": "@rnoh/react-native-openharmony@0.72.38"
   },
   "packages": {
-    "rnoh@../../../libs/rnoh": {
-      "name": "rnoh",
-      "version": "0.72.12",
-      "resolved": "../../../libs/rnoh",
-      "registryType": "local"
+    "@rnoh/react-native-openharmony@0.72.38": {
+      "name": "@rnoh/react-native-openharmony",
+      "version": "0.72.38",
+      "integrity": "sha512-br5SIrbB0OarSLirenleE7eTOX1lNccMJ7nb/G7qWTyJ7kW4DalmTXVKYpoT2qaOLls1uEE7McD1OjbZZM9jug==",
+      "resolved": "https://ohpm.openharmony.cn/ohpm/@rnoh/react-native-openharmony/-/react-native-openharmony-0.72.38.har",
+      "registryType": "ohpm"
     }
   }
 }

harmony/oh-package.json5

@@ -7,6 +7,6 @@
   "main": "index.ets",
   "version": "3.1.0-0.0.7",
   "dependencies": {
-    "rnoh": "file:../../../libs/rnoh"
+    "@rnoh/react-native-openharmony":"^0.72.38"
   }
 }

harmony/oh_modules/@rnoh/react-native-openharmony

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

harmony/src/main/ets/DownloadTask.ts

@@ -65,9 +65,13 @@ export class DownloadTask {
             0,
             params.targetFile.lastIndexOf('/'),
           );
-          await fileIo.mkdir(targetDir);
+          const exists = fileIo.accessSync(targetDir);
+          if(!exists){
+            await fileIo.mkdir(targetDir);
+          }
         }
       } catch (error) {
+        throw error;
       }
 
       const response = await httpRequest.request(params.url, {
@@ -78,12 +82,11 @@ export class DownloadTask {
           'Content-Type': 'application/octet-stream',
         },
       });
-
       if (response.responseCode > 299) {
         throw new Error(`Server error: ${response.responseCode}`);
       }
 
-      const contentLength = parseInt(response.header['Content-Length'] || '0');
+      const contentLength = parseInt(response.header['content-length'] || '0');
       const writer = await fileIo.open(
         params.targetFile,
         fileIo.OpenMode.CREATE | fileIo.OpenMode.READ_WRITE,
@@ -102,8 +105,12 @@ export class DownloadTask {
         this.onProgressUpdate(received, contentLength);
       }
       await fileIo.close(writer);
-      const stat = await fileIo.stat(params.targetFile);
-      const fileSize = stat.size;
+      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`);
+      }
+
     } catch (error) {
       console.error('Download failed:', error);
       throw error;
@@ -113,7 +120,7 @@ export class DownloadTask {
   }
 
   private onProgressUpdate(received: number, total: number): void {
-    this.eventHub.emit('downloadProgress', {
+    this.eventHub.emit('RCTPushyDownloadProgress', {
       received,
       total,
       hash: this.hash,
@@ -288,8 +295,8 @@ export class DownloadTask {
         }
       }
 
-       if(entry.filename !== '.DS_Store'){
-        await zip.decompressFile(entry.filename, params.unzipDirectory);
+      if(fn !== '.DS_Store'){
+        await zip.decompressFile(fn, params.unzipDirectory);
       }
     }
 

harmony/src/main/ets/EventHub.ts

@@ -3,6 +3,7 @@ type EventCallback = (data: any) => void;
 export class EventHub {
   private static instance: EventHub;
   private listeners: Map<string, Set<EventCallback>>;
+  private rnInstance: any;
 
   private constructor() {
     this.listeners = new Map();
@@ -27,12 +28,12 @@ export class EventHub {
   }
 
   public emit(event: string, data: any): void {
-    this.listeners.get(event)?.forEach(callback => {
-      try {
-        callback(data);
-      } catch (error) {
-        console.error(`Error in event listener for ${event}:`, error);
-      }
-    });
+    if (this.rnInstance) {
+      this.rnInstance.emitDeviceEvent(event, data);
+    }
+  }
+
+  setRNInstance(instance: any) {
+    this.rnInstance = instance;
   }
 }

harmony/src/main/ets/FileJSBundleProvider.ets

@@ -1,4 +1,4 @@
-import { HotReloadConfig, JSBundleProvider, JSBundleProviderError, JSPackagerClientConfig } from 'rnoh';
+import { HotReloadConfig, JSBundleProvider, JSBundleProviderError, JSPackagerClientConfig } from '@rnoh/react-native-openharmony';
 import fileIo from '@ohos.file.fs';
 import common from '@ohos.app.ability.common';
 import { UpdateContext } from './UpdateContext';
@@ -40,20 +40,15 @@ export class FileJSBundleProvider extends JSBundleProvider {
       }
       throw new Error('Update bundle not found');
     } catch (error) {
-      throw new JSBundleProviderError(`Couldn't load JSBundle from ${this.filePath}`, error)
+      throw new JSBundleProviderError({
+        whatHappened: `Couldn't load JSBundle from ${this.filePath}`,
+        extraData: error,
+        howCanItBeFixed: [`Check if a bundle exists at "${this.filePath}" on your device.`]
+      })
     }
   }
 
   getAppKeys(): string[] {
     return [];
   }
-
-  getHotReloadConfig(): HotReloadConfig | null {
-   return null;
-  }
-
-  getJSPackagerClientConfig(): JSPackagerClientConfig | null {
-    return null;
-  }
-
 }

harmony/src/main/ets/PushyPackage.ts

@@ -1,5 +1,5 @@
-import { RNPackage, TurboModulesFactory } from 'rnoh/ts';
-import type { TurboModule, TurboModuleContext } from 'rnoh/ts';
+import { RNPackage, TurboModulesFactory } from '@rnoh/react-native-openharmony/ts';
+import type { TurboModule, TurboModuleContext } from '@rnoh/react-native-openharmony/ts';
 import { PushyTurboModule } from './PushyTurboModule';
 
 class PushyTurboModulesFactory extends TurboModulesFactory {

harmony/src/main/ets/PushyTurboModule.ts

@@ -1,4 +1,4 @@
-import { TurboModule, TurboModuleContext } from 'rnoh/ts';
+import { TurboModule, TurboModuleContext } from '@rnoh/react-native-openharmony/ts';
 import common from '@ohos.app.ability.common';
 import dataPreferences from '@ohos.data.preferences';
 import { bundleManager } from '@kit.AbilityKit';
@@ -7,6 +7,7 @@ import { BusinessError } from '@ohos.base';
 import logger from './Logger';
 import { UpdateModuleImpl } from './UpdateModuleImpl';
 import { UpdateContext } from './UpdateContext';
+import { EventHub } from './EventHub';
 
 const TAG = "PushyTurboModule"
 
@@ -18,9 +19,8 @@ export class PushyTurboModule extends TurboModule {
     super(ctx);
     logger.debug(TAG, ",PushyTurboModule constructor");
     this.mUiCtx = ctx.uiAbilityContext
-    let rnInstance = ctx.rnInstance
     this.context = new UpdateContext(this.mUiCtx)
-    // rnInstance.emitDeviceEvent("Pushy",{code: err.code, message: err.message});
+    EventHub.getInstance().setRNInstance(ctx.rnInstance)
   }
 
 

harmony/src/main/ets/UpdateContext.ts

@@ -26,15 +26,18 @@ export class UpdateContext {
         this.initPreferences();
     }
 
-    private async initPreferences() {
+    private initPreferences() {
         try {
-            this.preferences = await preferences.getPreferences(this.context, 'update');
-            const packageVersion = await this.getPackageVersion();
-            const storedVersion = await this.preferences.get('packageVersion', '');
-            if (packageVersion !== storedVersion) {
-                await this.preferences.clear();
-                await this.preferences.put('packageVersion', packageVersion);
-                await this.preferences.flush();
+            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) {
@@ -42,33 +45,33 @@ export class UpdateContext {
         }
     }
 
-    public async setKv(key: string, value: string): Promise<void> {
-        await this.preferences.put(key, value);
-        await this.preferences.flush();
+    public setKv(key: string, value: string): void {
+         this.preferences.putSync(key, value);
+         this.preferences.flush();
     }
 
-    public async getKv(key: string): Promise<string> {
-        return await this.preferences.get(key, '') as string;
+    public  getKv(key: string): string {
+        return  this.preferences.getSync(key, '') as string;
     }
 
-    public async isFirstTime(): Promise<boolean> {
-        return await this.preferences.get('firstTime', false) as boolean;
+    public  isFirstTime(): boolean {
+        return  this.preferences.getSync('firstTime', false) as boolean;
     }
 
-    public async rolledBackVersion(): Promise<string> {
-        return await this.preferences.get('rolledBackVersion', '') as string;
+    public  rolledBackVersion(): string {
+        return  this.preferences.getSync('rolledBackVersion', '') as string;
     }
 
-    public async markSuccess(): Promise<void> {
-        await this.preferences.put('firstTimeOk', true);
-        const lastVersion = await this.preferences.get('lastVersion', '') as string;
-        const curVersion = await this.preferences.get('currentVersion', '') 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) {
-            await this.preferences.delete('lastVersion');
-            await this.preferences.delete(`hash_${lastVersion}`);
+             this.preferences.deleteSync('lastVersion');
+             this.preferences.deleteSync(`hash_${lastVersion}`);
         }
-        await this.preferences.flush();
+        this.preferences.flush();
         this.cleanUp();
     }
 
@@ -137,29 +140,29 @@ export class UpdateContext {
             params.unzipDirectory = `${this.rootDir}/${hash}`;
 
             const downloadTask = new DownloadTask(this.context);
-            await downloadTask.execute(params);
+            return  await downloadTask.execute(params);
         } catch (e) {
+            throw e;
             console.error('Failed to download APK patch:', e);
         }
     }
 
-    public async switchVersion(hash: string): Promise<void> {
+    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 = await this.getKv('currentVersion');
-            await this.setKv('currentVersion', hash);
-
+            const lastVersion = this.getKv('currentVersion');
+            this.setKv('currentVersion', hash);
             if (lastVersion && lastVersion !== hash) {
-                await this.setKv('lastVersion', lastVersion);
+                this.setKv('lastVersion', lastVersion);
             }
 
-            await this.setKv('firstTime', 'true');
-            await this.setKv('firstTimeOk', 'false');
-            await this.setKv('rolledBackVersion', null);
+             this.setKv('firstTime', 'true');
+             this.setKv('firstTimeOk', 'false');
+             this.setKv('rolledBackVersion', "");
         } catch (e) {
             console.error('Failed to switch version:', e);
         }
@@ -176,7 +179,7 @@ export class UpdateContext {
             return defaultAssetsUrl;
         }
         if (!this.isFirstTime()) {
-            if (!this.preferences.get('firstTimeOk', true)) {
+            if (!this.preferences.getSync('firstTimeOk', true)) {
                 return this.rollBack();
             }
         }
@@ -211,7 +214,7 @@ export class UpdateContext {
     }
 
     public getCurrentVersion() : string {
-        const currentVersion = this.preferences.getSync('currentVersion', '') as string;
+        const currentVersion = this.getKv('currentVersion');
         return currentVersion;
     }
 

harmony/src/main/ets/UpdateModuleImpl.ts

@@ -1,8 +1,5 @@
-import { TurboModuleContext } from 'rnoh/ts';
-import dataPreferences from '@ohos.data.preferences';
 import bundleManager from '@ohos.bundle.bundleManager';
 import common from '@ohos.app.ability.common';
-import { BusinessError } from '@ohos.base';
 import { UpdateContext } from './UpdateContext';
 import { DownloadTaskParams } from './DownloadTaskParams';
 import logger from './Logger';
@@ -59,7 +56,7 @@ export class UpdateModuleImpl {
     options: { updateUrl: string; hash: string }
   ): Promise<void> {
     try {
-      await updateContext.downloadPatchFromPackage(options.updateUrl, options.hash, {
+     return await updateContext.downloadPatchFromPackage(options.updateUrl, options.hash, {
         onDownloadCompleted: (params: DownloadTaskParams) => {
           return Promise.resolve();
         },

ios/Expo/ExpoPushyModule.swift

@@ -0,0 +1,7 @@
+import ExpoModulesCore
+
+public class ExpoPushyModule: Module {
+  public func definition() -> ModuleDefinition {
+    Name("ExpoPushy")
+  }
+}

ios/Expo/ExpoPushyReactDelegateHandler.swift

@@ -0,0 +1,40 @@
+import ExpoModulesCore
+import React
+
+public final class ExpoPushyReactDelegateHandler: ExpoReactDelegateHandler {
+
+    #if EXPO_SUPPORTS_BUNDLEURL
+    // This code block compiles only if EXPO_SUPPORTS_BUNDLEURL is defined
+    // For expo-modules-core >= 1.12.0
+
+    // Override bundleURL, which is the primary mechanism for these versions.
+    // Expo's default createBridge implementation should respect this.
+    override public func bundleURL(reactDelegate: ExpoReactDelegate) -> URL? {
+      let bundleURL = RCTPushy.bundleURL()
+      print("PushyHandler: Using bundleURL: \(bundleURL?.absoluteString ?? "nil")")
+      return bundleURL
+    }
+
+    // No createBridge override needed here, rely on default behavior using the bundleURL override.
+
+    #else
+    // This code block compiles only if EXPO_SUPPORTS_BUNDLEURL is NOT defined
+    // For expo-modules-core < 1.12.0
+
+    // No bundleURL override possible here.
+
+    // createBridge is the mechanism to customize the URL here.
+    // We completely override it and do not call super.
+    override public func createBridge(reactDelegate: ExpoReactDelegate, bridgeDelegate: RCTBridgeDelegate, launchOptions: [AnyHashable: Any]?) -> RCTBridge? {
+      let bundleURL = RCTPushy.bundleURL()
+      // Print the URL being provided to the initializer
+      print("PushyHandler: createBridge bundleURL: \(bundleURL?.absoluteString ?? "nil")")
+
+      // Directly create the bridge using the bundleURL initializer.
+      // Pass nil for moduleProvider, assuming default behavior is sufficient.
+      // WARNING: If bundleURL is nil, this initialization might fail silently or crash.
+      return RCTBridge(bundleURL: bundleURL, moduleProvider: nil, launchOptions: launchOptions)
+    }
+
+    #endif // EXPO_SUPPORTS_BUNDLEURL
+}

ios/RCTPushy/RCTPushy.mm

@@ -78,6 +78,7 @@ RCT_EXPORT_MODULE(RCTPushy);
         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
@@ -337,6 +338,26 @@ RCT_EXPORT_METHOD(reloadUpdate:(NSDictionary *)options
     }
 }
 
+RCT_EXPORT_METHOD(restartApp:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    @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");
+        #endif
+
+        resolve(@true);
+    }
+    @catch (NSException *exception) {
+        reject(@"执行报错", exception.reason, nil);
+    }
+}
+
 RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
                                     rejecter:(RCTPromiseRejectBlock)reject)
 {

package.json

@@ -1,32 +1,33 @@
 {
   "name": "react-native-update",
-  "version": "10.22.1",
+  "version": "10.28.7",
   "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",
-    "url": "git+https://github.com/reactnativecn/react-native-pushy.git"
+    "url": "git+https://github.com/reactnativecn/react-native-update.git"
   },
   "keywords": [
     "react-native",
@@ -37,13 +38,13 @@
   "author": "reactnativecn",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/reactnativecn/react-native-pushy/issues"
+    "url": "https://github.com/reactnativecn/react-native-update/issues"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
     "react-native": ">=0.59.0"
   },
-  "homepage": "https://github.com/reactnativecn/react-native-pushy#readme",
+  "homepage": "https://github.com/reactnativecn/react-native-update#readme",
   "dependencies": {
     "nanoid": "^3.3.3",
     "react-native-url-polyfill": "^2.0.0"

react-native-update.podspec

@@ -1,12 +1,41 @@
 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
+  is_version_sufficient = 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
+    # Check root package.json for Expo version >= 50
+    root_package_json_path = File.join(podspec_dir, '..', '..', 'package.json')
+    if File.exist?(root_package_json_path)
+        pkg_json = JSON.parse(File.read(root_package_json_path))
+        expo_version_string = pkg_json['dependencies']&.[]('expo') || pkg_json['devDependencies']&.[]('expo')
+        if expo_version_string
+          match = expo_version_string.match(/\d+/)
+          if match
+            major_version = match[0].to_i
+            is_version_sufficient = major_version >= 50
+          end
+        end
+    end
+  rescue => e
+     # Silently ignore errors during check
+  end
+  # Determine final validity
+  valid_expo_project = is_expo_in_podfile && is_version_sufficient
+
   s.name         = package['name']
   s.version      = package['version']
   s.summary      = package['description']
@@ -18,8 +47,15 @@ Pod::Spec.new do |s|
   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-pushy.git', :tag => '#{s.version}' }
-  s.source_files    = "ios/**/*.{h,m,mm,swift}"
+  s.source = { :git => 'https://github.com/reactnativecn/react-native-update.git', :tag => '#{s.version}' }
+
+  # Conditionally set source files
+  if valid_expo_project
+    s.source_files = Dir.glob("ios/**/*.{h,m,mm,swift}") # Include Expo files
+  else
+    s.source_files = Dir.glob("ios/**/*.{h,m,mm,swift}").reject { |f| f.start_with?("ios/Expo/") } # Exclude Expo files
+  end
+
   s.libraries = 'bz2', 'z'
   s.vendored_libraries = 'RCTPushy/libRCTPushy.a'
   s.pod_target_xcconfig = { 
@@ -33,11 +69,16 @@ Pod::Spec.new do |s|
   s.dependency "React-Core"
   s.dependency 'SSZipArchive'
 
+  # Conditionally add Expo dependency
+  if valid_expo_project
+    s.dependency 'ExpoModulesCore'
+  end
+
   s.subspec 'RCTPushy' do |ss|
     ss.source_files = 'ios/RCTPushy/*.{h,m,mm,swift}'
-    ss.public_header_files = ['ios/RCTPushy/RCTPushy.h']
+    ss.public_header_files = ['ios/RCTPushy/*.h']
   end
-  
+
   s.subspec 'HDiffPatch' do |ss|
     ss.source_files = ['ios/RCTPushy/HDiffPatch/**/*.{h,m,c}',
                        'android/jni/hpatch.{h,c}',
@@ -47,7 +88,34 @@ Pod::Spec.new do |s|
                        'android/jni/lzma/C/Lzma2Dec.{h,c}']
     ss.public_header_files = 'ios/RCTPushy/HDiffPatch/**/*.h'
   end
-  
+
+  # Conditionally add Expo subspec and check ExpoModulesCore version
+  if valid_expo_project
+    supports_bundle_url_final = false # Default
+    begin
+      # Check installed ExpoModulesCore version for bundle URL support
+      expo_core_package_json_path = File.join(podspec_dir, '..', 'expo-modules-core', 'package.json')
+      if File.exist?(expo_core_package_json_path)
+          core_package_json = JSON.parse(File.read(expo_core_package_json_path))
+          installed_version_str = core_package_json['version']
+          if installed_version_str
+            installed_version = Gem::Version.new(installed_version_str)
+            target_version = Gem::Version.new('1.12.0')
+            supports_bundle_url_final = installed_version >= target_version
+          end
+      end
+    rescue JSON::ParserError, Errno::ENOENT, ArgumentError, StandardError => e
+      # Pod::UI.warn "Could not check ExpoModulesCore version: #{e.message}"
+    end
+
+    s.subspec 'Expo' do |ss|
+      ss.source_files = 'ios/Expo/**/*.{h,m,mm,swift}'
+      if supports_bundle_url_final
+        ss.pod_target_xcconfig = { 'SWIFT_ACTIVE_COMPILATION_CONDITIONS' => 'EXPO_SUPPORTS_BUNDLEURL' }
+      end
+    end
+  end
+
   if defined?(install_modules_dependencies()) != nil
     install_modules_dependencies(s);
   else
@@ -59,8 +127,7 @@ Pod::Spec.new do |s|
       s.pod_target_xcconfig = {
           "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
           "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-      }
-
+      }.merge(s.pod_target_xcconfig)
       s.dependency "React-Codegen"
       s.dependency "RCT-Folly"
       s.dependency "RCTRequired"

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

@@ -15,6 +15,7 @@ export interface Spec extends TurboModule {
   getLocalHashInfo(hash: string): Promise<string>;
   setUuid(uuid: string): Promise<void>;
   reloadUpdate(options: { hash: string }): Promise<void>;
+  restartApp(): Promise<void>;
   setNeedUpdate(options: { hash: string }): Promise<void>;
   markSuccess(): Promise<void>;
   downloadPatchFromPpk(options: {

src/client.ts

@@ -1,6 +1,19 @@
-import { CheckResult, PushyOptions, ProgressData, EventType } from './type';
-import { emptyObj, joinUrls, log, noop, promiseAny, testUrls } from './utils';
-import { EmitterSubscription, Platform } from 'react-native';
+import { CheckResult, ClientOptions, ProgressData, EventType } from './type';
+import {
+  assertDev,
+  assertWeb,
+  emptyObj,
+  joinUrls,
+  log,
+  noop,
+  promiseAny,
+  testUrls,
+} from './utils';
+import {
+  EmitterSubscription,
+  Platform,
+  DeviceEventEmitter,
+} from 'react-native';
 import { PermissionsAndroid } from './permissions';
 import {
   PushyModule,
@@ -13,44 +26,74 @@ import {
   setLocalHashInfo,
   isFirstTime,
   isRolledBack,
+  getCurrentVersionInfo,
 } from './core';
 
-const defaultServer = {
-  main: 'https://update.react-native.cn/api',
-  backups: ['https://update.reactnative.cn/api'],
-  queryUrls: [
-    'https://gitee.com/sunnylqm/react-native-pushy/raw/master/endpoints.json',
-    'https://cdn.jsdelivr.net/gh/reactnativecn/react-native-pushy@master/endpoints.json',
-  ],
+const SERVER_PRESETS = {
+  // cn
+  Pushy: {
+    main: 'https://update.react-native.cn/api',
+    backups: ['https://update.reactnative.cn/api'],
+    queryUrls: [
+      'https://gitee.com/sunnylqm/react-native-pushy/raw/master/endpoints.json',
+      'https://cdn.jsdelivr.net/gh/reactnativecn/react-native-update@master/endpoints.json',
+    ],
+  },
+  // i18n
+  Cresc: {
+    main: 'https://api.cresc.dev',
+    backups: ['https://api.cresc.app'],
+    queryUrls: [
+      'https://cdn.jsdelivr.net/gh/reactnativecn/react-native-update@master/endpoints_cresc.json',
+    ],
+  },
 };
 
-if (Platform.OS === 'web') {
-  console.warn('react-native-update 不支持 web 端热更，不会执行操作');
-}
+assertWeb();
 
+const defaultClientOptions: ClientOptions = {
+  appKey: '',
+  autoMarkSuccess: true,
+  updateStrategy: __DEV__ ? 'alwaysAlert' : 'alertUpdateAndIgnoreError',
+  checkStrategy: 'both',
+  logger: noop,
+  debug: false,
+  throwError: false,
+};
+
+export const sharedState: {
+  progressHandlers: Record<string, EmitterSubscription>;
+  downloadedHash?: string;
+  apkStatus: 'downloading' | 'downloaded' | null;
+  marked: boolean;
+  applyingUpdate: boolean;
+} = {
+  progressHandlers: {},
+  downloadedHash: undefined,
+  apkStatus: null,
+  marked: false,
+  applyingUpdate: false,
+};
+
+const assertHash = (hash: string) => {
+  if (!sharedState.downloadedHash) {
+    return;
+  }
+  if (hash !== sharedState.downloadedHash) {
+    log(`use downloaded hash ${sharedState.downloadedHash} first`);
+    return;
+  }
+  return true;
+};
+
+// for China users
 export class Pushy {
-  options: PushyOptions = {
-    appKey: '',
-    server: defaultServer,
-    autoMarkSuccess: true,
-    updateStrategy: __DEV__ ? 'alwaysAlert' : 'alertUpdateAndIgnoreError',
-    checkStrategy: 'both',
-    logger: noop,
-    debug: false,
-    throwError: false,
-  };
-
+  options = defaultClientOptions;
+  clientType: 'Pushy' | 'Cresc' = 'Pushy';
   lastChecking?: number;
   lastRespJson?: Promise<any>;
 
-  static progressHandlers: Record<string, EmitterSubscription> = {};
-  static downloadedHash?: string;
-
-  static apkStatus: 'downloading' | 'downloaded' | null = null;
-
-  static marked = false;
-  static applyingUpdate = false;
-  version = cInfo.pushy;
+  version = cInfo.rnu;
   loggerPromise = (() => {
     let resolve: (value?: unknown) => void = () => {};
     const promise = new Promise(res => {
@@ -62,12 +105,14 @@ export class Pushy {
     };
   })();
 
-  constructor(options: PushyOptions) {
+  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];
     this.setOptions(options);
     if (isRolledBack) {
       this.report({
@@ -79,7 +124,7 @@ export class Pushy {
     }
   }
 
-  setOptions = (options: Partial<PushyOptions>) => {
+  setOptions = (options: Partial<ClientOptions>) => {
     for (const [key, value] of Object.entries(options)) {
       if (value !== undefined) {
         (this.options as any)[key] = value;
@@ -102,6 +147,7 @@ export class Pushy {
     log(type + ' ' + message);
     await this.loggerPromise.promise;
     const { logger = noop, appKey } = this.options;
+    const info = await getCurrentVersionInfo();
     logger({
       type,
       data: {
@@ -111,6 +157,7 @@ export class Pushy {
         packageVersion,
         buildTime,
         message,
+        ...info,
         ...data,
       },
     });
@@ -123,66 +170,55 @@ export class Pushy {
   getCheckUrl = (endpoint: string = this.options.server!.main) => {
     return `${endpoint}/checkUpdate/${this.options.appKey}`;
   };
-  static assertHash = (hash: string) => {
-    if (!Pushy.downloadedHash) {
-      return;
-    }
-    if (hash !== Pushy.downloadedHash) {
-      log(`use downloaded hash ${Pushy.downloadedHash} first`);
-      return;
+  assertDebug = () => {
+    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.',
+      );
+      return false;
     }
     return true;
   };
   markSuccess = () => {
-    if (Pushy.marked || __DEV__ || !isFirstTime) {
+    if (sharedState.marked || __DEV__ || !isFirstTime) {
       return;
     }
-    Pushy.marked = true;
+    sharedState.marked = true;
     PushyModule.markSuccess();
     this.report({ type: 'markSuccess' });
   };
   switchVersion = async (hash: string) => {
-    if (__DEV__) {
-      console.warn(
-        '您调用了switchVersion方法，但是当前是开发环境，不会进行任何操作。',
-      );
+    if (!assertDev('switchVersion()')) {
       return;
     }
-    if (Pushy.assertHash(hash) && !Pushy.applyingUpdate) {
+    if (assertHash(hash) && !sharedState.applyingUpdate) {
       log('switchVersion: ' + hash);
-      Pushy.applyingUpdate = true;
+      sharedState.applyingUpdate = true;
       return PushyModule.reloadUpdate({ hash });
     }
   };
 
   switchVersionLater = async (hash: string) => {
-    if (__DEV__) {
-      console.warn(
-        '您调用了switchVersionLater方法，但是当前是开发环境，不会进行任何操作。',
-      );
+    if (!assertDev('switchVersionLater()')) {
       return;
     }
-    if (Pushy.assertHash(hash)) {
+    if (assertHash(hash)) {
       log('switchVersionLater: ' + hash);
       return PushyModule.setNeedUpdate({ hash });
     }
   };
   checkUpdate = async (extra?: Record<string, any>) => {
-    if (__DEV__ && !this.options.debug) {
-      console.info(
-        '您当前处于开发环境且未启用 debug，不会进行热更检查。如需在开发环境中调试热更，请在 client 中设置 debug 为 true',
-      );
+    if (!this.assertDebug()) {
       return;
     }
-    if (Platform.OS === 'web') {
-      console.warn('web 端不支持热更新检查');
+    if (!assertWeb()) {
       return;
     }
     if (
       this.options.beforeCheckUpdate &&
       (await this.options.beforeCheckUpdate()) === false
     ) {
-      log('beforeCheckUpdate 返回 false, 忽略检查');
+      log('beforeCheckUpdate returned false, skipping check');
       return;
     }
     const now = Date.now();
@@ -205,10 +241,11 @@ export class Pushy {
       // @ts-ignore
       delete fetchBody.buildTime;
     }
+    const stringifyBody = JSON.stringify(fetchBody);
     // harmony fetch body is not string
     let body: any = fetchBody;
     if (Platform.OS === 'ios' || Platform.OS === 'android') {
-      body = JSON.stringify(fetchBody);
+      body = stringifyBody;
     }
     const fetchPayload = {
       method: 'POST',
@@ -222,13 +259,13 @@ export class Pushy {
     try {
       this.report({
         type: 'checking',
-        message: this.options.appKey + ': ' + body,
+        message: this.options.appKey + ': ' + stringifyBody,
       });
       resp = await fetch(this.getCheckUrl(), fetchPayload);
     } catch (e: any) {
       this.report({
         type: 'errorChecking',
-        message: 'Can not connect to update server. Trying backup endpoints.',
+        message: `Can not connect to update server: ${e.message}. Trying backup endpoints.`,
       });
       const backupEndpoints = await this.getBackupEndpoints();
       if (backupEndpoints) {
@@ -310,7 +347,7 @@ export class Pushy {
       this.options.beforeDownloadUpdate &&
       (await this.options.beforeDownloadUpdate(info)) === false
     ) {
-      log('beforeDownloadUpdate 返回 false, 忽略下载');
+      log('beforeDownloadUpdate returned false, skipping download');
       return;
     }
     if (!info.update || !hash) {
@@ -320,26 +357,41 @@ export class Pushy {
       log(`rolledback hash ${rolledBackVersion}, ignored`);
       return;
     }
-    if (Pushy.downloadedHash === hash) {
-      log(`duplicated downloaded hash ${Pushy.downloadedHash}, ignored`);
-      return Pushy.downloadedHash;
+    if (sharedState.downloadedHash === hash) {
+      log(`duplicated downloaded hash ${sharedState.downloadedHash}, ignored`);
+      return sharedState.downloadedHash;
     }
-    if (Pushy.progressHandlers[hash]) {
+    if (sharedState.progressHandlers[hash]) {
       return;
     }
+    const patchStartTime = Date.now();
     if (onDownloadProgress) {
-      Pushy.progressHandlers[hash] = pushyNativeEventEmitter.addListener(
-        'RCTPushyDownloadProgress',
-        progressData => {
-          if (progressData.hash === hash) {
-            onDownloadProgress(progressData);
-          }
-        },
-      );
+      // @ts-expect-error harmony not in existing platforms
+      if (Platform.OS === 'harmony') {
+        sharedState.progressHandlers[hash] = DeviceEventEmitter.addListener(
+          'RCTPushyDownloadProgress',
+          progressData => {
+            if (progressData.hash === hash) {
+              onDownloadProgress(progressData);
+            }
+          },
+        );
+      } else {
+        sharedState.progressHandlers[hash] =
+          pushyNativeEventEmitter.addListener(
+            'RCTPushyDownloadProgress',
+            progressData => {
+              if (progressData.hash === hash) {
+                onDownloadProgress(progressData);
+              }
+            },
+          );
+      }
     }
     let succeeded = '';
     this.report({ type: 'downloading' });
     let lastError: any;
+    let errorMessages: string[] = [];
     const diffUrl = await testUrls(joinUrls(paths, diff));
     if (diffUrl) {
       log('downloading diff');
@@ -351,11 +403,13 @@ export class Pushy {
         });
         succeeded = 'diff';
       } catch (e: any) {
-        lastError = e;
+        const errorMessage = `diff error: ${e.message}`;
+        errorMessages.push(errorMessage);
+        lastError = new Error(errorMessage);
         if (__DEV__) {
           succeeded = 'diff';
         } else {
-          log(`diff error: ${e.message}, try pdiff`);
+          log(errorMessage);
         }
       }
     }
@@ -369,11 +423,13 @@ export class Pushy {
         });
         succeeded = 'pdiff';
       } catch (e: any) {
-        lastError = e;
+        const errorMessage = `pdiff error: ${e.message}`;
+        errorMessages.push(errorMessage);
+        lastError = new Error(errorMessage);
         if (__DEV__) {
           succeeded = 'pdiff';
         } else {
-          log(`pdiff error: ${e.message}, try full patch`);
+          log(errorMessage);
         }
       }
     }
@@ -387,17 +443,19 @@ export class Pushy {
         });
         succeeded = 'full';
       } catch (e: any) {
-        lastError = e;
+        const errorMessage = `full patch error: ${e.message}`;
+        errorMessages.push(errorMessage);
+        lastError = new Error(errorMessage);
         if (__DEV__) {
           succeeded = 'full';
         } else {
-          log(`full patch error: ${e.message}`);
+          log(errorMessage);
         }
       }
     }
-    if (Pushy.progressHandlers[hash]) {
-      Pushy.progressHandlers[hash].remove();
-      delete Pushy.progressHandlers[hash];
+    if (sharedState.progressHandlers[hash]) {
+      sharedState.progressHandlers[hash].remove();
+      delete sharedState.progressHandlers[hash];
     }
     if (__DEV__) {
       return hash;
@@ -406,15 +464,25 @@ export class Pushy {
       this.report({
         type: 'errorUpdate',
         data: { newVersion: hash },
+        message: errorMessages.join(';'),
       });
       if (lastError) {
         throw lastError;
       }
       return;
     } else {
+      const duration = Date.now() - patchStartTime;
+      const data: Record<string, any> = {
+        newVersion: hash,
+        diff: succeeded,
+        duration,
+      };
+      if (errorMessages.length > 0) {
+        data.error = errorMessages.join(';');
+      }
       this.report({
         type: 'downloadSuccess',
-        data: { newVersion: hash, diff: succeeded },
+        data,
       });
     }
     log(`downloaded ${succeeded} hash:`, hash);
@@ -423,7 +491,7 @@ export class Pushy {
       description,
       metaInfo,
     });
-    Pushy.downloadedHash = hash;
+    sharedState.downloadedHash = hash;
     return hash;
   };
   downloadAndInstallApk = async (
@@ -433,10 +501,10 @@ export class Pushy {
     if (Platform.OS !== 'android') {
       return;
     }
-    if (Pushy.apkStatus === 'downloading') {
+    if (sharedState.apkStatus === 'downloading') {
       return;
     }
-    if (Pushy.apkStatus === 'downloaded') {
+    if (sharedState.apkStatus === 'downloaded') {
       this.report({ type: 'errorInstallApk' });
       this.throwIfEnabled(new Error('errorInstallApk'));
       return;
@@ -457,35 +525,46 @@ export class Pushy {
         return;
       }
     }
-    Pushy.apkStatus = 'downloading';
+    sharedState.apkStatus = 'downloading';
     this.report({ type: 'downloadingApk' });
     const progressKey = 'downloadingApk';
     if (onDownloadProgress) {
-      if (Pushy.progressHandlers[progressKey]) {
-        Pushy.progressHandlers[progressKey].remove();
+      if (sharedState.progressHandlers[progressKey]) {
+        sharedState.progressHandlers[progressKey].remove();
       }
-      Pushy.progressHandlers[progressKey] = pushyNativeEventEmitter.addListener(
-        'RCTPushyDownloadProgress',
-        (progressData: ProgressData) => {
-          if (progressData.hash === progressKey) {
-            onDownloadProgress(progressData);
-          }
-        },
-      );
+      sharedState.progressHandlers[progressKey] =
+        pushyNativeEventEmitter.addListener(
+          'RCTPushyDownloadProgress',
+          (progressData: ProgressData) => {
+            if (progressData.hash === progressKey) {
+              onDownloadProgress(progressData);
+            }
+          },
+        );
     }
     await PushyModule.downloadAndInstallApk({
       url,
       target: 'update.apk',
       hash: progressKey,
     }).catch(() => {
-      Pushy.apkStatus = null;
+      sharedState.apkStatus = null;
       this.report({ type: 'errorDownloadAndInstallApk' });
       this.throwIfEnabled(new Error('errorDownloadAndInstallApk'));
     });
-    Pushy.apkStatus = 'downloaded';
-    if (Pushy.progressHandlers[progressKey]) {
-      Pushy.progressHandlers[progressKey].remove();
-      delete Pushy.progressHandlers[progressKey];
+    sharedState.apkStatus = 'downloaded';
+    if (sharedState.progressHandlers[progressKey]) {
+      sharedState.progressHandlers[progressKey].remove();
+      delete sharedState.progressHandlers[progressKey];
     }
   };
+  restartApp = async () => {
+    return PushyModule.restartApp();
+  };
+}
+
+// for international users
+export class Cresc extends Pushy {
+  constructor(options: ClientOptions) {
+    super(options, 'Cresc');
+  }
 }

src/context.ts

@@ -1,6 +1,6 @@
 import { createContext, useContext } from 'react';
 import { CheckResult, ProgressData } from './type';
-import { Pushy } from './client';
+import { Pushy, Cresc } from './client';
 
 const noop = () => {};
 const asyncNoop = () => Promise.resolve();
@@ -13,14 +13,15 @@ export const defaultContext = {
   dismissError: noop,
   downloadUpdate: asyncNoop,
   downloadAndInstallApk: asyncNoop,
+  restartApp: asyncNoop,
   getCurrentVersionInfo: () => Promise.resolve({}),
   parseTestQrCode: () => false,
   currentHash: '',
   packageVersion: '',
 };
 
-export const PushyContext = createContext<{
-  checkUpdate: () => Promise<void>;
+export const UpdateContext = createContext<{
+  checkUpdate: () => Promise<void | CheckResult>;
   switchVersion: () => Promise<void>;
   switchVersionLater: () => Promise<void>;
   markSuccess: () => void;
@@ -33,12 +34,16 @@ export const PushyContext = createContext<{
     metaInfo?: string;
   }>;
   parseTestQrCode: (code: string) => boolean;
+  restartApp: () => Promise<void>;
   currentHash: string;
   packageVersion: string;
-  client?: Pushy;
+  client?: Pushy | Cresc;
   progress?: ProgressData;
   updateInfo?: CheckResult;
   lastError?: Error;
 }>(defaultContext);
 
-export const usePushy = () => useContext(PushyContext);
+export const useUpdate = () => useContext(UpdateContext);
+
+/** @deprecated Please use `useUpdate` instead */
+export const usePushy = useUpdate;

src/core.ts

@@ -4,7 +4,9 @@ const {
   version: v,
 } = require('react-native/Libraries/Core/ReactNativeVersion');
 const RNVersion = `${v.major}.${v.minor}.${v.patch}`;
-const isTurboModuleEnabled = (global as any).__turboModuleProxy != null;
+const isTurboModuleEnabled =
+  // https://github.com/facebook/react-native/pull/48362
+  (global as any).__turboModuleProxy || (global as any).RN$Bridgeless;
 
 export const PushyModule =
   Platform.OS === 'web'
@@ -13,8 +15,12 @@ export const PushyModule =
     ? require('./NativePushy').default
     : NativeModules.Pushy;
 
+export const UpdateModule = PushyModule;
+
 if (!PushyModule) {
-  throw new Error('react-native-update 模块无法加载，请对照安装文档检查配置。');
+  throw new Error(
+    'Failed to load react-native-update native module, please try to recompile',
+  );
 }
 
 const PushyConstants = isTurboModuleEnabled
@@ -31,12 +37,6 @@ export const isRolledBack: boolean = typeof rolledBackVersion === 'string';
 export const buildTime: string = PushyConstants.buildTime;
 let uuid = PushyConstants.uuid;
 
-if (Platform.OS === 'android' && !PushyConstants.isUsingBundleUrl) {
-  throw new Error(
-    'react-native-update 模块无法加载，请对照文档检查 Bundle URL 的配置',
-  );
-}
-
 export function setLocalHashInfo(hash: string, info: Record<string, any>) {
   PushyModule.setLocalHashInfo(hash, JSON.stringify(info));
 }
@@ -63,7 +63,7 @@ if (!uuid) {
 log('uuid: ' + uuid);
 
 export const cInfo = {
-  pushy: require('../package.json').version,
+  rnu: require('../package.json').version,
   rn: RNVersion,
   os: Platform.OS + ' ' + Platform.Version,
   uuid,

src/index.ts

@@ -1,4 +1,4 @@
-export { Pushy } from './client';
-export { PushyContext, usePushy } from './context';
-export { PushyProvider } from './provider';
-export { PushyModule } from './core';
+export { Pushy, Cresc } from './client';
+export { UpdateContext, usePushy, useUpdate } from './context';
+export { PushyProvider, UpdateProvider } from './provider';
+export { PushyModule, UpdateModule } from './core';

src/provider.tsx

@@ -12,22 +12,24 @@ import {
   Platform,
   Linking,
 } from 'react-native';
-import { Pushy } from './client';
+import { Pushy, Cresc, sharedState } from './client';
 import { currentVersion, packageVersion, getCurrentVersionInfo } from './core';
-import { CheckResult, ProgressData, PushyTestPayload } from './type';
-import { PushyContext } from './context';
+import { CheckResult, ProgressData, UpdateTestPayload } from './type';
+import { UpdateContext } from './context';
 import { URL } from 'react-native-url-polyfill';
 import { isInRollout } from './isInRollout';
 import { log } from './utils';
 
-export const PushyProvider = ({
+export const UpdateProvider = ({
   client,
   children,
 }: {
-  client: Pushy;
+  client: Pushy | Cresc;
   children: ReactNode;
 }) => {
+  client = useRef(client).current;
   const { options } = client;
+
   const stateListener = useRef<NativeEventSubscription>();
   const [updateInfo, setUpdateInfo] = useState<CheckResult>();
   const updateInfoRef = useRef(updateInfo);
@@ -98,6 +100,14 @@ export const PushyProvider = ({
           return false;
         }
         stateListener.current && stateListener.current.remove();
+
+        if (
+          options.afterDownloadUpdate &&
+          (await options.afterDownloadUpdate(info)) === false
+        ) {
+          log('afterDownloadUpdate returned false, skipping');
+          return false;
+        }
         if (options.updateStrategy === 'silentAndNow') {
           client.switchVersion(hash);
           return true;
@@ -129,13 +139,7 @@ export const PushyProvider = ({
         return false;
       }
     },
-    [
-      client,
-      options.updateStrategy,
-      alertUpdate,
-      alertError,
-      throwErrorIfEnabled,
-    ],
+    [client, options, alertUpdate, alertError, throwErrorIfEnabled],
   );
 
   const downloadAndInstallApk = useCallback(
@@ -167,7 +171,7 @@ export const PushyProvider = ({
         return;
       }
       const rollout = info.config?.rollout?.[packageVersion];
-      if (rollout) {
+      if (info.update && rollout) {
         if (!isInRollout(rollout)) {
           log(`not in ${rollout}% rollout, ignored`);
           return;
@@ -178,15 +182,22 @@ export const PushyProvider = ({
       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) {
+        if (downloadUrl && sharedState.apkStatus === null) {
           if (options.updateStrategy === 'silentAndNow') {
             if (Platform.OS === 'android' && downloadUrl.endsWith('.apk')) {
               downloadAndInstallApk(downloadUrl);
             } else {
               Linking.openURL(downloadUrl);
             }
-            return;
+            return info;
           }
           alertUpdate('提示', '您的应用版本已更新，点击更新下载安装新版本', [
             {
@@ -207,7 +218,7 @@ export const PushyProvider = ({
           options.updateStrategy === 'silentAndLater'
         ) {
           downloadUpdate(info);
-          return;
+          return info;
         }
         alertUpdate(
           '提示',
@@ -224,12 +235,13 @@ export const PushyProvider = ({
           ],
         );
       }
+      return info;
     },
     [
       client,
       alertError,
       throwErrorIfEnabled,
-      options.updateStrategy,
+      options,
       alertUpdate,
       downloadAndInstallApk,
       downloadUpdate,
@@ -239,15 +251,14 @@ export const PushyProvider = ({
   const markSuccess = client.markSuccess;
 
   useEffect(() => {
-    if (__DEV__ && !options.debug) {
-      console.info(
-        '您当前处于开发环境且未启用debug，不会进行热更检查。如需在开发环境中调试热更，请在client中设置debug为true',
-      );
+    if (!client.assertDebug()) {
       return;
     }
     const { checkStrategy, dismissErrorAfter, autoMarkSuccess } = options;
     if (autoMarkSuccess) {
-      markSuccess();
+      setTimeout(() => {
+        markSuccess();
+      }, 1000);
     }
     if (checkStrategy === 'both' || checkStrategy === 'onAppResume') {
       stateListener.current = AppState.addEventListener(
@@ -272,10 +283,10 @@ export const PushyProvider = ({
       stateListener.current && stateListener.current.remove();
       clearTimeout(dismissErrorTimer);
     };
-  }, [checkUpdate, options, dismissError, markSuccess]);
+  }, [checkUpdate, options, dismissError, markSuccess, client]);
 
   const parseTestPayload = useCallback(
-    (payload: PushyTestPayload) => {
+    (payload: UpdateTestPayload) => {
       if (payload && payload.type && payload.type.startsWith('__rnPushy')) {
         const logger = options.logger || (() => {});
         options.logger = ({ type, data }) => {
@@ -286,8 +297,8 @@ export const PushyProvider = ({
           checkUpdate({ extra: { toHash: payload.data } }).then(() => {
             if (updateInfoRef.current && updateInfoRef.current.upToDate) {
               Alert.alert(
-                '提示',
-                '当前尚未检测到更新版本，如果是首次扫码，请等待服务器端生成补丁包后再试（约10秒）',
+                'Info',
+                'No update found, please wait 10s for the server to generate the patch package',
               );
             }
             options.logger = logger;
@@ -301,7 +312,7 @@ export const PushyProvider = ({
   );
 
   const parseTestQrCode = useCallback(
-    (code: string | PushyTestPayload) => {
+    (code: string | UpdateTestPayload) => {
       try {
         const payload = typeof code === 'string' ? JSON.parse(code) : code;
         return parseTestPayload(payload);
@@ -312,6 +323,10 @@ export const PushyProvider = ({
     [parseTestPayload],
   );
 
+  const restartApp = useCallback(async () => {
+    return client.restartApp();
+  }, [client]);
+
   useEffect(() => {
     const parseLinking = (url: string | null) => {
       if (!url) {
@@ -326,16 +341,21 @@ export const PushyProvider = ({
     };
 
     Linking.getInitialURL().then(parseLinking);
-    const linkingListener = Linking.addEventListener('url', ({ url }) =>
-      parseLinking(url),
-    );
+    const linkingHandler = ({ url }: { url: string }) => {
+      parseLinking(url);
+    };
+    const linkingListener = Linking.addEventListener('url', linkingHandler);
     return () => {
-      linkingListener.remove();
+      if ('removeEventListener' in Linking) {
+        (Linking as any).removeEventListener('url', linkingHandler);
+      } else {
+        linkingListener.remove();
+      }
     };
   }, [parseTestPayload]);
 
   return (
-    <PushyContext.Provider
+    <UpdateContext.Provider
       value={{
         checkUpdate,
         switchVersion,
@@ -352,8 +372,12 @@ export const PushyProvider = ({
         downloadAndInstallApk,
         getCurrentVersionInfo,
         parseTestQrCode,
+        restartApp,
       }}>
       {children}
-    </PushyContext.Provider>
+    </UpdateContext.Provider>
   );
 };
+
+/** @deprecated Please use `UpdateProvider` instead */
+export const PushyProvider = UpdateProvider;

src/type.ts

@@ -44,7 +44,7 @@ export type EventType =
 export interface EventData {
   currentVersion: string;
   cInfo: {
-    pushy: string;
+    rnu: string;
     rn: string;
     os: string;
     uuid: string;
@@ -54,6 +54,9 @@ export interface EventData {
   message?: string;
   rolledBackVersion?: string;
   newVersion?: string;
+  name?: string;
+  description?: string;
+  metaInfo?: string;
   [key: string]: any;
 }
 
@@ -65,15 +68,15 @@ export type UpdateEventsLogger = ({
   data: EventData;
 }) => void;
 
-export interface PushyServerConfig {
+export interface UpdateServerConfig {
   main: string;
   backups?: string[];
   queryUrls?: string[];
 }
 
-export interface PushyOptions {
+export interface ClientOptions {
   appKey: string;
-  server?: PushyServerConfig;
+  server?: UpdateServerConfig;
   logger?: UpdateEventsLogger;
   updateStrategy?:
     | 'alwaysAlert'
@@ -88,9 +91,11 @@ export interface PushyOptions {
   throwError?: boolean;
   beforeCheckUpdate?: () => Promise<boolean>;
   beforeDownloadUpdate?: (info: CheckResult) => Promise<boolean>;
+  afterDownloadUpdate?: (info: CheckResult) => Promise<boolean>;
+  onPackageExpired?: (info: CheckResult) => Promise<boolean>;
 }
 
-export interface PushyTestPayload {
+export interface UpdateTestPayload {
   type: '__rnPushyVersionHash' | string | null;
   data: any;
 }

src/utils.ts

@@ -1,7 +1,7 @@
 import { Platform } from 'react-native';
 
 export function log(...args: any[]) {
-  console.log('pushy: ', ...args);
+  console.log('react-native-update: ', ...args);
 }
 
 export function promiseAny<T>(promises: Promise<T>[]) {
@@ -49,20 +49,20 @@ const ping =
                 return url;
               }
               log('ping failed', url, status, statusText);
-              return null;
+              throw new Error('Ping failed');
             })
             .catch(e => {
               pingFinished = true;
               log('ping error', url, e);
-              return null;
+              throw e;
             }),
-          new Promise(r =>
+          new Promise((_, reject) =>
             setTimeout(() => {
-              r(null);
+              reject(new Error('Ping timeout'));
               if (!pingFinished) {
                 log('ping timeout', url);
               }
-            }, 2000),
+            }, 5000),
           ),
         ]);
       };
@@ -77,10 +77,34 @@ export const testUrls = async (urls?: string[]) => {
   if (!urls?.length) {
     return null;
   }
-  const ret = await promiseAny(urls.map(ping));
-  if (ret) {
-    return ret;
-  }
+
+  try {
+    const ret = await promiseAny(urls.map(ping));
+    if (ret) {
+      log('ping success, use url:', ret);
+      return ret;
+    }
+  } catch {}
   log('all ping failed, use first url:', urls[0]);
   return urls[0];
 };
+
+export const assertWeb = () => {
+  if (Platform.OS === 'web') {
+    console.warn(
+      'react-native-update does not support the Web platform and will not perform any operations',
+    );
+    return false;
+  }
+  return true;
+};
+
+export const assertDev = (matter: string) => {
+  if (__DEV__) {
+    console.warn(
+      `${matter} is not supported in development environment; no action taken.`,
+    );
+    return false;
+  }
+  return true;
+};