saltfish 0.2.66 → 0.2.68

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

@@ -2012,9 +2012,16 @@ class PlayerInitializationService {
    * Check for in-progress playlists and resume them
    */
   async checkAndResumeInProgressPlaylist(watchedPlaylists) {
+    var _a;
     if (!watchedPlaylists) {
       return false;
     }
+    const store = useSaltfishStore.getState();
+    const currentManifestId = (_a = store.manifest) == null ? void 0 : _a.id;
+    const currentState = store.currentState;
+    if (currentManifestId && currentState !== "idle" && currentState !== "error") {
+      return false;
+    }
     const currentTime = Date.now();
     const MAX_AGE_MS = 6e3;
     const inProgressEntry = Object.entries(watchedPlaylists).find(([playlistId, status]) => {
@@ -7836,28 +7843,38 @@ class TransitionManager {
      * Handles URL changes by checking active URL path transitions and playlist triggers
      */
     __publicField(this, "handleURLChange", () => {
-      const isValidUrl = this.validateCurrentStepUrl();
-      if (!isValidUrl) {
-        return;
-      }
-      if (this.triggerManager) {
-        this.triggerManager.evaluateAllTriggers();
-      }
       const urlPathTransitions = Array.from(this.activeTransitions.entries()).filter(([_, transition]) => {
         var _a;
         return ((_a = transition.data) == null ? void 0 : _a.type) === "url-path";
       });
-      if (urlPathTransitions.length === 0) {
-        return;
+      let hasValidTransition = false;
+      if (urlPathTransitions.length > 0) {
+        for (const [_, transition] of urlPathTransitions) {
+          if (transition.data && this.isURLPathMatch(transition.data.pattern)) {
+            hasValidTransition = true;
+            break;
+          }
+        }
       }
-      for (const [_, transition] of urlPathTransitions) {
-        if (!transition.data) {
-          continue;
+      if (!hasValidTransition) {
+        const isValidUrl = this.validateCurrentStepUrl();
+        if (!isValidUrl) {
+          return;
         }
-        const { pattern, nextStepId } = transition.data;
-        if (this.isURLPathMatch(pattern)) {
-          this.triggerTransition(nextStepId);
-          break;
+      }
+      if (this.triggerManager) {
+        this.triggerManager.evaluateAllTriggers();
+      }
+      if (hasValidTransition) {
+        for (const [_, transition] of urlPathTransitions) {
+          if (!transition.data) {
+            continue;
+          }
+          const { pattern, nextStepId } = transition.data;
+          if (this.isURLPathMatch(pattern)) {
+            this.triggerTransition(nextStepId);
+            break;
+          }
         }
       }
     });
@@ -10676,7 +10693,7 @@ const SaltfishPlayer$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.de
   __proto__: null,
   SaltfishPlayer
 }, Symbol.toStringTag, { value: "Module" }));
-const version = "0.2.66";
+const version = "0.2.68";
 const packageJson = {
   version
 };