react-native-update 10.10.2 → 10.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.10.2",
+  "version": "10.11.0",
   "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/context.ts

@@ -14,7 +14,7 @@ export const defaultContext = {
   downloadUpdate: asyncNoop,
   downloadAndInstallApk: asyncNoop,
   getCurrentVersionInfo: () => Promise.resolve({}),
-  parseTestPayload: () => Promise.resolve(false),
+  parseTestQrCode: () => false,
   currentHash: '',
   packageVersion: '',
 };
@@ -32,7 +32,7 @@ export const PushyContext = createContext<{
     description?: string;
     metaInfo?: string;
   }>;
-  parseTestPayload: (code: string) => Promise<boolean>;
+  parseTestQrCode: (code: string) => boolean;
   currentHash: string;
   packageVersion: string;
   client?: Pushy;

package/src/provider.tsx

@@ -263,13 +263,7 @@ export const PushyProvider = ({
   }, [checkUpdate, options, dismissError, markSuccess]);
 
   const parseTestPayload = useCallback(
-    async (code: string) => {
-      let payload: PushyTestPayload;
-      try {
-        payload = JSON.parse(code);
-      } catch {
-        return false;
-      }
+    (payload: PushyTestPayload) => {
       if (payload && payload.type && payload.type.startsWith('__rnPushy')) {
         const logger = options.logger || (() => {});
         options.logger = ({ type, data }) => {
@@ -294,6 +288,41 @@ export const PushyProvider = ({
     [checkUpdate, options],
   );
 
+  const parseTestQrCode = useCallback(
+    (code: string) => {
+      let payload: PushyTestPayload;
+      try {
+        payload = JSON.parse(code);
+        return parseTestPayload(payload);
+      } catch {
+        return false;
+      }
+    },
+    [parseTestPayload],
+  );
+
+  useEffect(() => {
+    const parseLinking = (url: string | null) => {
+      if (!url) {
+        return;
+      }
+      const params = new URLSearchParams(url);
+      const payload = {
+        type: params.get('type'),
+        data: params.get('data'),
+      };
+      parseTestPayload(payload);
+    };
+
+    Linking.getInitialURL().then(parseLinking);
+    const linkingListener = Linking.addEventListener('url', ({ url }) =>
+      parseLinking(url),
+    );
+    return () => {
+      linkingListener.remove();
+    };
+  }, [parseTestPayload]);
+
   return (
     <PushyContext.Provider
       value={{
@@ -311,7 +340,7 @@ export const PushyProvider = ({
         progress,
         downloadAndInstallApk,
         getCurrentVersionInfo,
-        parseTestPayload,
+        parseTestQrCode,
       }}>
       {children}
     </PushyContext.Provider>

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 {
@@ -83,6 +83,6 @@ export interface PushyOptions {
 }
 
 export interface PushyTestPayload {
-  type: '__rnPushyVersionHash';
+  type: '__rnPushyVersionHash' | string | null;
   data: any;
 }