@adobe/alloy 2.34.2-beta.3 → 2.35.0-beta.4

package/dist/alloyServiceWorker.js

@@ -10,6 +10,20 @@
  * governing permissions and limitations under the License.
  */
 
+/*
+Copyright 2019 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+
+var ecidNamespace = "ECID";
+
 /*
 Copyright 2025 Adobe. All rights reserved.
 This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -22,11 +36,50 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-// @ts-check
-/// <reference lib="webworker" />
 
-/** @import {  PushNotificationData  } from '../types.js' */
-/** @import { ServiceWorkerLogger } from '../types.js' */
+/**
+ * Determines whether a notification targeted at a specific identity should be
+ * shown on this browser. When the payload contains an `identity` with the ECID
+ * namespace, the notification is only shown if the ECID in the payload matches
+ * the ECID stored in IndexedDB for this browser. When there is no identity, or
+ * the namespace is not ECID, the notification is always shown.
+ *
+ * @param {Object} options
+ * @param {PushNotificationData["web"]} options.webData
+ * @param {(logger: ServiceWorkerLogger) => Promise<PushServiceWorkerConfig|undefined>} options.readFromIndexedDb
+ * @param {ServiceWorkerLogger} options.logger
+ * @returns {Promise<boolean>}
+ */
+const shouldShowNotification = async ({
+  webData,
+  readFromIndexedDb,
+  logger,
+}) => {
+  const { identity } = webData;
+
+  if (!identity || identity.namespace?.toUpperCase() !== ecidNamespace) {
+    return true;
+  }
+
+  let storedConfig;
+  try {
+    storedConfig = await readFromIndexedDb(logger);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    logger.error(`Unable to read the stored ECID for this browser. ${message}`);
+    return true;
+  }
+  const storedEcid = storedConfig?.ecid;
+
+  if (identity.id !== storedEcid) {
+    logger.info(
+      "Suppressing push notification: payload ECID does not match the ECID stored for this browser.",
+    );
+    return false;
+  }
+
+  return true;
+};
 
 /**
  * @async
@@ -36,9 +89,10 @@ governing permissions and limitations under the License.
  * @param {ServiceWorkerGlobalScope} options.sw
  * @param {PushEvent} options.event
  * @param {ServiceWorkerLogger} options.logger
+ * @param {(logger: ServiceWorkerLogger) => Promise<PushServiceWorkerConfig|undefined>} options.readFromIndexedDb
  * @returns {Promise<void>}
  */
