@scarlett-player/hls 1.1.1 → 1.4.0

package/dist/index.cjs

@@ -34,9 +34,19 @@ __export(index_exports, {
   default: () => index_default
 });
 module.exports = __toCommonJS(index_exports);
-var import_core = require("@scarlett-player/core");
 
 // src/hls-loader.ts
+var hls_loader_exports = {};
+__export(hls_loader_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() {
@@ -44,6 +54,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();
@@ -87,6 +104,13 @@ function createHlsInstance(config) {
 function getHlsConstructor() {
   return hlsConstructor;
 }
+function resetLoader() {
+  hlsConstructor = null;
+  loadingPromise = null;
+}
+
+// src/create-hls-plugin.ts
+var import_core = require("@scarlett-player/core");
 
 // src/quality.ts
 function formatLevel(level) {
@@ -418,7 +442,51 @@ function setupVideoEventHandlers(video, api) {
   };
 }
 
-// src/index.ts
+// src/playlist-validation.ts
+var PLAYLIST_INVALID_TEXT = "Invalid playlist document";
+var MEDIA_PLAYLIST_CONTEXTS = ["level", "audioTrack", "subtitleTrack"];
+function isValidPlaylistDocument(data, contextType) {
+  if (typeof data !== "string" || data.length === 0) return false;
+  const text = data.trimStart();
+  if (!text.startsWith("#EXTM3U")) return false;
+  if (contextType && MEDIA_PLAYLIST_CONTEXTS.includes(contextType)) {
+    return /^#EXT(?:INF|-X-TARGETDURATION):/m.test(text);
+  }
+  return true;
+}
+function createValidatingPlaylistLoader(Hls) {
+  const BaseLoader = Hls.DefaultConfig.loader;
+  return class ValidatingPlaylistLoader extends BaseLoader {
+    /**
+     * Load a playlist, validating the response document before it reaches
+     * the M3U8 parser.
+     *
+     * @param context - hls.js loader context
+     * @param config - hls.js loader config
+     * @param callbacks - hls.js loader callbacks
+     */
+    load(context, config, callbacks) {
+      const wrapped = {
+        ...callbacks,
+        onSuccess: (response, stats, ctx, networkDetails) => {
+          if (!isValidPlaylistDocument(response?.data, ctx?.type)) {
+            callbacks.onError(
+              { code: 0, text: PLAYLIST_INVALID_TEXT },
+              ctx,
+              networkDetails,
+              stats
+            );
+            return;
+          }
+          callbacks.onSuccess(response, stats, ctx, networkDetails);
+        }
+      };
+      super.load(context, config, wrapped);
+    }
+  };
+}
+
+// src/create-hls-plugin.ts
 var DEFAULT_CONFIG = {
   debug: false,
   autoStartLoad: true,
@@ -440,14 +508,16 @@ var DEFAULT_CONFIG = {
   autoReconnect: true,
   reconnectBaseDelayMs: 2e3,
   reconnectMaxDelayMs: 3e4,
-  reconnectWindowMs: 3e5
+  reconnectWindowMs: 3e5,
+  // Never index a malformed live playlist refresh blindly
+  validatePlaylists: true
 };
 var MANIFEST_PHASE_ERRORS = [
   "manifestLoadError",
   "manifestLoadTimeOut",
   "manifestParsingError"
 ];
-function createHLSPlugin(config) {
+function createHLSPluginWith(loader, variant, config) {
   const mergedConfig = { ...DEFAULT_CONFIG, ...config };
   let api = null;
   let hls = null;
@@ -457,6 +527,8 @@ function createHLSPlugin(config) {
   let cleanupHlsEvents = null;
   let cleanupVideoEvents = null;
   let isAutoQuality = true;
+  let loadSession = 0;
+  let abortPendingLoad = null;
   let networkRetryCount = 0;
   let mediaRetryCount = 0;
   let retryTimeout = null;
@@ -489,7 +561,9 @@ function createHLSPlugin(config) {
     api?.container.appendChild(video);
     return video;
   };
-  const cleanup = () => {
+  const teardownPipeline = (reason) => {
+    abortPendingLoad?.(reason ?? new Error("HLS load cancelled"));
+    abortPendingLoad = null;
     cleanupHlsEvents?.();
     cleanupHlsEvents = null;
     cleanupVideoEvents?.();
@@ -502,6 +576,9 @@ function createHLSPlugin(config) {
       hls.destroy();
       hls = null;
     }
+  };
+  const cleanup = (reason) => {
+    teardownPipeline(reason);
     currentSrc = null;
     isNative = false;
     isAutoQuality = true;
@@ -510,7 +587,17 @@ function createHLSPlugin(config) {
     errorCount = 0;
     errorWindowStart = 0;
   };
-  const buildHlsConfig = () => ({
+  const buildHlsConfig = () => {
+    const config2 = buildBaseHlsConfig();
+    if (mergedConfig.validatePlaylists !== false) {
+      const Hls = loader.getHlsConstructor();
+      if (Hls && Hls.DefaultConfig?.loader) {
+        config2.pLoader = createValidatingPlaylistLoader(Hls);
+      }
+    }
+    return config2;
+  };
+  const buildBaseHlsConfig = () => ({
     debug: mergedConfig.debug,
     autoStartLoad: mergedConfig.autoStartLoad,
     startPosition: mergedConfig.startPosition,
@@ -538,7 +625,21 @@ function createHLSPlugin(config) {
     const jitter = delay * (0.7 + Math.random() * 0.3);
     return jitter;
   };
+  const APPEND_ERROR_DETAILS = [
+    "bufferAppendError",
+    "bufferAppendingError",
+    "bufferAddCodecError"
+  ];
   const mapFatalErrorCode = (error) => {
+    if (error.response?.text === PLAYLIST_INVALID_TEXT) {
+      return import_core.ErrorCode.PLAYLIST_INVALID;
+    }
+    if (error.details === "bufferFullError") {
+      return import_core.ErrorCode.MEDIA_BUFFER_FULL;
+    }
+    if (APPEND_ERROR_DETAILS.includes(error.details)) {
+      return import_core.ErrorCode.MEDIA_APPEND_ERROR;
+    }
     switch (error.type) {
       case "network":
         return import_core.ErrorCode.MEDIA_NETWORK_ERROR;
@@ -563,7 +664,7 @@ function createHLSPlugin(config) {
     maybeScheduleReconnect(error);
   };
   const handleHlsError = (error) => {
-    const Hls = getHlsConstructor();
+    const Hls = loader.getHlsConstructor();
     if (!Hls || !hls) return false;
     const now = Date.now();
     if (now - errorWindowStart > ERROR_WINDOW_MS) {
@@ -575,10 +676,7 @@ function createHLSPlugin(config) {
     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;
+      teardownPipeline(new Error(error.details));
       return true;
     }
     if (error.fatal) {
@@ -599,8 +697,9 @@ function createHLSPlugin(config) {
             clearTimeout(retryTimeout);
           }
           const isManifestPhase = MANIFEST_PHASE_ERRORS.includes(error.details);
+          const retry_session = loadSession;
           retryTimeout = setTimeout(() => {
-            if (!hls) return;
+            if (retry_session !== loadSession || !hls) return;
             if (isManifestPhase && currentSrc) {
               hls.loadSource(currentSrc);
             } else {
@@ -623,10 +722,10 @@ function createHLSPlugin(config) {
           if (retryTimeout) {
             clearTimeout(retryTimeout);
           }
+          const retry_session = loadSession;
           retryTimeout = setTimeout(() => {
-            if (hls) {
-              hls.recoverMediaError();
-            }
+            if (retry_session !== loadSession || !hls) return;
+            hls.recoverMediaError();
           }, delay);
           break;
         }
@@ -638,6 +737,7 @@ function createHLSPlugin(config) {
     return false;
   };
   const loadNative = async (src) => {
+    const session = loadSession;
     const videoEl = getOrCreateVideo();
     isNative = true;
     if (api) {
@@ -645,7 +745,12 @@ function createHLSPlugin(config) {
     }
     return new Promise((resolve, reject) => {
       let watchdog = null;
+      let settled = false;
       const settle = () => {
+        settled = true;
+        if (abortPendingLoad === abort) {
+          abortPendingLoad = null;
+        }
         videoEl.removeEventListener("loadedmetadata", onLoaded);
         videoEl.removeEventListener("error", onError);
         if (watchdog !== null) {
@@ -653,7 +758,19 @@ function createHLSPlugin(config) {
           watchdog = null;
         }
       };
+      const abort = (reason) => {
+        if (settled) return;
+        settle();
+        reject(reason);
+      };
+      abortPendingLoad = abort;
       const onLoaded = () => {
+        if (settled) return;
+        if (session !== loadSession) {
+          settle();
+          reject(new Error("HLS load cancelled"));
+          return;
+        }
         settle();
         hasPlayedContent = true;
         const onFatalVideoError = () => {
@@ -677,6 +794,7 @@ function createHLSPlugin(config) {
         resolve();
       };
       const onError = () => {
+        if (settled) return;
         settle();
         const error = videoEl.error;
         reject(new Error(error?.message || "Failed to load HLS source"));
@@ -684,6 +802,7 @@ function createHLSPlugin(config) {
       const timeout_ms = mergedConfig.loadTimeoutMs ?? 3e4;
       if (timeout_ms > 0) {
         watchdog = setTimeout(() => {
+          if (settled || session !== loadSession) return;
           settle();
           reject(new Error("Video took too long to load (network timeout)"));
         }, timeout_ms);
@@ -695,10 +814,14 @@ function createHLSPlugin(config) {
     });
   };
   const loadWithHlsJs = async (src) => {
-    await loadHlsJs();
+    const session = loadSession;
+    await loader.loadHlsJs();
+    if (session !== loadSession) {
+      throw new Error("HLS load cancelled");
+    }
     const videoEl = getOrCreateVideo();
     isNative = false;
-    hls = createHlsInstance(buildHlsConfig());
+    hls = loader.createHlsInstance(buildHlsConfig());
     if (api) {
       cleanupVideoEvents = setupVideoEventHandlers(videoEl, api);
     }
@@ -715,10 +838,24 @@ function createHLSPlugin(config) {
           watchdog = null;
         }
       };
+      const abort = (reason) => {
+        if (resolved) return;
+        resolved = true;
+        clearWatchdog();
+        reject(reason);
+      };
+      abortPendingLoad = abort;
+      const releaseAbort = () => {
+        if (abortPendingLoad === abort) {
+          abortPendingLoad = null;
+        }
+      };
       cleanupHlsEvents = setupHlsEventHandlers(hls, api, {
         onManifestParsed: () => {
+          if (session !== loadSession) return;
           if (!resolved) {
             resolved = true;
+            releaseAbort();
             clearWatchdog();
             hasPlayedContent = true;
             api?.setState("source", { src, type: "application/x-mpegURL" });
@@ -729,14 +866,17 @@ function createHLSPlugin(config) {
         onLevelSwitched: () => {
         },
         onError: (error) => {
+          if (session !== loadSession) return;
           const terminal = handleHlsError(error);
           if (terminal && !resolved) {
             resolved = true;
+            releaseAbort();
             clearWatchdog();
             reject(new Error(error.details));
           }
         },
         onFragLoaded: () => {
+          if (session !== loadSession) return;
           if (networkRetryCount > 0 || mediaRetryCount > 0) {
             api?.logger.debug("Playback recovered, resetting retry budgets");
             networkRetryCount = 0;
@@ -748,17 +888,11 @@ function createHLSPlugin(config) {
       const timeout_ms = mergedConfig.loadTimeoutMs ?? 3e4;
       if (timeout_ms > 0) {
         watchdog = setTimeout(() => {
-          if (resolved) return;
+          if (resolved || session !== loadSession) return;
           resolved = true;
+          releaseAbort();
           api?.logger.error(`HLS load timed out after ${timeout_ms}ms`, { src });
-          if (retryTimeout) {
-            clearTimeout(retryTimeout);
-            retryTimeout = null;
-          }
-          cleanupHlsEvents?.();
-          cleanupHlsEvents = null;
-          hls?.destroy();
-          hls = null;
+          teardownPipeline();
           reject(new Error("Video took too long to load (network timeout)"));
         }, timeout_ms);
       }
@@ -805,6 +939,7 @@ function createHLSPlugin(config) {
   };
   const attemptReconnect = async () => {
     if (!api || !currentSrc) return;
+    const session = ++loadSession;
     reconnectAttempts++;
     const saved_src = currentSrc;
     const was_live = api.getState("live");
@@ -812,27 +947,19 @@ function createHLSPlugin(config) {
     const resume_position = reconnectResumePosition;
     api.logger.info(`Auto-reconnect attempt ${reconnectAttempts}`, { src: saved_src });
     try {
-      cleanupHlsEvents?.();
-      cleanupHlsEvents = null;
-      cleanupVideoEvents?.();
-      cleanupVideoEvents = null;
-      if (retryTimeout) {
-        clearTimeout(retryTimeout);
-        retryTimeout = null;
-      }
-      hls?.destroy();
-      hls = null;
+      teardownPipeline(new Error("HLS load cancelled: reconnecting"));
       networkRetryCount = 0;
       mediaRetryCount = 0;
       errorCount = 0;
       errorWindowStart = 0;
       currentSrc = saved_src;
       api.setState("playbackState", "loading");
-      if (was_native && supportsNativeHLS()) {
+      if (was_native && loader.supportsNativeHLS()) {
         await loadNative(saved_src);
       } else {
         await loadWithHlsJs(saved_src);
       }
+      if (session !== loadSession) return;
       if (!was_live && video && resume_position > 0) {
         video.currentTime = resume_position;
       }
@@ -846,18 +973,19 @@ function createHLSPlugin(config) {
       } catch {
       }
     } catch {
+      if (session !== loadSession) return;
       api?.logger.warn(`Auto-reconnect attempt ${reconnectAttempts} failed`);
       scheduleReconnectAttempt();
     }
   };
   const plugin = {
     id: "hls-provider",
-    name: "HLS Provider",
+    name: variant.name,
     version: "1.0.0",
     type: "provider",
-    description: "HLS playback provider using hls.js",
+    description: variant.description,
     canPlay(src) {
-      if (!isHLSSupported()) return false;
+      if (!loader.isHLSSupported()) return false;
       const url = src.toLowerCase();
       const urlWithoutQuery = url.split("?")[0].split("#")[0];
       if (urlWithoutQuery.endsWith(".m3u8")) return true;
@@ -867,7 +995,7 @@ function createHLSPlugin(config) {
     },
     async init(pluginApi) {
       api = pluginApi;
-      api.logger.info("HLS plugin initialized");
+      api.logger.info(`HLS plugin${variant.logSuffix} initialized`);
       const unsubPlay = api.on("playback:play", async () => {
         if (!video) return;
         try {
@@ -955,13 +1083,14 @@ function createHLSPlugin(config) {
       });
     },
     async destroy() {
-      api?.logger.info("HLS plugin destroying");
+      api?.logger.info(`HLS plugin${variant.logSuffix} destroying`);
+      loadSession++;
       cancelReconnect();
       if (onlineListener && typeof window !== "undefined") {
         window.removeEventListener("online", onlineListener);
         onlineListener = null;
       }
-      cleanup();
+      cleanup(new Error("HLS load cancelled: player destroyed"));
       if (video?.parentNode) {
         video.parentNode.removeChild(video);
       }
@@ -970,25 +1099,27 @@ function createHLSPlugin(config) {
     },
     async loadSource(src) {
       if (!api) throw new Error("Plugin not initialized");
-      api.logger.info("Loading HLS source", { src });
+      api.logger.info(`Loading HLS source${variant.logSuffix}`, { src });
+      const session = ++loadSession;
       cancelReconnect();
       hasPlayedContent = false;
-      cleanup();
+      cleanup(new Error("HLS load cancelled: superseded by a new load"));
       currentSrc = src;
       api.setState("playbackState", "loading");
       api.setState("buffering", true);
-      if (api.getState("airplayActive") && supportsNativeHLS()) {
+      if (api.getState("airplayActive") && loader.supportsNativeHLS()) {
         api.logger.info("Using native HLS (AirPlay active)");
         await loadNative(src);
-      } else if (isHlsJsSupported()) {
-        api.logger.info("Using hls.js for HLS playback");
+      } else if (loader.isHlsJsSupported()) {
+        api.logger.info(`Using ${variant.engineLabel} for HLS playback`);
         await loadWithHlsJs(src);
-      } else if (supportsNativeHLS()) {
+      } else if (loader.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 (session !== loadSession) return;
       if (video) {
         const muted = api.getState("muted");
         const volume = api.getState("volume");
@@ -1040,7 +1171,7 @@ function createHLSPlugin(config) {
         api?.logger.debug("Already using native HLS");
         return;
       }
-      if (!supportsNativeHLS()) {
+      if (!loader.supportsNativeHLS()) {
         api?.logger.warn("Native HLS not supported in this browser");
         return;
       }
@@ -1052,8 +1183,10 @@ function createHLSPlugin(config) {
       const wasPlaying = api?.getState("playing") || false;
       const currentTime = video?.currentTime || 0;
       const savedSrc = currentSrc;
-      cleanup();
+      const session = ++loadSession;
+      cleanup(new Error("HLS load cancelled: switching to native HLS"));
       await loadNative(savedSrc);
+      if (session !== loadSession) return;
       if (video && currentTime > 0) {
         video.currentTime = currentTime;
       }
@@ -1075,7 +1208,7 @@ function createHLSPlugin(config) {
         api?.logger.debug("Already using hls.js");
         return;
       }
-      if (!isHlsJsSupported()) {
+      if (!loader.isHlsJsSupported()) {
         api?.logger.warn("hls.js not supported in this browser");
         return;
       }
@@ -1087,8 +1220,10 @@ function createHLSPlugin(config) {
       const wasPlaying = api?.getState("playing") || false;
       const currentTime = video?.currentTime || 0;
       const savedSrc = currentSrc;
-      cleanup();
+      const session = ++loadSession;
+      cleanup(new Error("HLS load cancelled: switching to hls.js"));
       await loadWithHlsJs(savedSrc);
+      if (session !== loadSession) return;
       if (video && currentTime > 0) {
         video.currentTime = currentTime;
       }
@@ -1104,6 +1239,20 @@ function createHLSPlugin(config) {
   };
   return plugin;
 }
+
+// src/index.ts
+function createHLSPlugin(config) {
+  return createHLSPluginWith(
+    hls_loader_exports,
+    {
+      name: "HLS Provider",
+      description: "HLS playback provider using hls.js",
+      logSuffix: "",
+      engineLabel: "hls.js"
+    },
+    config
+  );
+}
 var index_default = createHLSPlugin;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.d.cts

@@ -1,17 +1,15 @@
-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 for Scarlett Player
  *
  * Provides HLS playback using hls.js or native HLS (Safari).
- * Features:
- * - Lazy loading of hls.js
- * - Native HLS fallback for Safari
- * - Quality level management
- * - Error recovery
- * - Live stream support
+ * Thin wrapper around the shared factory in `create-hls-plugin.ts`; the
+ * light entry (`light.ts`) wraps the same factory with the hls.js/light
+ * loader, so both builds always carry identical error handling, retry,
+ * reconnect, and playlist-validation machinery.
  */
 
 /**

package/dist/index.d.ts

@@ -1,17 +1,15 @@
-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 for Scarlett Player
  *
  * Provides HLS playback using hls.js or native HLS (Safari).
- * Features:
- * - Lazy loading of hls.js
- * - Native HLS fallback for Safari
- * - Quality level management
- * - Error recovery
- * - Live stream support
+ * Thin wrapper around the shared factory in `create-hls-plugin.ts`; the
+ * light entry (`light.ts`) wraps the same factory with the hls.js/light
+ * loader, so both builds always carry identical error handling, retry,
+ * reconnect, and playlist-validation machinery.
  */
 
 /**