@scarlett-player/playlist 1.9.0 → 1.11.0

package/dist/index.cjs

@@ -304,7 +304,7 @@ function injectStyles() {
 }
 
 // src/version.ts
-var PKG_VERSION = true ? "1.9.0" : "0.0.0-dev";
+var PKG_VERSION = true ? "1.11.0" : "0.0.0-dev";
 
 // src/index.ts
 var DEFAULT_CONFIG = {
@@ -428,18 +428,24 @@ function createPlaylistPlugin(config) {
       api?.logger.warn("Failed to persist playlist", e);
     }
   };
+  const isTrack = (t) => typeof t === "object" && t !== null && typeof t.src === "string";
   const loadPersistedPlaylist = () => {
     if (!mergedConfig.persist) return;
+    if (mergedConfig.tracks !== void 0) return;
     try {
       const data = localStorage.getItem(mergedConfig.persistKey);
-      if (data) {
-        const parsed = JSON.parse(data);
-        tracks = parsed.tracks || [];
-        currentIndex = parsed.currentIndex ?? -1;
-        shuffle = parsed.shuffle ?? false;
-        repeat = parsed.repeat ?? "none";
-        shuffleOrder = parsed.shuffleOrder || [];
-      }
+      if (!data) return;
+      const parsed = JSON.parse(data);
+      const restored = Array.isArray(parsed.tracks) ? parsed.tracks.filter(isTrack) : [];
+      if (restored.length === 0) return;
+      tracks = restored;
+      const index = Number.isInteger(parsed.currentIndex) ? parsed.currentIndex : -1;
+      currentIndex = index >= 0 ? Math.min(index, tracks.length - 1) : -1;
+      shuffle = parsed.shuffle === true;
+      repeat = parsed.repeat === "one" || parsed.repeat === "all" ? parsed.repeat : "none";
+      shuffleOrder = Array.isArray(parsed.shuffleOrder) ? parsed.shuffleOrder.filter(
+        (n) => typeof n === "number" && n >= 0 && n < tracks.length
+      ) : [];
     } catch (e) {
       api?.logger.warn("Failed to load persisted playlist", e);
     }
@@ -449,7 +455,7 @@ function createPlaylistPlugin(config) {
     api?.emit("playlist:change", { track, index: currentIndex });
     persistPlaylist();
   };
-  const setCurrentTrack = (index) => {
+  const setCurrentTrack = (index, options = {}) => {
     if (index < 0 || index >= tracks.length) {
       api?.logger.warn("Invalid track index", { index });
       return;
@@ -462,7 +468,7 @@ function createPlaylistPlugin(config) {
     api?.setState("mediaType", track.type || "audio");
     emitChange();
     if (mergedConfig.autoLoad !== false && track.src) {
-      api?.emit("media:load-request", { src: track.src, autoplay: true });
+      api?.emit("media:load-request", { src: track.src, autoplay: options.autoplay ?? true });
     }
   };
   const plugin = {
@@ -476,7 +482,7 @@ function createPlaylistPlugin(config) {
       api = pluginApi;
       api.logger.info("Playlist plugin initialized");
       loadPersistedPlaylist();
-      if (shuffle && tracks.length > 0) {
+      if (shuffle && tracks.length > 0 && shuffleOrder.length !== tracks.length) {
         generateShuffleOrder();
       }
       let advanceTimeout = null;
@@ -484,11 +490,13 @@ function createPlaylistPlugin(config) {
         if (!mergedConfig.autoAdvance) return;
         const nextIdx = getNextIndex();
         if (nextIdx >= 0) {
+          const wasPlaying = !api?.getState("paused");
           const advance = () => {
             api?.logger.debug("Auto-advancing to next track", { nextIdx });
-            setCurrentTrack(nextIdx);
+            setCurrentTrack(nextIdx, { autoplay: wasPlaying });
           };
           if (mergedConfig.advanceDelay) {
+            if (advanceTimeout) clearTimeout(advanceTimeout);
             advanceTimeout = setTimeout(advance, mergedConfig.advanceDelay);
           } else {
             advance();

package/dist/index.js

@@ -266,7 +266,7 @@ function injectStyles() {
 }
 
 // src/version.ts
-var PKG_VERSION = true ? "1.9.0" : "0.0.0-dev";
+var PKG_VERSION = true ? "1.11.0" : "0.0.0-dev";
 
 // src/index.ts
 var DEFAULT_CONFIG = {
@@ -390,18 +390,24 @@ function createPlaylistPlugin(config) {
       api?.logger.warn("Failed to persist playlist", e);
     }
   };
+  const isTrack = (t) => typeof t === "object" && t !== null && typeof t.src === "string";
   const loadPersistedPlaylist = () => {
     if (!mergedConfig.persist) return;
+    if (mergedConfig.tracks !== void 0) return;
     try {
       const data = localStorage.getItem(mergedConfig.persistKey);
-      if (data) {
-        const parsed = JSON.parse(data);
-        tracks = parsed.tracks || [];
-        currentIndex = parsed.currentIndex ?? -1;
-        shuffle = parsed.shuffle ?? false;
-        repeat = parsed.repeat ?? "none";
-        shuffleOrder = parsed.shuffleOrder || [];
-      }
+      if (!data) return;
+      const parsed = JSON.parse(data);
+      const restored = Array.isArray(parsed.tracks) ? parsed.tracks.filter(isTrack) : [];
+      if (restored.length === 0) return;
+      tracks = restored;
+      const index = Number.isInteger(parsed.currentIndex) ? parsed.currentIndex : -1;
+      currentIndex = index >= 0 ? Math.min(index, tracks.length - 1) : -1;
+      shuffle = parsed.shuffle === true;
+      repeat = parsed.repeat === "one" || parsed.repeat === "all" ? parsed.repeat : "none";
+      shuffleOrder = Array.isArray(parsed.shuffleOrder) ? parsed.shuffleOrder.filter(
+        (n) => typeof n === "number" && n >= 0 && n < tracks.length
+      ) : [];
     } catch (e) {
       api?.logger.warn("Failed to load persisted playlist", e);
     }
@@ -411,7 +417,7 @@ function createPlaylistPlugin(config) {
     api?.emit("playlist:change", { track, index: currentIndex });
     persistPlaylist();
   };
-  const setCurrentTrack = (index) => {
+  const setCurrentTrack = (index, options = {}) => {
     if (index < 0 || index >= tracks.length) {
       api?.logger.warn("Invalid track index", { index });
       return;
@@ -424,7 +430,7 @@ function createPlaylistPlugin(config) {
     api?.setState("mediaType", track.type || "audio");
     emitChange();
     if (mergedConfig.autoLoad !== false && track.src) {
-      api?.emit("media:load-request", { src: track.src, autoplay: true });
+      api?.emit("media:load-request", { src: track.src, autoplay: options.autoplay ?? true });
     }
   };
   const plugin = {
@@ -438,7 +444,7 @@ function createPlaylistPlugin(config) {
       api = pluginApi;
       api.logger.info("Playlist plugin initialized");
       loadPersistedPlaylist();
-      if (shuffle && tracks.length > 0) {
+      if (shuffle && tracks.length > 0 && shuffleOrder.length !== tracks.length) {
         generateShuffleOrder();
       }
       let advanceTimeout = null;
@@ -446,11 +452,13 @@ function createPlaylistPlugin(config) {
         if (!mergedConfig.autoAdvance) return;
         const nextIdx = getNextIndex();
         if (nextIdx >= 0) {
+          const wasPlaying = !api?.getState("paused");
           const advance = () => {
             api?.logger.debug("Auto-advancing to next track", { nextIdx });
-            setCurrentTrack(nextIdx);
+            setCurrentTrack(nextIdx, { autoplay: wasPlaying });
           };
           if (mergedConfig.advanceDelay) {
+            if (advanceTimeout) clearTimeout(advanceTimeout);
             advanceTimeout = setTimeout(advance, mergedConfig.advanceDelay);
           } else {
             advance();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scarlett-player/playlist",
-  "version": "1.9.0",
+  "version": "1.11.0",
   "description": "Playlist Plugin for Scarlett Player - Queue management, shuffle, repeat, and gapless playback",
   "type": "module",
   "main": "dist/index.cjs",
@@ -22,16 +22,16 @@
     "dist"
   ],
   "peerDependencies": {
-    "@scarlett-player/core": "^1.8.0",
-    "@scarlett-player/ui": "^1.8.0"
+    "@scarlett-player/core": "^1.9.0",
+    "@scarlett-player/ui": "^1.9.0"
   },
   "devDependencies": {
     "tsup": "^8.0.0",
     "typescript": "^5.3.0",
     "vitest": "^1.6.0",
     "jsdom": "^24.0.0",
-    "@scarlett-player/core": "1.9.0",
-    "@scarlett-player/ui": "1.9.0"
+    "@scarlett-player/core": "1.11.0",
+    "@scarlett-player/ui": "1.11.0"
   },
   "keywords": [
     "video",