react-native-update 10.0.0-beta.1 → 10.0.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.0.0-beta.1",
+  "version": "10.0.0-beta.3",
   "description": "react-native hot update",
   "main": "src/index.ts",
   "scripts": {
@@ -40,7 +40,7 @@
   },
   "peerDependencies": {
     "react": ">=16.8.0",
-    "react-native": ">=0.57.0"
+    "react-native": ">=0.59.0"
   },
   "homepage": "https://github.com/reactnativecn/react-native-pushy#readme",
   "dependencies": {

package/src/client.tsx

@@ -154,7 +154,6 @@ export class Pushy {
     if (resp.status !== 200) {
       report({
         type: 'errorChecking',
-        //@ts-ignore
         message: result.message,
       });
     }
@@ -187,11 +186,11 @@ export class Pushy {
     onDownloadProgress?: (data: ProgressData) => void,
   ) => {
     assertRelease();
-    if (!('update' in info)) {
-      return;
-    }
     const { hash, diffUrl, pdiffUrl, updateUrl, name, description, metaInfo } =
       info;
+    if (!info.update || !hash) {
+      return;
+    }
     if (rolledBackVersion === hash) {
       log(`rolledback hash ${rolledBackVersion}, ignored`);
       return;
@@ -262,6 +261,7 @@ export class Pushy {
         data: { newVersion: hash },
       });
     }
+    log('downloaded hash:', hash);
     setLocalHashInfo(hash, {
       name,
       description,

package/src/client.web.js

@@ -0,0 +1,13 @@
+const noop = () => {};
+export class Pushy {
+  constructor() {
+    console.warn(
+      'react-native-update is not supported and will do nothing on web.',
+    );
+    return new Proxy(this, {
+      get() {
+        return noop;
+      },
+    });
+  }
+}

package/src/context.ts

@@ -12,6 +12,7 @@ export const defaultContext = {
   markSuccess: noop,
   dismissError: noop,
   downloadUpdate: noop,
+  downloadAndInstallApk: noop,
   currentHash: '',
   packageVersion: '',
 };
@@ -23,6 +24,7 @@ export const PushyContext = createContext<{
   markSuccess: () => void;
   dismissError: () => void;
   downloadUpdate: () => void;
+  downloadAndInstallApk: (url: string) => void;
   currentHash: string;
   packageVersion: string;
   client?: Pushy;

package/src/provider.tsx

@@ -14,7 +14,7 @@ import {
 } from 'react-native';
 import { Pushy } from './client';
 import { currentVersion, isFirstTime, packageVersion } from './core';
-import { CheckResult } from './type';
+import { CheckResult, ProgressData } from './type';
 import { PushyContext } from './context';
 
 export const PushyProvider = ({
@@ -24,9 +24,10 @@ export const PushyProvider = ({
   client: Pushy;
   children: ReactNode;
 }) => {
-  const { strategy, useAlert } = client.options;
+  const { options } = client;
   const stateListener = useRef<NativeEventSubscription>();
   const [updateInfo, setUpdateInfo] = useState<CheckResult>();
+  const [progress, setProgress] = useState<ProgressData>();
   const [lastError, setLastError] = useState<Error>();
 
   const dismissError = useCallback(() => {
@@ -37,31 +38,31 @@ export const PushyProvider = ({
 
   const showAlert = useCallback(
     (...args: Parameters<typeof Alert.alert>) => {
-      if (useAlert) {
+      if (options.useAlert) {
         Alert.alert(...args);
       }
     },
-    [useAlert],
+    [options],
   );
 
   const switchVersion = useCallback(() => {
-    if (updateInfo && 'hash' in updateInfo) {
+    if (updateInfo && updateInfo.hash) {
       client.switchVersion(updateInfo.hash);
     }
   }, [client, updateInfo]);
 
   const switchVersionLater = useCallback(() => {
-    if (updateInfo && 'hash' in updateInfo) {
+    if (updateInfo && updateInfo.hash) {
       client.switchVersionLater(updateInfo.hash);
     }
   }, [client, updateInfo]);
 
   const downloadUpdate = useCallback(async () => {
-    if (!updateInfo || !('update' in updateInfo)) {
+    if (!updateInfo || !updateInfo.update) {
       return;
     }
     try {
-      const hash = await client.downloadUpdate(updateInfo);
+      const hash = await client.downloadUpdate(updateInfo, setProgress);
       if (!hash) {
         return;
       }
@@ -88,6 +89,15 @@ export const PushyProvider = ({
     }
   }, [client, showAlert, updateInfo]);
 
+  const downloadAndInstallApk = useCallback(
+    (downloadUrl: string) => {
+      if (Platform.OS === 'android' && downloadUrl) {
+        client.downloadAndInstallApk(downloadUrl, setProgress);
+      }
+    },
+    [client],
+  );
+
   const checkUpdate = useCallback(async () => {
     let info: CheckResult;
     try {
@@ -98,7 +108,7 @@ export const PushyProvider = ({
       return;
     }
     setUpdateInfo(info);
-    if ('expired' in info) {
+    if (info.expired) {
       const { downloadUrl } = info;
       showAlert('提示', '您的应用版本已更新，点击更新下载安装新版本', [
         {
@@ -106,7 +116,7 @@ export const PushyProvider = ({
           onPress: () => {
             if (downloadUrl) {
               if (Platform.OS === 'android' && downloadUrl.endsWith('.apk')) {
-                client.downloadAndInstallApk(downloadUrl);
+                downloadAndInstallApk(downloadUrl);
               } else {
                 Linking.openURL(downloadUrl);
               }
@@ -114,7 +124,7 @@ export const PushyProvider = ({
           },
         },
       ]);
-    } else if ('update' in info) {
+    } else if (info.update) {
       showAlert(
         '提示',
         '检查到新的版本' + info.name + ',是否下载?\n' + info.description,
@@ -130,12 +140,13 @@ export const PushyProvider = ({
         ],
       );
     }
-  }, [client, downloadUpdate, showAlert]);
+  }, [client, downloadAndInstallApk, downloadUpdate, showAlert]);
 
   const markSuccess = client.markSuccess;
 
   useEffect(() => {
-    if (isFirstTime) {
+    const { strategy, dismissErrorAfter, autoMarkSuccess } = options;
+    if (isFirstTime && autoMarkSuccess) {
       markSuccess();
     }
     if (strategy === 'both' || strategy === 'onAppResume') {
@@ -152,7 +163,6 @@ export const PushyProvider = ({
       checkUpdate();
     }
     let dismissErrorTimer: ReturnType<typeof setTimeout>;
-    const { dismissErrorAfter } = client.options;
     if (typeof dismissErrorAfter === 'number' && dismissErrorAfter > 0) {
       dismissErrorTimer = setTimeout(() => {
         dismissError();
@@ -162,7 +172,7 @@ export const PushyProvider = ({
       stateListener.current && stateListener.current.remove();
       clearTimeout(dismissErrorTimer);
     };
-  }, [checkUpdate, client.options, dismissError, markSuccess, strategy]);
+  }, [checkUpdate, options, dismissError, markSuccess]);
 
   return (
     <PushyContext.Provider
@@ -178,6 +188,8 @@ export const PushyProvider = ({
         downloadUpdate,
         packageVersion,
         currentHash: currentVersion,
+        progress,
+        downloadAndInstallApk,
       }}
     >
       {children}

package/src/provider.web.js

@@ -0,0 +1,2 @@
+import { Fragment } from 'react';
+export const PushyProvider = Fragment;

package/src/type.ts

@@ -1,31 +1,19 @@
-export interface ExpiredResult {
-  expired: true;
-  downloadUrl: string;
-}
-
-export interface UpTodateResult {
-  upToDate: true;
-  paused?: 'app' | 'package';
-}
-
-export interface UpdateAvailableResult {
-  upToDate: false;
-  update: true;
-  name: string; // version name
-  hash: string;
-  description: string;
-  metaInfo: string;
-  pdiffUrl: string;
+export interface CheckResult {
+  upToDate?: true;
+  expired?: true;
+  downloadUrl?: string;
+  update?: true;
+  name?: string; // version name
+  hash?: string;
+  description?: string;
+  metaInfo?: string;
+  pdiffUrl?: string;
   diffUrl?: string;
   updateUrl?: string;
+  paused?: 'app' | 'package';
+  message?: string;
 }
 
-export type CheckResult =
-  | ExpiredResult
-  | UpTodateResult
-  | UpdateAvailableResult
-  | {};
-
 export interface ProgressData {
   hash: string;
   received: number;
@@ -59,6 +47,7 @@ export interface EventData {
   newVersion?: string;
   [key: string]: any;
 }
+
 export type UpdateEventsLogger = ({
   type,
   data,
@@ -72,6 +61,7 @@ export interface PushyServerConfig {
   backups?: string[];
   queryUrl?: string;
 }
+
 export interface PushyOptions {
   appKey: string;
   server?: PushyServerConfig;

package/src/index.web.js

@@ -1,17 +0,0 @@
-import { Fragment } from 'react';
-
-const noop = () => {};
-export class Pushy {
-  constructor() {
-    console.warn('react-native-update is not supported and will do nothing on web.');
-    return new Proxy(this, {
-      get() {
-        return noop;
-      },
-    });
-  }
-}
-
-export { PushyContext, usePushy } from './context';
-
-export const PushyProvider = Fragment;