Updating config options

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

@@ -16,6 +16,51 @@ function setUpTestDependencies(providedTestSdk, providedTestConfig, testNativeBr
 var testConfig;
 var testSdk;
 
+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;
+            }
+
+            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 getConfiguration = (() => {
   var config;
   return function getConfiguration() {
@@ -71,56 +116,15 @@ 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;
-            }
-
-            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();
-              })
-            });
-          });
-}
-
 /* Logs messages to console with the [CodePush] prefix */
 function log(message) {
   console.log(`[CodePush] ${message}`)
 }
 
+function restartApp(rollbackTimeout = 0) {
+  NativeCodePush.restartApp(rollbackTimeout);
+}
+
 /**
  * The sync method provides a simple, one-line experience for
  * incorporating the check, download and application of an update.
@@ -214,7 +218,7 @@ function sync(options = {}, syncStatusChangeCallback, downloadProgressCallback)
           if (typeof syncOptions.updateDialog !== "object") {
             syncOptions.updateDialog = CodePush.DEFAULT_UPDATE_DIALOG;
           } else {
-            syncOptions.updateDialog = Object.assign({}, CodePush.DEFAULT_UPDATE_DIALOG, syncOptions.updateDialog);
+            syncOptions.updateDialog = Object.assign(CodePush.DEFAULT_UPDATE_DIALOG, syncOptions.updateDialog);
           }
 
           var message = null;
@@ -258,6 +262,7 @@ function sync(options = {}, syncStatusChangeCallback, downloadProgressCallback)
         }
       })
       .catch((error) => {
+        console.log(error);
         syncStatusChangeCallback(CodePush.SyncStatus.UNKNOWN_ERROR);
         reject(error);
       })
@@ -271,6 +276,8 @@ var CodePush = {
   getCurrentPackage: getCurrentPackage,
   log: log,
   notifyApplicationReady: NativeCodePush.notifyApplicationReady,
+  restartApp: restartApp,
+  setDeploymentKey: NativeCodePush.setDeploymentKey,
   setUpTestDependencies: setUpTestDependencies,
   sync: sync,
   InstallMode: {