feedback

Author: geof90

CodePush.js

@@ -34,7 +34,7 @@ function checkForUpdate(deploymentKey = null) {
         config = configResult;
       }
 
-      sdk = getSDK(config);
+      sdk = new module.exports.AcquisitionSdk(requestFetchAdapter, config);
 
       // Allow dynamic overwrite of function. This is only to be used for tests.
       return module.exports.getCurrentPackage();
@@ -129,11 +129,6 @@ function getCurrentPackage() {
   });
 }
 
-function getSDK(config) {
-  // Allow dynamic overwrite of acquisition SDK. This is only to be used for tests.
-  return new module.exports.AcquisitionSdk(requestFetchAdapter, config);
-}
-
 /* Logs messages to console with the [CodePush] prefix */
 function log(message) {
   console.log(`[CodePush] ${message}`)

CodePush.m

@@ -50,7 +50,10 @@ + (NSURL *)bundleURLForResource:(NSString *)resourceName
     NSString *packageFile = [CodePushPackage getCurrentPackageBundlePath:&error];
     NSURL *binaryJsBundleUrl = [[NSBundle mainBundle] URLForResource:resourceName withExtension:resourceExtension];
 
+    NSString *logMessageFormat = @"Loading JS bundle from %@";
+    
     if (error || !packageFile) {
+        NSLog(logMessageFormat, binaryJsBundleUrl);
         return binaryJsBundleUrl;
     }
 
@@ -61,8 +64,11 @@ + (NSURL *)bundleURLForResource:(NSString *)resourceName
 
     if ([binaryDate compare:packageDate] == NSOrderedAscending) {
         // Return package file because it is newer than the app store binary's JS bundle
-        return [[NSURL alloc] initFileURLWithPath:packageFile];
+        NSURL *packageUrl = [[NSURL alloc] initFileURLWithPath:packageFile];
+        NSLog(logMessageFormat, packageUrl);
+        return packageUrl;
     } else {
+        NSLog(logMessageFormat, binaryJsBundleUrl);
         return binaryJsBundleUrl;
     }
 }
