saltfish 0.3.45 → 0.3.47

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

@@ -2460,8 +2460,7 @@ class PlaylistValidator {
         return { isValid: false, error: "Playlist not found in backend list" };
       }
       const hasTriggers = (foundPlaylist == null ? void 0 : foundPlaylist.hasTriggers) ?? (foundPlaylist == null ? void 0 : foundPlaylist.autoStart) ?? false;
-      const wasTriggered = (options == null ? void 0 : options._triggeredByTriggerManager) === true;
-      if (hasTriggers && wasTriggered) {
+      if (hasTriggers) {
         const triggerValidation = await this.validateTriggerConditions(
           playlistId,
           foundPlaylist,
@@ -2535,12 +2534,14 @@ class PlaylistValidator {
     const watchedPlaylists = ((_a = currentStore.userData) == null ? void 0 : _a.watchedPlaylists) || {};
     const hasTriggers = foundPlaylist.hasTriggers ?? foundPlaylist.autoStart ?? false;
     const playlistData = watchedPlaylists[playlistId];
-    if (hasTriggers && ((_b = foundPlaylist.triggers) == null ? void 0 : _b.once) && playlistData && (playlistData.status === "completed" || playlistData.status === "dismissed")) {
-      info(`Playlist ${playlistId} has hasTriggers enabled with once:true and has already been ${playlistData.status}. Skipping playlist start.`, {
+    const maxVisits = (_b = foundPlaylist.triggers) == null ? void 0 : _b.maxVisits;
+    const visitCount = (playlistData == null ? void 0 : playlistData.visitCount) ?? 0;
+    if (hasTriggers && maxVisits !== null && maxVisits !== void 0 && visitCount >= maxVisits) {
+      info(`Playlist ${playlistId} has hasTriggers enabled with maxVisits:${maxVisits} and user has ${visitCount} visits. Skipping playlist start.`, {
         watchedPlaylists,
         triggers: foundPlaylist.triggers
       });
-      return { isValid: false, error: `Playlist already ${playlistData.status} with once=true policy` };
+      return { isValid: false, error: `Playlist visit limit reached (${visitCount}/${maxVisits})` };
     }
     return { isValid: true };
   }
@@ -9664,7 +9665,7 @@ class TriggerManager {
     log(`TriggerManager: Registered ${this.triggeredPlaylists.length} playlists with triggers`);
     this.triggeredPlaylists.forEach((playlist) => {
       var _a, _b, _c, _d;
-      log(`TriggerManager: Registered trigger for playlist ${playlist.id} - URL: ${(_a = playlist.triggers) == null ? void 0 : _a.url}, ElementClick: ${(_b = playlist.triggers) == null ? void 0 : _b.elementClicked}, ElementVisible: ${(_c = playlist.triggers) == null ? void 0 : _c.elementVisible}, Once: ${(_d = playlist.triggers) == null ? void 0 : _d.once}`);
+      log(`TriggerManager: Registered trigger for playlist ${playlist.id} - URL: ${(_a = playlist.triggers) == null ? void 0 : _a.url}, ElementClick: ${(_b = playlist.triggers) == null ? void 0 : _b.elementClicked}, ElementVisible: ${(_c = playlist.triggers) == null ? void 0 : _c.elementVisible}, MaxVisits: ${(_d = playlist.triggers) == null ? void 0 : _d.maxVisits}`);
     });
     this.setupElementClickListeners();
     this.setupElementVisibleObservers();
@@ -9702,7 +9703,6 @@ class TriggerManager {
    * @param playlist - The playlist to evaluate triggers for
    */
   evaluatePlaylistTrigger(playlist) {
-    var _a, _b, _c;
     if (!playlist.triggers) {
       return;
     }
@@ -9716,15 +9716,16 @@ class TriggerManager {
       return;
     }
     const conditions = [];
-    const onceCondition = this.evaluateOnceCondition(triggers.once, playlistId, ((_a = store.userData) == null ? void 0 : _a.watchedPlaylists) || {});
-    conditions.push(onceCondition);
+    const watchedPlaylists = this.getWatchedPlaylists();
+    const maxVisitsCondition = this.evaluateMaxVisitsCondition(triggers.maxVisits, playlistId, watchedPlaylists);
+    conditions.push(maxVisitsCondition);
     const urlCondition = this.evaluateURLCondition(triggers);
     conditions.push(urlCondition);
     log(`TriggerManager: URL condition for playlist ${playlistId}: ${urlCondition} (pattern: ${triggers.url})`);
-    const playlistSeenCondition = this.evaluatePlaylistSeenCondition(triggers.playlistSeen, ((_b = store.userData) == null ? void 0 : _b.watchedPlaylists) || {});
+    const playlistSeenCondition = this.evaluatePlaylistSeenCondition(triggers.playlistSeen, watchedPlaylists);
     conditions.push(playlistSeenCondition);
     log(`TriggerManager: PlaylistSeen condition for playlist ${playlistId}: ${playlistSeenCondition} (required: ${JSON.stringify(triggers.playlistSeen)})`);
-    const playlistNotSeenCondition = this.evaluatePlaylistNotSeenCondition(triggers.playlistNotSeen, ((_c = store.userData) == null ? void 0 : _c.watchedPlaylists) || {});
+    const playlistNotSeenCondition = this.evaluatePlaylistNotSeenCondition(triggers.playlistNotSeen, watchedPlaylists);
     conditions.push(playlistNotSeenCondition);
     log(`TriggerManager: PlaylistNotSeen condition for playlist ${playlistId}: ${playlistNotSeenCondition} (forbidden: ${JSON.stringify(triggers.playlistNotSeen)})`);
     const elementClickedCondition = this.evaluateElementClickCondition(triggers.elementClicked);
@@ -9743,17 +9744,43 @@ class TriggerManager {
     }
   }
   /**
-   * Evaluates the 'once' condition for a playlist
-   * @param once - Whether playlist should only trigger once per user
+   * Gets watched playlists from backend userData or localStorage (for anonymous users)
+   * @returns WatchedPlaylists object
+   */
+  getWatchedPlaylists() {
+    var _a, _b;
+    const store = getSaltfishStore();
+    if (((_a = store.userData) == null ? void 0 : _a.watchedPlaylists) && Object.keys(store.userData.watchedPlaylists).length > 0) {
+      return store.userData.watchedPlaylists;
+    }
+    const storageManager2 = StorageManager.getInstance();
+    const progressData = storageManager2.getProgress((_b = store.user) == null ? void 0 : _b.id);
+    if (!progressData) {
+      return {};
+    }
+    const watchedPlaylists = {};
+    for (const playlistId of Object.keys(progressData)) {
+      watchedPlaylists[playlistId] = {
+        status: "in_progress",
+        timestamp: Date.now()
+      };
+    }
+    log(`TriggerManager: Built watchedPlaylists from localStorage: ${JSON.stringify(Object.keys(watchedPlaylists))}`);
+    return watchedPlaylists;
+  }
+  /**
+   * Evaluates the 'maxVisits' condition for a playlist
+   * @param maxVisits - Maximum number of times user can see this playlist (null = unlimited)
    * @param playlistId - The playlist ID to check
    * @param watchedPlaylists - User's watched playlists data
    */
-  evaluateOnceCondition(once, playlistId, watchedPlaylists) {
-    if (!once) {
+  evaluateMaxVisitsCondition(maxVisits, playlistId, watchedPlaylists) {
+    if (maxVisits === null) {
       return true;
     }
-    const hasWatched = watchedPlaylists && watchedPlaylists[playlistId];
-    return !hasWatched;
+    const playlistData = watchedPlaylists && watchedPlaylists[playlistId];
+    const visitCount = (playlistData == null ? void 0 : playlistData.visitCount) ?? 0;
+    return visitCount < maxVisits;
   }
   /**
    * Normalizes a URL by removing trailing slash (unless it's the root path)
@@ -10660,14 +10687,19 @@ class PlaylistManager extends EventSubscriberManager {
       const store = getSaltfishStore();
       const currentUserData = store.userData || {};
       const currentWatchedPlaylists = currentUserData.watchedPlaylists || {};
+      const existingPlaylistData = currentWatchedPlaylists[playlistId];
+      const previousStatus = existingPlaylistData == null ? void 0 : existingPlaylistData.status;
+      const currentVisitCount = (existingPlaylistData == null ? void 0 : existingPlaylistData.visitCount) ?? 0;
+      const shouldIncrementVisitCount = (status === "completed" || status === "dismissed") && previousStatus !== status;
       const updatedPlaylistData = {
         status,
         // Don't save currentStepId for completed playlists - they should restart from beginning
         currentStepId: status === "completed" ? null : currentStepId || store.currentStepId || null,
         timestamp: Date.now(),
         // Use timestamp for consistency with checkAndResumeInProgressPlaylist
-        lastProgressAt: Date.now()
+        lastProgressAt: Date.now(),
         // Keep for backward compatibility
+        visitCount: shouldIncrementVisitCount ? currentVisitCount + 1 : currentVisitCount
       };
       const updatedWatchedPlaylists = {
         ...currentWatchedPlaylists,
@@ -10726,13 +10758,18 @@ class PlaylistManager extends EventSubscriberManager {
     if (!anonymousUserData.watchedPlaylists) {
       anonymousUserData.watchedPlaylists = {};
     }
+    const existingPlaylistData = anonymousUserData.watchedPlaylists[playlistId];
+    const previousStatus = existingPlaylistData == null ? void 0 : existingPlaylistData.status;
+    const currentVisitCount = (existingPlaylistData == null ? void 0 : existingPlaylistData.visitCount) ?? 0;
+    const shouldIncrementVisitCount = (status === "completed" || status === "dismissed") && previousStatus !== status;
     anonymousUserData.watchedPlaylists[playlistId] = {
       status,
       currentStepId: currentStepId || null,
       timestamp: Date.now(),
       // Use timestamp for consistency with checkAndResumeInProgressPlaylist
-      lastProgressAt: Date.now()
+      lastProgressAt: Date.now(),
       // Keep for backward compatibility
+      visitCount: shouldIncrementVisitCount ? currentVisitCount + 1 : currentVisitCount
     };
     anonymousUserData.timestamp = Date.now();
     this.storageManager.setAnonymousUserData(anonymousUserData);
@@ -12001,7 +12038,7 @@ const SaltfishPlayer$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.de
   __proto__: null,
   SaltfishPlayer
 }, Symbol.toStringTag, { value: "Module" }));
-const version = "0.3.45";
+const version = "0.3.47";
 const packageJson = {
   version
 };