bump 10.31.0

* modify harmony download logic to async

* fix harmony image assets load fail issue

.gitignore

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

.npmignore

@@ -6,6 +6,7 @@
 Example
 android/build
 .vscode
+.github/
 
 # OSX
 #
@@ -45,8 +46,12 @@ node_modules/
 npm-debug.log
 Example
 yarn.lock
+bun.lock
 
 domains.json
 endpoints.json
+endpoints_cresc.json
 
 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,27 @@
+{
+  "name": "expousepushy",
+  "version": "1.0.0",
+  "main": "index.js",
+  "scripts": {
+    "start": "expo start",
+    "android": "expo run:android",
+    "ios": "expo run:ios",
+    "web": "expo start --web"
+  },
+  "dependencies": {
+    "@expo/metro-runtime": "~4.0.1",
+    "expo": "~52.0.46",
+    "expo-status-bar": "~2.0.1",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "react-native": "0.76.9",
+    "react-native-update": "^10.30.3",
+    "react-native-web": "~0.19.13"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.25.2",
+    "@types/react": "~18.3.12",
+    "typescript": "^5.3.3"
+  },
+  "private": true
+}

Example/expoUsePushy/tsconfig.json

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

Example/expoUsePushy/update.json

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

Example/harmony_use_pushy/README.md

@@ -1,34 +1,26 @@
 ## 运行harmony_use_pushy项目步骤
 
-### 1.将项目克隆到本地后在项目根目录创建libs文件夹。
+### 1. 在项目根目录执行下面命令安装第三方依赖。
-
-### 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++库进行初始化；
 ```
-git submodule update --init --recursive
+bun install
 ```
 
-### 4. 确保在react-native-update根目录已经执行过yarn submodule命令。
+### 2. 本地debug 模式
-说明：这个命令会在harmony/src/main/cpp目录生成HDiffPatch和lzma的C++模块依赖。
+```
+bun run start
+```
+![image](./debug.png)
 
