@scarlett-player/embed 1.5.1 → 1.7.0

package/dist/embed.audio.js

@@ -149,6 +149,7 @@ class StateManager {
     this.signals = /* @__PURE__ */ new Map();
     this.changeSubscribers = /* @__PURE__ */ new Set();
     this.definedDefaults = /* @__PURE__ */ new Map();
+    this.destroyed = false;
     this.initializeSignals(initialState);
   }
   /**
@@ -209,6 +210,7 @@ class StateManager {
    *
    * @param key - State property key
    * @returns Signal for the property
+   * @throws If the manager has been destroyed, or the key was never registered
    *
    * @example
    * ```ts
@@ -218,6 +220,9 @@ class StateManager {
    * ```
    */
   get(key) {
+    if (this.destroyed) {
+      throw new Error(`[StateManager] Manager is destroyed (reading '${key}')`);
+    }
     const stateSignal = this.signals.get(key);
     if (!stateSignal) {
       throw new Error(`[StateManager] Unknown state key: ${key}`);
@@ -229,6 +234,7 @@ class StateManager {
    *
    * @param key - State property key
    * @returns Current value
+   * @throws If the manager has been destroyed, or the key was never registered
    *
    * @example
    * ```ts
@@ -396,6 +402,11 @@ class StateManager {
   /**
    * Destroy the state manager and cleanup all signals.
    *
+   * After this, every read or write ({@link get}, {@link getValue},
+   * {@link set}) throws a destroyed-specific error. Returning last-known
+   * values instead was considered and rejected: it silently masks the
+   * lifecycle bugs this throw exposes.
+   *
    * @example
    * ```ts
    * state.destroy();
@@ -405,6 +416,7 @@ class StateManager {
     this.signals.forEach((stateSignal) => stateSignal.destroy());
     this.signals.clear();
     this.changeSubscribers.clear();
+    this.destroyed = true;
   }
 }
 const DEFAULT_OPTIONS = {
@@ -1629,6 +1641,7 @@ class ScarlettPlayer {
     this.eventBus.on("media:load-request", async ({ src, autoplay }) => {
       if (this.stateManager.getValue("chromecastActive")) return;
       await this.load(src);
+      if (this.destroyed) return;
       if (autoplay !== false) {
         await this.play();
       }
@@ -1637,12 +1650,14 @@ class ScarlettPlayer {
       const was_live = this.stateManager.getValue("live");
       const resume_at = this.stateManager.getValue("currentTime");
       await this.load(src);
+      if (this.destroyed) return;
       if (this.stateManager.getValue("error")) return;
       if (was_live) {
         this.seekToLive();
       } else if (resume_at > 0) {
         this.seek(resume_at);
       }
+      if (this.destroyed) return;
       await this.play();
     });
     if (this.initialSrc) {
@@ -2140,6 +2155,7 @@ class ScarlettPlayer {
       return;
     }
     this.logger.info("Destroying player");
+    this.loadGeneration++;
     if (this.seekResumeTimeout !== null) {
       clearTimeout(this.seekResumeTimeout);
       this.seekResumeTimeout = null;
@@ -2287,6 +2303,15 @@ var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
+function sanitizeUrl(url) {
+  if (!url) return void 0;
+  try {
+    const parsed = new URL(url);
+    return `${parsed.origin}${parsed.pathname}`;
+  } catch {
+    return void 0;
+  }
+}
 function formatLevel(level) {
   if (level.name) {
     return level.name;
@@ -2708,6 +2733,8 @@ function createHLSPluginWith(loader, variant, config) {
   let reconnectWindowStart = 0;
   let reconnectResumePosition = 0;
   let onlineListener = null;
+  let reconnectTriggerError = null;
+  let reconnectExhausted = false;
   const getOrCreateVideo = () => {
     if (video) return video;
     const existing = api?.container.querySelector("video");
@@ -2816,6 +2843,22 @@ function createHLSPluginWith(loader, variant, config) {
         return ErrorCode.PLAYBACK_FAILED;
     }
   };
+  const buildErrorDetail = (error, retriesExhausted) => {
+    const attempts = error.type === "network" ? networkRetryCount : error.type === "media" ? mediaRetryCount : 0;
+    const detail = {
+      type: error.type,
+      retriesExhausted,
+      attempts
+    };
+    if (typeof error.response?.code === "number" && error.response.code > 0) {
+      detail.httpStatus = error.response.code;
+    }
+    const url = sanitizeUrl(error.url);
+    if (url) {
+      detail.url = url;
+    }
+    return detail;
+  };
   const emitFatalError = (error, retriesExhausted) => {
     const message = retriesExhausted ? `HLS error: ${error.details} (max retries exceeded)` : `HLS error: ${error.details}`;
     api?.logger.error(message, { type: error.type, details: error.details });
@@ -2825,7 +2868,8 @@ function createHLSPluginWith(loader, variant, config) {
       code: mapFatalErrorCode(error),
       message,
       fatal: true,
-      timestamp: Date.now()
+      timestamp: Date.now(),
+      detail: buildErrorDetail(error, retriesExhausted)
     });
     maybeScheduleReconnect(error);
   };
@@ -2902,6 +2946,62 @@ function createHLSPluginWith(loader, variant, config) {
     }
     return false;
   };
+  const handleNativeFatalError = (error, resumePosition) => {
+    const is_network = error.type === "network";
+    const max_retries = is_network ? mergedConfig.maxNetworkRetries ?? 3 : mergedConfig.maxMediaRetries ?? 2;
+    const used = is_network ? networkRetryCount : mediaRetryCount;
+    if (!currentSrc || used >= max_retries) {
+      emitFatalError(error, used >= max_retries);
+      return;
+    }
+    const resume_position = resumePosition ?? video?.currentTime ?? 0;
+    if (is_network) {
+      networkRetryCount++;
+    } else {
+      mediaRetryCount++;
+    }
+    const attempt = used + 1;
+    const delay = getRetryDelay(attempt - 1);
+    api?.logger.info(
+      `Attempting native ${error.type} error recovery (attempt ${attempt}/${max_retries}) in ${delay}ms`
+    );
+    api?.emit(is_network ? "error:network" : "error:media", {
+      error: new Error(error.details)
+    });
+    if (retryTimeout) {
+      clearTimeout(retryTimeout);
+    }
+    const retry_session = loadSession;
+    retryTimeout = setTimeout(() => {
+      if (retry_session !== loadSession) return;
+      void recoverNative(error, resume_position);
+    }, delay);
+  };
+  const recoverNative = async (error, resumePosition) => {
+    if (!currentSrc) return;
+    const session = ++loadSession;
+    const saved_src = currentSrc;
+    const was_live = api?.getState("live") ?? false;
+    try {
+      teardownPipeline(new Error("HLS load cancelled: native error recovery"));
+      api?.setState("playbackState", "loading");
+      await loadNative(saved_src);
+      if (session !== loadSession) return;
+      if (!was_live && video && resumePosition > 0) {
+        video.currentTime = resumePosition;
+      }
+      api?.setState("playbackState", "ready");
+      api?.setState("buffering", false);
+      try {
+        await video?.play();
+      } catch {
+      }
+    } catch {
+      if (session !== loadSession) return;
+      api?.logger.warn("Native error recovery attempt failed");
+      handleNativeFatalError(error, resumePosition);
+    }
+  };
   const loadNative = async (src) => {
     const session = loadSession;
     const videoEl = getOrCreateVideo();
@@ -2943,12 +3043,24 @@ function createHLSPluginWith(loader, variant, config) {
           const media_error = videoEl.error;
           const hls_error = {
             type: media_error?.code === MediaError.MEDIA_ERR_NETWORK ? "network" : "media",
-            details: media_error?.message || "Native HLS playback error"
+            details: media_error?.message || "Native HLS playback error",
+            fatal: true
           };
-          emitFatalError(hls_error, false);
+          handleNativeFatalError(hls_error);
         };
         videoEl.addEventListener("error", onFatalVideoError);
-        const removeFatalListener = () => videoEl.removeEventListener("error", onFatalVideoError);
+        const onPlayingResetBudget = () => {
+          if (networkRetryCount > 0 || mediaRetryCount > 0) {
+            api?.logger.debug("Native playback recovered, resetting retry budgets");
+            networkRetryCount = 0;
+            mediaRetryCount = 0;
+          }
+        };
+        videoEl.addEventListener("playing", onPlayingResetBudget);
+        const removeFatalListener = () => {
+          videoEl.removeEventListener("error", onFatalVideoError);
+          videoEl.removeEventListener("playing", onPlayingResetBudget);
+        };
         const previous_cleanup = cleanupVideoEvents;
         cleanupVideoEvents = () => {
           removeFatalListener();
@@ -3073,12 +3185,38 @@ function createHLSPluginWith(loader, variant, config) {
     reconnectAttempts = 0;
     reconnectWindowStart = 0;
     reconnectResumePosition = 0;
+    reconnectTriggerError = null;
+    reconnectExhausted = false;
+  };
+  const emitReconnectExhausted = (elapsedMs, windowMs) => {
+    if (reconnectExhausted) return;
+    reconnectExhausted = true;
+    const attempts = reconnectAttempts;
+    const trigger = reconnectTriggerError;
+    api?.emit("error:reconnect-exhausted", { attempts, elapsedMs, windowMs });
+    api?.setState("playbackState", "error");
+    api?.setState("buffering", false);
+    api?.emit("error", {
+      code: trigger ? mapFatalErrorCode(trigger) : ErrorCode.PLAYBACK_FAILED,
+      message: `HLS auto-reconnect gave up after ${attempts} attempts over ${Math.round(elapsedMs / 1e3)}s`,
+      fatal: true,
+      timestamp: Date.now(),
+      detail: {
+        type: trigger?.type ?? "other",
+        retriesExhausted: true,
+        attempts,
+        reconnectExhausted: true
+      }
+    });
   };
   const scheduleReconnectAttempt = () => {
+    if (reconnectExhausted) return;
     if (reconnectTimer) return;
     const window_ms = mergedConfig.reconnectWindowMs ?? 3e5;
-    if (Date.now() - reconnectWindowStart > window_ms) {
+    const elapsed_ms = Date.now() - reconnectWindowStart;
+    if (elapsed_ms > window_ms) {
       api?.logger.warn(`Auto-reconnect window exhausted after ${reconnectAttempts} attempts`);
+      emitReconnectExhausted(elapsed_ms, window_ms);
       return;
     }
     const base_delay = mergedConfig.reconnectBaseDelayMs ?? 2e3;
@@ -3086,7 +3224,12 @@ function createHLSPluginWith(loader, variant, config) {
     const backoff = Math.min(base_delay * Math.pow(2, reconnectAttempts), max_delay);
     const delay = Math.round(backoff * (0.7 + Math.random() * 0.3));
     api?.logger.info(`Scheduling auto-reconnect attempt ${reconnectAttempts + 1} in ${delay}ms`);
-    api?.emit("error:reconnecting", { attempt: reconnectAttempts + 1, delayMs: delay });
+    api?.emit("error:reconnecting", {
+      attempt: reconnectAttempts + 1,
+      delayMs: delay,
+      elapsedMs: elapsed_ms,
+      windowMs: window_ms
+    });
     reconnectTimer = setTimeout(() => {
       reconnectTimer = null;
       void attemptReconnect();
@@ -3099,6 +3242,7 @@ function createHLSPluginWith(loader, variant, config) {
     if (reconnectWindowStart === 0) {
       reconnectWindowStart = Date.now();
       reconnectResumePosition = video?.currentTime ?? 0;
+      reconnectTriggerError = error;
     }
     scheduleReconnectAttempt();
   };
@@ -3130,7 +3274,10 @@ function createHLSPluginWith(loader, variant, config) {
       }
       api.setState("playbackState", "ready");
       api.setState("buffering", false);
-      api.emit("error:recovered", void 0);
+      api.emit("error:recovered", {
+        attempt: reconnectAttempts,
+        elapsedMs: Date.now() - reconnectWindowStart
+      });
       api.logger.info("Auto-reconnect succeeded");
       cancelReconnect();
       try {
@@ -4220,6 +4367,272 @@ function createAudioUIPlugin(config) {
   };
   return plugin;
 }
+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>',
+  next: '<svg viewBox="0 0 24 24" fill="currentColor" aria-hidden="true" focusable="false"><path d="M16 6h2v12h-2V6zM6 6l8.5 6L6 18V6z"/></svg>',
+  list: '<svg viewBox="0 0 24 24" fill="currentColor" aria-hidden="true" focusable="false"><path d="M3 6h11v2H3V6zm0 5h11v2H3v-2zm0 5h7v2H3v-2zm13-1.5V8l6 3.5-6 3.5z"/></svg>'
+};
+var PlaylistSkipButton = class {
+  constructor(plugin, direction) {
+    this.plugin = plugin;
+    this.direction = direction;
+    this.clickHandler = () => {
+      if (this.direction === "next") {
+        this.plugin.next();
+      } else {
+        this.plugin.previous();
+      }
+    };
+    const label = direction === "next" ? "Next item" : "Previous item";
+    this.el = document.createElement("button");
+    this.el.type = "button";
+    this.el.className = `sp-control sp-playlist-skip sp-playlist-skip--${direction}`;
+    this.el.setAttribute("aria-label", label);
+    this.el.setAttribute("title", label);
+    this.el.innerHTML = PLAYLIST_ICONS[direction];
+    this.el.addEventListener("click", this.clickHandler);
+  }
+  render() {
+    return this.el;
+  }
+  update() {
+    const state = this.plugin.getState();
+    if (state.tracks.length <= 1) {
+      this.el.style.display = "none";
+      return;
+    }
+    this.el.style.display = "";
+    const enabled = this.direction === "next" ? state.hasNext : state.hasPrevious;
+    this.el.disabled = !enabled;
+  }
+  destroy() {
+    this.el.removeEventListener("click", this.clickHandler);
+    this.el.remove();
+  }
+};
+var PlaylistPanel = class {
+  constructor(plugin, options) {
+    this.plugin = plugin;
+    this.options = options;
+    this.open = false;
+    this.renderedIds = "";
+    this.toggleHandler = (event) => {
+      event.stopPropagation();
+      this.setOpen(!this.open);
+    };
+    this.documentClickHandler = () => {
+      if (this.open) this.setOpen(false);
+    };
+    this.keydownHandler = (event) => {
+      if (event.key === "Escape" && this.open) {
+        this.setOpen(false);
+        this.button.focus();
+      }
+    };
+    this.el = document.createElement("div");
+    this.el.className = "sp-playlist";
+    this.button = document.createElement("button");
+    this.button.type = "button";
+    this.button.className = "sp-control sp-playlist__button";
+    this.button.setAttribute("aria-label", "Playlist");
+    this.button.setAttribute("title", "Playlist");
+    this.button.setAttribute("aria-haspopup", "true");
+    this.button.setAttribute("aria-expanded", "false");
+    this.button.innerHTML = PLAYLIST_ICONS.list;
+    this.panel = document.createElement("div");
+    this.panel.className = "sp-playlist__panel";
+    this.panel.setAttribute("role", "menu");
+    this.panel.hidden = true;
+    this.el.appendChild(this.button);
+    this.el.appendChild(this.panel);
+    this.button.addEventListener("click", this.toggleHandler);
+    document.addEventListener("click", this.documentClickHandler);
+    document.addEventListener("keydown", this.keydownHandler);
+  }
+  render() {
+    return this.el;
+  }
+  update() {
+    const state = this.plugin.getState();
+    if (state.tracks.length <= 1) {
+      this.el.style.display = "none";
+      return;
+    }
+    this.el.style.display = "";
+    const signature = state.tracks.map((track) => track.id).join("|");
+    if (signature !== this.renderedIds) {
+      this.renderedIds = signature;
+      this.renderPanel(state.tracks, state.currentIndex);
+      return;
+    }
+    this.markActive(state.currentIndex);
+  }
+  destroy() {
+    this.button.removeEventListener("click", this.toggleHandler);
+    document.removeEventListener("click", this.documentClickHandler);
+    document.removeEventListener("keydown", this.keydownHandler);
+    this.el.remove();
+  }
+  setOpen(open) {
+    this.open = open;
+    this.panel.hidden = !open;
+    this.button.setAttribute("aria-expanded", String(open));
+    this.el.classList.toggle("sp-playlist--open", open);
+  }
+  markActive(currentIndex) {
+    const items = this.panel.querySelectorAll(".sp-playlist__item");
+    items.forEach((item, index) => {
+      item.classList.toggle("sp-playlist__item--active", index === currentIndex);
+      item.setAttribute("aria-current", index === currentIndex ? "true" : "false");
+    });
+  }
+  renderPanel(tracks, currentIndex) {
+    this.panel.textContent = "";
+    tracks.forEach((track, index) => {
+      const item = document.createElement("button");
+      item.type = "button";
+      item.className = "sp-playlist__item";
+      item.setAttribute("role", "menuitem");
+      item.setAttribute("aria-current", index === currentIndex ? "true" : "false");
+      if (index === currentIndex) {
+        item.classList.add("sp-playlist__item--active");
+      }
+      const position = document.createElement("span");
+      position.className = "sp-playlist__position";
+      position.textContent = String(index + 1);
+      const text = document.createElement("span");
+      text.className = "sp-playlist__text";
+      const title = document.createElement("span");
+      title.className = "sp-playlist__title";
+      title.textContent = track.title ?? `Item ${index + 1}`;
+      text.appendChild(title);
+      if (track.artist) {
+        const artist = document.createElement("span");
+        artist.className = "sp-playlist__artist";
+        artist.textContent = track.artist;
+        text.appendChild(artist);
+      }
+      item.appendChild(position);
+      item.appendChild(text);
+      item.addEventListener("click", (event) => {
+        event.stopPropagation();
+        this.options.onSelect(index);
+        this.setOpen(false);
+      });
+      this.panel.appendChild(item);
+    });
+  }
+};
+var STYLE_ID = "sp-playlist-styles";
+var styles = `
+.sp-playlist-skip[disabled] {
+  opacity: 0.4;
+  cursor: default;
+}
+
+.sp-playlist {
+  position: relative;
+  display: inline-flex;
+}
+
+.sp-playlist__button svg,
+.sp-playlist-skip svg {
+  width: 20px;
+  height: 20px;
+}
+
+.sp-playlist__panel {
+  position: absolute;
+  bottom: calc(100% + 8px);
+  right: 0;
+  z-index: 20;
+  display: flex;
+  flex-direction: column;
+  min-width: 240px;
+  max-width: 320px;
+  max-height: 300px;
+  overflow-y: auto;
+  padding: 4px;
+  border-radius: 8px;
+  background: rgba(20, 20, 20, 0.96);
+  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.5);
+}
+
+.sp-playlist__panel[hidden] {
+  display: none;
+}
+
+.sp-playlist__item {
+  display: flex;
+  gap: 10px;
+  align-items: flex-start;
+  width: 100%;
+  padding: 8px 10px;
+  border: 0;
+  border-radius: 6px;
+  background: transparent;
+  color: #fff;
+  font: inherit;
+  text-align: left;
+  cursor: pointer;
+}
+
+.sp-playlist__item:hover,
+.sp-playlist__item:focus-visible {
+  background: rgba(255, 255, 255, 0.12);
+}
+
+.sp-playlist__item--active {
+  background: rgba(255, 255, 255, 0.08);
+}
+
+.sp-playlist__item--active .sp-playlist__title {
+  font-weight: 600;
+}
+
+.sp-playlist__position {
+  flex: 0 0 auto;
+  min-width: 18px;
+  color: rgba(255, 255, 255, 0.7);
+  font-variant-numeric: tabular-nums;
+  font-size: 12px;
+  line-height: 18px;
+}
+
+.sp-playlist__text {
+  display: flex;
+  flex-direction: column;
+  min-width: 0;
+}
+
+.sp-playlist__title {
+  font-size: 13px;
+  line-height: 18px;
+}
+
+.sp-playlist__artist {
+  color: rgba(255, 255, 255, 0.6);
+  font-size: 11px;
+  line-height: 16px;
+}
+
+@media (max-width: 480px) {
+  .sp-playlist__panel {
+    min-width: 200px;
+    max-width: 76vw;
+  }
+}
+`;
+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;
+}
 var DEFAULT_CONFIG$1 = {
   autoAdvance: true,
   preloadNext: true,
@@ -4409,8 +4822,42 @@ function createPlaylistPlugin(config) {
           api?.emit("playlist:ended", void 0);
         }
       });
+      injectStyles();
+      void import("./hls2.js").then(({ registerControl }) => {
+        const self = plugin;
+        registerControl(
+          "playlist-previous",
+          () => new PlaylistSkipButton(self, "previous")
+        );
+        registerControl("playlist-next", () => new PlaylistSkipButton(self, "next"));
+        registerControl(
+          "playlist",
+          () => new PlaylistPanel(self, {
+            onSelect: (index) => self.play(index)
+          })
+        );
+      }).catch(() => {
+        api?.logger.debug("@scarlett-player/ui not present, playlist controls not registered");
+      });
+      const onKeyDown = (event) => {
+        if (!api || !api.container.contains(document.activeElement)) return;
+        const activeEl = document.activeElement;
+        if (activeEl instanceof HTMLInputElement || activeEl instanceof HTMLTextAreaElement || activeEl instanceof HTMLSelectElement || activeEl?.isContentEditable) {
+          return;
+        }
+        if (event.metaKey || event.ctrlKey || event.altKey) return;
+        if (event.key === "n" || event.key === "N") {
+          event.preventDefault();
+          plugin.next();
+        } else if (event.key === "p" || event.key === "P") {
+          event.preventDefault();
+          plugin.previous();
+        }
+      };
+      document.addEventListener("keydown", onKeyDown);
       api.onDestroy(() => {
         unsubEnded();
+        document.removeEventListener("keydown", onKeyDown);
         if (advanceTimeout) {
           clearTimeout(advanceTimeout);
           advanceTimeout = null;