fix 0.77+ bridgeless detection

.gitignore

@@ -51,12 +51,3 @@ android/bin
 Example/testHotUpdate/harmony
 Example/testHotUpdate/android/app/.cxx
 Example/harmony_use_pushy/libs
-**/mcp.json
-
-
-harmony/package
-**/oh_modules
-harmony/pushy/.preview
-Example/harmony_use_pushy/harmony/entry/src/main/resources/rawfile/meta.json
-**/.hvigor
-Example/harmony_use_pushy/harmony/entry/src/main/cpp/generated

.gitmodules

@@ -4,3 +4,9 @@
 [submodule "android/jni/HDiffPatch"]
 	path = android/jni/HDiffPatch
 	url = https://github.com/sisong/HDiffPatch.git
+[submodule "harmony/src/main/cpp/HDiffPatch"]
+	path = harmony/src/main/cpp/HDiffPatch
+	url = https://github.com/sisong/HDiffPatch.git
+[submodule "harmony/src/main/cpp/lzma"]
+	path = harmony/src/main/cpp/lzma
+	url = https://github.com/sisong/lzma.git

.npmignore

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

.nvmrc

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

.yarnrc.yml

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

Example/expoUsePushy/.gitignore

@@ -1,36 +0,0 @@
-# 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

@@ -1,221 +0,0 @@
-/* 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

@@ -1,274 +0,0 @@
-/* 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

@@ -1,30 +0,0 @@
-{
-  "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"
-      },
-      "package": "com.anonymous.expoUsePushy"
-    },
-    "web": {
-      "favicon": "./assets/favicon.png"
-    }
-  }
-}

Example/expoUsePushy/index.js

@@ -1 +0,0 @@
-import 'expo-router/entry';

Example/expoUsePushy/package.json

@@ -1,50 +0,0 @@
-{
-  "name": "expousepushy",
-  "main": "index.js",
-  "version": "1.0.0",
-  "scripts": {
-    "start": "expo start",
-    "reset-project": "node ./scripts/reset-project.js",
-    "android": "expo run:android",
-    "ios": "expo run:ios",
-    "web": "expo start --web",
-    "lint": "expo lint"
-  },
-  "dependencies": {
-    "@expo/vector-icons": "^14.1.0",
-    "@react-navigation/bottom-tabs": "^7.3.10",
-    "@react-navigation/elements": "^2.3.8",
-    "@react-navigation/native": "^7.1.6",
-    "expo": "~53.0.22",
-    "expo-blur": "~14.1.5",
-    "expo-constants": "~17.1.7",
-    "expo-font": "~13.3.2",
-    "expo-haptics": "~14.1.4",
-    "expo-image": "~2.4.0",
-    "expo-linking": "~7.1.7",
-    "expo-router": "~5.1.5",
-    "expo-splash-screen": "~0.30.10",
-    "expo-status-bar": "~2.2.3",
-    "expo-symbols": "~0.4.5",
-    "expo-system-ui": "~5.0.11",
-    "expo-web-browser": "~14.2.0",
-    "react": "19.0.0",
-    "react-dom": "19.0.0",
-    "react-native": "0.79.6",
-    "react-native-gesture-handler": "~2.24.0",
-    "react-native-reanimated": "~3.17.4",
-    "react-native-safe-area-context": "5.4.0",
-    "react-native-screens": "~4.11.1",
-    "react-native-update": "^10.34.4",
-    "react-native-web": "~0.20.0",
-    "react-native-webview": "13.13.5"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.25.2",
-    "@types/react": "~19.0.10",
-    "typescript": "~5.8.3",
-    "eslint": "^9.25.0",
-    "eslint-config-expo": "~9.2.0"
-  },
-  "private": true
-}

Example/expoUsePushy/tsconfig.json

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

Example/expoUsePushy/update.json

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

Example/harmony_use_pushy/App.tsx

@@ -1,3 +1,4 @@
+/* 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';
@@ -5,7 +6,7 @@ import {StyleSheet, Text, View, TouchableOpacity, Image} from 'react-native';
 import TestConsole from './TestConsole';
 
 import _updateConfig from './update.json';
-import {UpdateProvider, Pushy, useUpdate} from 'react-native-update';
+import {PushyProvider, Pushy, usePushy} from 'react-native-update';
 const {appKey} = _updateConfig.harmony;
 
 function App() {
@@ -19,7 +20,7 @@ function App() {
     packageVersion,
     currentHash,
     progress: {received, total} = {},
-  } = useUpdate();
+  } = usePushy();
   const [useDefaultAlert, setUseDefaultAlert] = useState(false);
   const [showTestConsole, setShowTestConsole] = useState(false);
   const [showUpdateBanner, setShowUpdateBanner] = useState(false);
@@ -40,7 +41,6 @@ function App() {
   return (
     <View style={styles.container}>
       <Text style={styles.welcome}>欢迎使用Pushy热更新服务</Text>
-      {/* <Image source={require('./gmail.png')} style={styles.image} /> */}
       {/* <Text style={styles.welcome}>😁hdiffFromAPP更新成功！！！</Text> */}
       {/* <Text style={styles.welcome}>😁hdiffFromPPk更新成功！！！</Text> */}
       <View style={{flexDirection: 'row'}}>
@@ -166,7 +166,7 @@ function App() {
                 style={{marginRight: 20}}>
                 <Text style={{color: '#2196F3'}}>下次再说</Text>
               </TouchableOpacity>
-              <TouchableOpacity onPress={() => switchVersion()}>
+              <TouchableOpacity onPress={switchVersion}>
                 <Text style={{color: '#2196F3'}}>立即重启</Text>
               </TouchableOpacity>
             </View>
@@ -204,22 +204,18 @@ const styles = StyleSheet.create({
     color: '#333333',
     marginBottom: 5,
   },
-  image: {
-    width: 109,
-    height: 40,
-  },
+  image: {},
 });
 
 const pushyClient = new Pushy({
   appKey,
   debug: true,
-  updateStrategy: null,
 });
 
 export default function Root() {
   return (
-    <UpdateProvider client={pushyClient}>
+    <PushyProvider client={pushyClient}>
       <App />
-    </UpdateProvider>
+    </PushyProvider>
   );
 }

Example/harmony_use_pushy/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
+ruby ">= 2.6.10"
+
+gem 'cocoapods', '~> 1.12'

Example/harmony_use_pushy/README.md

@@ -1,19 +1,18 @@
 ## 运行harmony_use_pushy项目步骤
 
-### 1. 在项目根目录执行下面命令安装第三方依赖。
+### 1. 先在react-native-update根目录执行下面命令同步C++模块。
 ```
-bun install
+yarn submodule
 ```
 
-### 2. 本地debug 模式
+### 2. 在项目根目录执行下面命令安装第三方依赖。
 ```
-bun run start
+yarn install
 ```
-![image](./debug.png)
 
-### 3. release 模式: 在项目根目录执行下面命令生成bundle包文件。
+### 3. 在项目根目录执行下面命令生成bundle包文件。
 ```
-bun run build
+yarn build
 ```
 说明：这个命令会在harmony/entry/src/main/resources/rawfile目录生成Hbundle.harmony.js和assets文件，同时会基于该内容在.pushy/output目录生成ppk包。
 

Example/harmony_use_pushy/harmony/build-profile.json5

@@ -1,43 +1,45 @@
 {
-  app: {
-    signingConfigs: [],
-    products: [
+  "app": {
+    "signingConfigs": [],
+    "products": [
       {
-        name: 'default',
-        signingConfig: 'default',
-        compatibleSdkVersion: '5.0.0(12)',
-        runtimeOS: 'HarmonyOS',
-        buildOption: {
-          strictMode: {
-            caseSensitiveCheck: true,
-            useNormalizedOHMUrl: true,
-          },
-        },
-      },
+        "name": "default",
+        "signingConfig": "default",
+        "compatibleSdkVersion": "5.0.0(12)",
+        "runtimeOS": "HarmonyOS",
+        "buildOption": {
+          "strictMode": {
+            "caseSensitiveCheck": true,
+            "useNormalizedOHMUrl": true
+          }
+        }
+      }
     ],
-    buildModeSet: [
+    "buildModeSet": [
       {
-        name: 'debug',
+        "name": "debug",
       },
       {
-        name: 'release',
-      },
-    ],
+        "name": "release"
+      }
+    ]
   },
-  modules: [
+  "modules": [
     {
-      name: 'entry',
-      srcPath: './entry',
-      targets: [
+      "name": "entry",
+      "srcPath": "./entry",
+      "targets": [
         {
-          name: 'default',
-          applyToProducts: ['default'],
-        },
-      ],
+          "name": "default",
+          "applyToProducts": [
+            "default"
+          ]
+        }
+      ]
     },
     {
       name: 'pushy',
-      srcPath: '../node_modules/react-native-update/harmony/pushy',
-    },
-  ],
-}
+      srcPath: '../node_modules/react-native-update/harmony',
+    }
+  ]
+}

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

