fix 0.77+ bridgeless detection

.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,29 +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"
-      }
-    },
-    "web": {
-      "favicon": "./assets/favicon.png"
-    }
-  }
-}

Example/expoUsePushy/index.js

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

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

Example/expoUsePushy/tsconfig.json

@@ -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/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/entry/src/main/cpp/generated/RNOHGeneratedPackage.h

@@ -1,65 +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.
- *
- * @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,6 +1,5 @@
 import { FileJSBundleProvider } from 'pushy/src/main/ets/FileJSBundleProvider';
-import { ComponentBuilderContext, RNOHCoreContext,RNAbility,
-  MetroJSBundleProvider } from '@rnoh/react-native-openharmony';
+import { ComponentBuilderContext, RNOHCoreContext,RNAbility } from '@rnoh/react-native-openharmony';
 import {
   RNApp,
   AnyJSBundleProvider,
@@ -62,9 +61,8 @@ struct Index {
           },
           jsBundleProvider: new TraceJSBundleProviderDecorator(
             new AnyJSBundleProvider([
-              // local debug mode
-              new MetroJSBundleProvider(),
-              // release mode
+              // 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')
             ]),

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

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

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.43",
     "react": "18.2.0",
     "react-native": "0.72.5",
-    "react-native-update": "^10.26.4"
+    "react-native-update": "file:../../",
+    "@react-native-oh/react-native-harmony": "^0.72.43"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

Example/testHotUpdate/.nvmrc

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

Example/testHotUpdate/bun.lock

@@ -12,7 +12,7 @@
         "react-native-paper": "^5.13.1",
         "react-native-safe-area-context": "^5.3.0",
         "react-native-svg": "^15.11.2",
-        "react-native-update": "^10.26.4",
+        "react-native-update": "^10.26.0",
         "react-native-vector-icons": "^10.2.0",
       },
       "devDependencies": {
@@ -1412,7 +1412,7 @@
 
     "react-native-svg": ["react-native-svg@15.11.2", "", { "dependencies": { "css-select": "^5.1.0", "css-tree": "^1.1.3", "warn-once": "0.1.1" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-+YfF72IbWQUKzCIydlijV1fLuBsQNGMT6Da2kFlo1sh+LE3BIm/2Q7AR1zAAR6L0BFLi1WaQPLfFUC9bNZpOmw=="],
 
-    "react-native-update": ["react-native-update@10.26.4", "", { "dependencies": { "nanoid": "^3.3.3", "react-native-url-polyfill": "^2.0.0" }, "peerDependencies": { "react": ">=16.8.0", "react-native": ">=0.59.0" } }, "sha512-o7R6hOtUYk+pXijdztS0FLrdmg9pNzKagtNZloLBIa0kbPdKgbOgGpu4OLCWyo7v3Bj2mWbX1r1fxtpMHX9/UA=="],
+    "react-native-update": ["react-native-update@10.26.0", "", { "dependencies": { "nanoid": "^3.3.3", "react-native-url-polyfill": "^2.0.0" }, "peerDependencies": { "react": ">=16.8.0", "react-native": ">=0.59.0" } }, "sha512-DHVIeKDx4HiVTtyOFLloLl6fwhuJ71vdVZU6Aw5i989g0s2wltVTo+HW1xqQaRgrJUwV4yOreNxKpStRWnpMXA=="],
 
     "react-native-url-polyfill": ["react-native-url-polyfill@2.0.0", "", { "dependencies": { "whatwg-url-without-unicode": "8.0.0-3" }, "peerDependencies": { "react-native": "*" } }, "sha512-My330Do7/DvKnEvwQc0WdcBnFPploYKp9CYlefDXzIdEaA+PAhDYllkvGeEroEzvc4Kzzj2O4yVdz8v6fjRvhA=="],
 

Example/testHotUpdate/ios/Podfile.lock

@@ -1304,7 +1304,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-update (10.26.4):
+  - react-native-update (10.26.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1318,8 +1318,8 @@ PODS:
     - React-featureflags
     - React-graphics
     - React-ImageManager
-    - react-native-update/HDiffPatch (= 10.26.4)
-    - react-native-update/RCTPushy (= 10.26.4)
+    - react-native-update/HDiffPatch (= 10.26.0)
+    - react-native-update/RCTPushy (= 10.26.0)
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
@@ -1329,7 +1329,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - SSZipArchive
     - Yoga
-  - react-native-update/HDiffPatch (10.26.4):
+  - react-native-update/HDiffPatch (10.26.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1352,7 +1352,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - SSZipArchive
     - Yoga
-  - react-native-update/RCTPushy (10.26.4):
+  - react-native-update/RCTPushy (10.26.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -2015,7 +2015,7 @@ SPEC CHECKSUMS:
   React-Mapbuffer: 3c11cee7737609275c7b66bd0b1de475f094cedf
   React-microtasksnativemodule: 843f352b32aacbe13a9c750190d34df44c3e6c2c
   react-native-safe-area-context: 0f14bce545abcdfbff79ce2e3c78c109f0be283e
-  react-native-update: 7f8b9954150ff2b360fdfd999c20c16c0af2c491
+  react-native-update: ae3d7e91c2ce65a161769fa00e2fb0eb2b26b39e
   React-NativeModulesApple: 88433b6946778bea9c153e27b671de15411bf225
   React-perflogger: 9e8d3c0dc0194eb932162812a168aa5dc662f418
   React-performancetimeline: 5a2d6efef52bdcefac079c7baa30934978acd023

Example/testHotUpdate/package.json

@@ -22,7 +22,7 @@
     "react-native-paper": "^5.13.1",
     "react-native-safe-area-context": "^5.3.0",
     "react-native-svg": "^15.11.2",
-    "react-native-update": "^10.26.4",
+    "react-native-update": "^10.26.0",
     "react-native-vector-icons": "^10.2.0"
   },
   "devDependencies": {
@@ -52,4 +52,4 @@
     "detox",
     "dtrace-provider"
   ]
-}
+}

Example/testHotUpdate/src/index.tsx

@@ -204,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}>
@@ -224,4 +223,4 @@ export default function Root() {
       </PaperProvider>
     </UpdateProvider>
   );
-}
+}

Example/testHotUpdate/update.json

@@ -7,4 +7,4 @@
     "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,6 +41,7 @@ android {
     }
     compileSdkVersion safeExtGet('compileSdkVersion', 28)
     buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
+
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 16)
         targetSdkVersion safeExtGet('targetSdkVersion', 27)
