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

package/dist/alloy.js

@@ -6667,7 +6667,9 @@
           // so that sendBeacon requests don't override the edge info from before.
           edge = { ...edge, ...response.getEdge() };
 
-          identity.setIdentityAcquired();
+          if (identity.getEcidFromCookie()) {
+            identity.setIdentityAcquired();
+          }
 
           return handleResponseForIdSyncs(response);
         },
@@ -7552,10 +7554,10 @@
   governing permissions and limitations under the License.
   */
 
-  // The 2.34.2-beta.1 keyword will be replace at alloy build time with the package.json version.
+  // The 2.34.2-beta.3 keyword will be replace at alloy build time with the package.json version.
   // see babel-plugin-version
 
-  var libraryVersion = "2.34.2-beta.1";
+  var libraryVersion = "2.34.2-beta.3";
 
   /*
   Copyright 2019 Adobe. All rights reserved.
@@ -17030,10 +17032,24 @@
       };
     });
   };
-  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;
@@ -17076,7 +17092,7 @@
     return result;
   };
 
-  const getRemoteScriptsUrls = (fragment) => {
+  const getRemoteScripts = (fragment) => {
     const scripts = selectNodes(SCRIPT, fragment);
     const result = [];
     const { length } = scripts;
@@ -17084,17 +17100,12 @@
     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;
@@ -17107,8 +17118,8 @@
     });
   };
 
-  const executeRemoteScripts = (urls) => {
-    return Promise.all(urls.map(loadScript));
+  const executeRemoteScripts = (scripts) => {
+    return Promise.all(scripts.map(loadScript));
   };
 
   /*
@@ -17129,7 +17140,7 @@
     addNonceToInlineStyleElements(fragment);
     const elements = getChildNodes(fragment);
     const scripts = getInlineScripts(fragment);
-    const scriptsUrls = getRemoteScriptsUrls(fragment);
+    const remoteScripts = getRemoteScripts(fragment);
 
     loadImages(fragment);
 
@@ -17141,7 +17152,7 @@
 
     executeInlineScripts(container, scripts);
 
-    return executeRemoteScripts(scriptsUrls);
+    return executeRemoteScripts(remoteScripts);
   };
 
   /*
@@ -17187,7 +17198,7 @@
     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;
 
@@ -17212,7 +17223,7 @@
 
     executeInlineScripts(container, scripts);
 
-    return executeRemoteScripts(scriptsUrls);
+    return executeRemoteScripts(remoteScripts);
   };
 
   /*
@@ -17350,7 +17361,7 @@
     addNonceToInlineStyleElements(fragment);
     const elements = getChildNodes(fragment);
     const scripts = getInlineScripts(fragment);
-    const scriptsUrls = getRemoteScriptsUrls(fragment);
+    const remoteScripts = getRemoteScripts(fragment);
 
     loadImages(fragment);
 
@@ -17361,7 +17372,7 @@
 
     executeInlineScripts(container, scripts);
 
-    return executeRemoteScripts(scriptsUrls);
+    return executeRemoteScripts(remoteScripts);
   };
 
   /*
@@ -17401,7 +17412,7 @@
     addNonceToInlineStyleElements(fragment);
     const elements = getChildNodes(fragment);
     const scripts = getInlineScripts(fragment);
-    const scriptsUrls = getRemoteScriptsUrls(fragment);
+    const remoteScripts = getRemoteScripts(fragment);
 
     loadImages(fragment);
 
@@ -17415,7 +17426,7 @@
 
     executeInlineScripts(container, scripts);
 
-    return executeRemoteScripts(scriptsUrls);
+    return executeRemoteScripts(remoteScripts);
   };
 
   /*
@@ -20766,7 +20777,7 @@
    * @param {Object} data
    * @param {Logger} logger
    *
-   * @returns {Promise<void>}
+   * @returns {Promise<boolean>} Whether the data was successfully saved.
    */
   async function saveToIndexedDB(data, logger) {
     try {
@@ -20800,8 +20811,12 @@
         "Successfully saved web SDK config to IndexedDB",
         updatedConfigData,
       );
+
+      return true;
     } catch (error) {
       logger.error("Failed to save config to IndexedDB", { error });
+
+      return false;
     }
   }
 
@@ -20855,6 +20870,14 @@
     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$1({
       vapidPublicKey,
       window,
@@ -20867,7 +20890,7 @@
     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.",
       );
@@ -20875,8 +20898,6 @@
       return;
     }
 
-    storage.setItem(SUBSCRIPTION_DETAILS, cacheValue);
-
     const payload = await createSendPushSubscriptionPayload({
       eventManager,
       ecid,
@@ -20891,7 +20912,15 @@
     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);
+    }
   };
 
   /*