-### 5. 在项目根目录执行下面命令安装第三方依赖。
+### 3. release 模式: 在项目根目录执行下面命令生成bundle包文件。
 ```
-yarn install
+bun run build
-```
-
-### 6. 在项目根目录执行下面命令生成bundle包文件。
-```
-yarn 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 运行效果图
+### 5 运行效果图
 ![image](./demo.png)

Example/harmony_use_pushy/harmony/build-profile.json5

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

Example/harmony_use_pushy/harmony/entry/hvigorfile.ts

@@ -1,6 +1,7 @@
 import { hapTasks } from '@ohos/hvigor-ohos-plugin';
 import fs from 'fs';
 import path from 'path';
+
 export function generatePushyBuildTime(str?: string) {
     return {
         pluginId: 'PushyBuildTimePlugin',
@@ -13,11 +14,22 @@ export function generatePushyBuildTime(str?: string) {
                     if (!fs.existsSync(dirPath)) {
                         fs.mkdirSync(dirPath, { recursive: true });
                     }
+                    const moduleJsonPath = path.resolve(__dirname, '../AppScope/app.json5');
+                    let versionName = '';
+                    if (fs.existsSync(moduleJsonPath)) {
+                        const moduleContent = fs.readFileSync(moduleJsonPath, 'utf-8');
+                        const versionMatch = moduleContent.match(/"versionName":\s*"([^"]+)"/);
+                        if (versionMatch && versionMatch[1]) {
+                            versionName = versionMatch[1];
+                        }
+                    }
                     const buildTime = new Date().toISOString();
-                    const metaContent = { pushy_build_time : buildTime };
+                    const metaContent = { 
+                        pushy_build_time: buildTime,
+                        versionName: versionName 
+                    };
                     fs.writeFileSync(metaFilePath, JSON.stringify(metaContent, null, 4));
                     console.log(`Build time written to ${metaFilePath}`);
-
                 },
                 dependencies: [],
                 postDependencies: ['default@BuildJS']

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/react-native-openharmony@0.72.38": "@rnoh/react-native-openharmony@0.72.38",
-    "rnoh@../../libs/rnoh": "rnoh@../../libs/rnoh"
+    "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,8 +6,8 @@
   "author": "",
   "license": "",
   "dependencies": {
-    "rnoh": "file:../../libs/rnoh",
+    "@rnoh/react-native-openharmony": "0.72.38",
-    "pushy": "file:../../node_modules/react-native-update/harmony"
+    "pushy": "file:../../node_modules/react-native-update/harmony/pushy.har",
   }
 }
 

Example/harmony_use_pushy/harmony/entry/src/main/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 { PushyFileJSBundleProvider  } from 'pushy/src/main/ets/PushyFileJSBundleProvider';
-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'),
+              // local debug mode
-              // new ResourceJSBundleProvider(this.rnAbility.context.resourceManager, 'hermes_bundle.hbc'),
+              new MetroJSBundleProvider(),
-              new FileJSBundleProvider(this.rnAbility.context),
+              // release mode
-              new ResourceJSBundleProvider(this.rnAbility.context.resourceManager, 'bundle.harmony.js')
+              new PushyFileJSBundleProvider(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-30T02:46:33.340Z",
+    "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.59",
     "react": "18.2.0",
     "react-native": "0.72.5",
-    "react-native-update": "file:../../",
+    "react-native-update": "latest"
-    "@react-native-oh/react-native-harmony": "^0.72.43"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

Example/harmony_use_pushy/update.json

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

Example/testHotUpdate/.gitignore

@@ -30,6 +30,7 @@ build/
 local.properties
 *.iml
 *.hprof
+.kotlin/
 
 # node.js
 #
@@ -61,3 +62,7 @@ buck-out/
 # Ruby / CocoaPods
 /ios/Pods/
 /vendor/bundle/
+
+# react-native-update
+.update
+.pushy

Example/testHotUpdate/.nvmrc

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

Example/testHotUpdate/.prettierrc.js

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

Example/testHotUpdate/android/app/build.gradle

@@ -68,12 +68,12 @@ 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
-
+    buildToolsVersion rootProject.ext.buildToolsVersion
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdk rootProject.ext.compileSdkVersion
 
     namespace "com.awesomeproject"
     defaultConfig {
@@ -81,7 +81,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "1.0"
+        versionName "1.81.4"
     }
     signingConfigs {
         debug {

Example/testHotUpdate/android/app/src/debug/AndroidManifest.xml

@@ -2,12 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-
     <application
         android:usesCleartextTraffic="true"
         tools:targetApi="28"
-        tools:ignore="GoogleAppIndexingWarning">
+        tools:ignore="GoogleAppIndexingWarning"/>
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
-    </application>
 </manifest>

Example/testHotUpdate/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-  package="com.awesomeproject">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />

Example/testHotUpdate/android/app/src/main/java/com/awesomeproject/MainActivity.java

@@ -1,32 +0,0 @@
-package com.awesomeproject;
-
-import com.facebook.react.ReactActivity;
-import com.facebook.react.ReactActivityDelegate;
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
-import com.facebook.react.defaults.DefaultReactActivityDelegate;
-
-public class MainActivity extends ReactActivity {
-
-  /**
-   * Returns the name of the main component registered from JavaScript. This is used to schedule
-   * rendering of the component.
-   */
-  @Override
-  protected String getMainComponentName() {
-    return "AwesomeProject";
-  }
-
-  /**
-   * Returns the instance of the {@link ReactActivityDelegate}. Here we use a util class {@link
-   * DefaultReactActivityDelegate} which allows you to easily enable Fabric and Concurrent React
-   * (aka React 18) with two boolean flags.
-   */
-  @Override
-  protected ReactActivityDelegate createReactActivityDelegate() {
-    return new DefaultReactActivityDelegate(
-        this,
-        getMainComponentName(),
-        // If you opted-in for the New Architecture, we enable the Fabric Renderer.
-        DefaultNewArchitectureEntryPoint.getFabricEnabled());
-  }
-}

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

@@ -0,0 +1,22 @@
+package com.awesomeproject
+
+import com.facebook.react.ReactActivity
+import com.facebook.react.ReactActivityDelegate
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
+import com.facebook.react.defaults.DefaultReactActivityDelegate
+
+class MainActivity : ReactActivity() {
+
+  /**
+   * Returns the name of the main component registered from JavaScript. This is used to schedule
+   * rendering of the component.
+   */
+  override fun getMainComponentName(): String = "AwesomeProject"
+
+  /**
+   * Returns the instance of the [ReactActivityDelegate]. We use [DefaultReactActivityDelegate]
+   * which allows you to enable New Architecture with a single boolean flags [fabricEnabled]
+   */
+  override fun createReactActivityDelegate(): ReactActivityDelegate =
+      DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)
+}

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

@@ -1,69 +0,0 @@
-package com.awesomeproject;
-
-import android.app.Application;
-import com.facebook.react.PackageList;
-import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactNativeHost;
-import com.facebook.react.ReactPackage;
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
-import com.facebook.react.defaults.DefaultReactNativeHost;
-import com.facebook.soloader.SoLoader;
-import java.util.List;
-import cn.reactnative.modules.update.UpdateContext;
-
-public class MainApplication extends Application implements ReactApplication {
-
-  private final ReactNativeHost mReactNativeHost =
-      new DefaultReactNativeHost(this) {
-          @Override
-          public boolean getUseDeveloperSupport() {
-              return BuildConfig.DEBUG;
-          }
-
-          @Override
-          protected String getJSBundleFile() {
-              return UpdateContext.getBundleUrl(MainApplication.this);
-          }
-
-          @Override
-          protected List<ReactPackage> getPackages() {
-              @SuppressWarnings("UnnecessaryLocalVariable")
-              List<ReactPackage> packages = new PackageList(this).getPackages();
-              // Packages that cannot be autolinked yet can be added manually here, for example:
-              // packages.add(new MyReactNativePackage());
-              return packages;
-          }
-
-          @Override
-          protected boolean isNewArchEnabled() {
-              return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
-          }
-
-          @Override
-          protected Boolean isHermesEnabled() {
-              return BuildConfig.IS_HERMES_ENABLED;
-          }
-
-
-          @Override
-          protected String getJSMainModuleName() {
-              return "index";
-          }
-      };
-
-
-  @Override
-  public ReactNativeHost getReactNativeHost() {
-    return mReactNativeHost;
-  }
-
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    SoLoader.init(this, /* native exopackage */ false);
-    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-      // If you opted-in for the New Architecture, we load the native entry point for this app.
-      DefaultNewArchitectureEntryPoint.load();
-    }
-  }
-}

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

@@ -0,0 +1,42 @@
+package com.awesomeproject
+
+import android.app.Application
+import cn.reactnative.modules.update.UpdateContext
+import com.facebook.react.PackageList
+import com.facebook.react.ReactApplication
+import com.facebook.react.ReactHost
+import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
+import com.facebook.react.ReactNativeHost
+import com.facebook.react.ReactPackage
+import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
+import com.facebook.react.defaults.DefaultReactNativeHost
+
+class MainApplication : Application(), ReactApplication {
+
+  override val reactNativeHost: ReactNativeHost =
+      object : DefaultReactNativeHost(this) {
+          
+        override fun getJSBundleFile(): String? = UpdateContext.getBundleUrl(this@MainApplication)
+
+        override fun getPackages(): List<ReactPackage> =
+            PackageList(this).packages.apply {
+              // Packages that cannot be autolinked yet can be added manually here, for example:
+              // add(MyReactNativePackage())
+            }
+
+        override fun getJSMainModuleName(): String = "index"
+
+        override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
+
+        override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+        override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
+      }
+
+  override val reactHost: ReactHost
+    get() = getDefaultReactHost(applicationContext, reactNativeHost)
+
+  override fun onCreate() {
+    super.onCreate()
+    loadReactNative(this)
+  }
+}

Example/testHotUpdate/android/build.gradle

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

Example/testHotUpdate/android/gradle.properties

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

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

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

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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
-' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

Example/testHotUpdate/android/gradlew.bat

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

Example/testHotUpdate/android/settings.gradle

@@ -2,6 +2,5 @@ pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
 plugins { id("com.facebook.react.settings") }
 extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
 rootProject.name = 'AwesomeProject'
-apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')

Example/testHotUpdate/ios/AwesomeProject/AppDelegate.mm

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

Example/testHotUpdate/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,41 +14,42 @@
     "dev:harmony": "react-native bundle-harmony --dev"
   },
   "dependencies": {
-    "form-data": "^4.0.1",
+    "form-data": "^4.0.4",
     "patch-package": "^8.0.0",
-    "postinstall-postinstall": "^2.1.0",
+    "react": "19.1.0",
-    "react": "18.3.1",
+    "react-native": "0.81.4",
-    "react-native": "0.76.3",
+    "react-native-camera-kit": "^16.1.2",
-    "react-native-camera-kit": "^14.1.0",
+    "react-native-paper": "^5.14.5",
-    "react-native-paper": "^5.12.5",
+    "react-native-safe-area-context": "^5.6.1",
-    "react-native-safe-area-context": "^4.14.0",
+    "react-native-svg": "^15.13.0",
-    "react-native-update": "^10.17.1",
+    "react-native-update": "^10.31.0-beta.4",
-    "react-native-vector-icons": "^10.2.0"
+    "react-native-vector-icons": "^10.3.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.26.0",
+    "@babel/core": "^7.27.3",
-    "@babel/preset-env": "^7.26.0",
+    "@babel/preset-env": "^7.27.2",
-    "@babel/runtime": "^7.26.0",
+    "@babel/runtime": "^7.27.3",
-    "@react-native-community/cli": "15.0.0-alpha.2",
+    "@react-native-community/cli": "20.0.0",
-    "@react-native-community/cli-platform-android": "15.0.0-alpha.2",
+    "@react-native-community/cli-platform-android": "20.0.0",
-    "@react-native-community/cli-platform-ios": "15.0.0-alpha.2",
+    "@react-native-community/cli-platform-ios": "20.0.0",
-    "@react-native/babel-preset": "0.76.3",
+    "@react-native/babel-preset": "0.81.4",
-    "@react-native/eslint-config": "0.76.3",
+    "@react-native/eslint-config": "0.81.4",
-    "@react-native/metro-config": "0.76.3",
+    "@react-native/metro-config": "0.81.4",
-    "@react-native/typescript-config": "0.76.3",
+    "@react-native/typescript-config": "0.81.4",
-    "@types/react": "^18.2.6",
+    "@types/react": "^19.1.13",
-    "@types/react-test-renderer": "^18.0.0",
+    "@types/react-test-renderer": "^19.1.0",
-    "babel-jest": "^29.6.3",
+    "detox": "^20.41.2",
-    "eslint": "^8.19.0",
+    "eslint": "^9.35.0",
     "jest": "^29.6.3",
     "prettier": "2.8.8",
-    "react-test-renderer": "18.3.1",
+    "react-test-renderer": "19.1.1",
-    "typescript": "5.7.2"
+    "typescript": "5.8.3"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=20"
   },
   "trustedDependencies": [
-    "postinstall-postinstall"
+    "detox",
+    "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,13 @@ 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 +41,8 @@ function App() {
     currentHash,
     parseTestQrCode,
     progress: { received, total } = {},
-  } = usePushy();
+    currentVersionInfo,
+  } = useUpdate();
   const [useDefaultAlert, setUseDefaultAlert] = useState(true);
   const [showTestConsole, setShowTestConsole] = useState(false);
   const [showUpdateBanner, setShowUpdateBanner] = useState(false);
@@ -91,17 +94,28 @@ function App() {
           />
         </Modal>
       </Portal>
+      <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}
         {'\n'}
         当前热更新版本Hash: {currentHash || '(空)'}
         {'\n'}
+        当前热更新版本信息: {JSON.stringify(currentVersionInfo) || '(空)'}
       </Text>
       <Text>
         下载进度：{received} / {total}
@@ -192,17 +206,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/tsconfig.json

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

Example/testHotUpdate/update.json

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

README.md

@@ -2,6 +2,8 @@
 
 本组件是面向 React Native 提供热更新功能的组件，详情请访问我们的官方网站 <https://pushy.reactnative.cn>。
 
+**现已支持鸿蒙以及新架构**
+
 ### 快速开始
 
 请查看[文档](https://pushy.reactnative.cn/docs/getting-started.html)
@@ -20,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
@@ -32,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,15 +97,15 @@ android {
     }
     compileSdkVersion safeExtGet('compileSdkVersion', 28)
     buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
-
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 16)
         targetSdkVersion safeExtGet('targetSdkVersion', 27)
         versionCode 1
-        versionName "1.0"
+        versionName "1.81.4"
         consumerProguardFiles "proguard.pro"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
     }
+    
     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 {
@@ -82,7 +148,6 @@ repositories {
 dependencies {
     implementation 'com.facebook.react:react-native:+'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
-    implementation 'com.jakewharton:process-phoenix:3.0.0'
 }
 if (isNewArchitectureEnabled()) {
     react {

android/proguard.pro

@@ -1,3 +1,37 @@
+# Keep our update module classes
 -keepnames class cn.reactnative.modules.update.DownloadTask { *; }
 -keepnames class cn.reactnative.modules.update.UpdateModuleImpl { *; }
+-keepnames class cn.reactnative.modules.update.** { *; }
+
+# Keep React Native classes
 -keepnames class com.facebook.react.ReactInstanceManager { *; }
+-keepnames class com.facebook.react.** { *; }
+-keepnames class com.facebook.react.bridge.** { *; }
+-keepnames class com.facebook.react.devsupport.** { *; }
+
+# Keep fields used in reflection
+-keepclassmembers class com.facebook.react.ReactInstanceManager {
+    private JSBundleLoader mBundleLoader;
+    private String mJSBundleFile;
+}
+
+-keepclassmembers class com.facebook.react.ReactDelegate {
+    private ReactHost mReactHost;
+}
+
+-keepclassmembers class com.facebook.react.ReactHost {
+    private boolean mUseDevSupport;
+    private ReactHostDelegate mReactHostDelegate;
+}
+
+# Keep Expo related classes
+-keepnames class expo.modules.ExpoReactHostFactory$ExpoReactHostDelegate { *; }
+
+# Keep methods used in reflection
+-keepclassmembers class com.facebook.react.ReactActivity {
+    public ReactDelegate getReactDelegate();
+}
+
+-keepclassmembers class com.facebook.react.ReactHost {
+    public void reload(java.lang.String);
+}

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 {
@@ -39,10 +36,28 @@ public class UpdateContext {
         this.sp = context.getSharedPreferences("update", Context.MODE_PRIVATE);
 
         String packageVersion = getPackageVersion();
-        if (!packageVersion.equals(this.sp.getString("packageVersion", null))) {
+        String buildTime = getBuildTime();
+        String storedPackageVersion = this.sp.getString("packageVersion", null);
+        String storedBuildTime = this.sp.getString("buildTime", null);
+        
+        // If stored versions don't exist, write current versions first
+        if (storedPackageVersion == null || storedBuildTime == null) {
+            SharedPreferences.Editor editor = sp.edit();
+            editor.putString("packageVersion", packageVersion);
+            editor.putString("buildTime", buildTime);
+            editor.apply();
+            storedPackageVersion = packageVersion;
+            storedBuildTime = buildTime;
+        }
+        
+        boolean packageVersionChanged = !packageVersion.equals(storedPackageVersion);
+        boolean buildTimeChanged = !buildTime.equals(storedBuildTime);
+        
+        if (packageVersionChanged || buildTimeChanged) {
             SharedPreferences.Editor editor = sp.edit();
             editor.clear();
             editor.putString("packageVersion", packageVersion);
+            editor.putString("buildTime", buildTime);
             editor.apply();
 
             this.cleanUp();
@@ -172,6 +187,7 @@ public class UpdateContext {
     }
 
     public void markSuccess() {
+        if (!BuildConfig.DEBUG) {
             SharedPreferences.Editor editor = sp.edit();
             editor.putBoolean("firstTimeOk", true);
             String lastVersion = sp.getString("lastVersion", null);
@@ -184,6 +200,7 @@ public class UpdateContext {
 
             this.cleanUp();
         }
+    }
 
     public void clearFirstTime() {
         SharedPreferences.Editor editor = sp.edit();

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

@@ -3,7 +3,10 @@ package cn.reactnative.modules.update;
 import android.app.Activity;
 import android.content.Context;
 import android.util.Log;
+
+import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactDelegate;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.JSBundleLoader;
 import com.facebook.react.bridge.Promise;
@@ -12,22 +15,48 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import org.json.JSONObject;
-
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Field;
-import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public class UpdateModuleImpl {
 
     public static final String NAME = "Pushy";
     
-    public static void downloadFullUpdate(UpdateContext updateContext, ReadableMap options, Promise promise) {
+    /**
+     * 获取字段的兼容性方法，尝试带m前缀和不带m前缀的字段名
+     * @param clazz 目标类
+     * @param fieldName 基础字段名（不带m前缀）
+     * @return 找到的字段对象
+     * @throws NoSuchFieldException 如果两种命名都找不到字段
+     */
+    private static Field getCompatibleField(Class<?> clazz, String fieldName) throws NoSuchFieldException {
+        // 首先尝试带m前缀的字段名
+        try {
+            return clazz.getDeclaredField("m" + capitalize(fieldName));
+        } catch (NoSuchFieldException e) {
+            // 如果找不到带m前缀的，尝试不带m前缀的
+            try {
+                return clazz.getDeclaredField(fieldName);
+            } catch (NoSuchFieldException e2) {
+                // 如果都找不到，抛出异常并包含两种尝试的信息
+                throw new NoSuchFieldException("Field not found with either name: m" + capitalize(fieldName) + " or " + fieldName);
+            }
+        }
+    }
+    
+    /**
+     * 首字母大写的辅助方法
+     */
+    private static String capitalize(String str) {
+        if (str == null || str.length() == 0) {
+            return str;
+        }
+        return str.substring(0, 1).toUpperCase() + str.substring(1);
+    }
+
+    public static void downloadFullUpdate(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
         String url = options.getString("updateUrl");
         String hash = options.getString("hash");
         updateContext.downloadFullUpdate(url, hash, new UpdateContext.DownloadFileListener() {
@@ -43,7 +72,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");
@@ -66,7 +95,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() {
@@ -82,7 +111,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");
@@ -101,37 +130,20 @@ public class UpdateModuleImpl {
                 }
             });
         }catch (Exception e){
-            promise.reject("执行报错:"+e.getMessage());
+            promise.reject("downloadPatchFromPpk failed: "+e.getMessage());
         }
     }
 
-    private void loadBundleLegacy(ReactApplicationContext mContext) {
+    public static void reloadUpdate(final UpdateContext updateContext,final ReactApplicationContext mContext, final ReadableMap options, final Promise promise) {
-        final Activity currentActivity = mContext.getCurrentActivity();
-        if (currentActivity == null) {
-            return;
-        }
-
-        currentActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                currentActivity.recreate();
-            }
-        });
-    }
-
-    public static void reloadUpdate(UpdateContext updateContext, ReactApplicationContext mContext, ReadableMap options,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() {
-                try {
+
                 updateContext.switchVersion(hash);
                 final Context application = mContext.getApplicationContext();
+                JSBundleLoader loader = JSBundleLoader.createFileLoader(UpdateContext.getBundleUrl(application));
+                try {
                     ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager();
 
                     if (instanceManager == null) {
@@ -139,12 +151,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));
@@ -154,22 +164,91 @@ public class UpdateModuleImpl {
                     promise.resolve(true);
 
                 } catch (Throwable err) {
-                    promise.reject(err);
+                    final Activity currentActivity = mContext.getCurrentActivity();
-                    Log.e("pushy", "switchVersion failed ", err);
+                    if (currentActivity == null) {
-                    loadBundleLegacy(mContext);
+                        return;
+                    }
+                    try {
+                        java.lang.reflect.Method getReactDelegateMethod = 
+                            ReactActivity.class.getMethod("getReactDelegate");
+
+                        ReactDelegate reactDelegate = (ReactDelegate) 
+                            getReactDelegateMethod.invoke(currentActivity);
+
+                        Field reactHostField = getCompatibleField(ReactDelegate.class, "reactHost");
+                        reactHostField.setAccessible(true);
+                        Object reactHost = reactHostField.get(reactDelegate);
+
+                        Field devSupport = getCompatibleField(reactHost.getClass(), "useDevSupport");
+                        devSupport.setAccessible(true);
+                        devSupport.set(reactHost, false);
+
+                        // Access the ReactHostDelegate field (compatible with mReactHostDelegate/reactHostDelegate)
+                        Field reactHostDelegateField = getCompatibleField(reactHost.getClass(), "reactHostDelegate");
+                        reactHostDelegateField.setAccessible(true);
+                        Object reactHostDelegate = reactHostDelegateField.get(reactHost);
+
+                        String bundleFieldName = "jsBundleLoader";
+                        if (reactHostDelegate.getClass().getCanonicalName().equals("expo.modules.ExpoReactHostFactory.ExpoReactHostDelegate")) {
+                            bundleFieldName = "_jsBundleLoader";
+                        }
+
+                        // Modify the jsBundleLoader field
+                        Field jsBundleLoaderField = reactHostDelegate.getClass().getDeclaredField(bundleFieldName);
+                        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
+                            public void run() {
+                                currentActivity.recreate();
+                            }
+                        });
+                    }
+                }
+                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();
+
+                      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) {
-    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;
-            }
         UiThreadUtil.runOnUiThread(new Runnable() {
             @Override
             public void run() {
@@ -182,13 +261,9 @@ public class UpdateModuleImpl {
                 }
             }
         });
-        } catch (Exception e){
-            promise.reject("执行报错:"+e.getMessage());
-        }
     }
 
-    public static void markSuccess(UpdateContext updateContext,Promise promise) {
+    public static void markSuccess(final UpdateContext updateContext, final Promise promise) {
-        try {
         UiThreadUtil.runOnUiThread(new Runnable() {
             @Override
             public void run() {
@@ -196,13 +271,9 @@ public class UpdateModuleImpl {
                 promise.resolve(true);
             }
         });
-        } catch (Exception e){
-            promise.reject("执行报错:"+e.getMessage());
-        }
     }
 
-    public static void setUuid(UpdateContext updateContext, String uuid, Promise promise) {
+    public static void setUuid(final UpdateContext updateContext, final String uuid, final Promise promise) {
-        try {
         UiThreadUtil.runOnUiThread(new Runnable() {
             @Override
             public void run() {
@@ -210,46 +281,40 @@ public class UpdateModuleImpl {
                 promise.resolve(true);
             }
         });
-        } catch (Exception e){
-            promise.reject("执行报错:"+e.getMessage());
-        }
-
     }
 
     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)){
+                if (check(info)) {
-                    updateContext.setKv("hash_" + hash, info);
-                    promise.reject("校验报错:json字符串格式错误");
-                }else {
                     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/cn/reactnative/modules/update/UpdatePackage.java

@@ -9,9 +9,6 @@ import com.facebook.react.module.model.ReactModuleInfoProvider;
 import java.util.HashMap;
 import java.util.Map;
 
-/**
- * Created by tdzl2003 on 3/31/16.
- */
 public class UpdatePackage extends TurboReactPackage {
     @Nullable
     @Override
@@ -25,7 +22,9 @@ public class UpdatePackage extends TurboReactPackage {
 
     @Override
     public ReactModuleInfoProvider getReactModuleInfoProvider() {
-        return () -> {
+        return new ReactModuleInfoProvider() {
+            @Override
+            public Map<String, ReactModuleInfo> getReactModuleInfos() {
                 final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
                 boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
                 moduleInfos.put(
@@ -40,6 +39,7 @@ public class UpdatePackage extends TurboReactPackage {
                                 isTurboModule // isTurboModule
                         ));
                 return moduleInfos;
+            }
         };
     }
 }

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

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

@@ -20,7 +20,6 @@ import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.JSBundleLoader;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.jakewharton.processphoenix.ProcessPhoenix;
 
 import java.io.File;
 import java.lang.reflect.Field;
@@ -49,7 +48,9 @@ public class UpdateModule extends ReactContextBaseJavaModule {
         final Map<String, Object> constants = new HashMap<>();
         constants.put("downloadRootDir", updateContext.getRootDir());
         constants.put("packageVersion", updateContext.getPackageVersion());
-        constants.put("currentVersion", updateContext.getCurrentVersion());
+        String currentVersion = updateContext.getCurrentVersion();
+        constants.put("currentVersion", currentVersion);
+        constants.put("currentVersionInfo", updateContext.getKv("hash_" + currentVersion));
         constants.put("buildTime", updateContext.getBuildTime());
         constants.put("isUsingBundleUrl", updateContext.getIsUsingBundleUrl());
         boolean isFirstTime = updateContext.isFirstTime();
@@ -224,6 +225,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.json

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

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/README.OpenSource

@@ -1,11 +0,0 @@
-[
-    {
-        "Name": "react-native-netinfo",
-        "License": "MIT License",
-        "License File": "https://github.com/react-native-netinfo/react-native-netinfo/blob/master/LICENSE",
-        "Version Number": "11.1.0",
-        "Owner" : "Matt Oakes <hello@mattoakes.net>"
-        "Upstream URL": "https://github.com/react-native-netinfo/react-native-netinfo",
-        "Description": "React Native Network Info API for Android, iOS, macOS, Windows & Web. It allows you to get information on:Connection type，Connection quality"
-    }
-]

harmony/oh-package-lock.json5

@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "stableOrder": true
-  },
-  "lockfileVersion": 3,
-  "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
-  "specifiers": {
-    "rnoh@../../../libs/rnoh": "rnoh@../../../libs/rnoh"
-  },
-  "packages": {
-    "rnoh@../../../libs/rnoh": {
-      "name": "rnoh",
-      "version": "0.72.12",
-      "resolved": "../../../libs/rnoh",
-      "registryType": "local"
-    }
-  }
-}

harmony/pushy/oh-package-lock.json5

@@ -0,0 +1,19 @@
+{
+  "meta": {
+    "stableOrder": true
+  },
+  "lockfileVersion": 3,
+  "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
+  "specifiers": {
+    "@rnoh/react-native-openharmony@0.72.38": "@rnoh/react-native-openharmony@0.72.38"
+  },
+  "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"
+    }
+  }
+}

harmony/pushy/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"
   }
 }