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

Compare commits

...

14 Commits

Author SHA1 Message Date
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
sunnylqm
905413e424 fix jdk 1.8 support 2025-04-14 08:44:12 +08:00
sunnylqm
ee36fd9334 support jdk 1.8 2025-04-13 22:12:41 +08:00
sunnylqm
5b46071834 10.28.3 2025-04-13 14:31:00 +08:00
sunnylqm
a6802bdd44 support expo < 51 2025-04-13 14:22:06 +08:00
波仔糕
97848e7b13 support to harmony local debug mode (#493)
* support to Expo

* update

* update

* update

* support to harmony local debug

* udpate

* update

---------

Co-authored-by: Steven <steven@Stevens-MacBook-Pro.local>
2025-04-12 19:20:49 +08:00
39 changed files with 5430 additions and 12965 deletions

View File

@@ -6,6 +6,7 @@
Example
android/build
.vscode
.github/
# OSX
#
@@ -45,8 +46,12 @@ node_modules/
npm-debug.log
Example
yarn.lock
bun.lock
domains.json
endpoints.json
endpoints_cresc.json
tea.yaml
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,24 @@
{
"name": "expousepushy",
"version": "1.0.0",
"main": "index.js",
"scripts": {
"start": "expo start",
"android": "expo run:android",
"ios": "expo run:ios",
"web": "expo start --web"
},
"dependencies": {
"expo": "~52.0.46",
"expo-status-bar": "~2.0.1",
"react": "18.3.1",
"react-native": "0.76.9",
"react-native-update": "^10.28.7"
},
"devDependencies": {
"@babel/core": "^7.25.2",
"@types/react": "~18.3.12",
"typescript": "^5.3.3"
},
"private": true
}

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

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

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 743 KiB

View File

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

View File

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

File diff suppressed because one or more lines are too long

View File

@@ -1,4 +1,4 @@
{
"pushy_build_time": "2025-03-09T01:57:42.464Z",
"pushy_build_time": "2025-04-12T11:12:43.423Z",
"versionName": "1.0.0"
}

View File

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

View File

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

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

@@ -22,21 +22,49 @@ def supportsNamespace() {
return major >= 8
}
def isExpoProject() {
def checkProjectInfo() {
def hasExpoModulesCore = rootProject.subprojects.any { it.name == 'expo-modules-core' }
def packageJsonFile = new File(rootProject.projectDir.parentFile, 'package.json')
def hasExpoDependency = false
def projectVersion = '1.0.0' // Default version
if (packageJsonFile.exists()) {
def packageJson = new groovy.json.JsonSlurper().parseText(packageJsonFile.text)
hasExpoDependency = (packageJson.dependencies?.expo != null) ||
(packageJson.devDependencies?.expo != null)
projectVersion = packageJson.version ?: '1.0.0' // Get project version
// Check for expo dependency and version >= 50
String expoVersionString = packageJson.dependencies?.expo ?: packageJson.devDependencies?.expo
boolean expoVersionIsHighEnough = false
if (expoVersionString) {
try {
// Extract the first number sequence as the major version
def matcher = (expoVersionString =~ /(\d+)/)
if (matcher.find()) {
int majorVersion = matcher[0][0].toInteger()
if (majorVersion >= 50) {
expoVersionIsHighEnough = true
}
}
} catch (NumberFormatException e) {
// Handle error if version parsing fails, maybe log a warning
println "Warning: Could not parse Expo version string: ${expoVersionString}"
}
}
hasExpoDependency = expoVersionIsHighEnough // Update based on version check
}
return hasExpoModulesCore || hasExpoDependency
def isExpo = hasExpoModulesCore && hasExpoDependency
// Return a map containing both pieces of information
return [isExpo: isExpo, version: projectVersion]
}
def expoProject = isExpoProject()
// Get project info map
def projectInfo = checkProjectInfo()
// Extract info into variables
def projectVersion = projectInfo.version
def expoProject = projectInfo.isExpo
apply plugin: 'com.android.library'
if (isNewArchitectureEnabled()) {
@@ -45,16 +73,16 @@ if (isNewArchitectureEnabled()) {
if (expoProject) {
group = 'expo.modules.pushy'
version = '1.0.0'
version = projectVersion
def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
apply from: expoModulesCorePlugin
applyKotlinExpoModulesCorePlugin()
useCoreDependencies()
useExpoPublishing()
useCoreDependencies()
} else {
group = 'cn.reactnative.modules.update'
version = '1.0.0'
version = projectVersion
}
android {

View File

@@ -120,14 +120,13 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
}
@Override
protected void onProgressUpdate(long[]... values) {
protected void onProgressUpdate(final long[]... values) {
super.onProgressUpdate(values);
WritableMap params = Arguments.createMap();
params.putDouble("received", (values[0][0]));
params.putDouble("total", (values[0][1]));
params.putString("hash", this.hash);
sendEvent("RCTPushyDownloadProgress", params);
}
byte[] buffer = new byte[1024*4];
@@ -452,7 +451,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
}
@Override
protected Void doInBackground(DownloadTaskParams... params) {
protected Void doInBackground(final DownloadTaskParams... params) {
int taskType = params[0].type;
try {
switch (taskType) {

View File

@@ -24,7 +24,7 @@ public class UpdateModuleImpl {
public static final String NAME = "Pushy";
public static void downloadFullUpdate(UpdateContext updateContext, ReadableMap options, Promise promise) {
public static void downloadFullUpdate(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
String url = options.getString("updateUrl");
String hash = options.getString("hash");
updateContext.downloadFullUpdate(url, hash, new UpdateContext.DownloadFileListener() {
@@ -40,7 +40,7 @@ public class UpdateModuleImpl {
});
}
public static void downloadAndInstallApk(UpdateContext updateContext, ReadableMap options, Promise promise) {
public static void downloadAndInstallApk(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
String url = options.getString("url");
String hash = options.getString("hash");
String target = options.getString("target");
@@ -63,7 +63,7 @@ public class UpdateModuleImpl {
UpdateModule.installApk(toInstall);
}
public static void downloadPatchFromPackage(UpdateContext updateContext, ReadableMap options, Promise promise) {
public static void downloadPatchFromPackage(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
String url = options.getString("updateUrl");
String hash = options.getString("hash");
updateContext.downloadPatchFromApk(url, hash, new UpdateContext.DownloadFileListener() {
@@ -79,7 +79,7 @@ public class UpdateModuleImpl {
});
}
public static void downloadPatchFromPpk(UpdateContext updateContext, ReadableMap options, Promise promise) {
public static void downloadPatchFromPpk(UpdateContext updateContext, final ReadableMap options, final Promise promise) {
try {
String url = options.getString("updateUrl");
String hash = options.getString("hash");
@@ -102,7 +102,7 @@ public class UpdateModuleImpl {
}
}
public static void reloadUpdate(UpdateContext updateContext, ReactApplicationContext mContext, ReadableMap options, Promise promise) {
public static void reloadUpdate(final UpdateContext updateContext,final ReactApplicationContext mContext, final ReadableMap options, final Promise promise) {
final String hash = options.getString("hash");
UiThreadUtil.runOnUiThread(new Runnable() {
@Override
@@ -176,7 +176,7 @@ public class UpdateModuleImpl {
});
}
public static void restartApp(final ReactApplicationContext mContext, Promise promise) {
public static void restartApp(final ReactApplicationContext mContext, final Promise promise) {
UiThreadUtil.runOnUiThread(new Runnable() {
@Override
public void run() {
@@ -206,7 +206,7 @@ public class UpdateModuleImpl {
});
}
public static void setNeedUpdate(UpdateContext updateContext, ReadableMap options, Promise promise) {
public static void setNeedUpdate(final UpdateContext updateContext, final ReadableMap options, final Promise promise) {
final String hash = options.getString("hash");
UiThreadUtil.runOnUiThread(new Runnable() {
@Override
@@ -222,7 +222,7 @@ public class UpdateModuleImpl {
});
}
public static void markSuccess(UpdateContext updateContext, Promise promise) {
public static void markSuccess(final UpdateContext updateContext, final Promise promise) {
UiThreadUtil.runOnUiThread(new Runnable() {
@Override
public void run() {
@@ -232,7 +232,7 @@ public class UpdateModuleImpl {
});
}
public static void setUuid(UpdateContext updateContext, String uuid, Promise promise) {
public static void setUuid(final UpdateContext updateContext, final String uuid, final Promise promise) {
UiThreadUtil.runOnUiThread(new Runnable() {
@Override
public void run() {
@@ -253,7 +253,7 @@ public class UpdateModuleImpl {
}
public static void setLocalHashInfo(UpdateContext updateContext, final String hash, final String info, Promise promise) {
public static void setLocalHashInfo(final UpdateContext updateContext, final String hash, final String info, final Promise promise) {
UiThreadUtil.runOnUiThread(new Runnable() {
@Override
public void run() {
@@ -268,7 +268,7 @@ public class UpdateModuleImpl {
});
}
public static void getLocalHashInfo(UpdateContext updateContext, final String hash, Promise promise) {
public static void getLocalHashInfo(UpdateContext updateContext, final String hash, final Promise promise) {
String value = updateContext.getKv("hash_" + hash);
if (check(value)) {
promise.resolve(value);

610
bun.lock Executable file → Normal file

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

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