fix expo reload

* update pushy reference method

* update

.npmignore

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

.nvmrc

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

.yarnrc.yml

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

Example/expoUsePushy/.gitignore

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

Example/expoUsePushy/App.tsx

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

Example/expoUsePushy/TestConsole.js

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

Example/expoUsePushy/app.json

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

Example/expoUsePushy/index.js

@@ -0,0 +1,8 @@
+import { registerRootComponent } from 'expo';
+
+import App from './App';
+
+// registerRootComponent calls AppRegistry.registerComponent('main', () => App);
+// It also ensures that whether you load the app in Expo Go or in a native build,
+// the environment is set up appropriately
+registerRootComponent(App);

Example/expoUsePushy/package.json

@@ -0,0 +1,24 @@
+{
+  "name": "expousepushy",
+  "version": "1.0.0",
+  "main": "index.js",
+  "scripts": {
+    "start": "expo start",
+    "android": "expo run:android",
+    "ios": "expo run:ios",
+    "web": "expo start --web"
+  },
+  "dependencies": {
+    "expo": "~52.0.46",
+    "expo-status-bar": "~2.0.1",
+    "react": "18.3.1",
+    "react-native": "0.76.9",
+    "react-native-update": "^10.28.7"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.25.2",
+    "@types/react": "~18.3.12",
+    "typescript": "^5.3.3"
+  },
+  "private": true
+}

Example/expoUsePushy/tsconfig.json

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

Example/expoUsePushy/update.json

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

Example/harmony_use_pushy/README.md

@@ -2,19 +2,25 @@
 
 ### 1. 在项目根目录执行下面命令安装第三方依赖。
 ```
-yarn install
+bun install
 ```
 
-### 2. 在项目根目录执行下面命令生成bundle包文件。
+### 2. 本地debug 模式
 ```
-yarn build
+bun run start
+```
+![image](./debug.png)
+
+### 3. release 模式: 在项目根目录执行下面命令生成bundle包文件。
+```
+bun run build
 ```
 说明：这个命令会在harmony/entry/src/main/resources/rawfile目录生成Hbundle.harmony.js和assets文件，同时会基于该内容在.pushy/output目录生成ppk包。
 
 **注意⚠️**：在使用pushy bundle --platform harmony命令进行打包的默认bundle包名是Hbundle.harmony.js，不要随意修改包名，因为diff是匹配该包名进行生成的。
 
-### 3. 使用DevEco Studio IDE打开harmony目录然后执行sync运行项目
+### 4. 使用DevEco Studio IDE打开harmony目录然后执行sync运行项目
 ![image](./sync.png)
 
-### 4 运行效果图
+### 5 运行效果图
 ![image](./demo.png)

Example/harmony_use_pushy/harmony/build-profile.json5

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
 {
-    "pushy_build_time": "2025-02-14T09:43:25.648Z",
+    "pushy_build_time": "2025-04-30T02:46:33.340Z",
     "versionName": "1.0.0"
 }

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

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

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

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

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

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

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

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

Example/harmony_use_pushy/package.json

@@ -6,7 +6,8 @@
     "android": "react-native run-android",
     "ios": "react-native run-ios",
     "lint": "eslint .",
-    "start": "react-native start",
+    "start": "npm run codegen && hdc rport tcp:8081 tcp:8081 && react-native start",
+    "codegen": "react-native codegen-harmony --rnoh-module-path ./harmony/react_native_openharmony",
     "build": "pushy bundle --platform harmony",
     "test": "jest",
     "hdiffFromPPK": "pushy hdiffFromPPK .pushy/output/harmony.1735052610653.ppk .pushy/output/harmony.1735052678646.ppk .pushy/output/hdiff.ppk-patch",
@@ -14,10 +15,10 @@
     "hash": "pushy hash /Users/yanbo.he/Desktop/HarmonyOS/react-native-pushy/Example/harmony_use_pushy/.pushy/output/harmony.1735048297258.ppk"
   },
   "dependencies": {
+    "@react-native-oh/react-native-harmony": "^0.72.59",
     "react": "18.2.0",
     "react-native": "0.72.5",
-    "react-native-update": "file:../../",
+    "react-native-update": "latest"
-    "@react-native-oh/react-native-harmony": "^0.72.43"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

Example/testHotUpdate/.gitignore

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

Example/testHotUpdate/.nvmrc

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

Example/testHotUpdate/android/app/build.gradle

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

Example/testHotUpdate/android/build.gradle

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

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

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

Example/testHotUpdate/android/gradlew

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

Example/testHotUpdate/metro.config.js

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

Example/testHotUpdate/package.json

@@ -16,43 +16,40 @@
   "dependencies": {
     "form-data": "^4.0.2",
     "patch-package": "^8.0.0",
-    "postinstall-postinstall": "^2.1.0",
+    "react": "19.0.0",
-    "react": "18.3.1",
+    "react-native": "0.79.2",
-    "react-native": "0.76.7",
+    "react-native-camera-kit": "^15.0.1",
-    "react-native-camera-kit": "^14.2.0",
+    "react-native-paper": "^5.14.5",
-    "react-native-paper": "^5.13.1",
+    "react-native-safe-area-context": "^5.4.1",
-    "react-native-safe-area-context": "^5.2.0",
+    "react-native-svg": "^15.12.0",
-    "react-native-svg": "^15.11.1",
+    "react-native-update": "^10.28.11",
-    "react-native-update": "^10.24.2",
     "react-native-vector-icons": "^10.2.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.26.0",
+    "@babel/core": "^7.27.3",
-    "@babel/preset-env": "^7.26.0",
+    "@babel/preset-env": "^7.27.2",
-    "@babel/runtime": "^7.26.0",
+    "@babel/runtime": "^7.27.3",
-    "@react-native-community/cli": "15.0.1",
+    "@react-native-community/cli": "18.0.0",
-    "@react-native-community/cli-platform-android": "15.0.1",
+    "@react-native-community/cli-platform-android": "18.0.0",
-    "@react-native-community/cli-platform-ios": "15.0.1",
+    "@react-native-community/cli-platform-ios": "18.0.0",
-    "@react-native/babel-preset": "0.76.7",
+    "@react-native/babel-preset": "0.79.2",
-    "@react-native/eslint-config": "0.76.7",
+    "@react-native/eslint-config": "0.79.2",
-    "@react-native/metro-config": "0.76.7",
+    "@react-native/metro-config": "0.79.2",
-    "@react-native/typescript-config": "0.76.7",
+    "@react-native/typescript-config": "0.79.2",
-    "@types/react": "^18.2.6",
+    "@types/react": "^19.0.0",
-    "@types/react-test-renderer": "^18.0.0",
+    "@types/react-test-renderer": "^19.0.0",
-    "babel-jest": "^29.6.3",
+    "detox": "^20.39.0",
-    "detox": "^20.32.0",
     "eslint": "^8.19.0",
     "jest": "^29.6.3",
     "prettier": "2.8.8",
-    "react-test-renderer": "18.3.1",
+    "react-test-renderer": "19.0.0",
-    "typescript": "5.7.3"
+    "typescript": "5.8.3"
   },
   "engines": {
     "node": ">=18"
   },
   "trustedDependencies": [
     "detox",
-    "dtrace-provider",
+    "dtrace-provider"
-    "postinstall-postinstall"
   ]
 }

