@scarlett-player/hls 1.1.1 → 1.4.0

package/dist/light.d.cts

@@ -1,12 +1,19 @@
-import { H as HLSPluginConfig, I as IHLSPlugin } from './types-DOzoPHQe.cjs';
-export { b as HLSError, c as HLSLiveInfo, a as HLSQualityLevel } from './types-DOzoPHQe.cjs';
+import { H as HLSPluginConfig, I as IHLSPlugin } from './types-D-HW4lmM.cjs';
+export { b as HLSError, c as HLSLiveInfo, a as HLSQualityLevel } from './types-D-HW4lmM.cjs';
 import '@scarlett-player/core';
 
 /**
  * HLS Provider Plugin - Light Build
  *
- * Same functionality as the main plugin but uses hls.js/light for smaller bundle.
- * The light build excludes: subtitles, ID3 tags, and DRM/EME support.
+ * Same functionality as the main plugin but uses hls.js/light for smaller
+ * bundle. The light build of hls.js excludes: subtitles, ID3 tags, and
+ * DRM/EME support.
+ *
+ * Thin wrapper around the shared factory in `create-hls-plugin.ts`, so
+ * the light entry always carries the same error handling, retry,
+ * auto-reconnect, load watchdog, and playlist-validation machinery as the
+ * full build (before 1.2.0 this file was a hand-maintained fork that had
+ * silently missed all of that hardening).
  *
  * @packageDocumentation
  */

package/dist/light.d.ts

@@ -1,12 +1,19 @@
-import { H as HLSPluginConfig, I as IHLSPlugin } from './types-DOzoPHQe.js';
-export { b as HLSError, c as HLSLiveInfo, a as HLSQualityLevel } from './types-DOzoPHQe.js';
+import { H as HLSPluginConfig, I as IHLSPlugin } from './types-D-HW4lmM.js';
+export { b as HLSError, c as HLSLiveInfo, a as HLSQualityLevel } from './types-D-HW4lmM.js';
 import '@scarlett-player/core';
 
 /**
  * HLS Provider Plugin - Light Build
  *
- * Same functionality as the main plugin but uses hls.js/light for smaller bundle.
- * The light build excludes: subtitles, ID3 tags, and DRM/EME support.
+ * Same functionality as the main plugin but uses hls.js/light for smaller
+ * bundle. The light build of hls.js excludes: subtitles, ID3 tags, and
+ * DRM/EME support.
+ *
+ * Thin wrapper around the shared factory in `create-hls-plugin.ts`, so
+ * the light entry always carries the same error handling, retry,
+ * auto-reconnect, load watchdog, and playlist-validation machinery as the
+ * full build (before 1.2.0 this file was a hand-maintained fork that had
+ * silently missed all of that hardening).
  *
  * @packageDocumentation
  */

package/dist/light.js

@@ -1,11 +1,20 @@
 import {
-  formatLevel,
-  mapLevels,
-  setupHlsEventHandlers,
-  setupVideoEventHandlers
-} from "./chunk-L73PRXS4.js";
+  __export,
+  createHLSPluginWith
+} from "./chunk-IFUZZQQE.js";
 
 // src/hls-loader-light.ts
