react-native-update 10.10.1 → 10.10.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.10.1",
+  "version": "10.10.3",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {

package/src/client.ts

@@ -17,8 +17,10 @@ import {
 const defaultServer = {
   main: 'https://update.react-native.cn/api',
   backups: ['https://update.reactnative.cn/api'],
-  queryUrl:
+  queryUrls: [
+    'https://gitee.com/sunnylqm/react-native-pushy/raw/master/endpoints.json',
     'https://cdn.jsdelivr.net/gh/reactnativecn/react-native-pushy@master/endpoints.json',
+  ],
 };
 
 const empty = {};
@@ -233,9 +235,11 @@ export class Pushy {
     if (!server) {
       return [];
     }
-    if (server.queryUrl) {
+    if (server.queryUrls) {
       try {
-        const resp = await fetch(server.queryUrl);
+        const resp = await Promise.race(
+          server.queryUrls.map(queryUrl => fetch(queryUrl)),
+        );
         const remoteEndpoints = await resp.json();
         log('fetch endpoints:', remoteEndpoints);
         if (Array.isArray(remoteEndpoints)) {
@@ -244,7 +248,7 @@ export class Pushy {
           );
         }
       } catch (e: any) {
-        log('failed to fetch endpoints from: ', server.queryUrl);
+        log('failed to fetch endpoints from: ', server.queryUrls);
       }
     }
     return server.backups;

package/src/provider.tsx

@@ -270,21 +270,28 @@ export const PushyProvider = ({
       } catch {
         return false;
       }
-      if (payload && payload.type) {
+      if (payload && payload.type && payload.type.startsWith('__rnPushy')) {
+        const logger = options.logger || (() => {});
+        options.logger = ({ type, data }) => {
+          logger({ type, data });
+          Alert.alert(type, JSON.stringify(data));
+        };
         if (payload.type === '__rnPushyVersionHash') {
-          await checkUpdate({ toHash: payload.data });
-          if (updateInfoRef.current && updateInfoRef.current.upToDate) {
-            Alert.alert(
-              '提示',
-              '当前尚未检测到更新版本，如果是首次扫码，请等待服务器端生成补丁包后再试（约10秒）',
-            );
-          }
-          return true;
+          checkUpdate({ toHash: payload.data }).then(() => {
+            if (updateInfoRef.current && updateInfoRef.current.upToDate) {
+              Alert.alert(
+                '提示',
+                '当前尚未检测到更新版本，如果是首次扫码，请等待服务器端生成补丁包后再试（约10秒）',
+              );
+            }
+            options.logger = logger;
+          });
         }
+        return true;
       }
       return false;
     },
-    [checkUpdate],
+    [checkUpdate, options],
   );
 
   return (

package/src/type.ts

@@ -62,7 +62,7 @@ export type UpdateEventsLogger = ({
 export interface PushyServerConfig {
   main: string;
   backups?: string[];
-  queryUrl?: string;
+  queryUrls?: string[];
 }
 
 export interface PushyOptions {