-var serviceWorkerPushListener = async ({ sw, event, logger }) => {
+var serviceWorkerPushListener = async ({ sw, event, logger, readFromIndexedDb }) => {
   if (!event.data) {
     return;
   }
@@ -57,6 +111,15 @@ var serviceWorkerPushListener = async ({ sw, event, logger }) => {
     return;
   }
 
+  const showNotification = await shouldShowNotification({
+    webData,
+    readFromIndexedDb,
+    logger,
+  });
+  if (!showNotification) {
+    return;
+  }
+
   /** @type {Record<string, unknown>} */
   const notificationOptions = {
     data: webData,
@@ -251,7 +314,7 @@ governing permissions and limitations under the License.
 
 /**
  * @param {ServiceWorkerLogger} logger
- * @returns {Promise<Object|undefined>}
+ * @returns {Promise<PushServiceWorkerConfig|undefined>}
  * @throws {Error}
  */
 var readFromIndexedDb = async (logger) => {
@@ -277,6 +340,7 @@ var readFromIndexedDb = async (logger) => {
     return existingConfigData;
   } catch (error) {
     logger.error("Failed to read data from IndexedDB", { error });
+    throw error;
   }
 };
 
@@ -294,14 +358,16 @@ governing permissions and limitations under the License.
 
 /** @import { ServiceWorkerLogger } from '../types.js' */
 /** @import { TrackingDataPayload   } from '../types.js' */
+/** @import { PushServiceWorkerConfig } from '../types.js' */
+/** @import { XdmTrackingContext } from '../types.js' */
 
 /**
  * @param {Object} dependencies
- * @param {(logger: ServiceWorkerLogger) => Promise<Object>} dependencies.readFromIndexedDb
+ * @param {(logger: ServiceWorkerLogger) => Promise<PushServiceWorkerConfig>} dependencies.readFromIndexedDb
  * @param {() => string} dependencies.uuidv4
  * @param {ServiceWorkerLogger} dependencies.logger
  * @param {(url: string, options: object) => Promise<Response>} dependencies.fetch
- * @returns {(options: { xdm: Object, actionLabel?: string, applicationLaunches?: number }) => Promise<boolean>}
+ * @returns {(options: { xdm: XdmTrackingContext, actionLabel?: string, applicationLaunches?: number }) => Promise<boolean>}
  */
 const createMakeSendServiceWorkerTrackingData = ({
   readFromIndexedDb,
@@ -313,7 +379,7 @@ const createMakeSendServiceWorkerTrackingData = ({
    * @async
    * @function
    * @param {Object} options
-   * @param {Object} options.xdm
+   * @param {XdmTrackingContext} options.xdm
    * @param {string} [options.actionLabel]
    * @param {number} [options.applicationLaunches=0]
    *
@@ -332,6 +398,7 @@ const createMakeSendServiceWorkerTrackingData = ({
       };
     }
 
+    /** @type {{ name: keyof PushServiceWorkerConfig, errorField: string }[]} */
     const requiredFields = [
       { name: "browser", errorField: "Browser" },
       { name: "ecid", errorField: "ECID" },
@@ -364,19 +431,24 @@ const createMakeSendServiceWorkerTrackingData = ({
 
       const url = `https://${edgeDomain}/${edgeBasePath}/v1/interact?configId=${datastreamId}&requestId=${uuidv4()}`;
 
+      // The requiredFields loop above guarantees these are defined strings.
+      const validEcid = /** @type {string} */ (ecid);
+      const validBrowser = /** @type {string} */ (browser);
+      const validDatasetId = /** @type {string} */ (datasetId);
+
       /** @type {TrackingDataPayload} */
       const payload = {
         events: [
           {
             xdm: {
               identityMap: {
-                ECID: [{ id: ecid }],
+                ECID: [{ id: validEcid }],
               },
               timestamp: new Date().toISOString(),
               pushNotificationTracking: {
                 ...customActionData,
                 pushProviderMessageID: uuidv4(),
-                pushProvider: browser.toLowerCase(),
+                pushProvider: validBrowser.toLowerCase(),
               },
               application: {
                 launches: {
@@ -403,7 +475,7 @@ const createMakeSendServiceWorkerTrackingData = ({
             },
             meta: {
               collect: {
-                datasetId,
+                datasetId: validDatasetId,
               },
             },
           },
@@ -541,6 +613,7 @@ const createEventListeners = ({ platform, sw }) => {
           event,
           sw,
           logger: platform.logger,
+          readFromIndexedDb,
         });
       },
       /**

package/dist/alloyServiceWorker.min.js

@@ -10,4 +10,4 @@
  * governing permissions and limitations under the License.
  */
 
-const e=e=>["DEEPLINK","WEBURL"].includes(e);const t="config";var n=async e=>{try{const e=await(n="alloyPushNotifications",o=1,r=e=>{e.objectStoreNames.contains(t)||e.createObjectStore(t,{keyPath:"id"})},new Promise((e,t)=>{const a=indexedDB.open(n,o);a.onerror=()=>t(a.error),a.onsuccess=()=>e(a.result),a.onupgradeneeded=e=>{const t=e.target.result;r&&r(t)}})),a=await((e,t,n)=>new Promise((o,r)=>{const a=e.transaction([t],"readonly").objectStore(t).get(n);a.onerror=()=>r(a.error),a.onsuccess=()=>o(a.result)}))(e,t,"alloyConfig");return e.close(),a}catch(t){e.error("Failed to read data from IndexedDB",{error:t})}var n,o,r};const o=[];for(let e=0;e<256;++e)o.push((e+256).toString(16).slice(1));const r=new Uint8Array(16);function a(e,t,n){return t||e||!crypto.randomUUID?function(e,t,n){e=e||{};const a=e.random??e.rng?.()??crypto.getRandomValues(r);if(a.length<16)throw new Error("Random bytes length must be >= 16");if(a[6]=15&a[6]|64,a[8]=63&a[8]|128,t){if((n=n||0)<0||n+16>t.length)throw new RangeError(`UUID byte range ${n}:${n+15} is out of buffer bounds`);for(let e=0;e<16;++e)t[n+e]=a[e];return t}return function(e,t=0){return(o[e[t+0]]+o[e[t+1]]+o[e[t+2]]+o[e[t+3]]+"-"+o[e[t+4]]+o[e[t+5]]+"-"+o[e[t+6]]+o[e[t+7]]+"-"+o[e[t+8]]+o[e[t+9]]+"-"+o[e[t+10]]+o[e[t+11]]+o[e[t+12]]+o[e[t+13]]+o[e[t+14]]+o[e[t+15]]).toLowerCase()}(a)}(e,t,n):crypto.randomUUID()}const i=self,s={namespace:"[alloy][pushNotificationWorker]",info:(...e)=>console.log(s.namespace,...e),error:(...e)=>console.error(s.namespace,...e)},c=(({platform:t,sw:o})=>{const r=(({readFromIndexedDb:e,uuidv4:t,logger:n,fetch:o})=>async({xdm:r,actionLabel:a,applicationLaunches:i=0})=>{const s=await e(n),{browser:c,ecid:l,edgeDomain:d,edgeBasePath:u,datastreamId:g,datasetId:m}=s||{};let f={};a&&(f={customAction:{actionID:a}});const p=[{name:"browser",errorField:"Browser"},{name:"ecid",errorField:"ECID"},{name:"edgeDomain",errorField:"Edge domain"},{name:"edgeBasePath",errorField:"Edge base path"},{name:"datastreamId",errorField:"Datastream ID"},{name:"datasetId",errorField:"Dataset ID"}];try{for(const e of p)if(!s[e.name])throw new Error(`Cannot send tracking call. ${e.errorField} is missing.`);const e=`https://${d}/${u}/v1/interact?configId=${g}&requestId=${t()}`,h={events:[{xdm:{identityMap:{ECID:[{id:l}]},timestamp:(new Date).toISOString(),pushNotificationTracking:{...f,pushProviderMessageID:t(),pushProvider:c.toLowerCase()},application:{launches:{value:i}},eventType:a?"pushTracking.customAction":"pushTracking.applicationOpened",_experience:{...r._experience,customerJourneyManagement:{...r._experience.customerJourneyManagement,pushChannelContext:{platform:"web"},messageProfile:{channel:{_id:"https://ns.adobe.com/xdm/channels/push"}}}}},meta:{collect:{datasetId:m}}}]},w=await o(e,{method:"POST",headers:{"content-type":"text/plain; charset=UTF-8"},body:JSON.stringify(h)});return!!w.ok||(n.error("Tracking call failed: ",w.status,w.statusText),!1)}catch(e){return n.error("Error sending tracking call:",e),!1}})({readFromIndexedDb:n,uuidv4:a,logger:t.logger,fetch:t.fetch}),i=(({makeSendServiceWorkerTrackingData:t,sw:n,logger:o})=>({event:r})=>{r.notification.close();const a=r.notification.data;let i=null,s=null;if(r.action){const t=parseInt(r.action.replace("action_",""),10);if(a?.actions?.buttons[t]){const n=a.actions.buttons[t];s=n.label,e(n.type)&&n.uri&&(i=n.uri)}}else e(a?.interaction?.type)&&a?.interaction?.uri&&(i=a.interaction.uri);t({xdm:a._xdm.mixins,actionLabel:s,applicationLaunches:1}).catch(e=>{o.error("Failed to send tracking call:",e)}),i&&r.waitUntil(n.clients.matchAll({type:"window"}).then(e=>{for(const t of e)if(t.url===i&&"focus"in t)return t.focus();if(n.clients.openWindow)return n.clients.openWindow(i)}))})({makeSendServiceWorkerTrackingData:r,sw:o,logger:t.logger});return{pushNotifications:{onPush:e=>(async({sw:e,event:t,logger:n})=>{if(!t.data)return;let o;try{o=t.data.json()}catch(e){return void n.error("Error decoding notification JSON data:",e)}const r=o.web;if(!r?.title)return;const a={data:r,actions:r.actions?.buttons?.map((e,t)=>({action:`action_${t}`,title:e.label}))??[]};return null!=r.body&&(a.body=r.body),null!=r.media&&(a.icon=r.media,a.image=r.media),e.registration.showNotification(r.title,a)})({event:e,sw:o,logger:t.logger}),onNotificationClick(e){i({event:e})},async onNotificationClose(e){const n=e.notification.data;try{await r({xdm:n._xdm.mixins,actionLabel:"Dismiss"})}catch(e){t.logger.error("Failed to send tracking call:",e)}}}}})({sw:i,platform:{logger:s,fetch:fetch}});i.addEventListener("install",()=>{i.skipWaiting()}),i.addEventListener("activate",e=>{e.waitUntil(i.clients.claim())}),i.addEventListener("push",e=>c.pushNotifications.onPush(e)),i.addEventListener("notificationclick",e=>c.pushNotifications.onNotificationClick(e)),i.addEventListener("notificationclose",e=>{c.pushNotifications.onNotificationClose(e)});
+var e=async({sw:e,event:t,logger:n,readFromIndexedDb:o})=>{if(!t.data)return;let r;try{r=t.data.json()}catch(e){return void n.error("Error decoding notification JSON data:",e)}const a=r.web;if(!a?.title)return;const i=await(async({webData:e,readFromIndexedDb:t,logger:n})=>{const{identity:o}=e;if(!o||"ECID"!==o.namespace?.toUpperCase())return!0;let r;try{r=await t(n)}catch(e){const t=e instanceof Error?e.message:String(e);return n.error(`Unable to read the stored ECID for this browser. ${t}`),!0}const a=r?.ecid;return o.id===a||(n.info("Suppressing push notification: payload ECID does not match the ECID stored for this browser."),!1)})({webData:a,readFromIndexedDb:o,logger:n});if(!i)return;const s={data:a,actions:a.actions?.buttons?.map((e,t)=>({action:`action_${t}`,title:e.label}))??[]};return null!=a.body&&(s.body=a.body),null!=a.media&&(s.icon=a.media,s.image=a.media),e.registration.showNotification(a.title,s)};const t=e=>["DEEPLINK","WEBURL"].includes(e);const n="config";var o=async e=>{try{const e=await(t="alloyPushNotifications",o=1,r=e=>{e.objectStoreNames.contains(n)||e.createObjectStore(n,{keyPath:"id"})},new Promise((e,n)=>{const a=indexedDB.open(t,o);a.onerror=()=>n(a.error),a.onsuccess=()=>e(a.result),a.onupgradeneeded=e=>{const t=e.target.result;r&&r(t)}})),a=await((e,t,n)=>new Promise((o,r)=>{const a=e.transaction([t],"readonly").objectStore(t).get(n);a.onerror=()=>r(a.error),a.onsuccess=()=>o(a.result)}))(e,n,"alloyConfig");return e.close(),a}catch(t){throw e.error("Failed to read data from IndexedDB",{error:t}),t}var t,o,r};const r=[];for(let e=0;e<256;++e)r.push((e+256).toString(16).slice(1));const a=new Uint8Array(16);function i(e,t,n){return t||e||!crypto.randomUUID?function(e,t,n){e=e||{};const o=e.random??e.rng?.()??crypto.getRandomValues(a);if(o.length<16)throw new Error("Random bytes length must be >= 16");if(o[6]=15&o[6]|64,o[8]=63&o[8]|128,t){if((n=n||0)<0||n+16>t.length)throw new RangeError(`UUID byte range ${n}:${n+15} is out of buffer bounds`);for(let e=0;e<16;++e)t[n+e]=o[e];return t}return function(e,t=0){return(r[e[t+0]]+r[e[t+1]]+r[e[t+2]]+r[e[t+3]]+"-"+r[e[t+4]]+r[e[t+5]]+"-"+r[e[t+6]]+r[e[t+7]]+"-"+r[e[t+8]]+r[e[t+9]]+"-"+r[e[t+10]]+r[e[t+11]]+r[e[t+12]]+r[e[t+13]]+r[e[t+14]]+r[e[t+15]]).toLowerCase()}(o)}(e,t,n):crypto.randomUUID()}const s=self,c={namespace:"[alloy][pushNotificationWorker]",info:(...e)=>console.log(c.namespace,...e),error:(...e)=>console.error(c.namespace,...e)},d=(({platform:n,sw:r})=>{const a=(({readFromIndexedDb:e,uuidv4:t,logger:n,fetch:o})=>async({xdm:r,actionLabel:a,applicationLaunches:i=0})=>{const s=await e(n),{browser:c,ecid:d,edgeDomain:l,edgeBasePath:u,datastreamId:g,datasetId:m}=s||{};let f={};a&&(f={customAction:{actionID:a}});const p=[{name:"browser",errorField:"Browser"},{name:"ecid",errorField:"ECID"},{name:"edgeDomain",errorField:"Edge domain"},{name:"edgeBasePath",errorField:"Edge base path"},{name:"datastreamId",errorField:"Datastream ID"},{name:"datasetId",errorField:"Dataset ID"}];try{for(const e of p)if(!s[e.name])throw new Error(`Cannot send tracking call. ${e.errorField} is missing.`);const e=`https://${l}/${u}/v1/interact?configId=${g}&requestId=${t()}`,h=c,w=m,b={events:[{xdm:{identityMap:{ECID:[{id:d}]},timestamp:(new Date).toISOString(),pushNotificationTracking:{...f,pushProviderMessageID:t(),pushProvider:h.toLowerCase()},application:{launches:{value:i}},eventType:a?"pushTracking.customAction":"pushTracking.applicationOpened",_experience:{...r._experience,customerJourneyManagement:{...r._experience.customerJourneyManagement,pushChannelContext:{platform:"web"},messageProfile:{channel:{_id:"https://ns.adobe.com/xdm/channels/push"}}}}},meta:{collect:{datasetId:w}}}]},y=await o(e,{method:"POST",headers:{"content-type":"text/plain; charset=UTF-8"},body:JSON.stringify(b)});return!!y.ok||(n.error("Tracking call failed: ",y.status,y.statusText),!1)}catch(e){return n.error("Error sending tracking call:",e),!1}})({readFromIndexedDb:o,uuidv4:i,logger:n.logger,fetch:n.fetch}),s=(({makeSendServiceWorkerTrackingData:e,sw:n,logger:o})=>({event:r})=>{r.notification.close();const a=r.notification.data;let i=null,s=null;if(r.action){const e=parseInt(r.action.replace("action_",""),10);if(a?.actions?.buttons[e]){const n=a.actions.buttons[e];s=n.label,t(n.type)&&n.uri&&(i=n.uri)}}else t(a?.interaction?.type)&&a?.interaction?.uri&&(i=a.interaction.uri);e({xdm:a._xdm.mixins,actionLabel:s,applicationLaunches:1}).catch(e=>{o.error("Failed to send tracking call:",e)}),i&&r.waitUntil(n.clients.matchAll({type:"window"}).then(e=>{for(const t of e)if(t.url===i&&"focus"in t)return t.focus();if(n.clients.openWindow)return n.clients.openWindow(i)}))})({makeSendServiceWorkerTrackingData:a,sw:r,logger:n.logger});return{pushNotifications:{onPush:t=>e({event:t,sw:r,logger:n.logger,readFromIndexedDb:o}),onNotificationClick(e){s({event:e})},async onNotificationClose(e){const t=e.notification.data;try{await a({xdm:t._xdm.mixins,actionLabel:"Dismiss"})}catch(e){n.logger.error("Failed to send tracking call:",e)}}}}})({sw:s,platform:{logger:c,fetch:fetch}});s.addEventListener("install",()=>{s.skipWaiting()}),s.addEventListener("activate",e=>{e.waitUntil(s.clients.claim())}),s.addEventListener("push",e=>d.pushNotifications.onPush(e)),s.addEventListener("notificationclick",e=>d.pushNotifications.onNotificationClick(e)),s.addEventListener("notificationclose",e=>{d.pushNotifications.onNotificationClose(e)});

package/dist/types/browser/src/components/ActivityCollector/configValidators.d.ts

@@ -1,4 +1,4 @@
-export const downloadLinkQualifier: any;
+export const downloadLinkQualifier: import("@adobe/alloy-core/utils/validation/types").AnyValidator;
 export default validators;
 export const DEFAULT_DOWNLOAD_QUALIFIER: "\\.(exe|zip|wav|mp3|mov|mpg|avi|wmv|pdf|doc|docx|xls|xlsx|ppt|pptx)$";
-declare const validators: Function;
+declare const validators: import("@adobe/alloy-core/utils/validation/types").ObjectValidator;

package/dist/types/browser/src/components/Advertising/configValidators.d.ts

@@ -1,2 +1,2 @@
-declare const _default: Function;
+declare const _default: import("@adobe/alloy-core/utils/validation/types").ObjectValidator;
 export default _default;

package/dist/types/browser/src/components/Context/index.d.ts

@@ -12,5 +12,5 @@ declare function createContext({ config, logger }: {
 };
 declare namespace createContext {
     let namespace: string;
-    let configValidators: Function;
+    let configValidators: import("@adobe/alloy-core/utils/validation/types.js").ObjectValidator;
 }

package/dist/types/browser/src/components/Personalization/index.d.ts

@@ -33,5 +33,5 @@ declare function createPersonalization({ config, logger, eventManager, consent }
 };
 declare namespace createPersonalization {
     let namespace: string;
-    let configValidators: Function;
+    let configValidators: import("@adobe/alloy-core/utils/validation/types.js").ObjectValidator;
 }

package/dist/types/browser/src/components/PushNotifications/helpers/readFromIndexedDb.d.ts

@@ -1,3 +1,4 @@
-declare function _default(logger: ServiceWorkerLogger): Promise<Object | undefined>;
+declare function _default(logger: ServiceWorkerLogger): Promise<PushServiceWorkerConfig | undefined>;
 export default _default;
 import type { ServiceWorkerLogger } from '../types.js';
+import type { PushServiceWorkerConfig } from '../types.js';

package/dist/types/browser/src/components/PushNotifications/helpers/saveToIndexedDb.d.ts

@@ -1,8 +1,9 @@
 /**
- * @param {Object} data
+ * @param {Partial<PushServiceWorkerConfig>} data
  * @param {Logger} logger
  *
  * @returns {Promise<boolean>} Whether the data was successfully saved.
  */
-export default function saveToIndexedDB(data: Object, logger: Logger): Promise<boolean>;
+export default function saveToIndexedDB(data: Partial<PushServiceWorkerConfig>, logger: Logger): Promise<boolean>;
+import type { PushServiceWorkerConfig } from '../types.js';
 import type { Logger } from '@adobe/alloy-core/core/types.js';

package/dist/types/browser/src/components/PushNotifications/helpers/serviceWorkerPushListener.d.ts

@@ -1,7 +1,9 @@
-declare function _default({ sw, event, logger }: {
+declare function _default({ sw, event, logger, readFromIndexedDb }: {
     sw: ServiceWorkerGlobalScope;
     event: PushEvent;
     logger: ServiceWorkerLogger;
+    readFromIndexedDb: (logger: ServiceWorkerLogger) => Promise<PushServiceWorkerConfig | undefined>;
 }): Promise<void>;
 export default _default;
 import type { ServiceWorkerLogger } from '../types.js';
+import type { PushServiceWorkerConfig } from '../types.js';

package/dist/types/browser/src/components/PushNotifications/index.d.ts

@@ -40,7 +40,7 @@ declare function createPushNotifications({ eventManager, config, logger, consent
 };
 declare namespace createPushNotifications {
     let namespace: string;
-    let configValidators: Function;
+    let configValidators: import("@adobe/alloy-core/utils/validation/types.js").ObjectValidator;
 }
 import type { EventManager } from '@adobe/alloy-core/core/types.js';
 import type { Logger } from '@adobe/alloy-core/core/types.js';

package/dist/types/browser/src/components/PushNotifications/request/makeSendPushSubscriptionRequest.d.ts

@@ -10,9 +10,13 @@ declare function _default({ config: { vapidPublicKey, appId }, storage, logger,
     sendEdgeNetworkRequest: EdgeRequestExecutor;
     consent: ConsentManager;
     window: Window;
+    getPushSubscriptionDetails?: (({ vapidPublicKey, window }: {
+        vapidPublicKey: string;
+        window: Window;
+    }) => Promise<import("../types.js").PushSubscription>) | undefined;
 }): Promise<void>;
 export default _default;
-import type { Storage } from '@adobe/alloy-core/utils/types.js';
+import type { Storage } from '@adobe/alloy-core/services';
 import type { Logger } from '@adobe/alloy-core/core/types.js';
 import type { EventManager } from '@adobe/alloy-core/core/types.js';
 import type { IdentityManager } from '@adobe/alloy-core/core/identity/types.js';

package/dist/types/browser/src/components/PushNotifications/request/makeSendServiceWorkerTrackingData.d.ts

@@ -1,11 +1,13 @@
 export function createMakeSendServiceWorkerTrackingData({ readFromIndexedDb, uuidv4, logger, fetch, }: {
-    readFromIndexedDb: (logger: ServiceWorkerLogger) => Promise<Object>;
+    readFromIndexedDb: (logger: ServiceWorkerLogger) => Promise<PushServiceWorkerConfig>;
     uuidv4: () => string;
     logger: ServiceWorkerLogger;
     fetch: (url: string, options: object) => Promise<Response>;
 }): (options: {
-    xdm: Object;
+    xdm: XdmTrackingContext;
     actionLabel?: string;
     applicationLaunches?: number;
 }) => Promise<boolean>;
 import type { ServiceWorkerLogger } from '../types.js';
+import type { PushServiceWorkerConfig } from '../types.js';
+import type { XdmTrackingContext } from '../types.js';

package/dist/types/browser/src/components/PushNotifications/types.d.ts

@@ -39,6 +39,9 @@
  * @property {string} web.title
  * @property {string} web.body
  * @property {string|null} web.media
+ * @property {Object} [web.identity]
+ * @property {string} [web.identity.id]
+ * @property {string} [web.identity.namespace]
  * @property {Object} web.interaction
  * @property {string} web.interaction.type
  * @property {string|null} web.interaction.uri
@@ -81,6 +84,17 @@
  * @property {(...args: any[]) => void} info
  * @property {(...args: any[]) => void} error
  */
+/**
+ * @typedef {Object} PushServiceWorkerConfig
+ * @property {string} [ecid]
+ * @property {string} [browser]
+ * @property {string} [edgeDomain]
+ * @property {string} [edgeBasePath]
+ * @property {string} [datastreamId]
+ * @property {string} [datasetId]
+ * @property {string} [id]
+ * @property {number} [timestamp]
+ */
 export const Types: {};
 export type PushSubscription = {
     /**
@@ -131,6 +145,10 @@ export type PushNotificationData = {
         title: string;
         body: string;
         media: string | null;
+        identity?: {
+            id?: string | undefined;
+            namespace?: string | undefined;
+        } | undefined;
         interaction: {
             type: string;
             uri: string | null;
@@ -187,3 +205,13 @@ export type ServiceWorkerLogger = {
     info: (...args: any[]) => void;
     error: (...args: any[]) => void;
 };
+export type PushServiceWorkerConfig = {
+    ecid?: string | undefined;
+    browser?: string | undefined;
+    edgeDomain?: string | undefined;
+    edgeBasePath?: string | undefined;
+    datastreamId?: string | undefined;
+    datasetId?: string | undefined;
+    id?: string | undefined;
+    timestamp?: number | undefined;
+};

package/dist/types/core/src/components/BrandConcierge/configValidators.d.ts

@@ -1,2 +1,2 @@
-declare const _default: Function;
+declare const _default: import("../../utils/validation/types.js").ObjectValidator;
 export default _default;

package/dist/types/core/src/components/Consent/configValidators.d.ts

@@ -1,2 +1,2 @@
-declare const _default: Function;
+declare const _default: import("../../utils/validation/types.js").ObjectValidator;
 export default _default;

package/dist/types/core/src/components/Consent/validateSetConsentOptions.d.ts

@@ -1,2 +1,2 @@
-declare const _default: any;
+declare const _default: import("../../utils/validation/types.js").AnyValidator;
 export default _default;

package/dist/types/core/src/components/Identity/configValidators.d.ts

@@ -1,2 +1,2 @@
 export default configValidators;
-declare const configValidators: Function;
+declare const configValidators: import("../../utils/validation/types.js").ObjectValidator;

package/dist/types/core/src/components/RulesEngine/index.d.ts

@@ -44,5 +44,5 @@ declare function createRulesEngine({ config, eventManager, consent, getBrowser,
 };
 declare namespace createRulesEngine {
     let namespace: string;
-    let configValidators: Function;
+    let configValidators: import("../../utils/validation/types.js").ObjectValidator;
 }

package/dist/types/core/src/components/StreamingMedia/configValidators.d.ts

@@ -1,2 +1,2 @@
-declare const _default: Function;
+declare const _default: import("../../utils/validation/types.js").ObjectValidator;
 export default _default;

package/dist/types/core/src/core/config/createCoreConfigs.d.ts

@@ -1,2 +1,2 @@
-declare function _default(): any;
+declare function _default(): import("../../utils/validation/types.js").ObjectValidator;
 export default _default;

package/dist/types/core/src/utils/bytes.d.ts

@@ -1,4 +1,4 @@
-export function base64ToBytes(base64String: string): Uint8Array;
+export function base64ToBytes(base64String: string): Uint8Array<ArrayBuffer>;
 export function bytesToBase64(bytes: Uint8Array, options?: {
     urlSafe?: boolean | undefined;
 }): string;

package/dist/types/core/src/utils/validateConfigOverride.d.ts

@@ -1,2 +1,2 @@
-declare const _default: Function;
+declare const _default: import("./validation/types.js").ObjectValidator;
 export default _default;

package/dist/types/core/src/utils/validateIdentityMap.d.ts

@@ -1,2 +1,2 @@
-declare const _default: Function;
+declare const _default: import("./validation/types.js").MapOfValuesValidator;
 export default _default;

package/dist/types/core/src/utils/validation/index.d.ts

@@ -1,12 +1,24 @@
-declare function boundAnyOf(validators: any, message: any): Function;
-declare function boundAnything(): any;
-declare function boundArrayOf(elementValidator: any): Function;
-declare function boundBoolean(): Function;
-declare function boundCallback(): Function;
-declare function boundLiteral(literalValue: any): Function;
-declare function boundNumber(): Function;
-declare function boundMapOfValues(valuesValidator: any): Function;
-declare function boundObjectOf(schema: any): Function;
-declare function boundString(): Function;
-declare function boundEnumOf(...values: any[]): Function;
+declare const boundAnyOf: (validators: ValidatorFn[], message?: string | undefined) => AnyValidator;
+declare const boundAnything: () => AnyValidator;
+declare const boundArrayOf: (elementValidator: ValidatorFn) => ArrayValidator;
+declare const boundBoolean: () => AnyValidator;
+declare const boundCallback: () => AnyValidator;
+declare const boundLiteral: (literalValue: any) => AnyValidator;
+declare const boundNumber: () => NumberValidator;
+declare const boundMapOfValues: (valuesValidator: ValidatorFn) => MapOfValuesValidator;
+declare const boundObjectOf: (schema: ObjectValidatorSchema) => ObjectValidator;
+declare const boundString: () => StringValidator;
+/**
+ * @param {...any} values
+ * @returns {AnyValidator}
+ */
+declare function boundEnumOf(...values: any[]): AnyValidator;
+import type { ValidatorFn } from './types.js';
+import type { AnyValidator } from './types.js';
+import type { ArrayValidator } from './types.js';
+import type { NumberValidator } from './types.js';
+import type { MapOfValuesValidator } from './types.js';
+import type { ObjectValidatorSchema } from './types.js';
+import type { ObjectValidator } from './types.js';
+import type { StringValidator } from './types.js';
 export { boundAnyOf as anyOf, boundAnything as anything, boundArrayOf as arrayOf, boundBoolean as boolean, boundCallback as callback, boundLiteral as literal, boundNumber as number, boundMapOfValues as mapOfValues, boundObjectOf as objectOf, boundString as string, boundEnumOf as enumOf };

package/dist/types/core/src/utils/validation/types.d.ts

@@ -0,0 +1,133 @@
+/**
+ * A validator is a function of a value and an optional path that returns the
+ * computed value if valid, or throws if invalid.
+ * @typedef {(value: any, path?: string) => any} ValidatorFn
+ */
+/**
+ * The methods available on every validator, regardless of data type.
+ * @typedef {ValidatorFn & {
+ *   required: () => AnyValidator,
+ *   default: (defaultValue: any) => AnyValidator,
+ *   deprecated: (message: string) => AnyValidator,
+ * }} AnyValidator
+ */
+/**
+ * @typedef {AnyValidator & {
+ *   nonEmpty: () => ArrayValidator,
+ *   uniqueItems: () => ArrayValidator,
+ *   required: () => ArrayValidator,
+ *   default: (defaultValue: any[]) => ArrayValidator,
+ *   deprecated: (message: string) => ArrayValidator,
+ * }} ArrayValidator
+ */
+/**
+ * @typedef {AnyValidator & {
+ *   minimum: (minValue: number) => NumberValidator,
+ *   maximum: (maxValue: number) => NumberValidator,
+ *   integer: () => NumberValidator,
+ *   unique: () => NumberValidator,
+ *   required: () => NumberValidator,
+ *   default: (defaultValue: number) => NumberValidator,
+ *   deprecated: (message: string) => NumberValidator,
+ * }} NumberValidator
+ */
+/**
+ * @typedef {AnyValidator & {
+ *   nonEmpty: () => MapOfValuesValidator,
+ *   required: () => MapOfValuesValidator,
+ *   default: (defaultValue: object) => MapOfValuesValidator,
+ *   deprecated: (message: string) => MapOfValuesValidator,
+ * }} MapOfValuesValidator
+ */
+/**
+ * objectOf's schema is normally a plain map of field name to validator, but
+ * it is also idiomatically called with a bare validator (e.g. `objectOf(anything())`)
+ * to mean "an object, with no per-field validation."
+ * @typedef {Record<string, ValidatorFn> | ValidatorFn} ObjectValidatorSchema
+ */
+/**
+ * @typedef {AnyValidator & {
+ *   noUnknownFields: () => ObjectValidator,
+ *   nonEmpty: () => ObjectValidator,
+ *   concat: (otherObjectOfValidator: ObjectValidator) => ObjectValidator,
+ *   renamed: (oldField: string, oldSchema: ValidatorFn, newField: string) => ObjectValidator,
+ *   schema: ObjectValidatorSchema,
+ *   required: () => ObjectValidator,
+ *   default: (defaultValue: object) => ObjectValidator,
+ *   deprecated: (message: string) => ObjectValidator,
+ * }} ObjectValidator
+ */
+/**
+ * @typedef {AnyValidator & {
+ *   regexp: () => StringValidator,
+ *   domain: () => StringValidator,
+ *   nonEmpty: () => StringValidator,
+ *   unique: () => StringValidator,
+ *   matches: (pattern: RegExp) => StringValidator,
+ *   required: () => StringValidator,
+ *   default: (defaultValue: string) => StringValidator,
+ *   deprecated: (message: string) => StringValidator,
+ * }} StringValidator
+ */
+export const Types: {};
+/**
+ * A validator is a function of a value and an optional path that returns the
+ * computed value if valid, or throws if invalid.
+ */
+export type ValidatorFn = (value: any, path?: string) => any;
+/**
+ * The methods available on every validator, regardless of data type.
+ */
+export type AnyValidator = ValidatorFn & {
+    required: () => AnyValidator;
+    default: (defaultValue: any) => AnyValidator;
+    deprecated: (message: string) => AnyValidator;
+};
+export type ArrayValidator = AnyValidator & {
+    nonEmpty: () => ArrayValidator;
+    uniqueItems: () => ArrayValidator;
+    required: () => ArrayValidator;
+    default: (defaultValue: any[]) => ArrayValidator;
+    deprecated: (message: string) => ArrayValidator;
+};
+export type NumberValidator = AnyValidator & {
+    minimum: (minValue: number) => NumberValidator;
+    maximum: (maxValue: number) => NumberValidator;
+    integer: () => NumberValidator;
+    unique: () => NumberValidator;
+    required: () => NumberValidator;
+    default: (defaultValue: number) => NumberValidator;
+    deprecated: (message: string) => NumberValidator;
+};
+export type MapOfValuesValidator = AnyValidator & {
+    nonEmpty: () => MapOfValuesValidator;
+    required: () => MapOfValuesValidator;
+    default: (defaultValue: object) => MapOfValuesValidator;
+    deprecated: (message: string) => MapOfValuesValidator;
+};
+/**
+ * objectOf's schema is normally a plain map of field name to validator, but
+ * it is also idiomatically called with a bare validator (e.g. `objectOf(anything())`)
+ * to mean "an object, with no per-field validation."
+ */
+export type ObjectValidatorSchema = Record<string, ValidatorFn> | ValidatorFn;
+export type ObjectValidator = AnyValidator & {
+    noUnknownFields: () => ObjectValidator;
+    nonEmpty: () => ObjectValidator;
+    concat: (otherObjectOfValidator: ObjectValidator) => ObjectValidator;
+    renamed: (oldField: string, oldSchema: ValidatorFn, newField: string) => ObjectValidator;
+    schema: ObjectValidatorSchema;
+    required: () => ObjectValidator;
+    default: (defaultValue: object) => ObjectValidator;
+    deprecated: (message: string) => ObjectValidator;
+};
+export type StringValidator = AnyValidator & {
+    regexp: () => StringValidator;
+    domain: () => StringValidator;
+    nonEmpty: () => StringValidator;
+    unique: () => StringValidator;
+    matches: (pattern: RegExp) => StringValidator;
+    required: () => StringValidator;
+    default: (defaultValue: string) => StringValidator;
+    deprecated: (message: string) => StringValidator;
+};

package/dist/types/core/src/utils/validation/utils.d.ts

@@ -1,4 +1,5 @@
-export function chain(baseValidator: Function, newValidator: Function, additionalMethods: object): Function;
-export function nullSafeChain(baseValidator: Function, newValidator: Function, additionalMethods: object): Function;
-export function reverseNullSafeChainJoinErrors(baseValidator: Function, newValidator: Function, additionalMethods: Function): Function;
+export function chain(baseValidator: ValidatorFn, newValidator: ValidatorFn, additionalMethods?: object): ValidatorFn;
+export function nullSafeChain(baseValidator: ValidatorFn, newValidator: ValidatorFn, additionalMethods?: object): ValidatorFn;
+export function reverseNullSafeChainJoinErrors(baseValidator: ValidatorFn, newValidator: ValidatorFn, additionalMethods?: object): ValidatorFn;
 export function assertValid(isValid: boolean, value: any, path: string, message: string): void;
+import type { ValidatorFn } from './types.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/alloy",
-  "version": "2.34.2-beta.3",
+  "version": "2.35.0-beta.4",
   "description": "Adobe Experience Platform Web SDK",
   "type": "module",
   "repository": {
@@ -69,7 +69,7 @@
     "commander": "^14.0.2",
     "rollup": "^4.60.3",
     "rollup-plugin-license": "^3.7.1",
-    "@adobe/alloy-core": "^1.2.2-beta.0"
+    "@adobe/alloy-core": "^1.2.2-beta.1"
   },
   "devDependencies": {
     "glob": "^13.0.6",