@novacraft-engineering/pulsar-code-push 1.5.2 → 1.5.4

package/CodePush.js

@@ -4,6 +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, getTargetingInfo } from "./targeting";
 
 let NativeCodePush = require("react-native").NativeModules.CodePush;
 const PackageMixins = require("./package-mixins")(NativeCodePush);
@@ -19,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
@@ -618,6 +624,7 @@ if (NativeCodePush) {
     notifyAppReady: notifyApplicationReady,
     notifyApplicationReady,
     restartApp,
+    setTargetingInfo,
     setUpTestDependencies,
     sync,
     disallowRestart: NativeCodePush.disallow,

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
@@ -806,7 +814,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.2",
-  "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.4",
+  "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",
@@ -26,6 +26,7 @@
   "files": [
     "CodePush.js",
     "AlertAdapter.js",
+    "targeting.js",
     "logging.js",
     "package-mixins.js",
     "request-fetch-adapter.js",
@@ -61,4 +62,4 @@
       ]
     }
   }
-}
+}

package/request-fetch-adapter.js

@@ -1,4 +1,5 @@
 const packageJson = require("./package.json");
+const { getTargetingInfo } = require("./targeting");
 
 module.exports = {
   async request(verb, url, requestBody, callback) {
@@ -7,6 +8,16 @@ module.exports = {
       requestBody = null;
     }
 
+    // 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.
+    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("&");
+    }
+
     const headers = {
       "Accept": "application/json",
       "Content-Type": "application/json",

package/targeting.js

@@ -0,0 +1,17 @@
+// Optional targeting identifiers the host app can set (e.g. at login). They are appended to the
+// update-check request so the server can scope a release to specific device models / user ids.
+// Shared singleton: the fetch adapter reads it, CodePush.setTargetingInfo writes it.
+let info = { userId: null, deviceModel: null };
+
+function setTargetingInfo(next) {
+  if (!next) return info;
+  if (next.userId !== undefined) info.userId = next.userId == null ? null : String(next.userId);
+  if (next.deviceModel !== undefined) info.deviceModel = next.deviceModel == null ? null : String(next.deviceModel);
+  return info;
+}
+
+function getTargetingInfo() {
+  return info;
+}
+
+module.exports = { setTargetingInfo, getTargetingInfo };