Snapshot current iteration of rollback support (WIP)

Author: Will Anderson

CodePush.h

@@ -21,6 +21,7 @@
 + (NSString *)getBuildVersion;
 
 + (void)setRootComponent:(NSString *)rootComponent;
+
 + (NSString *)getRootComponent;
 
 + (NSDictionary *)getConfiguration;
@@ -44,4 +45,5 @@
 + (void)applyPackage:(NSDictionary *)updatePackage
                error:(NSError **)error;
 
++ (void)rollbackPackage;
 @end

CodePush.m

@@ -10,6 +10,7 @@ @implementation CodePush
 RCT_EXPORT_MODULE()
 
 RCTBridge * _bridge;
+NSTimer *_timer;
 BOOL usingTestFolder = NO;
 
 @synthesize bridge = _bridge;
@@ -62,7 +63,7 @@ + (NSURL *) getBundleUrl
     NSString *packageFolder = [CodePushPackage getCurrentPackageFolderPath:&error];
 
     if (error || !packageFolder) {
-        [self getNativeBundleURL];
+        return [self getNativeBundleURL];
     }
 
     NSString *packageFile = [packageFolder stringByAppendingPathComponent:@"app.jsbundle"];
@@ -82,6 +83,28 @@ + (void) loadBundle
     });
 }
 
++ (void) rollbackPackage:(NSTimer *)timer {
+    [CodePushPackage rollbackPackage];
+    [self loadBundle];
+}
+
++ (void) startRollbackTimer:(int)rollbackTimeout
+{
+    double timeoutInSeconds = rollbackTimeout / 1000;
+    _timer = [NSTimer scheduledTimerWithTimeInterval:timeoutInSeconds
+                                              target:self
+                                            selector:@selector(rollbackPackage:)
+                                            userInfo:nil
+                                             repeats:NO];
+}
+
++ (void) cancelRollbackTimer
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [_timer invalidate];
+    });
+}
+
 RCT_EXPORT_METHOD(setUsingTestFolder:(BOOL) shouldUseTestFolder)
 {
     usingTestFolder = shouldUseTestFolder;
@@ -118,6 +141,7 @@ + (void) loadBundle
 }
 
 RCT_EXPORT_METHOD(applyUpdate:(NSDictionary*)updatePackage
+                  rollbackTimeout:(int)rollbackTimeout
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
@@ -132,7 +156,15 @@ + (void) loadBundle
         }
 
         [CodePush loadBundle];
+        
+        if (0 != rollbackTimeout) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [CodePush startRollbackTimer:rollbackTimeout];
+            });
+
+        }
     });
+    
 }
 
 RCT_EXPORT_METHOD(getCurrentPackage:(RCTPromiseResolveBlock)resolve
@@ -149,4 +181,12 @@ + (void) loadBundle
     });
 }
 
+RCT_EXPORT_METHOD(notifyApplicationReady:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    [CodePush cancelRollbackTimer];
+    
+    resolve([NSNull null]);
+}
+
 @end

CodePushPackage.m

@@ -72,6 +72,18 @@ + (NSString *)getCurrentPackageFolderPath:(NSError **)error
     return [self getPackageFolderPath:packageHash];
 }
 
++ (NSString *)getCurrentPackageHash:(NSError **)error
+{
+    NSDictionary *info = [self getCurrentPackageInfo:error];
+    return info[@"currentPackage"];
+}
+
++ (NSString *)getPreviousPackageHash:(NSError **)error
+{
+    NSDictionary *info = [self getCurrentPackageInfo:error];
+    return info[@"previousPackage"];
+}
+
 + (NSDictionary *)getCurrentPackage:(NSError **)error
 {
     NSString *folderPath = [CodePushPackage getCurrentPackageFolderPath:error];
@@ -185,10 +197,26 @@ + (void)applyPackage:(NSDictionary *)updatePackage
         return;
     }
 
+    [info setValue:info[@"currentPackage"] forKey:@"previousPackage"];
     [info setValue:packageHash forKey:@"currentPackage"];
 
     [self updateCurrentPackageInfo:info
                              error:error];
 }
 
++ (void)rollbackPackage
+{
+    NSError *error;
+    NSMutableDictionary *info = [self getCurrentPackageInfo:&error];
+    
+    if (error) {
+        return;
+    }
+    
+    [info setValue:info[@"previousPackage"] forKey:@"currentPackage"];
+    [info removeObjectForKey:@"previousPackage"];
+    
+    [self updateCurrentPackageInfo:info error:&error];
+}
+
 @end