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

package/ios/CodePush/CodePush.m

@@ -570,19 +570,11 @@ static NSString *const LatestRollbackCountKey = @"count";
         } else {
             CPLog(@"Attempted to perform a rollback when there is no current update");
         }
-        // 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;
+    } else {
+        // Write the current package's metadata to the "failed list"
+        [self saveFailedUpdate:failedPackage];
     }
 
-    // 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];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@novacraft-engineering/pulsar-code-push",
-  "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.",
+  "version": "1.6.0",
+  "description": "Pulsar OTA client for React Native \u2014 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",

package/request-fetch-adapter.js

@@ -1,6 +1,17 @@
+const { Platform } = require("react-native");
 const packageJson = require("./package.json");
 const { getTargetingInfo } = require("./targeting");
 
+// React Native's default agent carries no usable platform detail — iOS sends a Darwin/CFNetwork
+// string with no "iPhone OS x_y", and Android goes out through OkHttp as bare "okhttp/4.x". Both
+// left the server guessing (Android was filed as "unknown" entirely, OS version was always empty),
+// so state it explicitly instead.
+function userAgent() {
+  const os = Platform.OS === "ios" ? "iOS" : Platform.OS === "android" ? "Android" : Platform.OS;
+  const version = Platform.Version === undefined || Platform.Version === null ? "" : String(Platform.Version);
+  return `Pulsar/${packageJson.version} (${os}${version ? " " + version : ""})`;
+}
+
 module.exports = {
   async request(verb, url, requestBody, callback) {
     if (typeof requestBody === "function") {
@@ -9,18 +20,32 @@ module.exports = {
     }
 
     // Scope the update-check to a specific device model / user id when the host app has set them.
-    // Only the GET update_check request is augmented; report_status is untouched.
+    const { userId, deviceModel } = getTargetingInfo();
     if (verb === 0 && url.indexOf("update_check") !== -1) {
-      const { userId, deviceModel } = getTargetingInfo();
       const extra = [];
       if (deviceModel) extra.push("device_model=" + encodeURIComponent(deviceModel));
       if (userId) extra.push("user_id=" + encodeURIComponent(userId));
       if (extra.length) url += (url.indexOf("?") === -1 ? "?" : "&") + extra.join("&");
     }
 
+    // Status reports carry the same identity. update_check only records a device when an update is
+    // actually served, so without this the device/user targeting lists never fill on a quiet app.
+    // The acquisition SDK hands us an already-stringified body here, so parse before augmenting.
+    if (url.indexOf("report_status") !== -1 && requestBody && (deviceModel || userId)) {
+      try {
+        const parsed = typeof requestBody === "string" ? JSON.parse(requestBody) : requestBody;
+        if (deviceModel && !parsed.device_model) parsed.device_model = deviceModel;
+        if (userId && !parsed.user_id) parsed.user_id = userId;
+        requestBody = parsed;
+      } catch (err) {
+        // A body we can't parse is left exactly as-is — reporting must never fail over telemetry.
+      }
+    }
+
     const headers = {
       "Accept": "application/json",
       "Content-Type": "application/json",
+      "User-Agent": userAgent(),
       "X-CodePush-Plugin-Name": packageJson.name,
       "X-CodePush-Plugin-Version": packageJson.version,
       "X-CodePush-SDK-Version": packageJson.dependencies["code-push"]