saltfish 0.2.73 → 0.2.74

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

@@ -1525,6 +1525,36 @@ const useSaltfishStore = {
   subscribe: saltfishStore.subscribe,
   destroy: saltfishStore.destroy
 };
+const MAX_PROGRESS_AGE_MS = 6e3;
+function parseProgressTimestamp(progressData) {
+  if (!progressData) {
+    return null;
+  }
+  if (progressData.lastProgressAt && typeof progressData.lastProgressAt === "object" && "_seconds" in progressData.lastProgressAt && "_nanoseconds" in progressData.lastProgressAt) {
+    const firestoreTimestamp = progressData.lastProgressAt;
+    return firestoreTimestamp._seconds * 1e3 + Math.floor(firestoreTimestamp._nanoseconds / 1e6);
+  }
+  if (progressData.timestamp && typeof progressData.timestamp === "number") {
+    return progressData.timestamp;
+  }
+  if (progressData.lastProgressAt && typeof progressData.lastProgressAt === "number") {
+    return progressData.lastProgressAt;
+  }
+  return null;
+}
+function isProgressRecent(progressData, maxAgeMs = MAX_PROGRESS_AGE_MS) {
+  const timestampMs = parseProgressTimestamp(progressData);
+  if (!timestampMs) {
+    return { isValid: false, ageMs: null, timestampMs: null };
+  }
+  const currentTime = Date.now();
+  const ageMs = currentTime - timestampMs;
+  return {
+    isValid: ageMs <= maxAgeMs,
+    ageMs,
+    timestampMs
+  };
+}
 class ErrorHandler {
   /**
    * Handles an error with consistent logging, reporting, and response
@@ -2042,40 +2072,19 @@ class PlayerInitializationService {
     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]) => {
       if ((status == null ? void 0 : status.status) !== "in_progress") {
         return false;
       }
-      let timestampMs = null;
-      if (status.lastProgressAt && typeof status.lastProgressAt === "object" && "_seconds" in status.lastProgressAt && "_nanoseconds" in status.lastProgressAt) {
-        const firestoreTimestamp = status.lastProgressAt;
-        timestampMs = firestoreTimestamp._seconds * 1e3 + Math.floor(firestoreTimestamp._nanoseconds / 1e6);
-      } else if (status.timestamp && typeof status.timestamp === "number") {
-        timestampMs = status.timestamp;
-      } else if (status.lastProgressAt && typeof status.lastProgressAt === "number") {
-        timestampMs = status.lastProgressAt;
-      }
-      if (!timestampMs) {
-        return false;
-      }
-      const ageMs = currentTime - timestampMs;
-      if (ageMs > MAX_AGE_MS) {
+      const { isValid, ageMs } = isProgressRecent(status);
+      if (!isValid) {
         return false;
       }
       return true;
     });
     if (inProgressEntry) {
       const [playlistId, status] = inProgressEntry;
-      if ((status == null ? void 0 : status.lastProgressAt) && typeof status.lastProgressAt === "object" && "_seconds" in status.lastProgressAt && "_nanoseconds" in status.lastProgressAt) {
-        const firestoreTimestamp = status.lastProgressAt;
-        firestoreTimestamp._seconds * 1e3 + Math.floor(firestoreTimestamp._nanoseconds / 1e6);
-      } else if ((status == null ? void 0 : status.timestamp) && typeof status.timestamp === "number") {
-        status.timestamp;
-      } else if ((status == null ? void 0 : status.lastProgressAt) && typeof status.lastProgressAt === "number") {
-        status.lastProgressAt;
-      }
+      parseProgressTimestamp(status);
       try {
         if (this.playlistOrchestrator) {
           await this.playlistOrchestrator.startPlaylist(playlistId);
@@ -2997,9 +3006,10 @@ class StateMachineActionHandler {
       const completionPolicy = hasSpecialTransitions ? "manual" : "auto";
       if (hasSpecialTransitions) {
         log("StateMachineActionHandler: Setting up transitions immediately for step with special transitions");
-        this.managers.transitionManager.setupTransitions(currentStep, false);
+        this.managers.transitionManager.setupTransitions(currentStep, false, true);
       }
       this.managers.videoManager.setCompletionPolicy(completionPolicy, () => {
+        var _a;
         const store = useSaltfishStore.getState();
         if (!hasSpecialTransitions) {
           log("StateMachineActionHandler: Setting up transitions after video ended");
@@ -3014,10 +3024,38 @@ class StateMachineActionHandler {
             });
           }
         } else {
-          store.sendStateMachineEvent({
-            type: "VIDEO_FINISHED_WAIT",
-            step: currentStep
-          });
+          const timeoutTransition = currentStep.transitions.find((t) => t.type === "timeout");
+          const hasGotoButtonWithUrl = (_a = currentStep.buttons) == null ? void 0 : _a.some(
+            (button) => button.action.type === "goto" && button.action.url
+          );
+          if (timeoutTransition && !hasGotoButtonWithUrl) {
+            const timeout = timeoutTransition.timeout || 0;
+            log(`StateMachineActionHandler: Video ended, setting up timeout transition to ${timeoutTransition.nextStep} with ${timeout}ms delay`);
+            setTimeout(() => {
+              var _a2;
+              const currentStore = useSaltfishStore.getState();
+              if (currentStore.currentStepId === currentStep.id && (currentStore.currentState === "waitingForInteraction" || currentStore.currentState === "playing")) {
+                log(`StateMachineActionHandler: Timeout expired (${timeout}ms), transitioning to ${timeoutTransition.nextStep}`);
+                (_a2 = currentStore.goToStep) == null ? void 0 : _a2.call(currentStore, timeoutTransition.nextStep);
+              } else {
+                log(`StateMachineActionHandler: Timeout cancelled - step changed or state is ${currentStore.currentState}`);
+              }
+            }, timeout);
+            store.sendStateMachineEvent({
+              type: "VIDEO_FINISHED_WAIT",
+              step: currentStep
+            });
+          } else {
+            if (hasGotoButtonWithUrl) {
+              log("StateMachineActionHandler: Video ended, has goto button with URL redirect - waiting for user to click button");
+            } else {
+              log("StateMachineActionHandler: Video ended, waiting for user interaction");
+            }
+            store.sendStateMachineEvent({
+              type: "VIDEO_FINISHED_WAIT",
+              step: currentStep
+            });
+          }
         }
       });
       log("StateMachineActionHandler: Starting async video load");
@@ -7209,6 +7247,8 @@ class InteractionManager {
                 state.progress[state.manifest.id] = {
                   ...state.progress[state.manifest.id],
                   lastStepId: buttonConfig.action.target,
+                  lastProgressAt: Date.now(),
+                  // Use timestamp for 6-second rule
                   lastVisited: (/* @__PURE__ */ new Date()).toISOString()
                 };
               }
