1
0
mirror of https://gitcode.com/gh_mirrors/re/react-native-pushy.git synced 2025-11-22 23:46:10 +08:00
Code Issues Packages Projects Releases Wiki Activity GitHub Gitee

Compare commits

..

57 Commits

Author SHA1 Message Date
sunnylqm
9d51128ed3 Update react-native-update to version 10.31.2 in package.json and enhance currentVersionInfo retrieval in RCTPushy.mm for improved data handling. 2025-09-19 14:50:13 +08:00
sunnylqm
eddb072927 Update Podfile.lock to reflect react-native-update version 10.31.1, ensuring consistency with package dependencies. 2025-09-19 14:42:29 +08:00
sunnylqm
4f9417d620 Update react-native-update to version 10.31.1 in package.json and bun.lock for improved stability and features. 2025-09-19 14:41:52 +08:00
sunnylqm
6f2314d3c9 Update version to 10.31.1, enhance iOS Info.plist with camera and photo library usage descriptions, and refactor code for improved readability in index.tsx. Adjust currentVersionInfo retrieval in RCTPushy.mm for better data handling. 2025-09-19 14:31:07 +08:00
sunnylqm
a6e9ece559 bump 10.31.0 2025-09-17 21:46:28 +08:00
sunnylqm
78430e2ec2 support 0.81 android 2025-09-17 16:36:15 +08:00
sunnylqm
ec5b9e1938 Update dependencies and versioning: bump react-native-update to 10.31.0-beta.3, update form-data and react-native-camera-kit versions, and enhance TypeScript types for better compatibility. 2025-09-17 11:25:51 +08:00
sunnylqm
53dfb45ca2 Update Android build configuration: change React Native architectures and bump version name to 1.81.4 2025-09-17 10:22:04 +08:00
sunnylqm
4a62e89c73 Update gradle-wrapper.jar to the latest version 2025-09-17 10:07:30 +08:00
sunnylqm
655f4c8cf5 update to 0.81.4 2025-09-16 16:56:49 +08:00
sunnylqm
3732c196a1 Implement localized message for disabled incremental hot update in development environment 2025-09-16 12:51:02 +08:00
sunnylqm
bfb520bd07 add currentversioninfo 2025-09-15 23:46:19 +08:00
sunnylqm
f7be8a4d71 Update dependencies in package.json and bun.lock, enhance .gitignore to exclude mcp.json, and refactor provider and utils for improved web support. 2025-09-12 23:28:27 +08:00
sunnylqm
4383a66274 update TypeScript configuration to exclude additional directories: harmony and Example 2025-09-12 00:32:36 +08:00
sunny.ll
a82b75f51f bump version to 10.31.0-beta.1, update TypeScript configuration to include .ts and .tsx files, and initialize stateListener with undefined 2025-09-10 23:07:33 +08:00
sunnylqm
584f698329 bump version to 10.31.0-beta.0 and integrate i18n for improved localization support 2025-09-04 10:24:52 +08:00
sunnylqm
e58903a634 support multiple versions 2025-09-04 00:24:35 +08:00
sunnylqm
41e1028b2d fix first reload 2025-09-03 13:58:57 +08:00
sunnylqm
11d40ce5f2 bump version to 10.30.3 and remove unnecessary code in RCTPushy.mm 2025-09-01 17:03:20 +08:00
sunnylqm
4a1d4d5a50 bump version to 10.30.2 and improve error handling in enhancedFetch function 2025-08-30 11:53:52 +08:00
sunnylqm
02517a9eb0 bump version to 10.30.1 and enhance error handling in enhancedFetch function 2025-08-30 11:14:01 +08:00
sunnylqm
f7309f699f update version to 10.30.0, enhance version and build time tracking in UpdateContext and RCTPushy, and add new entry to .gitignore 2025-08-28 18:45:00 +08:00
sunnylqm
a224113998 bump version to 10.29.9 2025-08-28 14:35:18 +08:00
sunnylqm
f2ede92ea1 add debug resolution for markSuccess method in RCTPushy 2025-08-28 14:33:36 +08:00
sunnylqm
a913e8c10e bump version to 10.29.8 and include new version data in downloading report 2025-08-25 17:18:59 +08:00
sunnylqm
c5f458291a update welcome message in App component and add overridePackageVersion option to ClientOptions 2025-08-22 16:39:33 +08:00
sunnylqm
9699632a43 remove deprecated endpoint from endpoints.json 2025-07-27 10:32:24 +08:00
sunnylqm
80e42f5dba bump version to 10.29.7 and add error handling for hdiffFileAtPath in RCTPushy 2025-07-21 20:57:16 +08:00
sunnylqm
9b718b8f75 support expo 53 2025-06-29 11:52:05 +08:00
sunnylqm
99e3431844 simplify subspec 2025-06-29 00:20:22 +08:00
sunnylqm
d7b5562ab7 improve iOS reload handling 2025-06-28 21:40:06 +08:00
sunnylqm
6a0a5b2d49 fix ios reload 2025-06-27 23:23:59 +08:00
Sunny Luo
7023ff57ca bump 10.29.4 2025-06-25 15:23:08 +08:00
波仔糕
17e21d79cf fix harmony image assets load fail issue (#505)
* modify harmony download logic to async

* fix harmony image assets load fail issue
2025-06-25 15:22:47 +08:00
Sunny Luo
1cab582bd0 Update package.json 2025-06-17 22:29:46 +08:00
波仔糕
7da5a165fd modify harmony download logic to async (#502) 2025-06-17 22:29:28 +08:00
sunnylqm
d5194a1ad1 bump version to 10.29.2 and add delayed execution for clearing first-time and rollback marks in UpdateModule 2025-06-16 12:00:19 +08:00
sunnylqm
ebc9b97e70 fix proguard 2025-06-14 23:34:54 +08:00
sunnylqm
40742e16d8 fix expo reload 2025-06-05 16:04:35 +08:00
sunnylqm
598ae1a506 bump example rn 0.79.2 2025-06-05 14:48:18 +08:00
sunnylqm
e5424591d1 fallback for all 2025-05-21 11:46:40 +08:00
sunnylqm
2cf7336b6a add fallback for android <= 7.0 2025-05-21 11:12:01 +08:00
Sunny Luo
7eac48ab5d 更新 package.json 2025-05-12 14:24:17 +08:00
波仔糕
18d9b75545 update pushy reference method (#499)
* update pushy reference method

* update
2025-05-12 14:23:45 +08:00
sunnylqm
e8ec85c65f cleanup 2025-05-01 20:25:26 +08:00
sunnylqm
48a776d506 cleanup expo android config 2025-04-30 15:50:07 +08:00
Sunny Luo
8ad526148f 更新 package.json 2025-04-30 14:12:16 +08:00
波仔糕
cea39f1746 fix FileJSBundleProvider conflict issue (#496)
* fix FileJSBundleProvider conflics issue

* udpate
2025-04-30 14:11:50 +08:00
sunnylqm
aa56c2ec0f improve podspec detection 2025-04-30 11:56:58 +08:00
sunnylqm
00a989d567 do not specify ios platform version 2025-04-29 22:01:45 +08:00
sunnylqm
83ca3a6c05 update deps 2025-04-26 23:09:23 +08:00
sunnylqm
257f2697e0 skip postinstall during dev/publish 2025-04-26 22:52:32 +08:00
sunnylqm
77aa345f11 cleanup 2025-04-26 21:57:58 +08:00
sunnylqm
66332d007a cleanup 2025-04-26 21:54:12 +08:00
波仔糕
37849b1730 add expoUsePushy demo (#495)
* add expoUsePushy demo

* update
2025-04-26 21:36:02 +08:00
sunnylqm
c771672fcd support static linking 2025-04-24 22:04:47 +08:00
sunnylqm
2978454298 disable expo autolink if sdk < 50 2025-04-17 09:42:37 +08:00
102 changed files with 6187 additions and 9427 deletions

1
.gitignore vendored
View File

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

View File

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

View File

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

36
Example/expoUsePushy/.gitignore vendored Normal file
View File

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

View File

@@ -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>
);
}

View File

@@ -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',
},
});

View File

@@ -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"
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 696 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

File diff suppressed because it is too large Load Diff

View File

@@ -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);

View File

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

View File

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

View File

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

View File

