v5.11.0-beta0

.gitignore

@@ -42,3 +42,4 @@ node_modules/
 npm-debug.log
 
 Example/**/update.json
+yarn-error.log

android/src/main/java/cn/reactnative/modules/update/DownloadTask.java

@@ -277,12 +277,12 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
         }
     }
 
-    private void copyFromResource(HashMap<String, ArrayList<File> > map) throws IOException {
+    private void copyFromResource(HashMap<String, ArrayList<File> > resToCopy) throws IOException {
         ZipInputStream zis = new ZipInputStream(new BufferedInputStream(new FileInputStream(context.getPackageResourcePath())));
         ZipEntry ze;
         while ((ze = zis.getNextEntry()) != null) {
             String fn = ze.getName();
-            ArrayList<File> targets = map.get(fn);
+            ArrayList<File> targets = resToCopy.get(fn);
             if (targets != null) {
                 File lastTarget = null;
                 for (File target: targets) {
@@ -307,6 +307,8 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
         ZipEntry ze;
         int count;
         String filename;
+        boolean foundDiff = false;
+        boolean foundBundlePatch = false;
 
         removeDirectory(param.unzipDirectory);
         param.unzipDirectory.mkdirs();
@@ -318,6 +320,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
             String fn = ze.getName();
 
             if (fn.equals("__diff.json")) {
+                foundDiff = true;
                 // copy files from assets
                 byte[] bytes = readBytes(zis);
                 String json = new String(bytes, "UTF-8");
@@ -344,6 +347,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
                 continue;
             }
             if (fn.equals("index.bundlejs.patch")) {
+                foundBundlePatch = true;
                 // do bsdiff patch
                 byte[] patched = bsdiffPatch(readOriginBundle(), readBytes(zis));
 
@@ -367,6 +371,12 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
         }
 
         zis.close();
+        if (!foundDiff) {
+            throw new Error("diff.json not found");
+        }
+        if (!foundBundlePatch) {
+            throw new Error("bundle patch not found");
+        }
 
         copyFromResource(copyList);
 
@@ -383,6 +393,8 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
         ZipEntry ze;
         int count;
         String filename;
+        boolean foundDiff = false;
+        boolean foundBundlePatch = false;
 
         removeDirectory(param.unzipDirectory);
         param.unzipDirectory.mkdirs();
@@ -392,6 +404,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
             String fn = ze.getName();
 
             if (fn.equals("__diff.json")) {
+                foundDiff = true;
                 // copy files from assets
                 byte[] bytes = readBytes(zis);
                 String json = new String(bytes, "UTF-8");
@@ -412,6 +425,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
                 continue;
             }
             if (fn.equals("index.bundlejs.patch")) {
+                foundBundlePatch = true;
                 // do bsdiff patch
                 byte[] patched = bsdiffPatch(readFile(new File(param.originDirectory, "index.bundlejs")), readBytes(zis));
 
@@ -436,6 +450,12 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
 
         zis.close();
 
+        if (!foundDiff) {
+            throw new Error("diff.json not found");
+        }
+        if (!foundBundlePatch) {
+            throw new Error("bundle patch not found");
+        }
         if (UpdateContext.DEBUG) {
             Log.d("RNUpdate", "Unzip finished");
         }
@@ -462,8 +482,9 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
 
     @Override
     protected Void doInBackground(DownloadTaskParams... params) {
+        int taskType = params[0].type;
         try {
-            switch (params[0].type) {
+            switch (taskType) {
                 case DownloadTaskParams.TASK_TYPE_PATCH_FULL:
                     doFullPatch(params[0]);
                     break;
@@ -489,6 +510,25 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
             if (UpdateContext.DEBUG) {
                 e.printStackTrace();
             }
+            File targetToClean = params[0].targetFile;
+            switch (taskType) {
+                case DownloadTaskParams.TASK_TYPE_PATCH_FULL:
+                case DownloadTaskParams.TASK_TYPE_PATCH_FROM_APK:
+                case DownloadTaskParams.TASK_TYPE_PATCH_FROM_PPK:
+                    try {
+                        removeDirectory(targetToClean);
+                    } catch (IOException ioException) {
+                        ioException.printStackTrace();
+                    }
+                    break;
+                case DownloadTaskParams.TASK_TYPE_PLAIN_DOWNLOAD:
+                    if (targetToClean.exists()) {
+                        targetToClean.delete();
+                    }
+                    break;
+                default:
+                    break;
+            }
             Log.e("pushy", "download task failed", e);
             params[0].listener.onDownloadFailed(e);
         }

android/src/main/java/cn/reactnative/modules/update/UpdateModule.java

@@ -31,13 +31,14 @@ import static android.support.v4.content.FileProvider.getUriForFile;
 /**
  * Created by tdzl2003 on 3/31/16.
  */
-public class UpdateModule extends ReactContextBaseJavaModule{
+public class UpdateModule extends ReactContextBaseJavaModule {
     UpdateContext updateContext;
     public static ReactApplicationContext mContext;
+
     public UpdateModule(ReactApplicationContext reactContext, UpdateContext updateContext) {
         super(reactContext);
         this.updateContext = updateContext;
-        mContext=reactContext;
+        mContext = reactContext;
     }
 
     public UpdateModule(ReactApplicationContext reactContext) {
@@ -73,7 +74,7 @@ public class UpdateModule extends ReactContextBaseJavaModule{
     }
 
     @ReactMethod
-    public void downloadUpdate(ReadableMap options, final Promise promise){
+    public void downloadUpdate(ReadableMap options, final Promise promise) {
         String url = options.getString("updateUrl");
         String hash = options.getString("hash");
         updateContext.downloadFullUpdate(url, hash, new UpdateContext.DownloadFileListener() {
@@ -90,7 +91,7 @@ public class UpdateModule extends ReactContextBaseJavaModule{
     }
 
     @ReactMethod
-    public void downloadAndInstallApk(ReadableMap options, final Promise promise){
+    public void downloadAndInstallApk(ReadableMap options, final Promise promise) {
         String url = options.getString("url");
         String hash = options.getString("hash");
         String target = options.getString("target");
@@ -136,9 +137,12 @@ public class UpdateModule extends ReactContextBaseJavaModule{
 
 
     @ReactMethod
-    public void downloadPatchFromPackage(ReadableMap options, final Promise promise){
+    public void downloadPatchFromPackage(ReadableMap options, final Promise promise) {
         String url = options.getString("updateUrl");
         String hash = options.getString("hash");
+        if (hash == null) {
+            hash = options.getString("hashName");
+        }
         updateContext.downloadPatchFromApk(url, hash, new UpdateContext.DownloadFileListener() {
             @Override
             public void onDownloadCompleted(DownloadTaskParams params) {
@@ -153,10 +157,16 @@ public class UpdateModule extends ReactContextBaseJavaModule{
     }
 
     @ReactMethod
-    public void downloadPatchFromPpk(ReadableMap options, final Promise promise){
+    public void downloadPatchFromPpk(ReadableMap options, final Promise promise) {
         String url = options.getString("updateUrl");
         String hash = options.getString("hash");
+        if (hash == null) {
+            hash = options.getString("hashName");
+        }
         String originHash = options.getString("originHash");
+        if (originHash == null) {
+            originHash = options.getString(("originHashName"));
+        }
         updateContext.downloadPatchFromPpk(url, hash, originHash, new UpdateContext.DownloadFileListener() {
             @Override
             public void onDownloadCompleted(DownloadTaskParams params) {
@@ -172,7 +182,8 @@ public class UpdateModule extends ReactContextBaseJavaModule{
 
     @ReactMethod
     public void reloadUpdate(ReadableMap options) {
-        final String hash = options.getString("hash");
+        final String hash = options.getString("hash") == null ?
+                options.getString("hashName") : options.getString("hash");
 
         UiThreadUtil.runOnUiThread(new Runnable() {
             @Override
@@ -200,7 +211,7 @@ public class UpdateModule extends ReactContextBaseJavaModule{
 
                     try {
                         instanceManager.recreateReactContextInBackground();
-                    } catch(Throwable err) {
+                    } catch (Throwable err) {
                         activity.recreate();
                     }
 
@@ -213,7 +224,8 @@ public class UpdateModule extends ReactContextBaseJavaModule{
 
     @ReactMethod
     public void setNeedUpdate(ReadableMap options) {
-        final String hash = options.getString("hash");
+        final String hash = options.getString("hash") == null ?
+                options.getString("hashName") : options.getString("hash");
 
         UiThreadUtil.runOnUiThread(new Runnable() {
             @Override
@@ -260,7 +272,7 @@ public class UpdateModule extends ReactContextBaseJavaModule{
     }
 
     /* 发送事件*/
-    public static void sendEvent(String eventName,  WritableMap params) {
+    public static void sendEvent(String eventName, WritableMap params) {
         ((ReactContext) mContext).getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName,
                 params);
     }

ios/RCTPushy/RCTPushy.m

@@ -84,7 +84,6 @@ RCT_EXPORT_MODULE(RCTPushy);
         }
         else {
             NSString *curVersion = pushyInfo[paramCurrentVersion];
-            NSString *lastVersion = pushyInfo[paramLastVersion];
             
             BOOL isFirstTime = [pushyInfo[paramIsFirstTime] boolValue];
             BOOL isFirstLoadOK = [pushyInfo[paramIsFirstLoadOk] boolValue];
@@ -92,23 +91,7 @@ RCT_EXPORT_MODULE(RCTPushy);
             NSString *loadVersion = curVersion;
             BOOL needRollback = (!ignoreRollback && isFirstTime == NO && isFirstLoadOK == NO) || loadVersion.length<=0;
             if (needRollback) {
-                loadVersion = lastVersion;
+                loadVersion = [self rollback];
-                
-                if (lastVersion.length) {
-                    // roll back to last version
-                    [defaults setObject:@{paramCurrentVersion:lastVersion,
-                                          paramIsFirstTime:@(NO),
-                                          paramIsFirstLoadOk:@(YES),
-                                          paramPackageVersion:curPackageVersion}
-                                 forKey:keyPushyInfo];
-                }
-                else {
-                    // roll back to bundle
-                    [defaults setObject:nil forKey:keyPushyInfo];
-                }
-                [defaults setObject:@(YES) forKey:keyRolledBackMarked];
-                [defaults synchronize];
-                // ...need clear files later
             }
             else if (isFirstTime && !ignoreRollback){
                 // bundleURL may be called many times, ignore rollbacks before process restarted again.
@@ -121,13 +104,15 @@ RCT_EXPORT_MODULE(RCTPushy);
                 [defaults synchronize];
             }
             
-            if (loadVersion.length) {
+            NSString *downloadDir = [RCTPushy downloadDir];
-                NSString *downloadDir = [RCTPushy downloadDir];
+            while (loadVersion.length) {
-                
                 NSString *bundlePath = [[downloadDir stringByAppendingPathComponent:loadVersion] stringByAppendingPathComponent:BUNDLE_FILE_NAME];
                 if ([[NSFileManager defaultManager] fileExistsAtPath:bundlePath isDirectory:NULL]) {
                     NSURL *bundleURL = [NSURL fileURLWithPath:bundlePath];
                     return bundleURL;
+                } else {
+                    RCTLogError(@"RCTPushy -- bundle version %@ not found", loadVersion);
+                    loadVersion = [self rollback];
                 }
             }
         }
@@ -136,6 +121,29 @@ RCT_EXPORT_MODULE(RCTPushy);
     return [RCTPushy binaryBundleURL];
 }
 
++ (NSString *) rollback {
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    
+    NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo];
+    NSString *lastVersion = pushyInfo[paramLastVersion];
+    NSString *curPackageVersion = [RCTPushy packageVersion];
+    if (lastVersion.length) {
+        // roll back to last version
+        [defaults setObject:@{paramCurrentVersion:lastVersion,
+                              paramIsFirstTime:@(NO),
+                              paramIsFirstLoadOk:@(YES),
+                              paramPackageVersion:curPackageVersion}
+                     forKey:keyPushyInfo];
+    }
+    else {
+        // roll back to bundle
+        [defaults setObject:nil forKey:keyPushyInfo];
+    }
+    [defaults setObject:@(YES) forKey:keyRolledBackMarked];
+    [defaults synchronize];
+    return lastVersion;
+}
+
 + (BOOL)requiresMainQueueSetup {
     // only set to YES if your module initialization relies on calling UIKit!
 	return NO;
@@ -248,6 +256,9 @@ RCT_EXPORT_METHOD(downloadPatchFromPpk:(NSDictionary *)options
 RCT_EXPORT_METHOD(setNeedUpdate:(NSDictionary *)options)
 {
     NSString *hash = options[@"hash"];
+    if (hash.length <= 0) {
+        hash = options[@"hashName"];
+    }
     if (hash.length) {
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
         NSString *lastVersion = nil;
@@ -271,6 +282,9 @@ RCT_EXPORT_METHOD(setNeedUpdate:(NSDictionary *)options)
 RCT_EXPORT_METHOD(reloadUpdate:(NSDictionary *)options)
 {
     NSString *hash = options[@"hash"];
+    if (hash.length <= 0) {
+        hash = options[@"hashName"];
+    }
     if (hash.length) {
         [self setNeedUpdate:options];
         
@@ -327,6 +341,9 @@ RCT_EXPORT_METHOD(markSuccess)
 {
     NSString *updateUrl = [RCTConvert NSString:options[@"updateUrl"]];
     NSString *hash = [RCTConvert NSString:options[@"hash"]];
+    if (hash.length <= 0) {
+        hash = [RCTConvert NSString:options[@"hashName"]];;
+    }
     if (updateUrl.length <= 0 || hash.length <= 0) {
         callback([self errorWithMessage:ERROR_OPTIONS]);
         return;

package.json

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