saltfish 0.2.23 → 0.2.25

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

@@ -2066,7 +2066,7 @@ class PlayerInitializationService {
       return false;
     }
     const currentTime = Date.now();
-    const MAX_AGE_MS = 1e4;
+    const MAX_AGE_MS = 4e3;
     const inProgressEntry = Object.entries(watchedPlaylists).find(([playlistId, status]) => {
       if ((status == null ? void 0 : status.status) !== "in_progress") {
         return false;
@@ -8404,6 +8404,16 @@ class TriggerManager {
     const hasWatched = watchedPlaylists && watchedPlaylists[playlistId];
     return !hasWatched;
   }
+  /**
+   * Normalizes a URL by removing trailing slash (unless it's the root path)
+   * @param url - The URL to normalize
+   */
+  normalizeUrl(url) {
+    if (url.endsWith("/") && url.lastIndexOf("/") > url.indexOf("://") + 2) {
+      return url.slice(0, -1);
+    }
+    return url;
+  }
   /**
    * Evaluates the URL condition for a playlist
    * @param triggers - The trigger configuration containing URL pattern and match type
@@ -8413,7 +8423,7 @@ class TriggerManager {
     if (!pattern) {
       return true;
     }
-    const currentUrl = window.location.href.split("#")[0];
+    const currentUrl = this.normalizeUrl(window.location.href.split("#")[0]);
     const currentPath = window.location.pathname;
     if (triggers.urlMatchType === "regex") {
       try {
@@ -8430,6 +8440,9 @@ class TriggerManager {
       pattern = "*" + pattern + "*";
     }
     const hasWildcards = pattern.includes("*");
+    if (!hasWildcards && (!triggers.urlMatchType || triggers.urlMatchType === "exact" || triggers.urlMatchType === "contains")) {
+      pattern = this.normalizeUrl(pattern);
+    }
     const escapedPattern = pattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     let regexPattern = escapedPattern.replace(/\\\*/g, ".*");
     if (!hasWildcards) {