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

test cdn urls

This commit is contained in:
sunnylqm
2024-07-26 15:37:32 +08:00
parent fcfc8c3dbb
commit ab1e62dba5
3 changed files with 34 additions and 25 deletions

View File

@@ -16,7 +16,7 @@ import {
UpdateAvailableResult, UpdateAvailableResult,
UpdateEventsListener, UpdateEventsListener,
} from './type'; } from './type';
import { assertRelease, logger } from './utils'; import { assertRelease, logger, testUrls } from './utils';
export { setCustomEndpoints }; export { setCustomEndpoints };
const { const {
version: v, version: v,
@@ -255,11 +255,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,
}); });
@@ -268,11 +269,13 @@ export async function downloadUpdate(
logger(`diff error: ${e.message}, try pdiff`); logger(`diff error: ${e.message}, try pdiff`);
} }
} }
if (!succeeded && options.pdiffUrl) { if (!succeeded) {
const pdiffUrl = (await testUrls(options.pdiffUrls)) || options.pdiffUrl;
if (pdiffUrl) {
logger('downloading pdiff'); logger('downloading pdiff');
try { try {
await PushyModule.downloadPatchFromPackage({ await PushyModule.downloadPatchFromPackage({
updateUrl: options.pdiffUrl, updateUrl: pdiffUrl,
hash: options.hash, hash: options.hash,
}); });
succeeded = true; succeeded = true;
@@ -280,11 +283,14 @@ export async function downloadUpdate(
logger(`pdiff error: ${e.message}, try full patch`); logger(`pdiff error: ${e.message}, try full patch`);
} }
} }
if (!succeeded && options.updateUrl) { }
if (!succeeded) {
const updateUrl = (await testUrls(options.updateUrls)) || options.updateUrl;
if (updateUrl) {
logger('downloading full patch'); logger('downloading full patch');
try { try {
await PushyModule.downloadFullUpdate({ await PushyModule.downloadFullUpdate({
updateUrl: options.updateUrl, updateUrl: updateUrl,
hash: options.hash, hash: options.hash,
}); });
succeeded = true; succeeded = true;
@@ -292,6 +298,7 @@ export async function downloadUpdate(
logger(`full patch error: ${e.message}`); logger(`full patch error: ${e.message}`);
} }
} }
}
progressHandler && progressHandler.remove(); progressHandler && progressHandler.remove();
if (!succeeded) { if (!succeeded) {
return report({ type: 'errorUpdate', data: { newVersion: options.hash } }); return report({ type: 'errorUpdate', data: { newVersion: options.hash } });

View File

@@ -19,8 +19,11 @@ 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 =

View File

@@ -23,10 +23,9 @@ const ping =
new Promise(r => setTimeout(() => r(null), 2000)), new Promise(r => setTimeout(() => r(null), 2000)),
]); ]);
const canUseGoogle = ping('https://www.google.com');
export const testUrls = async (urls?: string[]) => { export const testUrls = async (urls?: string[]) => {
if (!urls?.length || (await canUseGoogle)) { if (!urls?.length) {
return null; return null;
} }
return Promise.race(urls.map(ping)).catch(() => null); return Promise.race(urls.map(ping)).catch(() => null);