@adobe/alloy 2.34.2-beta.1 → 2.34.2-beta.3

package/dist/types/browser/src/components/Personalization/dom-actions/scripts.d.ts

@@ -1,5 +1,5 @@
 export function is(element: any, tagName: any): boolean;
 export function getInlineScripts(fragment: any): any[];
-export function getRemoteScriptsUrls(fragment: any): any[];
+export function getRemoteScripts(fragment: any): any[];
 export function executeInlineScripts(parent: any, scripts: any): void;
-export function executeRemoteScripts(urls: any): Promise<any[]>;
+export function executeRemoteScripts(scripts: any): Promise<any[]>;

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/alloy",
-  "version": "2.34.2-beta.1",
+  "version": "2.34.2-beta.3",
   "description": "Adobe Experience Platform Web SDK",
   "type": "module",
   "repository": {

package/src/components/Personalization/dom-actions/appendHtml.js

@@ -18,7 +18,7 @@ import {
   executeInlineScripts,
   executeRemoteScripts,
   getInlineScripts,
-  getRemoteScriptsUrls,
+  getRemoteScripts,
 } from "./scripts.js";
 
 export default (container, html, decorateProposition) => {
@@ -26,7 +26,7 @@ export default (container, html, decorateProposition) => {
   addNonceToInlineStyleElements(fragment);
   const elements = getChildNodes(fragment);
   const scripts = getInlineScripts(fragment);
-  const scriptsUrls = getRemoteScriptsUrls(fragment);
+  const remoteScripts = getRemoteScripts(fragment);
 
   loadImages(fragment);
 
@@ -38,5 +38,5 @@ export default (container, html, decorateProposition) => {
 
   executeInlineScripts(container, scripts);
 
-  return executeRemoteScripts(scriptsUrls);
+  return executeRemoteScripts(remoteScripts);
 };

package/src/components/Personalization/dom-actions/insertHtmlAfter.js

@@ -15,7 +15,7 @@ import { loadImages } from "./images.js";
 import addNonceToInlineStyleElements from "./addNonceToInlineStyleElements.js";
 import {
   getInlineScripts,
-  getRemoteScriptsUrls,
+  getRemoteScripts,
   executeInlineScripts,
   executeRemoteScripts,
 } from "./scripts.js";
@@ -25,7 +25,7 @@ export default (container, html, decorateProposition) => {
   addNonceToInlineStyleElements(fragment);
   const elements = getChildNodes(fragment);
   const scripts = getInlineScripts(fragment);
-  const scriptsUrls = getRemoteScriptsUrls(fragment);
+  const remoteScripts = getRemoteScripts(fragment);
 
   loadImages(fragment);
 
@@ -39,5 +39,5 @@ export default (container, html, decorateProposition) => {
 
   executeInlineScripts(container, scripts);
 
-  return executeRemoteScripts(scriptsUrls);
+  return executeRemoteScripts(remoteScripts);
 };

package/src/components/Personalization/dom-actions/insertHtmlBefore.js

@@ -17,7 +17,7 @@ import {
   executeInlineScripts,
   executeRemoteScripts,
   getInlineScripts,
-  getRemoteScriptsUrls,
+  getRemoteScripts,
 } from "./scripts.js";
 
 export default (container, html, decorateProposition) => {
@@ -25,7 +25,7 @@ export default (container, html, decorateProposition) => {
   addNonceToInlineStyleElements(fragment);
   const elements = getChildNodes(fragment);
   const scripts = getInlineScripts(fragment);
-  const scriptsUrls = getRemoteScriptsUrls(fragment);
+  const remoteScripts = getRemoteScripts(fragment);
 
   loadImages(fragment);
 
@@ -36,5 +36,5 @@ export default (container, html, decorateProposition) => {
 
   executeInlineScripts(container, scripts);
 
-  return executeRemoteScripts(scriptsUrls);
+  return executeRemoteScripts(remoteScripts);
 };

package/src/components/Personalization/dom-actions/prependHtml.js

@@ -23,7 +23,7 @@ import {
   executeInlineScripts,
   executeRemoteScripts,
   getInlineScripts,
-  getRemoteScriptsUrls,
+  getRemoteScripts,
 } from "./scripts.js";
 
 export default (container, html, decorateProposition) => {
@@ -31,7 +31,7 @@ export default (container, html, decorateProposition) => {
   addNonceToInlineStyleElements(fragment);
   const elements = getChildNodes(fragment);
   const scripts = getInlineScripts(fragment);
-  const scriptsUrls = getRemoteScriptsUrls(fragment);
+  const remoteScripts = getRemoteScripts(fragment);
   const { length } = elements;
   let i = length - 1;
 
@@ -56,5 +56,5 @@ export default (container, html, decorateProposition) => {
 
   executeInlineScripts(container, scripts);
 
-  return executeRemoteScripts(scriptsUrls);
+  return executeRemoteScripts(remoteScripts);
 };

package/src/components/Personalization/dom-actions/scripts.js

@@ -24,10 +24,24 @@ const getPromise = (url, script) => {
     };
   });
 };
-const loadScript = (url) => {
+const loadScript = (source) => {
+  const url = getAttribute(source, SRC);
   const script = document.createElement("script");
-  script.src = url;
+  // Preserve all author-supplied attributes (class, type, data-*, etc.) so
+  // consumers relying on them keep working.
+  const { attributes } = source;
+  for (let i = 0; i < attributes.length; i += 1) {
+    const { name, value } = attributes[i];
+    script.setAttribute(name, value);
+  }
+  // Override invariants last so they can't be clobbered by the source element.
+  const nonce = getNonce();
+  if (nonce) {
+    script.setAttribute("nonce", nonce);
+  }
   script.async = true;
+  // Assign load handlers after copying attributes so a copied inline
+  // onload/onerror attribute can't break load-completion tracking.
   const promise = getPromise(url, script);
   document.head.appendChild(script);
   return promise;
@@ -70,7 +84,7 @@ export const getInlineScripts = (fragment) => {
   return result;
 };
 
-export const getRemoteScriptsUrls = (fragment) => {
+export const getRemoteScripts = (fragment) => {
   const scripts = selectNodes(SCRIPT, fragment);
   const result = [];
   const { length } = scripts;
@@ -78,17 +92,12 @@ export const getRemoteScriptsUrls = (fragment) => {
   for (let i = 0; i < length; i += 1) {
     const element = scripts[i];
 
+    // isRemoteScript already requires a non-empty src attribute.
     if (!isRemoteScript(element)) {
       continue;
     }
 
-    const url = getAttribute(element, SRC);
-
-    if (!url) {
-      continue;
-    }
-
-    result.push(url);
+    result.push(element);
   }
 
   return result;
@@ -101,6 +110,6 @@ export const executeInlineScripts = (parent, scripts) => {
   });
 };
 
-export const executeRemoteScripts = (urls) => {
-  return Promise.all(urls.map(loadScript));
+export const executeRemoteScripts = (scripts) => {
+  return Promise.all(scripts.map(loadScript));
 };

package/src/components/PushNotifications/helpers/saveToIndexedDb.js

@@ -24,7 +24,7 @@ import { DB_NAME, DB_VERSION, STORE_NAME, INDEX_KEY } from "./constants.js";
  * @param {Object} data
  * @param {Logger} logger
  *
- * @returns {Promise<void>}
+ * @returns {Promise<boolean>} Whether the data was successfully saved.
  */
 export default async function saveToIndexedDB(data, logger) {
   try {
@@ -58,7 +58,11 @@ export default async function saveToIndexedDB(data, logger) {
       "Successfully saved web SDK config to IndexedDB",
       updatedConfigData,
     );
+
+    return true;
   } catch (error) {
     logger.error("Failed to save config to IndexedDB", { error });
+
+    return false;
   }
 }

package/src/components/PushNotifications/request/makeSendPushSubscriptionRequest.js

@@ -59,6 +59,14 @@ export default async ({
   await identity.awaitIdentity();
   const ecid = identity.getEcidFromCookie();
 
+  if (!ecid) {
+    logger.info(
+      "No ECID is available. Not sending push subscription details to the server.",
+    );
+
+    return;
+  }
+
   const pushSubscriptionDetails = await getPushSubscriptionDetails({
     vapidPublicKey,
     window,
@@ -71,7 +79,7 @@ export default async ({
   const cacheValue = `${ecid}${serializedPushSubscriptionDetails}`;
   const storedValue = await storage.getItem(SUBSCRIPTION_DETAILS);
 
-  if (cacheValue === storedValue) {
+  if (storedValue && cacheValue === storedValue) {
     logger.info(
       "Subscription details have not changed. Not sending to the server.",
     );
@@ -79,8 +87,6 @@ export default async ({
     return;
   }
 
-  storage.setItem(SUBSCRIPTION_DETAILS, cacheValue);
-
   const payload = await createSendPushSubscriptionPayload({
     eventManager,
     ecid,
@@ -95,5 +101,13 @@ export default async ({
   await consent.awaitConsent();
   await sendEdgeNetworkRequest({ request });
 
-  await saveToIndexedDb({ ecid }, logger);
+  const savedToIndexedDb = await saveToIndexedDb({ ecid }, logger);
+
+  // Only cache the subscription details once the ECID has been persisted, so
+  // that a failed send or a failed IndexedDB write does not short-circuit the
+  // dedupe check on the next call. This lets a subsequent sendPushSubscription
+  // self-heal instead of getting stuck with a cached subscription but no ECID.
+  if (savedToIndexedDb) {
+    storage.setItem(SUBSCRIPTION_DETAILS, cacheValue);
+  }
 };