cleanup

* add expoUsePushy demo

* update

.npmignore

@@ -6,6 +6,7 @@
 Example
 android/build
 .vscode
+.github/
 
 # OSX
 #
@@ -51,4 +52,6 @@ domains.json
 endpoints.json
 endpoints_cresc.json
 
-tea.yaml
+tea.yaml
+
+e2e/

.yarnrc.yml

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

Example/expoUsePushy/.gitignore

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

Example/expoUsePushy/App.tsx

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

Example/expoUsePushy/TestConsole.js

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

Example/expoUsePushy/app.json

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

Example/expoUsePushy/index.js

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

Example/expoUsePushy/package.json

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

Example/expoUsePushy/tsconfig.json

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

Example/expoUsePushy/update.json

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

android/build.gradle

@@ -22,21 +22,49 @@ def supportsNamespace() {
   return major >= 8
 }
 
-def isExpoProject() {
+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)
-        hasExpoDependency = (packageJson.dependencies?.expo != null) || 
-                           (packageJson.devDependencies?.expo != null)
+        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
     }
     
-    return hasExpoModulesCore || hasExpoDependency
+    def isExpo = hasExpoModulesCore && hasExpoDependency
+    
+    // Return a map containing both pieces of information
+    return [isExpo: isExpo, version: projectVersion]
 }
 
-def expoProject = isExpoProject()
+// 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()) {
@@ -45,16 +73,16 @@ if (isNewArchitectureEnabled()) {
 
 if (expoProject) {
     group = 'expo.modules.pushy'
-    version = '1.0.0'
+    version = projectVersion
 
     def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
     apply from: expoModulesCorePlugin
     applyKotlinExpoModulesCorePlugin()
-    useCoreDependencies()
     useExpoPublishing()
+    useCoreDependencies()
 } else {
     group = 'cn.reactnative.modules.update'
-    version = '1.0.0'
+    version = projectVersion
 }
 
 android {

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

@@ -120,14 +120,13 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
     }
 
     @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];
@@ -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) {

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
@@ -176,7 +176,7 @@ public class UpdateModuleImpl {
         });
     }
 
