mirror of
https://gitcode.com/gh_mirrors/re/react-native-pushy.git
synced 2025-09-17 22:06:11 +08:00
Compare commits
28 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
f01df80b5c | ||
![]() |
0ced603d97 | ||
![]() |
d180702ebf | ||
![]() |
1614a21968 | ||
![]() |
d7879ac2fe | ||
![]() |
a564770597 | ||
![]() |
7229f8847a | ||
![]() |
1daafb0142 | ||
![]() |
c1679a4cea | ||
![]() |
7ab7dffb0f | ||
![]() |
8622935bdf | ||
![]() |
b747b1f356 | ||
![]() |
7752581470 | ||
![]() |
33eb89d2a7 | ||
![]() |
d111bf5a9c | ||
![]() |
23346a5f1d | ||
![]() |
5aca2104c2 | ||
![]() |
fe0a05db3d | ||
![]() |
2b287786ff | ||
![]() |
7d128900cd | ||
![]() |
189e3ec78e | ||
![]() |
821722165a | ||
![]() |
6cb53ac655 | ||
![]() |
7b9a24168a | ||
![]() |
c6354bbedc | ||
![]() |
b53878c291 | ||
![]() |
ab01312f8d | ||
![]() |
44784b6d3e |
@@ -9,6 +9,19 @@ def isNewArchitectureEnabled() {
|
|||||||
return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
|
return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def supportsNamespace() {
|
||||||
|
def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
|
||||||
|
def major = parsed[0].toInteger()
|
||||||
|
def minor = parsed[1].toInteger()
|
||||||
|
|
||||||
|
// Namespace support was added in 7.3.0
|
||||||
|
if (major == 7 && minor >= 3) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
return major >= 8
|
||||||
|
}
|
||||||
|
|
||||||
apply plugin: 'com.android.library'
|
apply plugin: 'com.android.library'
|
||||||
if (isNewArchitectureEnabled()) {
|
if (isNewArchitectureEnabled()) {
|
||||||
apply plugin: 'com.facebook.react'
|
apply plugin: 'com.facebook.react'
|
||||||
@@ -16,6 +29,16 @@ if (isNewArchitectureEnabled()) {
|
|||||||
|
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
|
||||||
|
if (supportsNamespace()) {
|
||||||
|
namespace "cn.reactnative.modules.update"
|
||||||
|
|
||||||
|
sourceSets {
|
||||||
|
main {
|
||||||
|
manifest.srcFile "src/main/AndroidManifestNew.xml"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
compileSdkVersion safeExtGet('compileSdkVersion', 28)
|
compileSdkVersion safeExtGet('compileSdkVersion', 28)
|
||||||
buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
|
buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
|
||||||
|
|
||||||
|
1
android/proguard.pro
vendored
1
android/proguard.pro
vendored
@@ -1,2 +1,3 @@
|
|||||||
-keepnames class cn.reactnative.modules.update.DownloadTask { *; }
|
-keepnames class cn.reactnative.modules.update.DownloadTask { *; }
|
||||||
|
-keepnames class cn.reactnative.modules.update.UpdateModuleImpl { *; }
|
||||||
-keepnames class com.facebook.react.ReactInstanceManager { *; }
|
-keepnames class com.facebook.react.ReactInstanceManager { *; }
|
@@ -1,9 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="cn.reactnative.modules.update">
|
package="cn.reactnative.modules.update">
|
||||||
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
|
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
|
||||||
<application>
|
<application>
|
||||||
<meta-data android:name="pushy_build_time" android:value="@string/pushy_build_time" />
|
<meta-data android:name="pushy_build_time" android:value="@string/pushy_build_time" />
|
||||||
<provider
|
<provider
|
||||||
|
14
android/src/main/AndroidManifestNew.xml
Normal file
14
android/src/main/AndroidManifestNew.xml
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<application>
|
||||||
|
<meta-data android:name="pushy_build_time" android:value="@string/pushy_build_time" />
|
||||||
|
<provider
|
||||||
|
android:name=".PushyFileProvider"
|
||||||
|
android:authorities="${applicationId}.pushy.fileprovider"
|
||||||
|
android:exported="false"
|
||||||
|
android:grantUriPermissions="true">
|
||||||
|
<meta-data
|
||||||
|
android:name="android.support.FILE_PROVIDER_PATHS"
|
||||||
|
android:resource="@xml/pushy_file_paths" />
|
||||||
|
</provider>
|
||||||
|
</application>
|
||||||
|
</manifest>
|
@@ -237,19 +237,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
|
|||||||
while (entries.hasMoreElements()) {
|
while (entries.hasMoreElements()) {
|
||||||
ZipEntry ze = entries.nextElement();
|
ZipEntry ze = entries.nextElement();
|
||||||
|
|
||||||
String fn = ze.getName();
|
zipFile.unzipToPath(ze, param.unzipDirectory);
|
||||||
File fmd = new File(param.unzipDirectory, fn);
|
|
||||||
|
|
||||||
if (UpdateContext.DEBUG) {
|
|
||||||
Log.d("RNUpdate", "Unzipping " + fn);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ze.isDirectory()) {
|
|
||||||
fmd.mkdirs();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
zipFile.unzipToFile(ze, fmd);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
zipFile.close();
|
zipFile.close();
|
||||||
@@ -324,8 +312,15 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
|
|||||||
} else {
|
} else {
|
||||||
target = copyList.get((from));
|
target = copyList.get((from));
|
||||||
}
|
}
|
||||||
target.add(new File(param.unzipDirectory, to));
|
File toFile = new File(param.unzipDirectory, to);
|
||||||
//copyFromResource(from, new File(param.unzipDirectory, to));
|
|
||||||
|
// Fixing a Zip Path Traversal Vulnerability
|
||||||
|
// https://support.google.com/faqs/answer/9294009
|
||||||
|
String canonicalPath = toFile.getCanonicalPath();
|
||||||
|
if (!canonicalPath.startsWith(param.unzipDirectory.getCanonicalPath() + File.separator)) {
|
||||||
|
throw new SecurityException("Illegal name: " + to);
|
||||||
|
}
|
||||||
|
target.add(toFile);
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -339,18 +334,9 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
|
|||||||
fout.close();
|
fout.close();
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
File fmd = new File(param.unzipDirectory, fn);
|
|
||||||
|
|
||||||
if (UpdateContext.DEBUG) {
|
|
||||||
Log.d("RNUpdate", "Unzipping " + fn);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ze.isDirectory()) {
|
zipFile.unzipToPath(ze, param.unzipDirectory);
|
||||||
fmd.mkdirs();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
zipFile.unzipToFile(ze, fmd);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
zipFile.close();
|
zipFile.close();
|
||||||
@@ -419,18 +405,8 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
|
|||||||
fout.close();
|
fout.close();
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
File fmd = new File(param.unzipDirectory, fn);
|
|
||||||
|
|
||||||
if (UpdateContext.DEBUG) {
|
zipFile.unzipToPath(ze, param.unzipDirectory);
|
||||||
Log.d("RNUpdate", "Unzipping " + fn);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ze.isDirectory()) {
|
|
||||||
fmd.mkdirs();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
zipFile.unzipToFile(ze, fmd);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
zipFile.close();
|
zipFile.close();
|
||||||
|
@@ -1,5 +1,7 @@
|
|||||||
package cn.reactnative.modules.update;
|
package cn.reactnative.modules.update;
|
||||||
|
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
import java.io.BufferedInputStream;
|
import java.io.BufferedInputStream;
|
||||||
import java.io.BufferedOutputStream;
|
import java.io.BufferedOutputStream;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@@ -10,12 +12,15 @@ import java.util.Enumeration;
|
|||||||
import java.util.zip.ZipEntry;
|
import java.util.zip.ZipEntry;
|
||||||
import java.util.zip.ZipFile;
|
import java.util.zip.ZipFile;
|
||||||
|
|
||||||
|
|
||||||
public class SafeZipFile extends ZipFile {
|
public class SafeZipFile extends ZipFile {
|
||||||
|
|
||||||
public SafeZipFile(File file) throws IOException {
|
public SafeZipFile(File file) throws IOException {
|
||||||
super(file);
|
super(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static final int BUFFER_SIZE = 8192;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Enumeration<? extends ZipEntry> entries() {
|
public Enumeration<? extends ZipEntry> entries() {
|
||||||
return new SafeZipEntryIterator(super.entries());
|
return new SafeZipEntryIterator(super.entries());
|
||||||
@@ -43,40 +48,46 @@ public class SafeZipFile extends ZipFile {
|
|||||||
* avoid ZipperDown
|
* avoid ZipperDown
|
||||||
*/
|
*/
|
||||||
if (null != name && (name.contains("../") || name.contains("..\\"))) {
|
if (null != name && (name.contains("../") || name.contains("..\\"))) {
|
||||||
throw new SecurityException("illegal entry: " + entry.getName());
|
throw new SecurityException("illegal entry: " + name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void unzipToFile(ZipEntry entry, File output) throws IOException {
|
public void unzipToPath(ZipEntry ze, File targetPath) throws IOException {
|
||||||
InputStream inputStream = null;
|
String name = ze.getName();
|
||||||
try {
|
File target = new File(targetPath, name);
|
||||||
inputStream = getInputStream(entry);
|
|
||||||
writeOutInputStream(output, inputStream);
|
// Fixing a Zip Path Traversal Vulnerability
|
||||||
} finally {
|
// https://support.google.com/faqs/answer/9294009
|
||||||
if (inputStream != null) {
|
String canonicalPath = target.getCanonicalPath();
|
||||||
inputStream.close();
|
if (!canonicalPath.startsWith(targetPath.getCanonicalPath() + File.separator)) {
|
||||||
|
throw new SecurityException("Illegal name: " + name);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (UpdateContext.DEBUG) {
|
||||||
|
Log.d("RNUpdate", "Unzipping " + name);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ze.isDirectory()) {
|
||||||
|
target.mkdirs();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
unzipToFile(ze, target);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void unzipToFile(ZipEntry ze, File target) throws IOException {
|
||||||
|
try (InputStream inputStream = getInputStream(ze)) {
|
||||||
|
try (BufferedOutputStream output = new BufferedOutputStream(new FileOutputStream(target));
|
||||||
|
BufferedInputStream input = new BufferedInputStream(inputStream)) {
|
||||||
|
byte[] buffer = new byte[BUFFER_SIZE];
|
||||||
|
int n;
|
||||||
|
while ((n = input.read(buffer, 0, BUFFER_SIZE)) >= 0) {
|
||||||
|
output.write(buffer, 0, n);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void writeOutInputStream(File file, InputStream inputStream) throws IOException {
|
|
||||||
BufferedOutputStream output = null;
|
|
||||||
try {
|
|
||||||
output = new BufferedOutputStream(
|
|
||||||
new FileOutputStream(file));
|
|
||||||
BufferedInputStream input = new BufferedInputStream(inputStream);
|
|
||||||
byte b[] = new byte[8192];
|
|
||||||
int n;
|
|
||||||
while ((n = input.read(b, 0, 8192)) >= 0) {
|
|
||||||
output.write(b, 0, n);
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
if (output != null) {
|
|
||||||
output.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
@@ -57,7 +57,7 @@ public class UpdateModule extends NativeUpdateSpec {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void downloadFullUpdate(ReadableMap options, final Promise promise) {
|
public void downloadFullUpdate(ReadableMap options, final Promise promise) {
|
||||||
UpdateModuleImpl.downloadFullUpdate(this.updateContext,options,promise);
|
UpdateModuleImpl.downloadFullUpdate(this.updateContext,options,promise);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -349,8 +349,7 @@ RCT_EXPORT_METHOD(reloadUpdate:(NSDictionary *)options
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
RCT_EXPORT_METHOD(markSuccess:
|
RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
|
||||||
resolver:(RCTPromiseResolveBlock)resolve
|
|
||||||
rejecter:(RCTPromiseRejectBlock)reject)
|
rejecter:(RCTPromiseRejectBlock)reject)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
101
lib/endpoint.ts
101
lib/endpoint.ts
@@ -1,75 +1,34 @@
|
|||||||
|
import { logger, promiseAny } from './utils';
|
||||||
|
|
||||||
let currentEndpoint = 'https://update.react-native.cn/api';
|
let currentEndpoint = 'https://update.react-native.cn/api';
|
||||||
|
let backupEndpoints: string[] = [
|
||||||
|
'https://pushy-koa-qgbgqmcpis.cn-beijing.fcapp.run',
|
||||||
|
'https://update.reactnative.cn/api',
|
||||||
|
];
|
||||||
|
let backupEndpointsQueryUrls = [
|
||||||
|
'https://gitee.com/sunnylqm/react-native-pushy/raw/master/endpoints.json',
|
||||||
|
'https://cdn.jsdelivr.net/gh/reactnativecn/react-native-pushy@master/endpoints.json',
|
||||||
|
];
|
||||||
|
|
||||||
function ping(url: string, rejectImmediate?: boolean) {
|
export async function updateBackupEndpoints() {
|
||||||
return new Promise((resolve, reject) => {
|
if (backupEndpointsQueryUrls) {
|
||||||
const xhr = new XMLHttpRequest();
|
|
||||||
xhr.onreadystatechange = (e) => {
|
|
||||||
if (xhr.readyState !== 4) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (xhr.status === 200) {
|
|
||||||
resolve(url);
|
|
||||||
} else {
|
|
||||||
rejectImmediate ? reject() : setTimeout(reject, 5000);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
xhr.open('HEAD', url);
|
|
||||||
xhr.send();
|
|
||||||
xhr.timeout = 5000;
|
|
||||||
xhr.ontimeout = reject;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function logger(...args: any[]) {
|
|
||||||
console.log('Pushy: ', ...args);
|
|
||||||
}
|
|
||||||
|
|
||||||
let backupEndpoints: string[] = [];
|
|
||||||
let backupEndpointsQueryUrl: string | null =
|
|
||||||
'https://cdn.jsdelivr.net/gh/reactnativecn/react-native-pushy@master/endpoints.json';
|
|
||||||
|
|
||||||
export async function tryBackupEndpoints() {
|
|
||||||
if (!backupEndpoints.length && !backupEndpointsQueryUrl) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
await ping(getStatusUrl(), true);
|
|
||||||
logger('current endpoint ok', currentEndpoint);
|
|
||||||
return;
|
|
||||||
} catch (e) {
|
|
||||||
logger('current endpoint failed', currentEndpoint);
|
|
||||||
}
|
|
||||||
if (!backupEndpoints.length && backupEndpointsQueryUrl) {
|
|
||||||
try {
|
try {
|
||||||
const resp = await fetch(backupEndpointsQueryUrl);
|
const resp = await promiseAny(
|
||||||
backupEndpoints = await resp.json();
|
backupEndpointsQueryUrls.map(queryUrl => fetch(queryUrl)),
|
||||||
logger('get remote endpoints:', backupEndpoints);
|
);
|
||||||
|
const remoteEndpoints = await resp.json();
|
||||||
|
if (Array.isArray(remoteEndpoints)) {
|
||||||
|
backupEndpoints = Array.from(
|
||||||
|
new Set([...backupEndpoints, ...remoteEndpoints]),
|
||||||
|
);
|
||||||
|
logger('fetch remote endpoints:', remoteEndpoints);
|
||||||
|
logger('merged backup endpoints:', backupEndpoints);
|
||||||
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger('get remote endpoints failed');
|
logger('fetch remote endpoints failed');
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
await pickFatestAvailableEndpoint();
|
return backupEndpoints;
|
||||||
}
|
|
||||||
|
|
||||||
async function pickFatestAvailableEndpoint(endpoints = backupEndpoints) {
|
|
||||||
const fastestEndpoint = await Promise.race(
|
|
||||||
endpoints.map(pingAndReturnEndpoint),
|
|
||||||
);
|
|
||||||
if (typeof fastestEndpoint === 'string') {
|
|
||||||
logger(`pick endpoint: ${fastestEndpoint}`);
|
|
||||||
currentEndpoint = fastestEndpoint;
|
|
||||||
} else {
|
|
||||||
logger('all remote endpoints failed');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function pingAndReturnEndpoint(endpoint = currentEndpoint) {
|
|
||||||
return ping(getStatusUrl(endpoint)).then(() => endpoint);
|
|
||||||
}
|
|
||||||
|
|
||||||
function getStatusUrl(endpoint = currentEndpoint) {
|
|
||||||
return `${endpoint}/status`;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getCheckUrl(APPKEY, endpoint = currentEndpoint) {
|
export function getCheckUrl(APPKEY, endpoint = currentEndpoint) {
|
||||||
@@ -85,19 +44,17 @@ export function getCheckUrl(APPKEY, endpoint = currentEndpoint) {
|
|||||||
export function setCustomEndpoints({
|
export function setCustomEndpoints({
|
||||||
main,
|
main,
|
||||||
backups,
|
backups,
|
||||||
backupQueryUrl,
|
backupQueryUrls,
|
||||||
}: {
|
}: {
|
||||||
main: string;
|
main: string;
|
||||||
backups?: string[];
|
backups?: string[];
|
||||||
backupQueryUrl?: string;
|
backupQueryUrls?: string[];
|
||||||
}) {
|
}) {
|
||||||
currentEndpoint = main;
|
currentEndpoint = main;
|
||||||
backupEndpointsQueryUrl = null;
|
|
||||||
if (Array.isArray(backups) && backups.length > 0) {
|
if (Array.isArray(backups) && backups.length > 0) {
|
||||||
backupEndpoints = backups;
|
backupEndpoints = backups;
|
||||||
pickFatestAvailableEndpoint();
|
|
||||||
}
|
}
|
||||||
if (typeof backupQueryUrl === 'string') {
|
if (Array.isArray(backupQueryUrls) && backupQueryUrls.length > 0) {
|
||||||
backupEndpointsQueryUrl = backupQueryUrl;
|
backupEndpointsQueryUrls = backupQueryUrls;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -14,5 +14,5 @@ export const markSuccess = noop;
|
|||||||
export const downloadAndInstallApk = noop;
|
export const downloadAndInstallApk = noop;
|
||||||
export const setCustomEndpoints = noop;
|
export const setCustomEndpoints = noop;
|
||||||
export const getCurrentVersionInfo = noop;
|
export const getCurrentVersionInfo = noop;
|
||||||
export const simpleUpdate = noop;
|
export const simpleUpdate = (app) => app;
|
||||||
export const onEvents = noop;
|
export const onPushyEvents = noop;
|
||||||
|
142
lib/main.ts
142
lib/main.ts
@@ -1,5 +1,5 @@
|
|||||||
import {
|
import {
|
||||||
tryBackupEndpoints,
|
updateBackupEndpoints,
|
||||||
getCheckUrl,
|
getCheckUrl,
|
||||||
setCustomEndpoints,
|
setCustomEndpoints,
|
||||||
} from './endpoint';
|
} from './endpoint';
|
||||||
@@ -16,6 +16,7 @@ import {
|
|||||||
UpdateAvailableResult,
|
UpdateAvailableResult,
|
||||||
UpdateEventsListener,
|
UpdateEventsListener,
|
||||||
} from './type';
|
} from './type';
|
||||||
|
import { assertRelease, logger, promiseAny, testUrls } from './utils';
|
||||||
export { setCustomEndpoints };
|
export { setCustomEndpoints };
|
||||||
const {
|
const {
|
||||||
version: v,
|
version: v,
|
||||||
@@ -74,14 +75,10 @@ if (!uuid) {
|
|||||||
PushyModule.setUuid(uuid);
|
PushyModule.setUuid(uuid);
|
||||||
}
|
}
|
||||||
|
|
||||||
function logger(...args: string[]) {
|
|
||||||
console.log('Pushy: ', ...args);
|
|
||||||
}
|
|
||||||
|
|
||||||
const noop = () => {};
|
const noop = () => {};
|
||||||
let reporter: UpdateEventsListener = noop;
|
let reporter: UpdateEventsListener = noop;
|
||||||
|
|
||||||
export function onEvents(customReporter: UpdateEventsListener) {
|
export function onPushyEvents(customReporter: UpdateEventsListener) {
|
||||||
reporter = customReporter;
|
reporter = customReporter;
|
||||||
if (isRolledBack) {
|
if (isRolledBack) {
|
||||||
report({
|
report({
|
||||||
@@ -125,19 +122,15 @@ export const cInfo = {
|
|||||||
uuid,
|
uuid,
|
||||||
};
|
};
|
||||||
|
|
||||||
function assertRelease() {
|
let lastChecking;
|
||||||
if (__DEV__) {
|
const empty = {};
|
||||||
throw new Error('react-native-update 只能在 RELEASE 版本中运行.');
|
let lastResult: CheckResult;
|
||||||
}
|
export async function checkUpdate(APPKEY: string) {
|
||||||
}
|
|
||||||
|
|
||||||
let lastChecking = Date.now();
|
|
||||||
export async function checkUpdate(APPKEY: string, isRetry?: boolean) {
|
|
||||||
assertRelease();
|
assertRelease();
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
if (now - lastChecking < 1000 * 5) {
|
if (lastResult && lastChecking && now - lastChecking < 1000 * 60) {
|
||||||
logger('repeated checking, ignored');
|
// logger('repeated checking, ignored');
|
||||||
return;
|
return lastResult;
|
||||||
}
|
}
|
||||||
lastChecking = now;
|
lastChecking = now;
|
||||||
if (blockUpdate && blockUpdate.until > Date.now() / 1000) {
|
if (blockUpdate && blockUpdate.until > Date.now() / 1000) {
|
||||||
@@ -147,36 +140,51 @@ export async function checkUpdate(APPKEY: string, isRetry?: boolean) {
|
|||||||
blockUpdate.until * 1000,
|
blockUpdate.until * 1000,
|
||||||
).toLocaleString()}"之后重试。`,
|
).toLocaleString()}"之后重试。`,
|
||||||
});
|
});
|
||||||
return;
|
return lastResult || empty;
|
||||||
}
|
}
|
||||||
report({ type: 'checking' });
|
report({ type: 'checking' });
|
||||||
|
const fetchPayload = {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
Accept: 'application/json',
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
packageVersion,
|
||||||
|
hash: currentVersion,
|
||||||
|
buildTime,
|
||||||
|
cInfo,
|
||||||
|
}),
|
||||||
|
};
|
||||||
let resp;
|
let resp;
|
||||||
try {
|
try {
|
||||||
resp = await fetch(getCheckUrl(APPKEY), {
|
resp = await fetch(getCheckUrl(APPKEY), fetchPayload);
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
Accept: 'application/json',
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify({
|
|
||||||
packageVersion,
|
|
||||||
hash: currentVersion,
|
|
||||||
buildTime,
|
|
||||||
cInfo,
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (isRetry) {
|
report({
|
||||||
report({
|
type: 'errorChecking',
|
||||||
type: 'errorChecking',
|
message: '无法连接主更新服务器,尝试备用节点',
|
||||||
message: '无法连接更新服务器,请检查网络连接后重试',
|
});
|
||||||
});
|
const backupEndpoints = await updateBackupEndpoints();
|
||||||
return;
|
if (backupEndpoints) {
|
||||||
|
try {
|
||||||
|
resp = await promiseAny(
|
||||||
|
backupEndpoints.map(endpoint =>
|
||||||
|
fetch(getCheckUrl(APPKEY, endpoint), fetchPayload),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
} catch {}
|
||||||
}
|
}
|
||||||
await tryBackupEndpoints();
|
}
|
||||||
return checkUpdate(APPKEY, true);
|
if (!resp) {
|
||||||
|
report({
|
||||||
|
type: 'errorChecking',
|
||||||
|
message: '无法连接更新服务器,请检查网络连接后重试',
|
||||||
|
});
|
||||||
|
return lastResult || empty;
|
||||||
}
|
}
|
||||||
const result: CheckResult = await resp.json();
|
const result: CheckResult = await resp.json();
|
||||||
|
|
||||||
|
lastResult = result;
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
checkOperation(result.op);
|
checkOperation(result.op);
|
||||||
|
|
||||||
@@ -186,7 +194,6 @@ export async function checkUpdate(APPKEY: string, isRetry?: boolean) {
|
|||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
message: result.message,
|
message: result.message,
|
||||||
});
|
});
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
@@ -198,7 +205,7 @@ function checkOperation(
|
|||||||
if (!Array.isArray(op)) {
|
if (!Array.isArray(op)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
op.forEach((action) => {
|
op.forEach(action => {
|
||||||
if (action.type === 'block') {
|
if (action.type === 'block') {
|
||||||
blockUpdate = {
|
blockUpdate = {
|
||||||
reason: action.reason,
|
reason: action.reason,
|
||||||
@@ -243,7 +250,7 @@ export async function downloadUpdate(
|
|||||||
const downloadCallback = eventListeners.onDownloadProgress;
|
const downloadCallback = eventListeners.onDownloadProgress;
|
||||||
progressHandler = eventEmitter.addListener(
|
progressHandler = eventEmitter.addListener(
|
||||||
'RCTPushyDownloadProgress',
|
'RCTPushyDownloadProgress',
|
||||||
(progressData) => {
|
progressData => {
|
||||||
if (progressData.hash === options.hash) {
|
if (progressData.hash === options.hash) {
|
||||||
downloadCallback(progressData);
|
downloadCallback(progressData);
|
||||||
}
|
}
|
||||||
@@ -253,11 +260,12 @@ export async function downloadUpdate(
|
|||||||
}
|
}
|
||||||
let succeeded = false;
|
let succeeded = false;
|
||||||
report({ type: 'downloading' });
|
report({ type: 'downloading' });
|
||||||
if (options.diffUrl) {
|
const diffUrl = (await testUrls(options.diffUrls)) || options.diffUrl;
|
||||||
|
if (diffUrl) {
|
||||||
logger('downloading diff');
|
logger('downloading diff');
|
||||||
try {
|
try {
|
||||||
await PushyModule.downloadPatchFromPpk({
|
await PushyModule.downloadPatchFromPpk({
|
||||||
updateUrl: options.diffUrl,
|
updateUrl: diffUrl,
|
||||||
hash: options.hash,
|
hash: options.hash,
|
||||||
originHash: currentVersion,
|
originHash: currentVersion,
|
||||||
});
|
});
|
||||||
@@ -266,28 +274,34 @@ export async function downloadUpdate(
|
|||||||
logger(`diff error: ${e.message}, try pdiff`);
|
logger(`diff error: ${e.message}, try pdiff`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!succeeded && options.pdiffUrl) {
|
if (!succeeded) {
|
||||||
logger('downloading pdiff');
|
const pdiffUrl = (await testUrls(options.pdiffUrls)) || options.pdiffUrl;
|
||||||
try {
|
if (pdiffUrl) {
|
||||||
await PushyModule.downloadPatchFromPackage({
|
logger('downloading pdiff');
|
||||||
updateUrl: options.pdiffUrl,
|
try {
|
||||||
hash: options.hash,
|
await PushyModule.downloadPatchFromPackage({
|
||||||
});
|
updateUrl: pdiffUrl,
|
||||||
succeeded = true;
|
hash: options.hash,
|
||||||
} catch (e) {
|
});
|
||||||
logger(`pdiff error: ${e.message}, try full patch`);
|
succeeded = true;
|
||||||
|
} catch (e) {
|
||||||
|
logger(`pdiff error: ${e.message}, try full patch`);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!succeeded && options.updateUrl) {
|
if (!succeeded) {
|
||||||
logger('downloading full patch');
|
const updateUrl = (await testUrls(options.updateUrls)) || options.updateUrl;
|
||||||
try {
|
if (updateUrl) {
|
||||||
await PushyModule.downloadFullUpdate({
|
logger('downloading full patch');
|
||||||
updateUrl: options.updateUrl,
|
try {
|
||||||
hash: options.hash,
|
await PushyModule.downloadFullUpdate({
|
||||||
});
|
updateUrl: updateUrl,
|
||||||
succeeded = true;
|
hash: options.hash,
|
||||||
} catch (e) {
|
});
|
||||||
logger(`full patch error: ${e.message}`);
|
succeeded = true;
|
||||||
|
} catch (e) {
|
||||||
|
logger(`full patch error: ${e.message}`);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
progressHandler && progressHandler.remove();
|
progressHandler && progressHandler.remove();
|
||||||
|
@@ -16,20 +16,20 @@ import {
|
|||||||
switchVersionLater,
|
switchVersionLater,
|
||||||
markSuccess,
|
markSuccess,
|
||||||
downloadAndInstallApk,
|
downloadAndInstallApk,
|
||||||
onEvents,
|
onPushyEvents,
|
||||||
} from './main';
|
} from './main';
|
||||||
import { UpdateEventsListener } from './type';
|
import { UpdateEventsListener } from './type';
|
||||||
|
|
||||||
export function simpleUpdate(
|
export function simpleUpdate(
|
||||||
WrappedComponent: ComponentType,
|
WrappedComponent: ComponentType,
|
||||||
options: { appKey?: string; onEvents?: UpdateEventsListener } = {},
|
options: { appKey?: string; onPushyEvents?: UpdateEventsListener } = {},
|
||||||
) {
|
) {
|
||||||
const { appKey, onEvents: eventListeners } = options;
|
const { appKey, onPushyEvents: eventListeners } = options;
|
||||||
if (!appKey) {
|
if (!appKey) {
|
||||||
throw new Error('appKey is required for simpleUpdate()');
|
throw new Error('appKey is required for simpleUpdate()');
|
||||||
}
|
}
|
||||||
if (typeof eventListeners === 'function') {
|
if (typeof eventListeners === 'function') {
|
||||||
onEvents(eventListeners);
|
onPushyEvents(eventListeners);
|
||||||
}
|
}
|
||||||
return __DEV__
|
return __DEV__
|
||||||
? WrappedComponent
|
? WrappedComponent
|
||||||
|
@@ -19,14 +19,18 @@ export interface UpdateAvailableResult {
|
|||||||
description: string;
|
description: string;
|
||||||
metaInfo: string;
|
metaInfo: string;
|
||||||
pdiffUrl: string;
|
pdiffUrl: string;
|
||||||
|
pdiffUrls?: string[];
|
||||||
diffUrl?: string;
|
diffUrl?: string;
|
||||||
|
diffUrls?: string[];
|
||||||
updateUrl?: string;
|
updateUrl?: string;
|
||||||
|
updateUrls?: string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export type CheckResult =
|
export type CheckResult =
|
||||||
| ExpiredResult
|
| ExpiredResult
|
||||||
| UpTodateResult
|
| UpTodateResult
|
||||||
| UpdateAvailableResult;
|
| UpdateAvailableResult
|
||||||
|
| {};
|
||||||
|
|
||||||
export interface ProgressData {
|
export interface ProgressData {
|
||||||
hash: string;
|
hash: string;
|
||||||
|
75
lib/utils.ts
Normal file
75
lib/utils.ts
Normal file
@@ -0,0 +1,75 @@
|
|||||||
|
import { Platform } from 'react-native';
|
||||||
|
|
||||||
|
export function logger(...args: any[]) {
|
||||||
|
console.log('Pushy: ', ...args);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function promiseAny<T>(promises: Promise<T>[]) {
|
||||||
|
return new Promise<T>((resolve, reject) => {
|
||||||
|
let count = 0;
|
||||||
|
|
||||||
|
promises.forEach((promise) => {
|
||||||
|
Promise.resolve(promise)
|
||||||
|
.then(resolve)
|
||||||
|
.catch(() => {
|
||||||
|
count++;
|
||||||
|
if (count === promises.length) {
|
||||||
|
reject(new Error('All promises were rejected'));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function assertRelease() {
|
||||||
|
if (__DEV__) {
|
||||||
|
throw new Error('react-native-update 只能在 RELEASE 版本中运行.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const ping =
|
||||||
|
Platform.OS === 'web'
|
||||||
|
? Promise.resolve
|
||||||
|
: async (url: string) => {
|
||||||
|
let pingFinished = false;
|
||||||
|
return Promise.race([
|
||||||
|
fetch(url, {
|
||||||
|
method: 'HEAD',
|
||||||
|
})
|
||||||
|
.then(({ status, statusText }) => {
|
||||||
|
pingFinished = true;
|
||||||
|
if (status === 200) {
|
||||||
|
return url;
|
||||||
|
}
|
||||||
|
logger('ping failed', url, status, statusText);
|
||||||
|
throw new Error('Ping failed');
|
||||||
|
})
|
||||||
|
.catch((e) => {
|
||||||
|
pingFinished = true;
|
||||||
|
logger('ping error', url, e);
|
||||||
|
throw e;
|
||||||
|
}),
|
||||||
|
new Promise((_, reject) =>
|
||||||
|
setTimeout(() => {
|
||||||
|
reject(new Error('Ping timeout'));
|
||||||
|
if (!pingFinished) {
|
||||||
|
logger('ping timeout', url);
|
||||||
|
}
|
||||||
|
}, 2000),
|
||||||
|
),
|
||||||
|
]);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const testUrls = async (urls?: string[]) => {
|
||||||
|
if (!urls?.length) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const ret = await promiseAny(urls.map(ping));
|
||||||
|
if (ret) {
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
|
logger('all ping failed, use first url:', urls[0]);
|
||||||
|
return urls[0];
|
||||||
|
};
|
12
package.json
12
package.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "react-native-update",
|
"name": "react-native-update",
|
||||||
"version": "9.0.1",
|
"version": "9.2.5",
|
||||||
"description": "react-native hot update",
|
"description": "react-native hot update",
|
||||||
"main": "lib/index.ts",
|
"main": "lib/index.ts",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
"url": "https://github.com/reactnativecn/react-native-pushy/issues"
|
"url": "https://github.com/reactnativecn/react-native-pushy/issues"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"react-native": ">=0.27.0"
|
"react-native": ">=0.57.0"
|
||||||
},
|
},
|
||||||
"homepage": "https://github.com/reactnativecn/react-native-pushy#readme",
|
"homepage": "https://github.com/reactnativecn/react-native-pushy#readme",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -57,12 +57,16 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/fs-extra": "^9.0.13",
|
"@types/fs-extra": "^9.0.13",
|
||||||
"@types/jest": "^29.2.1",
|
"@types/jest": "^29.2.1",
|
||||||
|
"@types/node": "^20.8.9",
|
||||||
|
"@types/react": "^18.2.33",
|
||||||
"detox": "^20.5.0",
|
"detox": "^20.5.0",
|
||||||
"firebase-tools": "^11.24.1",
|
"firebase-tools": "^11.24.1",
|
||||||
"fs-extra": "^9.1.0",
|
"fs-extra": "^9.1.0",
|
||||||
"jest": "^29.2.1",
|
"jest": "^29.2.1",
|
||||||
"pod-install": "^0.1.37",
|
"pod-install": "^0.1.37",
|
||||||
|
"react-native": "^0.72.6",
|
||||||
"ts-jest": "^29.0.3",
|
"ts-jest": "^29.0.3",
|
||||||
"typescript": "^4.1.3"
|
"typescript": "^5.2.2"
|
||||||
}
|
},
|
||||||
|
"packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user