@scarlett-player/playlist 1.8.1 → 1.10.0

package/dist/index.cjs

@@ -37,6 +37,7 @@ __export(index_exports, {
   default: () => index_default
 });
 module.exports = __toCommonJS(index_exports);
+var import_core2 = require("@scarlett-player/core");
 
 // src/controls.ts
 var PLAYLIST_ICONS = {
@@ -197,6 +198,7 @@ var PlaylistPanel = class {
 };
 
 // src/styles.ts
+var import_core = require("@scarlett-player/core");
 var STYLE_ID = "sp-playlist-styles";
 var styles = `
 .sp-playlist-skip[disabled] {
@@ -298,18 +300,11 @@ var styles = `
 }
 `;
 function injectStyles() {
-  if (typeof document === "undefined" || document.getElementById(STYLE_ID)) {
-    return null;
-  }
-  const el = document.createElement("style");
-  el.id = STYLE_ID;
-  el.textContent = styles;
-  document.head.appendChild(el);
-  return el;
+  return (0, import_core.injectSharedStyles)(STYLE_ID, styles);
 }
 
 // src/version.ts
-var PKG_VERSION = true ? "1.8.1" : "0.0.0-dev";
+var PKG_VERSION = true ? "1.10.0" : "0.0.0-dev";
 
 // src/index.ts
 var DEFAULT_CONFIG = {
@@ -336,6 +331,9 @@ function shuffleArray(array) {
 function createPlaylistPlugin(config) {
   const mergedConfig = { ...DEFAULT_CONFIG, ...config };
   let api = null;
+  let releaseStyles = null;
+  let releaseControls = null;
+  let lifecycle = 0;
   let tracks = mergedConfig.tracks || [];
   let currentIndex = mergedConfig.initialIndex ?? -1;
   if (currentIndex < -1 || currentIndex >= tracks.length) {
@@ -430,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);
     }
@@ -451,20 +455,20 @@ 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;
     }
     const track = tracks[index];
     currentIndex = index;
-    api?.logger.info("Track changed", { index, title: track.title, src: track.src });
+    api?.logger.info("Track changed", { index, title: track.title, src: (0, import_core2.sanitizeUrl)(track.src) });
     api?.setState("title", track.title || "");
     api?.setState("poster", track.artwork || "");
     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 = {
@@ -474,10 +478,11 @@ function createPlaylistPlugin(config) {
     type: "feature",
     description: "Playlist management with shuffle, repeat, and gapless playback",
     async init(pluginApi) {
+      const generation = ++lifecycle;
       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;
@@ -485,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();
@@ -499,20 +506,31 @@ function createPlaylistPlugin(config) {
           api?.emit("playlist:ended", void 0);
         }
       });
-      injectStyles();
-      void import("@scarlett-player/ui").then(({ registerControl }) => {
+      releaseStyles = injectStyles();
+      const owner = api.container;
+      void import("@scarlett-player/ui").then(({ registerControl, unregisterControl }) => {
+        if (generation !== lifecycle) return;
         const self = plugin;
         registerControl(
           "playlist-previous",
-          () => new PlaylistSkipButton(self, "previous")
+          () => new PlaylistSkipButton(self, "previous"),
+          { owner }
         );
-        registerControl("playlist-next", () => new PlaylistSkipButton(self, "next"));
+        registerControl("playlist-next", () => new PlaylistSkipButton(self, "next"), {
+          owner
+        });
         registerControl(
           "playlist",
           () => new PlaylistPanel(self, {
             onSelect: (index) => self.play(index)
-          })
+          }),
+          { owner }
         );
+        releaseControls = () => {
+          unregisterControl("playlist-previous", { owner });
+          unregisterControl("playlist-next", { owner });
+          unregisterControl("playlist", { owner });
+        };
       }).catch(() => {
         api?.logger.debug("@scarlett-player/ui not present, playlist controls not registered");
       });
@@ -543,8 +561,13 @@ function createPlaylistPlugin(config) {
       });
     },
     async destroy() {
+      lifecycle++;
       api?.logger.info("Playlist plugin destroying");
       persistPlaylist();
+      releaseStyles?.();
+      releaseStyles = null;
+      releaseControls?.();
+      releaseControls = null;
       api = null;
     },
     add(trackOrTracks) {

package/dist/index.js

@@ -1,3 +1,6 @@
+// src/index.ts
+import { sanitizeUrl } from "@scarlett-player/core";
+
 // src/controls.ts
 var PLAYLIST_ICONS = {
   previous: '<svg viewBox="0 0 24 24" fill="currentColor" aria-hidden="true" focusable="false"><path d="M6 6h2v12H6V6zm3.5 6L18 6v12l-8.5-6z"/></svg>',
@@ -157,6 +160,7 @@ var PlaylistPanel = class {
 };
 
 // src/styles.ts
+import { injectSharedStyles } from "@scarlett-player/core";
 var STYLE_ID = "sp-playlist-styles";
 var styles = `
 .sp-playlist-skip[disabled] {
@@ -258,18 +262,11 @@ var styles = `
 }
 `;
 function injectStyles() {
-  if (typeof document === "undefined" || document.getElementById(STYLE_ID)) {
-    return null;
-  }
-  const el = document.createElement("style");
-  el.id = STYLE_ID;
-  el.textContent = styles;
-  document.head.appendChild(el);
-  return el;
+  return injectSharedStyles(STYLE_ID, styles);
 }
 
 // src/version.ts
-var PKG_VERSION = true ? "1.8.1" : "0.0.0-dev";
+var PKG_VERSION = true ? "1.10.0" : "0.0.0-dev";
 
 // src/index.ts
 var DEFAULT_CONFIG = {
@@ -296,6 +293,9 @@ function shuffleArray(array) {
 function createPlaylistPlugin(config) {
   const mergedConfig = { ...DEFAULT_CONFIG, ...config };
   let api = null;
+  let releaseStyles = null;
+  let releaseControls = null;
+  let lifecycle = 0;
   let tracks = mergedConfig.tracks || [];
   let currentIndex = mergedConfig.initialIndex ?? -1;
   if (currentIndex < -1 || currentIndex >= tracks.length) {
@@ -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,20 +417,20 @@ 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;
     }
     const track = tracks[index];
     currentIndex = index;
-    api?.logger.info("Track changed", { index, title: track.title, src: track.src });
+    api?.logger.info("Track changed", { index, title: track.title, src: sanitizeUrl(track.src) });
     api?.setState("title", track.title || "");
     api?.setState("poster", track.artwork || "");
     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 = {
@@ -434,10 +440,11 @@ function createPlaylistPlugin(config) {
     type: "feature",
     description: "Playlist management with shuffle, repeat, and gapless playback",
     async init(pluginApi) {
+      const generation = ++lifecycle;
       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;
@@ -445,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();
@@ -459,20 +468,31 @@ function createPlaylistPlugin(config) {
           api?.emit("playlist:ended", void 0);
         }
       });
-      injectStyles();
-      void import("@scarlett-player/ui").then(({ registerControl }) => {
+      releaseStyles = injectStyles();
+      const owner = api.container;
+      void import("@scarlett-player/ui").then(({ registerControl, unregisterControl }) => {
+        if (generation !== lifecycle) return;
         const self = plugin;
         registerControl(
           "playlist-previous",
-          () => new PlaylistSkipButton(self, "previous")
+          () => new PlaylistSkipButton(self, "previous"),
+          { owner }
         );
-        registerControl("playlist-next", () => new PlaylistSkipButton(self, "next"));
+        registerControl("playlist-next", () => new PlaylistSkipButton(self, "next"), {
+          owner
+        });
         registerControl(
           "playlist",
           () => new PlaylistPanel(self, {
             onSelect: (index) => self.play(index)
-          })
+          }),
+          { owner }
         );
+        releaseControls = () => {
+          unregisterControl("playlist-previous", { owner });
+          unregisterControl("playlist-next", { owner });
+          unregisterControl("playlist", { owner });
+        };
       }).catch(() => {
         api?.logger.debug("@scarlett-player/ui not present, playlist controls not registered");
       });
@@ -503,8 +523,13 @@ function createPlaylistPlugin(config) {
       });
     },
     async destroy() {
+      lifecycle++;
       api?.logger.info("Playlist plugin destroying");
       persistPlaylist();
+      releaseStyles?.();
+      releaseStyles = null;
+      releaseControls?.();
+      releaseControls = null;
       api = null;
     },
     add(trackOrTracks) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scarlett-player/playlist",
-  "version": "1.8.1",
+  "version": "1.10.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.8.1",
-    "@scarlett-player/ui": "1.8.1"
+    "@scarlett-player/core": "1.10.0",
+    "@scarlett-player/ui": "1.10.0"
   },
   "keywords": [
     "video",
@@ -65,6 +65,6 @@
     "dev": "tsup --watch",
     "test": "vitest --run",
     "test:watch": "vitest",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit -p tsconfig.typecheck.json"
   }
 }