@geekapps/silo-elements-nextjs 0.3.23 → 0.3.25

package/dist/VideoPlayer.js

@@ -107,14 +107,23 @@ var CHANNEL_LABELS = {
 };
 function friendlyAudioLabel(rawName, lang, codec, channels) {
   const langKey = (lang ?? "").toLowerCase();
-  const langLabel = LANG_NAMES[langKey] ?? (lang ? lang.toUpperCase() : null);
-  const codecKey = Object.keys(CODEC_LABELS).find((k) => codec.toLowerCase().includes(k));
+  const langLabel = LANG_NAMES[langKey] ?? (lang && lang.toLowerCase() !== "und" ? lang.toUpperCase() : "Original");
+  const chNum = typeof channels === "string" ? parseInt(channels, 10) : channels ?? 0;
+  const searchIn = [codec, rawName ?? ""].join(" ").toLowerCase();
+  const codecKey = Object.keys(CODEC_LABELS).find((k) => searchIn.includes(k));
   const codecLabel = codecKey ? CODEC_LABELS[codecKey] : null;
-  const chLabel = channels ? CHANNEL_LABELS[channels] ?? `${channels}ch` : null;
-  const looksHuman = rawName && !/^(und|dts|ac3|eac3|aac|opus|truehd|atmos|\w{2,3}-\d+ch|\w{2})/i.test(rawName) && rawName.length > 1;
-  const baseName = looksHuman ? rawName : langLabel ?? "\xC1udio";
+  let resolvedCh = chNum > 0 ? chNum : 0;
+  if (!resolvedCh && rawName) {
+    const m = rawName.match(/(\d+)\.(\d+)/) ?? rawName.match(/(\d+)\s*ch/i);
+    if (m) {
+      if (m[2] !== void 0) resolvedCh = parseInt(m[1], 10) + (parseInt(m[2], 10) > 0 ? 1 : 0);
+      else resolvedCh = parseInt(m[1], 10);
+    } else if (/stereo/i.test(rawName)) resolvedCh = 2;
+    else if (/mono/i.test(rawName)) resolvedCh = 1;
+  }
+  const chLabel = resolvedCh ? CHANNEL_LABELS[resolvedCh] ?? `${resolvedCh}ch` : null;
   const suffix = [codecLabel, chLabel].filter(Boolean).join(" ");
-  return suffix ? `${baseName} \u2014 ${suffix}` : baseName;
+  return suffix ? `${langLabel} \u2014 ${suffix}` : langLabel;
 }
 function isHdrLevel(level) {
   const range = level?.videoRange ?? level?.video_range ?? "";
@@ -776,6 +785,54 @@ function Video({
       try {
         const response = await fetch(parsed.storyboard.src);
         if (!response.ok) throw new Error("Storyboard not found");
+        const contentType = response.headers.get("content-type") ?? "";
+        if (contentType.includes("application/json")) {
+          const json = await response.json();
+          if (json.resolutions && Object.keys(json.resolutions).length > 0) {
+            storyboardCacheRef.current.clear();
+            preloadedSpritesRef.current.clear();
+            const RES_ORDER = ["180p", "240p", "360p", "480p", "default"];
+            const keys = Object.keys(json.resolutions).sort((a, b) => {
+              const ai = RES_ORDER.indexOf(a);
+              const bi = RES_ORDER.indexOf(b);
+              return (ai === -1 ? 99 : ai) - (bi === -1 ? 99 : bi);
+            });
+            const loadResFromApi = async (key) => {
+              if (cancelled) return;
+              const res = json.resolutions[key];
+              if (!res) return;
+              const vttResp = await fetch(res.vttUrl);
+              if (!vttResp.ok) return;
+              const vttText = await vttResp.text();
+              const cues2 = parseStoryboardVtt(vttText, res.vttUrl);
+              storyboardCacheRef.current.set(key, cues2);
+              const firstSprite = cues2[0]?.image;
+              if (firstSprite && !preloadedSpritesRef.current.has(firstSprite)) {
+                preloadedSpritesRef.current.add(firstSprite);
+                const img = new window.Image();
+                img.src = firstSprite;
+              }
+              return cues2;
+            };
+            const firstCues = await loadResFromApi(keys[0]);
+            if (!cancelled && firstCues) {
+              setStoryboardCues(firstCues);
+              setActiveStoryboardRes(keys[0]);
+            }
+            for (const key of keys.slice(1)) await loadResFromApi(key);
+            return;
+          }
+          if (json.url) {
+            const vttResp = await fetch(json.url);
+            if (vttResp.ok) {
+              const text2 = await vttResp.text();
+              const spriteUrl = json.url.replace(/\/vtt(\?|$)/, "/sprite$1");
+              const cues2 = parseStoryboardVtt(text2, spriteUrl);
+              if (!cancelled) setStoryboardCues(cues2);
+            }
+          }
+          return;
+        }
         const text = await response.text();
         const cues = parseStoryboardVtt(text, new URL(parsed.storyboard.src, window.location.href).href);
         if (!cancelled) setStoryboardCues(cues);
@@ -1014,9 +1071,11 @@ function Video({
                   const failedTrack = hls.audioTrack;
                   if (failedTrack >= 0 && pinnedAudio === -1) {
                     failedAudioTracks.add(failedTrack);
-                    console.warn("[Silo/hls] audio track", failedTrack, "failed \u2014 trying next");
+                    console.warn("[Silo/hls] audio track", failedTrack, "failed \u2014 recovering MSE and trying next");
+                    hls.recoverMediaError();
                     tryNextAudioTrack2();
                   }
+                  return;
                 }
                 if (data.details === Hls.ErrorDetails.BUFFER_STALLED_ERROR && pinnedLevel >= 0) {
                   stalledOnPinnedLevel += 1;