@@ -159,6 +165,7 @@ - (void)initializeUpdateAfterRestart
         if (updateIsLoading) {
             // Pending update was initialized, but notifyApplicationReady was not called.
             // Therefore, deduce that it is a broken update and rollback.
+            NSLog(@"Update did not finish loading the last time, rolling back to a previous version.");
             [self rollbackPackage];
         } else {
             // Mark that we tried to initialize the new update, so that if it crashes,
@@ -214,8 +221,7 @@ - (void)loadBundle
         // file (since Chrome wouldn't support it). Otherwise, update
         // the current bundle URL to point at the latest update
         if ([CodePush isUsingTestConfiguration] || ![_bridge.bundleURL.scheme hasPrefix:@"http"]) {
-            NSURL *url = [CodePush bundleURL];
-            _bridge.bundleURL = url;
+            _bridge.bundleURL = [CodePush bundleURL];
         }
 
         [_bridge reload];
@@ -386,17 +392,15 @@ - (void)savePendingUpdate:(NSString *)packageHash
             [self savePendingUpdate:updatePackage[PackageHashKey]
                           isLoading:NO];
 
-            if (installMode == CodePushInstallModeOnNextResume) {
+            if (installMode == CodePushInstallModeOnNextResume && !_hasResumeListener) {
                 // Ensure we do not add the listener twice.
-                if (!_hasResumeListener) {
-                    // Register for app resume notifications so that we
-                    // can check for pending updates which support "restart on resume"
-                    [[NSNotificationCenter defaultCenter] addObserver:self
-                                                             selector:@selector(loadBundle)
-                                                                 name:UIApplicationWillEnterForegroundNotification
-                                                               object:[UIApplication sharedApplication]];
-                    _hasResumeListener = YES;
-                }
+                // Register for app resume notifications so that we
+                // can check for pending updates which support "restart on resume"
+                [[NSNotificationCenter defaultCenter] addObserver:self
+                                                         selector:@selector(loadBundle)
+                                                             name:UIApplicationWillEnterForegroundNotification
+                                                           object:[UIApplication sharedApplication]];
+                _hasResumeListener = YES;
             }
             // Signal to JS that the update has been applied.
             resolve(nil);
@@ -453,8 +457,9 @@ - (void)savePendingUpdate:(NSString *)packageHash
 
 /*
  * This method is the native side of the CodePush.downloadAndReplaceCurrentBundle()
- * method, which is only to be used during tests and no-ops if the test configuration
- * flag is not set.
+ * method, which replaces the current bundle with the one downloaded from
+ * removeBundleUrl. It is only to be used during tests and no-ops if the test 
+ * configuration flag is not set.
  */
 RCT_EXPORT_METHOD(downloadAndReplaceCurrentBundle:(NSString *)remoteBundleUrl)
 {

Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/resources/testPackages.js

@@ -0,0 +1,32 @@
+export let serverPackage = {
+  appVersion: "1.5.0",
+  description: "Angry flappy birds",
+  downloadUrl: "http://www.windowsazure.com/blobs/awperoiuqpweru",
+  isAvailable: true,
+  isMandatory: false,
+  packageHash: "hash240",
+  packageSize: 1024,
+  updateAppVersion: false
+};
+
+export let localPackage = {
+  downloadURL: "http://www.windowsazure.com/blobs/awperoiuqpweru",
+  description: "Angry flappy birds",
+  appVersion: "1.5.0",
+  label: "2.4.0",
+  isMandatory: false,
+  isAvailable: true,
+  updateAppVersion: false,
+  packageHash: "hash123",
+  packageSize: 1024
+};
+
+export let updateAppVersionPackage = {
+  appVersion: "1.5.0",
+  description: "",
+  downloadUrl: "",
+  isAvailable: false,
+  isMandatory: false,
+  packageHash: "",
+  updateAppVersion: true
+};

Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/FirstUpdateTest.js

@@ -8,18 +8,8 @@ let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCo
 import assert from "assert";
 import createMockAcquisitionSdk from "../../utils/mockAcquisitionSdk";
 
-let serverPackage = {
-  appVersion: "1.5.0",
-  description: "Angry flappy birds",
-  downloadUrl: "http://www.windowsazure.com/blobs/awperoiuqpweru",
-  isAvailable: true,
-  isMandatory: false,
-  packageHash: "hash240",
-  packageSize: 1024,
-  updateAppVersion: false
-};
-
-let localPackage = {};
+import { serverPackage } from "../resources/testPackages";
+const localPackage = {};
 
 let FirstUpdateTest = createTestCaseComponent(
   "FirstUpdateTest",

Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/NewUpdateTest.js

@@ -8,28 +8,7 @@ let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCo
 import assert from "assert";
 import createMockAcquisitionSdk from "../../utils/mockAcquisitionSdk";
 
-let serverPackage = {
-  appVersion: "1.5.0",
-  description: "Angry flappy birds",
-  downloadUrl: "http://www.windowsazure.com/blobs/awperoiuqpweru",
-  isAvailable: true,
-  isMandatory: false,
-  packageHash: "hash240",
-  packageSize: 1024,
-  updateAppVersion: false
-};
-
-let localPackage = {
-  downloadURL: "http://www.windowsazure.com/blobs/awperoiuqpweru",
-  description: "Angry flappy birds",
-  appVersion: "1.5.0",
-  label: "2.4.0",
-  isMandatory: false,
-  isAvailable: true,
-  updateAppVersion: false,
-  packageHash: "hash123",
-  packageSize: 1024
-};
+import { serverPackage, localPackage } from "../resources/testPackages";
 
 let NewUpdateTest = createTestCaseComponent(
   "NewUpdateTest",

Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/RemotePackageAppVersionNewerTest.js

@@ -8,16 +8,7 @@ let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCo
 import assert from "assert";
 import createMockAcquisitionSdk from "../../utils/mockAcquisitionSdk";
 
-let serverPackage = {
-  appVersion: "1.5.0",
-  description: "",
-  downloadUrl: "",
-  isAvailable: false,
-  isMandatory: false,
-  packageHash: "",
-  updateAppVersion: true
-};
-
+import { updateAppVersionPackage as serverPackage } from "../resources/testPackages";
 let localPackage = {};
 
 let RemotePackageAppVersionNewerTest = createTestCaseComponent(

Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/SamePackageTest.js

@@ -8,18 +8,8 @@ let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCo
 import assert from "assert";
 import createMockAcquisitionSdk from "../../utils/mockAcquisitionSdk";
 
-let serverPackage = {
-  appVersion: "1.5.0",
-  description: "Angry flappy birds",
-  downloadUrl: "http://www.windowsazure.com/blobs/awperoiuqpweru",
-  isAvailable: true,
-  isMandatory: false,
-  packageHash: "hash240",
-  packageSize: 1024,
-  updateAppVersion: false
-};
-
-let localPackage = serverPackage;
+import { serverPackage } from "../resources/testPackages";
+const localPackage = serverPackage;
 
 let SamePackageTest = createTestCaseComponent(
   "SamePackageTest",

Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/SwitchDeploymentKeyTest.js

@@ -8,18 +8,9 @@ let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCo
 import assert from "assert";
 import createMockAcquisitionSdk from "../../utils/mockAcquisitionSdk";
 
-let serverPackage = {
-  appVersion: "1.5.0",
-  description: "Angry flappy birds",
-  downloadUrl: "http://www.windowsazure.com/blobs/awperoiuqpweru",
-  isAvailable: true,
-  isMandatory: false,
-  packageHash: "hash240",
-  packageSize: 1024,
-  updateAppVersion: false
-};
+import { serverPackage } from "../resources/testPackages";
+const localPackage = {};
 
-let localPackage = {};
 let deploymentKey = "myKey123";
 
 let SwitchDeploymentKeyTest = createTestCaseComponent(

Examples/CodePushDemoApp/CodePushDemoAppTests/DownloadProgressTests/resources/TestPackages.js

@@ -44,4 +44,4 @@ packages.forEach((aPackage) => {
   }
 });
 
-module.exports = packages;
+export default packages;

Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/NotifyApplicationReadyAndRestart.js

@@ -1,17 +1,11 @@
 "use strict";
 
 import React from "react-native";
-let { Platform } = require("react-native");
+import { Platform, AppRegistry, Text, View } from "react-native";
 import CodePush from "react-native-code-push";
 let NativeCodePush = React.NativeModules.CodePush;
 let RCTTestModule = React.NativeModules.TestModule;
 
-let {
-  AppRegistry,
-  Text,
-  View,
-} = React;
-
 let NotifyApplicationReadyTest = React.createClass({
   getInitialState() {
     return {};