v10.0.2

V10

Example/testHotUpdate/ios/Podfile.lock

@@ -284,17 +284,19 @@ PODS:
   - React-jsinspector (0.69.8)
   - React-logger (0.69.8):
     - glog
-  - react-native-update (9.0.0):
+  - react-native-safe-area-context (4.8.2):
+    - React-Core
+  - react-native-update (10.0.0-beta.1):
     - React
     - React-Core
-    - react-native-update/HDiffPatch (= 9.0.0)
+    - react-native-update/HDiffPatch (= 10.0.0-beta.1)
-    - react-native-update/RCTPushy (= 9.0.0)
+    - react-native-update/RCTPushy (= 10.0.0-beta.1)
     - SSZipArchive
-  - react-native-update/HDiffPatch (9.0.0):
+  - react-native-update/HDiffPatch (10.0.0-beta.1):
     - React
     - React-Core
     - SSZipArchive
-  - react-native-update/RCTPushy (9.0.0):
+  - react-native-update/RCTPushy (10.0.0-beta.1):
     - React
     - React-Core
     - SSZipArchive
@@ -364,6 +366,8 @@ PODS:
     - React-jsi (= 0.69.8)
     - React-logger (= 0.69.8)
     - React-perflogger (= 0.69.8)
+  - RNVectorIcons (10.0.3):
+    - React-Core
   - SocketRocket (0.6.0)
   - SSZipArchive (2.4.3)
   - Yoga (1.14.0)
@@ -414,6 +418,7 @@ DEPENDENCIES:
   - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
   - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
+  - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
   - react-native-update (from `../node_modules/react-native-update`)
   - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
@@ -427,6 +432,7 @@ DEPENDENCIES:
   - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
   - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
+  - RNVectorIcons (from `../node_modules/react-native-vector-icons`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
@@ -487,6 +493,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/jsinspector"
   React-logger:
     :path: "../node_modules/react-native/ReactCommon/logger"
+  react-native-safe-area-context:
+    :path: "../node_modules/react-native-safe-area-context"
   react-native-update:
     :path: "../node_modules/react-native-update"
   React-perflogger:
@@ -513,6 +521,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/runtimeexecutor"
   ReactCommon:
     :path: "../node_modules/react-native/ReactCommon"
+  RNVectorIcons:
+    :path: "../node_modules/react-native-vector-icons"
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
@@ -549,7 +559,8 @@ SPEC CHECKSUMS:
   React-jsiexecutor: 2cf8ea3753afb81dfcc386613dbbb0b5d155fb34
   React-jsinspector: 0eda09e9cf22bbb5dbb1d23143b03a31acf37d67
   React-logger: 5997ab008583826c10ffe4e1ff990363e975639d
-  react-native-update: 2b5ef06bfeaa668614c8deb7ec4d20dcf56f9278
+  react-native-safe-area-context: 0ee144a6170530ccc37a0fd9388e28d06f516a89
+  react-native-update: 767449a2cf592387b9aecb97980ec0536d72c890
   React-perflogger: ad1416a715d86b32f456e5d0aed99c3b52f1de37
   React-RCTActionSheet: cbf7c6a953982562418ee72a1084ff7b9447b558
   React-RCTAnimation: 33df3e25824dd7313edec28dded2745542f9352b
@@ -562,6 +573,7 @@ SPEC CHECKSUMS:
   React-RCTVibration: 5462287ee85304ba1a00474665ab292e63a41663
   React-runtimeexecutor: 9df680f18497367bcf5c15b6b6406c0f2dfa2b6a
   ReactCommon: c10f046f3ef8561e7c8e7e9b9dae2ecc9ffc48ef
+  RNVectorIcons: bc7ee28cadf39c77a49232a14738dfce690f66cd
   SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
   Yoga: d3820731e0ca3a4933f061ad29defaf7726e3251
@@ -569,4 +581,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 618d17df10f335f1d113daac849a7997894646b2
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.14.3

Example/testHotUpdate/metro.config.js

@@ -1,12 +1,12 @@
 const path = require('path');
 
-const extraNodeModules = {
+// const extraNodeModules = {
-  react: path.resolve(__dirname, 'node_modules/react'),
+//   react: path.resolve(__dirname, 'node_modules/react'),
-  'react-native': path.resolve(__dirname, 'node_modules/react-native'),
+//   'react-native': path.resolve(__dirname, 'node_modules/react-native'),
-  'react-native-update': path.resolve(__dirname, '../..'),
+//   'react-native-update': path.resolve(__dirname, '../..'),
-  '@babel/runtime': path.resolve(__dirname, 'node_modules/@babel/runtime'),
+//   '@babel/runtime': path.resolve(__dirname, 'node_modules/@babel/runtime'),
-};
+// };
-const watchFolders = [path.resolve(__dirname, '../..')];
+// const watchFolders = [path.resolve(__dirname, '../..')];
 
 module.exports = {
   transformer: {
@@ -17,8 +17,8 @@ module.exports = {
       },
     }),
   },
