v5.10.0-beta0

.gitignore

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

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,8 +91,42 @@ RCT_EXPORT_MODULE(RCTPushy);
             NSString *loadVersion = curVersion;
             BOOL needRollback = (!ignoreRollback && isFirstTime == NO && isFirstLoadOK == NO) || loadVersion.length<=0;
             if (needRollback) {
-                loadVersion = lastVersion;
+                loadVersion = [self rollback];
+            }
+            else if (isFirstTime && !ignoreRollback){
+                // bundleURL may be called many times, ignore rollbacks before process restarted again.
+                ignoreRollback = true;
 
+                NSMutableDictionary *newInfo = [[NSMutableDictionary alloc] initWithDictionary:pushyInfo];
+                newInfo[paramIsFirstTime] = @(NO);
+                [defaults setObject:newInfo forKey:keyPushyInfo];
+                [defaults setObject:@(YES) forKey:keyFirstLoadMarked];
+                [defaults synchronize];
+            }
+            
+            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];
+                }
+            }
+        }
+    }
+    
+    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,
@@ -108,32 +141,7 @@ RCT_EXPORT_MODULE(RCTPushy);
     }
     [defaults setObject:@(YES) forKey:keyRolledBackMarked];
     [defaults synchronize];
-                // ...need clear files later
+    return lastVersion;
-            }
-            else if (isFirstTime && !ignoreRollback){
-                // bundleURL may be called many times, ignore rollbacks before process restarted again.
-                ignoreRollback = true;
-
-                NSMutableDictionary *newInfo = [[NSMutableDictionary alloc] initWithDictionary:pushyInfo];
-                newInfo[paramIsFirstTime] = @(NO);
-                [defaults setObject:newInfo forKey:keyPushyInfo];
-                [defaults setObject:@(YES) forKey:keyFirstLoadMarked];
-                [defaults synchronize];
-            }
-            
-            if (loadVersion.length) {
-                NSString *downloadDir = [RCTPushy downloadDir];
-                
-                NSString *bundlePath = [[downloadDir stringByAppendingPathComponent:loadVersion] stringByAppendingPathComponent:BUNDLE_FILE_NAME];
-                if ([[NSFileManager defaultManager] fileExistsAtPath:bundlePath isDirectory:NULL]) {
-                    NSURL *bundleURL = [NSURL fileURLWithPath:bundlePath];
-                    return bundleURL;
-                }
-            }
-        }
-    }
-    
-    return [RCTPushy binaryBundleURL];
 }
 
 + (BOOL)requiresMainQueueSetup {

package.json

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