@scarlett-player/hls 1.12.0 → 1.13.0

package/dist/{chunk-47MU7IVX.js → chunk-3KFYKCR2.js}

@@ -246,7 +246,7 @@ function setupHlsEventHandlers(hls, api, callbacks) {
     api.emit("quality:levels", {
       levels: levels.map((l) => ({ id: l.id, label: l.label }))
     });
-    callbacks.onManifestParsed?.(data.levels);
+    callbacks.onManifestParsed?.(data.levels, data);
   });
   addHandler("hlsLevelSwitched", (_event, data) => {
     const level = hls.levels[data.level];
@@ -455,12 +455,6 @@ function setupVideoEventHandlers(video, api, getLiveMetrics) {
   });
   addHandler("loadedmetadata", () => {
     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;
@@ -502,6 +496,119 @@ function setupVideoEventHandlers(video, api, getLiveMetrics) {
   };
 }
 
+// src/media-type.ts
+var ELEMENT_EVENTS = ["loadedmetadata", "loadeddata", "resize", "playing"];
+var TRACK_LIST_EVENTS = ["addtrack", "removetrack", "change"];
+var HAVE_METADATA = 1;
+function isTrackList(list) {
+  return typeof list === "object" && list !== null && typeof list.length === "number";
+}
+function createMediaTypeClassifier(api) {
+  let source = null;
+  let videoConfirmed = false;
+  let audioConfirmed = false;
+  let elementReported = false;
+  let element = null;
+  let elementDisposers = [];
+  let published = null;
+  let destroyed = false;
+  const decide = () => {
+    if (videoConfirmed) return "video";
+    if (audioConfirmed) return "audio";
+    return "unknown";
+  };
+  const publish = () => {
+    const next = decide();
+    if (next === published) return;
+    published = next;
+    api.setState("mediaType", next);
+  };
+  const readElement = () => {
+    const video = element;
+    if (!video) return;
+    if (elementReported && video.videoWidth > 0) {
+      videoConfirmed = true;
+      return;
+    }
+    if (video.readyState < HAVE_METADATA) return;
+    const videoTracks = video.videoTracks;
+    const audioTracks = video.audioTracks;
+    if (!isTrackList(videoTracks)) return;
+    if (videoTracks.length > 0) {
+      videoConfirmed = true;
+      return;
+    }
+    if (isTrackList(audioTracks) && audioTracks.length > 0) {
+      audioConfirmed = true;
+    }
+  };
+  const evaluate = () => {
+    if (destroyed) return;
+    readElement();
+    publish();
+  };
+  const detachElement = () => {
+    for (const off of elementDisposers) off();
+    elementDisposers = [];
+    element = null;
+  };
+  return {
+    beginSource(src) {
+      if (destroyed) return;
+      if (source === src) return;
+      source = src;
+      videoConfirmed = false;
+      audioConfirmed = false;
+      elementReported = false;
+      published = null;
+      publish();
+    },
+    attach(video) {
+      if (destroyed) return;
+      detachElement();
+      element = video;
+      elementReported = false;
+      for (const event of ELEMENT_EVENTS) {
+        const handler = () => {
+          elementReported = true;
+          evaluate();
+        };
+        video.addEventListener(event, handler);
+        elementDisposers.push(() => video.removeEventListener(event, handler));
+      }
+      for (const list of [element.videoTracks, element.audioTracks]) {
+        if (!isTrackList(list) || typeof list.addEventListener !== "function") continue;
+        for (const event of TRACK_LIST_EVENTS) {
+          const handler = () => evaluate();
+          list.addEventListener(event, handler);
+          elementDisposers.push(() => list.removeEventListener?.(event, handler));
+        }
+      }
+      evaluate();
+    },
+    noteManifestParsed(data) {
+      if (destroyed || !data) return;
+      const hasVideo = typeof data.video === "boolean" ? data.video : null;
+      const hasAudio = typeof data.audio === "boolean" ? data.audio : null;
+      if (hasVideo === true) {
+        videoConfirmed = true;
+      } else if (hasVideo === false && hasAudio === true) {
+        audioConfirmed = true;
+      }
+      publish();
+    },
+    evaluate,
+    current() {
+      return decide();
+    },
+    destroy() {
+      if (destroyed) return;
+      destroyed = true;
+      detachElement();
+    }
+  };
+}
+
 // src/playlist-validation.ts
 var PLAYLIST_INVALID_TEXT = "Invalid playlist document";
 var MEDIA_PLAYLIST_CONTEXTS = ["level", "audioTrack", "subtitleTrack"];
@@ -591,6 +698,7 @@ function createHLSPluginWith(loader, variant, config) {
   let cleanupHlsEvents = null;
   let cleanupVideoEvents = null;
   let isAutoQuality = true;
+  let mediaTypeClassifier = null;
   let lastLevelDetails = null;
   let lastLiveMetrics = null;
   let lastKnownTargetLatency = null;
@@ -948,6 +1056,8 @@ function createHLSPluginWith(loader, variant, config) {
     if (api) {
       cleanupVideoEvents = setupVideoEventHandlers(videoEl, api, readLiveMetrics);
     }
+    mediaTypeClassifier?.beginSource(src);
+    mediaTypeClassifier?.attach(videoEl);
     return new Promise((resolve, reject) => {
       let watchdog = null;
       let settled = false;
@@ -1041,6 +1151,8 @@ function createHLSPluginWith(loader, variant, config) {
     if (api) {
       cleanupVideoEvents = setupVideoEventHandlers(videoEl, api, readLiveMetrics);
     }
+    mediaTypeClassifier?.beginSource(src);
+    mediaTypeClassifier?.attach(videoEl);
     return new Promise((resolve, reject) => {
       if (!hls || !api) {
         reject(new Error("HLS not initialized"));
@@ -1067,8 +1179,9 @@ function createHLSPluginWith(loader, variant, config) {
         }
       };
       cleanupHlsEvents = setupHlsEventHandlers(hls, api, {
-        onManifestParsed: () => {
+        onManifestParsed: (_levels, manifestData) => {
           if (session !== loadSession) return;
+          mediaTypeClassifier?.noteManifestParsed(manifestData);
           if (!resolved) {
             resolved = true;
             releaseAbort();
@@ -1327,6 +1440,7 @@ function createHLSPluginWith(loader, variant, config) {
     async init(pluginApi) {
       api = pluginApi;
       api.logger.info(`HLS plugin${variant.logSuffix} initialized`);
+      mediaTypeClassifier = createMediaTypeClassifier(api);
       const unsubPlay = api.on("playback:play", async () => {
         if (!video) return;
         try {
@@ -1462,6 +1576,8 @@ function createHLSPluginWith(loader, variant, config) {
         onlineListener = null;
       }
       cleanup(new Error("HLS load cancelled: player destroyed"));
+      mediaTypeClassifier?.destroy();
+      mediaTypeClassifier = null;
       if (video?.parentNode) {
         video.parentNode.removeChild(video);
       }

package/dist/index.cjs

@@ -346,7 +346,7 @@ function setupHlsEventHandlers(hls, api, callbacks) {
     api.emit("quality:levels", {
       levels: levels.map((l) => ({ id: l.id, label: l.label }))
     });
-    callbacks.onManifestParsed?.(data.levels);
+    callbacks.onManifestParsed?.(data.levels, data);
   });
   addHandler("hlsLevelSwitched", (_event, data) => {
     const level = hls.levels[data.level];
@@ -555,12 +555,6 @@ function setupVideoEventHandlers(video, api, getLiveMetrics) {
   });
   addHandler("loadedmetadata", () => {
     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;
@@ -602,6 +596,119 @@ function setupVideoEventHandlers(video, api, getLiveMetrics) {
   };
 }
 
+// src/media-type.ts
+var ELEMENT_EVENTS = ["loadedmetadata", "loadeddata", "resize", "playing"];
+var TRACK_LIST_EVENTS = ["addtrack", "removetrack", "change"];
+var HAVE_METADATA = 1;
+function isTrackList(list) {
+  return typeof list === "object" && list !== null && typeof list.length === "number";
+}
+function createMediaTypeClassifier(api) {
+  let source = null;
+  let videoConfirmed = false;
+  let audioConfirmed = false;
+  let elementReported = false;
+  let element = null;
+  let elementDisposers = [];
+  let published = null;
+  let destroyed = false;
+  const decide = () => {
+    if (videoConfirmed) return "video";
+    if (audioConfirmed) return "audio";
+    return "unknown";
+  };
+  const publish = () => {
+    const next = decide();
+    if (next === published) return;
+    published = next;
+    api.setState("mediaType", next);
+  };
+  const readElement = () => {
+    const video = element;
+    if (!video) return;
+    if (elementReported && video.videoWidth > 0) {
+      videoConfirmed = true;
+      return;
+    }
+    if (video.readyState < HAVE_METADATA) return;
+    const videoTracks = video.videoTracks;
+    const audioTracks = video.audioTracks;
+    if (!isTrackList(videoTracks)) return;
+    if (videoTracks.length > 0) {
+      videoConfirmed = true;
+      return;
+    }
+    if (isTrackList(audioTracks) && audioTracks.length > 0) {
+      audioConfirmed = true;
+    }
+  };
+  const evaluate = () => {
+    if (destroyed) return;
+    readElement();
+    publish();
+  };
+  const detachElement = () => {
+    for (const off of elementDisposers) off();
+    elementDisposers = [];
+    element = null;
+  };
+  return {
+    beginSource(src) {
+      if (destroyed) return;
+      if (source === src) return;
+      source = src;
+      videoConfirmed = false;
+      audioConfirmed = false;
+      elementReported = false;
+      published = null;
+      publish();
+    },
+    attach(video) {
+      if (destroyed) return;
+      detachElement();
+      element = video;
+      elementReported = false;
+      for (const event of ELEMENT_EVENTS) {
+        const handler = () => {
+          elementReported = true;
+          evaluate();
+        };
+        video.addEventListener(event, handler);
+        elementDisposers.push(() => video.removeEventListener(event, handler));
+      }
+      for (const list of [element.videoTracks, element.audioTracks]) {
+        if (!isTrackList(list) || typeof list.addEventListener !== "function") continue;
+        for (const event of TRACK_LIST_EVENTS) {
+          const handler = () => evaluate();
+          list.addEventListener(event, handler);
+          elementDisposers.push(() => list.removeEventListener?.(event, handler));
+        }
+      }
+      evaluate();
+    },
+    noteManifestParsed(data) {
+      if (destroyed || !data) return;
+      const hasVideo = typeof data.video === "boolean" ? data.video : null;
+      const hasAudio = typeof data.audio === "boolean" ? data.audio : null;
+      if (hasVideo === true) {
+        videoConfirmed = true;
+      } else if (hasVideo === false && hasAudio === true) {
+        audioConfirmed = true;
+      }
+      publish();
+    },
+    evaluate,
+    current() {
+      return decide();
+    },
+    destroy() {
+      if (destroyed) return;
+      destroyed = true;
+      detachElement();
+    }
+  };
+}
+
 // src/playlist-validation.ts
 var PLAYLIST_INVALID_TEXT = "Invalid playlist document";
 var MEDIA_PLAYLIST_CONTEXTS = ["level", "audioTrack", "subtitleTrack"];
@@ -691,6 +798,7 @@ function createHLSPluginWith(loader, variant, config) {
   let cleanupHlsEvents = null;
   let cleanupVideoEvents = null;
   let isAutoQuality = true;
+  let mediaTypeClassifier = null;
   let lastLevelDetails = null;
   let lastLiveMetrics = null;
   let lastKnownTargetLatency = null;
@@ -1048,6 +1156,8 @@ function createHLSPluginWith(loader, variant, config) {
     if (api) {
       cleanupVideoEvents = setupVideoEventHandlers(videoEl, api, readLiveMetrics);
     }
+    mediaTypeClassifier?.beginSource(src);
+    mediaTypeClassifier?.attach(videoEl);
     return new Promise((resolve, reject) => {
       let watchdog = null;
       let settled = false;
@@ -1141,6 +1251,8 @@ function createHLSPluginWith(loader, variant, config) {
     if (api) {
       cleanupVideoEvents = setupVideoEventHandlers(videoEl, api, readLiveMetrics);
     }
+    mediaTypeClassifier?.beginSource(src);
+    mediaTypeClassifier?.attach(videoEl);
     return new Promise((resolve, reject) => {
       if (!hls || !api) {
         reject(new Error("HLS not initialized"));
@@ -1167,8 +1279,9 @@ function createHLSPluginWith(loader, variant, config) {
         }
       };
       cleanupHlsEvents = setupHlsEventHandlers(hls, api, {
-        onManifestParsed: () => {
+        onManifestParsed: (_levels, manifestData) => {
           if (session !== loadSession) return;
+          mediaTypeClassifier?.noteManifestParsed(manifestData);
           if (!resolved) {
             resolved = true;
             releaseAbort();
@@ -1427,6 +1540,7 @@ function createHLSPluginWith(loader, variant, config) {
     async init(pluginApi) {
       api = pluginApi;
       api.logger.info(`HLS plugin${variant.logSuffix} initialized`);
+      mediaTypeClassifier = createMediaTypeClassifier(api);
       const unsubPlay = api.on("playback:play", async () => {
         if (!video) return;
         try {
@@ -1562,6 +1676,8 @@ function createHLSPluginWith(loader, variant, config) {
         onlineListener = null;
       }
       cleanup(new Error("HLS load cancelled: player destroyed"));
+      mediaTypeClassifier?.destroy();
+      mediaTypeClassifier = null;
       if (video?.parentNode) {
         video.parentNode.removeChild(video);
       }

package/dist/index.js

@@ -4,7 +4,7 @@ import {
   computeLiveMetrics,
   createHLSPluginWith,
   sanitizeUrl
-} from "./chunk-47MU7IVX.js";
+} from "./chunk-3KFYKCR2.js";
 
 // src/hls-loader.ts
 var hls_loader_exports = {};

package/dist/light.cjs

@@ -346,7 +346,7 @@ function setupHlsEventHandlers(hls, api, callbacks) {
     api.emit("quality:levels", {
       levels: levels.map((l) => ({ id: l.id, label: l.label }))
     });
-    callbacks.onManifestParsed?.(data.levels);
+    callbacks.onManifestParsed?.(data.levels, data);
   });
   addHandler("hlsLevelSwitched", (_event, data) => {
     const level = hls.levels[data.level];
@@ -555,12 +555,6 @@ function setupVideoEventHandlers(video, api, getLiveMetrics) {
   });
   addHandler("loadedmetadata", () => {
     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;
@@ -602,6 +596,119 @@ function setupVideoEventHandlers(video, api, getLiveMetrics) {
   };
 }
 
+// src/media-type.ts
+var ELEMENT_EVENTS = ["loadedmetadata", "loadeddata", "resize", "playing"];
+var TRACK_LIST_EVENTS = ["addtrack", "removetrack", "change"];
+var HAVE_METADATA = 1;
+function isTrackList(list) {
+  return typeof list === "object" && list !== null && typeof list.length === "number";
+}
+function createMediaTypeClassifier(api) {
+  let source = null;
+  let videoConfirmed = false;
+  let audioConfirmed = false;
+  let elementReported = false;
+  let element = null;
+  let elementDisposers = [];
+  let published = null;
+  let destroyed = false;
+  const decide = () => {
+    if (videoConfirmed) return "video";
+    if (audioConfirmed) return "audio";
+    return "unknown";
+  };
+  const publish = () => {
+    const next = decide();
+    if (next === published) return;
+    published = next;
+    api.setState("mediaType", next);
+  };
+  const readElement = () => {
+    const video = element;
+    if (!video) return;
+    if (elementReported && video.videoWidth > 0) {
+      videoConfirmed = true;
+      return;
+    }
+    if (video.readyState < HAVE_METADATA) return;
+    const videoTracks = video.videoTracks;
+    const audioTracks = video.audioTracks;
+    if (!isTrackList(videoTracks)) return;
+    if (videoTracks.length > 0) {
+      videoConfirmed = true;
+      return;
+    }
+    if (isTrackList(audioTracks) && audioTracks.length > 0) {
+      audioConfirmed = true;
+    }
+  };
+  const evaluate = () => {
+    if (destroyed) return;
+    readElement();
+    publish();
+  };
+  const detachElement = () => {
+    for (const off of elementDisposers) off();
+    elementDisposers = [];
+    element = null;
+  };
+  return {
+    beginSource(src) {
+      if (destroyed) return;
+      if (source === src) return;
+      source = src;
+      videoConfirmed = false;
+      audioConfirmed = false;
+      elementReported = false;
+      published = null;
+      publish();
+    },
+    attach(video) {
+      if (destroyed) return;
+      detachElement();
+      element = video;
+      elementReported = false;
+      for (const event of ELEMENT_EVENTS) {
+        const handler = () => {
+          elementReported = true;
+          evaluate();
+        };
+        video.addEventListener(event, handler);
+        elementDisposers.push(() => video.removeEventListener(event, handler));
+      }
+      for (const list of [element.videoTracks, element.audioTracks]) {
+        if (!isTrackList(list) || typeof list.addEventListener !== "function") continue;
+        for (const event of TRACK_LIST_EVENTS) {
+          const handler = () => evaluate();
+          list.addEventListener(event, handler);
+          elementDisposers.push(() => list.removeEventListener?.(event, handler));
+        }
+      }
+      evaluate();
+    },
+    noteManifestParsed(data) {
+      if (destroyed || !data) return;
+      const hasVideo = typeof data.video === "boolean" ? data.video : null;
+      const hasAudio = typeof data.audio === "boolean" ? data.audio : null;
+      if (hasVideo === true) {
+        videoConfirmed = true;
+      } else if (hasVideo === false && hasAudio === true) {
+        audioConfirmed = true;
+      }
+      publish();
+    },
+    evaluate,
+    current() {
+      return decide();
+    },
+    destroy() {
+      if (destroyed) return;
+      destroyed = true;
+      detachElement();
+    }
+  };
+}
+
 // src/playlist-validation.ts
 var PLAYLIST_INVALID_TEXT = "Invalid playlist document";
 var MEDIA_PLAYLIST_CONTEXTS = ["level", "audioTrack", "subtitleTrack"];
@@ -691,6 +798,7 @@ function createHLSPluginWith(loader, variant, config) {
   let cleanupHlsEvents = null;
   let cleanupVideoEvents = null;
   let isAutoQuality = true;
+  let mediaTypeClassifier = null;
   let lastLevelDetails = null;
   let lastLiveMetrics = null;
   let lastKnownTargetLatency = null;
@@ -1048,6 +1156,8 @@ function createHLSPluginWith(loader, variant, config) {
     if (api) {
       cleanupVideoEvents = setupVideoEventHandlers(videoEl, api, readLiveMetrics);
     }
+    mediaTypeClassifier?.beginSource(src);
+    mediaTypeClassifier?.attach(videoEl);
     return new Promise((resolve, reject) => {
       let watchdog = null;
       let settled = false;
@@ -1141,6 +1251,8 @@ function createHLSPluginWith(loader, variant, config) {
     if (api) {
       cleanupVideoEvents = setupVideoEventHandlers(videoEl, api, readLiveMetrics);
     }
+    mediaTypeClassifier?.beginSource(src);
+    mediaTypeClassifier?.attach(videoEl);
     return new Promise((resolve, reject) => {
       if (!hls || !api) {
         reject(new Error("HLS not initialized"));
@@ -1167,8 +1279,9 @@ function createHLSPluginWith(loader, variant, config) {
         }
       };
       cleanupHlsEvents = setupHlsEventHandlers(hls, api, {
-        onManifestParsed: () => {
+        onManifestParsed: (_levels, manifestData) => {
           if (session !== loadSession) return;
+          mediaTypeClassifier?.noteManifestParsed(manifestData);
           if (!resolved) {
             resolved = true;
             releaseAbort();
@@ -1427,6 +1540,7 @@ function createHLSPluginWith(loader, variant, config) {
     async init(pluginApi) {
       api = pluginApi;
       api.logger.info(`HLS plugin${variant.logSuffix} initialized`);
+      mediaTypeClassifier = createMediaTypeClassifier(api);
       const unsubPlay = api.on("playback:play", async () => {
         if (!video) return;
         try {
@@ -1562,6 +1676,8 @@ function createHLSPluginWith(loader, variant, config) {
         onlineListener = null;
       }
       cleanup(new Error("HLS load cancelled: player destroyed"));
+      mediaTypeClassifier?.destroy();
+      mediaTypeClassifier = null;
       if (video?.parentNode) {
         video.parentNode.removeChild(video);
       }

package/dist/light.js

@@ -4,7 +4,7 @@ import {
   computeLiveMetrics,
   createHLSPluginWith,
   sanitizeUrl
-} from "./chunk-47MU7IVX.js";
+} from "./chunk-3KFYKCR2.js";
 
 // src/hls-loader-light.ts
 var hls_loader_light_exports = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scarlett-player/hls",
-  "version": "1.12.0",
+  "version": "1.13.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.12.0"
+    "@scarlett-player/core": "1.13.0"
   },
   "keywords": [
     "video",