Merge pull request #300 from Microsoft/clear-updates-init

Check and clear updates if needed during init if running JS bundle from dev server

Author: geof90

ios/CodePush/CodePush.m

@@ -76,32 +76,32 @@ + (NSURL *)bundleURLForResource:(NSString *)resourceName
 {
     bundleResourceName = resourceName;
     bundleResourceExtension = resourceExtension;
-    
+
     [self ensureBinaryBundleExists];
-    
+
     NSString *logMessageFormat = @"Loading JS bundle from %@";
-    
+
     NSError *error;
     NSString *packageFile = [CodePushPackage getCurrentPackageBundlePath:&error];
     NSURL *binaryBundleURL = [self binaryBundleURL];
-    
+
     if (error || !packageFile) {
         NSLog(logMessageFormat, binaryBundleURL);
         isRunningBinaryVersion = YES;
         return binaryBundleURL;
     }
-    
+
     NSString *binaryAppVersion = [[CodePushConfig current] appVersion];
     NSDictionary *currentPackageMetadata = [CodePushPackage getCurrentPackage:&error];
     if (error || !currentPackageMetadata) {
         NSLog(logMessageFormat, binaryBundleURL);
         isRunningBinaryVersion = YES;
         return binaryBundleURL;
     }
-    
+
     NSString *packageDate = [currentPackageMetadata objectForKey:BinaryBundleDateKey];
     NSString *packageAppVersion = [currentPackageMetadata objectForKey:AppVersionKey];
-    
+
     if ([[CodePushUpdateUtils modifiedDateStringOfFileAtURL:binaryBundleURL] isEqualToString:packageDate] && ([CodePush isUsingTestConfiguration] ||[binaryAppVersion isEqualToString:packageAppVersion])) {
         // Return package file because it is newer than the app store binary's JS bundle
         NSURL *packageUrl = [[NSURL alloc] initFileURLWithPath:packageFile];
@@ -113,11 +113,11 @@ + (NSURL *)bundleURLForResource:(NSString *)resourceName
 #ifndef DEBUG
         isRelease = YES;
 #endif
-        
+
         if (isRelease || ![binaryAppVersion isEqualToString:packageAppVersion]) {
             [CodePush clearUpdates];
         }
-        
+
         NSLog(logMessageFormat, binaryBundleURL);
         isRunningBinaryVersion = YES;
         return binaryBundleURL;
@@ -172,6 +172,29 @@ + (void)setUsingTestConfiguration:(BOOL)shouldUseTestConfiguration
 @synthesize bridge = _bridge;
 @synthesize methodQueue = _methodQueue;
 
+/*
+ * This method is used to clear updates that are installed
+ * under a different app version and hence don't apply anymore,
+ * during a debug run configuration and when the bridge is 
+ * running the JS bundle from the dev server.
+ */
+- (void)clearDebugUpdates
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if ([_bridge.bundleURL.scheme hasPrefix:@"http"]) {
+            NSError *error;
+            NSString *binaryAppVersion = [[CodePushConfig current] appVersion];
+            NSDictionary *currentPackageMetadata = [CodePushPackage getCurrentPackage:&error];
+            if (currentPackageMetadata) {
+                NSString *packageAppVersion = [currentPackageMetadata objectForKey:AppVersionKey];
+                if (![binaryAppVersion isEqualToString:packageAppVersion]) {
+                    [CodePush clearUpdates];
+                }
+            }
+        }
+    });
+}
+
 /*
  * This method is used by the React Native bridge to allow
  * our plugin to expose constants to the JS-side. In our case
@@ -186,7 +209,7 @@ - (NSDictionary *)constantsToExport
              @"codePushInstallModeOnNextRestart":@(CodePushInstallModeOnNextRestart),
              @"codePushInstallModeImmediate": @(CodePushInstallModeImmediate),
              @"codePushInstallModeOnNextResume": @(CodePushInstallModeOnNextResume),
-             
+
              @"codePushUpdateStateRunning": @(CodePushUpdateStateRunning),
              @"codePushUpdateStatePending": @(CodePushUpdateStatePending),
              @"codePushUpdateStateLatest": @(CodePushUpdateStateLatest)
@@ -208,35 +231,35 @@ + (void)ensureBinaryBundleExists
 {
     if (![self binaryBundleURL]) {
         NSString *errorMessage;
-        
+
 #if TARGET_IPHONE_SIMULATOR
         errorMessage = @"React Native doesn't generate your app's JS bundle by default when deploying to the simulator. "
         "If you'd like to test CodePush using the simulator, you can do one of three things depending on your React "
         "Native version and/or preferred workflow:\n\n"
-        
+
         "1. Update your AppDelegate.m file to load the JS bundle from the packager instead of from CodePush. "
         "You can still test your CodePush update experience using this workflow (debug builds only).\n\n"
-        
+
         "2. Force the JS bundle to be generated in simulator builds by removing the if block that echoes "
         "\"Skipping bundling for Simulator platform\" in the \"node_modules/react-native/packager/react-native-xcode.sh\" file.\n\n"
-        
+
         "3. Deploy a release build to the simulator, which unlike debug builds, will generate the JS bundle (React Native >=0.22.0 only).";
 #else
         errorMessage = [NSString stringWithFormat:@"The specified JS bundle file wasn't found within the app's binary. Is \"%@\" the correct file name?", [bundleResourceName stringByAppendingPathExtension:bundleResourceExtension]];
 #endif
-        
+
         RCTFatal([CodePushErrorUtils errorWithMessage:errorMessage]);
     }
 }
 
 - (instancetype)init
 {
     self = [super init];
-    
+
     if (self) {
         [self initializeUpdateAfterRestart];
     }
-    
+
     return self;
 }
 
@@ -247,6 +270,10 @@ - (instancetype)init
  */
 - (void)initializeUpdateAfterRestart
 {
+#ifdef DEBUG
+    [self clearDebugUpdates];
+#endif
+    
     NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
     NSDictionary *pendingUpdate = [preferences objectForKey:PendingUpdateKey];
     if (pendingUpdate) {
@@ -291,7 +318,7 @@ - (BOOL)isFailedHash:(NSString*)packageHash
                 }
             }
         }
