@adobe/alloy 2.29.0-beta.13 → 2.29.0-beta.15

package/libEs5/components/Advertising/handlers/onBeforeSendEventHandler.js

@@ -7,6 +7,7 @@ var _collectRampId = require("../identities/collectRampId.js");
 var _helpers = require("../utils/helpers.js");
 var _index = require("../constants/index.js");
 var _consentStatus = require("../../../constants/consentStatus.js");
+var _browser = require("../../../constants/browser.js");
 /*
 Copyright 2023 Adobe. All rights reserved.
 Licensed under the Apache License, Version 2.0.
@@ -14,10 +15,10 @@ http://www.apache.org/licenses/LICENSE-2.0
 */
 
 const isAdvertisingDisabled = advertising => {
-  return ![_consentStatus.AUTO, _consentStatus.WAIT].includes(advertising?.handleAdvertisingData);
+  return ![_consentStatus.AUTO, _consentStatus.WAIT].includes(advertising?.handleAdvertisingData?.toLowerCase());
 };
 const waitForAdvertisingId = advertising => {
-  return advertising?.handleAdvertisingData === _consentStatus.WAIT;
+  return advertising?.handleAdvertisingData?.toLowerCase() === _consentStatus.WAIT;
 };
 
 /**
@@ -47,7 +48,11 @@ async function handleOnBeforeSendEvent({
   if (isAdvertisingDisabled(advertising) || isClickThru || (0, _helpers.isThrottled)(_index.SURFER_ID, cookieManager) && (0, _helpers.isThrottled)(_index.ID5_ID, cookieManager) && (0, _helpers.isThrottled)(_index.RAMP_ID, cookieManager)) return;
   try {
     const useShortTimeout = waitForAdvertisingId(advertising);
-    const [surferIdResult, id5IdResult, rampIdResult] = await Promise.allSettled([(0, _collectSurferId.default)(cookieManager, getBrowser, useShortTimeout), (0, _collectID5Id.getID5Id)(logger, componentConfig.id5PartnerId, useShortTimeout, useShortTimeout), (0, _collectRampId.getRampId)(logger, componentConfig.rampIdJSPath, cookieManager, useShortTimeout, useShortTimeout)]);
+    let rampIdPromise = null;
+    if (!getBrowser || getBrowser() !== _browser.CHROME) {
+      rampIdPromise = (0, _collectRampId.getRampId)(logger, componentConfig.rampIdJSPath, cookieManager, useShortTimeout, useShortTimeout);
+    }
+    const [surferIdResult, id5IdResult, rampIdResult] = await Promise.allSettled([(0, _collectSurferId.default)(cookieManager, getBrowser, useShortTimeout), (0, _collectID5Id.getID5Id)(logger, componentConfig.id5PartnerId, useShortTimeout, useShortTimeout), rampIdPromise]);
     const availableIds = {};
     if (surferIdResult.status === "fulfilled" && surferIdResult.value && !(0, _helpers.isThrottled)(_index.SURFER_ID, cookieManager)) {
       availableIds.surferId = surferIdResult.value;

package/libEs5/components/Advertising/identities/collectID5Id.js

@@ -17,7 +17,7 @@ governing permissions and limitations under the License.
 
 let id5Id = "";
 let inProgressId5Promise = null;
-const SHORT_TIMEOUT_MS = 5000;
+const SHORT_TIMEOUT_MS = 2000;
 const DEFAULT_TIMEOUT_MS = 30000;
 const initiateID5Call = (partnerId, useShortTimeout, logger) => {
   partnerId = Math.floor(Number(partnerId));

package/libEs5/components/Advertising/identities/collectRampId.js

@@ -20,7 +20,7 @@ const RETRY_CONFIG = {
   MAX_TIME_MS: 30000,
   DELAY_BASE_MS: 500,
   MAX_DELAY_MS: 5000,
-  SHORT_TIMEOUT_MS: 5000
+  SHORT_TIMEOUT_MS: 2000
 };
 const state = {
   rampIdEnv: undefined,

package/libEs5/components/PushNotifications/helpers/getPushSubscriptionDetails.js

@@ -90,8 +90,12 @@ const getPushSubscriptionDetails = async ({
     return {
       endpoint: subscription.endpoint,
       keys: {
-        p256dh: (0, _index.bytesToBase64)(new Uint8Array(subscription.getKey("p256dh"))),
-        auth: (0, _index.bytesToBase64)(new Uint8Array(subscription.getKey("auth")))
+        p256dh: (0, _index.bytesToBase64)(new Uint8Array(subscription.getKey("p256dh")), {
+          urlSafe: true
+        }),
+        auth: (0, _index.bytesToBase64)(new Uint8Array(subscription.getKey("auth")), {
+          urlSafe: true
+        })
       }
     };
   } catch (e) {

package/libEs5/constants/libraryVersion.js

@@ -14,4 +14,4 @@ governing permissions and limitations under the License.
 */
 // The __VERSION__ keyword will be replace at alloy build time with the package.json version.
 // see babel-plugin-version
