BlueGit

timfa filemanager

test

timfa Tim Falken · pushed by timfa

Authored 2026-05-16 · 6 months ago

Hash
b48f942ddd7756a240540f7a9b40d1b86146c8e6
Parent
2c0e0fdd
4 files changed +372 −143
.github/technical-reference.md +7 −4
@@ -73,7 +73,8 @@
73 73 - POST /api/files/upload - Streams multipart uploads into hidden temp files, computes/stores sha256, and enforces user-folder size limits.
74 74 - POST /api/files/move - Moves file/folder; supports conflict strategies: `error` (default), `overwrite`, or `rename` with optional `targetName`.
75 75 - POST /api/files/copy - Copies a file to a destination folder with conflict strategies (`error`, `overwrite`, `rename`) and user-folder size-limit checks.
76 - POST /api/files/video-stream - Creates a short-lived HLS session for a video and returns playlistUrl, durationSeconds, subtitleTracks, and subtitleSummary ({total, converted, skipped}).
76 - POST /api/files/video-stream - Creates a short-lived HLS session for a video and returns playlistUrl, durationSeconds, subtitleTracks, imageSubtitleTracks, and subtitleSummary ({total, converted, imageBased, skipped}).
77 - GET /api/files/video-stream-subtitle-frame - Authenticated. Extracts a PNG frame for an image-based subtitle stream at a specific timestamp using ffmpeg and the source file path.
77 78 - DELETE /api/files/video-stream/:sessionId - Explicitly releases an active short-lived video stream session and stops backend processing.
78 79 - POST /api/files/watched-statuses - Returns fast per-user watched statuses for up to 500 file paths without triggering expensive metadata/hash work; response is { statuses: { [filePath]: 'fully'|'partway' } }.
79 80 - POST /api/files/watch-progress - Records per-user watch status (`partway` >=10%, `fully` >=70%) for sidebar "Watched by" display.
@@ -86,14 +87,14 @@
86 87 - GET /api/share/info/:token - Public. Returns {name, isDir, expiresAt} for a valid non-expired token; 410 when expired, 404 when unknown.
87 88 - GET /api/share/preview/:token - Public. Streams file content inline for preview (files only, max 50 MB); 400 for directories, 410 expired.
88 89 - GET /api/share/download/:token - Public. Downloads the file or a zip of the directory for a valid token; 410 expired.
89 - GET /api/share/video-stream/:token - Public. Creates a short-lived HLS session for a shared video and returns playlistUrl, durationSeconds, subtitleTracks, and subtitleSummary ({total, converted, skipped}).
90 - GET /api/share/video-stream/:token - Public. Creates a short-lived HLS session for a shared video and returns playlistUrl, durationSeconds, subtitleTracks, imageSubtitleTracks, and subtitleSummary ({total, converted, imageBased, skipped}).
90 91 - buildShareOpenGraphPage(token, req) - Reads share.html, injects OG meta tags (<og:title>, <og:description>, <og:image> for image files, twitter:card) based on DB lookup of token, and returns the full HTML string. Handles expired and not-found tokens. Exported and used by the /share/:token route in server/index.js.
91 92 - buildZip(dirPath, cacheKey) - Creates (or returns cached) zip in zip-cache/; prunes stale zips before building; exported for reuse in files.js.
92 93 - pruneZipCache() - Deletes zip files in zip-cache/ older than 1 day; called automatically before each zip build.
93 94 - ZIP_CACHE_DIR - Absolute path to the zip-cache/ directory (project root).
94 95
95 96 ## server/video-stream.js
96 - createVideoStreamSession(sourcePath) - Probes input metadata and reuses a compatible active transcode session per source file when possible; returns a per-viewer lease id as sessionId plus duration/subtitle data.
97 - createVideoStreamSession(sourcePath) - Probes input metadata and reuses a compatible active transcode session per source file when possible; returns a per-viewer lease id as sessionId plus duration, subtitleTracks, imageSubtitleTracks, and subtitleSummary data.
97 98 - sendVideoStreamAsset(sessionId, assetPath, req, res) - Resolves viewer leases to a shared stream session, serves HLS assets, tracks lease activity, and prunes segments using the slowest active viewer position.
98 99 - releaseVideoStreamSession(sessionId) - Releases one viewer lease; only destroys the underlying transcode session when no active leases remain.
99 100 - STREAM_ROOT_DIR - Temporary root directory for active ffmpeg-backed stream sessions.
@@ -158,7 +159,9 @@
158 159 - disconnectThumbnailObserver() - Clears active IntersectionObserver when the grid is rebuilt.
159 160 - setThumbnailPending(iconEl, pending) - Toggles per-icon pending spinner state while a cached image thumbnail is not ready yet.
160 161 - buildThumbnailSource(item, blob, kind) - Produces thumbnail image source (data/blob URL) for icon injection.
161 - renderStreamedVideoPreview(item, targetEl) - Creates the Video.js player with HLS source/track config, enforces non-live playback UI for file streams, uses container-fill sizing to keep previews within bounds, restores per-user video prefs (volume + subtitle/audio track names when present), forces caption overrides on each open (text background opacity transparent + text edge style uniform), reports watch progress, warns when subtitle streams exist but none are web-compatible, and releases the backend stream session on close/unload.
162 - buildAuthHeaders() - Builds the authenticated fetch headers used by preview-side API calls that need the bearer token plus fingerprint header.
163 - bindImageSubtitleOverlay(player, videojs, prefs, session, item) - Adds the fullscreen-safe image-subtitle button, menu, and bottom overlay used to fetch and display subtitle frames for image-based tracks.
164 - renderStreamedVideoPreview(item, targetEl) - Creates the Video.js player with HLS source/track config, enforces non-live playback UI for file streams, uses container-fill sizing to keep previews within bounds, restores per-user video prefs (volume + subtitle/audio track names when present), wires the image-subtitle overlay controller, forces caption overrides on each open (text background opacity transparent + text edge style uniform), reports watch progress, warns when subtitle streams exist but none are web-compatible, and releases the backend stream session on close/unload.
162 165 - modelPreviewType(name) - Classifies direct client-side 3D preview support for `.stl` and `.obj`.
163 166 - loadThreePreviewModules() - Lazy-loads Three.js plus OrbitControls/STLLoader/OBJLoader via import map aliases.
164 167 - modelThumbnailDataUrl(item, blob) - Builds a blue SVG thumbnail for STL/OBJ files by parsing their geometry client-side; falls back to a badge when parsing fails.
@@ -73,7 +73,8 @@
73- POST /api/files/upload - Streams multipart uploads into hidden temp files, computes/stores sha256, and enforces user-folder size limits.
73- POST /api/files/upload - Streams multipart uploads into hidden temp files, computes/stores sha256, and enforces user-folder size limits.
74- POST /api/files/move - Moves file/folder; supports conflict strategies: `error` (default), `overwrite`, or `rename` with optional `targetName`.
74- POST /api/files/move - Moves file/folder; supports conflict strategies: `error` (default), `overwrite`, or `rename` with optional `targetName`.
75- POST /api/files/copy - Copies a file to a destination folder with conflict strategies (`error`, `overwrite`, `rename`) and user-folder size-limit checks.
75- POST /api/files/copy - Copies a file to a destination folder with conflict strategies (`error`, `overwrite`, `rename`) and user-folder size-limit checks.
76- POST /api/files/video-stream - Creates a short-lived HLS session for a video and returns playlistUrl, durationSeconds, subtitleTracks, and subtitleSummary ({total, converted, skipped}).
76- POST /api/files/video-stream - Creates a short-lived HLS session for a video and returns playlistUrl, durationSeconds, subtitleTracks, imageSubtitleTracks, and subtitleSummary ({total, converted, imageBased, skipped}).
77- GET /api/files/video-stream-subtitle-frame - Authenticated. Extracts a PNG frame for an image-based subtitle stream at a specific timestamp using ffmpeg and the source file path.
77- DELETE /api/files/video-stream/:sessionId - Explicitly releases an active short-lived video stream session and stops backend processing.
78- DELETE /api/files/video-stream/:sessionId - Explicitly releases an active short-lived video stream session and stops backend processing.
78- POST /api/files/watched-statuses - Returns fast per-user watched statuses for up to 500 file paths without triggering expensive metadata/hash work; response is { statuses: { [filePath]: 'fully'|'partway' } }.
79- POST /api/files/watched-statuses - Returns fast per-user watched statuses for up to 500 file paths without triggering expensive metadata/hash work; response is { statuses: { [filePath]: 'fully'|'partway' } }.
79- POST /api/files/watch-progress - Records per-user watch status (`partway` >=10%, `fully` >=70%) for sidebar "Watched by" display.
80- POST /api/files/watch-progress - Records per-user watch status (`partway` >=10%, `fully` >=70%) for sidebar "Watched by" display.
@@ -86,14 +87,14 @@
86- GET /api/share/info/:token - Public. Returns {name, isDir, expiresAt} for a valid non-expired token; 410 when expired, 404 when unknown.
87- GET /api/share/info/:token - Public. Returns {name, isDir, expiresAt} for a valid non-expired token; 410 when expired, 404 when unknown.
87- GET /api/share/preview/:token - Public. Streams file content inline for preview (files only, max 50 MB); 400 for directories, 410 expired.
88- GET /api/share/preview/:token - Public. Streams file content inline for preview (files only, max 50 MB); 400 for directories, 410 expired.
88- GET /api/share/download/:token - Public. Downloads the file or a zip of the directory for a valid token; 410 expired.
89- GET /api/share/download/:token - Public. Downloads the file or a zip of the directory for a valid token; 410 expired.
89- GET /api/share/video-stream/:token - Public. Creates a short-lived HLS session for a shared video and returns playlistUrl, durationSeconds, subtitleTracks, and subtitleSummary ({total, converted, skipped}).
90- GET /api/share/video-stream/:token - Public. Creates a short-lived HLS session for a shared video and returns playlistUrl, durationSeconds, subtitleTracks, imageSubtitleTracks, and subtitleSummary ({total, converted, imageBased, skipped}).
90- buildShareOpenGraphPage(token, req) - Reads share.html, injects OG meta tags (<og:title>, <og:description>, <og:image> for image files, twitter:card) based on DB lookup of token, and returns the full HTML string. Handles expired and not-found tokens. Exported and used by the /share/:token route in server/index.js.
91- buildShareOpenGraphPage(token, req) - Reads share.html, injects OG meta tags (<og:title>, <og:description>, <og:image> for image files, twitter:card) based on DB lookup of token, and returns the full HTML string. Handles expired and not-found tokens. Exported and used by the /share/:token route in server/index.js.
91- buildZip(dirPath, cacheKey) - Creates (or returns cached) zip in zip-cache/; prunes stale zips before building; exported for reuse in files.js.
92- buildZip(dirPath, cacheKey) - Creates (or returns cached) zip in zip-cache/; prunes stale zips before building; exported for reuse in files.js.
92- pruneZipCache() - Deletes zip files in zip-cache/ older than 1 day; called automatically before each zip build.
93- pruneZipCache() - Deletes zip files in zip-cache/ older than 1 day; called automatically before each zip build.
93- ZIP_CACHE_DIR - Absolute path to the zip-cache/ directory (project root).
94- ZIP_CACHE_DIR - Absolute path to the zip-cache/ directory (project root).
94
95
95## server/video-stream.js
96## server/video-stream.js
96- createVideoStreamSession(sourcePath) - Probes input metadata and reuses a compatible active transcode session per source file when possible; returns a per-viewer lease id as sessionId plus duration/subtitle data.
97- createVideoStreamSession(sourcePath) - Probes input metadata and reuses a compatible active transcode session per source file when possible; returns a per-viewer lease id as sessionId plus duration, subtitleTracks, imageSubtitleTracks, and subtitleSummary data.
97- sendVideoStreamAsset(sessionId, assetPath, req, res) - Resolves viewer leases to a shared stream session, serves HLS assets, tracks lease activity, and prunes segments using the slowest active viewer position.
98- sendVideoStreamAsset(sessionId, assetPath, req, res) - Resolves viewer leases to a shared stream session, serves HLS assets, tracks lease activity, and prunes segments using the slowest active viewer position.
98- releaseVideoStreamSession(sessionId) - Releases one viewer lease; only destroys the underlying transcode session when no active leases remain.
99- releaseVideoStreamSession(sessionId) - Releases one viewer lease; only destroys the underlying transcode session when no active leases remain.
99- STREAM_ROOT_DIR - Temporary root directory for active ffmpeg-backed stream sessions.
100- STREAM_ROOT_DIR - Temporary root directory for active ffmpeg-backed stream sessions.
@@ -158,7 +159,9 @@
158- disconnectThumbnailObserver() - Clears active IntersectionObserver when the grid is rebuilt.
159- disconnectThumbnailObserver() - Clears active IntersectionObserver when the grid is rebuilt.
159- setThumbnailPending(iconEl, pending) - Toggles per-icon pending spinner state while a cached image thumbnail is not ready yet.
160- setThumbnailPending(iconEl, pending) - Toggles per-icon pending spinner state while a cached image thumbnail is not ready yet.
160- buildThumbnailSource(item, blob, kind) - Produces thumbnail image source (data/blob URL) for icon injection.
161- buildThumbnailSource(item, blob, kind) - Produces thumbnail image source (data/blob URL) for icon injection.
161- renderStreamedVideoPreview(item, targetEl) - Creates the Video.js player with HLS source/track config, enforces non-live playback UI for file streams, uses container-fill sizing to keep previews within bounds, restores per-user video prefs (volume + subtitle/audio track names when present), forces caption overrides on each open (text background opacity transparent + text edge style uniform), reports watch progress, warns when subtitle streams exist but none are web-compatible, and releases the backend stream session on close/unload.
162- buildAuthHeaders() - Builds the authenticated fetch headers used by preview-side API calls that need the bearer token plus fingerprint header.
163- bindImageSubtitleOverlay(player, videojs, prefs, session, item) - Adds the fullscreen-safe image-subtitle button, menu, and bottom overlay used to fetch and display subtitle frames for image-based tracks.
164- renderStreamedVideoPreview(item, targetEl) - Creates the Video.js player with HLS source/track config, enforces non-live playback UI for file streams, uses container-fill sizing to keep previews within bounds, restores per-user video prefs (volume + subtitle/audio track names when present), wires the image-subtitle overlay controller, forces caption overrides on each open (text background opacity transparent + text edge style uniform), reports watch progress, warns when subtitle streams exist but none are web-compatible, and releases the backend stream session on close/unload.
162- modelPreviewType(name) - Classifies direct client-side 3D preview support for `.stl` and `.obj`.
165- modelPreviewType(name) - Classifies direct client-side 3D preview support for `.stl` and `.obj`.
163- loadThreePreviewModules() - Lazy-loads Three.js plus OrbitControls/STLLoader/OBJLoader via import map aliases.
166- loadThreePreviewModules() - Lazy-loads Three.js plus OrbitControls/STLLoader/OBJLoader via import map aliases.
164- modelThumbnailDataUrl(item, blob) - Builds a blue SVG thumbnail for STL/OBJ files by parsing their geometry client-side; falls back to a badge when parsing fails.
167- modelThumbnailDataUrl(item, blob) - Builds a blue SVG thumbnail for STL/OBJ files by parsing their geometry client-side; falls back to a badge when parsing fails.
public/app.js +345 −137
@@ -250,6 +250,24 @@ function saveUserVideoPrefs (patch)
250 250 }
251 251 }
252 252
253 function buildAuthHeaders ()
254 {
255 const headers = {};
256 if (STATE.token)
257 {
258 headers.Authorization = 'Bearer ' + STATE.token;
259 try
260 {
261 const fp = getFingerprint();
262 if (fp) headers['X-Fp'] = fp;
263 } catch
264 {
265 // Continue without a fingerprint header in constrained test/runtime contexts.
266 }
267 }
268 return headers;
269 }
270
253 271 function applyUserVideoTextTrackPrefs ()
254 272 {
255 273 try
@@ -416,6 +434,329 @@ function bindUserVideoTrackPrefs (player, prefs)
416 434 };
417 435 }
418 436
437 function bindImageSubtitleOverlay (player, videojs, prefs, session, item)
438 {
439 const imageTracks = Array.isArray(session.imageSubtitleTracks)
440 ? session.imageSubtitleTracks.map((track) => ({
441 label: String(track.label || '').trim() || `Subtitle ${Number(track.streamIndex || 0) + 1}`,
442 language: String(track.language || '').trim(),
443 isDefault: !!track.default,
444 streamIndex: Number(track.streamIndex),
445 })).filter((track) => Number.isInteger(track.streamIndex) && track.streamIndex >= 0)
446 : [];
447
448 if (!imageTracks.length) return null;
449
450 const trackByStreamIndex = new Map(imageTracks.map((track) => [track.streamIndex, track]));
451 let selectedStreamIndex = null;
452 let menuOpen = false;
453 let requestToken = 0;
454 let activeBucket = -1;
455 let activeObjectUrl = null;
456 let overlayEl = null;
457 let overlayImgEl = null;
458 let menuEl = null;
459 let buttonEl = null;
460
461 const closeObjectUrl = () =>
462 {
463 if (activeObjectUrl)
464 {
465 URL.revokeObjectURL(activeObjectUrl);
466 activeObjectUrl = null;
467 }
468 };
469
470 const hideOverlay = () =>
471 {
472 if (overlayEl) overlayEl.style.display = 'none';
473 if (overlayImgEl) overlayImgEl.removeAttribute('src');
474 closeObjectUrl();
475 };
476
477 const updateButtonState = () =>
478 {
479 if (!buttonEl) return;
480 const track = selectedStreamIndex === null ? null : trackByStreamIndex.get(selectedStreamIndex) || null;
481 buttonEl.setAttribute('title', track ? `Image subtitles: ${track.label}` : 'Image subtitles');
482 buttonEl.setAttribute('aria-pressed', selectedStreamIndex === null ? 'false' : 'true');
483 };
484
485 const updateMenuState = () =>
486 {
487 if (!menuEl) return;
488 const items = menuEl.querySelectorAll('[data-image-subtitle-stream-index]');
489 for (const itemEl of items)
490 {
491 const value = itemEl.getAttribute('data-image-subtitle-stream-index');
492 const isSelected = value === (selectedStreamIndex === null ? 'off' : String(selectedStreamIndex));
493 itemEl.classList.toggle('is-selected', isSelected);
494 itemEl.setAttribute('aria-checked', isSelected ? 'true' : 'false');
495 }
496 };
497
498 const closeMenu = () =>
499 {
500 menuOpen = false;
501 if (menuEl) menuEl.style.display = 'none';
502 };
503
504 const openMenu = () =>
505 {
506 menuOpen = true;
507 if (menuEl)
508 {
509 updateMenuState();
510 menuEl.style.display = 'block';
511 }
512 };
513
514 const toggleMenu = () =>
515 {
516 if (menuOpen) closeMenu();
517 else openMenu();
518 };
519
520 const saveSelection = () =>
521 {
522 saveUserVideoPrefs({ imageSubtitleTrackStreamIndex: selectedStreamIndex });
523 };
524
525 const setSelectedStreamIndex = (streamIndex, { persist = true } = {}) =>
526 {
527 const nextStreamIndex = Number.isInteger(streamIndex) ? streamIndex : null;
528 if (nextStreamIndex !== null && !trackByStreamIndex.has(nextStreamIndex)) return;
529
530 selectedStreamIndex = nextStreamIndex;
531 activeBucket = -1;
532 hideOverlay();
533 updateButtonState();
534 updateMenuState();
535 if (persist) saveSelection();
536
537 if (selectedStreamIndex !== null)
538 {
539 void refreshFrame(true);
540 }
541 };
542
543 const refreshFrame = async (force = false) =>
544 {
545 if (selectedStreamIndex === null) return;
546 if (!overlayEl || !overlayImgEl) return;
547
548 const currentTime = Number(player.currentTime());
549 if (!Number.isFinite(currentTime) || currentTime < 0) return;
550
551 const bucket = Math.floor(currentTime * 4);
552 if (!force && bucket === activeBucket) return;
553 activeBucket = bucket;
554
555 const token = ++requestToken;
556 const headers = buildAuthHeaders();
557 const url = `/api/files/video-stream-subtitle-frame?filePath=${encodeURIComponent(item.path)}&streamIndex=${selectedStreamIndex}&timeSeconds=${encodeURIComponent(String(currentTime))}`;
558
559 try
560 {
561 const res = await fetch(url, {
562 method: 'GET',
563 headers,
564 credentials: 'same-origin',
565 });
566
567 if (token !== requestToken) return;
568
569 if (!res.ok)
570 {
571 hideOverlay();
572 return;
573 }
574
575 const blob = await res.blob();
576 if (token !== requestToken) return;
577
578 closeObjectUrl();
579 activeObjectUrl = URL.createObjectURL(blob);
580 overlayImgEl.src = activeObjectUrl;
581 overlayEl.style.display = 'block';
582 overlayImgEl.style.display = 'block';
583 } catch
584 {
585 if (token === requestToken) hideOverlay();
586 }
587 };
588
589 const dispose = () =>
590 {
591 requestToken++;
592 closeMenu();
593 hideOverlay();
594 if (overlayEl) overlayEl.remove();
595 if (menuEl) menuEl.remove();
596 player.imageSubtitleOverlayController = null;
597 buttonEl = null;
598 };
599
600 overlayEl = document.createElement('div');
601 overlayEl.className = 'video-subtitle-overlay';
602 overlayEl.style.position = 'absolute';
603 overlayEl.style.left = '0';
604 overlayEl.style.right = '0';
605 overlayEl.style.bottom = '3rem';
606 overlayEl.style.display = 'none';
607 overlayEl.style.zIndex = '3';
608 overlayEl.style.pointerEvents = 'none';
609 overlayEl.style.textAlign = 'center';
610 overlayEl.style.padding = '0 0.75rem';
611
612 overlayImgEl = document.createElement('img');
613 overlayImgEl.alt = 'Image subtitles';
614 overlayImgEl.style.display = 'none';
615 overlayImgEl.style.maxWidth = '100%';
616 overlayImgEl.style.maxHeight = '35%';
617 overlayImgEl.style.objectFit = 'contain';
618 overlayImgEl.style.filter = 'drop-shadow(0 2px 2px rgba(0, 0, 0, 0.7))';
619 overlayEl.appendChild(overlayImgEl);
620
621 menuEl = document.createElement('div');
622 menuEl.className = 'video-subtitle-overlay-menu';
623 menuEl.style.position = 'absolute';
624 menuEl.style.right = '0.75rem';
625 menuEl.style.bottom = 'calc(3rem + 0.5rem)';
626 menuEl.style.minWidth = '14rem';
627 menuEl.style.maxWidth = '20rem';
628 menuEl.style.background = 'rgba(12, 12, 12, 0.96)';
629 menuEl.style.border = '1px solid rgba(255, 255, 255, 0.15)';
630 menuEl.style.borderRadius = '0.5rem';
631 menuEl.style.boxShadow = '0 12px 28px rgba(0, 0, 0, 0.35)';
632 menuEl.style.padding = '0.35rem';
633 menuEl.style.display = 'none';
634 menuEl.style.zIndex = '4';
635
636 const buildMenuItem = (label, streamIndex, isSelected) =>
637 {
638 const itemEl = document.createElement('button');
639 itemEl.type = 'button';
640 itemEl.className = 'video-subtitle-overlay-menu-item';
641 itemEl.setAttribute('data-image-subtitle-stream-index', streamIndex === null ? 'off' : String(streamIndex));
642 itemEl.setAttribute('aria-checked', isSelected ? 'true' : 'false');
643 itemEl.style.display = 'block';
644 itemEl.style.width = '100%';
645 itemEl.style.margin = '0';
646 itemEl.style.padding = '0.5rem 0.75rem';
647 itemEl.style.border = '0';
648 itemEl.style.borderRadius = '0.35rem';
649 itemEl.style.background = isSelected ? 'rgba(255, 255, 255, 0.18)' : 'transparent';
650 itemEl.style.color = '#fff';
651 itemEl.style.textAlign = 'left';
652 itemEl.style.cursor = 'pointer';
653 itemEl.textContent = label;
654 itemEl.addEventListener('click', () =>
655 {
656 setSelectedStreamIndex(streamIndex);
657 closeMenu();
658 });
659 return itemEl;
660 };
661
662 menuEl.appendChild(buildMenuItem('Off', null, false));
663 for (const track of imageTracks)
664 {
665 menuEl.appendChild(buildMenuItem(track.label, track.streamIndex, false));
666 }
667
668 const registerButton = () =>
669 {
670 if (!videojs || typeof videojs.getComponent !== 'function' || typeof videojs.registerComponent !== 'function') return;
671 if (videojs.getComponent('ImageSubtitleButton')) return;
672
673 const Button = videojs.getComponent('Button');
674 class ImageSubtitleButton extends Button
675 {
676 buildCSSClass ()
677 {
678 return `${super.buildCSSClass()} vjs-image-subtitle-button`;
679 }
680
681 createEl ()
682 {
683 const el = super.createEl();
684 el.type = 'button';
685 el.setAttribute('title', 'Image subtitles');
686 el.setAttribute('aria-label', 'Image subtitles');
687 el.innerHTML = '<span aria-hidden="true">IM</span>';
688 return el;
689 }
690
691 handleClick ()
692 {
693 const controller = this.player().imageSubtitleOverlayController;
694 if (controller) controller.toggleMenu();
695 }
696 }
697
698 videojs.registerComponent('ImageSubtitleButton', ImageSubtitleButton);
699 };
700
701 const attachUi = () =>
702 {
703 if (!player.el()) return;
704 registerButton();
705 if (overlayEl.parentElement !== player.el()) player.el().appendChild(overlayEl);
706 if (menuEl.parentElement !== player.el()) player.el().appendChild(menuEl);
707 const controlBar = typeof player.getChild === 'function' ? player.getChild('controlBar') : null;
708 if (controlBar && typeof controlBar.addChild === 'function' && !buttonEl)
709 {
710 const button = controlBar.addChild('ImageSubtitleButton', {});
711 buttonEl = button && typeof button.el === 'function' ? button.el() : null;
712 updateButtonState();
713 }
714 };
715
716 const applySavedTracks = () =>
717 {
718 const savedIndex = Number(prefs.imageSubtitleTrackStreamIndex);
719 if (Number.isInteger(savedIndex) && trackByStreamIndex.has(savedIndex))
720 {
721 setSelectedStreamIndex(savedIndex, { persist: false });
722 return;
723 }
724
725 const defaultTrack = imageTracks.find((track) => track.isDefault) || null;
726 if (defaultTrack)
727 {
728 setSelectedStreamIndex(defaultTrack.streamIndex, { persist: false });
729 return;
730 }
731
732 setSelectedStreamIndex(null, { persist: false });
733 };
734
735 player.imageSubtitleOverlayController = {
736 toggleMenu,
737 closeMenu,
738 applySavedTracks,
739 captureSelectedTracks: saveSelection,
740 detach: dispose,
741 };
742
743 player.on('timeupdate', () => { void refreshFrame(); });
744 player.on('seeking', () => { void refreshFrame(true); });
745 player.on('play', () => { void refreshFrame(true); });
746 player.on('fullscreenchange', () => { closeMenu(); void refreshFrame(true); });
747 player.on('dispose', dispose);
748 player.ready(() =>
749 {
750 attachUi();
751 updateMenuState();
752 updateButtonState();
753 applySavedTracks();
754 if (menuOpen) openMenu();
755 });
756
757 return player.imageSubtitleOverlayController;
758 }
759
419 760 function normaliseVideoDuration (player, durationSeconds)
420 761 {
421 762 const duration = Number(durationSeconds);
@@ -2982,120 +3323,7 @@ async function renderStreamedVideoPreview (item, targetEl)
2982 3323 const trackPrefs = bindUserVideoTrackPrefs(player, prefs);
2983 3324
2984 3325 ensureVideoPlaybackUi(player, session.durationSeconds);
2985
2986 // -------------------------------------------------------------------------
2987 // Image-based subtitle overlays (PGS, DVD, etc.)
2988 // Extracted and displayed as PNG frames at the bottom of the video.
2989 // -------------------------------------------------------------------------
2990 const imageSubtitleTracks = session.imageSubtitleTracks || [];
2991 let activeImageStreamIndex = null;
2992 let imageOverlayContainer = null;
2993 let imageOverlayImg = null;
2994 let frameExtractionTimer = null;
2995
2996 const createImageOverlay = () =>
2997 {
2998 if (imageOverlayContainer) return;
2999
3000 imageOverlayContainer = document.createElement('div');
3001 imageOverlayContainer.className = 'video-subtitle-overlay';
3002 imageOverlayContainer.style.position = 'absolute';
3003 imageOverlayContainer.style.bottom = '0';
3004 imageOverlayContainer.style.left = '0';
3005 imageOverlayContainer.style.right = '0';
3006 imageOverlayContainer.style.display = 'none';
3007 imageOverlayContainer.style.textAlign = 'center';
3008 imageOverlayContainer.style.zIndex = '1';
3009 imageOverlayContainer.style.padding = '4px';
3010 imageOverlayContainer.style.backgroundColor = 'rgba(0, 0, 0, 0.3)';
3011 imageOverlayContainer.style.maxHeight = '30%';
3012 imageOverlayContainer.style.overflow = 'hidden';
3013
3014 imageOverlayImg = document.createElement('img');
3015 imageOverlayImg.style.maxHeight = '100%';
3016 imageOverlayImg.style.maxWidth = '100%';
3017 imageOverlayImg.style.display = 'none';
3018 imageOverlayImg.addEventListener('error', () => imageOverlayImg.style.display = 'none');
3019
3020 imageOverlayContainer.appendChild(imageOverlayImg);
3021
3022 const videoContainer = video.parentElement;
3023 videoContainer.style.position = 'relative';
3024 videoContainer.appendChild(imageOverlayContainer);
3025 };
3026
3027 const updateImageSubtitleFrame = async () =>
3028 {
3029 if (activeImageStreamIndex === null || !imageOverlayImg) return;
3030
3031 try
3032 {
3033 const currentTime = player.currentTime();
3034 const url = `/api/files/video-stream-subtitle-frame?filePath=${encodeURIComponent(item.path)}&streamIndex=${activeImageStreamIndex}&timeSeconds=${currentTime}`;
3035
3036 // Set a new src to trigger the load; use cache busting to ensure fresh frames
3037 imageOverlayImg.src = url + '&t=' + Date.now();
3038 imageOverlayImg.style.display = 'block';
3039 imageOverlayContainer.style.display = 'block';
3040 } catch
3041 {
3042 imageOverlayImg.style.display = 'none';
3043 }
3044 };
3045
3046 const scheduleFrameExtraction = () =>
3047 {
3048 if (frameExtractionTimer)
3049 {
3050 clearInterval(frameExtractionTimer);
3051 }
3052
3053 // Update frame every 100ms while playing
3054 if (!player.paused())
3055 {
3056 void updateImageSubtitleFrame();
3057 frameExtractionTimer = setInterval(updateImageSubtitleFrame, 100);
3058 }
3059 };
3060
3061 const handleImageTrackChange = async () =>
3062 {
3063 const allTextTracks = subtitleTracksFromPlayer(player);
3064 const activeImageEntry = imageSubtitleTracks.find(({ label }) =>
3065 allTextTracks.some((t) => t.label === label && String(t.mode || '') === 'showing'),
3066 );
3067
3068 const wantedStreamIndex = activeImageEntry ? activeImageEntry.streamIndex : null;
3069
3070 if (wantedStreamIndex === activeImageStreamIndex) return;
3071
3072 activeImageStreamIndex = wantedStreamIndex;
3073
3074 if (wantedStreamIndex === null)
3075 {
3076 if (imageOverlayContainer) imageOverlayContainer.style.display = 'none';
3077 if (frameExtractionTimer) clearInterval(frameExtractionTimer);
3078 } else
3079 {
3080 createImageOverlay();
3081 await updateImageSubtitleFrame();
3082 scheduleFrameExtraction();
3083 }
3084 };
3085
3086 // Add image subtitle tracks to VideoJS (as empty stubs so they show in menu)
3087 if (imageSubtitleTracks.length)
3088 {
3089 for (const imgTrack of imageSubtitleTracks)
3090 {
3091 player.addRemoteTextTrack({
3092 kind: 'subtitles',
3093 src: '/api/files/video-stream/empty.vtt',
3094 srclang: imgTrack.language || 'und',
3095 label: imgTrack.label,
3096 }, true);
3097 }
3098 }
3326 const imageSubtitleController = bindImageSubtitleOverlay(player, videojs, prefs, session, item);
3099 3327
3100 3328 // -------------------------------------------------------------------------
3101 3329
@@ -3136,11 +3364,6 @@ async function renderStreamedVideoPreview (item, targetEl)
3136 3364
3137 3365 player.ready(() =>
3138 3366 {
3139 if (imageSubtitleTracks.length)
3140 {
3141 player.textTracks().addEventListener('change', handleImageTrackChange);
3142 }
3143
3144 3367 const volume = Number(prefs.volume);
3145 3368 if (Number.isFinite(volume))
3146 3369 {
@@ -3163,17 +3386,6 @@ async function renderStreamedVideoPreview (item, targetEl)
3163 3386
3164 3387 player.on('loadedmetadata', trackPrefs.applySavedTracks);
3165 3388 player.on('loadedplaylist', trackPrefs.applySavedTracks);
3166
3167 player.on('play', scheduleFrameExtraction);
3168 player.on('pause', () =>
3169 {
3170 if (frameExtractionTimer)
3171 {
3172 clearInterval(frameExtractionTimer);
3173 frameExtractionTimer = null;
3174 }
3175 });
3176 player.on('seeking', updateImageSubtitleFrame);
3177 3389 player.on('timeupdate', markWatch);
3178 3390 player.on('ended', () =>
3179 3391 {
@@ -3189,14 +3401,10 @@ async function renderStreamedVideoPreview (item, targetEl)
3189 3401
3190 3402 STATE.previewCleanup = () =>
3191 3403 {
3192 if (imageSubtitleTracks.length)
3193 {
3194 try { player.textTracks().removeEventListener('change', handleImageTrackChange); } catch { /* ignore */ }
3195 }
3196 if (frameExtractionTimer)
3404 if (imageSubtitleController)
3197 3405 {
3198 clearInterval(frameExtractionTimer);
3199 frameExtractionTimer = null;
3406 try { imageSubtitleController.captureSelectedTracks(); } catch { /* ignore */ }
3407 try { imageSubtitleController.detach(); } catch { /* ignore */ }
3200 3408 }
3201 3409 releaseActivePreviewVideoStreamSession();
3202 3410 try { markWatch(); } catch { /* ignore */ }
@@ -250,6 +250,24 @@ function saveUserVideoPrefs (patch)
250 }
250 }
251}
251}
252
252
253function buildAuthHeaders ()
254{
255 const headers = {};
256 if (STATE.token)
257 {
258 headers.Authorization = 'Bearer ' + STATE.token;
259 try
260 {
261 const fp = getFingerprint();
262 if (fp) headers['X-Fp'] = fp;
263 } catch
264 {
265 // Continue without a fingerprint header in constrained test/runtime contexts.
266 }
267 }
268 return headers;
269}
270
253function applyUserVideoTextTrackPrefs ()
271function applyUserVideoTextTrackPrefs ()
254{
272{
255 try
273 try
@@ -416,6 +434,329 @@ function bindUserVideoTrackPrefs (player, prefs)
416 };
434 };
417}
435}
418
436
437function bindImageSubtitleOverlay (player, videojs, prefs, session, item)
438{
439 const imageTracks = Array.isArray(session.imageSubtitleTracks)
440 ? session.imageSubtitleTracks.map((track) => ({
441 label: String(track.label || '').trim() || `Subtitle ${Number(track.streamIndex || 0) + 1}`,
442 language: String(track.language || '').trim(),
443 isDefault: !!track.default,
444 streamIndex: Number(track.streamIndex),
445 })).filter((track) => Number.isInteger(track.streamIndex) && track.streamIndex >= 0)
446 : [];
447
448 if (!imageTracks.length) return null;
449
450 const trackByStreamIndex = new Map(imageTracks.map((track) => [track.streamIndex, track]));
451 let selectedStreamIndex = null;
452 let menuOpen = false;
453 let requestToken = 0;
454 let activeBucket = -1;
455 let activeObjectUrl = null;
456 let overlayEl = null;
457 let overlayImgEl = null;
458 let menuEl = null;
459 let buttonEl = null;
460
461 const closeObjectUrl = () =>
462 {
463 if (activeObjectUrl)
464 {
465 URL.revokeObjectURL(activeObjectUrl);
466 activeObjectUrl = null;
467 }
468 };
469
470 const hideOverlay = () =>
471 {
472 if (overlayEl) overlayEl.style.display = 'none';
473 if (overlayImgEl) overlayImgEl.removeAttribute('src');
474 closeObjectUrl();
475 };
476
477 const updateButtonState = () =>
478 {
479 if (!buttonEl) return;
480 const track = selectedStreamIndex === null ? null : trackByStreamIndex.get(selectedStreamIndex) || null;
481 buttonEl.setAttribute('title', track ? `Image subtitles: ${track.label}` : 'Image subtitles');
482 buttonEl.setAttribute('aria-pressed', selectedStreamIndex === null ? 'false' : 'true');
483 };
484
485 const updateMenuState = () =>
486 {
487 if (!menuEl) return;
488 const items = menuEl.querySelectorAll('[data-image-subtitle-stream-index]');
489 for (const itemEl of items)
490 {
491 const value = itemEl.getAttribute('data-image-subtitle-stream-index');
492 const isSelected = value === (selectedStreamIndex === null ? 'off' : String(selectedStreamIndex));
493 itemEl.classList.toggle('is-selected', isSelected);
494 itemEl.setAttribute('aria-checked', isSelected ? 'true' : 'false');
495 }
496 };
497
498 const closeMenu = () =>
499 {
500 menuOpen = false;
501 if (menuEl) menuEl.style.display = 'none';
502 };
503
504 const openMenu = () =>
505 {
506 menuOpen = true;
507 if (menuEl)
508 {
509 updateMenuState();
510 menuEl.style.display = 'block';
511 }
512 };
513
514 const toggleMenu = () =>
515 {
516 if (menuOpen) closeMenu();
517 else openMenu();
518 };
519
520 const saveSelection = () =>
521 {
522 saveUserVideoPrefs({ imageSubtitleTrackStreamIndex: selectedStreamIndex });
523 };
524
525 const setSelectedStreamIndex = (streamIndex, { persist = true } = {}) =>
526 {
527 const nextStreamIndex = Number.isInteger(streamIndex) ? streamIndex : null;
528 if (nextStreamIndex !== null && !trackByStreamIndex.has(nextStreamIndex)) return;
529
530 selectedStreamIndex = nextStreamIndex;
531 activeBucket = -1;
532 hideOverlay();
533 updateButtonState();
534 updateMenuState();
535 if (persist) saveSelection();
536
537 if (selectedStreamIndex !== null)
538 {
539 void refreshFrame(true);
540 }
541 };
542
543 const refreshFrame = async (force = false) =>
544 {
545 if (selectedStreamIndex === null) return;
546 if (!overlayEl || !overlayImgEl) return;
547
548 const currentTime = Number(player.currentTime());
549 if (!Number.isFinite(currentTime) || currentTime < 0) return;
550
551 const bucket = Math.floor(currentTime * 4);
552 if (!force && bucket === activeBucket) return;
553 activeBucket = bucket;
554
555 const token = ++requestToken;
556 const headers = buildAuthHeaders();
557 const url = `/api/files/video-stream-subtitle-frame?filePath=${encodeURIComponent(item.path)}&streamIndex=${selectedStreamIndex}&timeSeconds=${encodeURIComponent(String(currentTime))}`;
558
559 try
560 {
561 const res = await fetch(url, {
562 method: 'GET',
563 headers,
564 credentials: 'same-origin',
565 });
566
567 if (token !== requestToken) return;
568
569 if (!res.ok)
570 {
571 hideOverlay();
572 return;
573 }
574
575 const blob = await res.blob();
576 if (token !== requestToken) return;
577
578 closeObjectUrl();
579 activeObjectUrl = URL.createObjectURL(blob);
580 overlayImgEl.src = activeObjectUrl;
581 overlayEl.style.display = 'block';
582 overlayImgEl.style.display = 'block';
583 } catch
584 {
585 if (token === requestToken) hideOverlay();
586 }
587 };
588
589 const dispose = () =>
590 {
591 requestToken++;
592 closeMenu();
593 hideOverlay();
594 if (overlayEl) overlayEl.remove();
595 if (menuEl) menuEl.remove();
596 player.imageSubtitleOverlayController = null;
597 buttonEl = null;
598 };
599
600 overlayEl = document.createElement('div');
601 overlayEl.className = 'video-subtitle-overlay';
602 overlayEl.style.position = 'absolute';
603 overlayEl.style.left = '0';
604 overlayEl.style.right = '0';
605 overlayEl.style.bottom = '3rem';
606 overlayEl.style.display = 'none';
607 overlayEl.style.zIndex = '3';
608 overlayEl.style.pointerEvents = 'none';
609 overlayEl.style.textAlign = 'center';
610 overlayEl.style.padding = '0 0.75rem';
611
612 overlayImgEl = document.createElement('img');
613 overlayImgEl.alt = 'Image subtitles';
614 overlayImgEl.style.display = 'none';
615 overlayImgEl.style.maxWidth = '100%';
616 overlayImgEl.style.maxHeight = '35%';
617 overlayImgEl.style.objectFit = 'contain';
618 overlayImgEl.style.filter = 'drop-shadow(0 2px 2px rgba(0, 0, 0, 0.7))';
619 overlayEl.appendChild(overlayImgEl);
620
621 menuEl = document.createElement('div');
622 menuEl.className = 'video-subtitle-overlay-menu';
623 menuEl.style.position = 'absolute';
624 menuEl.style.right = '0.75rem';
625 menuEl.style.bottom = 'calc(3rem + 0.5rem)';
626 menuEl.style.minWidth = '14rem';
627 menuEl.style.maxWidth = '20rem';
628 menuEl.style.background = 'rgba(12, 12, 12, 0.96)';
629 menuEl.style.border = '1px solid rgba(255, 255, 255, 0.15)';
630 menuEl.style.borderRadius = '0.5rem';
631 menuEl.style.boxShadow = '0 12px 28px rgba(0, 0, 0, 0.35)';
632 menuEl.style.padding = '0.35rem';
633 menuEl.style.display = 'none';
634 menuEl.style.zIndex = '4';
635
636 const buildMenuItem = (label, streamIndex, isSelected) =>
637 {
638 const itemEl = document.createElement('button');
639 itemEl.type = 'button';
640 itemEl.className = 'video-subtitle-overlay-menu-item';
641 itemEl.setAttribute('data-image-subtitle-stream-index', streamIndex === null ? 'off' : String(streamIndex));
642 itemEl.setAttribute('aria-checked', isSelected ? 'true' : 'false');
643 itemEl.style.display = 'block';
644 itemEl.style.width = '100%';
645 itemEl.style.margin = '0';
646 itemEl.style.padding = '0.5rem 0.75rem';
647 itemEl.style.border = '0';
648 itemEl.style.borderRadius = '0.35rem';
649 itemEl.style.background = isSelected ? 'rgba(255, 255, 255, 0.18)' : 'transparent';
650 itemEl.style.color = '#fff';
651 itemEl.style.textAlign = 'left';
652 itemEl.style.cursor = 'pointer';
653 itemEl.textContent = label;
654 itemEl.addEventListener('click', () =>
655 {
656 setSelectedStreamIndex(streamIndex);
657 closeMenu();
658 });
659 return itemEl;
660 };
661
662 menuEl.appendChild(buildMenuItem('Off', null, false));
663 for (const track of imageTracks)
664 {
665 menuEl.appendChild(buildMenuItem(track.label, track.streamIndex, false));
666 }
667
668 const registerButton = () =>
669 {
670 if (!videojs || typeof videojs.getComponent !== 'function' || typeof videojs.registerComponent !== 'function') return;
671 if (videojs.getComponent('ImageSubtitleButton')) return;
672
673 const Button = videojs.getComponent('Button');
674 class ImageSubtitleButton extends Button
675 {
676 buildCSSClass ()
677 {
678 return `${super.buildCSSClass()} vjs-image-subtitle-button`;
679 }
680
681 createEl ()
682 {
683 const el = super.createEl();
684 el.type = 'button';
685 el.setAttribute('title', 'Image subtitles');
686 el.setAttribute('aria-label', 'Image subtitles');
687 el.innerHTML = '<span aria-hidden="true">IM</span>';
688 return el;
689 }
690
691 handleClick ()
692 {
693 const controller = this.player().imageSubtitleOverlayController;
694 if (controller) controller.toggleMenu();
695 }
696 }
697
698 videojs.registerComponent('ImageSubtitleButton', ImageSubtitleButton);
699 };
700
701 const attachUi = () =>
702 {
703 if (!player.el()) return;
704 registerButton();
705 if (overlayEl.parentElement !== player.el()) player.el().appendChild(overlayEl);
706 if (menuEl.parentElement !== player.el()) player.el().appendChild(menuEl);
707 const controlBar = typeof player.getChild === 'function' ? player.getChild('controlBar') : null;
708 if (controlBar && typeof controlBar.addChild === 'function' && !buttonEl)
709 {
710 const button = controlBar.addChild('ImageSubtitleButton', {});
711 buttonEl = button && typeof button.el === 'function' ? button.el() : null;
712 updateButtonState();
713 }
714 };
715
716 const applySavedTracks = () =>
717 {
718 const savedIndex = Number(prefs.imageSubtitleTrackStreamIndex);
719 if (Number.isInteger(savedIndex) && trackByStreamIndex.has(savedIndex))
720 {
721 setSelectedStreamIndex(savedIndex, { persist: false });
722 return;
723 }
724
725 const defaultTrack = imageTracks.find((track) => track.isDefault) || null;
726 if (defaultTrack)
727 {
728 setSelectedStreamIndex(defaultTrack.streamIndex, { persist: false });
729 return;
730 }
731
732 setSelectedStreamIndex(null, { persist: false });
733 };
734
735 player.imageSubtitleOverlayController = {
736 toggleMenu,
737 closeMenu,
738 applySavedTracks,
739 captureSelectedTracks: saveSelection,
740 detach: dispose,
741 };
742
743 player.on('timeupdate', () => { void refreshFrame(); });
744 player.on('seeking', () => { void refreshFrame(true); });
745 player.on('play', () => { void refreshFrame(true); });
746 player.on('fullscreenchange', () => { closeMenu(); void refreshFrame(true); });
747 player.on('dispose', dispose);
748 player.ready(() =>
749 {
750 attachUi();
751 updateMenuState();
752 updateButtonState();
753 applySavedTracks();
754 if (menuOpen) openMenu();
755 });
756
757 return player.imageSubtitleOverlayController;
758}
759
419function normaliseVideoDuration (player, durationSeconds)
760function normaliseVideoDuration (player, durationSeconds)
420{
761{
421 const duration = Number(durationSeconds);
762 const duration = Number(durationSeconds);
@@ -2982,120 +3323,7 @@ async function renderStreamedVideoPreview (item, targetEl)
2982 const trackPrefs = bindUserVideoTrackPrefs(player, prefs);
3323 const trackPrefs = bindUserVideoTrackPrefs(player, prefs);
2983
3324
2984 ensureVideoPlaybackUi(player, session.durationSeconds);
3325 ensureVideoPlaybackUi(player, session.durationSeconds);
2985
3326 const imageSubtitleController = bindImageSubtitleOverlay(player, videojs, prefs, session, item);
2986 // -------------------------------------------------------------------------
2987 // Image-based subtitle overlays (PGS, DVD, etc.)
2988 // Extracted and displayed as PNG frames at the bottom of the video.
2989 // -------------------------------------------------------------------------
2990 const imageSubtitleTracks = session.imageSubtitleTracks || [];
2991 let activeImageStreamIndex = null;
2992 let imageOverlayContainer = null;
2993 let imageOverlayImg = null;
2994 let frameExtractionTimer = null;
2995
2996 const createImageOverlay = () =>
2997 {
2998 if (imageOverlayContainer) return;
2999
3000 imageOverlayContainer = document.createElement('div');
3001 imageOverlayContainer.className = 'video-subtitle-overlay';
3002 imageOverlayContainer.style.position = 'absolute';
3003 imageOverlayContainer.style.bottom = '0';
3004 imageOverlayContainer.style.left = '0';
3005 imageOverlayContainer.style.right = '0';
3006 imageOverlayContainer.style.display = 'none';
3007 imageOverlayContainer.style.textAlign = 'center';
3008 imageOverlayContainer.style.zIndex = '1';
3009 imageOverlayContainer.style.padding = '4px';
3010 imageOverlayContainer.style.backgroundColor = 'rgba(0, 0, 0, 0.3)';
3011 imageOverlayContainer.style.maxHeight = '30%';
3012 imageOverlayContainer.style.overflow = 'hidden';
3013
3014 imageOverlayImg = document.createElement('img');
3015 imageOverlayImg.style.maxHeight = '100%';
3016 imageOverlayImg.style.maxWidth = '100%';
3017 imageOverlayImg.style.display = 'none';
3018 imageOverlayImg.addEventListener('error', () => imageOverlayImg.style.display = 'none');
3019
3020 imageOverlayContainer.appendChild(imageOverlayImg);
3021
3022 const videoContainer = video.parentElement;
3023 videoContainer.style.position = 'relative';
3024 videoContainer.appendChild(imageOverlayContainer);
3025 };
3026
3027 const updateImageSubtitleFrame = async () =>
3028 {
3029 if (activeImageStreamIndex === null || !imageOverlayImg) return;
3030
3031 try
3032 {
3033 const currentTime = player.currentTime();
3034 const url = `/api/files/video-stream-subtitle-frame?filePath=${encodeURIComponent(item.path)}&streamIndex=${activeImageStreamIndex}&timeSeconds=${currentTime}`;
3035
3036 // Set a new src to trigger the load; use cache busting to ensure fresh frames
3037 imageOverlayImg.src = url + '&t=' + Date.now();
3038 imageOverlayImg.style.display = 'block';
3039 imageOverlayContainer.style.display = 'block';
3040 } catch
3041 {
3042 imageOverlayImg.style.display = 'none';
3043 }
3044 };
3045
3046 const scheduleFrameExtraction = () =>
3047 {
3048 if (frameExtractionTimer)
3049 {
3050 clearInterval(frameExtractionTimer);
3051 }
3052
3053 // Update frame every 100ms while playing
3054 if (!player.paused())
3055 {
3056 void updateImageSubtitleFrame();
3057 frameExtractionTimer = setInterval(updateImageSubtitleFrame, 100);
3058 }
3059 };
3060
3061 const handleImageTrackChange = async () =>
3062 {
3063 const allTextTracks = subtitleTracksFromPlayer(player);
3064 const activeImageEntry = imageSubtitleTracks.find(({ label }) =>
3065 allTextTracks.some((t) => t.label === label && String(t.mode || '') === 'showing'),
3066 );
3067
3068 const wantedStreamIndex = activeImageEntry ? activeImageEntry.streamIndex : null;
3069
3070 if (wantedStreamIndex === activeImageStreamIndex) return;
3071
3072 activeImageStreamIndex = wantedStreamIndex;
3073
3074 if (wantedStreamIndex === null)
3075 {
3076 if (imageOverlayContainer) imageOverlayContainer.style.display = 'none';
3077 if (frameExtractionTimer) clearInterval(frameExtractionTimer);
3078 } else
3079 {
3080 createImageOverlay();
3081 await updateImageSubtitleFrame();
3082 scheduleFrameExtraction();
3083 }
3084 };
3085
3086 // Add image subtitle tracks to VideoJS (as empty stubs so they show in menu)
3087 if (imageSubtitleTracks.length)
3088 {
3089 for (const imgTrack of imageSubtitleTracks)
3090 {
3091 player.addRemoteTextTrack({
3092 kind: 'subtitles',
3093 src: '/api/files/video-stream/empty.vtt',
3094 srclang: imgTrack.language || 'und',
3095 label: imgTrack.label,
3096 }, true);
3097 }
3098 }
3099
3327
3100 // -------------------------------------------------------------------------
3328 // -------------------------------------------------------------------------
3101
3329
@@ -3136,11 +3364,6 @@ async function renderStreamedVideoPreview (item, targetEl)
3136
3364
3137 player.ready(() =>
3365 player.ready(() =>
3138 {
3366 {
3139 if (imageSubtitleTracks.length)
3140 {
3141 player.textTracks().addEventListener('change', handleImageTrackChange);
3142 }
3143
3144 const volume = Number(prefs.volume);
3367 const volume = Number(prefs.volume);
3145 if (Number.isFinite(volume))
3368 if (Number.isFinite(volume))
3146 {
3369 {
@@ -3163,17 +3386,6 @@ async function renderStreamedVideoPreview (item, targetEl)
3163
3386
3164 player.on('loadedmetadata', trackPrefs.applySavedTracks);
3387 player.on('loadedmetadata', trackPrefs.applySavedTracks);
3165 player.on('loadedplaylist', trackPrefs.applySavedTracks);
3388 player.on('loadedplaylist', trackPrefs.applySavedTracks);
3166
3167 player.on('play', scheduleFrameExtraction);
3168 player.on('pause', () =>
3169 {
3170 if (frameExtractionTimer)
3171 {
3172 clearInterval(frameExtractionTimer);
3173 frameExtractionTimer = null;
3174 }
3175 });
3176 player.on('seeking', updateImageSubtitleFrame);
3177 player.on('timeupdate', markWatch);
3389 player.on('timeupdate', markWatch);
3178 player.on('ended', () =>
3390 player.on('ended', () =>
3179 {
3391 {
@@ -3189,14 +3401,10 @@ async function renderStreamedVideoPreview (item, targetEl)
3189
3401
3190 STATE.previewCleanup = () =>
3402 STATE.previewCleanup = () =>
3191 {
3403 {
3192 if (imageSubtitleTracks.length)
3404 if (imageSubtitleController)
3193 {
3194 try { player.textTracks().removeEventListener('change', handleImageTrackChange); } catch { /* ignore */ }
3195 }
3196 if (frameExtractionTimer)
3197 {
3405 {
3198 clearInterval(frameExtractionTimer);
3406 try { imageSubtitleController.captureSelectedTracks(); } catch { /* ignore */ }
3199 frameExtractionTimer = null;
3407 try { imageSubtitleController.detach(); } catch { /* ignore */ }
3200 }
3408 }
3201 releaseActivePreviewVideoStreamSession();
3409 releaseActivePreviewVideoStreamSession();
3202 try { markWatch(); } catch { /* ignore */ }
3410 try { markWatch(); } catch { /* ignore */ }
server/routes/share.js +7 −1
@@ -306,13 +306,19 @@ router.get('/video-stream/:token', async (req, res, next) =>
306 306 sessionId: session.sessionId,
307 307 playlistUrl: `/api/share/video-stream/session/${session.sessionId}/master.m3u8`,
308 308 durationSeconds: session.durationSeconds || null,
309 subtitleSummary: session.subtitleSummary || { total: 0, converted: 0, skipped: 0 },
309 subtitleSummary: session.subtitleSummary || { total: 0, converted: 0, imageBased: 0, skipped: 0 },
310 310 subtitleTracks: session.subtitleTracks.map((track) => ({
311 311 label: track.label,
312 312 language: track.language,
313 313 default: !!track.isDefault,
314 314 src: `/api/share/video-stream/session/${session.sessionId}/${track.fileName}`,
315 315 })),
316 imageSubtitleTracks: (session.imageSubtitleTracks || []).map((track) => ({
317 label: track.label,
318 language: track.language,
319 default: !!track.isDefault,
320 streamIndex: track.streamIndex,
321 })),
316 322 });
317 323 } catch (err)
318 324 {
@@ -306,13 +306,19 @@ router.get('/video-stream/:token', async (req, res, next) =>
306 sessionId: session.sessionId,
306 sessionId: session.sessionId,
307 playlistUrl: `/api/share/video-stream/session/${session.sessionId}/master.m3u8`,
307 playlistUrl: `/api/share/video-stream/session/${session.sessionId}/master.m3u8`,
308 durationSeconds: session.durationSeconds || null,
308 durationSeconds: session.durationSeconds || null,
309 subtitleSummary: session.subtitleSummary || { total: 0, converted: 0, skipped: 0 },
309 subtitleSummary: session.subtitleSummary || { total: 0, converted: 0, imageBased: 0, skipped: 0 },
310 subtitleTracks: session.subtitleTracks.map((track) => ({
310 subtitleTracks: session.subtitleTracks.map((track) => ({
311 label: track.label,
311 label: track.label,
312 language: track.language,
312 language: track.language,
313 default: !!track.isDefault,
313 default: !!track.isDefault,
314 src: `/api/share/video-stream/session/${session.sessionId}/${track.fileName}`,
314 src: `/api/share/video-stream/session/${session.sessionId}/${track.fileName}`,
315 })),
315 })),
316 imageSubtitleTracks: (session.imageSubtitleTracks || []).map((track) => ({
317 label: track.label,
318 language: track.language,
319 default: !!track.isDefault,
320 streamIndex: track.streamIndex,
321 })),
316 });
322 });
317 } catch (err)
323 } catch (err)
318 {
324 {
tests/video-stream.test.js +13 −1
@@ -113,9 +113,11 @@ describe('video stream bootstrap', () =>
113 113 sessionId: expect.any(String),
114 114 durationSeconds: 12.5,
115 115 subtitleTracks: [],
116 imageSubtitleTracks: [],
116 117 subtitleSummary: {
117 118 total: 0,
118 119 converted: 0,
120 imageBased: 0,
119 121 skipped: 0,
120 122 },
121 123 });
@@ -280,9 +282,11 @@ describe('video stream bootstrap', () =>
280 282 language: 'eng',
281 283 }),
282 284 ],
285 imageSubtitleTracks: [],
283 286 subtitleSummary: {
284 287 total: 1,
285 288 converted: 1,
289 imageBased: 0,
286 290 skipped: 0,
287 291 },
288 292 });
@@ -341,10 +345,18 @@ describe('video stream bootstrap', () =>
341 345 sessionId: expect.any(String),
342 346 durationSeconds: null,
343 347 subtitleTracks: [],
348 imageSubtitleTracks: [
349 expect.objectContaining({
350 label: 'Subtitle 1 (eng)',
351 language: 'eng',
352 streamIndex: 0,
353 }),
354 ],
344 355 subtitleSummary: {
345 356 total: 1,
346 357 converted: 0,
347 skipped: 1,
358 imageBased: 1,
359 skipped: 0,
348 360 },
349 361 });
350 362 });
@@ -113,9 +113,11 @@ describe('video stream bootstrap', () =>
113 sessionId: expect.any(String),
113 sessionId: expect.any(String),
114 durationSeconds: 12.5,
114 durationSeconds: 12.5,
115 subtitleTracks: [],
115 subtitleTracks: [],
116 imageSubtitleTracks: [],
116 subtitleSummary: {
117 subtitleSummary: {
117 total: 0,
118 total: 0,
118 converted: 0,
119 converted: 0,
120 imageBased: 0,
119 skipped: 0,
121 skipped: 0,
120 },
122 },
121 });
123 });
@@ -280,9 +282,11 @@ describe('video stream bootstrap', () =>
280 language: 'eng',
282 language: 'eng',
281 }),
283 }),
282 ],
284 ],
285 imageSubtitleTracks: [],
283 subtitleSummary: {
286 subtitleSummary: {
284 total: 1,
287 total: 1,
285 converted: 1,
288 converted: 1,
289 imageBased: 0,
286 skipped: 0,
290 skipped: 0,
287 },
291 },
288 });
292 });
@@ -341,10 +345,18 @@ describe('video stream bootstrap', () =>
341 sessionId: expect.any(String),
345 sessionId: expect.any(String),
342 durationSeconds: null,
346 durationSeconds: null,
343 subtitleTracks: [],
347 subtitleTracks: [],
348 imageSubtitleTracks: [
349 expect.objectContaining({
350 label: 'Subtitle 1 (eng)',
351 language: 'eng',
352 streamIndex: 0,
353 }),
354 ],
344 subtitleSummary: {
355 subtitleSummary: {
345 total: 1,
356 total: 1,
346 converted: 0,
357 converted: 0,
347 skipped: 1,
358 imageBased: 1,
359 skipped: 0,
348 },
360 },
349 });
361 });
350 });
362 });