@revopush/react-native-code-push 2.5.0-rc.7 → 2.5.1

package/.claude/settings.local.json

@@ -0,0 +1,9 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(git:*)",
+      "Bash(echo \"EXIT:$?\")",
+      "Bash(find:*)"
+    ]
+  }
+}

package/CodePush.js

@@ -42,9 +42,11 @@ async function checkForUpdate(deploymentKey = null, handleBinaryVersionMismatchC
    */
   let queryPackage;
   if (localPackage) {
-    queryPackage = localPackage;
+    // buildNumber reflects the native binary and never changes across OTA updates,
+    // so always use the value from config rather than whatever the local package stored.
+    queryPackage = { ...localPackage, buildNumber: config.buildNumber };
   } else {
-    queryPackage = { appVersion: config.appVersion };
+    queryPackage = { appVersion: config.appVersion, buildNumber: config.buildNumber };
     if (config.packageHash) {
         queryPackage.packageHash = config.packageHash;
     }

package/android/src/main/java/com/microsoft/codepush/react/CodePush.java

@@ -40,6 +40,7 @@ public class CodePush implements ReactPackage {
     private static boolean sNeedToReportRollback = false;
     private static boolean sTestConfigurationFlag = false;
     private static String sAppVersion = null;
+    private static String sBuildNumber = null;
 
     private boolean mDidUpdate = false;
 
@@ -86,6 +87,7 @@ public class CodePush implements ReactPackage {
             try {
                 PackageInfo pInfo = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0);
                 sAppVersion = pInfo.versionName;
+                sBuildNumber = String.valueOf(pInfo.versionCode);
             } catch (PackageManager.NameNotFoundException e) {
                 throw new CodePushUnknownException("Unable to get package info for " + mContext.getPackageName(), e);
             }
@@ -182,6 +184,10 @@ public class CodePush implements ReactPackage {
         return sAppVersion;
     }
 
+    public String getBuildNumber() {
+        return sBuildNumber;
+    }
+
     public String getAssetsBundleFileName() {
         return mAssetsBundleFileName;
     }
@@ -372,6 +378,10 @@ public class CodePush implements ReactPackage {
         sAppVersion = appVersionOverride;
     }
 
+    public static void overrideBuildNumber(String buildNumberOverride) {
+        sBuildNumber = buildNumberOverride;
+    }
+
     private void rollbackPackage() {
         JSONObject failedPackage = mUpdateManager.getCurrentPackage();
         mSettingsManager.saveFailedUpdate(failedPackage);

package/android/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java

@@ -499,6 +499,7 @@ public class CodePushNativeModule extends BaseJavaModule {
         try {
             WritableMap configMap = Arguments.createMap();
             configMap.putString("appVersion", mCodePush.getAppVersion());
+            configMap.putString("buildNumber", mCodePush.getBuildNumber());
             configMap.putString("clientUniqueId", mClientUniqueId);
             configMap.putString("deploymentKey", mCodePush.getDeploymentKey());
             configMap.putString("serverUrl", mCodePush.getServerUrl());

package/ios/CodePush/CodePush.h

@@ -49,6 +49,13 @@
  */
 + (void)overrideAppVersion:(NSString *)appVersion;
 
+/*
+ * This method allows the build number of the app's binary interface
+ * to be specified, which would otherwise default to the
+ * binary build number of the app.
+ */
++ (void)overrideBuildNumber:(NSString *)buildNumber;
+
 /*
  * This method allows dynamically setting the app's
  * deployment key, in addition to setting it via
@@ -98,6 +105,7 @@
 @interface CodePushConfig : NSObject
 
 @property (copy) NSString *appVersion;
+@property (copy) NSString *buildNumber;
 @property (readonly) NSString *buildVersion;
 @property (readonly) NSDictionary *configuration;
 @property (copy) NSString *deploymentKey;

package/ios/CodePush/CodePush.m

@@ -218,6 +218,11 @@ static NSString *const LatestRollbackCountKey = @"count";
     [CodePushConfig current].appVersion = appVersion;
 }
 
++ (void)overrideBuildNumber:(NSString *)buildNumber
+{
+    [CodePushConfig current].buildNumber = buildNumber;
+}
+
 + (void)setDeploymentKey:(NSString *)deploymentKey
 {
     [CodePushConfig current].deploymentKey = deploymentKey;

package/ios/CodePush/CodePushConfig.m

@@ -9,6 +9,7 @@ static CodePushConfig *_currentConfig;
 
 static NSString * const AppVersionConfigKey = @"appVersion";
 static NSString * const BuildVersionConfigKey = @"buildVersion";
+static NSString * const BuildNumberConfigKey = @"buildNumber";
 static NSString * const ClientUniqueIDConfigKey = @"clientUniqueId";
 static NSString * const DeploymentKeyConfigKey = @"deploymentKey";
 static NSString * const ServerURLConfigKey = @"serverUrl";
@@ -33,6 +34,7 @@ static NSString * const PublicKeyKey = @"publicKey";
 
     NSString *appVersion = [infoDictionary objectForKey:@"CFBundleShortVersionString"];
     NSString *buildVersion = [infoDictionary objectForKey:(NSString *)kCFBundleVersionKey];
+    NSString *buildNumber = buildVersion;
     NSString *deploymentKey = [infoDictionary objectForKey:@"CodePushDeploymentKey"];
     NSString *serverURL = [infoDictionary objectForKey:@"CodePushServerURL"];
     NSString *publicKey = [infoDictionary objectForKey:@"CodePushPublicKey"];
@@ -53,6 +55,7 @@ static NSString * const PublicKeyKey = @"publicKey";
 
     if (appVersion) [_configDictionary setObject:appVersion forKey:AppVersionConfigKey];
     if (buildVersion) [_configDictionary setObject:buildVersion forKey:BuildVersionConfigKey];
+    if (buildNumber) [_configDictionary setObject:buildNumber forKey:BuildNumberConfigKey];
     if (serverURL) [_configDictionary setObject:serverURL forKey:ServerURLConfigKey];
     if (clientUniqueId) [_configDictionary setObject:clientUniqueId forKey:ClientUniqueIDConfigKey];
     if (deploymentKey) [_configDictionary setObject:deploymentKey forKey:DeploymentKeyConfigKey];
@@ -66,11 +69,21 @@ static NSString * const PublicKeyKey = @"publicKey";
     return [_configDictionary objectForKey:AppVersionConfigKey];
 }
 
+- (NSString *)buildNumber
+{
+    return [_configDictionary objectForKey:BuildNumberConfigKey];
+}
+
 - (NSString *)buildVersion
 {
     return [_configDictionary objectForKey:BuildVersionConfigKey];
 }
 
+- (void)setBuildNumber:(NSString *)buildNumber
+{
+    [_configDictionary setValue:buildNumber forKey:BuildNumberConfigKey];
+}
+
 - (NSDictionary *)configuration
 {
     return _configDictionary;

package/ios/CodePush/CodePushUpdateUtils.m

@@ -197,16 +197,24 @@ NSString * const IgnoreCodePushMetadata = @".codepushrelease";
     return AssetsFolderName;
 }
 
++ (NSString *)cacheKeyForBinaryAtURL:(NSURL *)binaryBundleUrl
+{
+    NSString *bundleModifiedDate = [self modifiedDateStringOfFileAtURL:binaryBundleUrl];
+    return [NSString stringWithFormat:@"%@:%@",
+            [[NSBundle mainBundle] bundlePath],
+            bundleModifiedDate ?: @"unknown"];
+}
+
 + (NSString *)getHashForBinaryContents:(NSURL *)binaryBundleUrl
                                  error:(NSError **)error
 {
     // Get the cached hash from user preferences if it exists.
-    NSString *binaryModifiedDate = [self modifiedDateStringOfFileAtURL:binaryBundleUrl];
+    NSString *binaryCacheKey = [self cacheKeyForBinaryAtURL:binaryBundleUrl];
     NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
     NSMutableDictionary *binaryHashDictionary = [preferences objectForKey:BinaryHashKey];
     NSString *binaryHash = nil;
     if (binaryHashDictionary != nil) {
-        binaryHash = [binaryHashDictionary objectForKey:binaryModifiedDate];
+        binaryHash = [binaryHashDictionary objectForKey:binaryCacheKey];
         if (binaryHash == nil) {
             [preferences removeObjectForKey:BinaryHashKey];
             [preferences synchronize];
@@ -237,9 +245,7 @@ NSString * const IgnoreCodePushMetadata = @".codepushrelease";
 
     binaryHash = [self computeFinalHashFromManifest:manifest error:error];
 
-    // Cache the hash in user preferences. This assumes that the modified date for the
-    // JS bundle changes every time a new bundle is generated by the packager.
-    [binaryHashDictionary setObject:binaryHash forKey:binaryModifiedDate];
+    [binaryHashDictionary setObject:binaryHash forKey:binaryCacheKey];
     [preferences setObject:binaryHashDictionary forKey:BinaryHashKey];
     [preferences synchronize];
     return binaryHash;
@@ -255,11 +261,10 @@ NSString * const IgnoreCodePushMetadata = @".codepushrelease";
     NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
     NSMutableDictionary *assetsHashDictionary = [preferences objectForKey:BinaryAssetsHashKey];
 
-    NSString *assetsModifiedDate = [self modifiedDateStringOfFileAtURL:
-                                    [NSURL fileURLWithPath:assetsPath isDirectory:YES]];
+    NSString *assetsCacheKey = [self cacheKeyForBinaryAtURL:[CodePush binaryBundleURL]];
 
     if (assetsHashDictionary != nil) {
-        NSString *cached = [assetsHashDictionary objectForKey:assetsModifiedDate];
+        NSString *cached = [assetsHashDictionary objectForKey:assetsCacheKey];
         if (cached != nil) {
             return cached;
         } else {
@@ -285,7 +290,7 @@ NSString * const IgnoreCodePushMetadata = @".codepushrelease";
         return nil;
     }
 
-    [assetsHashDictionary setObject:assetsHash forKey:assetsModifiedDate];
+    [assetsHashDictionary setObject:assetsHash forKey:assetsCacheKey];
     [preferences setObject:assetsHashDictionary forKey:BinaryAssetsHashKey];
     [preferences synchronize];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revopush/react-native-code-push",
-  "version": "2.5.0-rc.7",
+  "version": "2.5.1",
   "description": "React Native plugin for the CodePush service",
   "main": "CodePush.js",
   "typings": "typings/react-native-code-push.d.ts",
@@ -37,7 +37,7 @@
     "url": "https://github.com/revopush/react-native-code-push"
   },
   "dependencies": {
-    "@revopush/code-push": "4.3.0",
+    "@revopush/code-push": "4.4.0",
     "glob": "^7.1.7",
     "hoist-non-react-statics": "^3.3.2",
     "inquirer": "^8.1.5",

package/typings/react-native-code-push.d.ts

@@ -39,6 +39,11 @@ export interface Package {
      */
     appVersion: string;
 
+    /**
+     * The build number of the app binary (iOS: CFBundleVersion, Android: versionCode).
+     */
+    buildNumber?: string;
+
     /**
      * The deployment key that was used to originally download this update.
      */