@@ -1,26 +1,25 @@
 {
   "meta": {
-    "stableOrder": true,
-    "enableUnifiedLockfile": false
+    "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",
-    "pushy@../../node_modules/react-native-update/harmony/pushy": "pushy@../../node_modules/react-native-update/harmony/pushy"
+    "pushy@../../node_modules/react-native-update/harmony": "pushy@../../node_modules/react-native-update/harmony"
   },
   "packages": {
     "@rnoh/react-native-openharmony@0.72.38": {
-      "name": "",
+      "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/pushy": {
+    "pushy@../../node_modules/react-native-update/harmony": {
       "name": "pushy",
       "version": "3.1.0-0.0.7",
-      "resolved": "",
+      "resolved": "../../node_modules/react-native-update/harmony",
       "registryType": "local",
       "dependencies": {
         "@rnoh/react-native-openharmony": "^0.72.38"

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

@@ -1,12 +1,13 @@
 {
-  name: 'entry',
-  version: '1.0.0',
-  description: 'Please describe the basic information.',
-  main: '',
-  author: '',
-  license: '',
-  dependencies: {
-    '@rnoh/react-native-openharmony': '0.72.38',
-    pushy: 'file:../../node_modules/react-native-update/harmony/pushy',
-  },
+  "name": "entry",
+  "version": "1.0.0",
+  "description": "Please describe the basic information.",
+  "main": "",
+  "author": "",
+  "license": "",
+  "dependencies": {
+    "@rnoh/react-native-openharmony": "0.72.38",
+    "pushy": "file:../../node_modules/react-native-update/harmony"
+  }
 }
+

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

@@ -1,6 +1,5 @@
-import { PushyFileJSBundleProvider  } from 'pushy/src/main/ets/PushyFileJSBundleProvider';
-import { ComponentBuilderContext, RNOHCoreContext,RNAbility,
-  MetroJSBundleProvider } from '@rnoh/react-native-openharmony';
+import { FileJSBundleProvider } from 'pushy/src/main/ets/FileJSBundleProvider';
+import { ComponentBuilderContext, RNOHCoreContext,RNAbility } from '@rnoh/react-native-openharmony';
 import {
   RNApp,
   AnyJSBundleProvider,
@@ -62,10 +61,9 @@ struct Index {
           },
           jsBundleProvider: new TraceJSBundleProviderDecorator(
             new AnyJSBundleProvider([
-              // local debug mode
-              new MetroJSBundleProvider(),
-              // release mode
-              new PushyFileJSBundleProvider(this.rnohCoreContext.uiAbilityContext),
+              // MetroJSBundleProvider.fromServerIp('127.0.0.1'),
+              // new ResourceJSBundleProvider(rnohCoreContext.uiAbilityContext.resourceManager, 'hermes_bundle.hbc'),
+              new FileJSBundleProvider(this.rnohCoreContext.uiAbilityContext),
               new ResourceJSBundleProvider(this.rnohCoreContext.uiAbilityContext.resourceManager, 'bundle.harmony.js')
             ]),
             this.rnohCoreContext.logger),

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

@@ -0,0 +1,4 @@
+{
+    "pushy_build_time": "2025-02-14T09:43:25.648Z",
+    "versionName": "1.0.0"
+}

Example/harmony_use_pushy/harmony/hvigorfile.ts

@@ -1,6 +1,6 @@
-import {appTasks} from '@ohos/hvigor-ohos-plugin';
+import { appTasks } from '@ohos/hvigor-ohos-plugin';
 
 export default {
-  system: appTasks /* Built-in plugin of Hvigor. It cannot be modified. */,
-  plugins: [] /* Custom plugin to extend the functionality of Hvigor. */,
-};
+    system: appTasks,  /* Built-in plugin of Hvigor. It cannot be modified. */
+    plugins:[]         /* Custom plugin to extend the functionality of Hvigor. */
+}

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

@@ -1,16 +1,23 @@
 {
   "meta": {
-    "stableOrder": true,
-    "enableUnifiedLockfile": false
+    "stableOrder": true
   },
   "lockfileVersion": 3,
   "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
   "specifiers": {
+    "@ohos/hamock@1.0.0": "@ohos/hamock@1.0.0",
     "@ohos/hypium@1.0.19": "@ohos/hypium@1.0.19"
   },
   "packages": {
+    "@ohos/hamock@1.0.0": {
+      "name": "@ohos/hamock",
+      "version": "1.0.0",
+      "integrity": "sha512-K6lDPYc6VkKe6ZBNQa9aoG+ZZMiwqfcR/7yAVFSUGIuOAhPvCJAo9+t1fZnpe0dBRBPxj2bxPPbKh69VuyAtDg==",
+      "resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hamock/-/hamock-1.0.0.har",
+      "registryType": "ohpm"
+    },
     "@ohos/hypium@1.0.19": {
-      "name": "",
+      "name": "@ohos/hypium",
       "version": "1.0.19",
       "integrity": "sha512-cEjDgLFCm3cWZDeRXk7agBUkPqjWxUo6AQeiu0gEkb3J8ESqlduQLSIXeo3cCsm8U/asL7iKjF85ZyOuufAGSQ==",
       "resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hypium/-/hypium-1.0.19.har",

Example/harmony_use_pushy/harmony/oh-package.json5

@@ -1,18 +1,20 @@
 {
-  modelVersion: '5.0.0',
-  description: 'Please describe the basic information.',
-  dependencies: {},
-  devDependencies: {
-    '@ohos/hypium': '1.0.19'
+  "modelVersion": "5.0.0",
+  "description": "Please describe the basic information.",
+  "dependencies": {
   },
-  arkTs: {
-    compilerOptions: {
-      noImplicitAny: false,
-      suppressImplicitAnyIndexErrors: true,
-      strict: false,
-    },
+  "devDependencies": {
+    "@ohos/hypium": "1.0.19",
+    "@ohos/hamock": "1.0.0"
   },
-  overrides: {
-    '@rnoh/react-native-openharmony': '0.72.38',
+  "arkTs": {
+    "compilerOptions": {
+      "noImplicitAny": false,
+      "suppressImplicitAnyIndexErrors": true,
+      "strict": false
+    }
   },
+  "overrides": {
+    "@rnoh/react-native-openharmony": "0.72.38"
+  }
 }

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

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

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

@@ -1,8 +0,0 @@
-/**
- * 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

@@ -1,9 +0,0 @@
-/**
- * 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

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

Example/harmony_use_pushy/package.json

@@ -6,8 +6,7 @@
     "android": "react-native run-android",
     "ios": "react-native run-ios",
     "lint": "eslint .",
-    "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",
+    "start": "react-native start",
     "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",
@@ -15,10 +14,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": "^10.34.9"
+    "react-native-update": "file:../../",
+    "@react-native-oh/react-native-harmony": "^0.72.43"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

Example/testHotUpdate/.gitignore

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

Example/testHotUpdate/.nvmrc

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

Example/testHotUpdate/.prettierrc.js

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

Example/testHotUpdate/android/app/build.gradle

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

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

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

Example/testHotUpdate/android/build.gradle

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

Example/testHotUpdate/android/gradle.properties

@@ -25,8 +25,7 @@ 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=arm64-v8a
+reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 
 # Use this property to enable support to the new architecture.
 # This will allow you to use TurboModules and the Fabric render in

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

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

Example/testHotUpdate/android/gradlew

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

Example/testHotUpdate/android/gradlew.bat

@@ -1,8 +1,3 @@
-@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
@@ -75,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%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" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
@@ -96,4 +91,4 @@ exit /b %EXIT_CODE%
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
+:omega

Example/testHotUpdate/ios/AwesomeProject.xcodeproj/project.pbxproj

@@ -403,8 +403,6 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
-					"-DFOLLY_CFG_NO_COROUTINES=1",
-					"-DFOLLY_HAVE_CLOCK_GETTIME=1",
 				);
 				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
@@ -477,8 +475,6 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
-					"-DFOLLY_CFG_NO_COROUTINES=1",
-					"-DFOLLY_HAVE_CLOCK_GETTIME=1",
 				);
 				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";

Example/testHotUpdate/ios/AwesomeProject/AppDelegate.mm

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

Example/testHotUpdate/ios/AwesomeProject/Info.plist

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

Example/testHotUpdate/package.json

@@ -10,42 +10,43 @@
     "test:e2e": "detox test --configuration android.emu.debug",
     "lint": "eslint .",
     "postinstall": "patch-package",
-    "apk": "cd android && ./gradlew assembleRelease"
+    "apk": "cd android && ./gradlew assembleRelease",
+    "dev:harmony": "react-native bundle-harmony --dev"
   },
   "dependencies": {
-    "form-data": "^4.0.4",
+    "form-data": "^4.0.2",
     "patch-package": "^8.0.0",
-    "react": "19.1.0",
-    "react-native": "0.81.4",
-    "react-native-camera-kit": "^16.1.2",
-    "react-native-paper": "^5.14.5",
-    "react-native-safe-area-context": "^5.6.1",
-    "react-native-svg": "^15.13.0",
-    "react-native-update": "^10.34.4",
-    "react-native-vector-icons": "^10.3.0"
+    "react": "19.0.0",
+    "react-native": "0.78.0",
+    "react-native-camera-kit": "^14.2.0",
+    "react-native-paper": "^5.13.1",
+    "react-native-safe-area-context": "^5.3.0",
+    "react-native-svg": "^15.11.2",
+    "react-native-update": "^10.26.0",
+    "react-native-vector-icons": "^10.2.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.27.3",
-    "@babel/preset-env": "^7.27.2",
-    "@babel/runtime": "^7.27.3",
-    "@react-native-community/cli": "20.0.0",
-    "@react-native-community/cli-platform-android": "20.0.0",
-    "@react-native-community/cli-platform-ios": "20.0.0",
-    "@react-native/babel-preset": "0.81.4",
-    "@react-native/eslint-config": "0.81.4",
-    "@react-native/metro-config": "0.81.4",
-    "@react-native/typescript-config": "0.81.4",
-    "@types/react": "^19.1.13",
-    "@types/react-test-renderer": "^19.1.0",
-    "detox": "^20.41.2",
-    "eslint": "^9.35.0",
+    "@babel/core": "^7.26.0",
+    "@babel/preset-env": "^7.26.0",
+    "@babel/runtime": "^7.26.0",
+    "@react-native-community/cli": "15.0.1",
+    "@react-native-community/cli-platform-android": "15.0.1",
+    "@react-native-community/cli-platform-ios": "15.0.1",
+    "@react-native/babel-preset": "0.78.0",
+    "@react-native/eslint-config": "0.78.0",
+    "@react-native/metro-config": "0.78.0",
+    "@react-native/typescript-config": "0.78.0",
+    "@types/react": "^19.0.0",
+    "@types/react-test-renderer": "^19.0.0",
+    "detox": "^20.32.0",
+    "eslint": "^8.19.0",
     "jest": "^29.6.3",
     "prettier": "2.8.8",
-    "react-test-renderer": "19.1.1",
-    "typescript": "5.8.3"
+    "react-test-renderer": "19.0.0",
+    "typescript": "5.8.2"
   },
   "engines": {
-    "node": ">=20"
+    "node": ">=18"
   },
   "trustedDependencies": [
     "detox",

Example/testHotUpdate/src/index.tsx

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

Example/testHotUpdate/tsconfig.json

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

Example/testHotUpdate/update.json

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

android/build.gradle

@@ -22,70 +22,14 @@ 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"
 
@@ -97,15 +41,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.81.4"
+        versionName "1.0"
         consumerProguardFiles "proguard.pro"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
     }
-    
     sourceSets {
         main {
             // let gradle pack the shared library into apk
@@ -115,12 +59,6 @@ android {
             } else {
                 java.srcDirs += ['src/oldarch']
             }
-            
-            if (expoProject) {
-                java.srcDirs += ['java/expo/modules/pushy']
-            } else {
-                java.exclude 'expo/modules/pushy/**'
-            }
         }
     }
 
@@ -132,10 +70,6 @@ android {
             resValue("string", "pushy_build_time", "0")
         }
     }
-    
-    lintOptions {
-        abortOnError false
-    }
 }
 
 repositories {
@@ -148,6 +82,7 @@ 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,18 +1,3 @@
-# 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.ReactActivity { *; }
--keepclassmembers class com.facebook.react.ReactInstanceManager { *; }
--keepclassmembers class com.facebook.react.ReactDelegate { *; }
--keepclassmembers class com.facebook.react.ReactHost { *; }
-
--keepnames class expo.modules.ExpoReactHostFactory$ExpoReactHostDelegate { *; }
+-keepnames class com.facebook.react.ReactInstanceManager { *; }

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

@@ -25,7 +25,6 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.zip.ZipEntry;
-import java.util.zip.CRC32;
 import java.util.HashMap;
 
 import okio.BufferedSink;
@@ -101,7 +100,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
             if (UpdateContext.DEBUG) {
                 Log.d("react-native-update", "Progress " + received + "/" + contentLength);
             }
-
+            
             int percentage = (int)(received * 100.0 / contentLength + 0.5);
             if (percentage > currentPercentage) {
                 currentPercentage = percentage;
@@ -121,13 +120,14 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
     }
 
     @Override
-    protected void onProgressUpdate(final long[]... values) {
+    protected void onProgressUpdate(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];
@@ -199,10 +199,6 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
         return fout.toByteArray();
     }
 
-    private String getCRC32AsDecimal(long crc32Value) {
-        return String.valueOf(crc32Value & 0xFFFFFFFFL);
-    }
-
     private void copyFilesWithBlacklist(String current, File from, File to, JSONObject blackList) throws IOException {
         File[] files = from.listFiles();
         for (File file : files) {
@@ -278,41 +274,12 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
         zipFile.close();
     }
 
-    private void copyFromResourceV2(HashMap<String, ArrayList<File>> resToCopy2) throws IOException {
-        SafeZipFile zipFile = new SafeZipFile(new File(context.getPackageResourcePath()));
-        Enumeration<? extends ZipEntry> entries = zipFile.entries();
-        while (entries.hasMoreElements()) {
-            ZipEntry ze = entries.nextElement();
-            String fn = ze.getName();
-            long zipCrc32 = ze.getCrc();
-            String crc32Decimal = getCRC32AsDecimal(zipCrc32);
-            ArrayList<File> targets = resToCopy2.get(crc32Decimal);
-            if (targets != null) {
-                File lastTarget = null;
-                for (File target: targets) {
-                    if (UpdateContext.DEBUG) {
-                        Log.d("react-native-update", "Copying from resource " + fn + " to " + target);
-                    }
-                    if (lastTarget != null) {
-                        copyFile(lastTarget, target);
-                    } else {
-                        zipFile.unzipToFile(ze, target);
-                        lastTarget = target;
-                    }
-                }
-            }
-        }
-        zipFile.close();
-    }
-
     private void doPatchFromApk(DownloadTaskParams param) throws IOException, JSONException {
         downloadFile(param);
 
         removeDirectory(param.unzipDirectory);
         param.unzipDirectory.mkdirs();
         HashMap<String, ArrayList<File>> copyList = new HashMap<String, ArrayList<File>>();
-        HashMap<String, ArrayList<File>> copiesv2List = new HashMap<String, ArrayList<File>>();
-        Boolean isV2 = false;
 
         boolean foundDiff = false;
         boolean foundBundlePatch = false;
@@ -331,58 +298,29 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
                 JSONObject obj = (JSONObject)new JSONTokener(json).nextValue();
 
                 JSONObject copies = obj.getJSONObject("copies");
-                JSONObject copiesv2 = obj.getJSONObject("copiesv2");
                 Iterator<?> keys = copies.keys();
-                Iterator<?> keysV2 = copiesv2.keys();
-                if(keysV2.hasNext()){
-                    isV2 = true;
-                    while( keysV2.hasNext() ) {
-                        String from = (String)keysV2.next();
-                        String to = copiesv2.getString(from);
-                        if (from.isEmpty()) {
-                            from = to;
-                        }
-                        ArrayList<File> target = null;
-                        if (!copiesv2List.containsKey(from)) {
-                            target = new ArrayList<File>();
-                            copiesv2List.put(from, target);
-                        } else {
-                            target = copiesv2List.get((from));
-                        }
-                        File toFile = new File(param.unzipDirectory, to);
-
-                        // Fixing a Zip Path Traversal Vulnerability
-                        // https://support.google.com/faqs/answer/9294009
-                        String canonicalPath = toFile.getCanonicalPath();
-                        if (!canonicalPath.startsWith(param.unzipDirectory.getCanonicalPath() + File.separator)) {
-                            throw new SecurityException("Illegal name: " + to);
-                        }
-                        target.add(toFile);
+                while( keys.hasNext() ) {
+                    String to = (String)keys.next();
+                    String from = copies.getString(to);
+                    if (from.isEmpty()) {
+                        from = to;
                     }
-                }else{
-                    while( keys.hasNext() ) {
-                        String to = (String)keys.next();
-                        String from = copies.getString(to);
-                        if (from.isEmpty()) {
-                            from = to;
-                        }
-                        ArrayList<File> target = null;
-                        if (!copyList.containsKey(from)) {
-                            target = new ArrayList<File>();
-                            copyList.put(from, target);
-                        } else {
-                            target = copyList.get((from));
-                        }
-                        File toFile = new File(param.unzipDirectory, to);
-
-                        // Fixing a Zip Path Traversal Vulnerability
-                        // https://support.google.com/faqs/answer/9294009
-                        String canonicalPath = toFile.getCanonicalPath();
-                        if (!canonicalPath.startsWith(param.unzipDirectory.getCanonicalPath() + File.separator)) {
-                            throw new SecurityException("Illegal name: " + to);
-                        }
-                        target.add(toFile);
+                    ArrayList<File> target = null;
+                    if (!copyList.containsKey(from)) {
+                        target = new ArrayList<File>();
+                        copyList.put(from, target);
+                    } else {
+                        target = copyList.get((from));
                     }
+                    File toFile = new File(param.unzipDirectory, to);
+
+                    // Fixing a Zip Path Traversal Vulnerability
+                    // https://support.google.com/faqs/answer/9294009
+                    String canonicalPath = toFile.getCanonicalPath();
+                    if (!canonicalPath.startsWith(param.unzipDirectory.getCanonicalPath() + File.separator)) {
+                        throw new SecurityException("Illegal name: " + to);
+                    }
+                    target.add(toFile);
                 }
                 continue;
             }
@@ -411,11 +349,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
             throw new Error("bundle patch not found");
         }
 
-        if(isV2){
-            copyFromResourceV2(copiesv2List);
-        }else{
-            copyFromResource(copyList);
-        }
+        copyFromResource(copyList);
 
         if (UpdateContext.DEBUG) {
             Log.d("react-native-update", "Unzip finished");
@@ -518,7 +452,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
     }
 
     @Override
-    protected Void doInBackground(final DownloadTaskParams... params) {
+    protected Void doInBackground(DownloadTaskParams... params) {
         int taskType = params[0].type;
         try {
             switch (taskType) {

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

@@ -1,13 +0,0 @@
-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,11 +7,14 @@ 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 {
@@ -36,28 +39,10 @@ public class UpdateContext {
         this.sp = context.getSharedPreferences("update", Context.MODE_PRIVATE);
 
         String packageVersion = getPackageVersion();
-        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) {
+        if (!packageVersion.equals(this.sp.getString("packageVersion", null))) {
             SharedPreferences.Editor editor = sp.edit();
             editor.clear();
             editor.putString("packageVersion", packageVersion);
-            editor.putString("buildTime", buildTime);
             editor.apply();
 
             this.cleanUp();
@@ -187,19 +172,17 @@ public class UpdateContext {
     }
 
     public void markSuccess() {
-        if (!BuildConfig.DEBUG) {
-            SharedPreferences.Editor editor = sp.edit();
-            editor.putBoolean("firstTimeOk", true);
-            String lastVersion = sp.getString("lastVersion", null);
-            String curVersion = sp.getString("currentVersion", null);
-            if (lastVersion != null && !lastVersion.equals(curVersion)) {
-                editor.remove("lastVersion");
-                editor.remove("hash_" + lastVersion);
-            }
-            editor.apply();
-
-            this.cleanUp();
+        SharedPreferences.Editor editor = sp.edit();
+        editor.putBoolean("firstTimeOk", true);
+        String lastVersion = sp.getString("lastVersion", null);
+        String curVersion = sp.getString("currentVersion", null);
+        if (lastVersion != null && !lastVersion.equals(curVersion)) {
+            editor.remove("lastVersion");
+            editor.remove("hash_" + lastVersion);
         }
+        editor.apply();
+
+        this.cleanUp();
     }
 
     public void clearFirstTime() {

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

@@ -23,40 +23,8 @@ import java.util.Map;
 public class UpdateModuleImpl {
 
     public static final String NAME = "Pushy";
-    
-    /**
-     * 获取字段的兼容性方法，尝试带m前缀和不带m前缀的字段名
-     * @param clazz 目标类
-     * @param fieldName 基础字段名（不带m前缀）
-     * @return 找到的字段对象
-     * @throws NoSuchFieldException 如果两种命名都找不到字段
-     */
-    private static Field getCompatibleField(Class<?> clazz, String fieldName) throws NoSuchFieldException {
-        // 首先尝试带m前缀的字段名
-        try {
-            return clazz.getDeclaredField("m" + capitalize(fieldName));
-        } catch (NoSuchFieldException e) {
-            // 如果找不到带m前缀的，尝试不带m前缀的
-            try {
-                return clazz.getDeclaredField(fieldName);
-            } catch (NoSuchFieldException e2) {
-                // 如果都找不到，抛出异常并包含两种尝试的信息
-                throw new NoSuchFieldException("Field not found with either name: m" + capitalize(fieldName) + " or " + fieldName);
-            }
-        }
-    }
-    
-    /**
-     * 首字母大写的辅助方法
-     */
-    private static String capitalize(String str) {
-        if (str == null || str.length() == 0) {
-            return str;
-        }
-        return str.substring(0, 1).toUpperCase() + str.substring(1);
-    }
 
-    public static void downloadFullUpdate(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
+    public static void downloadFullUpdate(UpdateContext updateContext, ReadableMap options, Promise promise) {
         String url = options.getString("updateUrl");
         String hash = options.getString("hash");
         updateContext.downloadFullUpdate(url, hash, new UpdateContext.DownloadFileListener() {
@@ -72,7 +40,7 @@ public class UpdateModuleImpl {
         });
     }
 
-    public static void downloadAndInstallApk(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
+    public static void downloadAndInstallApk(UpdateContext updateContext, ReadableMap options, Promise promise) {
         String url = options.getString("url");
         String hash = options.getString("hash");
         String target = options.getString("target");
@@ -95,7 +63,7 @@ public class UpdateModuleImpl {
         UpdateModule.installApk(toInstall);
     }
 
-    public static void downloadPatchFromPackage(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
+    public static void downloadPatchFromPackage(UpdateContext updateContext, ReadableMap options, Promise promise) {
         String url = options.getString("updateUrl");
         String hash = options.getString("hash");
         updateContext.downloadPatchFromApk(url, hash, new UpdateContext.DownloadFileListener() {
@@ -111,7 +79,7 @@ public class UpdateModuleImpl {
         });
     }
 
-    public static void downloadPatchFromPpk(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
+    public static void downloadPatchFromPpk(UpdateContext updateContext, ReadableMap options, Promise promise) {
         try {
             String url = options.getString("updateUrl");
             String hash = options.getString("hash");
@@ -134,7 +102,7 @@ public class UpdateModuleImpl {
         }
     }
 
-    public static void reloadUpdate(final UpdateContext updateContext,final ReactApplicationContext mContext, final ReadableMap options, final Promise promise) {
+    public static void reloadUpdate(UpdateContext updateContext, ReactApplicationContext mContext, ReadableMap options, Promise promise) {
         final String hash = options.getString("hash");
         UiThreadUtil.runOnUiThread(new Runnable() {
             @Override
@@ -175,26 +143,17 @@ public class UpdateModuleImpl {
                         ReactDelegate reactDelegate = (ReactDelegate) 
                             getReactDelegateMethod.invoke(currentActivity);
 
-                        Field reactHostField = getCompatibleField(ReactDelegate.class, "reactHost");
+                        Field reactHostField = ReactDelegate.class.getDeclaredField("mReactHost");
                         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");
+                        // Access the mReactHostDelegate field
+                        Field reactHostDelegateField = reactHost.getClass().getDeclaredField("mReactHostDelegate");
                         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);
+                        Field jsBundleLoaderField = reactHostDelegate.getClass().getDeclaredField("jsBundleLoader");
                         jsBundleLoaderField.setAccessible(true);
                         jsBundleLoaderField.set(reactHostDelegate, loader);
                         
@@ -217,37 +176,8 @@ public class UpdateModuleImpl {
         });
     }
 
-    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) {
         final String hash = options.getString("hash");
         UiThreadUtil.runOnUiThread(new Runnable() {
             @Override
@@ -263,7 +193,7 @@ public class UpdateModuleImpl {
         });
     }
 
-    public static void markSuccess(final UpdateContext updateContext, final Promise promise) {
+    public static void markSuccess(UpdateContext updateContext, Promise promise) {
         UiThreadUtil.runOnUiThread(new Runnable() {
             @Override
             public void run() {
@@ -273,7 +203,7 @@ public class UpdateModuleImpl {
         });
     }
 
-    public static void setUuid(final UpdateContext updateContext, final String uuid, final Promise promise) {
+    public static void setUuid(UpdateContext updateContext, String uuid, Promise promise) {
         UiThreadUtil.runOnUiThread(new Runnable() {
             @Override
             public void run() {
@@ -294,7 +224,7 @@ public class UpdateModuleImpl {
     }
 
 
-    public static void setLocalHashInfo(final UpdateContext updateContext, final String hash, final String info, final Promise promise) {
+    public static void setLocalHashInfo(UpdateContext updateContext, final String hash, final String info, Promise promise) {
         UiThreadUtil.runOnUiThread(new Runnable() {
             @Override
             public void run() {
@@ -309,7 +239,7 @@ public class UpdateModuleImpl {
         });
     }
 
-    public static void getLocalHashInfo(UpdateContext updateContext, final String hash, final Promise promise) {
+    public static void getLocalHashInfo(UpdateContext updateContext, final String hash, Promise promise) {
         String value = updateContext.getKv("hash_" + hash);
         if (check(value)) {
             promise.resolve(value);

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

@@ -1,10 +0,0 @@
-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

@@ -1,27 +0,0 @@
-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,8 +4,6 @@ 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;
@@ -19,7 +17,6 @@ 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;
@@ -35,30 +32,18 @@ public class UpdateModule extends NativePushySpec {
         final Map<String, Object> constants = new HashMap<>();
         constants.put("downloadRootDir", updateContext.getRootDir());
         constants.put("packageVersion", updateContext.getPackageVersion());
-        String currentVersion = updateContext.getCurrentVersion();
-        constants.put("currentVersion", currentVersion);
-        constants.put("currentVersionInfo", updateContext.getKv("hash_" + currentVersion));
+        constants.put("currentVersion", updateContext.getCurrentVersion());
         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);
+            updateContext.clearFirstTime();
         }
         String rolledBackVersion = updateContext.rolledBackVersion();
         constants.put("rolledBackVersion", rolledBackVersion);
         if (rolledBackVersion != null) {
-            handler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    updateContext.clearRollbackMark();
-                }
-            }, 2000);
+            updateContext.clearRollbackMark();
         }
         constants.put("uuid", updateContext.getKv("uuid"));
         return constants;
@@ -112,11 +97,6 @@ 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,6 +20,7 @@ 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;
@@ -48,9 +49,7 @@ public class UpdateModule extends ReactContextBaseJavaModule {
         final Map<String, Object> constants = new HashMap<>();
         constants.put("downloadRootDir", updateContext.getRootDir());
         constants.put("packageVersion", updateContext.getPackageVersion());
-        String currentVersion = updateContext.getCurrentVersion();
-        constants.put("currentVersion", currentVersion);
-        constants.put("currentVersionInfo", updateContext.getKv("hash_" + currentVersion));
+        constants.put("currentVersion", updateContext.getCurrentVersion());
         constants.put("buildTime", updateContext.getBuildTime());
         constants.put("isUsingBundleUrl", updateContext.getIsUsingBundleUrl());
         boolean isFirstTime = updateContext.isFirstTime();
@@ -225,29 +224,6 @@ 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://p.reactnative.cn/api"]
+["https://pushy-koa-qgbgqmcpis.cn-beijing.fcapp.run", "https://p.reactnative.cn/api"]

expo-module.config.json

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

harmony/oh-package-lock.json5

@@ -1,7 +1,6 @@
 {
   "meta": {
-    "stableOrder": true,
-    "enableUnifiedLockfile": false
+    "stableOrder": true
   },
   "lockfileVersion": 3,
   "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
@@ -10,7 +9,7 @@
   },
   "packages": {
     "@rnoh/react-native-openharmony@0.72.38": {
-      "name": "",
+      "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",

harmony/oh-package.json5

@@ -1,5 +1,5 @@
 {
-  "license": "MIT",
+  "license": "ISC",
   "types": "",
   "devDependencies": {},
   "name": "pushy",
@@ -8,6 +8,5 @@
   "version": "3.1.0-0.0.7",
   "dependencies": {
     "@rnoh/react-native-openharmony":"^0.72.38"
-  },
-  "modelVersion": "5.0.0"
+  }
 }

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

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

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

@@ -1,46 +0,0 @@
-import {
-  FileJSBundle,
-  HotReloadConfig,
-  JSBundleProvider,
-  JSBundleProviderError
-} from '@rnoh/react-native-openharmony';
-import common from '@ohos.app.ability.common';
-import fs from '@ohos.file.fs';
-import { UpdateContext } from './UpdateContext';
-
-export class PushyFileJSBundleProvider extends JSBundleProvider {
-  private updateContext: UpdateContext;
-  private path: string = ''
-
-  constructor(context: common.UIAbilityContext) {
-    super();
-    this.updateContext = new UpdateContext(context);
-    this.path = this.updateContext.getBundleUrl();
-  }
-
-  getURL(): string {
-    return this.path;
-  }
-
-  async getBundle(): Promise<FileJSBundle> {
-    try {
-      const status = await fs.access(this.path, fs.OpenMode.READ_ONLY);
-      if (status) {
-        return {
-          filePath: this.path
-        }
-      }
-      throw new Error('Update bundle not found');
-    } catch (error) {
-      throw new JSBundleProviderError({
-        whatHappened: `Couldn't load JSBundle from ${this.path}`,
-        extraData: error,
-        howCanItBeFixed: [`Check if a bundle exists at "${this.path}" on your device.`]
-      })
-    }
-  }
-
-  getAppKeys(): string[] {
-    return [];
-  }
-}

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

@@ -1,150 +0,0 @@
-import {
-  TurboModule,
-  TurboModuleContext,
-} from '@rnoh/react-native-openharmony/ts';
-import common from '@ohos.app.ability.common';
-import dataPreferences from '@ohos.data.preferences';
-import { bundleManager } from '@kit.AbilityKit';
-import logger from './Logger';
-import { UpdateModuleImpl } from './UpdateModuleImpl';
-import { UpdateContext } from './UpdateContext';
-import { EventHub } from './EventHub';
-
-const TAG = 'PushyTurboModule';
-
-export class PushyTurboModule extends TurboModule {
-  mUiCtx: common.UIAbilityContext;
-  context: UpdateContext;
-
-  constructor(protected ctx: TurboModuleContext) {
-    super(ctx);
-    logger.debug(TAG, ',PushyTurboModule constructor');
-    this.mUiCtx = ctx.uiAbilityContext;
-    this.context = new UpdateContext(this.mUiCtx);
-    EventHub.getInstance().setRNInstance(ctx.rnInstance);
-  }
-
-  getConstants(): Object {
-    logger.debug(TAG, ',call getConstants');
-    const context = this.mUiCtx;
-    const preferencesManager = dataPreferences.getPreferencesSync(context, {
-      name: 'update',
-    });
-    const isFirstTime = preferencesManager.getSync(
-      'isFirstTime',
-      false,
-    ) as boolean;
-    const rolledBackVersion = preferencesManager.getSync(
-      'rolledBackVersion',
-      '',
-    ) as string;
-    const uuid = preferencesManager.getSync('uuid', '') as string;
-    const currentVersion = preferencesManager.getSync(
-      'currentVersion',
-      '',
-    ) as string;
-    const currentVersionInfo = this.context.getKv(`hash_${currentVersion}`);
-    const buildTime = preferencesManager.getSync('buildTime', '') as string;
-    const isUsingBundleUrl = this.context.getIsUsingBundleUrl();
-    let bundleFlags =
-      bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_REQUESTED_PERMISSION;
-    let packageVersion = '';
-    try {
-      const bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleFlags);
-      packageVersion = bundleInfo?.versionName || 'Unknown';
-    } catch (error) {
-      console.error('Failed to get bundle info:', error);
-    }
-
-    if (isFirstTime) {
-      preferencesManager.deleteSync('isFirstTime');
-    }
-
-    if (rolledBackVersion) {
-      preferencesManager.deleteSync('rolledBackVersion');
-    }
-
-    return {
-      downloadRootDir: `${context.filesDir}/_update`,
-      currentVersionInfo,
-      packageVersion,
-      currentVersion,
-      buildTime,
-      isUsingBundleUrl,
-      isFirstTime,
-      rolledBackVersion,
-      uuid,
-    };
-  }
-
-  setLocalHashInfo(hash: string, info: string): boolean {
-    logger.debug(TAG, ',call setLocalHashInfo');
-    return UpdateModuleImpl.setLocalHashInfo(this.context, hash, info);
-  }
-
-  getLocalHashInfo(hash: string): string {
-    return UpdateModuleImpl.getLocalHashInfo(this.context, hash);
-  }
-
-  async setUuid(uuid: string): Promise<boolean> {
-    logger.debug(TAG, ',call setUuid');
-    return UpdateModuleImpl.setUuid(this.context, uuid);
-  }
-
-  async reloadUpdate(options: { hash: string }): Promise<void> {
-    logger.debug(TAG, ',call reloadUpdate');
-    return UpdateModuleImpl.reloadUpdate(this.context, this.mUiCtx, options);
-  }
-
-  async setNeedUpdate(options: { hash: string }): Promise<boolean> {
-    logger.debug(TAG, ',call setNeedUpdate');
-    return UpdateModuleImpl.setNeedUpdate(this.context, options);
-  }
-
-  async markSuccess(): Promise<boolean> {
-    logger.debug(TAG, ',call markSuccess');
-    return UpdateModuleImpl.markSuccess(this.context);
-  }
-
-  async downloadPatchFromPpk(options: {
-    updateUrl: string;
-    hash: string;
-    originHash: string;
-  }): Promise<void> {
-    logger.debug(TAG, ',call downloadPatchFromPpk');
-    return UpdateModuleImpl.downloadPatchFromPpk(this.context, options);
-  }
-
-  async downloadPatchFromPackage(options: {
-    updateUrl: string;
-    hash: string;
-  }): Promise<void> {
-    logger.debug(TAG, ',call downloadPatchFromPackage');
-    return UpdateModuleImpl.downloadPatchFromPackage(this.context, options);
-  }
-
-  async downloadFullUpdate(options: {
-    updateUrl: string;
-    hash: string;
-  }): Promise<void> {
-    logger.debug(TAG, ',call downloadFullUpdate');
-    return UpdateModuleImpl.downloadFullUpdate(this.context, options);
-  }
-
-  async downloadAndInstallApk(options: {
-    url: string;
-    target: string;
-    hash: string;
-  }): Promise<void> {
-    logger.debug(TAG, ',call downloadAndInstallApk');
-    return UpdateModuleImpl.downloadAndInstallApk(this.mUiCtx, options);
-  }
-
-  addListener(_eventName: string): void {
-    logger.debug(TAG, ',call addListener');
-  }
-
-  removeListeners(_count: number): void {
-    logger.debug(TAG, ',call removeListeners');
-  }
-}

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

@@ -1,282 +0,0 @@
-import preferences from '@ohos.data.preferences';
-import bundleManager from '@ohos.bundle.bundleManager';
-import fileIo from '@ohos.file.fs';
-import { DownloadTask } from './DownloadTask';
-import common from '@ohos.app.ability.common';
-import { DownloadTaskParams } from './DownloadTaskParams';
-
-export class UpdateContext {
-  private context: common.UIAbilityContext;
-  private rootDir: string;
-  private preferences: preferences.Preferences;
-  private static DEBUG: boolean = false;
-  private static isUsingBundleUrl: boolean = false;
-
-  constructor(context: common.UIAbilityContext) {
-    this.context = context;
-    this.rootDir = context.filesDir + '/_update';
-
-    try {
-      if (!fileIo.accessSync(this.rootDir)) {
-        fileIo.mkdirSync(this.rootDir);
-      }
-    } catch (e) {
-      console.error('Failed to create root directory:', e);
-    }
-    this.initPreferences();
-  }
-
-  private initPreferences() {
-    try {
-      this.preferences = preferences.getPreferencesSync(this.context, {
-        name: 'update',
-      });
-      const packageVersion = this.getPackageVersion();
-      const storedVersion = this.preferences.getSync('packageVersion', '');
-      if (!storedVersion) {
-        this.preferences.putSync('packageVersion', packageVersion);
-        this.preferences.flush();
-      } else if (storedVersion && packageVersion !== storedVersion) {
-        this.preferences.clear();
-        this.preferences.putSync('packageVersion', packageVersion);
-        this.preferences.flush();
-        this.cleanUp();
-      }
-    } catch (e) {
-      console.error('Failed to init preferences:', e);
-    }
-  }
-
-  public setKv(key: string, value: string): void {
-    this.preferences.putSync(key, value);
-    this.preferences.flush();
-  }
-
-  public getKv(key: string): string {
-    return this.preferences.getSync(key, '') as string;
-  }
-
-  public isFirstTime(): boolean {
-    return this.preferences.getSync('firstTime', false) as boolean;
-  }
-
-  public rolledBackVersion(): string {
-    return this.preferences.getSync('rolledBackVersion', '') as string;
-  }
-
-  public markSuccess(): void {
-    this.preferences.putSync('firstTimeOk', true);
-    const lastVersion = this.preferences.getSync('lastVersion', '') as string;
-    const curVersion = this.preferences.getSync('currentVersion', '') as string;
-
-    if (lastVersion && lastVersion !== curVersion) {
-      this.preferences.deleteSync('lastVersion');
-      this.preferences.deleteSync(`hash_${lastVersion}`);
-    }
-    this.preferences.flush();
-    this.cleanUp();
-  }
-
-  public clearFirstTime(): void {
-    this.preferences.putSync('firstTime', false);
-    this.preferences.flush();
-    this.cleanUp();
-  }
-
-  public clearRollbackMark(): void {
-    this.preferences.putSync('rolledBackVersion', null);
-    this.preferences.flush();
-    this.cleanUp();
-  }
-
-  public async downloadFullUpdate(
-    url: string,
-    hash: string,
-    listener: DownloadFileListener,
-  ): Promise<void> {
-    try {
-      const params = new DownloadTaskParams();
-      params.type = DownloadTaskParams.TASK_TYPE_PATCH_FULL;
-      params.url = url;
-      params.hash = hash;
-      params.listener = listener;
-      params.targetFile = `${this.rootDir}/${hash}.ppk`;
-      params.unzipDirectory = `${this.rootDir}/${hash}`;
-      const downloadTask = new DownloadTask(this.context);
-      await downloadTask.execute(params);
-    } catch (e) {
-      console.error('Failed to download full update:', e);
-    }
-  }
-
-  public async downloadFile(
-    url: string,
-    hash: string,
-    fileName: string,
-    listener: DownloadFileListener,
-  ): Promise<void> {
-    const params = new DownloadTaskParams();
-    params.type = DownloadTaskParams.TASK_TYPE_PLAIN_DOWNLOAD;
-    params.url = url;
-    params.hash = hash;
-    params.listener = listener;
-    params.targetFile = this.rootDir + '/' + fileName;
-
-    const downloadTask = new DownloadTask(this.context);
-    await downloadTask.execute(params);
-  }
-
-  public async downloadPatchFromPpk(
-    url: string,
-    hash: string,
-    originHash: string,
-    listener: DownloadFileListener,
-  ): Promise<void> {
-    const params = new DownloadTaskParams();
-    params.type = DownloadTaskParams.TASK_TYPE_PATCH_FROM_PPK;
-    params.url = url;
-    params.hash = hash;
-    params.originHash = originHash;
-    params.listener = listener;
-    params.targetFile = `${this.rootDir}/${originHash}_${hash}.ppk.patch`;
-    params.unzipDirectory = `${this.rootDir}/${hash}`;
-    params.originDirectory = `${this.rootDir}/${params.originHash}`;
-
-    const downloadTask = new DownloadTask(this.context);
-    await downloadTask.execute(params);
-  }
-
-  public async downloadPatchFromPackage(
-    url: string,
-    hash: string,
-    listener: DownloadFileListener,
-  ): Promise<void> {
-    try {
-      const params = new DownloadTaskParams();
-      params.type = DownloadTaskParams.TASK_TYPE_PATCH_FROM_APP;
-      params.url = url;
-      params.hash = hash;
-      params.listener = listener;
-      params.targetFile = `${this.rootDir}/${hash}.app.patch`;
-      params.unzipDirectory = `${this.rootDir}/${hash}`;
-
-      const downloadTask = new DownloadTask(this.context);
-      return await downloadTask.execute(params);
-    } catch (e) {
-      console.error('Failed to download APK patch:', e);
-      throw e;
-    }
-  }
-
-  public switchVersion(hash: string): void {
-    try {
-      const bundlePath = `${this.rootDir}/${hash}/bundle.harmony.js`;
-      if (!fileIo.accessSync(bundlePath)) {
-        throw Error(`Bundle version ${hash} not found.`);
-      }
-
-      const lastVersion = this.getKv('currentVersion');
-      this.setKv('currentVersion', hash);
-      if (lastVersion && lastVersion !== hash) {
-        this.setKv('lastVersion', lastVersion);
-      }
-
-      this.setKv('firstTime', 'true');
-      this.setKv('firstTimeOk', 'false');
-      this.setKv('rolledBackVersion', '');
-    } catch (e) {
-      console.error('Failed to switch version:', e);
-    }
-  }
-
-  public static getBundleUrl(
-    context: common.UIAbilityContext,
-    defaultAssetsUrl?: string,
-  ) {
-    return new UpdateContext(context).getBundleUrl(defaultAssetsUrl);
-  }
-
-  public getBundleUrl(defaultAssetsUrl?: string) {
-    UpdateContext.isUsingBundleUrl = true;
-    const currentVersion = this.getCurrentVersion();
-    if (!currentVersion) {
-      return defaultAssetsUrl;
-    }
-    if (!this.isFirstTime()) {
-      if (!this.preferences.getSync('firstTimeOk', true)) {
-        return this.rollBack();
-      }
-    }
-    let version = currentVersion;
-    while (version) {
-      const bundleFile = `${this.rootDir}/${version}/bundle.harmony.js`;
-      try {
-        if (!fileIo.accessSync(bundleFile)) {
-          console.error(`Bundle version ${version} not found.`);
-          version = this.rollBack();
-          continue;
-        }
-        return bundleFile;
-      } catch (e) {
-        console.error('Failed to access bundle file:', e);
-        version = this.rollBack();
-      }
-    }
-    return defaultAssetsUrl;
-  }
-
-  getPackageVersion(): string {
-    let bundleFlags =
-      bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_REQUESTED_PERMISSION;
-    let packageVersion = '';
-    try {
-      const bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleFlags);
-      packageVersion = bundleInfo?.versionName || 'Unknown';
-    } catch (error) {
-      console.error('获取包信息失败:', error);
-    }
-    return packageVersion;
-  }
-
-  public getCurrentVersion(): string {
-    const currentVersion = this.getKv('currentVersion');
-    return currentVersion;
-  }
-
-  private rollBack(): string {
-    const lastVersion = this.preferences.getSync('lastVersion', '') as string;
-    const currentVersion = this.preferences.getSync(
-      'currentVersion',
-      '',
-    ) as string;
-    if (!lastVersion) {
-      this.preferences.deleteSync('currentVersion');
-    } else {
-      this.preferences.putSync('currentVersion', lastVersion);
-    }
-    this.preferences.putSync('firstTimeOk', true);
-    this.preferences.putSync('firstTime', false);
-    this.preferences.putSync('rolledBackVersion', currentVersion);
-    this.preferences.flush();
-    return lastVersion;
-  }
-
-  private cleanUp(): void {
-    const params = new DownloadTaskParams();
-    params.type = DownloadTaskParams.TASK_TYPE_CLEANUP;
-    params.hash = this.preferences.getSync('currentVersion', '') as string;
-    params.originHash = this.preferences.getSync('lastVersion', '') as string;
-    params.unzipDirectory = this.rootDir;
-    const downloadTask = new DownloadTask(this.context);
-    downloadTask.execute(params);
-  }
-
-  public getIsUsingBundleUrl(): boolean {
-    return UpdateContext.isUsingBundleUrl;
-  }
-}
-
-export interface DownloadFileListener {
-  onDownloadCompleted(params: DownloadTaskParams): void;
-  onDownloadFailed(error: Error): void;
-}

harmony/src/main/cpp/CMakeLists.txt

@@ -1,13 +1,11 @@
 cmake_minimum_required(VERSION 3.13)
 project(rnupdate)
 
-# Point to android/jni directory for shared source code
-set(ANDROID_JNI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../../../node_modules/react-native-update/android/jni)
-set(HDIFFPATCH_DIR ${ANDROID_JNI_DIR}/HDiffPatch)
-set(LZMA_DIR ${ANDROID_JNI_DIR}/lzma)
+set(HDIFFPATCH_DIR ${CMAKE_CURRENT_SOURCE_DIR}/HDiffPatch)
+set(LZMA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lzma)
 set(HDP_SOURCES
      ${CMAKE_CURRENT_SOURCE_DIR}/pushy.c
-     ${ANDROID_JNI_DIR}/hpatch.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/hpatch.c
      ${HDIFFPATCH_DIR}/libHDiffPatch/HPatch/patch.c
      ${HDIFFPATCH_DIR}/file_for_patch.c
      ${LZMA_DIR}/C/LzmaDec.c
@@ -22,7 +20,6 @@ add_library(rnupdate SHARED
 
 target_include_directories(rnupdate PRIVATE
      ${CMAKE_CURRENT_SOURCE_DIR}
-     ${ANDROID_JNI_DIR}
      ${HDIFFPATCH_DIR}
      ${HDIFFPATCH_DIR}/libHDiffPatch/HPatch
      ${LZMA_DIR}/C

harmony/src/main/cpp/PushyTurboModule.cpp

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

harmony/src/main/cpp/hpatch.c

@@ -0,0 +1,137 @@
+// hpatch.c
+// Copyright 2021 housisong, All rights reserved
+#include "hpatch.h"
+#include "HDiffPatch/libHDiffPatch/HPatch/patch.h"
+#include "HDiffPatch/file_for_patch.h"
+
+//#define _CompressPlugin_zlib
+//#define _CompressPlugin_bz2
+#define _CompressPlugin_lzma
+#define _CompressPlugin_lzma2
+#define _IsNeedIncludeDefaultCompressHead 0
+#include "lzma/C/LzmaDec.h"
+#include "lzma/C/Lzma2Dec.h"
+#include "HDiffPatch/decompress_plugin_demo.h"
+
+#define kMaxLoadMemOldSize ((1<<20)*8)
+
+#define  _check(v,errorType) do{ \
+    if (!(v)){ if (result==kHPatch_ok) result=errorType; if (!_isInClear){ goto _clear; }; } }while(0)
+
+int hpatch_getInfo_by_mem(hpatch_singleCompressedDiffInfo* out_patinfo,
+                          const uint8_t* pat,size_t patsize){
+    hpatch_TStreamInput patStream;
+    mem_as_hStreamInput(&patStream,pat,pat+patsize);
+    if (!getSingleCompressedDiffInfo(out_patinfo,&patStream,0))
+        return kHPatch_error_info;//data error;
+    return kHPatch_ok; //ok
+}
+
+static hpatch_TDecompress* getDecompressPlugin(const char* compressType){
+#ifdef  _CompressPlugin_zlib
+    if (zlibDecompressPlugin.is_can_open(compressType))
+        return &zlibDecompressPlugin;
+#endif
+#ifdef  _CompressPlugin_bz2
+    if (bz2DecompressPlugin.is_can_open(compressType))
+        return &bz2DecompressPlugin;
+#endif
+#ifdef  _CompressPlugin_lzma
+    if (lzmaDecompressPlugin.is_can_open(compressType))
+        return &lzmaDecompressPlugin;
+#endif
+#ifdef  _CompressPlugin_lzma2
+    if (lzma2DecompressPlugin.is_can_open(compressType))
+        return &lzma2DecompressPlugin;
+#endif
+    return 0;
+}
+static int hpatch_by_stream(const hpatch_TStreamInput* old,hpatch_BOOL isLoadOldAllToMem,const hpatch_TStreamInput* pat,
+                            hpatch_TStreamOutput* out_new,const hpatch_singleCompressedDiffInfo* patInfo){
+    int     result=kHPatch_ok;
+    int     _isInClear=hpatch_FALSE;
+    hpatch_TDecompress* decompressPlugin=0;
+    uint8_t* temp_cache=0;
+    size_t temp_cache_size;
+    hpatch_singleCompressedDiffInfo _patinfo;
+    hpatch_TStreamInput _old;
+    {// info
+        if (!patInfo){
+            _check(getSingleCompressedDiffInfo(&_patinfo,pat,0),kHPatch_error_info);
+            patInfo=&_patinfo;
+        }
+        _check(old->streamSize==patInfo->oldDataSize,kHPatch_error_old_size);
+        _check(out_new->streamSize>=patInfo->newDataSize,kHPatch_error_new_size);
+        out_new->streamSize=patInfo->newDataSize;
+        if (strlen(patInfo->compressType)>0){
+            decompressPlugin=getDecompressPlugin(patInfo->compressType);
+            _check(decompressPlugin,kHPatch_error_compressType);
+        }
+    }
+    {// mem
+        size_t mem_size;
+        size_t oldSize=(size_t)old->streamSize;
+        isLoadOldAllToMem=isLoadOldAllToMem&&(old->streamSize<=kMaxLoadMemOldSize);
+        temp_cache_size=patInfo->stepMemSize+hpatch_kFileIOBufBetterSize*3;
+        mem_size=temp_cache_size+(isLoadOldAllToMem?oldSize:0);
+        temp_cache=malloc(mem_size);
+        _check(temp_cache,kHPatch_error_malloc);
+        if (isLoadOldAllToMem){//load old to mem
+            uint8_t* oldMem=temp_cache+temp_cache_size;
+            _check(old->read(old,0,oldMem,oldMem+oldSize),kHPatch_error_old_fread);
+            mem_as_hStreamInput(&_old,oldMem,oldMem+oldSize);
+            old=&_old;
+        }
+    }
+
+    _check(patch_single_compressed_diff(out_new,old,pat,patInfo->diffDataPos,
+               patInfo->uncompressedSize,decompressPlugin,patInfo->coverCount,
+               patInfo->stepMemSize,temp_cache,temp_cache+temp_cache_size),kHPatch_error_patch);
+
+_clear:
+    _isInClear=hpatch_TRUE;
+    if (temp_cache){ free(temp_cache); temp_cache=0; }
+    return result;
+}
+
+int hpatch_by_mem(const uint8_t* old,size_t oldsize,uint8_t* newBuf,size_t newsize,
+                  const uint8_t* pat,size_t patsize,const hpatch_singleCompressedDiffInfo* patInfo){
+    hpatch_TStreamInput oldStream;
+    hpatch_TStreamInput patStream;
+    hpatch_TStreamOutput newStream;
+    mem_as_hStreamInput(&oldStream,old,old+oldsize);
+    mem_as_hStreamInput(&patStream,pat,pat+patsize);
+    mem_as_hStreamOutput(&newStream,newBuf,newBuf+newsize);
+    return hpatch_by_stream(&oldStream,hpatch_FALSE,&patStream,&newStream,patInfo);
+}
+
+int hpatch_by_file(const char* oldfile, const char* newfile, const char* patchfile){
+    int     result=kHPatch_ok;
+    int     _isInClear=hpatch_FALSE;
+    int     patch_result;
+    hpatch_TFileStreamInput oldStream;
+    hpatch_TFileStreamInput patStream;
+    hpatch_TFileStreamOutput newStream;
+    hpatch_TFileStreamInput_init(&oldStream);
+    hpatch_TFileStreamInput_init(&patStream);
+    hpatch_TFileStreamOutput_init(&newStream);
+
+    _check(hpatch_TFileStreamInput_open(&oldStream,oldfile),kHPatch_error_old_fopen);
+    _check(hpatch_TFileStreamInput_open(&patStream,patchfile),kHPatch_error_pat_fopen);
+    _check(hpatch_TFileStreamOutput_open(&newStream,newfile,~(hpatch_StreamPos_t)0),kHPatch_error_new_fopen);
+
+    patch_result=hpatch_by_stream(&oldStream.base,hpatch_TRUE,&patStream.base,&newStream.base,0);
+    if (patch_result!=kHPatch_ok){
+        _check(!oldStream.fileError,kHPatch_error_old_fread);
+        _check(!patStream.fileError,kHPatch_error_pat_fread);
+        _check(!newStream.fileError,kHPatch_error_new_fwrite);
+        _check(hpatch_FALSE,patch_result);
+    }
+
+_clear:
+    _isInClear=hpatch_TRUE;
+    _check(hpatch_TFileStreamInput_close(&oldStream),kHPatch_error_old_fclose);
+    _check(hpatch_TFileStreamInput_close(&patStream),kHPatch_error_pat_fclose);
+    _check(hpatch_TFileStreamOutput_close(&newStream),kHPatch_error_new_fclose);
+    return result;
+}

harmony/src/main/cpp/hpatch.h

@@ -0,0 +1,44 @@
+// hpatch.h
+// import HDiffPatch, support patchData created by "hdiffz -SD -c-lzma2 oldfile newfile patchfile"
+// Copyright 2021 housisong, All rights reserved
+
+#ifndef HDIFFPATCH_PATCH_H
+#define HDIFFPATCH_PATCH_H
+# include <stdint.h> //for uint8_t
+#include "HDiffPatch/libHDiffPatch/HPatch/patch_types.h" //for hpatch_singleCompressedDiffInfo
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//result
+enum {
+    kHPatch_ok                  = 0,
+    kHPatch_error_malloc        =-1,
+    kHPatch_error_info          =-2,
+    kHPatch_error_compressType  =-3,
+    kHPatch_error_patch         =-4,
+    kHPatch_error_old_fopen     =-5,
+    kHPatch_error_old_fread     =-6,
+    kHPatch_error_old_fclose    =-7,
+    kHPatch_error_pat_fopen     =-8,
+    kHPatch_error_pat_fread     =-9,
+    kHPatch_error_pat_fclose    =-10,
+    kHPatch_error_new_fopen     =-11,
+    kHPatch_error_new_fwrite    =-12,
+    kHPatch_error_new_fclose    =-13,
+    kHPatch_error_old_size      =-14,
+    kHPatch_error_new_size      =-15,
+};
+
+int hpatch_getInfo_by_mem(hpatch_singleCompressedDiffInfo* out_patinfo,
+                          const uint8_t* pat,size_t patsize);
+
+//patInfo can NULL
+int hpatch_by_mem(const uint8_t* old,size_t oldsize, uint8_t* newBuf,size_t newsize,
+                  const uint8_t* pat,size_t patsize,const hpatch_singleCompressedDiffInfo* patInfo);
+int hpatch_by_file(const char* oldfile, const char* newfile, const char* patchfile);
+
+#ifdef __cplusplus
+}
+#endif
+#endif //HDIFFPATCH_PATCH_H