@novacraft-engineering/pulsar-code-push 1.5.3 → 1.5.5

package/CodePush.js

@@ -4,7 +4,7 @@ import requestFetchAdapter from "./request-fetch-adapter";
 import { AppState, Platform } from "react-native";
 import log from "./logging";
 import hoistStatics from 'hoist-non-react-statics';
-import { setTargetingInfo } from "./targeting";
+import { setTargetingInfo, getTargetingInfo } from "./targeting";
 
 let NativeCodePush = require("react-native").NativeModules.CodePush;
 const PackageMixins = require("./package-mixins")(NativeCodePush);
@@ -20,6 +20,11 @@ async function checkForUpdate(deploymentKey = null, handleBinaryVersionMismatchC
    * different from the CodePush update they have already installed.
    */
   const nativeConfig = await getConfiguration();
+  // The native module reports the hardware model; use it for Pulsar device-model targeting unless
+  // the host app already supplied one explicitly (e.g. via react-native-device-info).
+  if (nativeConfig && nativeConfig.deviceModel && !getTargetingInfo().deviceModel) {
+    setTargetingInfo({ deviceModel: nativeConfig.deviceModel });
+  }
   /*
    * If a deployment key was explicitly provided,
    * then let's override the one we retrieved

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

@@ -501,6 +501,7 @@ public class CodePushNativeModule extends BaseJavaModule {
             configMap.putString("clientUniqueId", mClientUniqueId);
             configMap.putString("deploymentKey", mCodePush.getDeploymentKey());
             configMap.putString("serverUrl", mCodePush.getServerUrl());
+            configMap.putString("deviceModel", android.os.Build.MODEL);
 
             // The binary hash may be null in debug builds
             if (mBinaryContentsHash != null) {

package/ios/CodePush/CodePush.m

@@ -16,6 +16,14 @@
 #endif
 
 #import "CodePush.h"
+#import <sys/utsname.h>
+
+// Hardware model identifier (e.g. "iPhone15,3"), used for Pulsar device-model targeting.
+static NSString *CPDeviceModel(void) {
+    struct utsname systemInfo;
+    uname(&systemInfo);
+    return [NSString stringWithCString:systemInfo.machine encoding:NSUTF8StringEncoding];
+}
 
 @interface CodePush () <RCTBridgeModule, RCTFrameUpdateObserver>
 @end
@@ -562,11 +570,19 @@ static NSString *const LatestRollbackCountKey = @"count";
         } else {
             CPLog(@"Attempted to perform a rollback when there is no current update");
         }
-    } else {
-        // Write the current package's metadata to the "failed list"
-        [self saveFailedUpdate:failedPackage];
+        // Nothing to roll back to. This happens when a pending update was
+        // recorded before a binary update: bundleURL clears the packages
+        // because the app version changed, but CODE_PUSH_PENDING_UPDATE lives
+        // in NSUserDefaults and survives. Reloading here re-enters this same
+        // path on the new bridge, so the app reload-loops on a blank screen
+        // until it is killed. Drop the stale flag and keep the loaded bundle.
+        [CodePush removePendingUpdate];
+        return;
     }
 
+    // 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];
@@ -806,7 +822,8 @@ RCT_EXPORT_METHOD(downloadUpdate:(NSDictionary*)updatePackage
 RCT_EXPORT_METHOD(getConfiguration:(RCTPromiseResolveBlock)resolve
                           rejecter:(RCTPromiseRejectBlock)reject)
 {
-    NSDictionary *configuration = [[CodePushConfig current] configuration];
+    NSMutableDictionary *configuration = [[[CodePushConfig current] configuration] mutableCopy];
+    configuration[@"deviceModel"] = CPDeviceModel();
     NSError *error;
     if (isRunningBinaryVersion) {
         // isRunningBinaryVersion will not get set to "YES" if running against the packager.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@novacraft-engineering/pulsar-code-push",
-  "version": "1.5.3",
-  "description": "Pulsar OTA client for React Native \u2014 over-the-air JavaScript updates. A CodePush-compatible client (RevoPush lineage) pointed at Pulsar.",
+  "version": "1.5.5",
+  "description": "Pulsar OTA client for React Native — over-the-air JavaScript updates. A CodePush-compatible client (RevoPush lineage) pointed at Pulsar.",
   "main": "CodePush.js",
   "typings": "typings/react-native-code-push.d.ts",
   "homepage": "https://pulsar.novacraft.africa",
@@ -62,4 +62,4 @@
       ]
     }
   }
-}
+}