saltfish 0.2.26 → 0.2.28

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

@@ -1427,16 +1427,7 @@ const saltfishStore = createStore()(
       },
       completePlaylist: () => {
         set2((state) => {
-          var _a, _b;
-          const { manifest } = state;
           state.currentState = transitionState({ type: "COMPLETE_PLAYLIST" });
-          const playlistPersistence = ((_a = state.playlistOptions) == null ? void 0 : _a.persistence) ?? true;
-          if (manifest && playlistPersistence) {
-            delete state.progress[manifest.id];
-            const userId = (_b = state.user) == null ? void 0 : _b.id;
-            storageManager.setProgress(state.progress, userId);
-            log(`Store: Removed completed playlist ${manifest.id} from localStorage`);
-          }
         });
       },
       // Add new method to reset playlist state while preserving config and user data
@@ -2923,11 +2914,20 @@ class StateMachineActionHandler {
       }
       this.managers.videoManager.setCompletionPolicy(completionPolicy, () => {
         if (context.currentStep) {
+          const store = useSaltfishStore.getState();
           if (!hasSpecialTransitions) {
             log("StateMachineActionHandler: Setting up transitions after video ended");
             this.managers.transitionManager.setupTransitions(context.currentStep, true);
+            const hasValidNextSteps = context.currentStep.transitions.some((transition) => {
+              return store.manifest.steps.some((s) => s.id === transition.nextStep);
+            });
+            if (!hasValidNextSteps) {
+              log("StateMachineActionHandler: No valid next steps found, completing playlist");
+              store.sendStateMachineEvent({
+                type: "COMPLETE_PLAYLIST"
+              });
+            }
           } else {
-            const store = useSaltfishStore.getState();
             store.sendStateMachineEvent({
               type: "VIDEO_FINISHED_WAIT",
               step: context.currentStep
@@ -3089,16 +3089,24 @@ class StateMachineActionHandler {
     }
   }
   handleTrackPlaylistComplete() {
+    var _a, _b;
     const store = useSaltfishStore.getState();
     if (store.manifest && this.managers.eventManager) {
-      log(`StateMachineActionHandler: Triggering playlistEnded event for playlist ${store.manifest.id}`);
+      const playlistId = store.manifest.id;
       this.managers.eventManager.trigger("playlistEnded", {
         timestamp: Date.now(),
         playlist: {
-          id: store.manifest.id,
+          id: playlistId,
           title: store.manifest.name
         }
       });
+      const playlistPersistence = ((_a = store.playlistOptions) == null ? void 0 : _a.persistence) ?? true;
+      if (playlistPersistence && store.progress[playlistId]) {
+        const updatedProgress = { ...store.progress };
+        delete updatedProgress[playlistId];
+        const userId = (_b = store.user) == null ? void 0 : _b.id;
+        this.managers.storageManager.setProgress(updatedProgress, userId);
+      }
     }
   }
   handleError(context) {
@@ -4918,74 +4926,14 @@ class VideoManager {
      * Handles video ended event for automatic completion policy
      */
     __publicField(this, "handleAutoVideoEnded", () => {
-      var _a;
-      const store = useSaltfishStore.getState();
-      const currentStepId = store.currentStepId;
-      if (!currentStepId || !store.manifest) {
-        return;
-      }
-      const currentStep = store.manifest.steps.find((step) => step.id === currentStepId);
-      if (!currentStep) {
-        return;
-      }
       if (this.videoEndedCallback) {
         this.videoEndedCallback();
       }
-      const hasExternalUrlButtons = ((_a = currentStep.buttons) == null ? void 0 : _a.some((button) => button.action.type === "url")) ?? false;
-      const stepIndex = store.manifest.steps.findIndex((s) => s.id === currentStep.id);
-      const isLastInSequence = stepIndex === store.manifest.steps.length - 1;
-      const hasValidNextSteps = currentStep.transitions.some((transition) => {
-        return store.manifest.steps.some((s) => s.id === transition.nextStep);
-      });
-      const isEffectivelyFinal = hasExternalUrlButtons || isLastInSequence || !hasValidNextSteps;
-      const hasUrlPathTransitions = currentStep.transitions.some((t) => t.type === "url-path");
-      const hasDomClickTransitions = currentStep.transitions.some((t) => t.type === "dom-click");
-      const hasDomElementVisibleTransitions = currentStep.transitions.some((t) => t.type === "dom-element-visible");
-      const hasButtons = currentStep.buttons && currentStep.buttons.length > 0;
-      if (hasUrlPathTransitions || hasDomClickTransitions || hasDomElementVisibleTransitions || hasButtons) {
-        if (isEffectivelyFinal && hasExternalUrlButtons) {
-          store.updateProgressWithCompletion(store.manifest.id, currentStepId);
-        }
-        return;
-      }
-      if (currentStep.transitions.length > 0) {
-        const defaultTransition = currentStep.transitions[0];
-        const nextStepId = defaultTransition.nextStep;
-        store.goToStep(nextStepId);
-      } else {
-        if (store.completePlaylist) {
-          store.completePlaylist();
-        } else {
-          store.goToStep("completed");
-        }
-      }
     });
     /**
      * Handles video ended event for manual completion policy
      */
     __publicField(this, "handleManualVideoEnded", () => {
-      var _a;
-      const store = useSaltfishStore.getState();
-      const currentStepId = store.currentStepId;
-      if (currentStepId && store.manifest && store.manifest.steps) {
-        const currentStep = store.manifest.steps.find((step) => step.id === currentStepId);
-        if (currentStep) {
-          const hasExternalUrlButtons = ((_a = currentStep.buttons) == null ? void 0 : _a.some((button) => button.action.type === "url")) ?? false;
-          const stepIndex = store.manifest.steps.findIndex((s) => s.id === currentStep.id);
-          const isLastInSequence = stepIndex === store.manifest.steps.length - 1;
-          const hasValidNextSteps = currentStep.transitions.some((transition) => {
-            return store.manifest.steps.some((s) => s.id === transition.nextStep);
-          });
-          const isEffectivelyFinal = hasExternalUrlButtons || isLastInSequence || !hasValidNextSteps;
-          if (isEffectivelyFinal && hasExternalUrlButtons) {
-            store.updateProgressWithCompletion(store.manifest.id, currentStepId);
-            if (this.videoEndedCallback) {
-              this.videoEndedCallback();
-            }
-            return;
-          }
-        }
-      }
       if (this.videoEndedCallback) {
         this.videoEndedCallback();
       }