-        
+
         return NO;
     }
 }
@@ -305,13 +332,13 @@ - (BOOL)isPendingUpdate:(NSString*)packageHash
 {
     NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
     NSDictionary *pendingUpdate = [preferences objectForKey:PendingUpdateKey];
-    
+
     // If there is a pending update whose "state" isn't loading, then we consider it "pending".
     // Additionally, if a specific hash was provided, we ensure it matches that of the pending update.
     BOOL updateIsPending = pendingUpdate &&
                            [pendingUpdate[PendingUpdateIsLoadingKey] boolValue] == NO &&
                            (!packageHash || [pendingUpdate[PendingUpdateHashKey] isEqualToString:packageHash]);
-    
+
     return updateIsPending;
 }
 
@@ -332,7 +359,7 @@ - (void)loadBundle
         if ([CodePush isUsingTestConfiguration] || ![_bridge.bundleURL.scheme hasPrefix:@"http"]) {
             [_bridge setValue:[CodePush bundleURL] forKey:@"bundleURL"];
         }
-        
+
         [_bridge reload];
     });
 }
@@ -348,10 +375,10 @@ - (void)rollbackPackage
 {
     NSError *error;
     NSDictionary *failedPackage = [CodePushPackage getCurrentPackage:&error];
-    
+
     // Write the current package's metadata to the "failed list"
     [self saveFailedUpdate:failedPackage];
-    
+
     // Rollback to the previous version and de-register the new update
     [CodePushPackage rollbackPackage];
     [CodePush removePendingUpdate];
@@ -374,7 +401,7 @@ - (void)saveFailedUpdate:(NSDictionary *)failedPackage
         // objects, regardless if you stored something mutable.
         failedUpdates = [failedUpdates mutableCopy];
     }
-    
+
     [failedUpdates addObject:failedPackage];
     [preferences setObject:failedUpdates forKey:FailedUpdatesKey];
     [preferences synchronize];
@@ -416,7 +443,7 @@ - (void)savePendingUpdate:(NSString *)packageHash
     NSDictionary *pendingUpdate = [[NSDictionary alloc] initWithObjectsAndKeys:
                                    packageHash,PendingUpdateHashKey,
                                    [NSNumber numberWithBool:isLoading],PendingUpdateIsLoadingKey, nil];
-    
+
     [preferences setObject:pendingUpdate forKey:PendingUpdateKey];
     [preferences synchronize];
 }
@@ -457,7 +484,7 @@ - (void)applicationWillResignActive
         [mutableUpdatePackage setValue:[CodePushUpdateUtils modifiedDateStringOfFileAtURL:binaryBundleURL]
                                 forKey:BinaryBundleDateKey];
     }
-    
+
     [CodePushPackage
         downloadPackage:mutableUpdatePackage
         expectedBundleFileName:[bundleResourceName stringByAppendingPathExtension:bundleResourceExtension]
@@ -478,11 +505,11 @@ - (void)applicationWillResignActive
             dispatch_async(_methodQueue, ^{
                 NSError *err;
                 NSDictionary *newPackage = [CodePushPackage getPackage:mutableUpdatePackage[PackageHashKey] error:&err];
-                    
+
                 if (err) {
                     return reject([NSString stringWithFormat: @"%lu", (long)err.code], err.localizedDescription, err);
                 }
-                    
+
                 resolve(newPackage);
             });
         }
