@scarlett-player/hls 1.0.1 → 1.1.1

package/dist/{chunk-OEPNMGNQ.js → chunk-L73PRXS4.js}

@@ -137,6 +137,7 @@ function setupHlsEventHandlers(hls, api, callbacks) {
       lastBandwidthUpdate = now;
       api.setState("bandwidth", Math.round(hls.bandwidthEstimate));
     }
+    callbacks.onFragLoaded?.();
   });
   addHandler("hlsFragBuffered", () => {
     api.setState("buffering", false);
@@ -282,6 +283,11 @@ function setupVideoEventHandlers(video, api) {
     api.setState("duration", video.duration);
     api.setState("mediaType", video.videoWidth > 0 ? "video" : "audio");
   });
+  addHandler("loadeddata", () => {
+    if (video.videoWidth > 0) {
+      api.setState("mediaType", "video");
+    }
+  });
   addHandler("error", () => {
     const error = video.error;
     if (error) {

package/dist/index.cjs

@@ -34,6 +34,7 @@ __export(index_exports, {
   default: () => index_default
 });
 module.exports = __toCommonJS(index_exports);
+var import_core = require("@scarlett-player/core");
 
 // src/hls-loader.ts
 var hlsConstructor = null;
@@ -226,6 +227,7 @@ function setupHlsEventHandlers(hls, api, callbacks) {
       lastBandwidthUpdate = now;
       api.setState("bandwidth", Math.round(hls.bandwidthEstimate));
     }
+    callbacks.onFragLoaded?.();
   });
   addHandler("hlsFragBuffered", () => {
     api.setState("buffering", false);
@@ -371,6 +373,11 @@ function setupVideoEventHandlers(video, api) {
     api.setState("duration", video.duration);
     api.setState("mediaType", video.videoWidth > 0 ? "video" : "audio");
   });
+  addHandler("loadeddata", () => {
+    if (video.videoWidth > 0) {
+      api.setState("mediaType", "video");
+    }
+  });
   addHandler("error", () => {
     const error = video.error;
     if (error) {
@@ -426,8 +433,20 @@ var DEFAULT_CONFIG = {
   maxNetworkRetries: 3,
   maxMediaRetries: 2,
   retryDelayMs: 1e3,
-  retryBackoffFactor: 2
+  retryBackoffFactor: 2,
+  // Load watchdog: never leave the viewer on an endless spinner
+  loadTimeoutMs: 3e4,
+  // Self-healing: reconnect automatically after fatal errors mid-playback
+  autoReconnect: true,
+  reconnectBaseDelayMs: 2e3,
+  reconnectMaxDelayMs: 3e4,
+  reconnectWindowMs: 3e5
 };
+var MANIFEST_PHASE_ERRORS = [
+  "manifestLoadError",
+  "manifestLoadTimeOut",
+  "manifestParsingError"
+];
 function createHLSPlugin(config) {
   const mergedConfig = { ...DEFAULT_CONFIG, ...config };
   let api = null;
@@ -445,6 +464,12 @@ function createHLSPlugin(config) {
   let errorWindowStart = 0;
   const MAX_ERRORS_IN_WINDOW = 10;
   const ERROR_WINDOW_MS = 5e3;
+  let hasPlayedContent = false;
+  let reconnectTimer = null;
+  let reconnectAttempts = 0;
+  let reconnectWindowStart = 0;
+  let reconnectResumePosition = 0;
+  let onlineListener = null;
   const getOrCreateVideo = () => {
     if (video) return video;
     const existing = api?.container.querySelector("video");
@@ -513,21 +538,33 @@ function createHLSPlugin(config) {
     const jitter = delay * (0.7 + Math.random() * 0.3);
     return jitter;
   };
+  const mapFatalErrorCode = (error) => {
+    switch (error.type) {
+      case "network":
+        return import_core.ErrorCode.MEDIA_NETWORK_ERROR;
+      case "media":
+      case "mux":
+        return import_core.ErrorCode.MEDIA_DECODE_ERROR;
+      default:
+        return import_core.ErrorCode.PLAYBACK_FAILED;
+    }
+  };
   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",
+      code: mapFatalErrorCode(error),
       message,
       fatal: true,
       timestamp: Date.now()
     });
+    maybeScheduleReconnect(error);
   };
   const handleHlsError = (error) => {
     const Hls = getHlsConstructor();
-    if (!Hls || !hls) return;
+    if (!Hls || !hls) return false;
     const now = Date.now();
     if (now - errorWindowStart > ERROR_WINDOW_MS) {
       errorCount = 1;
@@ -542,7 +579,7 @@ function createHLSPlugin(config) {
       cleanupHlsEvents = null;
       hls.destroy();
       hls = null;
-      return;
+      return true;
     }
     if (error.fatal) {
       api?.logger.error("Fatal HLS error", { type: error.type, details: error.details });
@@ -552,7 +589,7 @@ function createHLSPlugin(config) {
           if (networkRetryCount >= maxRetries) {
             api?.logger.error(`Network error recovery failed after ${networkRetryCount} attempts`);
             emitFatalError(error, true);
-            return;
+            return true;
           }
           networkRetryCount++;
           const delay = getRetryDelay(networkRetryCount - 1);
@@ -561,8 +598,12 @@ function createHLSPlugin(config) {
           if (retryTimeout) {
             clearTimeout(retryTimeout);
           }
+          const isManifestPhase = MANIFEST_PHASE_ERRORS.includes(error.details);
           retryTimeout = setTimeout(() => {
-            if (hls) {
+            if (!hls) return;
+            if (isManifestPhase && currentSrc) {
+              hls.loadSource(currentSrc);
+            } else {
               hls.startLoad();
             }
           }, delay);
@@ -573,7 +614,7 @@ function createHLSPlugin(config) {
           if (mediaRetryCount >= maxRetries) {
             api?.logger.error(`Media error recovery failed after ${mediaRetryCount} attempts`);
             emitFatalError(error, true);
-            return;
+            return true;
           }
           mediaRetryCount++;
           const delay = getRetryDelay(mediaRetryCount - 1);
@@ -591,9 +632,10 @@ function createHLSPlugin(config) {
         }
         default:
           emitFatalError(error, false);
-          break;
+          return true;
       }
     }
+    return false;
   };
   const loadNative = async (src) => {
     const videoEl = getOrCreateVideo();
@@ -602,19 +644,50 @@ function createHLSPlugin(config) {
       cleanupVideoEvents = setupVideoEventHandlers(videoEl, api);
     }
     return new Promise((resolve, reject) => {
-      const onLoaded = () => {
+      let watchdog = null;
+      const settle = () => {
         videoEl.removeEventListener("loadedmetadata", onLoaded);
         videoEl.removeEventListener("error", onError);
+        if (watchdog !== null) {
+          clearTimeout(watchdog);
+          watchdog = null;
+        }
+      };
+      const onLoaded = () => {
+        settle();
+        hasPlayedContent = true;
+        const onFatalVideoError = () => {
+          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",
+            fatal: true
+          };
+          emitFatalError(hls_error, false);
+        };
+        videoEl.addEventListener("error", onFatalVideoError);
+        const removeFatalListener = () => videoEl.removeEventListener("error", onFatalVideoError);
+        const previous_cleanup = cleanupVideoEvents;
+        cleanupVideoEvents = () => {
+          removeFatalListener();
+          previous_cleanup?.();
+        };
         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);
+        settle();
         const error = videoEl.error;
         reject(new Error(error?.message || "Failed to load HLS source"));
       };
+      const timeout_ms = mergedConfig.loadTimeoutMs ?? 3e4;
+      if (timeout_ms > 0) {
+        watchdog = setTimeout(() => {
+          settle();
+          reject(new Error("Video took too long to load (network timeout)"));
+        }, timeout_ms);
+      }
       videoEl.addEventListener("loadedmetadata", onLoaded);
       videoEl.addEventListener("error", onError);
       videoEl.src = src;
@@ -635,10 +708,19 @@ function createHLSPlugin(config) {
         return;
       }
       let resolved = false;
+      let watchdog = null;
+      const clearWatchdog = () => {
+        if (watchdog !== null) {
+          clearTimeout(watchdog);
+          watchdog = null;
+        }
+      };
       cleanupHlsEvents = setupHlsEventHandlers(hls, api, {
         onManifestParsed: () => {
           if (!resolved) {
             resolved = true;
+            clearWatchdog();
+            hasPlayedContent = true;
             api?.setState("source", { src, type: "application/x-mpegURL" });
             api?.emit("media:loaded", { src, type: "application/x-mpegURL" });
             resolve();
@@ -647,18 +729,127 @@ function createHLSPlugin(config) {
         onLevelSwitched: () => {
         },
         onError: (error) => {
-          handleHlsError(error);
-          if (error.fatal && !resolved && error.type !== "network" && error.type !== "media") {
+          const terminal = handleHlsError(error);
+          if (terminal && !resolved) {
             resolved = true;
+            clearWatchdog();
             reject(new Error(error.details));
           }
         },
+        onFragLoaded: () => {
+          if (networkRetryCount > 0 || mediaRetryCount > 0) {
+            api?.logger.debug("Playback recovered, resetting retry budgets");
+            networkRetryCount = 0;
+            mediaRetryCount = 0;
+          }
+        },
         getIsAutoQuality: () => isAutoQuality
       });
+      const timeout_ms = mergedConfig.loadTimeoutMs ?? 3e4;
+      if (timeout_ms > 0) {
+        watchdog = setTimeout(() => {
+          if (resolved) return;
+          resolved = true;
+          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;
+          reject(new Error("Video took too long to load (network timeout)"));
+        }, timeout_ms);
+      }
       hls.attachMedia(videoEl);
       hls.loadSource(src);
     });
   };
+  const cancelReconnect = () => {
+    if (reconnectTimer) {
+      clearTimeout(reconnectTimer);
+      reconnectTimer = null;
+    }
+    reconnectAttempts = 0;
+    reconnectWindowStart = 0;
+    reconnectResumePosition = 0;
+  };
+  const scheduleReconnectAttempt = () => {
+    if (reconnectTimer) return;
+    const window_ms = mergedConfig.reconnectWindowMs ?? 3e5;
+    if (Date.now() - reconnectWindowStart > window_ms) {
+      api?.logger.warn(`Auto-reconnect window exhausted after ${reconnectAttempts} attempts`);
+      return;
+    }
+    const base_delay = mergedConfig.reconnectBaseDelayMs ?? 2e3;
+    const max_delay = mergedConfig.reconnectMaxDelayMs ?? 3e4;
+    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 });
+    reconnectTimer = setTimeout(() => {
+      reconnectTimer = null;
+      void attemptReconnect();
+    }, delay);
+  };
+  const maybeScheduleReconnect = (error) => {
+    if (mergedConfig.autoReconnect === false) return;
+    if (!hasPlayedContent || !currentSrc) return;
+    if (error.type !== "network" && error.type !== "media") return;
+    if (reconnectWindowStart === 0) {
+      reconnectWindowStart = Date.now();
+      reconnectResumePosition = video?.currentTime ?? 0;
+    }
+    scheduleReconnectAttempt();
+  };
+  const attemptReconnect = async () => {
+    if (!api || !currentSrc) return;
+    reconnectAttempts++;
+    const saved_src = currentSrc;
+    const was_live = api.getState("live");
+    const was_native = isNative;
+    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;
+      networkRetryCount = 0;
+      mediaRetryCount = 0;
+      errorCount = 0;
+      errorWindowStart = 0;
+      currentSrc = saved_src;
+      api.setState("playbackState", "loading");
+      if (was_native && supportsNativeHLS()) {
+        await loadNative(saved_src);
+      } else {
+        await loadWithHlsJs(saved_src);
+      }
+      if (!was_live && video && resume_position > 0) {
+        video.currentTime = resume_position;
+      }
+      api.setState("playbackState", "ready");
+      api.setState("buffering", false);
+      api.emit("error:recovered", void 0);
+      api.logger.info("Auto-reconnect succeeded");
+      cancelReconnect();
+      try {
+        await video?.play();
+      } catch {
+      }
+    } catch {
+      api?.logger.warn(`Auto-reconnect attempt ${reconnectAttempts} failed`);
+      scheduleReconnectAttempt();
+    }
+  };
   const plugin = {
     id: "hls-provider",
     name: "HLS Provider",
@@ -742,6 +933,17 @@ function createHLSPlugin(config) {
           }
         }
       });
+      if (typeof window !== "undefined") {
+        onlineListener = () => {
+          if (reconnectTimer) {
+            api?.logger.info("Browser back online, reconnecting immediately");
+            clearTimeout(reconnectTimer);
+            reconnectTimer = null;
+            void attemptReconnect();
+          }
+        };
+        window.addEventListener("online", onlineListener);
+      }
       api.onDestroy(() => {
         unsubPlay();
         unsubPause();
@@ -754,6 +956,11 @@ function createHLSPlugin(config) {
     },
     async destroy() {
       api?.logger.info("HLS plugin destroying");
+      cancelReconnect();
+      if (onlineListener && typeof window !== "undefined") {
+        window.removeEventListener("online", onlineListener);
+        onlineListener = null;
+      }
       cleanup();
       if (video?.parentNode) {
         video.parentNode.removeChild(video);
@@ -764,6 +971,8 @@ function createHLSPlugin(config) {
     async loadSource(src) {
       if (!api) throw new Error("Plugin not initialized");
       api.logger.info("Loading HLS source", { src });
+      cancelReconnect();
+      hasPlayedContent = false;
       cleanup();
       currentSrc = src;
       api.setState("playbackState", "loading");

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { H as HLSPluginConfig, I as IHLSPlugin } from './types-CRKmNxEW.cjs';
-export { a as HLSError, b as HLSLiveInfo, c as HLSQualityLevel } from './types-CRKmNxEW.cjs';
+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 '@scarlett-player/core';
 
 /**

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { H as HLSPluginConfig, I as IHLSPlugin } from './types-CRKmNxEW.js';
-export { a as HLSError, b as HLSLiveInfo, c as HLSQualityLevel } from './types-CRKmNxEW.js';
+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 '@scarlett-player/core';
 
 /**

package/dist/index.js

@@ -4,7 +4,10 @@ import {
   mapLevels,
   setupHlsEventHandlers,
   setupVideoEventHandlers
-} from "./chunk-OEPNMGNQ.js";
+} from "./chunk-L73PRXS4.js";
+
+// src/index.ts
+import { ErrorCode } from "@scarlett-player/core";
 
 // src/hls-loader.ts
 var hlsConstructor = null;
@@ -73,8 +76,20 @@ var DEFAULT_CONFIG = {
   maxNetworkRetries: 3,
   maxMediaRetries: 2,
   retryDelayMs: 1e3,
-  retryBackoffFactor: 2
+  retryBackoffFactor: 2,
+  // Load watchdog: never leave the viewer on an endless spinner
+  loadTimeoutMs: 3e4,
+  // Self-healing: reconnect automatically after fatal errors mid-playback
+  autoReconnect: true,
+  reconnectBaseDelayMs: 2e3,
+  reconnectMaxDelayMs: 3e4,
+  reconnectWindowMs: 3e5
 };
+var MANIFEST_PHASE_ERRORS = [
+  "manifestLoadError",
+  "manifestLoadTimeOut",
+  "manifestParsingError"
+];
 function createHLSPlugin(config) {
   const mergedConfig = { ...DEFAULT_CONFIG, ...config };
   let api = null;
@@ -92,6 +107,12 @@ function createHLSPlugin(config) {
   let errorWindowStart = 0;
   const MAX_ERRORS_IN_WINDOW = 10;
   const ERROR_WINDOW_MS = 5e3;
+  let hasPlayedContent = false;
+  let reconnectTimer = null;
+  let reconnectAttempts = 0;
+  let reconnectWindowStart = 0;
+  let reconnectResumePosition = 0;
+  let onlineListener = null;
   const getOrCreateVideo = () => {
     if (video) return video;
     const existing = api?.container.querySelector("video");
@@ -160,21 +181,33 @@ function createHLSPlugin(config) {
     const jitter = delay * (0.7 + Math.random() * 0.3);
     return jitter;
   };
+  const mapFatalErrorCode = (error) => {
+    switch (error.type) {
+      case "network":
+        return ErrorCode.MEDIA_NETWORK_ERROR;
+      case "media":
+      case "mux":
+        return ErrorCode.MEDIA_DECODE_ERROR;
+      default:
+        return ErrorCode.PLAYBACK_FAILED;
+    }
+  };
   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",
+      code: mapFatalErrorCode(error),
       message,
       fatal: true,
       timestamp: Date.now()
     });
+    maybeScheduleReconnect(error);
   };
   const handleHlsError = (error) => {
     const Hls = getHlsConstructor();
-    if (!Hls || !hls) return;
+    if (!Hls || !hls) return false;
     const now = Date.now();
     if (now - errorWindowStart > ERROR_WINDOW_MS) {
       errorCount = 1;
@@ -189,7 +222,7 @@ function createHLSPlugin(config) {
       cleanupHlsEvents = null;
       hls.destroy();
       hls = null;
-      return;
+      return true;
     }
     if (error.fatal) {
       api?.logger.error("Fatal HLS error", { type: error.type, details: error.details });
@@ -199,7 +232,7 @@ function createHLSPlugin(config) {
           if (networkRetryCount >= maxRetries) {
             api?.logger.error(`Network error recovery failed after ${networkRetryCount} attempts`);
             emitFatalError(error, true);
-            return;
+            return true;
           }
           networkRetryCount++;
           const delay = getRetryDelay(networkRetryCount - 1);
@@ -208,8 +241,12 @@ function createHLSPlugin(config) {
           if (retryTimeout) {
             clearTimeout(retryTimeout);
           }
+          const isManifestPhase = MANIFEST_PHASE_ERRORS.includes(error.details);
           retryTimeout = setTimeout(() => {
-            if (hls) {
+            if (!hls) return;
+            if (isManifestPhase && currentSrc) {
+              hls.loadSource(currentSrc);
+            } else {
               hls.startLoad();
             }
           }, delay);
@@ -220,7 +257,7 @@ function createHLSPlugin(config) {
           if (mediaRetryCount >= maxRetries) {
             api?.logger.error(`Media error recovery failed after ${mediaRetryCount} attempts`);
             emitFatalError(error, true);
-            return;
+            return true;
           }
           mediaRetryCount++;
           const delay = getRetryDelay(mediaRetryCount - 1);
@@ -238,9 +275,10 @@ function createHLSPlugin(config) {
         }
         default:
           emitFatalError(error, false);
-          break;
+          return true;
       }
     }
+    return false;
   };
   const loadNative = async (src) => {
     const videoEl = getOrCreateVideo();
@@ -249,19 +287,50 @@ function createHLSPlugin(config) {
       cleanupVideoEvents = setupVideoEventHandlers(videoEl, api);
     }
     return new Promise((resolve, reject) => {
-      const onLoaded = () => {
+      let watchdog = null;
+      const settle = () => {
         videoEl.removeEventListener("loadedmetadata", onLoaded);
         videoEl.removeEventListener("error", onError);
+        if (watchdog !== null) {
+          clearTimeout(watchdog);
+          watchdog = null;
+        }
+      };
+      const onLoaded = () => {
+        settle();
+        hasPlayedContent = true;
+        const onFatalVideoError = () => {
+          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",
+            fatal: true
+          };
+          emitFatalError(hls_error, false);
+        };
+        videoEl.addEventListener("error", onFatalVideoError);
+        const removeFatalListener = () => videoEl.removeEventListener("error", onFatalVideoError);
+        const previous_cleanup = cleanupVideoEvents;
+        cleanupVideoEvents = () => {
+          removeFatalListener();
+          previous_cleanup?.();
+        };
         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);
+        settle();
         const error = videoEl.error;
         reject(new Error(error?.message || "Failed to load HLS source"));
       };
+      const timeout_ms = mergedConfig.loadTimeoutMs ?? 3e4;
+      if (timeout_ms > 0) {
+        watchdog = setTimeout(() => {
+          settle();
+          reject(new Error("Video took too long to load (network timeout)"));
+        }, timeout_ms);
+      }
       videoEl.addEventListener("loadedmetadata", onLoaded);
       videoEl.addEventListener("error", onError);
       videoEl.src = src;
@@ -282,10 +351,19 @@ function createHLSPlugin(config) {
         return;
       }
       let resolved = false;
+      let watchdog = null;
+      const clearWatchdog = () => {
+        if (watchdog !== null) {
+          clearTimeout(watchdog);
+          watchdog = null;
+        }
+      };
       cleanupHlsEvents = setupHlsEventHandlers(hls, api, {
         onManifestParsed: () => {
           if (!resolved) {
             resolved = true;
+            clearWatchdog();
+            hasPlayedContent = true;
             api?.setState("source", { src, type: "application/x-mpegURL" });
             api?.emit("media:loaded", { src, type: "application/x-mpegURL" });
             resolve();
@@ -294,18 +372,127 @@ function createHLSPlugin(config) {
         onLevelSwitched: () => {
         },
         onError: (error) => {
-          handleHlsError(error);
-          if (error.fatal && !resolved && error.type !== "network" && error.type !== "media") {
+          const terminal = handleHlsError(error);
+          if (terminal && !resolved) {
             resolved = true;
+            clearWatchdog();
             reject(new Error(error.details));
           }
         },
+        onFragLoaded: () => {
+          if (networkRetryCount > 0 || mediaRetryCount > 0) {
+            api?.logger.debug("Playback recovered, resetting retry budgets");
+            networkRetryCount = 0;
+            mediaRetryCount = 0;
+          }
+        },
         getIsAutoQuality: () => isAutoQuality
       });
+      const timeout_ms = mergedConfig.loadTimeoutMs ?? 3e4;
+      if (timeout_ms > 0) {
+        watchdog = setTimeout(() => {
+          if (resolved) return;
+          resolved = true;
+          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;
+          reject(new Error("Video took too long to load (network timeout)"));
+        }, timeout_ms);
+      }
       hls.attachMedia(videoEl);
       hls.loadSource(src);
     });
   };
+  const cancelReconnect = () => {
+    if (reconnectTimer) {
+      clearTimeout(reconnectTimer);
+      reconnectTimer = null;
+    }
+    reconnectAttempts = 0;
+    reconnectWindowStart = 0;
+    reconnectResumePosition = 0;
+  };
+  const scheduleReconnectAttempt = () => {
+    if (reconnectTimer) return;
+    const window_ms = mergedConfig.reconnectWindowMs ?? 3e5;
+    if (Date.now() - reconnectWindowStart > window_ms) {
+      api?.logger.warn(`Auto-reconnect window exhausted after ${reconnectAttempts} attempts`);
+      return;
+    }
+    const base_delay = mergedConfig.reconnectBaseDelayMs ?? 2e3;
+    const max_delay = mergedConfig.reconnectMaxDelayMs ?? 3e4;
+    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 });
+    reconnectTimer = setTimeout(() => {
+      reconnectTimer = null;
+      void attemptReconnect();
+    }, delay);
+  };
+  const maybeScheduleReconnect = (error) => {
+    if (mergedConfig.autoReconnect === false) return;
+    if (!hasPlayedContent || !currentSrc) return;
+    if (error.type !== "network" && error.type !== "media") return;
+    if (reconnectWindowStart === 0) {
+      reconnectWindowStart = Date.now();
+      reconnectResumePosition = video?.currentTime ?? 0;
+    }
+    scheduleReconnectAttempt();
+  };
+  const attemptReconnect = async () => {
+    if (!api || !currentSrc) return;
+    reconnectAttempts++;
+    const saved_src = currentSrc;
+    const was_live = api.getState("live");
+    const was_native = isNative;
+    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;
+      networkRetryCount = 0;
+      mediaRetryCount = 0;
+      errorCount = 0;
+      errorWindowStart = 0;
+      currentSrc = saved_src;
+      api.setState("playbackState", "loading");
+      if (was_native && supportsNativeHLS()) {
+        await loadNative(saved_src);
+      } else {
+        await loadWithHlsJs(saved_src);
+      }
+      if (!was_live && video && resume_position > 0) {
+        video.currentTime = resume_position;
+      }
+      api.setState("playbackState", "ready");
+      api.setState("buffering", false);
+      api.emit("error:recovered", void 0);
+      api.logger.info("Auto-reconnect succeeded");
+      cancelReconnect();
+      try {
+        await video?.play();
+      } catch {
+      }
+    } catch {
+      api?.logger.warn(`Auto-reconnect attempt ${reconnectAttempts} failed`);
+      scheduleReconnectAttempt();
+    }
+  };
   const plugin = {
     id: "hls-provider",
     name: "HLS Provider",
@@ -389,6 +576,17 @@ function createHLSPlugin(config) {
           }
         }
       });
+      if (typeof window !== "undefined") {
+        onlineListener = () => {
+          if (reconnectTimer) {
+            api?.logger.info("Browser back online, reconnecting immediately");
+            clearTimeout(reconnectTimer);
+            reconnectTimer = null;
+            void attemptReconnect();
+          }
+        };
+        window.addEventListener("online", onlineListener);
+      }
       api.onDestroy(() => {
         unsubPlay();
         unsubPause();
@@ -401,6 +599,11 @@ function createHLSPlugin(config) {
     },
     async destroy() {
       api?.logger.info("HLS plugin destroying");
+      cancelReconnect();
+      if (onlineListener && typeof window !== "undefined") {
+        window.removeEventListener("online", onlineListener);
+        onlineListener = null;
+      }
       cleanup();
       if (video?.parentNode) {
         video.parentNode.removeChild(video);
@@ -411,6 +614,8 @@ function createHLSPlugin(config) {
     async loadSource(src) {
       if (!api) throw new Error("Plugin not initialized");
       api.logger.info("Loading HLS source", { src });
+      cancelReconnect();
+      hasPlayedContent = false;
       cleanup();
       currentSrc = src;
       api.setState("playbackState", "loading");

package/dist/light.cjs

@@ -214,6 +214,7 @@ function setupHlsEventHandlers(hls, api, callbacks) {
       lastBandwidthUpdate = now;
       api.setState("bandwidth", Math.round(hls.bandwidthEstimate));
     }
+    callbacks.onFragLoaded?.();
   });
   addHandler("hlsFragBuffered", () => {
     api.setState("buffering", false);
@@ -359,6 +360,11 @@ function setupVideoEventHandlers(video, api) {
     api.setState("duration", video.duration);
     api.setState("mediaType", video.videoWidth > 0 ? "video" : "audio");
   });
+  addHandler("loadeddata", () => {
+    if (video.videoWidth > 0) {
+      api.setState("mediaType", "video");
+    }
+  });
   addHandler("error", () => {
     const error = video.error;
     if (error) {

package/dist/light.d.cts

@@ -1,5 +1,5 @@
-import { H as HLSPluginConfig, I as IHLSPlugin } from './types-CRKmNxEW.cjs';
-export { a as HLSError, b as HLSLiveInfo, c as HLSQualityLevel } from './types-CRKmNxEW.cjs';
+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 '@scarlett-player/core';
 
 /**

package/dist/light.d.ts

@@ -1,5 +1,5 @@
-import { H as HLSPluginConfig, I as IHLSPlugin } from './types-CRKmNxEW.js';
-export { a as HLSError, b as HLSLiveInfo, c as HLSQualityLevel } from './types-CRKmNxEW.js';
+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 '@scarlett-player/core';
 
 /**

package/dist/light.js

@@ -3,7 +3,7 @@ import {
   mapLevels,
   setupHlsEventHandlers,
   setupVideoEventHandlers
-} from "./chunk-OEPNMGNQ.js";
+} from "./chunk-L73PRXS4.js";
 
 // src/hls-loader-light.ts
 var hlsConstructor = null;

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

@@ -34,6 +34,24 @@ interface HLSPluginConfig {
     retryDelayMs?: number;
     /** Exponential backoff multiplier (default: 2) */
     retryBackoffFactor?: number;
+    /**
+     * Watchdog for source loading in milliseconds (default: 30000, 0 disables).
+     * If the manifest has not parsed within this window the load fails with an
+     * error instead of leaving the viewer on a spinner forever.
+     */
+    loadTimeoutMs?: number;
+    /**
+     * Automatically attempt to reconnect after a fatal network/media error
+     * once the stream had been playing (default: true). Viewers should not
+     * have to press anything when a connection blip resolves itself.
+     */
+    autoReconnect?: boolean;
+    /** First auto-reconnect delay in milliseconds (default: 2000) */
+    reconnectBaseDelayMs?: number;
+    /** Cap for the auto-reconnect backoff in milliseconds (default: 30000) */
+    reconnectMaxDelayMs?: number;
+    /** Total window to keep auto-reconnecting in milliseconds (default: 300000 = 5 min) */
+    reconnectWindowMs?: number;
     /** Index signature for PluginConfig compatibility */
     [key: string]: unknown;
 }
@@ -102,4 +120,4 @@ interface IHLSPlugin extends Plugin<HLSPluginConfig> {
     switchToHlsJs(): Promise<void>;
 }
 
-export type { HLSPluginConfig as H, IHLSPlugin as I, HLSError as a, HLSLiveInfo as b, HLSQualityLevel as c };
+export type { HLSPluginConfig as H, IHLSPlugin as I, HLSQualityLevel as a, HLSError as b, HLSLiveInfo as c };

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

@@ -34,6 +34,24 @@ interface HLSPluginConfig {
     retryDelayMs?: number;
     /** Exponential backoff multiplier (default: 2) */
     retryBackoffFactor?: number;
+    /**
+     * Watchdog for source loading in milliseconds (default: 30000, 0 disables).
+     * If the manifest has not parsed within this window the load fails with an
+     * error instead of leaving the viewer on a spinner forever.
+     */
+    loadTimeoutMs?: number;
+    /**
+     * Automatically attempt to reconnect after a fatal network/media error
+     * once the stream had been playing (default: true). Viewers should not
+     * have to press anything when a connection blip resolves itself.
+     */
+    autoReconnect?: boolean;
+    /** First auto-reconnect delay in milliseconds (default: 2000) */
+    reconnectBaseDelayMs?: number;
+    /** Cap for the auto-reconnect backoff in milliseconds (default: 30000) */
+    reconnectMaxDelayMs?: number;
+    /** Total window to keep auto-reconnecting in milliseconds (default: 300000 = 5 min) */
+    reconnectWindowMs?: number;
     /** Index signature for PluginConfig compatibility */
     [key: string]: unknown;
 }
@@ -102,4 +120,4 @@ interface IHLSPlugin extends Plugin<HLSPluginConfig> {
     switchToHlsJs(): Promise<void>;
 }
 
-export type { HLSPluginConfig as H, IHLSPlugin as I, HLSError as a, HLSLiveInfo as b, HLSQualityLevel as c };
+export type { HLSPluginConfig as H, IHLSPlugin as I, HLSQualityLevel as a, HLSError as b, HLSLiveInfo as c };

package/package.json

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