Skip to content

A self-hosted media server and file management system

fix: subtitle canvas duplicates if you navigate away while loading

aminnausinbef46628197e
diff --git a/resources/js/components/video/subtitles/OctopusRenderer.ts b/resources/js/components/video/subtitles/OctopusRenderer.ts
index cba9d1f0..f65f66e1 100644
--- a/resources/js/components/video/subtitles/OctopusRenderer.ts
+++ b/resources/js/components/video/subtitles/OctopusRenderer.ts
@@ -7,12 +7,17 @@ import { ref } from 'vue';
export default function useOctopusRenderer() {
const assInstance = ref<SubtitlesOctopus | null>(null);
+ const abortController = ref<AbortController | null>(null);
const instantiateOctopus = async (nextTrack: SubtitleResource, frameRate?: number) => {
const video = document.getElementById('video-source') as HTMLVideoElement;
if (!video) return;
if (assInstance.value) clearOctopus();
+ abortController.value?.abort();
+ abortController.value = new AbortController();
+ const signal = abortController.value.signal;
+
const languageTag = nextTrack.track_id === 0 ? `.${nextTrack.language}` : '';
const subUrl = `/data/subtitles/${nextTrack.metadata_uuid}/${nextTrack.track_id}${languageTag}.ass`;
@@ -20,27 +25,39 @@ export default function useOctopusRenderer() {
const supplementalFonts = generateLanguageFonts(nextTrack.language);
const trackTitle = nextTrack.title ? formatSubtitleTitle(nextTrack.title) : `subtitles track ${nextTrack.track_id}`;
- await toast.promise(fetch(subUrl), {
- loading: `Loading ${trackTitle}...`,
- success: `Loaded ${trackTitle}`,
- error: `Failed to load ${trackTitle}`,
- });
-
- import('@jellyfin/libass-wasm').then(({ default: SubtitlesOctopus }) => {
- const options: SubtitlesOctopusOptions = {
- video,
- subUrl,
- fonts: [...baseFonts, ...supplementalFonts],
- workerUrl: '/build/lib/subtitles-octopus/subtitles-octopus-worker.js',
- fallbackFont: '/fonts/NotoSans-Regular.ttf',
- onError(e?: any) {
- toast.error('Subtitles Failed', { description: e?.message ?? undefined });
- clearOctopus();
- },
- targetFps: frameRate || 24,
- };
- assInstance.value = new SubtitlesOctopus(options);
- });
+
+ try {
+ const response = await toast.promise(fetch(subUrl, { signal }), {
+ loading: `Loading ${trackTitle}...`,
+ success: `Loaded ${trackTitle}`,
+ error: `Failed to load ${trackTitle}`,
+ });
+
+ if (!response.ok || signal.aborted) return;
+
+ // This await continues even if this instance of octopus renderer is cancelled like if im loading subs for a video and go to another video, this is never cancelled
+
+ import('@jellyfin/libass-wasm').then(({ default: SubtitlesOctopus }) => {
+ if (signal.aborted) return;
+
+ const options: SubtitlesOctopusOptions = {
+ video,
+ subUrl,
+ fonts: [...baseFonts, ...supplementalFonts],
+ workerUrl: '/build/lib/subtitles-octopus/subtitles-octopus-worker.js',
+ fallbackFont: '/fonts/NotoSans-Regular.ttf',
+ onError(e?: any) {
+ toast.error('Subtitles Failed', { description: e?.message ?? undefined });
+ clearOctopus();
+ },
+ targetFps: frameRate || 24,
+ };
+ assInstance.value = new SubtitlesOctopus(options);
+ });
+ } catch (e) {
+ if (e instanceof DOMException && e.name === 'AbortError') return;
+ console.error(e);
+ }
};
const clearOctopus = () => {