@@ -492,7 +519,7 @@ - (void)applicationWillResignActive
                 if ([CodePushErrorUtils isCodePushError:err]) {
                     [self saveFailedUpdate:mutableUpdatePackage];
                 }
-                
+
                 reject([NSString stringWithFormat: @"%lu", (long)err.code], err.localizedDescription, err);
             });
         }];
@@ -517,21 +544,21 @@ - (void)applicationWillResignActive
             resolve(configuration);
             return;
         }
-        
+
         if (binaryHash == nil) {
             // The hash was not generated either due to a previous unknown error or the fact that
             // the React Native assets were not bundled in the binary (e.g. during dev/simulator)
             // builds.
             resolve(configuration);
             return;
         }
-        
+
         NSMutableDictionary *mutableConfiguration = [configuration mutableCopy];
         [mutableConfiguration setObject:binaryHash forKey:PackageHashKey];
         resolve(mutableConfiguration);
         return;
     }
-    
+
     resolve(configuration);
 }
 
@@ -553,10 +580,10 @@ - (void)applicationWillResignActive
         // wanted to retrieve the pending or running update.
         return resolve(nil);
     }
-    
+
     // We have a CodePush update, so let's see if it's currently in a pending state.
     BOOL currentUpdateIsPending = [self isPendingUpdate:[package objectForKey:PackageHashKey]];
-   
+
     if (updateState == CodePushUpdateStatePending && !currentUpdateIsPending) {
         // The caller wanted a pending update
         // but there isn't currently one.
@@ -576,7 +603,7 @@ - (void)applicationWillResignActive
             // disk that is not actually running.
             [package setObject:@(YES) forKey:@"_isDebugOnly"];
         }
-    
+
         // Enable differentiating pending vs. non-pending updates
         [package setObject:@(currentUpdateIsPending) forKey:PackageIsPendingKey];
         resolve(package);
@@ -596,16 +623,16 @@ - (void)applicationWillResignActive
     [CodePushPackage installPackage:updatePackage
                 removePendingUpdate:[self isPendingUpdate:nil]
                               error:&error];
-    
+
     if (error) {
         reject([NSString stringWithFormat: @"%lu", (long)error.code], error.localizedDescription, error);
     } else {
         [self savePendingUpdate:updatePackage[PackageHashKey]
                       isLoading:NO];
-        
+
         if (installMode == CodePushInstallModeOnNextResume) {
             _minimumBackgroundDuration = minimumBackgroundDuration;
-            
+
             if (!_hasResumeListener) {
                 // Ensure we do not add the listener twice.
                 // Register for app resume notifications so that we
@@ -614,16 +641,16 @@ - (void)applicationWillResignActive
                                                          selector:@selector(applicationWillEnterForeground)
                                                              name:UIApplicationWillEnterForegroundNotification
                                                            object:[UIApplication sharedApplication]];
-                
+
                 [[NSNotificationCenter defaultCenter] addObserver:self
                                                          selector:@selector(applicationWillResignActive)
                                                              name:UIApplicationWillResignActiveNotification
                                                            object:[UIApplication sharedApplication]];
-                
+
                 _hasResumeListener = YES;
             }
         }
-        
+
         // Signal to JS that the update has been applied.
         resolve(nil);
     }
@@ -654,7 +681,7 @@ - (void)applicationWillResignActive
                         && nil != packageHash
                         && [packageHash length] > 0
                         && [packageHash isEqualToString:[CodePushPackage getCurrentPackageHash:&error]];
-    
+
     resolve(@(isFirstRun));
 }
 
@@ -701,7 +728,7 @@ - (void)applicationWillResignActive
  */
 RCT_EXPORT_METHOD(getNewStatusReport:(RCTPromiseResolveBlock)resolve
                             rejecter:(RCTPromiseRejectBlock)reject)
-{    
+{
     if (needToReportRollback) {
         needToReportRollback = NO;
         NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
@@ -725,7 +752,7 @@ - (void)applicationWillResignActive
         resolve([CodePushTelemetryManager getBinaryUpdateReport:appVersion]);
         return;
     }
-    
+
     resolve(nil);
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-code-push",
-  "version": "1.10.2-beta",
+  "version": "1.10.3-beta",
   "description": "React Native plugin for the CodePush service",
   "main": "CodePush.js",
   "homepage": "https://microsoft.github.io/code-push",
@@ -23,12 +23,12 @@
           "packageInstance": "new CodePush(${androidDeploymentKey}, this, BuildConfig.DEBUG)"
       },
       "ios": {
-        "sharedLibraries": ["libz"]  
+        "sharedLibraries": ["libz"]
       },
       "params": [{
         "type": "input",
         "name": "androidDeploymentKey",
-        "message": "What is your CodePush deployment key for Android (hit <ENTER> to ignore)"   
+        "message": "What is your CodePush deployment key for Android (hit <ENTER> to ignore)"
       }]
   }
 }