v7.3.4

Example/testHotUpdate/src/index.js

@@ -68,6 +68,9 @@ export default class App extends Component {
           });
         },
       });
+      if (!hash) {
+        return;
+      }
       Alert.alert('提示', '下载完毕,是否重启应用?', [
         {
           text: '是',

lib/main.js

@@ -175,8 +175,8 @@ export async function downloadUpdate(options, eventListeners) {
   if (!options.update) {
     return;
   }
-  if (rolledbackVersion === options.hash) {
-    logger(`rolledback hash ${rolledbackVersion}, ignored`);
+  if (rolledBackVersion === options.hash) {
+    logger(`rolledback hash ${rolledBackVersion}, ignored`);
     return;
   }
   if (downloadedHash === options.hash) {
@@ -218,19 +218,30 @@ export async function downloadUpdate(options, eventListeners) {
         originHash: currentVersion,
       });
     } catch (e) {
-      logger(e.message);
-      logger('diff error, try pdiff');
+      logger(`diff error: ${e.message}, try pdiff`);
+      try {
+        await Pushy.downloadPatchFromPackage({
+          updateUrl: options.pdiffUrl,
+          hash: options.hash,
+        });
+      } catch (e) {
+        progressHandler && progressHandler.remove();
+        report(options.hash, 'error');
+        throw e;
+      }
+    }
+  } else if (options.pdiffUrl) {
+    logger('downloading pdiff');
+    try {
       await Pushy.downloadPatchFromPackage({
         updateUrl: options.pdiffUrl,
         hash: options.hash,
       });
+    } catch (e) {
+      progressHandler && progressHandler.remove();
+      report(options.hash, 'error');
+      throw e;
     }
-  } else if (options.pdiffUrl) {
-    logger('downloading pdiff');
-    await Pushy.downloadPatchFromPackage({
-      updateUrl: options.pdiffUrl,
-      hash: options.hash,
-    });
   }
   setLocalHashInfo(options.hash, {
     name: options.name,
@@ -257,20 +268,23 @@ function assertHash(hash) {
     return;
   }
   readyHash = hash;
+  return true;
 }
 
 export function switchVersion(hash) {
   assertRelease();
-  assertHash(hash);
-  logger('switchVersion: ' + hash);
-  Pushy.reloadUpdate({ hash });
+  if (assertHash(hash)) {
+    logger('switchVersion: ' + hash);
+    Pushy.reloadUpdate({ hash });
+  }
 }
 
 export function switchVersionLater(hash) {
   assertRelease();
-  assertHash(hash);
-  logger('switchVersionLater: ' + hash);
-  Pushy.setNeedUpdate({ hash });
+  if (assertHash(hash)) {
+    logger('switchVersionLater: ' + hash);
+    Pushy.setNeedUpdate({ hash });
+  }
 }
 
 let marked = false;

lib/simpleUpdate.js

@@ -41,6 +41,9 @@ export function simpleUpdate(WrappedComponent) {
         doUpdate = async (info) => {
           try {
             const hash = await downloadUpdate(info);
+            if (!hash) {
+              return;
+            }
             this.stateListener.remove();
             Alert.alert('提示', '下载完毕，是否立即更新?', [
               {
@@ -91,7 +94,7 @@ export function simpleUpdate(WrappedComponent) {
                 },
               },
             ]);
-          } else {
+          } else if (info.update) {
             Alert.alert(
               '提示',
               '检查到新的版本' + info.name + ',是否下载?\n' + info.description,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "7.1.0",
+  "version": "7.3.4",
   "description": "react-native hot update",
   "main": "lib/index.js",
   "scripts": {