@@ -105,7 +50,6 @@ android {
         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 {

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

@@ -120,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];
@@ -451,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 {

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, 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() {
@@ -40,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");
@@ -63,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() {
@@ -79,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");
@@ -102,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
@@ -176,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
@@ -222,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() {
@@ -232,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() {
@@ -253,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() {
@@ -268,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

@@ -97,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

@@ -224,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");

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/src/main/ets/DownloadTask.ts

@@ -65,13 +65,9 @@ export class DownloadTask {
             0,
             params.targetFile.lastIndexOf('/'),
           );
-          const exists = fileIo.accessSync(targetDir);
-          if(!exists){
-            await fileIo.mkdir(targetDir);
-          }
+          await fileIo.mkdir(targetDir);
         }
       } catch (error) {
-        throw error;
       }
 
       const response = await httpRequest.request(params.url, {
@@ -82,11 +78,12 @@ 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,
@@ -105,12 +102,8 @@ export class DownloadTask {
         this.onProgressUpdate(received, contentLength);
       }
       await fileIo.close(writer);
-      const stats = await fileIo.stat(params.targetFile);
-      const fileSize = stats.size;
-      if (fileSize !== contentLength) {
-        throw new Error(`Download incomplete: expected ${contentLength} bytes but got ${stats.size} bytes`);
-      }
-
+      const stat = await fileIo.stat(params.targetFile);
+      const fileSize = stat.size;
     } catch (error) {
       console.error('Download failed:', error);
       throw error;
@@ -120,7 +113,7 @@ export class DownloadTask {
   }
 
   private onProgressUpdate(received: number, total: number): void {
-    this.eventHub.emit('RCTPushyDownloadProgress', {
+    this.eventHub.emit('downloadProgress', {
       received,
       total,
       hash: this.hash,
@@ -295,8 +288,8 @@ export class DownloadTask {
         }
       }
 
-      if(fn !== '.DS_Store'){
-        await zip.decompressFile(fn, params.unzipDirectory);
+       if(entry.filename !== '.DS_Store'){
+        await zip.decompressFile(entry.filename, params.unzipDirectory);
       }
     }
 
@@ -498,4 +491,4 @@ export class DownloadTask {
       params.listener?.onDownloadFailed(error);
     }
   }
-}
+}

harmony/src/main/ets/EventHub.ts

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

harmony/src/main/ets/PushyTurboModule.ts

@@ -7,7 +7,6 @@ import { BusinessError } from '@ohos.base';
 import logger from './Logger';
 import { UpdateModuleImpl } from './UpdateModuleImpl';
 import { UpdateContext } from './UpdateContext';
-import { EventHub } from './EventHub';
 
 const TAG = "PushyTurboModule"
 
@@ -19,8 +18,9 @@ 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)
-    EventHub.getInstance().setRNInstance(ctx.rnInstance)
+    // rnInstance.emitDeviceEvent("Pushy",{code: err.code, message: err.message});
   }
 
 

harmony/src/main/ets/UpdateContext.ts

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

harmony/src/main/ets/UpdateModuleImpl.ts

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

ios/Expo/ExpoPushyModule.swift

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

ios/Expo/ExpoPushyReactDelegateHandler.swift

@@ -1,40 +0,0 @@
-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,26 +338,6 @@ 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,29 +1,28 @@
 {
   "name": "react-native-update",
-  "version": "10.28.7",
+  "version": "10.26.1",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {
-    "postinstall": "node scripts/check-expo-version.js",
-    "prepack": "bun submodule && bun lint",
+    "prepack": "yarn submodule && yarn 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": "bun submodule && $ANDROID_HOME/ndk/20.1.5948944/ndk-build NDK_PROJECT_PATH=android APP_BUILD_SCRIPT=android/jni/Android.mk NDK_APPLICATION_MK=android/jni/Application.mk NDK_LIBS_OUT=android/lib",
-    "build:ios-debug": "cd Example/testHotUpdate && bun && detox build --configuration ios.sim.debug",
-    "build:ios-release": "cd Example/testHotUpdate && bun && detox build --configuration ios.sim.release",
+    "build-lib": "yarn submodule && $ANDROID_HOME/ndk/20.1.5948944/ndk-build NDK_PROJECT_PATH=android APP_BUILD_SCRIPT=android/jni/Android.mk NDK_APPLICATION_MK=android/jni/Application.mk NDK_LIBS_OUT=android/lib",
+    "build:ios-debug": "cd Example/testHotUpdate && yarn && detox build --configuration ios.sim.debug",
+    "build:ios-release": "cd Example/testHotUpdate && yarn && detox build --configuration ios.sim.release",
     "test:ios-debug": "cd Example/testHotUpdate && detox test --configuration ios.sim.debug",
-    "test:ios-release": "cd Example/testHotUpdate && bun detox test --configuration ios.sim.release",
-    "build:android-debug": "cd Example/testHotUpdate && bun && detox build --configuration android.emu.debug",
-    "build:android-release": "cd Example/testHotUpdate && bun && detox build --configuration android.emu.release",
-    "test:android-release": "cd Example/testHotUpdate && bun detox test --configuration android.emu.release --headless --record-logs all",
+    "test:ios-release": "cd Example/testHotUpdate && yarn detox test --configuration ios.sim.release",
+    "build:android-debug": "cd Example/testHotUpdate && yarn && detox build --configuration android.emu.debug",
+    "build:android-release": "cd Example/testHotUpdate && yarn && detox build --configuration android.emu.release",
+    "test:android-release": "cd Example/testHotUpdate && yarn detox test --configuration android.emu.release --headless --record-logs all",
     "test:android-debug": "cd Example/testHotUpdate && detox test --configuration android.emu.debug --headless --record-logs all",
-    "e2e:ios": "bun build:ios-release && bun test:ios-release",
-    "e2e:android": "bun build:android-release && bun test:android-release",
-    "tests:emulator:prepare": "cd .github/workflows/scripts/functions && bun && bun build",
-    "tests:emulator:start-ci": "bun tests:emulator:prepare && cd ./.github/workflows/scripts && ./start-firebase-emulator.sh",
+    "e2e:ios": "npm run build:ios-release && npm run test:ios-release",
+    "e2e:android": "npm run build:android-release && npm run test:android-release",
+    "tests:emulator:prepare": "cd .github/workflows/scripts/functions && yarn && yarn build",
+    "tests:emulator:start-ci": "yarn tests:emulator:prepare && cd ./.github/workflows/scripts && ./start-firebase-emulator.sh",
     "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 && bun && bun pod-install"
+    "tests:ios:pod:install": "cd Example/testHotUpdate && yarn && yarn pod-install"
   },
   "repository": {
     "type": "git",
@@ -75,6 +74,5 @@
     "react-native": "0.73",
     "ts-jest": "^29.2.5",
     "typescript": "^5.6.3"
-  },
-  "packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
+  }
 }

react-native-update.podspec

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

@@ -1,92 +0,0 @@
-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,7 +15,6 @@ 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

@@ -9,11 +9,7 @@ import {
   promiseAny,
   testUrls,
 } from './utils';
-import {
-  EmitterSubscription,
-  Platform,
-  DeviceEventEmitter,
-} from 'react-native';
+import { EmitterSubscription, Platform } from 'react-native';
 import { PermissionsAndroid } from './permissions';
 import {
   PushyModule,
@@ -26,7 +22,6 @@ import {
   setLocalHashInfo,
   isFirstTime,
   isRolledBack,
-  getCurrentVersionInfo,
 } from './core';
 
 const SERVER_PRESETS = {
@@ -61,31 +56,6 @@ 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;
@@ -93,6 +63,13 @@ 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 = () => {};
@@ -147,7 +124,6 @@ export class Pushy {
     log(type + ' ' + message);
     await this.loggerPromise.promise;
     const { logger = noop, appKey } = this.options;
-    const info = await getCurrentVersionInfo();
     logger({
       type,
       data: {
@@ -157,7 +133,6 @@ export class Pushy {
         packageVersion,
         buildTime,
         message,
-        ...info,
         ...data,
       },
     });
@@ -170,6 +145,16 @@ export class Pushy {
   getCheckUrl = (endpoint: string = this.options.server!.main) => {
     return `${endpoint}/checkUpdate/${this.options.appKey}`;
   };
+  static assertHash = (hash: 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(
@@ -180,10 +165,10 @@ export class Pushy {
     return true;
   };
   markSuccess = () => {
-    if (sharedState.marked || __DEV__ || !isFirstTime) {
+    if (Pushy.marked || __DEV__ || !isFirstTime) {
       return;
     }
-    sharedState.marked = true;
+    Pushy.marked = true;
     PushyModule.markSuccess();
     this.report({ type: 'markSuccess' });
   };
@@ -191,9 +176,9 @@ export class Pushy {
     if (!assertDev('switchVersion()')) {
       return;
     }
-    if (assertHash(hash) && !sharedState.applyingUpdate) {
+    if (Pushy.assertHash(hash) && !Pushy.applyingUpdate) {
       log('switchVersion: ' + hash);
-      sharedState.applyingUpdate = true;
+      Pushy.applyingUpdate = true;
       return PushyModule.reloadUpdate({ hash });
     }
   };
@@ -202,7 +187,7 @@ export class Pushy {
     if (!assertDev('switchVersionLater()')) {
       return;
     }
-    if (assertHash(hash)) {
+    if (Pushy.assertHash(hash)) {
       log('switchVersionLater: ' + hash);
       return PushyModule.setNeedUpdate({ hash });
     }
@@ -357,36 +342,22 @@ export class Pushy {
       log(`rolledback hash ${rolledBackVersion}, ignored`);
       return;
     }
-    if (sharedState.downloadedHash === hash) {
-      log(`duplicated downloaded hash ${sharedState.downloadedHash}, ignored`);
-      return sharedState.downloadedHash;
+    if (Pushy.downloadedHash === hash) {
+      log(`duplicated downloaded hash ${Pushy.downloadedHash}, ignored`);
+      return Pushy.downloadedHash;
     }
-    if (sharedState.progressHandlers[hash]) {
+    if (Pushy.progressHandlers[hash]) {
       return;
     }
-    const patchStartTime = Date.now();
     if (onDownloadProgress) {
-      // @ts-expect-error harmony not in existing platforms
-      if (Platform.OS === 'harmony') {
-        sharedState.progressHandlers[hash] = DeviceEventEmitter.addListener(
-          'RCTPushyDownloadProgress',
-          progressData => {
-            if (progressData.hash === hash) {
-              onDownloadProgress(progressData);
-            }
-          },
-        );
-      } else {
-        sharedState.progressHandlers[hash] =
-          pushyNativeEventEmitter.addListener(
-            'RCTPushyDownloadProgress',
-            progressData => {
-              if (progressData.hash === hash) {
-                onDownloadProgress(progressData);
-              }
-            },
-          );
-      }
+      Pushy.progressHandlers[hash] = pushyNativeEventEmitter.addListener(
+        'RCTPushyDownloadProgress',
+        progressData => {
+          if (progressData.hash === hash) {
+            onDownloadProgress(progressData);
+          }
+        },
+      );
     }
     let succeeded = '';
     this.report({ type: 'downloading' });
@@ -453,9 +424,9 @@ export class Pushy {
         }
       }
     }
-    if (sharedState.progressHandlers[hash]) {
-      sharedState.progressHandlers[hash].remove();
-      delete sharedState.progressHandlers[hash];
+    if (Pushy.progressHandlers[hash]) {
+      Pushy.progressHandlers[hash].remove();
+      delete Pushy.progressHandlers[hash];
     }
     if (__DEV__) {
       return hash;
@@ -471,18 +442,9 @@ export class Pushy {
       }
       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,
+        data: { newVersion: hash, diff: succeeded },
       });
     }
     log(`downloaded ${succeeded} hash:`, hash);
@@ -491,7 +453,7 @@ export class Pushy {
       description,
       metaInfo,
     });
-    sharedState.downloadedHash = hash;
+    Pushy.downloadedHash = hash;
     return hash;
   };
   downloadAndInstallApk = async (
@@ -501,10 +463,10 @@ export class Pushy {
     if (Platform.OS !== 'android') {
       return;
     }
-    if (sharedState.apkStatus === 'downloading') {
+    if (Pushy.apkStatus === 'downloading') {
       return;
     }
-    if (sharedState.apkStatus === 'downloaded') {
+    if (Pushy.apkStatus === 'downloaded') {
       this.report({ type: 'errorInstallApk' });
       this.throwIfEnabled(new Error('errorInstallApk'));
       return;
@@ -525,41 +487,37 @@ export class Pushy {
         return;
       }
     }
-    sharedState.apkStatus = 'downloading';
+    Pushy.apkStatus = 'downloading';
     this.report({ type: 'downloadingApk' });
     const progressKey = 'downloadingApk';
     if (onDownloadProgress) {
-      if (sharedState.progressHandlers[progressKey]) {
-        sharedState.progressHandlers[progressKey].remove();
+      if (Pushy.progressHandlers[progressKey]) {
+        Pushy.progressHandlers[progressKey].remove();
       }
-      sharedState.progressHandlers[progressKey] =
-        pushyNativeEventEmitter.addListener(
-          'RCTPushyDownloadProgress',
-          (progressData: ProgressData) => {
-            if (progressData.hash === progressKey) {
-              onDownloadProgress(progressData);
-            }
-          },
-        );
+      Pushy.progressHandlers[progressKey] = pushyNativeEventEmitter.addListener(
+        'RCTPushyDownloadProgress',
+        (progressData: ProgressData) => {
+          if (progressData.hash === progressKey) {
+            onDownloadProgress(progressData);
+          }
+        },
+      );
     }
     await PushyModule.downloadAndInstallApk({
       url,
       target: 'update.apk',
       hash: progressKey,
     }).catch(() => {
-      sharedState.apkStatus = null;
+      Pushy.apkStatus = null;
       this.report({ type: 'errorDownloadAndInstallApk' });
       this.throwIfEnabled(new Error('errorDownloadAndInstallApk'));
     });
-    sharedState.apkStatus = 'downloaded';
-    if (sharedState.progressHandlers[progressKey]) {
-      sharedState.progressHandlers[progressKey].remove();
-      delete sharedState.progressHandlers[progressKey];
+    Pushy.apkStatus = 'downloaded';
+    if (Pushy.progressHandlers[progressKey]) {
+      Pushy.progressHandlers[progressKey].remove();
+      delete Pushy.progressHandlers[progressKey];
     }
   };
-  restartApp = async () => {
-    return PushyModule.restartApp();
-  };
 }
 
 // for international users

src/context.ts

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

src/index.ts

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

src/provider.tsx

@@ -12,7 +12,7 @@ import {
   Platform,
   Linking,
 } from 'react-native';
-import { Pushy, Cresc, sharedState } from './client';
+import { Pushy, Cresc } from './client';
 import { currentVersion, packageVersion, getCurrentVersionInfo } from './core';
 import { CheckResult, ProgressData, UpdateTestPayload } from './type';
 import { UpdateContext } from './context';
@@ -100,14 +100,6 @@ export const UpdateProvider = ({
           return false;
         }
         stateListener.current && stateListener.current.remove();
-
-        if (
-          options.afterDownloadUpdate &&
-          (await options.afterDownloadUpdate(info)) === false
-        ) {
-          log('afterDownloadUpdate returned false, skipping');
-          return false;
-        }
         if (options.updateStrategy === 'silentAndNow') {
           client.switchVersion(hash);
           return true;
@@ -139,7 +131,13 @@ export const UpdateProvider = ({
         return false;
       }
     },
-    [client, options, alertUpdate, alertError, throwErrorIfEnabled],
+    [
+      client,
+      options.updateStrategy,
+      alertUpdate,
+      alertError,
+      throwErrorIfEnabled,
+    ],
   );
 
   const downloadAndInstallApk = useCallback(
@@ -171,7 +169,7 @@ export const UpdateProvider = ({
         return;
       }
       const rollout = info.config?.rollout?.[packageVersion];
-      if (info.update && rollout) {
+      if (rollout) {
         if (!isInRollout(rollout)) {
           log(`not in ${rollout}% rollout, ignored`);
           return;
@@ -182,15 +180,8 @@ export const UpdateProvider = ({
       updateInfoRef.current = info;
       setUpdateInfo(info);
       if (info.expired) {
-        if (
-          options.onPackageExpired &&
-          (await options.onPackageExpired(info)) === false
-        ) {
-          log('onPackageExpired returned false, skipping');
-          return;
-        }
         const { downloadUrl } = info;
-        if (downloadUrl && sharedState.apkStatus === null) {
+        if (downloadUrl) {
           if (options.updateStrategy === 'silentAndNow') {
             if (Platform.OS === 'android' && downloadUrl.endsWith('.apk')) {
               downloadAndInstallApk(downloadUrl);
@@ -241,7 +232,7 @@ export const UpdateProvider = ({
       client,
       alertError,
       throwErrorIfEnabled,
-      options,
+      options.updateStrategy,
       alertUpdate,
       downloadAndInstallApk,
       downloadUpdate,
@@ -256,9 +247,7 @@ export const UpdateProvider = ({
     }
     const { checkStrategy, dismissErrorAfter, autoMarkSuccess } = options;
     if (autoMarkSuccess) {
-      setTimeout(() => {
-        markSuccess();
-      }, 1000);
+      markSuccess();
     }
     if (checkStrategy === 'both' || checkStrategy === 'onAppResume') {
       stateListener.current = AppState.addEventListener(
@@ -287,7 +276,7 @@ export const UpdateProvider = ({
 
   const parseTestPayload = useCallback(
     (payload: UpdateTestPayload) => {
-      if (payload && payload.type && payload.type.startsWith('__rnPushy')) {
+      if (payload && payload.type && payload.type.startsWith('__rnUpdate')) {
         const logger = options.logger || (() => {});
         options.logger = ({ type, data }) => {
           logger({ type, data });
@@ -323,10 +312,6 @@ export const UpdateProvider = ({
     [parseTestPayload],
   );
 
-  const restartApp = useCallback(async () => {
-    return client.restartApp();
-  }, [client]);
-
   useEffect(() => {
     const parseLinking = (url: string | null) => {
       if (!url) {
@@ -372,12 +357,10 @@ export const UpdateProvider = ({
         downloadAndInstallApk,
         getCurrentVersionInfo,
         parseTestQrCode,
-        restartApp,
       }}>
       {children}
     </UpdateContext.Provider>
   );
 };
 
-/** @deprecated Please use `UpdateProvider` instead */
 export const PushyProvider = UpdateProvider;

src/type.ts

@@ -54,9 +54,6 @@ export interface EventData {
   message?: string;
   rolledBackVersion?: string;
   newVersion?: string;
-  name?: string;
-  description?: string;
-  metaInfo?: string;
   [key: string]: any;
 }
 
@@ -91,8 +88,6 @@ export interface ClientOptions {
   throwError?: boolean;
   beforeCheckUpdate?: () => Promise<boolean>;
   beforeDownloadUpdate?: (info: CheckResult) => Promise<boolean>;
-  afterDownloadUpdate?: (info: CheckResult) => Promise<boolean>;
-  onPackageExpired?: (info: CheckResult) => Promise<boolean>;
 }
 
 export interface UpdateTestPayload {

src/utils.ts

@@ -49,20 +49,20 @@ const ping =
                 return url;
               }
               log('ping failed', url, status, statusText);
-              throw new Error('Ping failed');
+              return null;
             })
             .catch(e => {
               pingFinished = true;
               log('ping error', url, e);
-              throw e;
+              return null;
             }),
-          new Promise((_, reject) =>
+          new Promise(r =>
             setTimeout(() => {
-              reject(new Error('Ping timeout'));
+              r(null);
               if (!pingFinished) {
                 log('ping timeout', url);
               }
-            }, 5000),
+            }, 2000),
           ),
         ]);
       };
@@ -77,14 +77,10 @@ export const testUrls = async (urls?: string[]) => {
   if (!urls?.length) {
     return null;
   }
-
-  try {
-    const ret = await promiseAny(urls.map(ping));
-    if (ret) {
-      log('ping success, use url:', ret);
-      return ret;
-    }
-  } catch {}
+  const ret = await promiseAny(urls.map(ping));
+  if (ret) {
+    return ret;
+  }
   log('all ping failed, use first url:', urls[0]);
   return urls[0];
 };