saltfish 0.3.70 → 0.3.71

package/dist/saltfish-playlist-player.es.js

@@ -1905,6 +1905,72 @@ const THRESHOLDS = {
   /** Minimum scroll distance in pixels to trigger scroll events */
   SCROLL_THRESHOLD_PX: 10
 };
+function stripShareIdFromUrl(url) {
+  try {
+    let cleanedUrl = url.replace(/[?&]saltfish-share-id=[^&#]*/g, (match, offset) => {
+      if (match.startsWith("?")) {
+        const afterMatch = url.substring(offset + match.length);
+        if (afterMatch.startsWith("&")) {
+          return "?";
+        }
+        return "";
+      }
+      return "";
+    });
+    cleanedUrl = cleanedUrl.replace(/\?&/g, "?");
+    cleanedUrl = cleanedUrl.replace(/&&/g, "&");
+    cleanedUrl = cleanedUrl.replace(/\?$/g, "");
+    cleanedUrl = cleanedUrl.replace(/&$/g, "");
+    return cleanedUrl;
+  } catch (error2) {
+    return url;
+  }
+}
+function validateUrlRequirement(urlRequirement) {
+  const { pattern, matchType } = urlRequirement;
+  if (!pattern) {
+    return true;
+  }
+  const currentUrl = stripShareIdFromUrl(window.location.href);
+  const currentPath = window.location.pathname;
+  if (matchType === "regex") {
+    try {
+      const regex = new RegExp(pattern);
+      const fullUrlMatch = regex.test(currentUrl);
+      const pathMatch = regex.test(currentPath);
+      const matches2 = fullUrlMatch || pathMatch;
+      log(`urlValidation: Result (regex) - matches: ${matches2}`);
+      return matches2;
+    } catch (error2) {
+      return false;
+    }
+  }
+  if (matchType === "contains") {
+    const matches2 = currentUrl.includes(pattern) || currentPath.includes(pattern);
+    return matches2;
+  }
+  const matches = currentUrl === pattern || currentPath === pattern;
+  return matches;
+}
+async function validateUrlRequirementWithRetry(urlRequirement, maxRetries = 20, retryDelay = 100) {
+  if (!urlRequirement) {
+    return true;
+  }
+  for (let attempt = 0; attempt < maxRetries; attempt++) {
+    if (validateUrlRequirement(urlRequirement)) {
+      return true;
+    }
+    if (attempt < maxRetries - 1) {
+      await new Promise((resolve) => setTimeout(resolve, retryDelay));
+      const saltfishPlayer = window._saltfishPlayer;
+      if (!saltfishPlayer) {
+        return false;
+      }
+    }
+  }
+  log(`urlValidation: Expected pattern: '${urlRequirement.pattern}' (matchType: ${urlRequirement.matchType})`);
+  return false;
+}
 class PlayerInitializationService {
   constructor(managers) {
     __publicField(this, "managers");
@@ -2282,7 +2348,7 @@ class PlayerInitializationService {
     if (!pattern || typeof window === "undefined") {
       return false;
     }
-    const currentUrl = window.location.href;
+    const currentUrl = stripShareIdFromUrl(window.location.href);
     const currentPath = window.location.pathname;
     const escapedPattern = pattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     const regexPattern = escapedPattern.replace(/\\\*/g, ".*");
@@ -3012,51 +3078,6 @@ class PlaylistOrchestrator {
   destroy() {
   }
 }
-function validateUrlRequirement(urlRequirement) {
-  const { pattern, matchType } = urlRequirement;
-  if (!pattern) {
-    return true;
-  }
-  const currentUrl = window.location.href;
-  const currentPath = window.location.pathname;
-  if (matchType === "regex") {
-    try {
-      const regex = new RegExp(pattern);
-      const fullUrlMatch = regex.test(currentUrl);
-      const pathMatch = regex.test(currentPath);
-      const matches2 = fullUrlMatch || pathMatch;
-      log(`urlValidation: Result (regex) - matches: ${matches2}`);
-      return matches2;
-    } catch (error2) {
-      return false;
-    }
-  }
-  if (matchType === "contains") {
-    const matches2 = currentUrl.includes(pattern) || currentPath.includes(pattern);
-    return matches2;
-  }
-  const matches = currentUrl === pattern || currentPath === pattern;
-  return matches;
-}
-async function validateUrlRequirementWithRetry(urlRequirement, maxRetries = 20, retryDelay = 100) {
-  if (!urlRequirement) {
-    return true;
-  }
-  for (let attempt = 0; attempt < maxRetries; attempt++) {
-    if (validateUrlRequirement(urlRequirement)) {
-      return true;
-    }
-    if (attempt < maxRetries - 1) {
-      await new Promise((resolve) => setTimeout(resolve, retryDelay));
-      const saltfishPlayer = window._saltfishPlayer;
-      if (!saltfishPlayer) {
-        return false;
-      }
-    }
-  }
-  log(`urlValidation: Expected pattern: '${urlRequirement.pattern}' (matchType: ${urlRequirement.matchType})`);
-  return false;
-}
 class StateMachineActionHandler {
   constructor(managers) {
     __publicField(this, "managers");
@@ -9726,7 +9747,7 @@ class TransitionManager {
     if (!pattern) {
       return false;
     }
-    const currentUrl = window.location.href;
+    const currentUrl = stripShareIdFromUrl(window.location.href);
     const currentPath = window.location.pathname;
     const escapedPattern = pattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     const regexPattern = escapedPattern.replace(/\\\*/g, ".*");
@@ -10241,7 +10262,7 @@ class TriggerManager {
     if (!pattern) {
       return true;
     }
-    const currentUrl = this.normalizeUrl(window.location.href.split("#")[0]);
+    const currentUrl = this.normalizeUrl(stripShareIdFromUrl(window.location.href.split("#")[0]));
     const currentPath = window.location.pathname;
     if (triggers.urlMatchType === "regex") {
       try {
@@ -12569,7 +12590,7 @@ const SaltfishPlayer$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.de
   __proto__: null,
   SaltfishPlayer
 }, Symbol.toStringTag, { value: "Module" }));
-const version = "0.3.70";
+const version = "0.3.71";
 const packageJson = {
   version
 };