Example/testHotUpdate/src/index.tsx

@@ -204,17 +204,18 @@ const styles = StyleSheet.create({
 });
 
 // use Pushy for China users
-// const updateClient = new Pushy({
+const updateClient = new Pushy({
+  appKey,
+  debug: true,
+  // updateStrategy: 'silentAndLater',
+});
+
+// use Cresc for global users
+// const updateClient = new Cresc({
 //   appKey,
 //   debug: true,
 // });
 
-// use Cresc for global users
-const updateClient = new Cresc({
-  appKey,
-  debug: true,
-});
-
 export default function Root() {
   return (
     <UpdateProvider client={updateClient}>

android/build.gradle

@@ -22,14 +22,70 @@ def supportsNamespace() {
   return major >= 8
 }
 
+def checkProjectInfo() {
+    def hasExpoModulesCore = rootProject.subprojects.any { it.name == 'expo-modules-core' }
+    def packageJsonFile = new File(rootProject.projectDir.parentFile, 'package.json')
+    
+    def hasExpoDependency = false
+    def projectVersion = '1.0.0' // Default version
+
+    if (packageJsonFile.exists()) {
+        def packageJson = new groovy.json.JsonSlurper().parseText(packageJsonFile.text)
+        projectVersion = packageJson.version ?: '1.0.0' // Get project version
+
+        // Check for expo dependency and version >= 50
+        String expoVersionString = packageJson.dependencies?.expo ?: packageJson.devDependencies?.expo
+        boolean expoVersionIsHighEnough = false
+        if (expoVersionString) {
+            try {
+                // Extract the first number sequence as the major version
+                def matcher = (expoVersionString =~ /(\d+)/)
+                if (matcher.find()) {
+                    int majorVersion = matcher[0][0].toInteger()
+                    if (majorVersion >= 50) {
+                        expoVersionIsHighEnough = true
+                    }
+                }
+            } catch (NumberFormatException e) {
+                // Handle error if version parsing fails, maybe log a warning
+                println "Warning: Could not parse Expo version string: ${expoVersionString}"
+            }
+        }
+        hasExpoDependency = expoVersionIsHighEnough // Update based on version check
+    }
+    
+    def isExpo = hasExpoModulesCore && hasExpoDependency
+    
+    // Return a map containing both pieces of information
+    return [isExpo: isExpo, version: projectVersion]
+}
+
+// Get project info map
+def projectInfo = checkProjectInfo()
+// Extract info into variables
+def projectVersion = projectInfo.version
+def expoProject = projectInfo.isExpo
+
 apply plugin: 'com.android.library'
 if (isNewArchitectureEnabled()) {
     apply plugin: 'com.facebook.react'
 }
 
+if (expoProject) {
+    group = 'expo.modules.pushy'
+    version = projectVersion
+
+    def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+    apply from: expoModulesCorePlugin
+    applyKotlinExpoModulesCorePlugin()
+    // useExpoPublishing()
+    useCoreDependencies()
+} else {
+    group = 'cn.reactnative.modules.update'
+    version = projectVersion
+}
 
 android {
-
     if (supportsNamespace()) {
         namespace "cn.reactnative.modules.update"
 
@@ -41,7 +97,6 @@ android {
     }
     compileSdkVersion safeExtGet('compileSdkVersion', 28)
     buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
-
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 16)
         targetSdkVersion safeExtGet('targetSdkVersion', 27)
@@ -50,6 +105,7 @@ android {
         consumerProguardFiles "proguard.pro"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
     }
+    
     sourceSets {
         main {
             // let gradle pack the shared library into apk
@@ -59,6 +115,12 @@ android {
             } else {
                 java.srcDirs += ['src/oldarch']
             }
+            
+            if (expoProject) {
+                java.srcDirs += ['java/expo/modules/pushy']
+            } else {
+                java.exclude 'expo/modules/pushy/**'
+            }
         }
     }
 
@@ -70,6 +132,10 @@ android {
             resValue("string", "pushy_build_time", "0")
         }
     }
+    
+    lintOptions {
+        abortOnError false
+    }
 }
 
 repositories {
@@ -82,7 +148,6 @@ repositories {
 dependencies {
     implementation 'com.facebook.react:react-native:+'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
-    implementation 'com.jakewharton:process-phoenix:3.0.0'
 }
 if (isNewArchitectureEnabled()) {
     react {

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

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

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

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

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

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

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

@@ -24,7 +24,7 @@ public class UpdateModuleImpl {
 
     public static final String NAME = "Pushy";
 
-    public static void downloadFullUpdate(UpdateContext updateContext, ReadableMap options, Promise promise) {
+    public static void downloadFullUpdate(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
         String url = options.getString("updateUrl");
         String hash = options.getString("hash");
         updateContext.downloadFullUpdate(url, hash, new UpdateContext.DownloadFileListener() {
@@ -40,7 +40,7 @@ public class UpdateModuleImpl {
         });
     }
 
-    public static void downloadAndInstallApk(UpdateContext updateContext, ReadableMap options, Promise promise) {
+    public static void downloadAndInstallApk(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
         String url = options.getString("url");
         String hash = options.getString("hash");
         String target = options.getString("target");
@@ -63,7 +63,7 @@ public class UpdateModuleImpl {
         UpdateModule.installApk(toInstall);
     }
 
-    public static void downloadPatchFromPackage(UpdateContext updateContext, ReadableMap options, Promise promise) {
+    public static void downloadPatchFromPackage(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
         String url = options.getString("updateUrl");
         String hash = options.getString("hash");
         updateContext.downloadPatchFromApk(url, hash, new UpdateContext.DownloadFileListener() {
@@ -79,7 +79,7 @@ public class UpdateModuleImpl {
         });
     }
 
-    public static void downloadPatchFromPpk(UpdateContext updateContext, ReadableMap options, Promise promise) {
+    public static void downloadPatchFromPpk(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
         try {
             String url = options.getString("updateUrl");
             String hash = options.getString("hash");
@@ -102,7 +102,7 @@ public class UpdateModuleImpl {
         }
     }
 
-    public static void reloadUpdate(UpdateContext updateContext, ReactApplicationContext mContext, ReadableMap options, Promise promise) {
+    public static void reloadUpdate(final UpdateContext updateContext,final ReactApplicationContext mContext, final ReadableMap options, final Promise promise) {
         final String hash = options.getString("hash");
         UiThreadUtil.runOnUiThread(new Runnable() {
             @Override
@@ -152,8 +152,13 @@ public class UpdateModuleImpl {
                         reactHostDelegateField.setAccessible(true);
                         Object reactHostDelegate = reactHostDelegateField.get(reactHost);
 
+                        String bundleFieldName = "jsBundleLoader";
+                        if (reactHostDelegate.getClass().getCanonicalName().equals("expo.modules.ExpoReactHostFactory.ExpoReactHostDelegate")) {
+                            bundleFieldName = "_jsBundleLoader";
+                        }
+
                         // Modify the jsBundleLoader field
-                        Field jsBundleLoaderField = reactHostDelegate.getClass().getDeclaredField("jsBundleLoader");
+                        Field jsBundleLoaderField = reactHostDelegate.getClass().getDeclaredField(bundleFieldName);
                         jsBundleLoaderField.setAccessible(true);
                         jsBundleLoaderField.set(reactHostDelegate, loader);
                         
@@ -176,8 +181,37 @@ 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();
 
-    public static void setNeedUpdate(UpdateContext updateContext, ReadableMap options, Promise promise) {
+                      instanceManager.recreateReactContextInBackground();
+                      promise.resolve(true);
+
+                  } catch (Throwable err) {
+                      promise.reject("restartApp failed: "+err.getMessage());
+                      Log.e("pushy", "restartApp failed", err);
+
+                      final Activity currentActivity = mContext.getCurrentActivity();
+                      if (currentActivity == null) {
+                          return;
+                      }
+                      currentActivity.runOnUiThread(new Runnable() {
+                          @Override
+                          public void run() {
+                              currentActivity.recreate();
+                          }
+                      });
+                  }
+              }
+          });
+      }
+
+    public static void setNeedUpdate(final UpdateContext updateContext, final ReadableMap options, final Promise promise) {
         final String hash = options.getString("hash");
         UiThreadUtil.runOnUiThread(new Runnable() {
             @Override
@@ -193,7 +227,7 @@ public class UpdateModuleImpl {
         });
     }
 
-    public static void markSuccess(UpdateContext updateContext, Promise promise) {
+    public static void markSuccess(final UpdateContext updateContext, final Promise promise) {
         UiThreadUtil.runOnUiThread(new Runnable() {
             @Override
             public void run() {
@@ -203,7 +237,7 @@ public class UpdateModuleImpl {
         });
     }
 
-    public static void setUuid(UpdateContext updateContext, String uuid, Promise promise) {
+    public static void setUuid(final UpdateContext updateContext, final String uuid, final Promise promise) {
         UiThreadUtil.runOnUiThread(new Runnable() {
             @Override
             public void run() {
@@ -224,7 +258,7 @@ public class UpdateModuleImpl {
     }
 
 
-    public static void setLocalHashInfo(UpdateContext updateContext, final String hash, final String info, Promise promise) {
+    public static void setLocalHashInfo(final UpdateContext updateContext, final String hash, final String info, final Promise promise) {
         UiThreadUtil.runOnUiThread(new Runnable() {
             @Override
             public void run() {
@@ -239,7 +273,7 @@ public class UpdateModuleImpl {
         });
     }
 
-    public static void getLocalHashInfo(UpdateContext updateContext, final String hash, Promise promise) {
+    public static void getLocalHashInfo(UpdateContext updateContext, final String hash, final Promise promise) {
         String value = updateContext.getKv("hash_" + hash);
         if (check(value)) {
             promise.resolve(value);

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

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

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

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

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

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

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

@@ -20,7 +20,6 @@ import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.JSBundleLoader;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.jakewharton.processphoenix.ProcessPhoenix;
 
 import java.io.File;
 import java.lang.reflect.Field;
@@ -224,6 +223,29 @@ public class UpdateModule extends ReactContextBaseJavaModule {
         });
     }
 
+    @ReactMethod
+    public void restartApp(final Promise promise) {
+
+        UiThreadUtil.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    final Context application = getReactApplicationContext().getApplicationContext();
+                    ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager();
+                    if (instanceManager == null) {
+                        instanceManager = ((ReactApplication) application).getReactNativeHost().getReactInstanceManager();
+                    }
+                    instanceManager.recreateReactContextInBackground();
+                    promise.resolve(true);
+
+                } catch (Throwable err) {
+                    promise.reject(err);
+                    Log.e("pushy", "restartApp failed ", err);
+                }
+            }
+        });
+    }
+
     @ReactMethod
     public void setNeedUpdate(ReadableMap options) {
         final String hash = options.getString("hash");

expo-module.config.json

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

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

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

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

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

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

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

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

@@ -3,7 +3,7 @@ import fileIo from '@ohos.file.fs';
 import common from '@ohos.app.ability.common';
 import { UpdateContext } from './UpdateContext';
 
-export class FileJSBundleProvider extends JSBundleProvider {
+export class PushyFileJSBundleProvider extends JSBundleProvider {
   private updateContext: UpdateContext;
   private filePath: string = ''
 

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

@@ -7,6 +7,7 @@ import { BusinessError } from '@ohos.base';
 import logger from './Logger';
 import { UpdateModuleImpl } from './UpdateModuleImpl';
 import { UpdateContext } from './UpdateContext';
+import { EventHub } from './EventHub';
 
 const TAG = "PushyTurboModule"
 
@@ -18,9 +19,8 @@ export class PushyTurboModule extends TurboModule {
     super(ctx);
     logger.debug(TAG, ",PushyTurboModule constructor");
     this.mUiCtx = ctx.uiAbilityContext
-    let rnInstance = ctx.rnInstance
     this.context = new UpdateContext(this.mUiCtx)
-    // rnInstance.emitDeviceEvent("Pushy",{code: err.code, message: err.message});
+    EventHub.getInstance().setRNInstance(ctx.rnInstance)
   }
 
 

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

@@ -31,7 +31,10 @@ export class UpdateContext {
             this.preferences = preferences.getPreferencesSync(this.context, {name:'update'});
             const packageVersion =  this.getPackageVersion();
             const storedVersion =  this.preferences.getSync('packageVersion', '');
-            if (packageVersion !== storedVersion) {
+            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();
@@ -137,8 +140,9 @@ export class UpdateContext {
             params.unzipDirectory = `${this.rootDir}/${hash}`;
 
             const downloadTask = new DownloadTask(this.context);
-            await downloadTask.execute(params);
+            return  await downloadTask.execute(params);
         } catch (e) {
+            throw e;
             console.error('Failed to download APK patch:', e);
         }
     }
@@ -152,14 +156,13 @@ export class UpdateContext {
 
             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', null);
+             this.setKv('rolledBackVersion', "");
         } catch (e) {
             console.error('Failed to switch version:', e);
         }
@@ -211,7 +214,7 @@ export class UpdateContext {
     }
 
     public getCurrentVersion() : string {
-        const currentVersion = this.preferences.getSync('currentVersion', '') as string;
+        const currentVersion = this.getKv('currentVersion');
         return currentVersion;
     }
 

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

@@ -56,7 +56,7 @@ export class UpdateModuleImpl {
     options: { updateUrl: string; hash: string }
   ): Promise<void> {
     try {
-      await updateContext.downloadPatchFromPackage(options.updateUrl, options.hash, {
+     return await updateContext.downloadPatchFromPackage(options.updateUrl, options.hash, {
         onDownloadCompleted: (params: DownloadTaskParams) => {
           return Promise.resolve();
         },

ios/Expo/ExpoPushyModule.swift

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

ios/Expo/ExpoPushyReactDelegateHandler.swift

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

ios/RCTPushy/RCTPushy.mm

@@ -338,6 +338,26 @@ RCT_EXPORT_METHOD(reloadUpdate:(NSDictionary *)options
     }
 }
 
+RCT_EXPORT_METHOD(restartApp:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    @try {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self.bridge reload];
+        });
+        #if __has_include("RCTReloadCommand.h")
+            // reload 0.62+
+            RCTReloadCommandSetBundleURL([[self class] bundleURL]);
+            RCTTriggerReloadCommandListeners(@"pushy restartApp");
+        #endif
+
+        resolve(@true);
+    }
+    @catch (NSException *exception) {
+        reject(@"执行报错", exception.reason, nil);
+    }
+}
+
 RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
                                     rejecter:(RCTPromiseRejectBlock)reject)
 {

package.json

@@ -1,28 +1,29 @@
 {
   "name": "react-native-update",
-  "version": "10.25.0",
+  "version": "10.29.0",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {
-    "prepack": "yarn submodule && yarn lint",
+    "postinstall": "node scripts/check-expo-version.js",
+    "prepack": "bun submodule && bun lint",
     "lint": "eslint \"src/*.@(ts|tsx|js|jsx)\" && tsc --noEmit",
     "submodule": "git submodule update --init --recursive",
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build-lib": "yarn submodule && $ANDROID_HOME/ndk/20.1.5948944/ndk-build NDK_PROJECT_PATH=android APP_BUILD_SCRIPT=android/jni/Android.mk NDK_APPLICATION_MK=android/jni/Application.mk NDK_LIBS_OUT=android/lib",
+    "build-lib": "bun submodule && $ANDROID_HOME/ndk/20.1.5948944/ndk-build NDK_PROJECT_PATH=android APP_BUILD_SCRIPT=android/jni/Android.mk NDK_APPLICATION_MK=android/jni/Application.mk NDK_LIBS_OUT=android/lib",
-    "build:ios-debug": "cd Example/testHotUpdate && yarn && detox build --configuration ios.sim.debug",
+    "build:ios-debug": "cd Example/testHotUpdate && bun && detox build --configuration ios.sim.debug",
-    "build:ios-release": "cd Example/testHotUpdate && yarn && detox build --configuration ios.sim.release",
+    "build:ios-release": "cd Example/testHotUpdate && bun && detox build --configuration ios.sim.release",
     "test:ios-debug": "cd Example/testHotUpdate && detox test --configuration ios.sim.debug",
-    "test:ios-release": "cd Example/testHotUpdate && yarn detox test --configuration ios.sim.release",
+    "test:ios-release": "cd Example/testHotUpdate && bun detox test --configuration ios.sim.release",
-    "build:android-debug": "cd Example/testHotUpdate && yarn && detox build --configuration android.emu.debug",
+    "build:android-debug": "cd Example/testHotUpdate && bun && detox build --configuration android.emu.debug",
-    "build:android-release": "cd Example/testHotUpdate && yarn && detox build --configuration android.emu.release",
+    "build:android-release": "cd Example/testHotUpdate && bun && detox build --configuration android.emu.release",
-    "test:android-release": "cd Example/testHotUpdate && yarn detox test --configuration android.emu.release --headless --record-logs all",
+    "test:android-release": "cd Example/testHotUpdate && bun detox test --configuration android.emu.release --headless --record-logs all",
     "test:android-debug": "cd Example/testHotUpdate && detox test --configuration android.emu.debug --headless --record-logs all",
-    "e2e:ios": "npm run build:ios-release && npm run test:ios-release",
+    "e2e:ios": "bun build:ios-release && bun test:ios-release",
-    "e2e:android": "npm run build:android-release && npm run test:android-release",
+    "e2e:android": "bun build:android-release && bun test:android-release",
-    "tests:emulator:prepare": "cd .github/workflows/scripts/functions && yarn && yarn build",
+    "tests:emulator:prepare": "cd .github/workflows/scripts/functions && bun && bun build",
-    "tests:emulator:start-ci": "yarn tests:emulator:prepare && cd ./.github/workflows/scripts && ./start-firebase-emulator.sh",
+    "tests:emulator:start-ci": "bun tests:emulator:prepare && cd ./.github/workflows/scripts && ./start-firebase-emulator.sh",
     "tests:packager:jet-ci": "cd Example/testHotUpdate && cross-env TMPDIR=$HOME/.metro REACT_DEBUGGER=\"echo nope\" node_modules/.bin/react-native start --no-interactive",
-    "tests:ios:pod:install": "cd Example/testHotUpdate && yarn && yarn pod-install"
+    "tests:ios:pod:install": "cd Example/testHotUpdate && bun && bun pod-install"
   },
   "repository": {
     "type": "git",
@@ -56,23 +57,20 @@
   "devDependencies": {
     "@babel/core": "^7.25.8",
     "@react-native/babel-preset": "^0.73.21",
-    "@react-native/eslint-config": "^0.73.2",
+    "@react-native/eslint-config": "0.79.1",
-    "@react-native/typescript-config": "^0.74.0",
+    "@react-native/typescript-config": "0.79.1",
-    "@types/fs-extra": "^11.0.4",
+    "@types/jest": "^29.5.14",
-    "@types/jest": "^29.5.13",
+    "@types/node": "^22.15.2",
-    "@types/node": "^22.7.6",
     "@types/react": "^18.3.11",
-    "detox": "^20.27.3",
+    "detox": "^20.37.0",
     "eslint": "^8.57.0",
-    "eslint-plugin-ft-flow": "^3.0.7",
     "firebase-tools": "^13.22.1",
-    "fs-extra": "^11.2.0",
     "jest": "^29.7.0",
-    "pod-install": "^0.2.2",
+    "pod-install": "^0.3.7",
     "prettier": "^2",
     "react": "18.2.0",
     "react-native": "0.73",
-    "ts-jest": "^29.2.5",
+    "ts-jest": "^29.3.2",
     "typescript": "^5.6.3"
   }
 }

react-native-update.podspec

@@ -1,12 +1,83 @@
 require 'json'
+require 'rubygems' # Required for version comparison
+
 
 new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
-
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
-
 podspec_dir = File.dirname(__FILE__)
 
 Pod::Spec.new do |s|
+
+  is_expo_in_podfile = false
+  begin
+    # Check Podfile for use_expo_modules!
+    podfile_path = File.join(Pod::Config.instance.installation_root, 'Podfile')
+    if File.exist?(podfile_path)
+      podfile_content = File.read(podfile_path)
+      is_expo_in_podfile = podfile_content.include?('use_expo_modules!')
+    end
+  rescue => e
+     # Silently ignore errors during check
+  end
+
+  # Determine final validity by checking Podfile presence AND Expo version
+  valid_expo_project = false # Default
+  if is_expo_in_podfile
+    # Only check expo version if use_expo_modules! is present
+    is_version_sufficient = false
+    begin
+        expo_version_str = `node --print \"require('expo/package.json').version\"`.strip
+        if expo_version_str && !expo_version_str.empty?
+          match = expo_version_str.match(/^\d+/)
+          if match
+            major_version = match[0].to_i
+            is_version_sufficient = major_version >= 50
+          end
+        end
+    rescue
+        # Node command failed, version remains insufficient
+    end
+    
+    # Final check
+    valid_expo_project = is_version_sufficient
+  end
+
+  # Set platform based on whether it's a valid Expo project and if we can parse its target
+  final_ios_deployment_target = '11.0' # Default target
+
+  if valid_expo_project
+    # --- Try to find and parse ExpoModulesCore.podspec only if it's an Expo project ---
+    parsed_expo_ios_target = nil
+    expo_modules_core_podspec_path = begin
+        package_json_path = `node -p "require.resolve('expo-modules-core/package.json')"`.strip
+        File.join(File.dirname(package_json_path), 'ExpoModulesCore.podspec') if $?.success? && package_json_path && !package_json_path.empty?
+    rescue
+        nil
+    end
+
+    if expo_modules_core_podspec_path && File.exist?(expo_modules_core_podspec_path)
+      begin
+        content = File.read(expo_modules_core_podspec_path)
+        match = content.match(/s\.platforms\s*=\s*\{[\s\S]*?:ios\s*=>\s*'([^\']+)'/) # Match within s.platforms hash
+        if match && match[1]
+          parsed_expo_ios_target = match[1]
+        else
+          match = content.match(/s\.platform\s*=\s*:ios,\s*'([^\']+)'/) # Fallback to s.platform = :ios, 'version'
+          if match && match[1]
+            parsed_expo_ios_target = match[1]
+          end
+        end
+      rescue => e
+        # Pod::UI.warn "Failed to read or parse ExpoModulesCore.podspec content: #{e.message}"
+      end
+    end
+    if parsed_expo_ios_target
+        final_ios_deployment_target = parsed_expo_ios_target
+    end
+  end
+
+  s.platforms = { :ios => final_ios_deployment_target }
+
   s.name         = package['name']
   s.version      = package['version']
   s.summary      = package['description']
@@ -16,10 +87,16 @@ Pod::Spec.new do |s|
   s.homepage     = package['homepage']
 
   s.cocoapods_version = '>= 1.6.0'
-  s.platform = :ios, "8.0"
+
-  s.platforms = { :ios => "11.0" }
   s.source = { :git => 'https://github.com/reactnativecn/react-native-update.git', :tag => '#{s.version}' }
-  s.source_files    = "ios/**/*.{h,m,mm,swift}"
+
+  # Conditionally set source files
+  if valid_expo_project
+    s.source_files = Dir.glob("ios/**/*.{h,m,mm,swift}") # Include Expo files
+  else
+    s.source_files = Dir.glob("ios/**/*.{h,m,mm,swift}").reject { |f| f.start_with?("ios/Expo/") } # Exclude Expo files
+  end
+
   s.libraries = 'bz2', 'z'
   s.vendored_libraries = 'RCTPushy/libRCTPushy.a'
   s.pod_target_xcconfig = { 
@@ -33,9 +110,14 @@ Pod::Spec.new do |s|
   s.dependency "React-Core"
   s.dependency 'SSZipArchive'
 
+  # Conditionally add Expo dependency
+  if valid_expo_project
+    s.dependency 'ExpoModulesCore'
+  end
+
   s.subspec 'RCTPushy' do |ss|
     ss.source_files = 'ios/RCTPushy/*.{h,m,mm,swift}'
-    ss.public_header_files = ['ios/RCTPushy/RCTPushy.h']
+    ss.public_header_files = ['ios/RCTPushy/*.h']
   end
 
   s.subspec 'HDiffPatch' do |ss|
@@ -48,6 +130,39 @@ Pod::Spec.new do |s|
     ss.public_header_files = 'ios/RCTPushy/HDiffPatch/**/*.h'
   end
 
+  # Conditionally add Expo subspec and check ExpoModulesCore version
+  if valid_expo_project
+    supports_bundle_url_final = false # Default
+
+    # 1. Try executing node to get the version string
+    expo_modules_core_version_str = begin
+      # Use node to directly require expo-modules-core/package.json and get its version
+      `node --print \"require('expo-modules-core/package.json').version\"` # Execute, keep raw output
+    rescue
+      # Node command failed (e.g., node not found, package not found). Return empty string.
+      ''
+    end
+
+    # 2. Process the obtained version string (if not empty)
+    if expo_modules_core_version_str && !expo_modules_core_version_str.empty?
+        begin
+            # Compare versions using Gem::Version (handles trailing newline)
+            installed_version = Gem::Version.new(expo_modules_core_version_str)
+            target_version = Gem::Version.new('1.12.0')
+            supports_bundle_url_final = installed_version >= target_version
+        rescue ArgumentError
+            # If Gem::Version fails parsing, supports_bundle_url_final remains false.
+        end
+    end
+
+    s.subspec 'Expo' do |ss|
+      ss.source_files = 'ios/Expo/**/*.{h,m,mm,swift}'
+      if supports_bundle_url_final
+        ss.pod_target_xcconfig = { 'SWIFT_ACTIVE_COMPILATION_CONDITIONS' => 'EXPO_SUPPORTS_BUNDLEURL' }
+      end
+    end
+  end
+
   if defined?(install_modules_dependencies()) != nil
     install_modules_dependencies(s);
   else
@@ -59,8 +174,7 @@ Pod::Spec.new do |s|
       s.pod_target_xcconfig = {
           "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
           "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-      }
+      }.merge(s.pod_target_xcconfig)
-
       s.dependency "React-Codegen"
       s.dependency "RCT-Folly"
       s.dependency "RCTRequired"

scripts/check-expo-version.js

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

src/NativePushy.ts

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

src/client.ts

@@ -1,28 +1,33 @@
-import { CheckResult, ClientOptions, ProgressData, EventType } from './type';
 import {
-  assertDev,
+  DeviceEventEmitter,
+  EmitterSubscription,
+  Platform,
+} from 'react-native';
+import {
+  PushyModule,
+  buildTime,
+  cInfo,
+  currentVersion,
+  getCurrentVersionInfo,
+  isFirstTime,
+  isRolledBack,
+  packageVersion,
+  pushyNativeEventEmitter,
+  rolledBackVersion,
+  setLocalHashInfo,
+} from './core';
+import { PermissionsAndroid } from './permissions';
+import { CheckResult, ClientOptions, EventType, ProgressData } from './type';
+import {
   assertWeb,
   emptyObj,
+  enhancedFetch,
   joinUrls,
   log,
   noop,
   promiseAny,
   testUrls,
 } from './utils';
-import { EmitterSubscription, Platform } from 'react-native';
-import { PermissionsAndroid } from './permissions';
-import {
-  PushyModule,
-  buildTime,
-  cInfo,
-  pushyNativeEventEmitter,
-  currentVersion,
-  packageVersion,
-  rolledBackVersion,
-  setLocalHashInfo,
-  isFirstTime,
-  isRolledBack,
-} from './core';
 
 const SERVER_PRESETS = {
   // cn
@@ -56,6 +61,31 @@ const defaultClientOptions: ClientOptions = {
   throwError: false,
 };
 
+export const sharedState: {
+  progressHandlers: Record<string, EmitterSubscription>;
+  downloadedHash?: string;
+  apkStatus: 'downloading' | 'downloaded' | null;
+  marked: boolean;
+  applyingUpdate: boolean;
+} = {
+  progressHandlers: {},
+  downloadedHash: undefined,
+  apkStatus: null,
+  marked: false,
+  applyingUpdate: false,
+};
+
+const assertHash = (hash: string) => {
+  if (!sharedState.downloadedHash) {
+    return;
+  }
+  if (hash !== sharedState.downloadedHash) {
+    log(`use downloaded hash ${sharedState.downloadedHash} first`);
+    return;
+  }
+  return true;
+};
+
 // for China users
 export class Pushy {
   options = defaultClientOptions;
@@ -63,13 +93,6 @@ export class Pushy {
   lastChecking?: number;
   lastRespJson?: Promise<any>;
 
-  static progressHandlers: Record<string, EmitterSubscription> = {};
-  static downloadedHash?: string;
-
-  static apkStatus: 'downloading' | 'downloaded' | null = null;
-
-  static marked = false;
-  static applyingUpdate = false;
   version = cInfo.rnu;
   loggerPromise = (() => {
     let resolve: (value?: unknown) => void = () => {};
@@ -82,13 +105,13 @@ export class Pushy {
     };
   })();
 
-  constructor(options: ClientOptions) {
+  constructor(options: ClientOptions, clientType?: 'Pushy' | 'Cresc') {
     if (Platform.OS === 'ios' || Platform.OS === 'android') {
       if (!options.appKey) {
         throw new Error('appKey is required');
       }
     }
-    this.clientType = new.target.name as 'Pushy' | 'Cresc';
+    this.clientType = clientType || 'Pushy';
     this.options.server = SERVER_PRESETS[this.clientType];
     this.setOptions(options);
     if (isRolledBack) {
@@ -124,6 +147,7 @@ export class Pushy {
     log(type + ' ' + message);
     await this.loggerPromise.promise;
     const { logger = noop, appKey } = this.options;
+    const info = await getCurrentVersionInfo();
     logger({
       type,
       data: {
@@ -133,6 +157,7 @@ export class Pushy {
         packageVersion,
         buildTime,
         message,
+        ...info,
         ...data,
       },
     });
@@ -145,55 +170,47 @@ export class Pushy {
   getCheckUrl = (endpoint: string = this.options.server!.main) => {
     return `${endpoint}/checkUpdate/${this.options.appKey}`;
   };
-  static assertHash = (hash: string) => {
+  assertDebug = (matter: string) => {
-    if (!this.downloadedHash) {
-      return;
-    }
-    if (hash !== this.downloadedHash) {
-      log(`use downloaded hash ${Pushy.downloadedHash} first`);
-      return;
-    }
-    return true;
-  };
-  assertDebug = () => {
     if (__DEV__ && !this.options.debug) {
       console.info(
-        'You are currently in the development environment and have not enabled debug mode. The hot update check will not be performed. If you need to debug hot updates in the development environment, please set debug to true in the client.',
+        `You are currently in the development environment and have not enabled debug mode. 
+        ${matter} will not be performed. 
+        If you need to debug ${matter} in the development environment, please set debug to true in the client.`,
       );
       return false;
     }
     return true;
   };
   markSuccess = () => {
-    if (Pushy.marked || __DEV__ || !isFirstTime) {
+    if (sharedState.marked || __DEV__ || !isFirstTime) {
       return;
     }
-    Pushy.marked = true;
+    sharedState.marked = true;
     PushyModule.markSuccess();
     this.report({ type: 'markSuccess' });
   };
   switchVersion = async (hash: string) => {
-    if (!assertDev('switchVersion()')) {
+    if (!this.assertDebug('switchVersion()')) {
       return;
     }
-    if (Pushy.assertHash(hash) && !Pushy.applyingUpdate) {
+    if (assertHash(hash) && !sharedState.applyingUpdate) {
       log('switchVersion: ' + hash);
-      Pushy.applyingUpdate = true;
+      sharedState.applyingUpdate = true;
       return PushyModule.reloadUpdate({ hash });
     }
   };
 
   switchVersionLater = async (hash: string) => {
-    if (!assertDev('switchVersionLater()')) {
+    if (!this.assertDebug('switchVersionLater()')) {
       return;
     }
-    if (Pushy.assertHash(hash)) {
+    if (assertHash(hash)) {
       log('switchVersionLater: ' + hash);
       return PushyModule.setNeedUpdate({ hash });
     }
   };
   checkUpdate = async (extra?: Record<string, any>) => {
-    if (!this.assertDebug()) {
+    if (!this.assertDebug('checkUpdate()')) {
       return;
     }
     if (!assertWeb()) {
@@ -226,10 +243,11 @@ export class Pushy {
       // @ts-ignore
       delete fetchBody.buildTime;
     }
+    const stringifyBody = JSON.stringify(fetchBody);
     // harmony fetch body is not string
     let body: any = fetchBody;
     if (Platform.OS === 'ios' || Platform.OS === 'android') {
-      body = JSON.stringify(fetchBody);
+      body = stringifyBody;
     }
     const fetchPayload = {
       method: 'POST',
@@ -243,20 +261,20 @@ export class Pushy {
     try {
       this.report({
         type: 'checking',
-        message: this.options.appKey + ': ' + body,
+        message: this.options.appKey + ': ' + stringifyBody,
       });
-      resp = await fetch(this.getCheckUrl(), fetchPayload);
+      resp = await enhancedFetch(this.getCheckUrl(), fetchPayload);
     } catch (e: any) {
       this.report({
         type: 'errorChecking',
-        message: 'Can not connect to update server. Trying backup endpoints.',
+        message: `Can not connect to update server: ${e.message}. Trying backup endpoints.`,
       });
       const backupEndpoints = await this.getBackupEndpoints();
       if (backupEndpoints) {
         try {
           resp = await promiseAny(
             backupEndpoints.map(endpoint =>
-              fetch(this.getCheckUrl(endpoint), fetchPayload),
+              enhancedFetch(this.getCheckUrl(endpoint), fetchPayload),
             ),
           );
         } catch (err: any) {
@@ -341,15 +359,28 @@ export class Pushy {
       log(`rolledback hash ${rolledBackVersion}, ignored`);
       return;
     }
-    if (Pushy.downloadedHash === hash) {
+    if (sharedState.downloadedHash === hash) {
-      log(`duplicated downloaded hash ${Pushy.downloadedHash}, ignored`);
+      log(`duplicated downloaded hash ${sharedState.downloadedHash}, ignored`);
-      return Pushy.downloadedHash;
+      return sharedState.downloadedHash;
     }
-    if (Pushy.progressHandlers[hash]) {
+    if (sharedState.progressHandlers[hash]) {
       return;
     }
+    const patchStartTime = Date.now();
     if (onDownloadProgress) {
-      Pushy.progressHandlers[hash] = pushyNativeEventEmitter.addListener(
+      // @ts-expect-error harmony not in existing platforms
+      if (Platform.OS === 'harmony') {
+        sharedState.progressHandlers[hash] = DeviceEventEmitter.addListener(
+          'RCTPushyDownloadProgress',
+          progressData => {
+            if (progressData.hash === hash) {
+              onDownloadProgress(progressData);
+            }
+          },
+        );
+      } else {
+        sharedState.progressHandlers[hash] =
+          pushyNativeEventEmitter.addListener(
             'RCTPushyDownloadProgress',
             progressData => {
               if (progressData.hash === hash) {
@@ -358,11 +389,13 @@ export class Pushy {
             },
           );
       }
+    }
     let succeeded = '';
     this.report({ type: 'downloading' });
     let lastError: any;
+    let errorMessages: string[] = [];
     const diffUrl = await testUrls(joinUrls(paths, diff));
-    if (diffUrl) {
+    if (diffUrl && !__DEV__) {
       log('downloading diff');
       try {
         await PushyModule.downloadPatchFromPpk({
@@ -372,16 +405,15 @@ export class Pushy {
         });
         succeeded = 'diff';
       } catch (e: any) {
-        lastError = e;
+        const errorMessage = `diff error: ${e.message}`;
-        if (__DEV__) {
+        errorMessages.push(errorMessage);
-          succeeded = 'diff';
+        lastError = new Error(errorMessage);
-        } else {
+        log(errorMessage);
-          log(`diff error: ${e.message}, try pdiff`);
-        }
       }
     }
+    if (!succeeded) {
       const pdiffUrl = await testUrls(joinUrls(paths, pdiff));
-    if (!succeeded && pdiffUrl) {
+      if (pdiffUrl && !__DEV__) {
         log('downloading pdiff');
         try {
           await PushyModule.downloadPatchFromPackage({
@@ -390,16 +422,16 @@ export class Pushy {
           });
           succeeded = 'pdiff';
         } catch (e: any) {
-        lastError = e;
+          const errorMessage = `pdiff error: ${e.message}`;
-        if (__DEV__) {
+          errorMessages.push(errorMessage);
-          succeeded = 'pdiff';
+          lastError = new Error(errorMessage);
-        } else {
+          log(errorMessage);
-          log(`pdiff error: ${e.message}, try full patch`);
         }
       }
     }
+    if (!succeeded) {
       const fullUrl = await testUrls(joinUrls(paths, full));
-    if (!succeeded && fullUrl) {
+      if (fullUrl) {
         log('downloading full patch');
         try {
           await PushyModule.downloadFullUpdate({
@@ -408,34 +440,47 @@ export class Pushy {
           });
           succeeded = 'full';
         } catch (e: any) {
-        lastError = e;
+          const errorMessage = `full patch error: ${e.message}`;
-        if (__DEV__) {
+          errorMessages.push(errorMessage);
+          lastError = new Error(errorMessage);
+          log(errorMessage);
+        }
+      } else if (__DEV__) {
+        log(
+          `当前是开发环境，无法执行增量式热更新，重启不会生效。
+          如果需要在开发环境中测试可生效的全量热更新（但也会在再次重启后重新连接 metro），
+          请打开“忽略时间戳”开关再重试。`,
+        );
         succeeded = 'full';
-        } else {
-          log(`full patch error: ${e.message}`);
       }
     }
-    }
+    if (sharedState.progressHandlers[hash]) {
-    if (Pushy.progressHandlers[hash]) {
+      sharedState.progressHandlers[hash].remove();
-      Pushy.progressHandlers[hash].remove();
+      delete sharedState.progressHandlers[hash];
-      delete Pushy.progressHandlers[hash];
-    }
-    if (__DEV__) {
-      return hash;
     }
     if (!succeeded) {
       this.report({
         type: 'errorUpdate',
         data: { newVersion: hash },
+        message: errorMessages.join(';'),
       });
       if (lastError) {
         throw lastError;
       }
       return;
     } else {
+      const duration = Date.now() - patchStartTime;
+      const data: Record<string, any> = {
+        newVersion: hash,
+        diff: succeeded,
+        duration,
+      };
+      if (errorMessages.length > 0) {
+        data.error = errorMessages.join(';');
+      }
       this.report({
         type: 'downloadSuccess',
-        data: { newVersion: hash, diff: succeeded },
+        data,
       });
     }
     log(`downloaded ${succeeded} hash:`, hash);
@@ -444,7 +489,7 @@ export class Pushy {
       description,
       metaInfo,
     });
-    Pushy.downloadedHash = hash;
+    sharedState.downloadedHash = hash;
     return hash;
   };
   downloadAndInstallApk = async (
@@ -454,10 +499,10 @@ export class Pushy {
     if (Platform.OS !== 'android') {
       return;
     }
-    if (Pushy.apkStatus === 'downloading') {
+    if (sharedState.apkStatus === 'downloading') {
       return;
     }
-    if (Pushy.apkStatus === 'downloaded') {
+    if (sharedState.apkStatus === 'downloaded') {
       this.report({ type: 'errorInstallApk' });
       this.throwIfEnabled(new Error('errorInstallApk'));
       return;
@@ -478,14 +523,15 @@ export class Pushy {
         return;
       }
     }
-    Pushy.apkStatus = 'downloading';
+    sharedState.apkStatus = 'downloading';
     this.report({ type: 'downloadingApk' });
     const progressKey = 'downloadingApk';
     if (onDownloadProgress) {
-      if (Pushy.progressHandlers[progressKey]) {
+      if (sharedState.progressHandlers[progressKey]) {
-        Pushy.progressHandlers[progressKey].remove();
+        sharedState.progressHandlers[progressKey].remove();
       }
-      Pushy.progressHandlers[progressKey] = pushyNativeEventEmitter.addListener(
+      sharedState.progressHandlers[progressKey] =
+        pushyNativeEventEmitter.addListener(
           'RCTPushyDownloadProgress',
           (progressData: ProgressData) => {
             if (progressData.hash === progressKey) {
@@ -499,17 +545,24 @@ export class Pushy {
       target: 'update.apk',
       hash: progressKey,
     }).catch(() => {
-      Pushy.apkStatus = null;
+      sharedState.apkStatus = null;
       this.report({ type: 'errorDownloadAndInstallApk' });
       this.throwIfEnabled(new Error('errorDownloadAndInstallApk'));
     });
-    Pushy.apkStatus = 'downloaded';
+    sharedState.apkStatus = 'downloaded';
-    if (Pushy.progressHandlers[progressKey]) {
+    if (sharedState.progressHandlers[progressKey]) {
-      Pushy.progressHandlers[progressKey].remove();
+      sharedState.progressHandlers[progressKey].remove();
-      delete Pushy.progressHandlers[progressKey];
+      delete sharedState.progressHandlers[progressKey];
     }
   };
+  restartApp = async () => {
+    return PushyModule.restartApp();
+  };
 }
 
 // for international users
-export class Cresc extends Pushy {}
+export class Cresc extends Pushy {
+  constructor(options: ClientOptions) {
+    super(options, 'Cresc');
+  }
+}

src/context.ts

@@ -13,6 +13,7 @@ export const defaultContext = {
   dismissError: noop,
   downloadUpdate: asyncNoop,
   downloadAndInstallApk: asyncNoop,
+  restartApp: asyncNoop,
   getCurrentVersionInfo: () => Promise.resolve({}),
   parseTestQrCode: () => false,
   currentHash: '',
@@ -20,7 +21,7 @@ export const defaultContext = {
 };
 
 export const UpdateContext = createContext<{
-  checkUpdate: () => Promise<void>;
+  checkUpdate: () => Promise<void | CheckResult>;
   switchVersion: () => Promise<void>;
   switchVersionLater: () => Promise<void>;
   markSuccess: () => void;
@@ -33,6 +34,7 @@ export const UpdateContext = createContext<{
     metaInfo?: string;
   }>;
   parseTestQrCode: (code: string) => boolean;
+  restartApp: () => Promise<void>;
   currentHash: string;
   packageVersion: string;
   client?: Pushy | Cresc;
@@ -43,6 +45,5 @@ export const UpdateContext = createContext<{
 
 export const useUpdate = () => useContext(UpdateContext);
 
+/** @deprecated Please use `useUpdate` instead */
 export const usePushy = useUpdate;
-
-export const useCresc = useUpdate;