@@ -4,7 +4,7 @@
"": { "": {
"name": "harmony_use_pushy", "name": "harmony_use_pushy",
"dependencies": { "dependencies": {
"@react-native-oh/react-native-harmony": "^0.72.43", "@react-native-oh/react-native-harmony": "^0.72.59",
"react": "18.2.0", "react": "18.2.0",
"react-native": "0.72.5", "react-native": "0.72.5",
"react-native-update": "^10.26.4", "react-native-update": "^10.26.4",

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
import { FileJSBundleProvider } from 'pushy/src/main/ets/FileJSBundleProvider'; import { PushyFileJSBundleProvider } from 'pushy/src/main/ets/PushyFileJSBundleProvider';
import { ComponentBuilderContext, RNOHCoreContext,RNAbility, import { ComponentBuilderContext, RNOHCoreContext,RNAbility,
MetroJSBundleProvider } from '@rnoh/react-native-openharmony'; MetroJSBundleProvider } from '@rnoh/react-native-openharmony';
import { import {
@@ -65,7 +65,7 @@ struct Index {
// local debug mode // local debug mode
new MetroJSBundleProvider(), new MetroJSBundleProvider(),
// release mode // release mode
new FileJSBundleProvider(this.rnohCoreContext.uiAbilityContext), new PushyFileJSBundleProvider(this.rnohCoreContext.uiAbilityContext),
new ResourceJSBundleProvider(this.rnohCoreContext.uiAbilityContext.resourceManager, 'bundle.harmony.js') new ResourceJSBundleProvider(this.rnohCoreContext.uiAbilityContext.resourceManager, 'bundle.harmony.js')
]), ]),
this.rnohCoreContext.logger), this.rnohCoreContext.logger),

View File

@@ -1,4 +1,4 @@
{ {
"pushy_build_time": "2025-04-12T11:12:43.423Z", "pushy_build_time": "2025-04-30T02:46:33.340Z",
"versionName": "1.0.0" "versionName": "1.0.0"
} }

View File

@@ -15,10 +15,10 @@
"hash": "pushy hash /Users/yanbo.he/Desktop/HarmonyOS/react-native-pushy/Example/harmony_use_pushy/.pushy/output/harmony.1735048297258.ppk" "hash": "pushy hash /Users/yanbo.he/Desktop/HarmonyOS/react-native-pushy/Example/harmony_use_pushy/.pushy/output/harmony.1735048297258.ppk"
}, },
"dependencies": { "dependencies": {
"@react-native-oh/react-native-harmony": "^0.72.43", "@react-native-oh/react-native-harmony": "^0.72.59",
"react": "18.2.0", "react": "18.2.0",
"react-native": "0.72.5", "react-native": "0.72.5",
"react-native-update": "^10.26.4" "react-native-update": "latest"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.20.0", "@babel/core": "^7.20.0",

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

@@ -22,21 +22,49 @@ def supportsNamespace() {
return major >= 8 return major >= 8
} }
def isExpoProject() { def checkProjectInfo() {
def hasExpoModulesCore = rootProject.subprojects.any { it.name == 'expo-modules-core' } def hasExpoModulesCore = rootProject.subprojects.any { it.name == 'expo-modules-core' }
def packageJsonFile = new File(rootProject.projectDir.parentFile, 'package.json') def packageJsonFile = new File(rootProject.projectDir.parentFile, 'package.json')
def hasExpoDependency = false def hasExpoDependency = false
def projectVersion = '1.0.0' // Default version
if (packageJsonFile.exists()) { if (packageJsonFile.exists()) {
def packageJson = new groovy.json.JsonSlurper().parseText(packageJsonFile.text) def packageJson = new groovy.json.JsonSlurper().parseText(packageJsonFile.text)
hasExpoDependency = (packageJson.dependencies?.expo != null) || projectVersion = packageJson.version ?: '1.0.0' // Get project version
(packageJson.devDependencies?.expo != null)
// 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' apply plugin: 'com.android.library'
if (isNewArchitectureEnabled()) { if (isNewArchitectureEnabled()) {
@@ -45,16 +73,16 @@ if (isNewArchitectureEnabled()) {
if (expoProject) { if (expoProject) {
group = 'expo.modules.pushy' group = 'expo.modules.pushy'
version = '1.0.0' version = projectVersion
def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle") def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
apply from: expoModulesCorePlugin apply from: expoModulesCorePlugin
applyKotlinExpoModulesCorePlugin() applyKotlinExpoModulesCorePlugin()
// useExpoPublishing()
useCoreDependencies() useCoreDependencies()
useExpoPublishing()
} else { } else {
group = 'cn.reactnative.modules.update' group = 'cn.reactnative.modules.update'
version = '1.0.0' version = projectVersion
} }
android { android {
@@ -73,7 +101,7 @@ android {
minSdkVersion safeExtGet('minSdkVersion', 16) minSdkVersion safeExtGet('minSdkVersion', 16)
targetSdkVersion safeExtGet('targetSdkVersion', 27) targetSdkVersion safeExtGet('targetSdkVersion', 27)
versionCode 1 versionCode 1
versionName "1.0" versionName "1.81.4"
consumerProguardFiles "proguard.pro" consumerProguardFiles "proguard.pro"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
} }
@@ -120,7 +148,6 @@ repositories {
dependencies { dependencies {
implementation 'com.facebook.react:react-native:+' implementation 'com.facebook.react:react-native:+'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.0' implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
implementation 'com.jakewharton:process-phoenix:3.0.0'
} }
if (isNewArchitectureEnabled()) { if (isNewArchitectureEnabled()) {
react { react {

36
android/proguard.pro vendored
View File

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

View File

@@ -36,10 +36,28 @@ public class UpdateContext {
this.sp = context.getSharedPreferences("update", Context.MODE_PRIVATE); this.sp = context.getSharedPreferences("update", Context.MODE_PRIVATE);
String packageVersion = getPackageVersion(); String packageVersion = getPackageVersion();
if (!packageVersion.equals(this.sp.getString("packageVersion", null))) { String buildTime = getBuildTime();
String storedPackageVersion = this.sp.getString("packageVersion", null);
String storedBuildTime = this.sp.getString("buildTime", null);
// If stored versions don't exist, write current versions first
if (storedPackageVersion == null || storedBuildTime == null) {
SharedPreferences.Editor editor = sp.edit();
editor.putString("packageVersion", packageVersion);
editor.putString("buildTime", buildTime);
editor.apply();
storedPackageVersion = packageVersion;
storedBuildTime = buildTime;
}
boolean packageVersionChanged = !packageVersion.equals(storedPackageVersion);
boolean buildTimeChanged = !buildTime.equals(storedBuildTime);
if (packageVersionChanged || buildTimeChanged) {
SharedPreferences.Editor editor = sp.edit(); SharedPreferences.Editor editor = sp.edit();
editor.clear(); editor.clear();
editor.putString("packageVersion", packageVersion); editor.putString("packageVersion", packageVersion);
editor.putString("buildTime", buildTime);
editor.apply(); editor.apply();
this.cleanUp(); this.cleanUp();
@@ -169,17 +187,19 @@ public class UpdateContext {
} }
public void markSuccess() { public void markSuccess() {
SharedPreferences.Editor editor = sp.edit(); if (!BuildConfig.DEBUG) {
editor.putBoolean("firstTimeOk", true); SharedPreferences.Editor editor = sp.edit();
String lastVersion = sp.getString("lastVersion", null); editor.putBoolean("firstTimeOk", true);
String curVersion = sp.getString("currentVersion", null); String lastVersion = sp.getString("lastVersion", null);
if (lastVersion != null && !lastVersion.equals(curVersion)) { String curVersion = sp.getString("currentVersion", null);
editor.remove("lastVersion"); if (lastVersion != null && !lastVersion.equals(curVersion)) {
editor.remove("hash_" + lastVersion); editor.remove("lastVersion");
} editor.remove("hash_" + lastVersion);
editor.apply(); }
editor.apply();
this.cleanUp(); this.cleanUp();
}
} }
public void clearFirstTime() { public void clearFirstTime() {

View File

@@ -23,6 +23,38 @@ import java.util.Map;
public class UpdateModuleImpl { public class UpdateModuleImpl {
public static final String NAME = "Pushy"; public static final String NAME = "Pushy";
/**
* 获取字段的兼容性方法尝试带m前缀和不带m前缀的字段名
* @param clazz 目标类
* @param fieldName 基础字段名不带m前缀
* @return 找到的字段对象
* @throws NoSuchFieldException 如果两种命名都找不到字段
*/
private static Field getCompatibleField(Class<?> clazz, String fieldName) throws NoSuchFieldException {
// 首先尝试带m前缀的字段名
try {
return clazz.getDeclaredField("m" + capitalize(fieldName));
} catch (NoSuchFieldException e) {
// 如果找不到带m前缀的尝试不带m前缀的
try {
return clazz.getDeclaredField(fieldName);
} catch (NoSuchFieldException e2) {
// 如果都找不到,抛出异常并包含两种尝试的信息
throw new NoSuchFieldException("Field not found with either name: m" + capitalize(fieldName) + " or " + fieldName);
}
}
}
/**
* 首字母大写的辅助方法
*/
private static String capitalize(String str) {
if (str == null || str.length() == 0) {
return str;
}
return str.substring(0, 1).toUpperCase() + str.substring(1);
}
public static void downloadFullUpdate(UpdateContext updateContext, final ReadableMap options, final Promise promise) { public static void downloadFullUpdate(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
String url = options.getString("updateUrl"); String url = options.getString("updateUrl");
@@ -143,17 +175,26 @@ public class UpdateModuleImpl {
ReactDelegate reactDelegate = (ReactDelegate) ReactDelegate reactDelegate = (ReactDelegate)
getReactDelegateMethod.invoke(currentActivity); getReactDelegateMethod.invoke(currentActivity);
Field reactHostField = ReactDelegate.class.getDeclaredField("mReactHost"); Field reactHostField = getCompatibleField(ReactDelegate.class, "reactHost");
reactHostField.setAccessible(true); reactHostField.setAccessible(true);
Object reactHost = reactHostField.get(reactDelegate); Object reactHost = reactHostField.get(reactDelegate);
// Access the mReactHostDelegate field Field devSupport = getCompatibleField(reactHost.getClass(), "useDevSupport");
Field reactHostDelegateField = reactHost.getClass().getDeclaredField("mReactHostDelegate"); devSupport.setAccessible(true);
devSupport.set(reactHost, false);
// Access the ReactHostDelegate field (compatible with mReactHostDelegate/reactHostDelegate)
Field reactHostDelegateField = getCompatibleField(reactHost.getClass(), "reactHostDelegate");
reactHostDelegateField.setAccessible(true); reactHostDelegateField.setAccessible(true);
Object reactHostDelegate = reactHostDelegateField.get(reactHost); Object reactHostDelegate = reactHostDelegateField.get(reactHost);
String bundleFieldName = "jsBundleLoader";
if (reactHostDelegate.getClass().getCanonicalName().equals("expo.modules.ExpoReactHostFactory.ExpoReactHostDelegate")) {
bundleFieldName = "_jsBundleLoader";
}
// Modify the jsBundleLoader field // Modify the jsBundleLoader field
Field jsBundleLoaderField = reactHostDelegate.getClass().getDeclaredField("jsBundleLoader"); Field jsBundleLoaderField = reactHostDelegate.getClass().getDeclaredField(bundleFieldName);
jsBundleLoaderField.setAccessible(true); jsBundleLoaderField.setAccessible(true);
jsBundleLoaderField.set(reactHostDelegate, loader); jsBundleLoaderField.set(reactHostDelegate, loader);

View File

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

View File

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

610
bun.lock Executable file → Normal file

File diff suppressed because it is too large Load Diff

View File

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

View File

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

BIN
harmony/pushy.har Normal file

Binary file not shown.

View File

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

View File

@@ -3,7 +3,7 @@ import fileIo from '@ohos.file.fs';
import common from '@ohos.app.ability.common'; import common from '@ohos.app.ability.common';
import { UpdateContext } from './UpdateContext'; import { UpdateContext } from './UpdateContext';
export class FileJSBundleProvider extends JSBundleProvider { export class PushyFileJSBundleProvider extends JSBundleProvider {
private updateContext: UpdateContext; private updateContext: UpdateContext;
private filePath: string = '' private filePath: string = ''
@@ -12,7 +12,7 @@ export class FileJSBundleProvider extends JSBundleProvider {
this.updateContext = new UpdateContext(context); this.updateContext = new UpdateContext(context);
} }
getURL(): string { getURL(): string {
return this.updateContext.getBundleUrl(); return this.updateContext.getBundleUrl().substring(1);
} }
async getBundle(): Promise<ArrayBuffer> { async getBundle(): Promise<ArrayBuffer> {

View File

@@ -32,6 +32,7 @@ getConstants(): Object {
const rolledBackVersion = preferencesManager.getSync("rolledBackVersion", "") as string; const rolledBackVersion = preferencesManager.getSync("rolledBackVersion", "") as string;
const uuid = preferencesManager.getSync("uuid", "") as string; const uuid = preferencesManager.getSync("uuid", "") as string;
const currentVersion = preferencesManager.getSync("currentVersion", "") as string; const currentVersion = preferencesManager.getSync("currentVersion", "") as string;
const currentVersionInfo = this.context.getKv(`hash_${currentVersion}`);
const buildTime = preferencesManager.getSync("buildTime", "") as string; const buildTime = preferencesManager.getSync("buildTime", "") as string;
const isUsingBundleUrl = this.context.getIsUsingBundleUrl(); const isUsingBundleUrl = this.context.getIsUsingBundleUrl();
let bundleFlags = bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_REQUESTED_PERMISSION; let bundleFlags = bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_REQUESTED_PERMISSION;
@@ -53,6 +54,7 @@ getConstants(): Object {
return { return {
downloadRootDir: `${context.filesDir}/_update`, downloadRootDir: `${context.filesDir}/_update`,
currentVersionInfo,
packageVersion, packageVersion,
currentVersion, currentVersion,
buildTime, buildTime,
@@ -64,13 +66,13 @@ getConstants(): Object {
} }
async setLocalHashInfo(hash: string, info: string): Promise<boolean> { setLocalHashInfo(hash: string, info: string): boolean {
logger.debug(TAG, ",call setLocalHashInfo"); logger.debug(TAG, ",call setLocalHashInfo");
return UpdateModuleImpl.setLocalHashInfo(this.context,hash,info); return UpdateModuleImpl.setLocalHashInfo(this.context, hash, info);
} }
async getLocalHashInfo(hash: string): Promise<string> { getLocalHashInfo(hash: string): string {
return UpdateModuleImpl.getLocalHashInfo(this.context,hash); return UpdateModuleImpl.getLocalHashInfo(this.context, hash);
} }
async setUuid(uuid: string): Promise<boolean> { async setUuid(uuid: string): Promise<boolean> {

View File

@@ -50,8 +50,8 @@ export class UpdateContext {
this.preferences.flush(); this.preferences.flush();
} }
public getKv(key: string): string { public getKv(key: string): string {
return this.preferences.getSync(key, '') as string; return this.preferences.getSync(key, '') as string;
} }
public isFirstTime(): boolean { public isFirstTime(): boolean {

View File

@@ -171,27 +171,20 @@ export class UpdateModuleImpl {
} }
} }
static async setLocalHashInfo( static setLocalHashInfo(
updateContext: UpdateContext, updateContext: UpdateContext,
hash: string, hash: string,
info: string info: string
): Promise<boolean> { ): boolean {
if (!this.checkJson(info)) { updateContext.setKv(`hash_${hash}`, info);
await updateContext.setKv(`hash_${hash}`, info);
throw new Error('校验报错:json字符串格式错误');
}
await updateContext.setKv(`hash_${hash}`, info);
return true; return true;
} }
static async getLocalHashInfo( static getLocalHashInfo(
updateContext: UpdateContext, updateContext: UpdateContext,
hash: string hash: string
): Promise<string> { ): string {
const value = await updateContext.getKv(`hash_${hash}`); const value = updateContext.getKv(`hash_${hash}`);
if (!this.checkJson(value)) {
throw new Error('校验报错:json字符串格式错误');
}
return value; return value;
} }
} }

2
ios/ImportReact.h Normal file
View File

@@ -0,0 +1,2 @@
@import React;

View File

@@ -16,6 +16,7 @@
static NSString *const keyPushyInfo = @"REACTNATIVECN_PUSHY_INFO_KEY"; static NSString *const keyPushyInfo = @"REACTNATIVECN_PUSHY_INFO_KEY";
static NSString *const paramPackageVersion = @"packageVersion"; static NSString *const paramPackageVersion = @"packageVersion";
static NSString *const paramBuildTime = @"buildTime";
static NSString *const paramLastVersion = @"lastVersion"; static NSString *const paramLastVersion = @"lastVersion";
static NSString *const paramCurrentVersion = @"currentVersion"; static NSString *const paramCurrentVersion = @"currentVersion";
static NSString *const paramIsFirstTime = @"isFirstTime"; static NSString *const paramIsFirstTime = @"isFirstTime";
@@ -70,20 +71,36 @@ RCT_EXPORT_MODULE(RCTPushy);
{ {
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
// Check for version changes first
NSString *curPackageVersion = [RCTPushy packageVersion];
NSString *curBuildTime = [RCTPushy buildTime];
NSString *storedPackageVersion = [defaults stringForKey:paramPackageVersion];
NSString *storedBuildTime = [defaults stringForKey:paramBuildTime];
// If stored versions don't exist, write current versions first
if (!storedPackageVersion || !storedBuildTime) {
[defaults setObject:curPackageVersion forKey:paramPackageVersion];
[defaults setObject:curBuildTime forKey:paramBuildTime];
storedPackageVersion = curPackageVersion;
storedBuildTime = curBuildTime;
}
BOOL packageVersionChanged = ![curPackageVersion isEqualToString:storedPackageVersion];
BOOL buildTimeChanged = ![curBuildTime isEqualToString:storedBuildTime];
if (packageVersionChanged || buildTimeChanged) {
// Clear all update data and store new versions
[defaults setObject:nil forKey:keyPushyInfo];
[defaults setObject:nil forKey:keyHashInfo];
[defaults setObject:@(YES) forKey:KeyPackageUpdatedMarked];
[defaults setObject:curPackageVersion forKey:paramPackageVersion];
[defaults setObject:curBuildTime forKey:paramBuildTime];
// ...need clear files later
}
NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo]; NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo];
if (pushyInfo) { if (pushyInfo) {
NSString *curPackageVersion = [RCTPushy packageVersion];
NSString *packageVersion = [pushyInfo objectForKey:paramPackageVersion];
BOOL needClearPushyInfo = ![curPackageVersion isEqualToString:packageVersion];
if (needClearPushyInfo) {
[defaults setObject:nil forKey:keyPushyInfo];
[defaults setObject:nil forKey:keyHashInfo];
[defaults setObject:@(YES) forKey:KeyPackageUpdatedMarked];
// ...need clear files later
}
else {
NSString *curVersion = pushyInfo[paramCurrentVersion]; NSString *curVersion = pushyInfo[paramCurrentVersion];
BOOL isFirstTime = [pushyInfo[paramIsFirstTime] boolValue]; BOOL isFirstTime = [pushyInfo[paramIsFirstTime] boolValue];
@@ -93,8 +110,7 @@ RCT_EXPORT_MODULE(RCTPushy);
BOOL needRollback = (!ignoreRollback && isFirstTime == NO && isFirstLoadOK == NO) || loadVersion.length<=0; BOOL needRollback = (!ignoreRollback && isFirstTime == NO && isFirstLoadOK == NO) || loadVersion.length<=0;
if (needRollback) { if (needRollback) {
loadVersion = [self rollback]; loadVersion = [self rollback];
} } else if (isFirstTime && !ignoreRollback){
else if (isFirstTime && !ignoreRollback){
// bundleURL may be called many times, ignore rollbacks before process restarted again. // bundleURL may be called many times, ignore rollbacks before process restarted again.
ignoreRollback = true; ignoreRollback = true;
@@ -116,7 +132,6 @@ RCT_EXPORT_MODULE(RCTPushy);
loadVersion = [self rollback]; loadVersion = [self rollback];
} }
} }
}
} }
return [RCTPushy binaryBundleURL]; return [RCTPushy binaryBundleURL];
@@ -128,13 +143,11 @@ RCT_EXPORT_MODULE(RCTPushy);
NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo]; NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo];
NSString *lastVersion = pushyInfo[paramLastVersion]; NSString *lastVersion = pushyInfo[paramLastVersion];
NSString *curVersion = pushyInfo[paramCurrentVersion]; NSString *curVersion = pushyInfo[paramCurrentVersion];
NSString *curPackageVersion = [RCTPushy packageVersion];
if (lastVersion.length) { if (lastVersion.length) {
// roll back to last version // roll back to last version
[defaults setObject:@{paramCurrentVersion:lastVersion, [defaults setObject:@{paramCurrentVersion:lastVersion,
paramIsFirstTime:@(NO), paramIsFirstTime:@(NO),
paramIsFirstLoadOk:@(YES), paramIsFirstLoadOk:@(YES)}
paramPackageVersion:curPackageVersion}
forKey:keyPushyInfo]; forKey:keyPushyInfo];
} }
else { else {
@@ -163,7 +176,11 @@ RCT_EXPORT_MODULE(RCTPushy);
ret[@"isFirstTime"] = [defaults objectForKey:keyFirstLoadMarked]; ret[@"isFirstTime"] = [defaults objectForKey:keyFirstLoadMarked];
ret[@"uuid"] = [defaults objectForKey:keyUuid]; ret[@"uuid"] = [defaults objectForKey:keyUuid];
NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo]; NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo];
ret[@"currentVersion"] = [pushyInfo objectForKey:paramCurrentVersion]; NSString *currentVersion = [pushyInfo objectForKey:paramCurrentVersion];
ret[@"currentVersion"] = currentVersion;
if (currentVersion != nil) {
ret[@"currentVersionInfo"] = [defaults objectForKey:[keyHashInfo stringByAppendingString:currentVersion]];
}
// clear isFirstTimemarked // clear isFirstTimemarked
if (ret[@"isFirstTime"]) { if (ret[@"isFirstTime"]) {
@@ -297,39 +314,38 @@ RCT_EXPORT_METHOD(setNeedUpdate:(NSDictionary *)options
newInfo[paramLastVersion] = lastVersion; newInfo[paramLastVersion] = lastVersion;
newInfo[paramIsFirstTime] = @(YES); newInfo[paramIsFirstTime] = @(YES);
newInfo[paramIsFirstLoadOk] = @(NO); newInfo[paramIsFirstLoadOk] = @(NO);
newInfo[paramPackageVersion] = [RCTPushy packageVersion];
[defaults setObject:newInfo forKey:keyPushyInfo]; [defaults setObject:newInfo forKey:keyPushyInfo];
resolve(@true); resolve(@true);
}else{ } else {
reject(@"执行报错", nil, nil); reject(@"执行报错", nil, nil);
} }
} }
RCT_EXPORT_METHOD(reloadUpdate:(NSDictionary *)options RCT_EXPORT_METHOD(reloadUpdate:(NSDictionary *)options
resolver:(RCTPromiseResolveBlock)resolve resolver:(RCTPromiseResolveBlock)resolve
rejecter:(RCTPromiseRejectBlock)reject) rejecter:(RCTPromiseRejectBlock)reject)
{ {
@try { @try {
NSString *hash = options[@"hash"]; NSString *hash = options[@"hash"];
if (hash.length) { if (hash.length) {
[self setNeedUpdate:options resolver:resolve rejecter:reject]; // 只在 setNeedUpdate 成功后 resolve
[self setNeedUpdate:options resolver:^(id result) {
// reload in earlier version dispatch_async(dispatch_get_main_queue(), ^{
dispatch_async(dispatch_get_main_queue(), ^{ #if __has_include("RCTReloadCommand.h")
[self.bridge setValue:[[self class] bundleURL] forKey:@"bundleURL"]; // reload 0.62+
[self.bridge reload]; RCTReloadCommandSetBundleURL([[self class] bundleURL]);
}); RCTTriggerReloadCommandListeners(@"pushy reloadUpdate");
#else
#if __has_include("RCTReloadCommand.h") [self.bridge reload];
// reload 0.62+ #endif
RCTReloadCommandSetBundleURL([[self class] bundleURL]); });
RCTTriggerReloadCommandListeners(@"pushy reload"); resolve(@true);
#endif } rejecter:^(NSString *code, NSString *message, NSError *error) {
reject(code, message, error);
resolve(@true); }];
}else{ } else {
reject(@"执行报错", nil, nil); reject(@"执行报错", nil, nil);
} }
} }
@@ -343,13 +359,14 @@ RCT_EXPORT_METHOD(restartApp:(RCTPromiseResolveBlock)resolve
{ {
@try { @try {
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
[self.bridge reload]; #if __has_include("RCTReloadCommand.h")
// reload 0.62+
RCTReloadCommandSetBundleURL([[self class] bundleURL]);
RCTTriggerReloadCommandListeners(@"pushy restartApp");
#else
[self.bridge reload];
#endif
}); });
#if __has_include("RCTReloadCommand.h")
// reload 0.62+
RCTReloadCommandSetBundleURL([[self class] bundleURL]);
RCTTriggerReloadCommandListeners(@"pushy restartApp");
#endif
resolve(@true); resolve(@true);
} }
@@ -361,6 +378,9 @@ RCT_EXPORT_METHOD(restartApp:(RCTPromiseResolveBlock)resolve
RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
rejecter:(RCTPromiseRejectBlock)reject) rejecter:(RCTPromiseRejectBlock)reject)
{ {
#if DEBUG
resolve(@true);
#else
@try { @try {
// up package info // up package info
@@ -384,6 +404,7 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
@catch (NSException *exception) { @catch (NSException *exception) {
reject(@"执行报错", nil, nil); reject(@"执行报错", nil, nil);
} }
#endif
} }
@@ -542,7 +563,15 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
callback([self errorWithMessage:ERROR_HDIFFPATCH]); callback([self errorWithMessage:ERROR_HDIFFPATCH]);
} }
}; };
[_fileManager hdiffFileAtPath:bundlePatch fromOrigin:bundleOrigin toDestination:destination completionHandler:completionHandler];
@try {
[_fileManager hdiffFileAtPath:bundlePatch fromOrigin:bundleOrigin toDestination:destination completionHandler:completionHandler];
}
@catch (NSException *exception) {
NSLog(@"Pushy _dopatch error: exception occurred during hdiffFileAtPath: %@, reason: %@",
exception.name, exception.reason);
callback([self errorWithMessage:ERROR_HDIFFPATCH]);
}
} }
- (void)patch:(NSString *)hash fromBundle:(NSString *)bundleOrigin source:(NSString *)sourceOrigin callback:(void (^)(NSError *error))callback - (void)patch:(NSString *)hash fromBundle:(NSString *)bundleOrigin source:(NSString *)sourceOrigin callback:(void (^)(NSError *error))callback

View File

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

View File

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

View File

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

View File

@@ -10,6 +10,7 @@ export interface Spec extends TurboModule {
buildTime: string; buildTime: string;
uuid: string; uuid: string;
isUsingBundleUrl: boolean; isUsingBundleUrl: boolean;
currentVersionInfo: string;
}; };
setLocalHashInfo(hash: string, info: string): Promise<void>; setLocalHashInfo(hash: string, info: string): Promise<void>;
getLocalHashInfo(hash: string): Promise<string>; getLocalHashInfo(hash: string): Promise<string>;

View File

@@ -1,33 +1,34 @@
import { CheckResult, ClientOptions, ProgressData, EventType } from './type';
import { import {
assertDev, DeviceEventEmitter,
EmitterSubscription,
Platform,
} from 'react-native';
import {
PushyModule,
buildTime,
cInfo,
currentVersion,
getCurrentVersionInfo,
isFirstTime,
isRolledBack,
packageVersion,
pushyNativeEventEmitter,
rolledBackVersion,
setLocalHashInfo,
} from './core';
import { PermissionsAndroid } from './permissions';
import { CheckResult, ClientOptions, EventType, ProgressData } from './type';
import {
assertWeb, assertWeb,
emptyObj, emptyObj,
enhancedFetch,
joinUrls, joinUrls,
log, log,
noop, noop,
promiseAny, promiseAny,
testUrls, testUrls,
} from './utils'; } from './utils';
import { import i18n from './i18n';
EmitterSubscription,
Platform,
DeviceEventEmitter,
} from 'react-native';
import { PermissionsAndroid } from './permissions';
import {
PushyModule,
buildTime,
cInfo,
pushyNativeEventEmitter,
currentVersion,
packageVersion,
rolledBackVersion,
setLocalHashInfo,
isFirstTime,
isRolledBack,
getCurrentVersionInfo,
} from './core';
const SERVER_PRESETS = { const SERVER_PRESETS = {
// cn // cn
@@ -91,7 +92,8 @@ export class Pushy {
options = defaultClientOptions; options = defaultClientOptions;
clientType: 'Pushy' | 'Cresc' = 'Pushy'; clientType: 'Pushy' | 'Cresc' = 'Pushy';
lastChecking?: number; lastChecking?: number;
lastRespJson?: Promise<any>; lastRespJson?: Promise<CheckResult>;
lastRespText?: Promise<string>;
version = cInfo.rnu; version = cInfo.rnu;
loggerPromise = (() => { loggerPromise = (() => {
@@ -106,13 +108,18 @@ export class Pushy {
})(); })();
constructor(options: ClientOptions, clientType?: 'Pushy' | 'Cresc') { constructor(options: ClientOptions, clientType?: 'Pushy' | 'Cresc') {
if (Platform.OS === 'ios' || Platform.OS === 'android') {
if (!options.appKey) {
throw new Error('appKey is required');
}
}
this.clientType = clientType || 'Pushy'; this.clientType = clientType || 'Pushy';
this.options.server = SERVER_PRESETS[this.clientType]; this.options.server = SERVER_PRESETS[this.clientType];
// Initialize i18n based on clientType
i18n.setLocale(this.clientType === 'Pushy' ? 'zh' : 'en');
if (Platform.OS === 'ios' || Platform.OS === 'android') {
if (!options.appKey) {
throw new Error(i18n.t('error_appkey_required'));
}
}
this.setOptions(options); this.setOptions(options);
if (isRolledBack) { if (isRolledBack) {
this.report({ this.report({
@@ -135,6 +142,16 @@ export class Pushy {
} }
}; };
/**
* Get translated text based on current clientType
* @param key - Translation key
* @param values - Values for interpolation (optional)
* @returns Translated string
*/
t = (key: string, values?: Record<string, string | number>) => {
return i18n.t(key as any, values);
};
report = async ({ report = async ({
type, type,
message = '', message = '',
@@ -148,6 +165,7 @@ export class Pushy {
await this.loggerPromise.promise; await this.loggerPromise.promise;
const { logger = noop, appKey } = this.options; const { logger = noop, appKey } = this.options;
const info = await getCurrentVersionInfo(); const info = await getCurrentVersionInfo();
const overridePackageVersion = this.options.overridePackageVersion;
logger({ logger({
type, type,
data: { data: {
@@ -155,6 +173,7 @@ export class Pushy {
currentVersion, currentVersion,
cInfo, cInfo,
packageVersion, packageVersion,
overridePackageVersion,
buildTime, buildTime,
message, message,
...info, ...info,
@@ -170,11 +189,9 @@ export class Pushy {
getCheckUrl = (endpoint: string = this.options.server!.main) => { getCheckUrl = (endpoint: string = this.options.server!.main) => {
return `${endpoint}/checkUpdate/${this.options.appKey}`; return `${endpoint}/checkUpdate/${this.options.appKey}`;
}; };
assertDebug = () => { assertDebug = (matter: string) => {
if (__DEV__ && !this.options.debug) { if (__DEV__ && !this.options.debug) {
console.info( console.info(this.t('dev_debug_disabled', { matter }));
'You are currently in the development environment and have not enabled debug mode. The hot update check will not be performed. If you need to debug hot updates in the development environment, please set debug to true in the client.',
);
return false; return false;
} }
return true; return true;
@@ -188,7 +205,7 @@ export class Pushy {
this.report({ type: 'markSuccess' }); this.report({ type: 'markSuccess' });
}; };
switchVersion = async (hash: string) => { switchVersion = async (hash: string) => {
if (!assertDev('switchVersion()')) { if (!this.assertDebug('switchVersion()')) {
return; return;
} }
if (assertHash(hash) && !sharedState.applyingUpdate) { if (assertHash(hash) && !sharedState.applyingUpdate) {
@@ -199,7 +216,7 @@ export class Pushy {
}; };
switchVersionLater = async (hash: string) => { switchVersionLater = async (hash: string) => {
if (!assertDev('switchVersionLater()')) { if (!this.assertDebug('switchVersionLater()')) {
return; return;
} }
if (assertHash(hash)) { if (assertHash(hash)) {
@@ -208,7 +225,7 @@ export class Pushy {
} }
}; };
checkUpdate = async (extra?: Record<string, any>) => { checkUpdate = async (extra?: Record<string, any>) => {
if (!this.assertDebug()) { if (!this.assertDebug('checkUpdate()')) {
return; return;
} }
if (!assertWeb()) { if (!assertWeb()) {
@@ -231,7 +248,7 @@ export class Pushy {
} }
this.lastChecking = now; this.lastChecking = now;
const fetchBody = { const fetchBody = {
packageVersion, packageVersion: this.options.overridePackageVersion || packageVersion,
hash: currentVersion, hash: currentVersion,
buildTime, buildTime,
cInfo, cInfo,
@@ -261,18 +278,18 @@ export class Pushy {
type: 'checking', type: 'checking',
message: this.options.appKey + ': ' + stringifyBody, message: this.options.appKey + ': ' + stringifyBody,
}); });
resp = await fetch(this.getCheckUrl(), fetchPayload); resp = await enhancedFetch(this.getCheckUrl(), fetchPayload);
} catch (e: any) { } catch (e: any) {
this.report({ this.report({
type: 'errorChecking', type: 'errorChecking',
message: `Can not connect to update server: ${e.message}. Trying backup endpoints.`, message: this.t('error_cannot_connect_backup', { message: e.message }),
}); });
const backupEndpoints = await this.getBackupEndpoints(); const backupEndpoints = await this.getBackupEndpoints();
if (backupEndpoints) { if (backupEndpoints) {
try { try {
resp = await promiseAny( resp = await promiseAny(
backupEndpoints.map(endpoint => backupEndpoints.map(endpoint =>
fetch(this.getCheckUrl(endpoint), fetchPayload), enhancedFetch(this.getCheckUrl(endpoint), fetchPayload),
), ),
); );
} catch (err: any) { } catch (err: any) {
@@ -285,25 +302,31 @@ export class Pushy {
if (!resp) { if (!resp) {
this.report({ this.report({
type: 'errorChecking', type: 'errorChecking',
message: 'Can not connect to update server. Please check your network.', message: this.t('error_cannot_connect_server'),
}); });
this.throwIfEnabled(new Error('errorChecking')); this.throwIfEnabled(new Error('errorChecking'));
return this.lastRespJson ? await this.lastRespJson : emptyObj; return this.lastRespJson ? await this.lastRespJson : emptyObj;
} }
if (resp.status !== 200) {
const errorMessage = this.t('error_http_status', {
status: resp.status,
statusText: resp.statusText,
});
this.report({
type: 'errorChecking',
message: errorMessage,
});
this.throwIfEnabled(new Error(errorMessage));
log('error checking response:', resp.status, await resp.text());
return this.lastRespJson ? await this.lastRespJson : emptyObj;
}
this.lastRespJson = resp.json(); this.lastRespJson = resp.json();
const result: CheckResult = await this.lastRespJson; const result: CheckResult = await this.lastRespJson;
log('checking result:', result); log('checking result:', result);
if (resp.status !== 200) {
this.report({
type: 'errorChecking',
message: result.message,
});
this.throwIfEnabled(new Error(result.message));
}
return result; return result;
}; };
getBackupEndpoints = async () => { getBackupEndpoints = async () => {
@@ -389,11 +412,16 @@ export class Pushy {
} }
} }
let succeeded = ''; let succeeded = '';
this.report({ type: 'downloading' }); this.report({
type: 'downloading',
data: {
newVersion: hash,
},
});
let lastError: any; let lastError: any;
let errorMessages: string[] = []; let errorMessages: string[] = [];
const diffUrl = await testUrls(joinUrls(paths, diff)); const diffUrl = await testUrls(joinUrls(paths, diff));
if (diffUrl) { if (diffUrl && !__DEV__) {
log('downloading diff'); log('downloading diff');
try { try {
await PushyModule.downloadPatchFromPpk({ await PushyModule.downloadPatchFromPpk({
@@ -403,63 +431,61 @@ export class Pushy {
}); });
succeeded = 'diff'; succeeded = 'diff';
} catch (e: any) { } catch (e: any) {
const errorMessage = `diff error: ${e.message}`; const errorMessage = this.t('error_diff_failed', {
message: e.message,
});
errorMessages.push(errorMessage); errorMessages.push(errorMessage);
lastError = new Error(errorMessage); lastError = new Error(errorMessage);
if (__DEV__) { log(errorMessage);
succeeded = 'diff';
} else {
log(errorMessage);
}
} }
} }
const pdiffUrl = await testUrls(joinUrls(paths, pdiff)); if (!succeeded) {
if (!succeeded && pdiffUrl) { const pdiffUrl = await testUrls(joinUrls(paths, pdiff));
log('downloading pdiff'); if (pdiffUrl && !__DEV__) {
try { log('downloading pdiff');
await PushyModule.downloadPatchFromPackage({ try {
updateUrl: pdiffUrl, await PushyModule.downloadPatchFromPackage({
hash, updateUrl: pdiffUrl,
}); hash,
succeeded = 'pdiff'; });
} catch (e: any) {
const errorMessage = `pdiff error: ${e.message}`;
errorMessages.push(errorMessage);
lastError = new Error(errorMessage);
if (__DEV__) {
succeeded = 'pdiff'; succeeded = 'pdiff';
} else { } catch (e: any) {
const errorMessage = this.t('error_pdiff_failed', {
message: e.message,
});
errorMessages.push(errorMessage);
lastError = new Error(errorMessage);
log(errorMessage); log(errorMessage);
} }
} }
} }
const fullUrl = await testUrls(joinUrls(paths, full)); if (!succeeded) {
if (!succeeded && fullUrl) { const fullUrl = await testUrls(joinUrls(paths, full));
log('downloading full patch'); if (fullUrl) {
try { log('downloading full patch');
await PushyModule.downloadFullUpdate({ try {
updateUrl: fullUrl, await PushyModule.downloadFullUpdate({
hash, updateUrl: fullUrl,
}); hash,
succeeded = 'full'; });
} catch (e: any) {
const errorMessage = `full patch error: ${e.message}`;
errorMessages.push(errorMessage);
lastError = new Error(errorMessage);
if (__DEV__) {
succeeded = 'full'; succeeded = 'full';
} else { } catch (e: any) {
const errorMessage = this.t('error_full_patch_failed', {
message: e.message,
});
errorMessages.push(errorMessage);
lastError = new Error(errorMessage);
log(errorMessage); log(errorMessage);
} }
} else if (__DEV__) {
log(this.t('dev_incremental_update_disabled'));
succeeded = 'full';
} }
} }
if (sharedState.progressHandlers[hash]) { if (sharedState.progressHandlers[hash]) {
sharedState.progressHandlers[hash].remove(); sharedState.progressHandlers[hash].remove();
delete sharedState.progressHandlers[hash]; delete sharedState.progressHandlers[hash];
} }
if (__DEV__) {
return hash;
}
if (!succeeded) { if (!succeeded) {
this.report({ this.report({
type: 'errorUpdate', type: 'errorUpdate',

View File

@@ -18,6 +18,7 @@ export const defaultContext = {
parseTestQrCode: () => false, parseTestQrCode: () => false,
currentHash: '', currentHash: '',
packageVersion: '', packageVersion: '',
currentVersionInfo: {},
}; };
export const UpdateContext = createContext<{ export const UpdateContext = createContext<{
@@ -28,11 +29,17 @@ export const UpdateContext = createContext<{
dismissError: () => void; dismissError: () => void;
downloadUpdate: () => Promise<boolean | void>; downloadUpdate: () => Promise<boolean | void>;
downloadAndInstallApk: (url: string) => Promise<void>; downloadAndInstallApk: (url: string) => Promise<void>;
// @deprecated use currentVersionInfo instead
getCurrentVersionInfo: () => Promise<{ getCurrentVersionInfo: () => Promise<{
name?: string; name?: string;
description?: string; description?: string;
metaInfo?: string; metaInfo?: string;
}>; }>;
currentVersionInfo: {
name?: string;
description?: string;
metaInfo?: string;
} | null;
parseTestQrCode: (code: string) => boolean; parseTestQrCode: (code: string) => boolean;
restartApp: () => Promise<void>; restartApp: () => Promise<void>;
currentHash: string; currentHash: string;

View File

@@ -30,6 +30,21 @@ const PushyConstants = isTurboModuleEnabled
export const downloadRootDir: string = PushyConstants.downloadRootDir; export const downloadRootDir: string = PushyConstants.downloadRootDir;
export const packageVersion: string = PushyConstants.packageVersion; export const packageVersion: string = PushyConstants.packageVersion;
export const currentVersion: string = PushyConstants.currentVersion; export const currentVersion: string = PushyConstants.currentVersion;
const currentVersionInfoString: string = PushyConstants.currentVersionInfo;
let _currentVersionInfo = {};
if (currentVersionInfoString) {
try {
_currentVersionInfo = JSON.parse(currentVersionInfoString);
} catch (error) {
console.error(
'Failed to parse currentVersionInfo:',
currentVersionInfoString,
);
}
}
export const currentVersionInfo = _currentVersionInfo;
export const isFirstTime: boolean = PushyConstants.isFirstTime; export const isFirstTime: boolean = PushyConstants.isFirstTime;
export const rolledBackVersion: string = PushyConstants.rolledBackVersion; export const rolledBackVersion: string = PushyConstants.rolledBackVersion;
export const isRolledBack: boolean = typeof rolledBackVersion === 'string'; export const isRolledBack: boolean = typeof rolledBackVersion === 'string';
@@ -45,6 +60,7 @@ async function getLocalHashInfo(hash: string) {
return JSON.parse(await PushyModule.getLocalHashInfo(hash)); return JSON.parse(await PushyModule.getLocalHashInfo(hash));
} }
// @deprecated use currentVersionInfo instead
export async function getCurrentVersionInfo(): Promise<{ export async function getCurrentVersionInfo(): Promise<{
name?: string; name?: string;
description?: string; description?: string;

108
src/i18n.ts Normal file
View File

@@ -0,0 +1,108 @@
import zhTranslations from './locales/zh';
import enTranslations from './locales/en';
type TranslationKey = keyof typeof zhTranslations | keyof typeof enTranslations;
type TranslationValues = Record<string, string | number>;
class I18n {
private currentLocale: 'zh' | 'en' = 'en';
private translations = {
zh: zhTranslations,
en: enTranslations,
};
/**
* Set locale directly
* @param locale - 'zh' or 'en'
*/
setLocale(locale: 'zh' | 'en') {
this.currentLocale = locale;
}
/**
* Get current locale
*/
getLocale(): 'zh' | 'en' {
return this.currentLocale;
}
/**
* Translate a key with optional interpolation
* @param key - Translation key
* @param values - Values for interpolation (optional)
* @returns Translated string with interpolated values
*/
t(key: TranslationKey, values?: TranslationValues): string {
const translation =
this.translations[this.currentLocale][
key as keyof (typeof this.translations)[typeof this.currentLocale]
];
if (!translation) {
// Fallback to the other locale if key not found
const fallbackLocale = this.currentLocale === 'zh' ? 'en' : 'zh';
const fallbackTranslation =
this.translations[fallbackLocale][
key as keyof (typeof this.translations)[typeof fallbackLocale]
];
if (!fallbackTranslation) {
// If still not found, return the key itself
return String(key);
}
return this.interpolate(fallbackTranslation, values);
}
return this.interpolate(translation, values);
}
/**
* Interpolate values into a string template
* Supports {{key}} syntax
* @param template - String template with {{key}} placeholders
* @param values - Values to interpolate
* @returns Interpolated string
*/
private interpolate(template: string, values?: TranslationValues): string {
if (!values) {
return template;
}
return template.replace(/\{\{(\w+)\}\}/g, (match, key) => {
const value = values[key];
return value !== undefined ? String(value) : match;
});
}
/**
* Add or update translations for a specific locale
* @param locale - Target locale
* @param translations - Translation object to merge
*/
addTranslations(locale: 'zh' | 'en', translations: Record<string, string>) {
this.translations[locale] = {
...this.translations[locale],
...translations,
};
}
}
// Create singleton instance
const i18n = new I18n();
// Export both the instance and the class for flexibility
export { i18n, I18n };
export default i18n;
/**
* Usage examples:
*
* // Direct locale setting (new preferred method)
* i18n.setLocale('zh'); // Chinese
* i18n.setLocale('en'); // English
*
* // Get translations
* i18n.t('checking_update'); // Based on current locale
* i18n.t('download_progress', { progress: 50 }); // With interpolation
*/

74
src/locales/en.ts Normal file
View File

@@ -0,0 +1,74 @@
export default {
// Common messages
checking_update: 'Checking for updates...',
downloading_update: 'Downloading update package...',
installing_update: 'Installing update...',
update_available: 'Update available',
update_downloaded: 'Update downloaded successfully',
update_installed: 'Update installed successfully',
no_update_available: 'You are up to date',
update_failed: 'Update failed',
network_error: 'Network connection error',
download_failed: 'Download failed',
install_failed: 'Installation failed',
// Progress messages with interpolation
download_progress: 'Download progress: {{progress}}%',
download_speed: 'Download speed: {{speed}}/s',
file_size: 'File size: {{size}}',
time_remaining: 'Time remaining: {{time}}',
// Error messages
error_code: 'Error code: {{code}}',
error_message: 'Error message: {{message}}',
retry_count: 'Retry attempt: {{count}}/{{max}}',
// Update info
version_info: 'Version {{version}} ({{build}})',
release_notes: 'Release notes: {{notes}}',
update_size: 'Update size: {{size}}MB',
// Alert messages
alert_title: 'Notice',
alert_update_ready: 'Download completed. Update now?',
alert_next_time: 'Later',
alert_update_now: 'Update Now',
alert_app_updated:
'Your app version has been updated. Click update to download and install the new version',
alert_update_button: 'Update',
alert_cancel: 'Cancel',
alert_confirm: 'OK',
alert_info: 'Info',
alert_no_update_wait:
'No update found, please wait 10s for the server to generate the patch package',
// Error messages
error_appkey_required: 'appKey is required',
error_update_check_failed: 'Update check failed',
error_cannot_connect_server:
'Can not connect to update server. Please check your network.',
error_cannot_connect_backup:
'Can not connect to update server: {{message}}. Trying backup endpoints.',
error_diff_failed: 'diff error: {{message}}',
error_pdiff_failed: 'pdiff error: {{message}}',
error_full_patch_failed: 'full patch error: {{message}}',
error_all_promises_rejected: 'All promises were rejected',
error_ping_failed: 'Ping failed',
error_ping_timeout: 'Ping timeout',
error_http_status: '{{status}} {{statusText}}',
// Development messages
dev_debug_disabled:
'You are currently in the development environment and have not enabled debug mode. {{matter}} will not be performed. If you need to debug {{matter}} in the development environment, please set debug to true in the client.',
dev_log_prefix: 'react-native-update: ',
dev_web_not_supported:
'react-native-update does not support the Web platform and will not perform any operations',
// More alert messages
alert_new_version_found:
'New version {{name}} found. Download now?\n{{description}}',
// Development environment messages
dev_incremental_update_disabled:
'Currently in development environment, incremental hot update cannot be executed and restart will not take effect. If you need to test effective full hot update in development environment (but will reconnect to metro after restart), please enable "ignore timestamp" switch and retry.',
};

71
src/locales/zh.ts Normal file
View File

@@ -0,0 +1,71 @@
export default {
// Common messages
checking_update: '正在检查更新...',
downloading_update: '正在下载更新包...',
installing_update: '正在安装更新...',
update_available: '发现新版本',
update_downloaded: '更新包下载完成',
update_installed: '更新安装完成',
no_update_available: '已是最新版本',
update_failed: '更新失败',
network_error: '网络连接错误',
download_failed: '下载失败',
install_failed: '安装失败',
// Progress messages with interpolation
download_progress: '下载进度: {{progress}}%',
download_speed: '下载速度: {{speed}}/s',
file_size: '文件大小: {{size}}',
time_remaining: '剩余时间: {{time}}',
// Error messages
error_code: '错误代码: {{code}}',
error_message: '错误信息: {{message}}',
retry_count: '重试次数: {{count}}/{{max}}',
// Update info
version_info: '版本 {{version}} ({{build}})',
release_notes: '更新说明: {{notes}}',
update_size: '更新包大小: {{size}}MB',
// Alert messages
alert_title: '提示',
alert_update_ready: '下载完毕,是否立即更新?',
alert_next_time: '下次再说',
alert_update_now: '立即更新',
alert_app_updated: '您的应用版本已更新,点击更新下载安装新版本',
alert_update_button: '更新',
alert_cancel: '取消',
alert_confirm: '确定',
alert_info: '信息',
alert_no_update_wait: '未发现更新请等待10秒让服务器生成补丁包',
// Error messages
error_appkey_required: '需要提供 appKey',
error_update_check_failed: '更新检查失败',
error_cannot_connect_server: '无法连接到更新服务器。请检查网络连接。',
error_cannot_connect_backup:
'无法连接到更新服务器: {{message}}。正在尝试备用端点。',
error_diff_failed: 'diff 错误: {{message}}',
error_pdiff_failed: 'pdiff 错误: {{message}}',
error_full_patch_failed: '完整补丁错误: {{message}}',
error_all_promises_rejected: '所有请求都被拒绝',
error_ping_failed: 'Ping 失败',
error_ping_timeout: 'Ping 超时',
error_http_status: '{{status}} {{statusText}}',
// Development messages
dev_debug_disabled:
'您当前处于开发环境且未启用调试模式。{{matter}} 将不会执行。如需在开发环境中调试 {{matter}},请在客户端中将 debug 设为 true。',
dev_log_prefix: 'react-native-update: ',
dev_web_not_supported:
'react-native-update 不支持 Web 平台,不会执行任何操作',
// More alert messages
alert_new_version_found:
'检查到新的版本{{name}},是否下载?\n{{description}}',
// Development environment messages
dev_incremental_update_disabled:
'当前是开发环境,无法执行增量式热更新,重启不会生效。如果需要在开发环境中测试可生效的全量热更新(但也会在再次重启后重新连接 metro请打开"忽略时间戳"开关再重试。',
};

View File

@@ -13,12 +13,17 @@ import {
Linking, Linking,
} from 'react-native'; } from 'react-native';
import { Pushy, Cresc, sharedState } from './client'; import { Pushy, Cresc, sharedState } from './client';
import { currentVersion, packageVersion, getCurrentVersionInfo } from './core'; import { currentVersion, packageVersion, getCurrentVersionInfo, currentVersionInfo } from './core';
import { CheckResult, ProgressData, UpdateTestPayload } from './type'; import {
CheckResult,
MixedCheckResult,
ProgressData,
UpdateTestPayload,
} from './type';
import { UpdateContext } from './context'; import { UpdateContext } from './context';
import { URL } from 'react-native-url-polyfill'; import { URL } from 'react-native-url-polyfill';
import { isInRollout } from './isInRollout'; import { isInRollout } from './isInRollout';
import { log } from './utils'; import { assertWeb, log } from './utils';
export const UpdateProvider = ({ export const UpdateProvider = ({
client, client,
@@ -30,7 +35,7 @@ export const UpdateProvider = ({
client = useRef(client).current; client = useRef(client).current;
const { options } = client; const { options } = client;
const stateListener = useRef<NativeEventSubscription>(); const stateListener = useRef<NativeEventSubscription>(undefined);
const [updateInfo, setUpdateInfo] = useState<CheckResult>(); const [updateInfo, setUpdateInfo] = useState<CheckResult>();
const updateInfoRef = useRef(updateInfo); const updateInfoRef = useRef(updateInfo);
const [progress, setProgress] = useState<ProgressData>(); const [progress, setProgress] = useState<ProgressData>();
@@ -115,16 +120,16 @@ export const UpdateProvider = ({
client.switchVersionLater(hash); client.switchVersionLater(hash);
return true; return true;
} }
alertUpdate('提示', '下载完毕,是否立即更新?', [ alertUpdate(client.t('alert_title'), client.t('alert_update_ready'), [
{ {
text: '下次再说', text: client.t('alert_next_time'),
style: 'cancel', style: 'cancel',
onPress: () => { onPress: () => {
client.switchVersionLater(hash); client.switchVersionLater(hash);
}, },
}, },
{ {
text: '立即更新', text: client.t('alert_update_now'),
style: 'default', style: 'default',
onPress: () => { onPress: () => {
client.switchVersion(hash); client.switchVersion(hash);
@@ -134,7 +139,7 @@ export const UpdateProvider = ({
return true; return true;
} catch (e: any) { } catch (e: any) {
setLastError(e); setLastError(e);
alertError('更新失败', e.message); alertError(client.t('update_failed'), e.message);
throwErrorIfEnabled(e); throwErrorIfEnabled(e);
return false; return false;
} }
@@ -158,84 +163,102 @@ export const UpdateProvider = ({
return; return;
} }
lastChecking.current = now; lastChecking.current = now;
let info: CheckResult; let rootInfo: MixedCheckResult | undefined;
try { try {
info = await client.checkUpdate(extra); rootInfo = await client.checkUpdate(extra);
} catch (e: any) { } catch (e: any) {
setLastError(e); setLastError(e);
alertError('更新检查失败', e.message); alertError(client.t('error_update_check_failed'), e.message);
throwErrorIfEnabled(e); throwErrorIfEnabled(e);
return; return;
} }
if (!info) { if (!rootInfo) {
return; return;
} }
const rollout = info.config?.rollout?.[packageVersion]; const versions = rootInfo.versions || [rootInfo as CheckResult];
if (info.update && rollout) { delete rootInfo.versions;
if (!isInRollout(rollout)) { for (const versionInfo of versions) {
log(`not in ${rollout}% rollout, ignored`); const info: CheckResult = {
return; ...versionInfo,
...rootInfo,
};
const rollout = info.config?.rollout?.[packageVersion];
if (info.update && rollout) {
if (!isInRollout(rollout)) {
log(`${info.name} not in ${rollout}% rollout, ignored`);
continue;
}
log(`${info.name} in ${rollout}% rollout, continue`);
} }
log(`in ${rollout}% rollout, continue`); info.description = info.description ?? '';
} updateInfoRef.current = info;
info.description = info.description ?? ''; setUpdateInfo(info);
updateInfoRef.current = info; if (info.expired) {
setUpdateInfo(info); if (
if (info.expired) { options.onPackageExpired &&
if ( (await options.onPackageExpired(info)) === false
options.onPackageExpired && ) {
(await options.onPackageExpired(info)) === false log('onPackageExpired returned false, skipping');
) { return;
log('onPackageExpired returned false, skipping'); }
return; const { downloadUrl } = info;
} if (downloadUrl && sharedState.apkStatus === null) {
const { downloadUrl } = info; if (options.updateStrategy === 'silentAndNow') {
if (downloadUrl && sharedState.apkStatus === null) { if (Platform.OS === 'android' && downloadUrl.endsWith('.apk')) {
if (options.updateStrategy === 'silentAndNow') { downloadAndInstallApk(downloadUrl);
if (Platform.OS === 'android' && downloadUrl.endsWith('.apk')) { } else {
downloadAndInstallApk(downloadUrl); Linking.openURL(downloadUrl);
} else { }
Linking.openURL(downloadUrl); return info;
} }
alertUpdate(
client.t('alert_title'),
client.t('alert_app_updated'),
[
{
text: client.t('alert_update_button'),
onPress: () => {
if (
Platform.OS === 'android' &&
downloadUrl.endsWith('.apk')
) {
downloadAndInstallApk(downloadUrl);
} else {
Linking.openURL(downloadUrl);
}
},
},
],
);
}
} else if (info.update) {
if (
options.updateStrategy === 'silentAndNow' ||
options.updateStrategy === 'silentAndLater'
) {
downloadUpdate(info);
return info; return info;
} }
alertUpdate('提示', '您的应用版本已更新,点击更新下载安装新版本', [ alertUpdate(
{ client.t('alert_title'),
text: '更新', client.t('alert_new_version_found', {
onPress: () => { name: info.name,
if (Platform.OS === 'android' && downloadUrl.endsWith('.apk')) { description: info.description,
downloadAndInstallApk(downloadUrl); }),
} else { [
Linking.openURL(downloadUrl); { text: client.t('alert_cancel'), style: 'cancel' },
} {
text: client.t('alert_confirm'),
style: 'default',
onPress: () => {
downloadUpdate();
},
}, },
}, ],
]); );
} }
} else if (info.update) { return info;
if (
options.updateStrategy === 'silentAndNow' ||
options.updateStrategy === 'silentAndLater'
) {
downloadUpdate(info);
return info;
}
alertUpdate(
'提示',
'检查到新的版本' + info.name + ',是否下载?\n' + info.description,
[
{ text: '取消', style: 'cancel' },
{
text: '确定',
style: 'default',
onPress: () => {
downloadUpdate();
},
},
],
);
} }
return info;
}, },
[ [
client, client,
@@ -251,7 +274,10 @@ export const UpdateProvider = ({
const markSuccess = client.markSuccess; const markSuccess = client.markSuccess;
useEffect(() => { useEffect(() => {
if (!client.assertDebug()) { if (!client.assertDebug('checkUpdate()')) {
return;
}
if (!assertWeb()) {
return; return;
} }
const { checkStrategy, dismissErrorAfter, autoMarkSuccess } = options; const { checkStrategy, dismissErrorAfter, autoMarkSuccess } = options;
@@ -297,8 +323,8 @@ export const UpdateProvider = ({
checkUpdate({ extra: { toHash: payload.data } }).then(() => { checkUpdate({ extra: { toHash: payload.data } }).then(() => {
if (updateInfoRef.current && updateInfoRef.current.upToDate) { if (updateInfoRef.current && updateInfoRef.current.upToDate) {
Alert.alert( Alert.alert(
'Info', client.t('alert_info'),
'No update found, please wait 10s for the server to generate the patch package', client.t('alert_no_update_wait'),
); );
} }
options.logger = logger; options.logger = logger;
@@ -308,7 +334,7 @@ export const UpdateProvider = ({
} }
return false; return false;
}, },
[checkUpdate, options], [checkUpdate, options, client],
); );
const parseTestQrCode = useCallback( const parseTestQrCode = useCallback(
@@ -328,6 +354,9 @@ export const UpdateProvider = ({
}, [client]); }, [client]);
useEffect(() => { useEffect(() => {
if (!assertWeb()) {
return;
}
const parseLinking = (url: string | null) => { const parseLinking = (url: string | null) => {
if (!url) { if (!url) {
return; return;
@@ -371,6 +400,7 @@ export const UpdateProvider = ({
progress, progress,
downloadAndInstallApk, downloadAndInstallApk,
getCurrentVersionInfo, getCurrentVersionInfo,
currentVersionInfo,
parseTestQrCode, parseTestQrCode,
restartApp, restartApp,
}}> }}>

View File

@@ -1,14 +1,10 @@
export interface CheckResult { export interface VersionInfo {
upToDate?: true; name: string;
expired?: true; hash: string;
downloadUrl?: string; description: string;
update?: true; metaInfo: string;
name?: string; // version name config: {
hash?: string; rollout: {
description?: string;
metaInfo?: string;
config?: {
rollout?: {
[packageVersion: string]: number; [packageVersion: string]: number;
}; };
[key: string]: any; [key: string]: any;
@@ -16,11 +12,27 @@ export interface CheckResult {
pdiff?: string; pdiff?: string;
diff?: string; diff?: string;
full?: string; full?: string;
paths?: string[]; }
interface RootResult {
upToDate?: true;
expired?: true;
downloadUrl?: string;
update?: true;
paused?: 'app' | 'package'; paused?: 'app' | 'package';
message?: string; message?: string;
paths?: string[];
} }
export type CheckResult = RootResult & VersionInfo;
export type CheckResultV2 = RootResult & {
versions?: VersionInfo[];
};
export type MixedCheckResult = CheckResult | CheckResultV2;
export interface ProgressData { export interface ProgressData {
hash: string; hash: string;
received: number; received: number;
@@ -93,6 +105,7 @@ export interface ClientOptions {
beforeDownloadUpdate?: (info: CheckResult) => Promise<boolean>; beforeDownloadUpdate?: (info: CheckResult) => Promise<boolean>;
afterDownloadUpdate?: (info: CheckResult) => Promise<boolean>; afterDownloadUpdate?: (info: CheckResult) => Promise<boolean>;
onPackageExpired?: (info: CheckResult) => Promise<boolean>; onPackageExpired?: (info: CheckResult) => Promise<boolean>;
overridePackageVersion?: string;
} }
export interface UpdateTestPayload { export interface UpdateTestPayload {

Some files were not shown because too many files have changed in this diff Show More