Merge pull request #61 from Microsoft/config_updates

Misc. product updates/improvements

Author: lostintangent

CodePush.h

@@ -2,30 +2,26 @@
 
 @interface CodePush : NSObject<RCTBridgeModule>
 
-+ (NSURL *)getBundleUrl;
-+ (NSString *)getDocumentsDirectory;
-
-@end
-
-@interface CodePushConfig : NSObject
++ (NSURL *)bundleURL;
 
-+ (void)setDeploymentKey:(NSString *)deploymentKey;
-+ (NSString *)getDeploymentKey;
++ (NSURL *)bundleURLForResourceName:(NSString *)resourceName;
 
-+ (void)setServerUrl:(NSString *)setServerUrl;
-+ (NSString *)getServerUrl;
++ (NSURL *)bundleURLForResourceName:(NSString *)resourceName
+                      withExtension:(NSString *)resourceExtension;
 
-+ (void)setAppVersion:(NSString *)appVersion;
-+ (NSString *)getAppVersion;
++ (NSString *)getDocumentsDirectory;
 
-+ (void)setBuildVersion:(NSString *)buildVersion;
-+ (NSString *)getBuildVersion;
+@end
 
-+ (void)setRootComponent:(NSString *)rootComponent;
+@interface CodePushConfig : NSObject
 
-+ (NSString *)getRootComponent;
+@property (readonly) NSString *appVersion;
+@property (readonly) NSString *buildVersion;
+@property (readonly) NSDictionary *configuration;
+@property (copy) NSString *deploymentKey;
+@property (copy) NSString *serverURL;
 
-+ (NSDictionary *)getConfiguration;
++ (instancetype)current;
 
 @end
 

CodePush.ios.js

@@ -1,32 +1,70 @@
 'use strict';
 
+var { AlertIOS } = require("react-native");
 var NativeCodePush = require("react-native").NativeModules.CodePush;
+var packageMixins = require("./package-mixins")(NativeCodePush);
 var requestFetchAdapter = require("./request-fetch-adapter.js");
 var Sdk = require("code-push/script/acquisition-sdk").AcquisitionManager;
-var packageMixins = require("./package-mixins")(NativeCodePush);
 
-var { AlertIOS } = require("react-native");
+function checkForUpdate() {
+  var config;
+  var sdk;
+  
+  return getConfiguration()
+          .then((configResult) => {
+            config = configResult;
+            return getSdk();
+          })
+          .then((sdkResult) => {
+            sdk = sdkResult;
+            return getCurrentPackage();
+          })
+          .then((localPackage) => {
+            var queryPackage = { appVersion: config.appVersion };
+            if (localPackage && localPackage.appVersion === config.appVersion) {
+              queryPackage = localPackage;
+            }
 
-// This function is only used for tests. Replaces the default SDK, configuration and native bridge
-function setUpTestDependencies(providedTestSdk, providedTestConfig, testNativeBridge){
-  if (providedTestSdk) testSdk = providedTestSdk;
-  if (providedTestConfig) testConfig = providedTestConfig;
-  if (testNativeBridge) NativeCodePush = testNativeBridge;
+            return new Promise((resolve, reject) => {
+              sdk.queryUpdateWithCurrentPackage(queryPackage, (err, update) => {
+                if (err) {
+                  return reject(err);
+                }
+                
+                // Ignore updates that require a newer app version,
+                // since the end-user couldn't reliably install it
+                if (!update || update.updateAppVersion) {
+                  return resolve(null);
+                }
+
+                update = Object.assign(update, packageMixins.remote);
+                
+                NativeCodePush.isFailedUpdate(update.packageHash)
+                  .then((isFailedHash) => {
+                    update.failedInstall = isFailedHash;
+                    resolve(update);
+                  })
+                  .catch(reject)
+                  .done();
+              })
+            });
+          });
 }
-var testConfig;
-var testSdk;
+
+var isConfigValid = true;
 
 var getConfiguration = (() => {
   var config;
   return function getConfiguration() {
-    if (config) {
+    if (config && isConfigValid) {
       return Promise.resolve(config);
     } else if (testConfig) {
       return Promise.resolve(testConfig);
     } else {
       return NativeCodePush.getConfiguration()
         .then((configuration) => {
           if (!config) config = configuration;
+          isConfigValid = true;
           return config;
         });
     }
@@ -71,54 +109,33 @@ function getCurrentPackage() {
   });
 }
 
-function checkForUpdate() {
-  var config;
-  var sdk;
-  
-  return getConfiguration()
-          .then((configResult) => {
-            config = configResult;
-            return getSdk();
-          })
-          .then((sdkResult) => {
-            sdk = sdkResult;
-            return getCurrentPackage();
-          })
-          .then((localPackage) => {
-            var queryPackage = { appVersion: config.appVersion };
-            if (localPackage && localPackage.appVersion === config.appVersion) {
-              queryPackage = localPackage;
-            }
+/* Logs messages to console with the [CodePush] prefix */
+function log(message) {
+  console.log(`[CodePush] ${message}`)
+}
 
-            return new Promise((resolve, reject) => {
-              sdk.queryUpdateWithCurrentPackage(queryPackage, (err, update) => {
-                if (err) {
-                  return reject(err);
-                }
-                
-                // Ignore updates that require a newer app version,
-                // since the end-user couldn't reliably install it
-                if (!update || update.updateAppVersion) {
-                  return resolve(null);
-                }
+function restartApp(rollbackTimeout = 0) {
+  NativeCodePush.restartApp(rollbackTimeout);
+}
 
-                update = Object.assign(update, packageMixins.remote);
-                
-                NativeCodePush.isFailedUpdate(update.packageHash)
-                  .then((isFailedHash) => {
-                    update.failedInstall = isFailedHash;
-                    resolve(update);
-                  })
-                  .catch(reject)
-                  .done();
-              })
-            });
-          });
+function setDeploymentKey(deploymentKey) {
+  return NativeCodePush.setDeploymentKey(deploymentKey)
+    .then(() => {
+        // Mark the local copy of the config data
+        // as invalid since we just modified it
+        // on the native end.
+        isConfigValid = false;
+    });  
 }
 
-/* Logs messages to console with the [CodePush] prefix */
-function log(message) {
-  console.log(`[CodePush] ${message}`)
+var testConfig;
+var testSdk;
+
+// This function is only used for tests. Replaces the default SDK, configuration and native bridge
+function setUpTestDependencies(providedTestSdk, providedTestConfig, testNativeBridge) {
+  if (providedTestSdk) testSdk = providedTestSdk;
+  if (providedTestConfig) testConfig = providedTestConfig;
+  if (testNativeBridge) NativeCodePush = testNativeBridge;
 }
 
 /**
@@ -271,6 +288,8 @@ var CodePush = {
   getCurrentPackage: getCurrentPackage,
   log: log,
   notifyApplicationReady: NativeCodePush.notifyApplicationReady,
+  restartApp: restartApp,
+  setDeploymentKey: setDeploymentKey,
   setUpTestDependencies: setUpTestDependencies,
   sync: sync,
   InstallMode: {