BlueGit

timfa filemanager

sub cache

timfa Tim Falken · pushed by timfa

Authored 2026-05-25 · 5 months ago

Hash
b94258875fd95d45b6ea124e6388915a136a62fd
Parent
b942d635
4 files changed +325 −110
.github/technical-reference.md +2 −1
@@ -182,7 +182,7 @@
182 182 ## public/shared-video-player.js
183 183 - applyDefaultTextTrackPrefs() - Writes the default Video.js caption override settings (transparent background, uniform edge style) so all streamed players start from the same text-track baseline.
184 184 - bindTrackPrefs(player, prefs, savePrefs) - Restores subtitle/audio track selections by track name and persists later track changes; shared by the authenticated player and the share page so both resolve track matches the same way.
185 - bindImageSubtitleOverlay(player, videojs, prefs, session, opts) - Adds the shared IM button/menu/overlay for bitmap subtitle tracks, restores saved image-subtitle selections, fetches rendered frames through a caller-supplied request builder, keeps a separate rolling lookahead-prefetch worker alive across timeupdates (including gaps where no subtitle is currently visible), extends prefetch target to at least the latest buffered video end (not only fixed lookahead seconds), coalesces overlapping current-frame refreshes into a single in-flight fetch (only force-refresh paths abort/restart), applies per-request timeouts (`currentRequestTimeoutMs`, `prefetchRequestTimeoutMs`) so hung subtitle frame requests cannot stall updates indefinitely, paces prefetch polling (`prefetchRequestIntervalMs`) to reduce request bursts, logs current and prefetch subtitle request/send/receive/not-available timing to the browser console and optional batch sink, updates seek-bar bracket markers only after responses resolve (no in-flight jump-back flicker), shows a merged `[]` marker when requested and received positions match, advances markers even when responses are 204/no-frame, and disables the track after the first hard failure.
185 - bindImageSubtitleOverlay(player, videojs, prefs, session, opts) - Adds the shared IM button/menu/overlay for bitmap subtitle tracks, restores saved image-subtitle selections, fetches rendered frames through a caller-supplied request builder, keeps a separate rolling lookahead-prefetch worker alive across timeupdates (including gaps where no subtitle is currently visible), extends prefetch target to at least the latest buffered video end (not only fixed lookahead seconds), coalesces overlapping current-frame refreshes into a single in-flight fetch (only force-refresh paths abort/restart), applies per-request timeouts (`currentRequestTimeoutMs`, `prefetchRequestTimeoutMs`) so hung subtitle frame requests cannot stall updates indefinitely, paces prefetch polling (`prefetchRequestIntervalMs`) to reduce request bursts, logs current and prefetch subtitle request/send/receive/not-available timing to the browser console and optional batch sink, caches received subtitle PNG frames client-side for the lifetime of the player session (including prefetched frames) so rewind playback can render from local cache even after server-side purge, updates seek-bar bracket markers only after responses resolve (no in-flight jump-back flicker), keeps both marker positions forward-only (never regressing to earlier times), allows the two bracket glyphs to overlap naturally when positions match, advances markers even when responses are 204/no-frame, and disables the track after the first hard failure.
186 186 - configureVideoJsBuffering(videojs, opts) - Applies the long forward-buffer settings used for file playback when VHS exposes those knobs.
187 187 - ensureVideoPlaybackUi(player, durationSeconds) - Forces file streams into VOD UI mode, normalises the reported duration, stops live-tracker state, and hides the live badge when present.
188 188
@@ -244,6 +244,7 @@
244 244 - openGlobalFaviconPicker() - Opens a debounced, server-backed image-search modal across all accessible roots and sets/clears global favicon via `/files/global-favicon`.
245 245 - refreshGlobalFavicon() - Reads `/files/global-favicon`, updates admin-panel favicon preview button, and applies/removes the page `<link rel="icon">` URL.
246 246 - refreshAdminOrphanUserFolders() - Fetches `/admin/orphan-userfolders`, conditionally renders orphaned folder rows, and wires "Open folder" navigation for admins.
247 - openAdminModal() / refreshAdminConfig() / refreshAdminUsers() / refreshAdminOrphanUserFolders() - Admin modal refresh chain now captures stable DOM references and exits safely when the document is torn down, preventing async teardown races from throwing post-close errors in tests or quick navigation flows.
247 248 - refreshAfterIconChange(item) - Resets and reloads the folder icon in both the grid tile and sidebar after set/clear operations.
248 249 - disconnectFolderIconObserver() - Disconnects and clears the folder icon IntersectionObserver on grid rebuild.
249 250 - getThumbnailKind(name) - Classifies files into image/text/badge thumbnail strategies.
@@ -182,7 +182,7 @@
182## public/shared-video-player.js
182## public/shared-video-player.js
183- applyDefaultTextTrackPrefs() - Writes the default Video.js caption override settings (transparent background, uniform edge style) so all streamed players start from the same text-track baseline.
183- applyDefaultTextTrackPrefs() - Writes the default Video.js caption override settings (transparent background, uniform edge style) so all streamed players start from the same text-track baseline.
184- bindTrackPrefs(player, prefs, savePrefs) - Restores subtitle/audio track selections by track name and persists later track changes; shared by the authenticated player and the share page so both resolve track matches the same way.
184- bindTrackPrefs(player, prefs, savePrefs) - Restores subtitle/audio track selections by track name and persists later track changes; shared by the authenticated player and the share page so both resolve track matches the same way.
185- bindImageSubtitleOverlay(player, videojs, prefs, session, opts) - Adds the shared IM button/menu/overlay for bitmap subtitle tracks, restores saved image-subtitle selections, fetches rendered frames through a caller-supplied request builder, keeps a separate rolling lookahead-prefetch worker alive across timeupdates (including gaps where no subtitle is currently visible), extends prefetch target to at least the latest buffered video end (not only fixed lookahead seconds), coalesces overlapping current-frame refreshes into a single in-flight fetch (only force-refresh paths abort/restart), applies per-request timeouts (`currentRequestTimeoutMs`, `prefetchRequestTimeoutMs`) so hung subtitle frame requests cannot stall updates indefinitely, paces prefetch polling (`prefetchRequestIntervalMs`) to reduce request bursts, logs current and prefetch subtitle request/send/receive/not-available timing to the browser console and optional batch sink, updates seek-bar bracket markers only after responses resolve (no in-flight jump-back flicker), shows a merged `[]` marker when requested and received positions match, advances markers even when responses are 204/no-frame, and disables the track after the first hard failure.
185- bindImageSubtitleOverlay(player, videojs, prefs, session, opts) - Adds the shared IM button/menu/overlay for bitmap subtitle tracks, restores saved image-subtitle selections, fetches rendered frames through a caller-supplied request builder, keeps a separate rolling lookahead-prefetch worker alive across timeupdates (including gaps where no subtitle is currently visible), extends prefetch target to at least the latest buffered video end (not only fixed lookahead seconds), coalesces overlapping current-frame refreshes into a single in-flight fetch (only force-refresh paths abort/restart), applies per-request timeouts (`currentRequestTimeoutMs`, `prefetchRequestTimeoutMs`) so hung subtitle frame requests cannot stall updates indefinitely, paces prefetch polling (`prefetchRequestIntervalMs`) to reduce request bursts, logs current and prefetch subtitle request/send/receive/not-available timing to the browser console and optional batch sink, caches received subtitle PNG frames client-side for the lifetime of the player session (including prefetched frames) so rewind playback can render from local cache even after server-side purge, updates seek-bar bracket markers only after responses resolve (no in-flight jump-back flicker), keeps both marker positions forward-only (never regressing to earlier times), allows the two bracket glyphs to overlap naturally when positions match, advances markers even when responses are 204/no-frame, and disables the track after the first hard failure.
186- configureVideoJsBuffering(videojs, opts) - Applies the long forward-buffer settings used for file playback when VHS exposes those knobs.
186- configureVideoJsBuffering(videojs, opts) - Applies the long forward-buffer settings used for file playback when VHS exposes those knobs.
187- ensureVideoPlaybackUi(player, durationSeconds) - Forces file streams into VOD UI mode, normalises the reported duration, stops live-tracker state, and hides the live badge when present.
187- ensureVideoPlaybackUi(player, durationSeconds) - Forces file streams into VOD UI mode, normalises the reported duration, stops live-tracker state, and hides the live badge when present.
188
188
@@ -244,6 +244,7 @@
244- openGlobalFaviconPicker() - Opens a debounced, server-backed image-search modal across all accessible roots and sets/clears global favicon via `/files/global-favicon`.
244- openGlobalFaviconPicker() - Opens a debounced, server-backed image-search modal across all accessible roots and sets/clears global favicon via `/files/global-favicon`.
245- refreshGlobalFavicon() - Reads `/files/global-favicon`, updates admin-panel favicon preview button, and applies/removes the page `<link rel="icon">` URL.
245- refreshGlobalFavicon() - Reads `/files/global-favicon`, updates admin-panel favicon preview button, and applies/removes the page `<link rel="icon">` URL.
246- refreshAdminOrphanUserFolders() - Fetches `/admin/orphan-userfolders`, conditionally renders orphaned folder rows, and wires "Open folder" navigation for admins.
246- refreshAdminOrphanUserFolders() - Fetches `/admin/orphan-userfolders`, conditionally renders orphaned folder rows, and wires "Open folder" navigation for admins.
247- openAdminModal() / refreshAdminConfig() / refreshAdminUsers() / refreshAdminOrphanUserFolders() - Admin modal refresh chain now captures stable DOM references and exits safely when the document is torn down, preventing async teardown races from throwing post-close errors in tests or quick navigation flows.
247- refreshAfterIconChange(item) - Resets and reloads the folder icon in both the grid tile and sidebar after set/clear operations.
248- refreshAfterIconChange(item) - Resets and reloads the folder icon in both the grid tile and sidebar after set/clear operations.
248- disconnectFolderIconObserver() - Disconnects and clears the folder icon IntersectionObserver on grid rebuild.
249- disconnectFolderIconObserver() - Disconnects and clears the folder icon IntersectionObserver on grid rebuild.
249- getThumbnailKind(name) - Classifies files into image/text/badge thumbnail strategies.
250- getThumbnailKind(name) - Classifies files into image/text/badge thumbnail strategies.
public/app.js +27 −14
@@ -5585,7 +5585,10 @@ function pulseAdminUpdateButton ()
5585 5585
5586 5586 async function openAdminModal ()
5587 5587 {
5588 document.getElementById('admin-modal').classList.remove('hidden');
5588 if (typeof document === 'undefined' || typeof document.getElementById !== 'function') return;
5589 const adminModal = document.getElementById('admin-modal');
5590 if (!adminModal) return;
5591 adminModal.classList.remove('hidden');
5589 5592 await refreshGlobalFavicon();
5590 5593 await refreshAdminConfig();
5591 5594 await refreshAdminUsers();
@@ -5594,11 +5597,14 @@ async function openAdminModal ()
5594 5597
5595 5598 async function refreshAdminConfig ()
5596 5599 {
5600 if (typeof document === 'undefined' || typeof document.getElementById !== 'function') return;
5601 const doc = document;
5597 5602 const data = await api('GET', '/admin/config');
5598 5603 if (!data) return;
5604 if (!doc.defaultView || doc.defaultView.closed) return;
5599 5605
5600 const userPathInput = document.getElementById('admin-user-path');
5601 const sizeInput = document.getElementById('admin-user-size-limit');
5606 const userPathInput = doc.getElementById('admin-user-path');
5607 const sizeInput = doc.getElementById('admin-user-size-limit');
5602 5608 if (userPathInput) userPathInput.value = data.userPath || '';
5603 5609 if (sizeInput)
5604 5610 {
@@ -5606,11 +5612,12 @@ async function refreshAdminConfig ()
5606 5612 updateAdminSizeFeedback(sizeInput.value);
5607 5613 }
5608 5614
5609 const container = document.getElementById('admin-paths');
5615 const container = doc.getElementById('admin-paths');
5616 if (!container) return;
5610 5617 container.innerHTML = '';
5611 5618 for (const p of data.paths)
5612 5619 {
5613 const row = document.createElement('div');
5620 const row = doc.createElement('div');
5614 5621 row.className = 'path-row';
5615 5622 row.innerHTML = `<span>${p}</span><button data-path="${p}" title="Remove">✕</button>`;
5616 5623 row.querySelector('button').addEventListener('click', () =>
@@ -5624,19 +5631,22 @@ async function refreshAdminConfig ()
5624 5631 async function refreshAdminUsers ()
5625 5632 {
5626 5633 if (typeof document === 'undefined' || typeof document.getElementById !== 'function') return;
5634 const doc = document;
5627 5635 const data = await api('GET', '/admin/users');
5628 5636 if (!data) return;
5629 const container = document.getElementById('admin-users-list');
5637 if (!doc.defaultView || doc.defaultView.closed) return;
5638 const container = doc.getElementById('admin-users-list');
5630 5639 if (!container) return;
5631 5640 container.innerHTML = '';
5632 5641
5633 5642 // Need paths for permission rows
5634 5643 const cfg = await api('GET', '/admin/config');
5644 if (!doc.defaultView || doc.defaultView.closed) return;
5635 5645 const paths = cfg ? (cfg.effectivePaths || []) : [];
5636 5646
5637 5647 for (const u of data.users)
5638 5648 {
5639 const row = document.createElement('div');
5649 const row = doc.createElement('div');
5640 5650 row.className = 'user-row';
5641 5651 row.innerHTML = `
5642 5652 <span class="user-name">${u.username}</span>
@@ -5666,8 +5676,9 @@ async function refreshAdminUsers ()
5666 5676 async function refreshAdminOrphanUserFolders ()
5667 5677 {
5668 5678 if (typeof document === 'undefined' || typeof document.getElementById !== 'function') return;
5669 const section = document.getElementById('admin-orphan-userfolders-section');
5670 const list = document.getElementById('admin-orphan-userfolders-list');
5679 const doc = document;
5680 const section = doc.getElementById('admin-orphan-userfolders-section');
5681 const list = doc.getElementById('admin-orphan-userfolders-list');
5671 5682 if (!section || !list) return;
5672 5683
5673 5684 let data = null;
@@ -5680,6 +5691,7 @@ async function refreshAdminOrphanUserFolders ()
5680 5691 list.innerHTML = '';
5681 5692 return;
5682 5693 }
5694 if (!doc.defaultView || doc.defaultView.closed) return;
5683 5695
5684 5696 const folders = Array.isArray(data && data.folders) ? data.folders : [];
5685 5697 if (!folders.length)
@@ -5694,19 +5706,19 @@ async function refreshAdminOrphanUserFolders ()
5694 5706
5695 5707 for (const folder of folders)
5696 5708 {
5697 const row = document.createElement('div');
5709 const row = doc.createElement('div');
5698 5710 row.className = 'user-row orphan-folder-row';
5699 5711
5700 const name = document.createElement('span');
5712 const name = doc.createElement('span');
5701 5713 name.className = 'user-name';
5702 5714 name.textContent = folder.folderName || 'Unknown folder';
5703 5715
5704 const info = document.createElement('span');
5716 const info = doc.createElement('span');
5705 5717 info.className = 'orphan-folder-meta';
5706 5718 const itemCount = Number(folder.itemCount) || 0;
5707 5719 info.textContent = `${itemCount} item${itemCount === 1 ? '' : 's'}`;
5708 5720
5709 const openBtn = document.createElement('button');
5721 const openBtn = doc.createElement('button');
5710 5722 openBtn.dataset.action = 'open-orphan-folder';
5711 5723 openBtn.textContent = 'Open folder';
5712 5724 openBtn.addEventListener('click', async () =>
@@ -5725,7 +5737,8 @@ async function refreshAdminOrphanUserFolders ()
5725 5737 isOrphanUserFolder: true,
5726 5738 };
5727 5739 await navigateTo(targetPath, syntheticRoot);
5728 document.getElementById('admin-modal').classList.add('hidden');
5740 const adminModal = doc.getElementById('admin-modal');
5741 if (adminModal) adminModal.classList.add('hidden');
5729 5742 } catch (err)
5730 5743 {
5731 5744 toast(err.message || 'Failed to open folder.', 'err');
@@ -5585,7 +5585,10 @@ function pulseAdminUpdateButton ()
5585
5585
5586async function openAdminModal ()
5586async function openAdminModal ()
5587{
5587{
5588 document.getElementById('admin-modal').classList.remove('hidden');
5588 if (typeof document === 'undefined' || typeof document.getElementById !== 'function') return;
5589 const adminModal = document.getElementById('admin-modal');
5590 if (!adminModal) return;
5591 adminModal.classList.remove('hidden');
5589 await refreshGlobalFavicon();
5592 await refreshGlobalFavicon();
5590 await refreshAdminConfig();
5593 await refreshAdminConfig();
5591 await refreshAdminUsers();
5594 await refreshAdminUsers();
@@ -5594,11 +5597,14 @@ async function openAdminModal ()
5594
5597
5595async function refreshAdminConfig ()
5598async function refreshAdminConfig ()
5596{
5599{
5600 if (typeof document === 'undefined' || typeof document.getElementById !== 'function') return;
5601 const doc = document;
5597 const data = await api('GET', '/admin/config');
5602 const data = await api('GET', '/admin/config');
5598 if (!data) return;
5603 if (!data) return;
5604 if (!doc.defaultView || doc.defaultView.closed) return;
5599
5605
5600 const userPathInput = document.getElementById('admin-user-path');
5606 const userPathInput = doc.getElementById('admin-user-path');
5601 const sizeInput = document.getElementById('admin-user-size-limit');
5607 const sizeInput = doc.getElementById('admin-user-size-limit');
5602 if (userPathInput) userPathInput.value = data.userPath || '';
5608 if (userPathInput) userPathInput.value = data.userPath || '';
5603 if (sizeInput)
5609 if (sizeInput)
5604 {
5610 {
@@ -5606,11 +5612,12 @@ async function refreshAdminConfig ()
5606 updateAdminSizeFeedback(sizeInput.value);
5612 updateAdminSizeFeedback(sizeInput.value);
5607 }
5613 }
5608
5614
5609 const container = document.getElementById('admin-paths');
5615 const container = doc.getElementById('admin-paths');
5616 if (!container) return;
5610 container.innerHTML = '';
5617 container.innerHTML = '';
5611 for (const p of data.paths)
5618 for (const p of data.paths)
5612 {
5619 {
5613 const row = document.createElement('div');
5620 const row = doc.createElement('div');
5614 row.className = 'path-row';
5621 row.className = 'path-row';
5615 row.innerHTML = `<span>${p}</span><button data-path="${p}" title="Remove">✕</button>`;
5622 row.innerHTML = `<span>${p}</span><button data-path="${p}" title="Remove">✕</button>`;
5616 row.querySelector('button').addEventListener('click', () =>
5623 row.querySelector('button').addEventListener('click', () =>
@@ -5624,19 +5631,22 @@ async function refreshAdminConfig ()
5624async function refreshAdminUsers ()
5631async function refreshAdminUsers ()
5625{
5632{
5626 if (typeof document === 'undefined' || typeof document.getElementById !== 'function') return;
5633 if (typeof document === 'undefined' || typeof document.getElementById !== 'function') return;
5634 const doc = document;
5627 const data = await api('GET', '/admin/users');
5635 const data = await api('GET', '/admin/users');
5628 if (!data) return;
5636 if (!data) return;
5629 const container = document.getElementById('admin-users-list');
5637 if (!doc.defaultView || doc.defaultView.closed) return;
5638 const container = doc.getElementById('admin-users-list');
5630 if (!container) return;
5639 if (!container) return;
5631 container.innerHTML = '';
5640 container.innerHTML = '';
5632
5641
5633 // Need paths for permission rows
5642 // Need paths for permission rows
5634 const cfg = await api('GET', '/admin/config');
5643 const cfg = await api('GET', '/admin/config');
5644 if (!doc.defaultView || doc.defaultView.closed) return;
5635 const paths = cfg ? (cfg.effectivePaths || []) : [];
5645 const paths = cfg ? (cfg.effectivePaths || []) : [];
5636
5646
5637 for (const u of data.users)
5647 for (const u of data.users)
5638 {
5648 {
5639 const row = document.createElement('div');
5649 const row = doc.createElement('div');
5640 row.className = 'user-row';
5650 row.className = 'user-row';
5641 row.innerHTML = `
5651 row.innerHTML = `
5642 <span class="user-name">${u.username}</span>
5652 <span class="user-name">${u.username}</span>
@@ -5666,8 +5676,9 @@ async function refreshAdminUsers ()
5666async function refreshAdminOrphanUserFolders ()
5676async function refreshAdminOrphanUserFolders ()
5667{
5677{
5668 if (typeof document === 'undefined' || typeof document.getElementById !== 'function') return;
5678 if (typeof document === 'undefined' || typeof document.getElementById !== 'function') return;
5669 const section = document.getElementById('admin-orphan-userfolders-section');
5679 const doc = document;
5670 const list = document.getElementById('admin-orphan-userfolders-list');
5680 const section = doc.getElementById('admin-orphan-userfolders-section');
5681 const list = doc.getElementById('admin-orphan-userfolders-list');
5671 if (!section || !list) return;
5682 if (!section || !list) return;
5672
5683
5673 let data = null;
5684 let data = null;
@@ -5680,6 +5691,7 @@ async function refreshAdminOrphanUserFolders ()
5680 list.innerHTML = '';
5691 list.innerHTML = '';
5681 return;
5692 return;
5682 }
5693 }
5694 if (!doc.defaultView || doc.defaultView.closed) return;
5683
5695
5684 const folders = Array.isArray(data && data.folders) ? data.folders : [];
5696 const folders = Array.isArray(data && data.folders) ? data.folders : [];
5685 if (!folders.length)
5697 if (!folders.length)
@@ -5694,19 +5706,19 @@ async function refreshAdminOrphanUserFolders ()
5694
5706
5695 for (const folder of folders)
5707 for (const folder of folders)
5696 {
5708 {
5697 const row = document.createElement('div');
5709 const row = doc.createElement('div');
5698 row.className = 'user-row orphan-folder-row';
5710 row.className = 'user-row orphan-folder-row';
5699
5711
5700 const name = document.createElement('span');
5712 const name = doc.createElement('span');
5701 name.className = 'user-name';
5713 name.className = 'user-name';
5702 name.textContent = folder.folderName || 'Unknown folder';
5714 name.textContent = folder.folderName || 'Unknown folder';
5703
5715
5704 const info = document.createElement('span');
5716 const info = doc.createElement('span');
5705 info.className = 'orphan-folder-meta';
5717 info.className = 'orphan-folder-meta';
5706 const itemCount = Number(folder.itemCount) || 0;
5718 const itemCount = Number(folder.itemCount) || 0;
5707 info.textContent = `${itemCount} item${itemCount === 1 ? '' : 's'}`;
5719 info.textContent = `${itemCount} item${itemCount === 1 ? '' : 's'}`;
5708
5720
5709 const openBtn = document.createElement('button');
5721 const openBtn = doc.createElement('button');
5710 openBtn.dataset.action = 'open-orphan-folder';
5722 openBtn.dataset.action = 'open-orphan-folder';
5711 openBtn.textContent = 'Open folder';
5723 openBtn.textContent = 'Open folder';
5712 openBtn.addEventListener('click', async () =>
5724 openBtn.addEventListener('click', async () =>
@@ -5725,7 +5737,8 @@ async function refreshAdminOrphanUserFolders ()
5725 isOrphanUserFolder: true,
5737 isOrphanUserFolder: true,
5726 };
5738 };
5727 await navigateTo(targetPath, syntheticRoot);
5739 await navigateTo(targetPath, syntheticRoot);
5728 document.getElementById('admin-modal').classList.add('hidden');
5740 const adminModal = doc.getElementById('admin-modal');
5741 if (adminModal) adminModal.classList.add('hidden');
5729 } catch (err)
5742 } catch (err)
5730 {
5743 {
5731 toast(err.message || 'Failed to open folder.', 'err');
5744 toast(err.message || 'Failed to open folder.', 'err');
public/shared-video-player.js +180 −75
@@ -304,12 +304,12 @@
304 304 let seekMarkerContainerEl = null;
305 305 let seekMarkerRequestedEl = null;
306 306 let seekMarkerReceivedEl = null;
307 let seekMarkerCombinedEl = null;
308 307 let lastRequestedCaptionStartTimeSeconds = null;
309 308 let lastReceivedCaptionStartTimeSeconds = null;
310 309 let subtitleLogSequence = 0;
311 310 let subtitleLogQueue = [];
312 311 let subtitleLogFlushTimer = null;
312 const cachedSubtitleFrames = new Map();
313 313
314 314 const flushSubtitleLogs = () =>
315 315 {
@@ -439,11 +439,7 @@
439 439
440 440 const closeObjectUrl = () =>
441 441 {
442 if (activeObjectUrl)
443 {
444 URL.revokeObjectURL(activeObjectUrl);
445 activeObjectUrl = null;
446 }
442 activeObjectUrl = null;
447 443 };
448 444
449 445 const hideOverlay = () =>
@@ -453,6 +449,142 @@
453 449 closeObjectUrl();
454 450 };
455 451
452 const revokeCachedFrameUrls = () =>
453 {
454 for (const frame of cachedSubtitleFrames.values())
455 {
456 if (!frame || !frame.objectUrl) continue;
457 try
458 {
459 URL.revokeObjectURL(frame.objectUrl);
460 } catch
461 {
462 // Ignore object URL cleanup races.
463 }
464 }
465 cachedSubtitleFrames.clear();
466 };
467
468 const parseFrameMetadata = (res, fallbackStartTimeSeconds) =>
469 {
470 const rawStart = parseHeaderFloat(res, 'X-Subtitle-Frame-Start-Time');
471 const startTimeSeconds = Number.isFinite(rawStart) && rawStart >= 0
472 ? rawStart
473 : (Number.isFinite(fallbackStartTimeSeconds) && fallbackStartTimeSeconds >= 0 ? fallbackStartTimeSeconds : null);
474
475 const rawEnd = parseHeaderFloat(res, 'X-Subtitle-Frame-End-Time');
476 const endTimeSeconds = Number.isFinite(rawEnd)
477 ? rawEnd
478 : (Number.isFinite(startTimeSeconds) ? startTimeSeconds + IMAGE_SUBTITLE_PREFETCH_STEP_SECONDS : null);
479
480 const frameWidth = Number.parseInt(String(res.headers.get('X-Subtitle-Frame-Width') || ''), 10);
481 const frameHeight = Number.parseInt(String(res.headers.get('X-Subtitle-Frame-Height') || ''), 10);
482 const canvasWidth = Number.parseInt(String(res.headers.get('X-Subtitle-Frame-Canvas-Width') || ''), 10);
483 const canvasHeight = Number.parseInt(String(res.headers.get('X-Subtitle-Frame-Canvas-Height') || ''), 10);
484
485 return {
486 startTimeSeconds,
487 endTimeSeconds,
488 frameWidth,
489 frameHeight,
490 canvasWidth,
491 canvasHeight,
492 };
493 };
494
495 const cacheFrameKey = (streamIndex, startTimeSeconds, endTimeSeconds) =>
496 {
497 const startPart = Number.isFinite(startTimeSeconds) ? startTimeSeconds.toFixed(6) : 'none';
498 const endPart = Number.isFinite(endTimeSeconds) ? endTimeSeconds.toFixed(6) : 'none';
499 return `${streamIndex}|${startPart}|${endPart}`;
500 };
501
502 const cacheSubtitleFrame = ({ streamIndex, blob, metadata }) =>
503 {
504 if (!Number.isInteger(streamIndex) || streamIndex < 0) return null;
505 if (!blob || typeof blob.size !== 'number' || blob.size <= 0) return null;
506
507 const startTimeSeconds = Number.isFinite(metadata && metadata.startTimeSeconds) ? metadata.startTimeSeconds : null;
508 const endTimeSeconds = Number.isFinite(metadata && metadata.endTimeSeconds)
509 ? metadata.endTimeSeconds
510 : (Number.isFinite(startTimeSeconds) ? startTimeSeconds + IMAGE_SUBTITLE_PREFETCH_STEP_SECONDS : null);
511 if (!Number.isFinite(startTimeSeconds) || !Number.isFinite(endTimeSeconds) || endTimeSeconds <= startTimeSeconds)
512 {
513 return null;
514 }
515
516 const key = cacheFrameKey(streamIndex, startTimeSeconds, endTimeSeconds);
517 const objectUrl = URL.createObjectURL(blob);
518 const previous = cachedSubtitleFrames.get(key);
519 if (previous && previous.objectUrl)
520 {
521 try
522 {
523 URL.revokeObjectURL(previous.objectUrl);
524 } catch
525 {
526 // Ignore object URL cleanup races.
527 }
528 }
529
530 const entry = {
531 key,
532 streamIndex,
533 startTimeSeconds,
534 endTimeSeconds,
535 objectUrl,
536 frameWidth: Number(metadata && metadata.frameWidth),
537 frameHeight: Number(metadata && metadata.frameHeight),
538 canvasWidth: Number(metadata && metadata.canvasWidth),
539 canvasHeight: Number(metadata && metadata.canvasHeight),
540 };
541 cachedSubtitleFrames.set(key, entry);
542 return entry;
543 };
544
545 const findCachedFrameForTime = (streamIndex, currentTime) =>
546 {
547 if (!Number.isInteger(streamIndex) || streamIndex < 0) return null;
548 if (!Number.isFinite(currentTime) || currentTime < 0) return null;
549
550 let best = null;
551 for (const frame of cachedSubtitleFrames.values())
552 {
553 if (!frame || frame.streamIndex !== streamIndex) continue;
554 if (!Number.isFinite(frame.startTimeSeconds) || !Number.isFinite(frame.endTimeSeconds)) continue;
555 if (currentTime < frame.startTimeSeconds || currentTime >= frame.endTimeSeconds) continue;
556 if (!best || frame.startTimeSeconds > best.startTimeSeconds) best = frame;
557 }
558 return best;
559 };
560
561 const renderSubtitleFrame = (frame) =>
562 {
563 if (!overlayEl || !overlayImgEl || !frame || !frame.objectUrl) return;
564
565 activeObjectUrl = frame.objectUrl;
566 overlayImgEl.src = frame.objectUrl;
567
568 if (frame.frameWidth > 0 && frame.frameHeight > 0 && frame.canvasWidth > 0 && frame.canvasHeight > 0)
569 {
570 const widthPercent = (frame.frameWidth / frame.canvasWidth) * 100;
571 const heightPercent = (frame.frameHeight / frame.canvasHeight) * 100;
572 overlayImgEl.style.width = `${widthPercent}%`;
573 overlayImgEl.style.height = `${heightPercent}%`;
574 overlayImgEl.style.maxWidth = 'none';
575 overlayImgEl.style.maxHeight = 'none';
576 } else
577 {
578 overlayImgEl.style.width = 'auto';
579 overlayImgEl.style.height = 'auto';
580 overlayImgEl.style.maxWidth = '100%';
581 overlayImgEl.style.maxHeight = '100%';
582 }
583
584 overlayEl.style.display = 'block';
585 overlayImgEl.style.display = 'block';
586 };
587
456 588 const setSeekMarkerTime = (kind, timeSeconds) =>
457 589 {
458 590 const numericTime = Number(timeSeconds);
@@ -460,23 +592,34 @@
460 592
461 593 if (kind === 'requested')
462 594 {
463 lastRequestedCaptionStartTimeSeconds = nextTime;
595 if (nextTime === null)
596 {
597 lastRequestedCaptionStartTimeSeconds = null;
598 } else if (!Number.isFinite(lastRequestedCaptionStartTimeSeconds) || nextTime >= lastRequestedCaptionStartTimeSeconds)
599 {
600 lastRequestedCaptionStartTimeSeconds = nextTime;
601 }
464 602 } else if (kind === 'received')
465 603 {
466 lastReceivedCaptionStartTimeSeconds = nextTime;
604 if (nextTime === null)
605 {
606 lastReceivedCaptionStartTimeSeconds = null;
607 } else if (!Number.isFinite(lastReceivedCaptionStartTimeSeconds) || nextTime >= lastReceivedCaptionStartTimeSeconds)
608 {
609 lastReceivedCaptionStartTimeSeconds = nextTime;
610 }
467 611 }
468 612 };
469 613
470 614 const updateSeekBarMarkers = () =>
471 615 {
472 if (!seekMarkerRequestedEl || !seekMarkerReceivedEl || !seekMarkerCombinedEl) return;
616 if (!seekMarkerRequestedEl || !seekMarkerReceivedEl) return;
473 617
474 618 const duration = Number(player.duration && player.duration());
475 619 if (!Number.isFinite(duration) || duration <= 0)
476 620 {
477 621 seekMarkerRequestedEl.style.display = 'none';
478 622 seekMarkerReceivedEl.style.display = 'none';
479 seekMarkerCombinedEl.style.display = 'none';
480 623 return;
481 624 }
482 625
@@ -504,19 +647,6 @@
504 647
505 648 const requestedRatio = getMarkerRatio(lastRequestedCaptionStartTimeSeconds);
506 649 const receivedRatio = getMarkerRatio(lastReceivedCaptionStartTimeSeconds);
507 const shouldCombine = Number.isFinite(requestedRatio)
508 && Number.isFinite(receivedRatio)
509 && Math.abs(requestedRatio - receivedRatio) <= 1e-6;
510
511 if (shouldCombine)
512 {
513 applyMarker(seekMarkerCombinedEl, requestedRatio);
514 seekMarkerRequestedEl.style.display = 'none';
515 seekMarkerReceivedEl.style.display = 'none';
516 return;
517 }
518
519 seekMarkerCombinedEl.style.display = 'none';
520 650 applyMarker(seekMarkerRequestedEl, requestedRatio);
521 651 applyMarker(seekMarkerReceivedEl, receivedRatio);
522 652 };
@@ -572,33 +702,10 @@
572 702 return markerEl;
573 703 };
574 704
575 const buildCombinedMarker = () =>
576 {
577 const markerEl = document.createElement('span');
578 markerEl.className = 'vjs-image-subtitle-seek-marker vjs-image-subtitle-seek-marker-combined';
579 markerEl.style.position = 'absolute';
580 markerEl.style.top = '50%';
581 markerEl.style.width = '16px';
582 markerEl.style.height = '10px';
583 markerEl.style.transform = 'translate(-50%, -50%)';
584 markerEl.style.color = '#fff';
585 markerEl.style.fontFamily = 'monospace';
586 markerEl.style.fontSize = '12px';
587 markerEl.style.fontWeight = '700';
588 markerEl.style.lineHeight = '10px';
589 markerEl.style.textAlign = 'center';
590 markerEl.style.display = 'none';
591 markerEl.textContent = '[]';
592 markerEl.setAttribute('aria-hidden', 'true');
593 return markerEl;
594 };
595
596 705 seekMarkerReceivedEl = buildBracketMarker('left');
597 706 seekMarkerRequestedEl = buildBracketMarker('right');
598 seekMarkerCombinedEl = buildCombinedMarker();
599 707 seekMarkerContainerEl.appendChild(seekMarkerReceivedEl);
600 708 seekMarkerContainerEl.appendChild(seekMarkerRequestedEl);
601 seekMarkerContainerEl.appendChild(seekMarkerCombinedEl);
602 709
603 710 seekBarEl.appendChild(seekMarkerContainerEl);
604 711 updateSeekBarMarkers();
@@ -843,6 +950,15 @@
843 950 if (!res.ok) return;
844 951 const payload = await res.arrayBuffer();
845 952 const receivedAtMs = Date.now();
953 const metadata = parseFrameMetadata(res, nextTime);
954 const blob = new Blob([payload], {
955 type: String(res.headers.get('Content-Type') || '').trim() || 'image/png',
956 });
957 cacheSubtitleFrame({
958 streamIndex: selectedStreamIndex,
959 blob,
960 metadata,
961 });
846 962 logSubtitleEvent('subtitle_png_received', {
847 963 ...responseMeta,
848 964 receivedAtMs,
@@ -907,6 +1023,17 @@
907 1023 if (!force && bucket === activeBucket) return;
908 1024 activeBucket = bucket;
909 1025
1026 const cachedFrame = findCachedFrameForTime(selectedStreamIndex, currentTime);
1027 if (cachedFrame)
1028 {
1029 setSeekMarkerTime('requested', currentTime);
1030 setSeekMarkerTime('received', cachedFrame.startTimeSeconds);
1031 updateSeekBarMarkers();
1032 renderSubtitleFrame(cachedFrame);
1033 queueLookaheadPrefetch(currentTime, { reset: force });
1034 return;
1035 }
1036
910 1037 const refreshLifecycleToken = lifecycleToken;
911 1038 if (force && currentFramePromise)
912 1039 {
@@ -1025,34 +1152,12 @@
1025 1152 disableTrack();
1026 1153 return;
1027 1154 }
1028
1029 closeObjectUrl();
1030 activeObjectUrl = URL.createObjectURL(blob);
1031 overlayImgEl.src = activeObjectUrl;
1032
1033 const frameWidth = Number.parseInt(String(res.headers.get('X-Subtitle-Frame-Width') || ''), 10);
1034 const frameHeight = Number.parseInt(String(res.headers.get('X-Subtitle-Frame-Height') || ''), 10);
1035 const canvasWidth = Number.parseInt(String(res.headers.get('X-Subtitle-Frame-Canvas-Width') || ''), 10);
1036 const canvasHeight = Number.parseInt(String(res.headers.get('X-Subtitle-Frame-Canvas-Height') || ''), 10);
1037
1038 if (frameWidth > 0 && frameHeight > 0 && canvasWidth > 0 && canvasHeight > 0)
1039 {
1040 const widthPercent = (frameWidth / canvasWidth) * 100;
1041 const heightPercent = (frameHeight / canvasHeight) * 100;
1042 overlayImgEl.style.width = `${widthPercent}%`;
1043 overlayImgEl.style.height = `${heightPercent}%`;
1044 overlayImgEl.style.maxWidth = 'none';
1045 overlayImgEl.style.maxHeight = 'none';
1046 } else
1047 {
1048 overlayImgEl.style.width = 'auto';
1049 overlayImgEl.style.height = 'auto';
1050 overlayImgEl.style.maxWidth = '100%';
1051 overlayImgEl.style.maxHeight = '100%';
1052 }
1053
1054 overlayEl.style.display = 'block';
1055 overlayImgEl.style.display = 'block';
1155 const cachedFrameEntry = cacheSubtitleFrame({
1156 streamIndex: selectedStreamIndex,
1157 blob,
1158 metadata: parseFrameMetadata(res, currentTime),
1159 });
1160 if (cachedFrameEntry) renderSubtitleFrame(cachedFrameEntry);
1056 1161
1057 1162 void waitForImagePresentation(window, overlayImgEl).then((shownAtMs) =>
1058 1163 {
@@ -1120,7 +1225,7 @@
1120 1225 seekMarkerContainerEl = null;
1121 1226 seekMarkerRequestedEl = null;
1122 1227 seekMarkerReceivedEl = null;
1123 seekMarkerCombinedEl = null;
1228 revokeCachedFrameUrls();
1124 1229 if (overlayEl) overlayEl.remove();
1125 1230 if (menuEl) menuEl.remove();
1126 1231 player.imageSubtitleOverlayController = null;
@@ -304,12 +304,12 @@
304 let seekMarkerContainerEl = null;
304 let seekMarkerContainerEl = null;
305 let seekMarkerRequestedEl = null;
305 let seekMarkerRequestedEl = null;
306 let seekMarkerReceivedEl = null;
306 let seekMarkerReceivedEl = null;
307 let seekMarkerCombinedEl = null;
308 let lastRequestedCaptionStartTimeSeconds = null;
307 let lastRequestedCaptionStartTimeSeconds = null;
309 let lastReceivedCaptionStartTimeSeconds = null;
308 let lastReceivedCaptionStartTimeSeconds = null;
310 let subtitleLogSequence = 0;
309 let subtitleLogSequence = 0;
311 let subtitleLogQueue = [];
310 let subtitleLogQueue = [];
312 let subtitleLogFlushTimer = null;
311 let subtitleLogFlushTimer = null;
312 const cachedSubtitleFrames = new Map();
313
313
314 const flushSubtitleLogs = () =>
314 const flushSubtitleLogs = () =>
315 {
315 {
@@ -439,11 +439,7 @@
439
439
440 const closeObjectUrl = () =>
440 const closeObjectUrl = () =>
441 {
441 {
442 if (activeObjectUrl)
442 activeObjectUrl = null;
443 {
444 URL.revokeObjectURL(activeObjectUrl);
445 activeObjectUrl = null;
446 }
447 };
443 };
448
444
449 const hideOverlay = () =>
445 const hideOverlay = () =>
@@ -453,6 +449,142 @@
453 closeObjectUrl();
449 closeObjectUrl();
454 };
450 };
455
451
452 const revokeCachedFrameUrls = () =>
453 {
454 for (const frame of cachedSubtitleFrames.values())
455 {
456 if (!frame || !frame.objectUrl) continue;
457 try
458 {
459 URL.revokeObjectURL(frame.objectUrl);
460 } catch
461 {
462 // Ignore object URL cleanup races.
463 }
464 }
465 cachedSubtitleFrames.clear();
466 };
467
468 const parseFrameMetadata = (res, fallbackStartTimeSeconds) =>
469 {
470 const rawStart = parseHeaderFloat(res, 'X-Subtitle-Frame-Start-Time');
471 const startTimeSeconds = Number.isFinite(rawStart) && rawStart >= 0
472 ? rawStart
473 : (Number.isFinite(fallbackStartTimeSeconds) && fallbackStartTimeSeconds >= 0 ? fallbackStartTimeSeconds : null);
474
475 const rawEnd = parseHeaderFloat(res, 'X-Subtitle-Frame-End-Time');
476 const endTimeSeconds = Number.isFinite(rawEnd)
477 ? rawEnd
478 : (Number.isFinite(startTimeSeconds) ? startTimeSeconds + IMAGE_SUBTITLE_PREFETCH_STEP_SECONDS : null);
479
480 const frameWidth = Number.parseInt(String(res.headers.get('X-Subtitle-Frame-Width') || ''), 10);
481 const frameHeight = Number.parseInt(String(res.headers.get('X-Subtitle-Frame-Height') || ''), 10);
482 const canvasWidth = Number.parseInt(String(res.headers.get('X-Subtitle-Frame-Canvas-Width') || ''), 10);
483 const canvasHeight = Number.parseInt(String(res.headers.get('X-Subtitle-Frame-Canvas-Height') || ''), 10);
484
485 return {
486 startTimeSeconds,
487 endTimeSeconds,
488 frameWidth,
489 frameHeight,
490 canvasWidth,
491 canvasHeight,
492 };
493 };
494
495 const cacheFrameKey = (streamIndex, startTimeSeconds, endTimeSeconds) =>
496 {
497 const startPart = Number.isFinite(startTimeSeconds) ? startTimeSeconds.toFixed(6) : 'none';
498 const endPart = Number.isFinite(endTimeSeconds) ? endTimeSeconds.toFixed(6) : 'none';
499 return `${streamIndex}|${startPart}|${endPart}`;
500 };
501
502 const cacheSubtitleFrame = ({ streamIndex, blob, metadata }) =>
503 {
504 if (!Number.isInteger(streamIndex) || streamIndex < 0) return null;
505 if (!blob || typeof blob.size !== 'number' || blob.size <= 0) return null;
506
507 const startTimeSeconds = Number.isFinite(metadata && metadata.startTimeSeconds) ? metadata.startTimeSeconds : null;
508 const endTimeSeconds = Number.isFinite(metadata && metadata.endTimeSeconds)
509 ? metadata.endTimeSeconds
510 : (Number.isFinite(startTimeSeconds) ? startTimeSeconds + IMAGE_SUBTITLE_PREFETCH_STEP_SECONDS : null);
511 if (!Number.isFinite(startTimeSeconds) || !Number.isFinite(endTimeSeconds) || endTimeSeconds <= startTimeSeconds)
512 {
513 return null;
514 }
515
516 const key = cacheFrameKey(streamIndex, startTimeSeconds, endTimeSeconds);
517 const objectUrl = URL.createObjectURL(blob);
518 const previous = cachedSubtitleFrames.get(key);
519 if (previous && previous.objectUrl)
520 {
521 try
522 {
523 URL.revokeObjectURL(previous.objectUrl);
524 } catch
525 {
526 // Ignore object URL cleanup races.
527 }
528 }
529
530 const entry = {
531 key,
532 streamIndex,
533 startTimeSeconds,
534 endTimeSeconds,
535 objectUrl,
536 frameWidth: Number(metadata && metadata.frameWidth),
537 frameHeight: Number(metadata && metadata.frameHeight),
538 canvasWidth: Number(metadata && metadata.canvasWidth),
539 canvasHeight: Number(metadata && metadata.canvasHeight),
540 };
541 cachedSubtitleFrames.set(key, entry);
542 return entry;
543 };
544
545 const findCachedFrameForTime = (streamIndex, currentTime) =>
546 {
547 if (!Number.isInteger(streamIndex) || streamIndex < 0) return null;
548 if (!Number.isFinite(currentTime) || currentTime < 0) return null;
549
550 let best = null;
551 for (const frame of cachedSubtitleFrames.values())
552 {
553 if (!frame || frame.streamIndex !== streamIndex) continue;
554 if (!Number.isFinite(frame.startTimeSeconds) || !Number.isFinite(frame.endTimeSeconds)) continue;
555 if (currentTime < frame.startTimeSeconds || currentTime >= frame.endTimeSeconds) continue;
556 if (!best || frame.startTimeSeconds > best.startTimeSeconds) best = frame;
557 }
558 return best;
559 };
560
561 const renderSubtitleFrame = (frame) =>
562 {
563 if (!overlayEl || !overlayImgEl || !frame || !frame.objectUrl) return;
564
565 activeObjectUrl = frame.objectUrl;
566 overlayImgEl.src = frame.objectUrl;
567
568 if (frame.frameWidth > 0 && frame.frameHeight > 0 && frame.canvasWidth > 0 && frame.canvasHeight > 0)
569 {
570 const widthPercent = (frame.frameWidth / frame.canvasWidth) * 100;
571 const heightPercent = (frame.frameHeight / frame.canvasHeight) * 100;
572 overlayImgEl.style.width = `${widthPercent}%`;
573 overlayImgEl.style.height = `${heightPercent}%`;
574 overlayImgEl.style.maxWidth = 'none';
575 overlayImgEl.style.maxHeight = 'none';
576 } else
577 {
578 overlayImgEl.style.width = 'auto';
579 overlayImgEl.style.height = 'auto';
580 overlayImgEl.style.maxWidth = '100%';
581 overlayImgEl.style.maxHeight = '100%';
582 }
583
584 overlayEl.style.display = 'block';
585 overlayImgEl.style.display = 'block';
586 };
587
456 const setSeekMarkerTime = (kind, timeSeconds) =>
588 const setSeekMarkerTime = (kind, timeSeconds) =>
457 {
589 {
458 const numericTime = Number(timeSeconds);
590 const numericTime = Number(timeSeconds);
@@ -460,23 +592,34 @@
460
592
461 if (kind === 'requested')
593 if (kind === 'requested')
462 {
594 {
463 lastRequestedCaptionStartTimeSeconds = nextTime;
595 if (nextTime === null)
596 {
597 lastRequestedCaptionStartTimeSeconds = null;
598 } else if (!Number.isFinite(lastRequestedCaptionStartTimeSeconds) || nextTime >= lastRequestedCaptionStartTimeSeconds)
599 {
600 lastRequestedCaptionStartTimeSeconds = nextTime;
601 }
464 } else if (kind === 'received')
602 } else if (kind === 'received')
465 {
603 {
466 lastReceivedCaptionStartTimeSeconds = nextTime;
604 if (nextTime === null)
605 {
606 lastReceivedCaptionStartTimeSeconds = null;
607 } else if (!Number.isFinite(lastReceivedCaptionStartTimeSeconds) || nextTime >= lastReceivedCaptionStartTimeSeconds)
608 {
609 lastReceivedCaptionStartTimeSeconds = nextTime;
610 }
467 }
611 }
468 };
612 };
469
613
470 const updateSeekBarMarkers = () =>
614 const updateSeekBarMarkers = () =>
471 {
615 {
472 if (!seekMarkerRequestedEl || !seekMarkerReceivedEl || !seekMarkerCombinedEl) return;
616 if (!seekMarkerRequestedEl || !seekMarkerReceivedEl) return;
473
617
474 const duration = Number(player.duration && player.duration());
618 const duration = Number(player.duration && player.duration());
475 if (!Number.isFinite(duration) || duration <= 0)
619 if (!Number.isFinite(duration) || duration <= 0)
476 {
620 {
477 seekMarkerRequestedEl.style.display = 'none';
621 seekMarkerRequestedEl.style.display = 'none';
478 seekMarkerReceivedEl.style.display = 'none';
622 seekMarkerReceivedEl.style.display = 'none';
479 seekMarkerCombinedEl.style.display = 'none';
480 return;
623 return;
481 }
624 }
482
625
@@ -504,19 +647,6 @@
504
647
505 const requestedRatio = getMarkerRatio(lastRequestedCaptionStartTimeSeconds);
648 const requestedRatio = getMarkerRatio(lastRequestedCaptionStartTimeSeconds);
506 const receivedRatio = getMarkerRatio(lastReceivedCaptionStartTimeSeconds);
649 const receivedRatio = getMarkerRatio(lastReceivedCaptionStartTimeSeconds);
507 const shouldCombine = Number.isFinite(requestedRatio)
508 && Number.isFinite(receivedRatio)
509 && Math.abs(requestedRatio - receivedRatio) <= 1e-6;
510
511 if (shouldCombine)
512 {
513 applyMarker(seekMarkerCombinedEl, requestedRatio);
514 seekMarkerRequestedEl.style.display = 'none';
515 seekMarkerReceivedEl.style.display = 'none';
516 return;
517 }
518
519 seekMarkerCombinedEl.style.display = 'none';
520 applyMarker(seekMarkerRequestedEl, requestedRatio);
650 applyMarker(seekMarkerRequestedEl, requestedRatio);
521 applyMarker(seekMarkerReceivedEl, receivedRatio);
651 applyMarker(seekMarkerReceivedEl, receivedRatio);
522 };
652 };
@@ -572,33 +702,10 @@
572 return markerEl;
702 return markerEl;
573 };
703 };
574
704
575 const buildCombinedMarker = () =>
576 {
577 const markerEl = document.createElement('span');
578 markerEl.className = 'vjs-image-subtitle-seek-marker vjs-image-subtitle-seek-marker-combined';
579 markerEl.style.position = 'absolute';
580 markerEl.style.top = '50%';
581 markerEl.style.width = '16px';
582 markerEl.style.height = '10px';
583 markerEl.style.transform = 'translate(-50%, -50%)';
584 markerEl.style.color = '#fff';
585 markerEl.style.fontFamily = 'monospace';
586 markerEl.style.fontSize = '12px';
587 markerEl.style.fontWeight = '700';
588 markerEl.style.lineHeight = '10px';
589 markerEl.style.textAlign = 'center';
590 markerEl.style.display = 'none';
591 markerEl.textContent = '[]';
592 markerEl.setAttribute('aria-hidden', 'true');
593 return markerEl;
594 };
595
596 seekMarkerReceivedEl = buildBracketMarker('left');
705 seekMarkerReceivedEl = buildBracketMarker('left');
597 seekMarkerRequestedEl = buildBracketMarker('right');
706 seekMarkerRequestedEl = buildBracketMarker('right');
598 seekMarkerCombinedEl = buildCombinedMarker();
599 seekMarkerContainerEl.appendChild(seekMarkerReceivedEl);
707 seekMarkerContainerEl.appendChild(seekMarkerReceivedEl);
600 seekMarkerContainerEl.appendChild(seekMarkerRequestedEl);
708 seekMarkerContainerEl.appendChild(seekMarkerRequestedEl);
601 seekMarkerContainerEl.appendChild(seekMarkerCombinedEl);
602
709
603 seekBarEl.appendChild(seekMarkerContainerEl);
710 seekBarEl.appendChild(seekMarkerContainerEl);
604 updateSeekBarMarkers();
711 updateSeekBarMarkers();
@@ -843,6 +950,15 @@
843 if (!res.ok) return;
950 if (!res.ok) return;
844 const payload = await res.arrayBuffer();
951 const payload = await res.arrayBuffer();
845 const receivedAtMs = Date.now();
952 const receivedAtMs = Date.now();
953 const metadata = parseFrameMetadata(res, nextTime);
954 const blob = new Blob([payload], {
955 type: String(res.headers.get('Content-Type') || '').trim() || 'image/png',
956 });
957 cacheSubtitleFrame({
958 streamIndex: selectedStreamIndex,
959 blob,
960 metadata,
961 });
846 logSubtitleEvent('subtitle_png_received', {
962 logSubtitleEvent('subtitle_png_received', {
847 ...responseMeta,
963 ...responseMeta,
848 receivedAtMs,
964 receivedAtMs,
@@ -907,6 +1023,17 @@
907 if (!force && bucket === activeBucket) return;
1023 if (!force && bucket === activeBucket) return;
908 activeBucket = bucket;
1024 activeBucket = bucket;
909
1025
1026 const cachedFrame = findCachedFrameForTime(selectedStreamIndex, currentTime);
1027 if (cachedFrame)
1028 {
1029 setSeekMarkerTime('requested', currentTime);
1030 setSeekMarkerTime('received', cachedFrame.startTimeSeconds);
1031 updateSeekBarMarkers();
1032 renderSubtitleFrame(cachedFrame);
1033 queueLookaheadPrefetch(currentTime, { reset: force });
1034 return;
1035 }
1036
910 const refreshLifecycleToken = lifecycleToken;
1037 const refreshLifecycleToken = lifecycleToken;
911 if (force && currentFramePromise)
1038 if (force && currentFramePromise)
912 {
1039 {
@@ -1025,34 +1152,12 @@
1025 disableTrack();
1152 disableTrack();
1026 return;
1153 return;
1027 }
1154 }
1028
1155 const cachedFrameEntry = cacheSubtitleFrame({
1029 closeObjectUrl();
1156 streamIndex: selectedStreamIndex,
1030 activeObjectUrl = URL.createObjectURL(blob);
1157 blob,
1031 overlayImgEl.src = activeObjectUrl;
1158 metadata: parseFrameMetadata(res, currentTime),
1032
1159 });
1033 const frameWidth = Number.parseInt(String(res.headers.get('X-Subtitle-Frame-Width') || ''), 10);
1160 if (cachedFrameEntry) renderSubtitleFrame(cachedFrameEntry);
1034 const frameHeight = Number.parseInt(String(res.headers.get('X-Subtitle-Frame-Height') || ''), 10);
1035 const canvasWidth = Number.parseInt(String(res.headers.get('X-Subtitle-Frame-Canvas-Width') || ''), 10);
1036 const canvasHeight = Number.parseInt(String(res.headers.get('X-Subtitle-Frame-Canvas-Height') || ''), 10);
1037
1038 if (frameWidth > 0 && frameHeight > 0 && canvasWidth > 0 && canvasHeight > 0)
1039 {
1040 const widthPercent = (frameWidth / canvasWidth) * 100;
1041 const heightPercent = (frameHeight / canvasHeight) * 100;
1042 overlayImgEl.style.width = `${widthPercent}%`;
1043 overlayImgEl.style.height = `${heightPercent}%`;
1044 overlayImgEl.style.maxWidth = 'none';
1045 overlayImgEl.style.maxHeight = 'none';
1046 } else
1047 {
1048 overlayImgEl.style.width = 'auto';
1049 overlayImgEl.style.height = 'auto';
1050 overlayImgEl.style.maxWidth = '100%';
1051 overlayImgEl.style.maxHeight = '100%';
1052 }
1053
1054 overlayEl.style.display = 'block';
1055 overlayImgEl.style.display = 'block';
1056
1161
1057 void waitForImagePresentation(window, overlayImgEl).then((shownAtMs) =>
1162 void waitForImagePresentation(window, overlayImgEl).then((shownAtMs) =>
1058 {
1163 {
@@ -1120,7 +1225,7 @@
1120 seekMarkerContainerEl = null;
1225 seekMarkerContainerEl = null;
1121 seekMarkerRequestedEl = null;
1226 seekMarkerRequestedEl = null;
1122 seekMarkerReceivedEl = null;
1227 seekMarkerReceivedEl = null;
1123 seekMarkerCombinedEl = null;
1228 revokeCachedFrameUrls();
1124 if (overlayEl) overlayEl.remove();
1229 if (overlayEl) overlayEl.remove();
1125 if (menuEl) menuEl.remove();
1230 if (menuEl) menuEl.remove();
1126 player.imageSubtitleOverlayController = null;
1231 player.imageSubtitleOverlayController = null;
tests/shared-video-player.test.js +116 −20
@@ -535,12 +535,12 @@ describe('shared image subtitle prefetching', () =>
535 535
536 536 const requestedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-right');
537 537 const receivedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-left');
538 const combinedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-combined');
539 538 expect(requestedMarker).toBeTruthy();
540 539 expect(receivedMarker).toBeTruthy();
541 expect(combinedMarker).toBeTruthy();
542 expect(combinedMarker.style.display).toBe('block');
543 expect(combinedMarker.style.left).toBe('40.0000%');
540 expect(requestedMarker.style.display).toBe('block');
541 expect(receivedMarker.style.display).toBe('block');
542 expect(requestedMarker.style.left).toBe('40.0000%');
543 expect(receivedMarker.style.left).toBe('40.0000%');
544 544 expect(requestedMarker.textContent).toBe(']');
545 545 expect(receivedMarker.textContent).toBe('[');
546 546
@@ -598,10 +598,8 @@ describe('shared image subtitle prefetching', () =>
598 598
599 599 const requestedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-right');
600 600 const receivedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-left');
601 const combinedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-combined');
602 601 expect(requestedMarker).toBeTruthy();
603 602 expect(receivedMarker).toBeTruthy();
604 expect(combinedMarker).toBeTruthy();
605 603 expect(requestedMarker.style.left).toBe('0.0000%');
606 604 expect(receivedMarker.style.left).toBe('20.0000%');
607 605
@@ -620,30 +618,54 @@ describe('shared image subtitle prefetching', () =>
620 618 }));
621 619
622 620 await flushAsyncWork(window, 8);
623 expect(combinedMarker.style.display).toBe('block');
624 expect(combinedMarker.style.left).toBe('15.0000%');
621 expect(requestedMarker.style.display).toBe('block');
622 expect(receivedMarker.style.display).toBe('block');
623 expect(requestedMarker.style.left).toBe('15.0000%');
624 expect(receivedMarker.style.left).toBe('20.0000%');
625 625
626 626 controller.detach();
627 627 await flushAsyncWork(window, 2);
628 628 window.close();
629 629 });
630 630
631 test('renders a combined marker when requested and received times are identical', async () =>
631 test('keeps marker positions forward-only when later responses resolve with earlier times', async () =>
632 632 {
633 633 const window = createWindow();
634 634 const helper = loadSharedVideoPlayer(window);
635 635 const { player, videojs } = buildPlayerHarness(window);
636 const requestedTimes = [];
636 637
637 player.duration(10);
638 window.fetch = jest.fn(async () =>
638 player.duration(12);
639 window.fetch = jest.fn(async (url) =>
639 640 {
641 const parsed = new URL(url, 'http://localhost/');
642 const timeSeconds = Number(parsed.searchParams.get('timeSeconds'));
643 requestedTimes.push(timeSeconds);
644
645 if (requestedTimes.length === 1)
646 {
647 return new Response('png-data', {
648 status: 200,
649 headers: {
650 'Content-Type': 'image/png',
651 'X-Subtitle-Frame-Status': 'ok',
652 'X-Subtitle-Frame-Start-Time': '4',
653 'X-Subtitle-Frame-End-Time': '5',
654 'X-Subtitle-Frame-Width': '320',
655 'X-Subtitle-Frame-Height': '180',
656 'X-Subtitle-Frame-Canvas-Width': '640',
657 'X-Subtitle-Frame-Canvas-Height': '360',
658 },
659 });
660 }
661
640 662 return new Response('png-data', {
641 663 status: 200,
642 664 headers: {
643 665 'Content-Type': 'image/png',
644 666 'X-Subtitle-Frame-Status': 'ok',
645 'X-Subtitle-Frame-Start-Time': '0',
646 'X-Subtitle-Frame-End-Time': '1',
667 'X-Subtitle-Frame-Start-Time': '2',
668 'X-Subtitle-Frame-End-Time': '3',
647 669 'X-Subtitle-Frame-Width': '320',
648 670 'X-Subtitle-Frame-Height': '180',
649 671 'X-Subtitle-Frame-Canvas-Width': '640',
@@ -665,15 +687,18 @@ describe('shared image subtitle prefetching', () =>
665 687
666 688 const requestedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-right');
667 689 const receivedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-left');
668 const combinedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-combined');
669 690 expect(requestedMarker).toBeTruthy();
670 691 expect(receivedMarker).toBeTruthy();
671 expect(combinedMarker).toBeTruthy();
672 expect(combinedMarker.style.display).toBe('block');
673 expect(combinedMarker.style.left).toBe('0.0000%');
674 expect(combinedMarker.textContent).toBe('[]');
675 expect(requestedMarker.style.display).toBe('none');
676 expect(receivedMarker.style.display).toBe('none');
692 expect(requestedMarker.style.left).toBe('0.0000%');
693 expect(receivedMarker.style.left).toBe('33.3333%');
694
695 player.setCurrentTime(1.5);
696 player.trigger('timeupdate');
697 await flushAsyncWork(window, 8);
698
699 // Second response reports an older start time, but markers stay monotonic.
700 expect(requestedMarker.style.left).toBe('12.5000%');
701 expect(receivedMarker.style.left).toBe('33.3333%');
677 702
678 703 controller.detach();
679 704 await flushAsyncWork(window, 2);
@@ -742,4 +767,75 @@ describe('shared image subtitle prefetching', () =>
742 767 await flushAsyncWork(window, 20);
743 768 window.close();
744 769 });
770
771 test('reuses cached subtitle frames after rewinding when server no longer has older frames', async () =>
772 {
773 const window = createWindow();
774 const helper = loadSharedVideoPlayer(window);
775 const { player, videojs } = buildPlayerHarness(window);
776
777 player.duration(10);
778 player.setCurrentTime(2);
779 window.fetch = jest.fn(async (url) =>
780 {
781 const parsed = new URL(url, 'http://localhost/');
782 const timeSeconds = Number(parsed.searchParams.get('timeSeconds'));
783
784 if (Math.abs(timeSeconds - 2) < 1e-6)
785 {
786 return new Response('png-data', {
787 status: 200,
788 headers: {
789 'Content-Type': 'image/png',
790 'X-Subtitle-Frame-Status': 'ok',
791 'X-Subtitle-Frame-Start-Time': '2',
792 'X-Subtitle-Frame-End-Time': '3',
793 'X-Subtitle-Frame-Width': '320',
794 'X-Subtitle-Frame-Height': '180',
795 'X-Subtitle-Frame-Canvas-Width': '640',
796 'X-Subtitle-Frame-Canvas-Height': '360',
797 },
798 });
799 }
800
801 return new Response(null, {
802 status: 204,
803 headers: {
804 'X-Subtitle-Frame-Status': 'none',
805 },
806 });
807 });
808
809 const controller = helper.bindImageSubtitleOverlay(player, videojs, {}, {
810 imageSubtitleTracks: [{ label: 'PGS English', streamIndex: 0, default: true }],
811 }, {
812 lookaheadSeconds: 0,
813 buildFrameRequest: ({ currentTime, streamIndex }) => ({
814 url: `/subtitle-frame?streamIndex=${streamIndex}&timeSeconds=${currentTime}`,
815 }),
816 });
817
818 await flushAsyncWork(window, 8);
819 expect(window.fetch).toHaveBeenCalledTimes(1);
820
821 player.setCurrentTime(4);
822 player.trigger('timeupdate');
823 await flushAsyncWork(window, 8);
824 expect(window.fetch).toHaveBeenCalledTimes(2);
825
826 const overlay = player.el().querySelector('.video-subtitle-overlay');
827 expect(overlay).toBeTruthy();
828 expect(overlay.style.display).toBe('none');
829
830 player.setCurrentTime(2.5);
831 player.trigger('timeupdate');
832 await flushAsyncWork(window, 8);
833
834 expect(window.fetch).toHaveBeenCalledTimes(2);
835 expect(overlay.style.display).toBe('block');
836
837 controller.detach();
838 await flushAsyncWork(window, 2);
839 window.close();
840 });
745 841 });
@@ -535,12 +535,12 @@ describe('shared image subtitle prefetching', () =>
535
535
536 const requestedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-right');
536 const requestedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-right');
537 const receivedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-left');
537 const receivedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-left');
538 const combinedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-combined');
539 expect(requestedMarker).toBeTruthy();
538 expect(requestedMarker).toBeTruthy();
540 expect(receivedMarker).toBeTruthy();
539 expect(receivedMarker).toBeTruthy();
541 expect(combinedMarker).toBeTruthy();
540 expect(requestedMarker.style.display).toBe('block');
542 expect(combinedMarker.style.display).toBe('block');
541 expect(receivedMarker.style.display).toBe('block');
543 expect(combinedMarker.style.left).toBe('40.0000%');
542 expect(requestedMarker.style.left).toBe('40.0000%');
543 expect(receivedMarker.style.left).toBe('40.0000%');
544 expect(requestedMarker.textContent).toBe(']');
544 expect(requestedMarker.textContent).toBe(']');
545 expect(receivedMarker.textContent).toBe('[');
545 expect(receivedMarker.textContent).toBe('[');
546
546
@@ -598,10 +598,8 @@ describe('shared image subtitle prefetching', () =>
598
598
599 const requestedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-right');
599 const requestedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-right');
600 const receivedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-left');
600 const receivedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-left');
601 const combinedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-combined');
602 expect(requestedMarker).toBeTruthy();
601 expect(requestedMarker).toBeTruthy();
603 expect(receivedMarker).toBeTruthy();
602 expect(receivedMarker).toBeTruthy();
604 expect(combinedMarker).toBeTruthy();
605 expect(requestedMarker.style.left).toBe('0.0000%');
603 expect(requestedMarker.style.left).toBe('0.0000%');
606 expect(receivedMarker.style.left).toBe('20.0000%');
604 expect(receivedMarker.style.left).toBe('20.0000%');
607
605
@@ -620,30 +618,54 @@ describe('shared image subtitle prefetching', () =>
620 }));
618 }));
621
619
622 await flushAsyncWork(window, 8);
620 await flushAsyncWork(window, 8);
623 expect(combinedMarker.style.display).toBe('block');
621 expect(requestedMarker.style.display).toBe('block');
624 expect(combinedMarker.style.left).toBe('15.0000%');
622 expect(receivedMarker.style.display).toBe('block');
623 expect(requestedMarker.style.left).toBe('15.0000%');
624 expect(receivedMarker.style.left).toBe('20.0000%');
625
625
626 controller.detach();
626 controller.detach();
627 await flushAsyncWork(window, 2);
627 await flushAsyncWork(window, 2);
628 window.close();
628 window.close();
629 });
629 });
630
630
631 test('renders a combined marker when requested and received times are identical', async () =>
631 test('keeps marker positions forward-only when later responses resolve with earlier times', async () =>
632 {
632 {
633 const window = createWindow();
633 const window = createWindow();
634 const helper = loadSharedVideoPlayer(window);
634 const helper = loadSharedVideoPlayer(window);
635 const { player, videojs } = buildPlayerHarness(window);
635 const { player, videojs } = buildPlayerHarness(window);
636 const requestedTimes = [];
636
637
637 player.duration(10);
638 player.duration(12);
638 window.fetch = jest.fn(async () =>
639 window.fetch = jest.fn(async (url) =>
639 {
640 {
641 const parsed = new URL(url, 'http://localhost/');
642 const timeSeconds = Number(parsed.searchParams.get('timeSeconds'));
643 requestedTimes.push(timeSeconds);
644
645 if (requestedTimes.length === 1)
646 {
647 return new Response('png-data', {
648 status: 200,
649 headers: {
650 'Content-Type': 'image/png',
651 'X-Subtitle-Frame-Status': 'ok',
652 'X-Subtitle-Frame-Start-Time': '4',
653 'X-Subtitle-Frame-End-Time': '5',
654 'X-Subtitle-Frame-Width': '320',
655 'X-Subtitle-Frame-Height': '180',
656 'X-Subtitle-Frame-Canvas-Width': '640',
657 'X-Subtitle-Frame-Canvas-Height': '360',
658 },
659 });
660 }
661
640 return new Response('png-data', {
662 return new Response('png-data', {
641 status: 200,
663 status: 200,
642 headers: {
664 headers: {
643 'Content-Type': 'image/png',
665 'Content-Type': 'image/png',
644 'X-Subtitle-Frame-Status': 'ok',
666 'X-Subtitle-Frame-Status': 'ok',
645 'X-Subtitle-Frame-Start-Time': '0',
667 'X-Subtitle-Frame-Start-Time': '2',
646 'X-Subtitle-Frame-End-Time': '1',
668 'X-Subtitle-Frame-End-Time': '3',
647 'X-Subtitle-Frame-Width': '320',
669 'X-Subtitle-Frame-Width': '320',
648 'X-Subtitle-Frame-Height': '180',
670 'X-Subtitle-Frame-Height': '180',
649 'X-Subtitle-Frame-Canvas-Width': '640',
671 'X-Subtitle-Frame-Canvas-Width': '640',
@@ -665,15 +687,18 @@ describe('shared image subtitle prefetching', () =>
665
687
666 const requestedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-right');
688 const requestedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-right');
667 const receivedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-left');
689 const receivedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-left');
668 const combinedMarker = player.el().querySelector('.vjs-image-subtitle-seek-marker-combined');
669 expect(requestedMarker).toBeTruthy();
690 expect(requestedMarker).toBeTruthy();
670 expect(receivedMarker).toBeTruthy();
691 expect(receivedMarker).toBeTruthy();
671 expect(combinedMarker).toBeTruthy();
692 expect(requestedMarker.style.left).toBe('0.0000%');
672 expect(combinedMarker.style.display).toBe('block');
693 expect(receivedMarker.style.left).toBe('33.3333%');
673 expect(combinedMarker.style.left).toBe('0.0000%');
694
674 expect(combinedMarker.textContent).toBe('[]');
695 player.setCurrentTime(1.5);
675 expect(requestedMarker.style.display).toBe('none');
696 player.trigger('timeupdate');
676 expect(receivedMarker.style.display).toBe('none');
697 await flushAsyncWork(window, 8);
698
699 // Second response reports an older start time, but markers stay monotonic.
700 expect(requestedMarker.style.left).toBe('12.5000%');
701 expect(receivedMarker.style.left).toBe('33.3333%');
677
702
678 controller.detach();
703 controller.detach();
679 await flushAsyncWork(window, 2);
704 await flushAsyncWork(window, 2);
@@ -742,4 +767,75 @@ describe('shared image subtitle prefetching', () =>
742 await flushAsyncWork(window, 20);
767 await flushAsyncWork(window, 20);
743 window.close();
768 window.close();
744 });
769 });
770
771 test('reuses cached subtitle frames after rewinding when server no longer has older frames', async () =>
772 {
773 const window = createWindow();
774 const helper = loadSharedVideoPlayer(window);
775 const { player, videojs } = buildPlayerHarness(window);
776
777 player.duration(10);
778 player.setCurrentTime(2);
779 window.fetch = jest.fn(async (url) =>
780 {
781 const parsed = new URL(url, 'http://localhost/');
782 const timeSeconds = Number(parsed.searchParams.get('timeSeconds'));
783
784 if (Math.abs(timeSeconds - 2) < 1e-6)
785 {
786 return new Response('png-data', {
787 status: 200,
788 headers: {
789 'Content-Type': 'image/png',
790 'X-Subtitle-Frame-Status': 'ok',
791 'X-Subtitle-Frame-Start-Time': '2',
792 'X-Subtitle-Frame-End-Time': '3',
793 'X-Subtitle-Frame-Width': '320',
794 'X-Subtitle-Frame-Height': '180',
795 'X-Subtitle-Frame-Canvas-Width': '640',
796 'X-Subtitle-Frame-Canvas-Height': '360',
797 },
798 });
799 }
800
801 return new Response(null, {
802 status: 204,
803 headers: {
804 'X-Subtitle-Frame-Status': 'none',
805 },
806 });
807 });
808
809 const controller = helper.bindImageSubtitleOverlay(player, videojs, {}, {
810 imageSubtitleTracks: [{ label: 'PGS English', streamIndex: 0, default: true }],
811 }, {
812 lookaheadSeconds: 0,
813 buildFrameRequest: ({ currentTime, streamIndex }) => ({
814 url: `/subtitle-frame?streamIndex=${streamIndex}&timeSeconds=${currentTime}`,
815 }),
816 });
817
818 await flushAsyncWork(window, 8);
819 expect(window.fetch).toHaveBeenCalledTimes(1);
820
821 player.setCurrentTime(4);
822 player.trigger('timeupdate');
823 await flushAsyncWork(window, 8);
824 expect(window.fetch).toHaveBeenCalledTimes(2);
825
826 const overlay = player.el().querySelector('.video-subtitle-overlay');
827 expect(overlay).toBeTruthy();
828 expect(overlay.style.display).toBe('none');
829
830 player.setCurrentTime(2.5);
831 player.trigger('timeupdate');
832 await flushAsyncWork(window, 8);
833
834 expect(window.fetch).toHaveBeenCalledTimes(2);
835 expect(overlay.style.display).toBe('block');
836
837 controller.detach();
838 await flushAsyncWork(window, 2);
839 window.close();
840 });
745});
841});