-  resolver: {
+  // resolver: {
-    extraNodeModules,
+  //   extraNodeModules,
-  },
+  // },
-  watchFolders,
+  // watchFolders,
 };

Example/testHotUpdate/package.json

@@ -18,7 +18,7 @@
     "react-native": "0.69.8",
     "react-native-paper": "^5.12.1",
     "react-native-safe-area-context": "^4.8.2",
-    "react-native-update": "link:../..",
+    "react-native-update": "^10.0.0-beta.3",
     "react-native-vector-icons": "^10.0.3"
   },
   "devDependencies": {

Example/testHotUpdate/src/index.tsx

@@ -24,29 +24,35 @@ function App() {
     switchVersionLater,
     switchVersion,
     updateInfo,
+    packageVersion,
+    currentHash,
     progress: {received, total} = {},
   } = usePushy();
   const [useDefaultAlert, setUseDefaultAlert] = useState(true);
+  const [showTestConsole, setShowTestConsole] = useState(false);
   const [showUpdateBanner, setShowUpdateBanner] = useState(false);
   const [showUpdateSnackbar, setShowUpdateSnackbar] = useState(false);
   const snackbarVisible =
-    showUpdateSnackbar &&
+    !useDefaultAlert && showUpdateSnackbar && updateInfo?.update;
-    updateInfo &&
+
-    updateInfo.updateAvailable &&
-    !useDefaultAlert;
   return (
     <View style={styles.container}>
       <Text style={styles.welcome}>欢迎使用Pushy热更新服务</Text>
+      <View style={{flexDirection: 'row'}}>
+        <Text>
+          {useDefaultAlert ? '当前使用' : '当前不使用'}默认的alert更新提示
+        </Text>
         <Switch
-        value={useCustomUi}
+          value={useDefaultAlert}
           onValueChange={v => {
             setUseDefaultAlert(v);
-          client.setOptions({
+            client?.setOptions({
-            showAlert: v,
+              useAlert: v,
             });
-        }}>
+            setShowUpdateSnackbar(!v);
-        {useDefaultAlert ? '当前使用' : '当前不使用'}默认的alert更新提示
+          }}
-      </Switch>
+        />
+      </View>
       <Image
         resizeMode={'contain'}
         source={require('./assets/shezhi.png')}
@@ -56,13 +62,17 @@ function App() {
         这是版本一 {'\n'}
         当前原生包版本号: {packageVersion}
         {'\n'}
-        当前热更新版本Hash: {currentVersion || '(空)'}
+        当前热更新版本Hash: {currentHash || '(空)'}
         {'\n'}
       </Text>
       <Text>
         下载进度：{received} / {total}
       </Text>
-      <TouchableOpacity onPress={checkUpdate}>
+      <TouchableOpacity
+        onPress={() => {
+          checkUpdate();
+          setShowUpdateSnackbar(true);
+        }}>
         <Text style={styles.instructions}>点击这里检查更新</Text>
       </TouchableOpacity>
 
@@ -70,13 +80,14 @@ function App() {
         testID="testcase"
         style={{marginTop: 15}}
         onLongPress={() => {
-          this.setState({showTestConsole: true});
+          setShowTestConsole(true);
         }}>
         <Text style={styles.instructions}>
-          react-native-update版本：{client.version}
+          react-native-update版本：{client?.version}
         </Text>
       </TouchableOpacity>
       <TestConsole visible={showTestConsole} />
+      {snackbarVisible && (
         <Snackbar
           visible={snackbarVisible}
           onDismiss={() => {
@@ -90,9 +101,13 @@ function App() {
               setShowUpdateBanner(true);
             },
           }}>
-        有新版本({updateInfo.version})可用，是否更新？
+          <Text style={{color: 'white'}}>
+            有新版本({updateInfo.name})可用，是否更新？
+          </Text>
         </Snackbar>
+      )}
       <Banner
+        style={{width: '100%', position: 'absolute', top: 0}}
         visible={showUpdateBanner}
         actions={[
           {
@@ -138,7 +153,6 @@ const styles = StyleSheet.create({
 
 const pushyClient = new Pushy({
   appKey,
-  showAlert: false,
 });
 
 export default function Root() {

Example/testHotUpdate/update.json

@@ -1,10 +1,10 @@
 {
   "ios": {
-        "appId": 10976,
+    "appId": 24794,
-        "appKey": "p5q_rPYNOE0WdCf-i9ZCGPw-DUGUCMvY"
+    "appKey": "SqShg4Klnj2hG6LAFMW2PdcgSSuniz0T"
   },
   "android": {
-        "appId": 10977,
+    "appId": 27509,
-        "appKey": "bUYKfZgtC9VirZsQbAt8qken2Gq2uxe3"
+    "appKey": "aQz3Uc2pA7gt_prDaQ4rbWRY"
   }
 }

Example/testHotUpdate/yarn.lock

@@ -6231,9 +6231,12 @@ react-native-safe-area-context@^4.8.2:
   resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.8.2.tgz#e6b3d8acf3c6afcb4b5db03a97f9c37df7668f65"
   integrity sha512-ffUOv8BJQ6RqO3nLml5gxJ6ab3EestPiyWekxdzO/1MQ7NF8fW1Mzh1C5QE9yq573Xefnc7FuzGXjtesZGv7cQ==
 
-"react-native-update@link:../..":
+react-native-update@^10.0.0-beta.3:
-  version "0.0.0"
+  version "10.0.0-beta.3"
-  uid ""
+  resolved "https://registry.yarnpkg.com/react-native-update/-/react-native-update-10.0.0-beta.3.tgz#cad099ebb40ff04b31ba2df13930517039e4fae3"
+  integrity sha512-Ak1ylgHbOUeaNsq3ItZGRenqqAwYKSTlB6T4sBn4PPNGaMmIMt6uIKKWrQqcNyc9WEy9LlFM6kSqQXBQdaVatw==
+  dependencies:
+    nanoid "^3.3.3"
 
 react-native-vector-icons@^10.0.3:
   version "10.0.3"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.0.0-beta.0",
+  "version": "10.0.2",
   "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": {

src/client.tsx

@@ -31,6 +31,7 @@ export class Pushy {
     server: defaultServer,
     autoMarkSuccess: true,
     useAlert: true,
+    strategy: 'both',
   };
 
   lastChecking: number;
@@ -154,7 +155,6 @@ export class Pushy {
     if (resp.status !== 200) {
       report({
         type: 'errorChecking',
-        //@ts-ignore
         message: result.message,
       });
     }
@@ -187,11 +187,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 +262,7 @@ export class Pushy {
         data: { newVersion: hash },
       });
     }
+    log('downloaded hash:', hash);
     setLocalHashInfo(hash, {
       name,
       description,

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;
+      },
+    });
+  }
+}

src/context.ts

@@ -12,19 +12,25 @@ export const defaultContext = {
   markSuccess: noop,
   dismissError: noop,
   downloadUpdate: noop,
+  downloadAndInstallApk: noop,
+  currentHash: '',
+  packageVersion: '',
 };
 
 export const PushyContext = createContext<{
   checkUpdate: () => void;
   switchVersion: () => void;
   switchVersionLater: () => void;
-  progress?: ProgressData;
   markSuccess: () => void;
+  dismissError: () => void;
+  downloadUpdate: () => void;
+  downloadAndInstallApk: (url: string) => void;
+  currentHash: string;
+  packageVersion: string;
+  client?: Pushy;
+  progress?: ProgressData;
   updateInfo?: CheckResult;
   lastError?: Error;
-  dismissError: () => void;
-  client?: Pushy;
-  downloadUpdate: () => void;
 }>(defaultContext);
 
 export const usePushy = () => useContext(PushyContext);

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;

src/provider.tsx

@@ -13,8 +13,8 @@ import {
   Linking,
 } from 'react-native';
 import { Pushy } from './client';
-import { isFirstTime } from './core';
+import { currentVersion, isFirstTime, packageVersion } from './core';
-import { CheckResult } from './type';
+import { CheckResult, ProgressData } from './type';
 import { PushyContext } from './context';
 
 export const PushyProvider = ({
@@ -24,44 +24,43 @@ 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(() => {
-    if (lastError) {
     setLastError(undefined);
-    }
+  }, []);
-  }, [lastError]);
 
   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 +87,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 +106,7 @@ export const PushyProvider = ({
       return;
     }
     setUpdateInfo(info);
-    if ('expired' in info) {
+    if (info.expired) {
       const { downloadUrl } = info;
       showAlert('提示', '您的应用版本已更新，点击更新下载安装新版本', [
         {
@@ -106,7 +114,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 +122,7 @@ export const PushyProvider = ({
           },
         },
       ]);
-    } else if ('update' in info) {
+    } else if (info.update) {
       showAlert(
         '提示',
         '检查到新的版本' + info.name + ',是否下载?\n' + info.description,
@@ -130,12 +138,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 +161,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 +170,7 @@ export const PushyProvider = ({
       stateListener.current && stateListener.current.remove();
       clearTimeout(dismissErrorTimer);
     };
-  }, [checkUpdate, client.options, dismissError, markSuccess, strategy]);
+  }, [checkUpdate, options, dismissError, markSuccess]);
 
   return (
     <PushyContext.Provider
@@ -176,6 +184,10 @@ export const PushyProvider = ({
         markSuccess,
         client,
         downloadUpdate,
+        packageVersion,
+        currentHash: currentVersion,
+        progress,
+        downloadAndInstallApk,
       }}
     >
       {children}

src/provider.web.js

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

src/type.ts

@@ -1,31 +1,19 @@
-export interface ExpiredResult {
+export interface CheckResult {
-  expired: true;
+  upToDate?: true;
-  downloadUrl: string;
+  expired?: true;
-}
+  downloadUrl?: string;
-
+  update?: true;
-export interface UpTodateResult {
+  name?: string; // version name
-  upToDate: true;
+  hash?: string;
-  paused?: 'app' | 'package';
+  description?: string;
-}
+  metaInfo?: string;
-
+  pdiffUrl?: string;
-export interface UpdateAvailableResult {
-  upToDate: false;
-  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;