-var _default = exports.default = "2.29.0-beta.13";
+var _default = exports.default = "2.29.0-beta.15";

package/libEs5/utils/bytes.js

@@ -31,8 +31,19 @@ const base64ToBytes = base64String => {
 /**
  * Takes a Uint8Array and returns a base64 string.
  * @param {Uint8Array} bytes
+ * @param {Object} [options={}] - Options for encoding
+ * @param {boolean} [options.urlSafe=false] - Whether to return URL-safe base64 (no padding, + becomes -, / becomes _)
  * @returns {string}
  */
 exports.base64ToBytes = base64ToBytes;
-const bytesToBase64 = bytes => btoa(String.fromCharCode(...bytes));
+const bytesToBase64 = (bytes, options = {}) => {
+  const {
+    urlSafe = false
+  } = options || {};
+  const base64 = btoa(String.fromCharCode(...bytes));
+  if (urlSafe) {
+    return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+  }
+  return base64;
+};
 exports.bytesToBase64 = bytesToBase64;

package/libEs6/components/Advertising/handlers/onBeforeSendEventHandler.js

@@ -10,11 +10,12 @@ import { getRampId } from "../identities/collectRampId.js";
 import { appendAdvertisingIdQueryToEvent, getUrlParams, isThrottled } from "../utils/helpers.js";
 import { SURFER_ID, ID5_ID, RAMP_ID } from "../constants/index.js";
 import { AUTO, WAIT } from "../../../constants/consentStatus.js";
+import { CHROME } from "../../../constants/browser.js";
 const isAdvertisingDisabled = advertising => {
-  return ![AUTO, WAIT].includes(advertising?.handleAdvertisingData);
+  return ![AUTO, WAIT].includes(advertising?.handleAdvertisingData?.toLowerCase());
 };
 const waitForAdvertisingId = advertising => {
-  return advertising?.handleAdvertisingData === WAIT;
+  return advertising?.handleAdvertisingData?.toLowerCase() === WAIT;
 };
 
 /**
@@ -44,7 +45,11 @@ export default async function handleOnBeforeSendEvent({
   if (isAdvertisingDisabled(advertising) || isClickThru || isThrottled(SURFER_ID, cookieManager) && isThrottled(ID5_ID, cookieManager) && isThrottled(RAMP_ID, cookieManager)) return;
   try {
     const useShortTimeout = waitForAdvertisingId(advertising);
-    const [surferIdResult, id5IdResult, rampIdResult] = await Promise.allSettled([collectSurferId(cookieManager, getBrowser, useShortTimeout), getID5Id(logger, componentConfig.id5PartnerId, useShortTimeout, useShortTimeout), getRampId(logger, componentConfig.rampIdJSPath, cookieManager, useShortTimeout, useShortTimeout)]);
+    let rampIdPromise = null;
+    if (!getBrowser || getBrowser() !== CHROME) {
+      rampIdPromise = getRampId(logger, componentConfig.rampIdJSPath, cookieManager, useShortTimeout, useShortTimeout);
+    }
+    const [surferIdResult, id5IdResult, rampIdResult] = await Promise.allSettled([collectSurferId(cookieManager, getBrowser, useShortTimeout), getID5Id(logger, componentConfig.id5PartnerId, useShortTimeout, useShortTimeout), rampIdPromise]);
     const availableIds = {};
     if (surferIdResult.status === "fulfilled" && surferIdResult.value && !isThrottled(SURFER_ID, cookieManager)) {
       availableIds.surferId = surferIdResult.value;

package/libEs6/components/Advertising/identities/collectID5Id.js

@@ -13,7 +13,7 @@ import { loadScript } from "../../../utils/dom/index.js";
 import { ID5_SCRIPT_URL } from "../constants/index.js";
 let id5Id = "";
 let inProgressId5Promise = null;
-const SHORT_TIMEOUT_MS = 5000;
+const SHORT_TIMEOUT_MS = 2000;
 const DEFAULT_TIMEOUT_MS = 30000;
 const initiateID5Call = (partnerId, useShortTimeout, logger) => {
   partnerId = Math.floor(Number(partnerId));

package/libEs6/components/Advertising/identities/collectRampId.js

@@ -17,7 +17,7 @@ const RETRY_CONFIG = {
   MAX_TIME_MS: 30000,
   DELAY_BASE_MS: 500,
   MAX_DELAY_MS: 5000,
-  SHORT_TIMEOUT_MS: 5000
+  SHORT_TIMEOUT_MS: 2000
 };
 const state = {
   rampIdEnv: undefined,

package/libEs6/components/PushNotifications/helpers/getPushSubscriptionDetails.js

@@ -88,8 +88,12 @@ const getPushSubscriptionDetails = async ({
     return {
       endpoint: subscription.endpoint,
       keys: {
-        p256dh: bytesToBase64(new Uint8Array(subscription.getKey("p256dh"))),
-        auth: bytesToBase64(new Uint8Array(subscription.getKey("auth")))
+        p256dh: bytesToBase64(new Uint8Array(subscription.getKey("p256dh")), {
+          urlSafe: true
+        }),
+        auth: bytesToBase64(new Uint8Array(subscription.getKey("auth")), {
+          urlSafe: true
+        })
       }
     };
   } catch (e) {

package/libEs6/constants/libraryVersion.js

@@ -13,4 +13,4 @@ governing permissions and limitations under the License.
 // The __VERSION__ keyword will be replace at alloy build time with the package.json version.
 // see babel-plugin-version
 
-export default "2.29.0-beta.13";
+export default "2.29.0-beta.15";

package/libEs6/utils/bytes.js

@@ -28,6 +28,17 @@ export const base64ToBytes = base64String => {
 /**
  * Takes a Uint8Array and returns a base64 string.
  * @param {Uint8Array} bytes
+ * @param {Object} [options={}] - Options for encoding
+ * @param {boolean} [options.urlSafe=false] - Whether to return URL-safe base64 (no padding, + becomes -, / becomes _)
  * @returns {string}
  */
-export const bytesToBase64 = bytes => btoa(String.fromCharCode(...bytes));
+export const bytesToBase64 = (bytes, options = {}) => {
+  const {
+    urlSafe = false
+  } = options || {};
+  const base64 = btoa(String.fromCharCode(...bytes));
+  if (urlSafe) {
+    return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+  }
+  return base64;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/alloy",
-  "version": "2.29.0-beta.13",
+  "version": "2.29.0-beta.15",
   "description": "Adobe Experience Platform Web SDK",
   "type": "module",
   "main": "libEs5/index.js",
@@ -94,7 +94,7 @@
     "uuid": "^11.1.0"
   },
   "devDependencies": {
-    "@adobe/alloy": "^2.29.0-beta.5",
+    "@adobe/alloy": "^2.29.0-beta.14",
     "@babel/cli": "^7.28.3",
     "@babel/plugin-transform-modules-commonjs": "^7.27.1",
     "@babel/plugin-transform-runtime": "^7.28.3",

package/types/components/Advertising/handlers/onBeforeSendEventHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onBeforeSendEventHandler.d.ts","sourceRoot":"","sources":["../../../../src/components/Advertising/handlers/onBeforeSendEventHandler.js"],"names":[],"mappings":"AAyBA;;;;;;;;;;GAUG;AACH,6HARG;IAAuB,aAAa;IACb,MAAM;IACN,KAAK;IACL,KAAK;IACL,eAAe;IACf,WAAW;IACT,UAAU;CACrC,iBAiFA"}
+{"version":3,"file":"onBeforeSendEventHandler.d.ts","sourceRoot":"","sources":["../../../../src/components/Advertising/handlers/onBeforeSendEventHandler.js"],"names":[],"mappings":"AA4BA;;;;;;;;;;GAUG;AACH,6HARG;IAAuB,aAAa;IACb,MAAM;IACN,KAAK;IACL,KAAK;IACL,eAAe;IACf,WAAW;IACT,UAAU;CACrC,iBAsFA"}

package/types/components/PushNotifications/helpers/getPushSubscriptionDetails.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPushSubscriptionDetails.d.ts","sourceRoot":"","sources":["../../../../src/components/PushNotifications/helpers/getPushSubscriptionDetails.js"],"names":[],"mappings":";AAgBA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wEAhBG;IAAwB,cAAc,EAA9B,MAAM;IACU,MAAM,EAAtB,MAAM;CAEd,GAAU,OAAO,CAAC,gBAAgB,CAAC,CAyFrC;sCAvGqC,aAAa"}
+{"version":3,"file":"getPushSubscriptionDetails.d.ts","sourceRoot":"","sources":["../../../../src/components/PushNotifications/helpers/getPushSubscriptionDetails.js"],"names":[],"mappings":";AAgBA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wEAhBG;IAAwB,cAAc,EAA9B,MAAM;IACU,MAAM,EAAtB,MAAM;CAEd,GAAU,OAAO,CAAC,gBAAgB,CAAC,CA6FrC;sCA3GqC,aAAa"}

package/types/utils/bytes.d.ts

@@ -1,3 +1,5 @@
 export function base64ToBytes(base64String: string): Uint8Array;
-export function bytesToBase64(bytes: Uint8Array): string;
+export function bytesToBase64(bytes: Uint8Array, options?: {
+    urlSafe?: boolean;
+}): string;
 //# sourceMappingURL=bytes.d.ts.map

package/types/utils/bytes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bytes.d.ts","sourceRoot":"","sources":["../../src/utils/bytes.js"],"names":[],"mappings":"AAiBO,4CAHI,MAAM,GACJ,UAAU,CAWtB;AAOM,qCAHI,UAAU,GACR,MAAM,CAEwD"}
+{"version":3,"file":"bytes.d.ts","sourceRoot":"","sources":["../../src/utils/bytes.js"],"names":[],"mappings":"AAiBO,4CAHI,MAAM,GACJ,UAAU,CAWtB;AASM,qCALI,UAAU,YAElB;IAA0B,OAAO,GAAzB,OAAO;CACf,GAAU,MAAM,CAWlB"}