v10.2.1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.1.0",
+  "version": "10.2.1",
   "description": "react-native hot update",
   "main": "src/index.ts",
   "scripts": {

src/client.tsx

@@ -1,5 +1,5 @@
 import { CheckResult, PushyOptions, ProgressData, EventType } from './type';
-import { assertRelease, log } from './utils';
+import { assertRelease, log, testUrls } from './utils';
 import {
   EmitterSubscription,
   PermissionsAndroid,
@@ -225,8 +225,18 @@ export class Pushy {
     onDownloadProgress?: (data: ProgressData) => void,
   ) => {
     assertRelease();
-    const { hash, diffUrl, pdiffUrl, updateUrl, name, description, metaInfo } =
-      info;
+    const {
+      hash,
+      diffUrl: _diffUrl,
+      diffUrls,
+      pdiffUrl: _pdiffUrl,
+      pdiffUrls,
+      updateUrl: _updateUrl,
+      updateUrls,
+      name,
+      description,
+      metaInfo,
+    } = info;
     if (!info.update || !hash) {
       return;
     }
@@ -253,6 +263,7 @@ export class Pushy {
     }
     let succeeded = false;
     this.report({ type: 'downloading' });
+    const diffUrl = (await testUrls(diffUrls)) || _diffUrl;
     if (diffUrl) {
       log('downloading diff');
       try {
@@ -266,6 +277,7 @@ export class Pushy {
         log(`diff error: ${e.message}, try pdiff`);
       }
     }
+    const pdiffUrl = (await testUrls(pdiffUrls)) || _pdiffUrl;
     if (!succeeded && pdiffUrl) {
       log('downloading pdiff');
       try {
@@ -278,6 +290,7 @@ export class Pushy {
         log(`pdiff error: ${e.message}, try full patch`);
       }
     }
+    const updateUrl = (await testUrls(updateUrls)) || _updateUrl;
     if (!succeeded && updateUrl) {
       log('downloading full patch');
       try {

src/context.ts

@@ -2,29 +2,35 @@ import { createContext, useContext } from 'react';
 import { CheckResult, ProgressData } from './type';
 import { Pushy } from './client';
 
-const empty = {};
 const noop = () => {};
+const asyncNoop = () => Promise.resolve();
 
 export const defaultContext = {
-  checkUpdate: () => Promise.resolve(empty),
+  checkUpdate: asyncNoop,
   switchVersion: noop,
   switchVersionLater: noop,
   markSuccess: noop,
   dismissError: noop,
-  downloadUpdate: noop,
-  downloadAndInstallApk: noop,
+  downloadUpdate: asyncNoop,
+  downloadAndInstallApk: asyncNoop,
+  getCurrentVersionInfo: () => Promise.resolve({}),
   currentHash: '',
   packageVersion: '',
 };
 
 export const PushyContext = createContext<{
-  checkUpdate: () => void;
+  checkUpdate: () => Promise<void>;
   switchVersion: () => void;
   switchVersionLater: () => void;
   markSuccess: () => void;
   dismissError: () => void;
-  downloadUpdate: () => void;
-  downloadAndInstallApk: (url: string) => void;
+  downloadUpdate: () => Promise<void>;
+  downloadAndInstallApk: (url: string) => Promise<void>;
+  getCurrentVersionInfo: () => Promise<{
+    name?: string;
+    description?: string;
+    metaInfo?: string;
+  }>;
   currentHash: string;
   packageVersion: string;
   client?: Pushy;

src/provider.tsx

@@ -13,7 +13,12 @@ import {
   Linking,
 } from 'react-native';
 import { Pushy } from './client';
-import { currentVersion, isFirstTime, packageVersion } from './core';
+import {
+  currentVersion,
+  isFirstTime,
+  packageVersion,
+  getCurrentVersionInfo,
+} from './core';
 import { CheckResult, ProgressData } from './type';
 import { PushyContext } from './context';
 
@@ -88,9 +93,9 @@ export const PushyProvider = ({
   }, [client, showAlert, updateInfo]);
 
   const downloadAndInstallApk = useCallback(
-    (downloadUrl: string) => {
+    async (downloadUrl: string) => {
       if (Platform.OS === 'android' && downloadUrl) {
-        client.downloadAndInstallApk(downloadUrl, setProgress);
+        await client.downloadAndInstallApk(downloadUrl, setProgress);
       }
     },
     [client],
@@ -188,6 +193,7 @@ export const PushyProvider = ({
         currentHash: currentVersion,
         progress,
         downloadAndInstallApk,
+        getCurrentVersionInfo,
       }}
     >
       {children}

src/type.ts

@@ -8,8 +8,11 @@ export interface CheckResult {
   description?: string;
   metaInfo?: string;
   pdiffUrl?: string;
+  pdiffUrls?: string[];
   diffUrl?: string;
+  diffUrls?: string[];
   updateUrl?: string;
+  updateUrls?: string[];
   paused?: 'app' | 'package';
   message?: string;
 }

src/utils.ts

@@ -7,3 +7,20 @@ export function assertRelease() {
     throw new Error('react-native-update 只能在 RELEASE 版本中运行.');
   }
 }
+
+const ping = async (url: string) =>
+  fetch(url, {
+    method: 'HEAD',
+    redirect: 'follow',
+  }).then(({ status }) => status === 200);
+
+const canUseGoogle = ping('https://www.google.com');
+
+export const testUrls = async (urls?: string[]) => {
+  if (!urls?.length || (await canUseGoogle)) {
+    return null;
+  }
+  return Promise.race(urls.map((url) => ping(url).then(() => url))).catch(
+    () => null,
+  );
+};