v10.0.0-beta.3

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": "10.0.0-beta.1",
+    "react-native-update": "^10.0.0-beta.2",
     "react-native-vector-icons": "^10.0.3"
   },
   "devDependencies": {

Example/testHotUpdate/src/index.tsx

@@ -33,7 +33,8 @@ function App() {
   const [showUpdateBanner, setShowUpdateBanner] = useState(false);
   const [showUpdateSnackbar, setShowUpdateSnackbar] = useState(false);
   const snackbarVisible =
-    showUpdateSnackbar && updateInfo?.update && !useDefaultAlert;
+    !useDefaultAlert && showUpdateSnackbar && updateInfo?.update;
+
   return (
     <View style={styles.container}>
       <Text style={styles.welcome}>欢迎使用Pushy热更新服务</Text>
@@ -48,6 +49,7 @@ function App() {
             client?.setOptions({
               useAlert: v,
             });
+            setShowUpdateSnackbar(!v);
           }}
         />
       </View>
@@ -66,7 +68,11 @@ function App() {
       <Text>
         下载进度：{received} / {total}
       </Text>
-      <TouchableOpacity onPress={checkUpdate}>
+      <TouchableOpacity
+        onPress={() => {
+          checkUpdate();
+          setShowUpdateSnackbar(true);
+        }}>
         <Text style={styles.instructions}>点击这里检查更新</Text>
       </TouchableOpacity>
 
@@ -83,7 +89,7 @@ function App() {
       <TestConsole visible={showTestConsole} />
       {snackbarVisible && (
         <Snackbar
-          visible={true}
+          visible={snackbarVisible}
           onDismiss={() => {
             setShowUpdateSnackbar(false);
           }}
@@ -95,10 +101,13 @@ function App() {
               setShowUpdateBanner(true);
             },
           }}>
-          <Text>有新版本({updateInfo.version})可用，是否更新？</Text>
+          <Text style={{color: 'white'}}>
+            有新版本({updateInfo.name})可用，是否更新？
+          </Text>
         </Snackbar>
       )}
       <Banner
+        style={{width: '100%', position: 'absolute', top: 0}}
         visible={showUpdateBanner}
         actions={[
           {

Example/testHotUpdate/update.json

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

Example/testHotUpdate/yarn.lock

@@ -6231,10 +6231,10 @@ 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@10.0.0-beta.1:
-  version "10.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/react-native-update/-/react-native-update-10.0.0-beta.1.tgz#bc49a7197dd19c16ba798ea13324b4b292edd052"
-  integrity sha512-PFTsut8SL+vqAPtBUzPg9KKU9mFgCktKttifzM8B4puSoburlSN2UnD+eDWxLkXyIWQtoQAqAmXPE1/zA/e7dw==
+react-native-update@^10.0.0-beta.2:
+  version "10.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/react-native-update/-/react-native-update-10.0.0-beta.2.tgz#2974f168a61c80d3240f10923294bc6e36879c08"
+  integrity sha512-/HjuxRVLGSxTqcGApsRHTJO89Md47qwHlsE4lXKigkmHPdE1q5RjFVEu0ee0hkMtSOHO14bpnbjFICiNp+9kLQ==
   dependencies:
     nanoid "^3.3.3"
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.0.0-beta.2",
+  "version": "10.0.0-beta.3",
   "description": "react-native hot update",
   "main": "src/index.ts",
   "scripts": {

src/client.tsx

@@ -261,6 +261,7 @@ export class Pushy {
         data: { newVersion: hash },
       });
     }
+    log('downloaded hash:', hash);
     setLocalHashInfo(hash, {
       name,
       description,

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;

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,11 +38,11 @@ export const PushyProvider = ({
 
   const showAlert = useCallback(
     (...args: Parameters<typeof Alert.alert>) => {
-      if (useAlert) {
+      if (options.useAlert) {
         Alert.alert(...args);
       }
     },
-    [useAlert],
+    [options],
   );
 
   const switchVersion = useCallback(() => {
@@ -61,7 +62,7 @@ export const PushyProvider = ({
       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 {
@@ -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);
               }
@@ -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}