+var hls_loader_light_exports = {};
+__export(hls_loader_light_exports, {
+  createHlsInstance: () => createHlsInstance,
+  getHlsConstructor: () => getHlsConstructor,
+  isHLSSupported: () => isHLSSupported,
+  isHlsJsSupported: () => isHlsJsSupported,
+  loadHlsJs: () => loadHlsJs,
+  resetLoader: () => resetLoader,
+  shouldPreferNativeHLS: () => shouldPreferNativeHLS,
+  supportsNativeHLS: () => supportsNativeHLS
+});
 var hlsConstructor = null;
 var loadingPromise = null;
 function supportsNativeHLS() {
@@ -13,6 +22,13 @@ function supportsNativeHLS() {
   const video = document.createElement("video");
   return video.canPlayType("application/vnd.apple.mpegurl") !== "";
 }
+function shouldPreferNativeHLS() {
+  if (!supportsNativeHLS()) return false;
+  if (typeof navigator === "undefined") return false;
+  const ua = navigator.userAgent;
+  const isSafari = /Safari/.test(ua) && !/Chrome/.test(ua) && !/CriOS/.test(ua);
+  return isSafari;
+}
 function isHlsJsSupported() {
   if (hlsConstructor) {
     return hlsConstructor.isSupported();
@@ -56,466 +72,23 @@ function createHlsInstance(config) {
 function getHlsConstructor() {
   return hlsConstructor;
 }
+function resetLoader() {
+  hlsConstructor = null;
+  loadingPromise = null;
+}
 
 // src/light.ts
-var DEFAULT_CONFIG = {
-  debug: false,
-  autoStartLoad: true,
-  startPosition: -1,
-  lowLatencyMode: false,
-  maxBufferLength: 30,
-  maxMaxBufferLength: 600,
-  backBufferLength: 30,
-  enableWorker: true,
-  maxNetworkRetries: 3,
-  maxMediaRetries: 2,
-  retryDelayMs: 1e3,
-  retryBackoffFactor: 2
-};
 function createHLSPlugin(config) {
-  const mergedConfig = { ...DEFAULT_CONFIG, ...config };
-  let api = null;
-  let hls = null;
-  let video = null;
-  let isNative = false;
-  let currentSrc = null;
-  let cleanupHlsEvents = null;
-  let cleanupVideoEvents = null;
-  let isAutoQuality = true;
-  let networkRetryCount = 0;
-  let mediaRetryCount = 0;
-  let retryTimeout = null;
-  let errorCount = 0;
-  let errorWindowStart = 0;
-  const MAX_ERRORS_IN_WINDOW = 10;
-  const ERROR_WINDOW_MS = 5e3;
-  const getOrCreateVideo = () => {
-    if (video) return video;
-    const existing = api?.container.querySelector("video");
-    if (existing) {
-      video = existing;
-      return video;
-    }
-    video = document.createElement("video");
-    video.style.cssText = "position:absolute;top:0;left:0;width:100%;height:100%;display:block;object-fit:contain;background:#000";
-    video.preload = "metadata";
-    video.controls = false;
-    video.playsInline = true;
-    api?.container.appendChild(video);
-    return video;
-  };
-  const cleanup = () => {
-    cleanupHlsEvents?.();
-    cleanupHlsEvents = null;
-    cleanupVideoEvents?.();
-    cleanupVideoEvents = null;
-    if (retryTimeout) {
-      clearTimeout(retryTimeout);
-      retryTimeout = null;
-    }
-    if (hls) {
-      hls.destroy();
-      hls = null;
-    }
-    currentSrc = null;
-    isNative = false;
-    isAutoQuality = true;
-    networkRetryCount = 0;
-    mediaRetryCount = 0;
-    errorCount = 0;
-    errorWindowStart = 0;
-  };
-  const buildHlsConfig = () => ({
-    debug: mergedConfig.debug,
-    autoStartLoad: mergedConfig.autoStartLoad,
-    startPosition: mergedConfig.startPosition,
-    startLevel: -1,
-    lowLatencyMode: mergedConfig.lowLatencyMode,
-    maxBufferLength: mergedConfig.maxBufferLength,
-    maxMaxBufferLength: mergedConfig.maxMaxBufferLength,
-    backBufferLength: mergedConfig.backBufferLength,
-    enableWorker: mergedConfig.enableWorker,
-    fragLoadingMaxRetry: 1,
-    manifestLoadingMaxRetry: 1,
-    levelLoadingMaxRetry: 1,
-    fragLoadingRetryDelay: 500,
-    manifestLoadingRetryDelay: 500,
-    levelLoadingRetryDelay: 500
-  });
-  const getRetryDelay = (retryCount) => {
-    const baseDelay = mergedConfig.retryDelayMs ?? 1e3;
-    const backoffFactor = mergedConfig.retryBackoffFactor ?? 2;
-    return baseDelay * Math.pow(backoffFactor, retryCount);
-  };
-  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 });
-    api?.setState("playbackState", "error");
-    api?.setState("buffering", false);
-    api?.emit("error", {
-      code: "MEDIA_ERROR",
-      message,
-      fatal: true,
-      timestamp: Date.now()
-    });
-  };
-  const handleHlsError = (error) => {
-    const Hls = getHlsConstructor();
-    if (!Hls || !hls) return;
-    const now = Date.now();
-    if (now - errorWindowStart > ERROR_WINDOW_MS) {
-      errorCount = 1;
-      errorWindowStart = now;
-    } else {
-      errorCount++;
-    }
-    if (errorCount >= MAX_ERRORS_IN_WINDOW) {
-      api?.logger.error(`Too many errors (${errorCount} in ${ERROR_WINDOW_MS}ms), giving up`);
-      emitFatalError(error, true);
-      cleanupHlsEvents?.();
-      cleanupHlsEvents = null;
-      hls.destroy();
-      hls = null;
-      return;
-    }
-    if (error.fatal) {
-      api?.logger.error("Fatal HLS error", { type: error.type, details: error.details });
-      switch (error.type) {
-        case "network": {
-          const maxRetries = mergedConfig.maxNetworkRetries ?? 3;
-          if (networkRetryCount >= maxRetries) {
-            api?.logger.error(`Network error recovery failed after ${networkRetryCount} attempts`);
-            emitFatalError(error, true);
-            return;
-          }
-          networkRetryCount++;
-          const delay = getRetryDelay(networkRetryCount - 1);
-          api?.logger.info(`Attempting network error recovery (attempt ${networkRetryCount}/${maxRetries}) in ${delay}ms`);
-          api?.emit("error:network", { error: new Error(error.details) });
-          if (retryTimeout) {
-            clearTimeout(retryTimeout);
-          }
-          retryTimeout = setTimeout(() => {
-            if (hls) {
-              hls.startLoad();
-            }
-          }, delay);
-          break;
-        }
-        case "media": {
-          const maxRetries = mergedConfig.maxMediaRetries ?? 2;
-          if (mediaRetryCount >= maxRetries) {
-            api?.logger.error(`Media error recovery failed after ${mediaRetryCount} attempts`);
-            emitFatalError(error, true);
-            return;
-          }
-          mediaRetryCount++;
-          const delay = getRetryDelay(mediaRetryCount - 1);
-          api?.logger.info(`Attempting media error recovery (attempt ${mediaRetryCount}/${maxRetries}) in ${delay}ms`);
-          api?.emit("error:media", { error: new Error(error.details) });
-          if (retryTimeout) {
-            clearTimeout(retryTimeout);
-          }
-          retryTimeout = setTimeout(() => {
-            if (hls) {
-              hls.recoverMediaError();
-            }
-          }, delay);
-          break;
-        }
-        default:
-          emitFatalError(error, false);
-          break;
-      }
-    }
-  };
-  const loadNative = async (src) => {
-    const videoEl = getOrCreateVideo();
-    isNative = true;
-    if (api) {
-      cleanupVideoEvents = setupVideoEventHandlers(videoEl, api);
-    }
-    return new Promise((resolve, reject) => {
-      const onLoaded = () => {
-        videoEl.removeEventListener("loadedmetadata", onLoaded);
-        videoEl.removeEventListener("error", onError);
-        api?.setState("source", { src, type: "application/x-mpegURL" });
-        api?.emit("media:loaded", { src, type: "application/x-mpegURL" });
-        resolve();
-      };
-      const onError = () => {
-        videoEl.removeEventListener("loadedmetadata", onLoaded);
-        videoEl.removeEventListener("error", onError);
-        const error = videoEl.error;
-        reject(new Error(error?.message || "Failed to load HLS source"));
-      };
-      videoEl.addEventListener("loadedmetadata", onLoaded);
-      videoEl.addEventListener("error", onError);
-      videoEl.src = src;
-      videoEl.load();
-    });
-  };
-  const loadWithHlsJs = async (src) => {
-    await loadHlsJs();
-    const videoEl = getOrCreateVideo();
-    isNative = false;
-    hls = createHlsInstance(buildHlsConfig());
-    if (api) {
-      cleanupVideoEvents = setupVideoEventHandlers(videoEl, api);
-    }
-    return new Promise((resolve, reject) => {
-      if (!hls || !api) {
-        reject(new Error("HLS not initialized"));
-        return;
-      }
-      let resolved = false;
-      cleanupHlsEvents = setupHlsEventHandlers(hls, api, {
-        onManifestParsed: () => {
-          if (!resolved) {
-            resolved = true;
-            api?.setState("source", { src, type: "application/x-mpegURL" });
-            api?.emit("media:loaded", { src, type: "application/x-mpegURL" });
-            resolve();
-          }
-        },
-        onLevelSwitched: () => {
-        },
-        onError: (error) => {
-          handleHlsError(error);
-          if (error.fatal && !resolved && error.type !== "network" && error.type !== "media") {
-            resolved = true;
-            reject(new Error(error.details));
-          }
-        },
-        getIsAutoQuality: () => isAutoQuality
-      });
-      hls.attachMedia(videoEl);
-      hls.loadSource(src);
-    });
-  };
-  const plugin = {
-    id: "hls-provider",
-    name: "HLS Provider (Light)",
-    version: "1.0.0",
-    type: "provider",
-    description: "HLS playback provider using hls.js/light (smaller bundle)",
-    canPlay(src) {
-      if (!isHLSSupported()) return false;
-      const url = src.toLowerCase();
-      const urlWithoutQuery = url.split("?")[0].split("#")[0];
-      if (urlWithoutQuery.endsWith(".m3u8")) return true;
-      if (url.includes("application/x-mpegurl")) return true;
-      if (url.includes("application/vnd.apple.mpegurl")) return true;
-      return false;
-    },
-    async init(pluginApi) {
-      api = pluginApi;
-      api.logger.info("HLS plugin (light) initialized");
-      const unsubPlay = api.on("playback:play", async () => {
-        if (!video) return;
-        try {
-          await video.play();
-        } catch (e) {
-          api?.logger.error("Play failed", e);
-        }
-      });
-      const unsubPause = api.on("playback:pause", () => {
-        video?.pause();
-      });
-      const unsubSeek = api.on("playback:seeking", ({ time }) => {
-        if (!video) return;
-        const clampedTime = Math.max(0, Math.min(time, video.duration || 0));
-        video.currentTime = clampedTime;
-      });
-      const unsubVolume = api.on("volume:change", ({ volume }) => {
-        if (video) video.volume = volume;
-      });
-      const unsubMute = api.on("volume:mute", ({ muted }) => {
-        if (video) video.muted = muted;
-      });
-      const unsubRate = api.on("playback:ratechange", ({ rate }) => {
-        if (video) video.playbackRate = rate;
-      });
-      const unsubQuality = api.on("quality:select", ({ quality, auto }) => {
-        if (!hls || isNative) {
-          api?.logger.warn("Quality selection not available");
-          return;
-        }
-        if (auto || quality === "auto") {
-          isAutoQuality = true;
-          hls.currentLevel = -1;
-          api?.logger.debug("Quality: auto selection enabled");
-          api?.setState("currentQuality", {
-            id: "auto",
-            label: "Auto",
-            width: 0,
-            height: 0,
-            bitrate: 0,
-            active: true
-          });
-        } else {
-          isAutoQuality = false;
-          const levelIndex = parseInt(quality.replace("level-", ""), 10);
-          if (!isNaN(levelIndex) && levelIndex >= 0 && levelIndex < hls.levels.length) {
-            hls.nextLevel = levelIndex;
-            api?.logger.debug(`Quality: queued switch to level ${levelIndex}`);
-            const targetLevel = hls.levels[levelIndex];
-            if (targetLevel) {
-              const label = formatLevel(targetLevel);
-              api?.setState("currentQuality", {
-                id: `level-${levelIndex}`,
-                label: `${label}...`,
-                // Ellipsis indicates switching in progress
-                width: targetLevel.width,
-                height: targetLevel.height,
-                bitrate: targetLevel.bitrate,
-                active: false
-                // Not yet active
-              });
-            }
-          }
-        }
-      });
-      api.onDestroy(() => {
-        unsubPlay();
-        unsubPause();
-        unsubSeek();
-        unsubVolume();
-        unsubMute();
-        unsubRate();
-        unsubQuality();
-      });
-    },
-    async destroy() {
-      api?.logger.info("HLS plugin (light) destroying");
-      cleanup();
-      if (video?.parentNode) {
-        video.parentNode.removeChild(video);
-      }
-      video = null;
-      api = null;
-    },
-    async loadSource(src) {
-      if (!api) throw new Error("Plugin not initialized");
-      api.logger.info("Loading HLS source (light)", { src });
-      cleanup();
-      currentSrc = src;
-      api.setState("playbackState", "loading");
-      api.setState("buffering", true);
-      if (isHlsJsSupported()) {
-        api.logger.info("Using hls.js/light for HLS playback");
-        await loadWithHlsJs(src);
-      } else if (supportsNativeHLS()) {
-        api.logger.info("Using native HLS playback (hls.js not supported)");
-        await loadNative(src);
-      } else {
-        throw new Error("HLS playback not supported in this browser");
-      }
-      if (video) {
-        const muted = api.getState("muted");
-        const volume = api.getState("volume");
-        if (muted !== void 0) video.muted = muted;
-        if (volume !== void 0) video.volume = volume;
-      }
-      api.setState("playbackState", "ready");
-      api.setState("buffering", false);
+  return createHLSPluginWith(
+    hls_loader_light_exports,
+    {
+      name: "HLS Provider (Light)",
+      description: "HLS playback provider using hls.js/light (smaller bundle)",
+      logSuffix: " (light)",
+      engineLabel: "hls.js/light"
     },
-    getCurrentLevel() {
-      if (isNative || !hls) return -1;
-      return hls.currentLevel;
-    },
-    setLevel(index) {
-      if (isNative || !hls) {
-        api?.logger.warn("Quality selection not available in native HLS mode");
-        return;
-      }
-      hls.currentLevel = index;
-    },
-    getLevels() {
-      if (isNative || !hls) return [];
-      return mapLevels(hls.levels, hls.currentLevel);
-    },
-    getHlsInstance() {
-      return hls;
-    },
-    isNativeHLS() {
-      return isNative;
-    },
-    getLiveInfo() {
-      if (isNative || !hls) return null;
-      const live = api?.getState("live") || false;
-      if (!live) return null;
-      return {
-        isLive: true,
-        latency: hls.latency || 0,
-        targetLatency: hls.targetLatency || 3,
-        drift: hls.drift || 0
-      };
-    },
-    async switchToNative() {
-      if (isNative) {
-        api?.logger.debug("Already using native HLS");
-        return;
-      }
-      if (!supportsNativeHLS()) {
-        api?.logger.warn("Native HLS not supported in this browser");
-        return;
-      }
-      if (!currentSrc) {
-        api?.logger.warn("No source loaded");
-        return;
-      }
-      api?.logger.info("Switching to native HLS for AirPlay");
-      const wasPlaying = api?.getState("playing") || false;
-      const currentTime = video?.currentTime || 0;
-      const savedSrc = currentSrc;
-      cleanup();
-      await loadNative(savedSrc);
-      if (video && currentTime > 0) {
-        video.currentTime = currentTime;
-      }
-      if (wasPlaying && video) {
-        try {
-          await video.play();
-        } catch (e) {
-          api?.logger.debug("Could not auto-resume after switch");
-        }
-      }
-      api?.logger.info("Switched to native HLS");
-    },
-    async switchToHlsJs() {
-      if (!isNative) {
-        api?.logger.debug("Already using hls.js");
-        return;
-      }
-      if (!isHlsJsSupported()) {
-        api?.logger.warn("hls.js not supported in this browser");
-        return;
-      }
-      if (!currentSrc) {
-        api?.logger.warn("No source loaded");
-        return;
-      }
-      api?.logger.info("Switching back to hls.js");
-      const wasPlaying = api?.getState("playing") || false;
-      const currentTime = video?.currentTime || 0;
-      const savedSrc = currentSrc;
-      cleanup();
-      await loadWithHlsJs(savedSrc);
-      if (video && currentTime > 0) {
-        video.currentTime = currentTime;
-      }
-      if (wasPlaying && video) {
-        try {
-          await video.play();
-        } catch (e) {
-          api?.logger.debug("Could not auto-resume after switch");
-        }
-      }
-      api?.logger.info("Switched to hls.js");
-    }
-  };
-  return plugin;
+    config
+  );
 }
 var light_default = createHLSPlugin;
 export {

package/dist/{types-DOzoPHQe.d.cts → types-D-HW4lmM.d.cts}

@@ -52,6 +52,14 @@ interface HLSPluginConfig {
     reconnectMaxDelayMs?: number;
     /** Total window to keep auto-reconnecting in milliseconds (default: 300000 = 5 min) */
     reconnectWindowMs?: number;
+    /**
+     * Validate every playlist response before it reaches the M3U8 parser
+     * (default: true). A live refresh that returns an error page, a
+     * master-only response, or an empty document becomes a normal network
+     * error (bounded retries, then reconnect, then the retry UI) instead of
+     * being indexed blindly.
+     */
+    validatePlaylists?: boolean;
     /** Index signature for PluginConfig compatibility */
     [key: string]: unknown;
 }

package/dist/{types-DOzoPHQe.d.ts → types-D-HW4lmM.d.ts}

@@ -52,6 +52,14 @@ interface HLSPluginConfig {
     reconnectMaxDelayMs?: number;
     /** Total window to keep auto-reconnecting in milliseconds (default: 300000 = 5 min) */
     reconnectWindowMs?: number;
+    /**
+     * Validate every playlist response before it reaches the M3U8 parser
+     * (default: true). A live refresh that returns an error page, a
+     * master-only response, or an empty document becomes a normal network
+     * error (bounded retries, then reconnect, then the retry UI) instead of
+     * being indexed blindly.
+     */
+    validatePlaylists?: boolean;
     /** Index signature for PluginConfig compatibility */
     [key: string]: unknown;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scarlett-player/hls",
-  "version": "1.1.1",
+  "version": "1.4.0",
   "description": "HLS Provider Plugin for Scarlett Player",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -37,7 +37,7 @@
     "vitest": "^1.6.0",
     "@vitest/coverage-v8": "^1.6.0",
     "jsdom": "^24.0.0",
-    "@scarlett-player/core": "1.1.1"
+    "@scarlett-player/core": "1.4.0"
   },
   "keywords": [
     "video",