@@ -7962,17 +8002,20 @@ class TransitionManager {
    * Sets up transitions for a step
    * @param step - The step to set up transitions for
    * @param triggerImmediately - Whether to immediately trigger non-interaction transitions
+   * @param skipTimeouts - Whether to skip setting up timeout transitions (useful for manual policy steps)
    */
-  setupTransitions(step, triggerImmediately = false) {
+  setupTransitions(step, triggerImmediately = false, skipTimeouts = false) {
     this.cleanupTransitions();
-    log(`TransitionManager: Setting up transitions for step ${step.id}`);
+    log(`TransitionManager: Setting up transitions for step ${step.id}${skipTimeouts ? " (skipping timeouts)" : ""}`);
     step.transitions.forEach((transition) => {
       switch (transition.type) {
         case "dom-click":
           this.setupDOMClickTransition(transition);
           break;
         case "timeout":
-          this.setupTimeoutTransition(transition, triggerImmediately);
+          if (!skipTimeouts) {
+            this.setupTimeoutTransition(transition, triggerImmediately);
+          }
           break;
         case "url-path":
           this.setupURLPathTransition(transition);
@@ -8078,7 +8121,7 @@ class TransitionManager {
     let timeoutId = null;
     if (triggerImmediately) {
       this.triggerTransition(nextStepId);
-    } else if (timeout > 0) {
+    } else {
       timeoutId = window.setTimeout(() => {
         this.triggerTransition(nextStepId);
       }, timeout);
@@ -9382,11 +9425,16 @@ class PlaylistLoader {
       if (progressData.status === "completed") {
         startStepId = manifest.startStep;
       } else {
-        const lastStepId = progressData.currentStepId || progressData.lastStepId;
-        if (lastStepId) {
-          const savedStep = manifest.steps.find((step) => step.id === lastStepId);
-          if (savedStep) {
-            startStepId = lastStepId;
+        const { isValid, ageMs } = isProgressRecent(progressData);
+        if (!isValid) {
+          startStepId = manifest.startStep;
+        } else {
+          const lastStepId = progressData.currentStepId || progressData.lastStepId;
+          if (lastStepId) {
+            const savedStep = manifest.steps.find((step) => step.id === lastStepId);
+            if (savedStep) {
+              startStepId = lastStepId;
+            }
           }
         }
       }
@@ -10748,7 +10796,7 @@ const SaltfishPlayer$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.de
   __proto__: null,
   SaltfishPlayer
 }, Symbol.toStringTag, { value: "Module" }));
-const version = "0.2.73";
+const version = "0.2.74";
 const packageJson = {
   version
 };