-    public static void restartApp(final ReactApplicationContext mContext, Promise promise) {
+    public static void restartApp(final ReactApplicationContext mContext, final Promise promise) {
           UiThreadUtil.runOnUiThread(new Runnable() {
               @Override
               public void run() {
@@ -206,7 +206,7 @@ public class UpdateModuleImpl {
           });
       }
 
-    public static void setNeedUpdate(UpdateContext updateContext, ReadableMap options, Promise promise) {
+    public static void setNeedUpdate(final UpdateContext updateContext, final ReadableMap options, final Promise promise) {
         final String hash = options.getString("hash");
         UiThreadUtil.runOnUiThread(new Runnable() {
             @Override
@@ -222,7 +222,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() {
@@ -232,7 +232,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() {
@@ -253,7 +253,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() {
@@ -268,7 +268,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);

package.json

@@ -1,28 +1,29 @@
 {
   "name": "react-native-update",
-  "version": "10.28.3",
+  "version": "10.28.6",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {
-    "prepack": "yarn submodule && yarn lint",
+    "postinstall": "node scripts/check-expo-version.js",
+    "prepack": "bun submodule && bun lint",
     "lint": "eslint \"src/*.@(ts|tsx|js|jsx)\" && tsc --noEmit",
     "submodule": "git submodule update --init --recursive",
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build-lib": "yarn submodule && $ANDROID_HOME/ndk/20.1.5948944/ndk-build NDK_PROJECT_PATH=android APP_BUILD_SCRIPT=android/jni/Android.mk NDK_APPLICATION_MK=android/jni/Application.mk NDK_LIBS_OUT=android/lib",
-    "build:ios-debug": "cd Example/testHotUpdate && yarn && detox build --configuration ios.sim.debug",
-    "build:ios-release": "cd Example/testHotUpdate && yarn && detox build --configuration ios.sim.release",
+    "build-lib": "bun submodule && $ANDROID_HOME/ndk/20.1.5948944/ndk-build NDK_PROJECT_PATH=android APP_BUILD_SCRIPT=android/jni/Android.mk NDK_APPLICATION_MK=android/jni/Application.mk NDK_LIBS_OUT=android/lib",
+    "build:ios-debug": "cd Example/testHotUpdate && bun && detox build --configuration ios.sim.debug",
+    "build:ios-release": "cd Example/testHotUpdate && bun && detox build --configuration ios.sim.release",
     "test:ios-debug": "cd Example/testHotUpdate && detox test --configuration ios.sim.debug",
-    "test:ios-release": "cd Example/testHotUpdate && yarn detox test --configuration ios.sim.release",
-    "build:android-debug": "cd Example/testHotUpdate && yarn && detox build --configuration android.emu.debug",
-    "build:android-release": "cd Example/testHotUpdate && yarn && detox build --configuration android.emu.release",
-    "test:android-release": "cd Example/testHotUpdate && yarn detox test --configuration android.emu.release --headless --record-logs all",
+    "test:ios-release": "cd Example/testHotUpdate && bun detox test --configuration ios.sim.release",
+    "build:android-debug": "cd Example/testHotUpdate && bun && detox build --configuration android.emu.debug",
+    "build:android-release": "cd Example/testHotUpdate && bun && detox build --configuration android.emu.release",
+    "test:android-release": "cd Example/testHotUpdate && bun detox test --configuration android.emu.release --headless --record-logs all",
     "test:android-debug": "cd Example/testHotUpdate && detox test --configuration android.emu.debug --headless --record-logs all",
-    "e2e:ios": "npm run build:ios-release && npm run test:ios-release",
-    "e2e:android": "npm run build:android-release && npm run test:android-release",
-    "tests:emulator:prepare": "cd .github/workflows/scripts/functions && yarn && yarn build",
-    "tests:emulator:start-ci": "yarn tests:emulator:prepare && cd ./.github/workflows/scripts && ./start-firebase-emulator.sh",
+    "e2e:ios": "bun build:ios-release && bun test:ios-release",
+    "e2e:android": "bun build:android-release && bun test:android-release",
+    "tests:emulator:prepare": "cd .github/workflows/scripts/functions && bun && bun build",
+    "tests:emulator:start-ci": "bun tests:emulator:prepare && cd ./.github/workflows/scripts && ./start-firebase-emulator.sh",
     "tests:packager:jet-ci": "cd Example/testHotUpdate && cross-env TMPDIR=$HOME/.metro REACT_DEBUGGER=\"echo nope\" node_modules/.bin/react-native start --no-interactive",
-    "tests:ios:pod:install": "cd Example/testHotUpdate && yarn && yarn pod-install"
+    "tests:ios:pod:install": "cd Example/testHotUpdate && bun && bun pod-install"
   },
   "repository": {
     "type": "git",
@@ -74,6 +75,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,13 +1,41 @@
 require 'json'
 require 'rubygems' # Required for version comparison
 
+
 new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
-
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
-
 podspec_dir = File.dirname(__FILE__)
 
 Pod::Spec.new do |s|
+
+  is_expo_in_podfile = false
+  is_version_sufficient = false
+  begin
+    # Check Podfile for use_expo_modules!
+    podfile_path = File.join(Pod::Config.instance.installation_root, 'Podfile')
+    if File.exist?(podfile_path)
+      podfile_content = File.read(podfile_path)
+      is_expo_in_podfile = podfile_content.include?('use_expo_modules!')
+    end
+    # Check root package.json for Expo version >= 50
+    root_package_json_path = File.join(podspec_dir, '..', '..', 'package.json')
+    if File.exist?(root_package_json_path)
+        pkg_json = JSON.parse(File.read(root_package_json_path))
+        expo_version_string = pkg_json['dependencies']&.[]('expo') || pkg_json['devDependencies']&.[]('expo')
+        if expo_version_string
+          match = expo_version_string.match(/\d+/)
+          if match
+            major_version = match[0].to_i
+            is_version_sufficient = major_version >= 50
+          end
+        end
+    end
+  rescue => e
+     # Silently ignore errors during check
+  end
+  # Determine final validity
+  valid_expo_project = is_expo_in_podfile && is_version_sufficient
+
   s.name         = package['name']
   s.version      = package['version']
   s.summary      = package['description']
@@ -20,7 +48,14 @@ 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}' }
-  s.source_files    = Dir.glob("ios/**/*.{h,m,mm,swift}").reject { |f| f.start_with?("ios/Expo/") }
+
+  # 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 = { 
@@ -34,51 +69,14 @@ Pod::Spec.new do |s|
   s.dependency "React-Core"
   s.dependency 'SSZipArchive'
 
-  is_expo_project = false
-  expo_dependency_added = false
-  supports_bundle_url_final = false
-
-  # Use CocoaPods mechanism to find Podfile
-  begin
-    podfile_path = File.join(Pod::Config.instance.installation_root, 'Podfile')
-    if File.exist?(podfile_path)
-      podfile_content = File.read(podfile_path)
-      is_expo_project = podfile_content.include?('use_expo_modules!')
-    end
-  rescue
-    # Silently skip if CocoaPods config is not available
-  end
-
-  if is_expo_project
+  # Conditionally add Expo dependency
+  if valid_expo_project
     s.dependency 'ExpoModulesCore'
-    expo_dependency_added = true
-
-    # Current directory is in node_modules/react-native-update, so parent is node_modules
-    expo_core_package_json_path = File.join(__dir__, '..', 'expo-modules-core', 'package.json')
-
-    if File.exist?(expo_core_package_json_path)
-      begin
-        core_package_json = JSON.parse(File.read(expo_core_package_json_path))
-        installed_version_str = core_package_json['version']
-
-        if installed_version_str
-          begin
-            installed_version = Gem::Version.new(installed_version_str)
-            target_version = Gem::Version.new('1.12.0')
-            supports_bundle_url_final = installed_version >= target_version
-          rescue ArgumentError
-            # Silently skip version parsing errors
-          end
-        end
-      rescue JSON::ParserError, StandardError
-        # Silently skip file reading and parsing errors
-      end
-    end
   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|
@@ -91,7 +89,25 @@ Pod::Spec.new do |s|
     ss.public_header_files = 'ios/RCTPushy/HDiffPatch/**/*.h'
   end
 
-  if expo_dependency_added
+  # 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

scripts/check-expo-version.js

@@ -0,0 +1,85 @@
+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();