@novacraft-engineering/pulsar-code-push 1.6.1 → 1.6.2

package/CodePush.js

@@ -206,6 +206,15 @@ async function notifyApplicationReadyInternal() {
   return statusReport;
 }
 
+// Report an install to the Pulsar server that delivered it. Its download links are
+// `<server>/download/...`, so the package names its own server — which matters when the native
+// config points elsewhere (an Android strings.xml that spells the key `CodePushServerURL`, the iOS
+// spelling, is ignored and falls back to the SDK's default).
+function pulsarServerFor(localPackage) {
+  const match = /^(https?:\/\/[^/?#]+)\/download\//.exec(localPackage?.downloadUrl || '');
+  return match ? match[1] : null;
+}
+
 async function tryReportStatus(statusReport, retryOnAppResume) {
   const nativeConfig = await getConfiguration();
   const config = nativeConfig.deploymentKey || !fallbackDeployment ? nativeConfig : { ...nativeConfig, ...fallbackDeployment };
@@ -231,8 +240,9 @@ async function tryReportStatus(statusReport, retryOnAppResume) {
         await NativeCodePush.setLatestRollbackInfo(statusReport.package.packageHash);
       }
 
-      config.deploymentKey = statusReport.package.deploymentKey;
-      const sdk = getPromisifiedSdk(requestFetchAdapter, config);
+      const deliveredBy = pulsarServerFor(statusReport.package);
+      const reportConfig = {...config, deploymentKey: statusReport.package.deploymentKey, ...(deliveredBy ? {serverUrl: deliveredBy} : {})};
+      const sdk = getPromisifiedSdk(requestFetchAdapter, reportConfig);
       await sdk.reportStatusDeploy(statusReport.package, statusReport.status, previousLabelOrAppVersion, previousDeploymentKey);
     }
 

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

@@ -93,6 +93,7 @@ public class CodePush implements ReactPackage {
         if (publicKeyFromStrings != null) mPublicKey = publicKeyFromStrings;
 
         String serverUrlFromStrings = getCustomPropertyFromStringsIfExist("ServerUrl");
+        if (serverUrlFromStrings == null) serverUrlFromStrings = getCustomPropertyFromStringsIfExist("ServerURL");
         if (serverUrlFromStrings != null) mServerUrl = serverUrlFromStrings;
 
         // ignore liveReload when CodePush is initializing so that unneccessary cache could be cleared

package/ios/CodePush/CodePushConfig.m

@@ -34,7 +34,7 @@ static NSString * const PublicKeyKey = @"publicKey";
     NSString *appVersion = [infoDictionary objectForKey:@"CFBundleShortVersionString"];
     NSString *buildVersion = [infoDictionary objectForKey:(NSString *)kCFBundleVersionKey];
     NSString *deploymentKey = [infoDictionary objectForKey:@"CodePushDeploymentKey"];
-    NSString *serverURL = [infoDictionary objectForKey:@"CodePushServerURL"];
+    NSString *serverURL = [infoDictionary objectForKey:@"CodePushServerURL"] ?: [infoDictionary objectForKey:@"CodePushServerUrl"];
     NSString *publicKey = [infoDictionary objectForKey:@"CodePushPublicKey"];
 
     NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@novacraft-engineering/pulsar-code-push",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "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",