react-native-update 10.5.3 → 10.6.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.5.3",
+  "version": "10.6.0-beta.0",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {

package/src/client.ts

@@ -18,7 +18,7 @@ const defaultServer = {
   main: 'https://update.react-native.cn/api',
   backups: ['https://update.reactnative.cn/api'],
   queryUrl:
-    'https://raw.githubusercontent.com/reactnativecn/react-native-pushy/master/endpoints.json',
+    'https://cdn.jsdelivr.net/gh/reactnativecn/react-native-pushy@master/endpoints.json',
 };
 
 const empty = {};
@@ -33,8 +33,8 @@ export class Pushy {
     appKey: '',
     server: defaultServer,
     autoMarkSuccess: true,
-    useAlert: true,
-    strategy: 'both',
+    updateStrategy: 'alwaysAlert',
+    checkStrategy: 'both',
     logger: noop,
     debug: false,
   };
@@ -50,8 +50,10 @@ export class Pushy {
   version = cInfo.pushy;
 
   constructor(options: PushyOptions) {
-    if (!options.appKey) {
-      throw new Error('appKey is required');
+    if (Platform.OS === 'ios' || Platform.OS === 'android') {
+      if (!options.appKey) {
+        throw new Error('appKey is required');
+      }
     }
     this.setOptions(options);
   }

package/src/core.ts

@@ -1,5 +1,5 @@
 import { NativeEventEmitter, NativeModules, Platform } from 'react-native';
-import { EmptyModule, log } from './utils';
+import { emptyModule, log } from './utils';
 const {
   version: v,
 } = require('react-native/Libraries/Core/ReactNativeVersion');
@@ -10,7 +10,7 @@ const isTurboModuleEnabled =
 
 export const PushyModule =
   Platform.OS === 'web'
-    ? new EmptyModule()
+    ? emptyModule
     : isTurboModuleEnabled
     ? require('./NativePushy').default
     : NativeModules.Pushy;

package/src/permissions.ts

@@ -1,4 +1,4 @@
 import type { PermissionsAndroidStatic } from 'react-native';
-import { EmptyModule } from './utils';
+import { emptyModule } from './utils';
 
-export const PermissionsAndroid = new EmptyModule() as PermissionsAndroidStatic;
+export const PermissionsAndroid = emptyModule as PermissionsAndroidStatic;

package/src/provider.tsx

@@ -43,7 +43,7 @@ export const PushyProvider = ({
 
   const showAlert = useCallback(
     (...args: Parameters<typeof Alert.alert>) => {
-      if (options.useAlert) {
+      if (options.updateStrategy === 'alwaysAlert') {
         Alert.alert(...args);
       }
     },
@@ -73,6 +73,11 @@ export const PushyProvider = ({
           return;
         }
         stateListener.current && stateListener.current.remove();
+        if (options.updateStrategy === 'silentAndNow') {
+          return client.switchVersion(hash);
+        } else if (options.updateStrategy === 'silentAndLater') {
+          return client.switchVersionLater(hash);
+        }
         showAlert('提示', '下载完毕，是否立即更新?', [
           {
             text: '下次再说',
@@ -94,7 +99,7 @@ export const PushyProvider = ({
         showAlert('更新失败', e.message);
       }
     },
-    [client, showAlert],
+    [client, options.updateStrategy, showAlert],
   );
 
   const downloadAndInstallApk = useCallback(
@@ -120,11 +125,22 @@ export const PushyProvider = ({
       showAlert('更新检查失败', e.message);
       return;
     }
+    if (!info) {
+      return;
+    }
     updateInfoRef.current = info;
     setUpdateInfo(info);
     if (info.expired) {
       const { downloadUrl } = info;
       if (downloadUrl) {
+        if (options.updateStrategy === 'silentAndNow') {
+          if (Platform.OS === 'android' && downloadUrl.endsWith('.apk')) {
+            downloadAndInstallApk(downloadUrl);
+          } else {
+            Linking.openURL(downloadUrl);
+          }
+          return;
+        }
         showAlert('提示', '您的应用版本已更新，点击更新下载安装新版本', [
           {
             text: '更新',
@@ -139,6 +155,12 @@ export const PushyProvider = ({
         ]);
       }
     } else if (info.update) {
+      if (
+        options.updateStrategy === 'silentAndNow' ||
+        options.updateStrategy === 'silentAndLater'
+      ) {
+        return downloadUpdate(info);
+      }
       showAlert(
         '提示',
         '检查到新的版本' + info.name + ',是否下载?\n' + info.description,
@@ -154,7 +176,13 @@ export const PushyProvider = ({
         ],
       );
     }
-  }, [client, downloadAndInstallApk, downloadUpdate, showAlert]);
+  }, [
+    client,
+    downloadAndInstallApk,
+    downloadUpdate,
+    options.updateStrategy,
+    showAlert,
+  ]);
 
   const markSuccess = client.markSuccess;
 
@@ -165,11 +193,11 @@ export const PushyProvider = ({
       );
       return;
     }
-    const { strategy, dismissErrorAfter, autoMarkSuccess } = options;
+    const { checkStrategy, dismissErrorAfter, autoMarkSuccess } = options;
     if (isFirstTime && autoMarkSuccess) {
       markSuccess();
     }
-    if (strategy === 'both' || strategy === 'onAppResume') {
+    if (checkStrategy === 'both' || checkStrategy === 'onAppResume') {
       stateListener.current = AppState.addEventListener(
         'change',
         nextAppState => {
@@ -179,7 +207,7 @@ export const PushyProvider = ({
         },
       );
     }
-    if (strategy === 'both' || strategy === 'onAppStart') {
+    if (checkStrategy === 'both' || checkStrategy === 'onAppStart') {
       checkUpdate();
     }
     let dismissErrorTimer: ReturnType<typeof setTimeout>;

package/src/type.ts

@@ -69,8 +69,8 @@ export interface PushyOptions {
   appKey: string;
   server?: PushyServerConfig;
   logger?: UpdateEventsLogger;
-  useAlert?: boolean;
-  strategy?: 'onAppStart' | 'onAppResume' | 'both' | null;
+  updateStrategy?: 'alwaysAlert' | 'silentAndNow' | 'silentAndLater' | null;
+  checkStrategy?: 'onAppStart' | 'onAppResume' | 'both' | null;
   autoMarkSuccess?: boolean;
   dismissErrorAfter?: number;
   debug?: boolean;

package/src/utils.ts

@@ -5,7 +5,7 @@ export function log(...args: any[]) {
 }
 
 const noop = () => {};
-export class EmptyModule {
+class EmptyModule {
   constructor() {
     return new Proxy(this, {
       get() {
@@ -14,16 +14,19 @@ export class EmptyModule {
     });
   }
 }
+export const emptyModule = new EmptyModule();
 
 const ping =
   Platform.OS === 'web'
-    ? () => Promise.resolve(true)
+    ? Promise.resolve
     : async (url: string) =>
         Promise.race([
           fetch(url, {
             method: 'HEAD',
-          }).then(({ status }) => status === 200),
-          new Promise<false>(r => setTimeout(() => r(false), 2000)),
+          })
+            .then(({ status }) => (status === 200 ? url : null))
+            .catch(() => null),
+          new Promise(r => setTimeout(() => r(null), 2000)),
         ]);
 
 const canUseGoogle = ping('https://www.google.com');
@@ -32,7 +35,5 @@ 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,
-  );
+  return Promise.race(urls.map(ping)).catch(() => null);
 };