From f820d9a8948b97460ebdfdaa6b42b6d510e2b3cf Mon Sep 17 00:00:00 2001 From: Maze Winther Date: Sat, 31 Jan 2026 22:19:11 +0100 Subject: refactor services structure --- .../editor/panels/assets/views/captions.tsx | 2 +- apps/web/src/components/storage-provider.tsx | 2 +- apps/web/src/core/managers/media-manager.ts | 4 +- apps/web/src/core/managers/project-manager.ts | 2 +- apps/web/src/core/managers/scenes-manager.ts | 2 +- apps/web/src/lib/commands/media/add-media-asset.ts | 2 +- .../src/lib/commands/media/remove-media-asset.ts | 4 +- apps/web/src/services/media/video-cache.ts | 314 -------------- apps/web/src/services/storage/service.ts | 469 ++++++++++++++++++++ apps/web/src/services/storage/storage-service.ts | 475 --------------------- apps/web/src/services/transcription/index.ts | 186 -------- apps/web/src/services/transcription/service.ts | 186 ++++++++ apps/web/src/services/video-cache/service.ts | 316 ++++++++++++++ apps/web/src/stores/sounds-store.ts | 2 +- 14 files changed, 981 insertions(+), 985 deletions(-) delete mode 100644 apps/web/src/services/media/video-cache.ts create mode 100644 apps/web/src/services/storage/service.ts delete mode 100644 apps/web/src/services/storage/storage-service.ts delete mode 100644 apps/web/src/services/transcription/index.ts create mode 100644 apps/web/src/services/transcription/service.ts create mode 100644 apps/web/src/services/video-cache/service.ts (limited to 'apps/web/src') diff --git a/apps/web/src/components/editor/panels/assets/views/captions.tsx b/apps/web/src/components/editor/panels/assets/views/captions.tsx index 306bad2a..d93baeff 100644 --- a/apps/web/src/components/editor/panels/assets/views/captions.tsx +++ b/apps/web/src/components/editor/panels/assets/views/captions.tsx @@ -17,7 +17,7 @@ import type { TranscriptionLanguage, TranscriptionProgress, } from "@/types/transcription"; -import { transcriptionService } from "@/services/transcription"; +import { transcriptionService } from "@/services/transcription/service"; import { decodeAudioToFloat32 } from "@/lib/media/audio"; import { buildCaptionChunks } from "@/lib/transcription/caption"; import { Spinner } from "@/components/ui/spinner"; diff --git a/apps/web/src/components/storage-provider.tsx b/apps/web/src/components/storage-provider.tsx index 144790dc..5b233782 100644 --- a/apps/web/src/components/storage-provider.tsx +++ b/apps/web/src/components/storage-provider.tsx @@ -3,7 +3,7 @@ import { createContext, useContext, useEffect, useRef, useState } from "react"; import { toast } from "sonner"; import { useEditor } from "@/hooks/use-editor"; -import { storageService } from "@/services/storage/storage-service"; +import { storageService } from "@/services/storage/service"; interface StorageContextType { isInitialized: boolean; diff --git a/apps/web/src/core/managers/media-manager.ts b/apps/web/src/core/managers/media-manager.ts index 7b9db0d5..fd8726d9 100644 --- a/apps/web/src/core/managers/media-manager.ts +++ b/apps/web/src/core/managers/media-manager.ts @@ -1,8 +1,8 @@ import type { EditorCore } from "@/core"; import type { MediaAsset } from "@/types/assets"; -import { storageService } from "@/services/storage/storage-service"; +import { storageService } from "@/services/storage/service"; import { generateUUID } from "@/utils/id"; -import { videoCache } from "@/services/media/video-cache"; +import { videoCache } from "@/services/video-cache/service"; import { hasMediaId } from "@/lib/timeline/element-utils"; export class MediaManager { diff --git a/apps/web/src/core/managers/project-manager.ts b/apps/web/src/core/managers/project-manager.ts index db9e3fad..fc0b2a36 100644 --- a/apps/web/src/core/managers/project-manager.ts +++ b/apps/web/src/core/managers/project-manager.ts @@ -8,7 +8,7 @@ import type { TTimelineViewState, } from "@/types/project"; import type { ExportOptions, ExportResult } from "@/types/export"; -import { storageService } from "@/services/storage/storage-service"; +import { storageService } from "@/services/storage/service"; import { toast } from "sonner"; import { generateUUID } from "@/utils/id"; import { UpdateProjectSettingsCommand } from "@/lib/commands/project"; diff --git a/apps/web/src/core/managers/scenes-manager.ts b/apps/web/src/core/managers/scenes-manager.ts index 447ec820..8c761f9b 100644 --- a/apps/web/src/core/managers/scenes-manager.ts +++ b/apps/web/src/core/managers/scenes-manager.ts @@ -1,6 +1,6 @@ import type { EditorCore } from "@/core"; import type { TimelineTrack, TScene } from "@/types/timeline"; -import { storageService } from "@/services/storage/storage-service"; +import { storageService } from "@/services/storage/service"; import { getMainScene, ensureMainScene, diff --git a/apps/web/src/lib/commands/media/add-media-asset.ts b/apps/web/src/lib/commands/media/add-media-asset.ts index d947cb97..ddcca426 100644 --- a/apps/web/src/lib/commands/media/add-media-asset.ts +++ b/apps/web/src/lib/commands/media/add-media-asset.ts @@ -2,7 +2,7 @@ import { Command } from "@/lib/commands/base-command"; import { EditorCore } from "@/core"; import type { MediaAsset } from "@/types/assets"; import { generateUUID } from "@/utils/id"; -import { storageService } from "@/services/storage/storage-service"; +import { storageService } from "@/services/storage/service"; export class AddMediaAssetCommand extends Command { private assetId: string; diff --git a/apps/web/src/lib/commands/media/remove-media-asset.ts b/apps/web/src/lib/commands/media/remove-media-asset.ts index aa1a5775..ee9ffa2d 100644 --- a/apps/web/src/lib/commands/media/remove-media-asset.ts +++ b/apps/web/src/lib/commands/media/remove-media-asset.ts @@ -1,8 +1,8 @@ import { Command } from "@/lib/commands/base-command"; import { EditorCore } from "@/core"; import type { MediaAsset } from "@/types/assets"; -import { storageService } from "@/services/storage/storage-service"; -import { videoCache } from "@/services/media/video-cache"; +import { storageService } from "@/services/storage/service"; +import { videoCache } from "@/services/video-cache/service"; import { hasMediaId } from "@/lib/timeline/element-utils"; import type { TimelineTrack } from "@/types/timeline"; diff --git a/apps/web/src/services/media/video-cache.ts b/apps/web/src/services/media/video-cache.ts deleted file mode 100644 index f3ddfcb2..00000000 --- a/apps/web/src/services/media/video-cache.ts +++ /dev/null @@ -1,314 +0,0 @@ -import { - Input, - ALL_FORMATS, - BlobSource, - CanvasSink, - type WrappedCanvas, -} from "mediabunny"; - -interface VideoSinkData { - sink: CanvasSink; - iterator: AsyncGenerator | null; - currentFrame: WrappedCanvas | null; - nextFrame: WrappedCanvas | null; - lastTime: number; - prefetching: boolean; - prefetchPromise: Promise | null; -} -export class VideoCache { - private sinks = new Map(); - private initPromises = new Map>(); - - async getFrameAt({ - mediaId, - file, - time, - }: { - mediaId: string; - file: File; - time: number; - }): Promise { - await this.ensureSink({ mediaId, file }); - - const sinkData = this.sinks.get(mediaId); - if (!sinkData) return null; - - if (sinkData.nextFrame && sinkData.nextFrame.timestamp <= time) { - sinkData.currentFrame = sinkData.nextFrame; - sinkData.nextFrame = null; - this.startPrefetch({ sinkData }); - } - - if ( - sinkData.currentFrame && - this.isFrameValid({ frame: sinkData.currentFrame, time }) - ) { - if (!sinkData.nextFrame && !sinkData.prefetching) { - this.startPrefetch({ sinkData }); - } - return sinkData.currentFrame; - } - - if ( - sinkData.iterator && - sinkData.currentFrame && - time >= sinkData.lastTime && - time < sinkData.lastTime + 2.0 - ) { - const frame = await this.iterateToTime({ sinkData, targetTime: time }); - if (frame) { - if (!sinkData.nextFrame && !sinkData.prefetching) { - this.startPrefetch({ sinkData }); - } - return frame; - } - } - - const frame = await this.seekToTime({ sinkData, time }); - if (frame && !sinkData.nextFrame && !sinkData.prefetching) { - this.startPrefetch({ sinkData }); - } - return frame; - } - - private isFrameValid({ - frame, - time, - }: { - frame: WrappedCanvas; - time: number; - }): boolean { - return time >= frame.timestamp && time < frame.timestamp + frame.duration; - } - private async iterateToTime({ - sinkData, - targetTime, - }: { - sinkData: VideoSinkData; - targetTime: number; - }): Promise { - if (!sinkData.iterator) return null; - - try { - while (true) { - // Wait for any pending prefetch to finish before touching iterator - if (sinkData.prefetching && sinkData.prefetchPromise) { - await sinkData.prefetchPromise; - } - - // Check if the nextFrame (which might have just arrived) is what we need - if ( - sinkData.nextFrame && - sinkData.nextFrame.timestamp <= targetTime + 0.05 // Tolerance - ) { - sinkData.currentFrame = sinkData.nextFrame; - sinkData.nextFrame = null; - } else { - const { value: frame, done } = await sinkData.iterator.next(); - - if (done || !frame) break; - - sinkData.currentFrame = frame; - } - - const frame = sinkData.currentFrame; - if (!frame) break; - - sinkData.lastTime = frame.timestamp; - - if (this.isFrameValid({ frame, time: targetTime })) { - return frame; - } - - if (frame.timestamp > targetTime + 1.0) break; - } - } catch (error) { - console.warn("Iterator failed, will restart:", error); - sinkData.iterator = null; - } - - return null; - } - private async seekToTime({ - sinkData, - time, - }: { - sinkData: VideoSinkData; - time: number; - }): Promise { - try { - if (sinkData.prefetching && sinkData.prefetchPromise) { - await sinkData.prefetchPromise; - } - - if (sinkData.iterator) { - await sinkData.iterator.return(); - sinkData.iterator = null; - } - - sinkData.nextFrame = null; - sinkData.iterator = sinkData.sink.canvases(time); - sinkData.lastTime = time; - - // Fetch current frame - const { value: frame } = await sinkData.iterator.next(); - - if (frame) { - sinkData.currentFrame = frame; - - // Aggressively fetch next frame immediately to fill buffer - // This matches the mediaplayer example which fetches 2 frames on start - try { - const { value: next } = await sinkData.iterator.next(); - if (next) { - sinkData.nextFrame = next; - } - } catch (e) { - console.warn("Failed to pre-fetch next frame on seek:", e); - } - - return frame; - } - } catch (error) { - console.warn("Failed to seek video:", error); - } - - return null; - } - - private startPrefetch({ sinkData }: { sinkData: VideoSinkData }): void { - if (sinkData.prefetching || !sinkData.iterator || sinkData.nextFrame) { - return; - } - - sinkData.prefetching = true; - sinkData.prefetchPromise = this.prefetchNextFrame({ sinkData }); - } - - private async prefetchNextFrame({ - sinkData, - }: { - sinkData: VideoSinkData; - }): Promise { - if (!sinkData.iterator) { - sinkData.prefetching = false; - sinkData.prefetchPromise = null; - return; - } - - try { - const { value: frame, done } = await sinkData.iterator.next(); - - if (done || !frame) { - sinkData.prefetching = false; - sinkData.prefetchPromise = null; - return; - } - - sinkData.nextFrame = frame; - sinkData.prefetching = false; - sinkData.prefetchPromise = null; - } catch (error) { - console.warn("Prefetch failed:", error); - sinkData.prefetching = false; - sinkData.prefetchPromise = null; - sinkData.iterator = null; - } - } - private async ensureSink({ - mediaId, - file, - }: { - mediaId: string; - file: File; - }): Promise { - if (this.sinks.has(mediaId)) return; - - if (this.initPromises.has(mediaId)) { - await this.initPromises.get(mediaId); - return; - } - - const initPromise = this.initializeSink({ mediaId, file }); - this.initPromises.set(mediaId, initPromise); - - try { - await initPromise; - } finally { - this.initPromises.delete(mediaId); - } - } - private async initializeSink({ - mediaId, - file, - }: { - mediaId: string; - file: File; - }): Promise { - try { - const input = new Input({ - source: new BlobSource(file), - formats: ALL_FORMATS, - }); - - const videoTrack = await input.getPrimaryVideoTrack(); - if (!videoTrack) { - throw new Error("No video track found"); - } - - const canDecode = await videoTrack.canDecode(); - if (!canDecode) { - throw new Error("Video codec not supported for decoding"); - } - - const sink = new CanvasSink(videoTrack, { - poolSize: 3, - fit: "contain", - }); - - this.sinks.set(mediaId, { - sink, - iterator: null, - currentFrame: null, - nextFrame: null, - lastTime: -1, - prefetching: false, - prefetchPromise: null, - }); - } catch (error) { - console.error(`Failed to initialize video sink for ${mediaId}:`, error); - throw error; - } - } - - clearVideo({ mediaId }: { mediaId: string }): void { - const sinkData = this.sinks.get(mediaId); - if (sinkData) { - if (sinkData.iterator) { - void sinkData.iterator.return(); - } - - this.sinks.delete(mediaId); - } - - this.initPromises.delete(mediaId); - } - - clearAll(): void { - for (const [mediaId] of this.sinks) { - this.clearVideo({ mediaId }); - } - } - - getStats() { - return { - totalSinks: this.sinks.size, - activeSinks: Array.from(this.sinks.values()).filter((s) => s.iterator) - .length, - cachedFrames: Array.from(this.sinks.values()).filter( - (s) => s.currentFrame, - ).length, - }; - } -} -export const videoCache = new VideoCache(); diff --git a/apps/web/src/services/storage/service.ts b/apps/web/src/services/storage/service.ts new file mode 100644 index 00000000..02f8d290 --- /dev/null +++ b/apps/web/src/services/storage/service.ts @@ -0,0 +1,469 @@ +import type { TProject, TProjectMetadata } from "@/types/project"; +import { getProjectDurationFromScenes } from "@/lib/scenes"; +import type { MediaAsset } from "@/types/assets"; +import { IndexedDBAdapter } from "./indexeddb-adapter"; +import { OPFSAdapter } from "./opfs-adapter"; +import type { + MediaAssetData, + StorageConfig, + SerializedProject, + SerializedScene, +} from "./types"; +import type { SavedSoundsData, SavedSound, SoundEffect } from "@/types/sounds"; +import { + migrations, + runStorageMigrations, +} from "@/services/storage/migrations"; +import type { TimelineTrack, TScene } from "@/types/timeline"; + +class StorageService { + private projectsAdapter: IndexedDBAdapter; + private savedSoundsAdapter: IndexedDBAdapter; + private config: StorageConfig; + private migrationsPromise: Promise | null = null; + + constructor() { + this.config = { + projectsDb: "video-editor-projects", + mediaDb: "video-editor-media", + savedSoundsDb: "video-editor-saved-sounds", + version: 1, + }; + + this.projectsAdapter = new IndexedDBAdapter( + this.config.projectsDb, + "projects", + this.config.version, + ); + + this.savedSoundsAdapter = new IndexedDBAdapter( + this.config.savedSoundsDb, + "saved-sounds", + this.config.version, + ); + } + + private async ensureMigrations(): Promise { + if (this.migrationsPromise) { + await this.migrationsPromise; + return; + } + + this.migrationsPromise = runStorageMigrations({ migrations }).then( + () => undefined, + ); + await this.migrationsPromise; + } + + private getProjectMediaAdapters({ projectId }: { projectId: string }) { + const mediaMetadataAdapter = new IndexedDBAdapter( + `${this.config.mediaDb}-${projectId}`, + "media-metadata", + this.config.version, + ); + + const mediaAssetsAdapter = new OPFSAdapter(`media-files-${projectId}`); + + return { mediaMetadataAdapter, mediaAssetsAdapter }; + } + + private stripAudioBuffers({ + tracks, + }: { + tracks: TimelineTrack[]; + }): TimelineTrack[] { + return tracks.map((track) => { + if (track.type !== "audio") return track; + return { + ...track, + elements: track.elements.map((element) => { + const { buffer: _buffer, ...rest } = element; + return rest; + }), + }; + }); + } + + async saveProject({ project }: { project: TProject }): Promise { + const duration = + project.metadata.duration ?? + getProjectDurationFromScenes({ scenes: project.scenes }); + const serializedScenes: SerializedScene[] = project.scenes.map((scene) => ({ + id: scene.id, + name: scene.name, + isMain: scene.isMain, + tracks: this.stripAudioBuffers({ tracks: scene.tracks }), + bookmarks: scene.bookmarks, + createdAt: scene.createdAt.toISOString(), + updatedAt: scene.updatedAt.toISOString(), + })); + + const serializedProject: SerializedProject = { + metadata: { + id: project.metadata.id, + name: project.metadata.name, + thumbnail: project.metadata.thumbnail, + duration, + createdAt: project.metadata.createdAt.toISOString(), + updatedAt: project.metadata.updatedAt.toISOString(), + }, + scenes: serializedScenes, + currentSceneId: project.currentSceneId, + settings: project.settings, + version: project.version, + timelineViewState: project.timelineViewState, + }; + + await this.projectsAdapter.set(project.metadata.id, serializedProject); + } + + async loadProject({ + id, + }: { + id: string; + }): Promise<{ project: TProject } | null> { + await this.ensureMigrations(); + const serializedProject = await this.projectsAdapter.get(id); + + if (!serializedProject) return null; + + const scenes = + serializedProject.scenes?.map((scene) => ({ + id: scene.id, + name: scene.name, + isMain: scene.isMain, + tracks: (scene.tracks ?? []).map((track) => + track.type === "video" + ? { ...track, isMain: track.isMain ?? false } // legacy: isMain was optional + : track, + ), + bookmarks: scene.bookmarks ?? [], + createdAt: new Date(scene.createdAt), + updatedAt: new Date(scene.updatedAt), + })) ?? []; + + const project: TProject = { + metadata: { + id: serializedProject.metadata.id, + name: serializedProject.metadata.name, + thumbnail: serializedProject.metadata.thumbnail, + duration: + serializedProject.metadata.duration ?? + getProjectDurationFromScenes({ scenes }), + createdAt: new Date(serializedProject.metadata.createdAt), + updatedAt: new Date(serializedProject.metadata.updatedAt), + }, + scenes, + currentSceneId: serializedProject.currentSceneId || "", + settings: serializedProject.settings, + version: serializedProject.version, + timelineViewState: serializedProject.timelineViewState, + }; + + return { project }; + } + + async loadAllProjects(): Promise { + const projectIds = await this.projectsAdapter.list(); + const projects: TProject[] = []; + + for (const id of projectIds) { + const result = await this.loadProject({ id }); + if (result?.project) { + projects.push(result.project); + } + } + + return projects.sort( + (a, b) => b.metadata.updatedAt.getTime() - a.metadata.updatedAt.getTime(), + ); + } + + async loadAllProjectsMetadata(): Promise { + await this.ensureMigrations(); + const serializedProjects = await this.projectsAdapter.getAll(); + + const metadata = serializedProjects.map((serializedProject) => ({ + id: serializedProject.metadata.id, + name: serializedProject.metadata.name, + thumbnail: serializedProject.metadata.thumbnail, + duration: + serializedProject.metadata.duration ?? + getProjectDurationFromScenes({ + scenes: (serializedProject.scenes ?? []) as unknown as TScene[], + }), + createdAt: new Date(serializedProject.metadata.createdAt), + updatedAt: new Date(serializedProject.metadata.updatedAt), + })); + + return metadata.sort( + (a, b) => b.updatedAt.getTime() - a.updatedAt.getTime(), + ); + } + + async deleteProject({ id }: { id: string }): Promise { + await this.projectsAdapter.remove(id); + } + + async saveMediaAsset({ + projectId, + mediaAsset, + }: { + projectId: string; + mediaAsset: MediaAsset; + }): Promise { + const { mediaMetadataAdapter, mediaAssetsAdapter } = + this.getProjectMediaAdapters({ projectId }); + + await mediaAssetsAdapter.set(mediaAsset.id, mediaAsset.file); + + const metadata: MediaAssetData = { + id: mediaAsset.id, + name: mediaAsset.name, + type: mediaAsset.type, + size: mediaAsset.file.size, + lastModified: mediaAsset.file.lastModified, + width: mediaAsset.width, + height: mediaAsset.height, + duration: mediaAsset.duration, + thumbnailUrl: mediaAsset.thumbnailUrl, + ephemeral: mediaAsset.ephemeral, + }; + + await mediaMetadataAdapter.set(mediaAsset.id, metadata); + } + + async loadMediaAsset({ + projectId, + id, + }: { + projectId: string; + id: string; + }): Promise { + const { mediaMetadataAdapter, mediaAssetsAdapter } = + this.getProjectMediaAdapters({ projectId }); + + const [file, metadata] = await Promise.all([ + mediaAssetsAdapter.get(id), + mediaMetadataAdapter.get(id), + ]); + + if (!file || !metadata) return null; + + let url: string; + if (metadata.type === "image" && (!file.type || file.type === "")) { + try { + const text = await file.text(); + if (text.trim().startsWith(" { + const { mediaMetadataAdapter } = this.getProjectMediaAdapters({ + projectId, + }); + + const mediaIds = await mediaMetadataAdapter.list(); + const mediaItems: MediaAsset[] = []; + + for (const id of mediaIds) { + const item = await this.loadMediaAsset({ projectId, id }); + if (item) { + mediaItems.push(item); + } + } + + return mediaItems; + } + + async deleteMediaAsset({ + projectId, + id, + }: { + projectId: string; + id: string; + }): Promise { + const { mediaMetadataAdapter, mediaAssetsAdapter } = + this.getProjectMediaAdapters({ projectId }); + + await Promise.all([ + mediaAssetsAdapter.remove(id), + mediaMetadataAdapter.remove(id), + ]); + } + + async deleteProjectMedia({ + projectId, + }: { + projectId: string; + }): Promise { + const { mediaMetadataAdapter, mediaAssetsAdapter } = + this.getProjectMediaAdapters({ projectId }); + + await Promise.all([ + mediaMetadataAdapter.clear(), + mediaAssetsAdapter.clear(), + ]); + } + + async clearAllData(): Promise { + await this.projectsAdapter.clear(); + // project-specific media and timelines cleaned up when projects are deleted + } + + async getStorageInfo(): Promise<{ + projects: number; + isOPFSSupported: boolean; + isIndexedDBSupported: boolean; + }> { + const projectIds = await this.projectsAdapter.list(); + + return { + projects: projectIds.length, + isOPFSSupported: this.isOPFSSupported(), + isIndexedDBSupported: this.isIndexedDBSupported(), + }; + } + + async getProjectStorageInfo({ projectId }: { projectId: string }): Promise<{ + mediaItems: number; + }> { + const { mediaMetadataAdapter } = this.getProjectMediaAdapters({ + projectId, + }); + + const mediaIds = await mediaMetadataAdapter.list(); + + return { + mediaItems: mediaIds.length, + }; + } + + async loadSavedSounds(): Promise { + try { + const savedSoundsData = await this.savedSoundsAdapter.get("user-sounds"); + return ( + savedSoundsData || { + sounds: [], + lastModified: new Date().toISOString(), + } + ); + } catch (error) { + console.error("Failed to load saved sounds:", error); + return { sounds: [], lastModified: new Date().toISOString() }; + } + } + + async saveSoundEffect({ + soundEffect, + }: { + soundEffect: SoundEffect; + }): Promise { + try { + const currentData = await this.loadSavedSounds(); + + if (currentData.sounds.some((sound) => sound.id === soundEffect.id)) { + return; // Already saved + } + + const savedSound: SavedSound = { + id: soundEffect.id, + name: soundEffect.name, + username: soundEffect.username, + previewUrl: soundEffect.previewUrl, + downloadUrl: soundEffect.downloadUrl, + duration: soundEffect.duration, + tags: soundEffect.tags, + license: soundEffect.license, + savedAt: new Date().toISOString(), + }; + + const updatedData: SavedSoundsData = { + sounds: [...currentData.sounds, savedSound], + lastModified: new Date().toISOString(), + }; + + await this.savedSoundsAdapter.set("user-sounds", updatedData); + } catch (error) { + console.error("Failed to save sound effect:", error); + throw error; + } + } + + async removeSavedSound({ soundId }: { soundId: number }): Promise { + try { + const currentData = await this.loadSavedSounds(); + + const updatedData: SavedSoundsData = { + sounds: currentData.sounds.filter((sound) => sound.id !== soundId), + lastModified: new Date().toISOString(), + }; + + await this.savedSoundsAdapter.set("user-sounds", updatedData); + } catch (error) { + console.error("Failed to remove saved sound:", error); + throw error; + } + } + + async isSoundSaved({ soundId }: { soundId: number }): Promise { + try { + const currentData = await this.loadSavedSounds(); + return currentData.sounds.some((sound) => sound.id === soundId); + } catch (error) { + console.error("Failed to check if sound is saved:", error); + return false; + } + } + + async clearSavedSounds(): Promise { + try { + await this.savedSoundsAdapter.remove("user-sounds"); + } catch (error) { + console.error("Failed to clear saved sounds:", error); + throw error; + } + } + + isOPFSSupported(): boolean { + return OPFSAdapter.isSupported(); + } + + isIndexedDBSupported(): boolean { + return "indexedDB" in window; + } + + isFullySupported(): boolean { + return this.isIndexedDBSupported() && this.isOPFSSupported(); + } +} + +export const storageService = new StorageService(); +export { StorageService }; diff --git a/apps/web/src/services/storage/storage-service.ts b/apps/web/src/services/storage/storage-service.ts deleted file mode 100644 index cb0b2ced..00000000 --- a/apps/web/src/services/storage/storage-service.ts +++ /dev/null @@ -1,475 +0,0 @@ -import type { TProject, TProjectMetadata } from "@/types/project"; -import { getProjectDurationFromScenes } from "@/lib/scenes"; -import type { MediaAsset } from "@/types/assets"; -import { IndexedDBAdapter } from "./indexeddb-adapter"; -import { OPFSAdapter } from "./opfs-adapter"; -import type { - MediaAssetData, - StorageConfig, - SerializedProject, - SerializedScene, -} from "./types"; -import type { SavedSoundsData, SavedSound, SoundEffect } from "@/types/sounds"; -import { - migrations, - runStorageMigrations, -} from "@/services/storage/migrations"; -import type { TimelineTrack, TScene } from "@/types/timeline"; - -class StorageService { - private projectsAdapter: IndexedDBAdapter; - private savedSoundsAdapter: IndexedDBAdapter; - private config: StorageConfig; - private migrationsPromise: Promise | null = null; - - constructor() { - this.config = { - projectsDb: "video-editor-projects", - mediaDb: "video-editor-media", - savedSoundsDb: "video-editor-saved-sounds", - version: 1, - }; - - this.projectsAdapter = new IndexedDBAdapter( - this.config.projectsDb, - "projects", - this.config.version, - ); - - this.savedSoundsAdapter = new IndexedDBAdapter( - this.config.savedSoundsDb, - "saved-sounds", - this.config.version, - ); - } - - private async ensureMigrations(): Promise { - if (this.migrationsPromise) { - await this.migrationsPromise; - return; - } - - this.migrationsPromise = runStorageMigrations({ migrations }).then( - () => undefined, - ); - await this.migrationsPromise; - } - - private getProjectMediaAdapters({ projectId }: { projectId: string }) { - const mediaMetadataAdapter = new IndexedDBAdapter( - `${this.config.mediaDb}-${projectId}`, - "media-metadata", - this.config.version, - ); - - const mediaAssetsAdapter = new OPFSAdapter(`media-files-${projectId}`); - - return { mediaMetadataAdapter, mediaAssetsAdapter }; - } - - private stripAudioBuffers({ - tracks, - }: { - tracks: TimelineTrack[]; - }): TimelineTrack[] { - return tracks.map((track) => { - if (track.type !== "audio") return track; - return { - ...track, - elements: track.elements.map((element) => { - const { buffer: _buffer, ...rest } = element; - return rest; - }), - }; - }); - } - - async saveProject({ project }: { project: TProject }): Promise { - const duration = - project.metadata.duration ?? - getProjectDurationFromScenes({ scenes: project.scenes }); - const serializedScenes: SerializedScene[] = project.scenes.map((scene) => ({ - id: scene.id, - name: scene.name, - isMain: scene.isMain, - tracks: this.stripAudioBuffers({ tracks: scene.tracks }), - bookmarks: scene.bookmarks, - createdAt: scene.createdAt.toISOString(), - updatedAt: scene.updatedAt.toISOString(), - })); - - const serializedProject: SerializedProject = { - metadata: { - id: project.metadata.id, - name: project.metadata.name, - thumbnail: project.metadata.thumbnail, - duration, - createdAt: project.metadata.createdAt.toISOString(), - updatedAt: project.metadata.updatedAt.toISOString(), - }, - scenes: serializedScenes, - currentSceneId: project.currentSceneId, - settings: project.settings, - version: project.version, - timelineViewState: project.timelineViewState, - }; - - await this.projectsAdapter.set(project.metadata.id, serializedProject); - } - - async loadProject({ - id, - }: { - id: string; - }): Promise<{ project: TProject } | null> { - await this.ensureMigrations(); - const serializedProject = await this.projectsAdapter.get(id); - - if (!serializedProject) return null; - - const scenes = - serializedProject.scenes?.map((scene) => ({ - id: scene.id, - name: scene.name, - isMain: scene.isMain, - tracks: (scene.tracks ?? []).map((track) => - track.type === "video" - ? { ...track, isMain: track.isMain ?? false } // legacy: isMain was optional - : track, - ), - bookmarks: scene.bookmarks ?? [], - createdAt: new Date(scene.createdAt), - updatedAt: new Date(scene.updatedAt), - })) ?? []; - - const project: TProject = { - metadata: { - id: serializedProject.metadata.id, - name: serializedProject.metadata.name, - thumbnail: serializedProject.metadata.thumbnail, - duration: - serializedProject.metadata.duration ?? - getProjectDurationFromScenes({ scenes }), - createdAt: new Date(serializedProject.metadata.createdAt), - updatedAt: new Date(serializedProject.metadata.updatedAt), - }, - scenes, - currentSceneId: serializedProject.currentSceneId || "", - settings: serializedProject.settings, - version: serializedProject.version, - timelineViewState: serializedProject.timelineViewState, - }; - - return { project }; - } - - async loadAllProjects(): Promise { - const projectIds = await this.projectsAdapter.list(); - const projects: TProject[] = []; - - for (const id of projectIds) { - const result = await this.loadProject({ id }); - if (result?.project) { - projects.push(result.project); - } - } - - return projects.sort( - (a, b) => b.metadata.updatedAt.getTime() - a.metadata.updatedAt.getTime(), - ); - } - - async loadAllProjectsMetadata(): Promise { - await this.ensureMigrations(); - const serializedProjects = await this.projectsAdapter.getAll(); - - const metadata = serializedProjects.map((serializedProject) => ({ - id: serializedProject.metadata.id, - name: serializedProject.metadata.name, - thumbnail: serializedProject.metadata.thumbnail, - duration: - serializedProject.metadata.duration ?? - getProjectDurationFromScenes({ - scenes: (serializedProject.scenes ?? []) as unknown as TScene[], - }), - createdAt: new Date(serializedProject.metadata.createdAt), - updatedAt: new Date(serializedProject.metadata.updatedAt), - })); - - return metadata.sort( - (a, b) => b.updatedAt.getTime() - a.updatedAt.getTime(), - ); - } - - async deleteProject({ id }: { id: string }): Promise { - await this.projectsAdapter.remove(id); - } - - async saveMediaAsset({ - projectId, - mediaAsset, - }: { - projectId: string; - mediaAsset: MediaAsset; - }): Promise { - const { mediaMetadataAdapter, mediaAssetsAdapter } = - this.getProjectMediaAdapters({ projectId }); - - await mediaAssetsAdapter.set(mediaAsset.id, mediaAsset.file); - - const metadata: MediaAssetData = { - id: mediaAsset.id, - name: mediaAsset.name, - type: mediaAsset.type, - size: mediaAsset.file.size, - lastModified: mediaAsset.file.lastModified, - width: mediaAsset.width, - height: mediaAsset.height, - duration: mediaAsset.duration, - thumbnailUrl: mediaAsset.thumbnailUrl, - ephemeral: mediaAsset.ephemeral, - }; - - await mediaMetadataAdapter.set(mediaAsset.id, metadata); - } - - async loadMediaAsset({ - projectId, - id, - }: { - projectId: string; - id: string; - }): Promise { - const { mediaMetadataAdapter, mediaAssetsAdapter } = - this.getProjectMediaAdapters({ projectId }); - - const [file, metadata] = await Promise.all([ - mediaAssetsAdapter.get(id), - mediaMetadataAdapter.get(id), - ]); - - if (!file || !metadata) return null; - - let url: string; - if (metadata.type === "image" && (!file.type || file.type === "")) { - try { - const text = await file.text(); - if (text.trim().startsWith(" { - const { mediaMetadataAdapter } = this.getProjectMediaAdapters({ - projectId, - }); - - const mediaIds = await mediaMetadataAdapter.list(); - const mediaItems: MediaAsset[] = []; - - for (const id of mediaIds) { - const item = await this.loadMediaAsset({ projectId, id }); - if (item) { - mediaItems.push(item); - } - } - - return mediaItems; - } - - async deleteMediaAsset({ - projectId, - id, - }: { - projectId: string; - id: string; - }): Promise { - const { mediaMetadataAdapter, mediaAssetsAdapter } = - this.getProjectMediaAdapters({ projectId }); - - await Promise.all([ - mediaAssetsAdapter.remove(id), - mediaMetadataAdapter.remove(id), - ]); - } - - async deleteProjectMedia({ - projectId, - }: { - projectId: string; - }): Promise { - const { mediaMetadataAdapter, mediaAssetsAdapter } = - this.getProjectMediaAdapters({ projectId }); - - await Promise.all([ - mediaMetadataAdapter.clear(), - mediaAssetsAdapter.clear(), - ]); - } - - // Utility methods - async clearAllData(): Promise { - // Clear all projects - await this.projectsAdapter.clear(); - - // Note: Project-specific media and timelines will be cleaned up when projects are deleted - } - - async getStorageInfo(): Promise<{ - projects: number; - isOPFSSupported: boolean; - isIndexedDBSupported: boolean; - }> { - const projectIds = await this.projectsAdapter.list(); - - return { - projects: projectIds.length, - isOPFSSupported: this.isOPFSSupported(), - isIndexedDBSupported: this.isIndexedDBSupported(), - }; - } - - async getProjectStorageInfo({ projectId }: { projectId: string }): Promise<{ - mediaItems: number; - }> { - const { mediaMetadataAdapter } = this.getProjectMediaAdapters({ - projectId, - }); - - const mediaIds = await mediaMetadataAdapter.list(); - - return { - mediaItems: mediaIds.length, - }; - } - - async loadSavedSounds(): Promise { - try { - const savedSoundsData = await this.savedSoundsAdapter.get("user-sounds"); - return ( - savedSoundsData || { - sounds: [], - lastModified: new Date().toISOString(), - } - ); - } catch (error) { - console.error("Failed to load saved sounds:", error); - return { sounds: [], lastModified: new Date().toISOString() }; - } - } - - async saveSoundEffect({ - soundEffect, - }: { - soundEffect: SoundEffect; - }): Promise { - try { - const currentData = await this.loadSavedSounds(); - - // Check if sound is already saved - if (currentData.sounds.some((sound) => sound.id === soundEffect.id)) { - return; // Already saved - } - - const savedSound: SavedSound = { - id: soundEffect.id, - name: soundEffect.name, - username: soundEffect.username, - previewUrl: soundEffect.previewUrl, - downloadUrl: soundEffect.downloadUrl, - duration: soundEffect.duration, - tags: soundEffect.tags, - license: soundEffect.license, - savedAt: new Date().toISOString(), - }; - - const updatedData: SavedSoundsData = { - sounds: [...currentData.sounds, savedSound], - lastModified: new Date().toISOString(), - }; - - await this.savedSoundsAdapter.set("user-sounds", updatedData); - } catch (error) { - console.error("Failed to save sound effect:", error); - throw error; - } - } - - async removeSavedSound({ soundId }: { soundId: number }): Promise { - try { - const currentData = await this.loadSavedSounds(); - - const updatedData: SavedSoundsData = { - sounds: currentData.sounds.filter((sound) => sound.id !== soundId), - lastModified: new Date().toISOString(), - }; - - await this.savedSoundsAdapter.set("user-sounds", updatedData); - } catch (error) { - console.error("Failed to remove saved sound:", error); - throw error; - } - } - - async isSoundSaved({ soundId }: { soundId: number }): Promise { - try { - const currentData = await this.loadSavedSounds(); - return currentData.sounds.some((sound) => sound.id === soundId); - } catch (error) { - console.error("Failed to check if sound is saved:", error); - return false; - } - } - - async clearSavedSounds(): Promise { - try { - await this.savedSoundsAdapter.remove("user-sounds"); - } catch (error) { - console.error("Failed to clear saved sounds:", error); - throw error; - } - } - - // Check browser support - isOPFSSupported(): boolean { - return OPFSAdapter.isSupported(); - } - - isIndexedDBSupported(): boolean { - return "indexedDB" in window; - } - - isFullySupported(): boolean { - return this.isIndexedDBSupported() && this.isOPFSSupported(); - } -} - -// Export singleton instance -export const storageService = new StorageService(); -export { StorageService }; diff --git a/apps/web/src/services/transcription/index.ts b/apps/web/src/services/transcription/index.ts deleted file mode 100644 index 37c650da..00000000 --- a/apps/web/src/services/transcription/index.ts +++ /dev/null @@ -1,186 +0,0 @@ -import type { - TranscriptionResult, - TranscriptionProgress, - TranscriptionModelId, -} from "@/types/transcription"; -import { - DEFAULT_TRANSCRIPTION_MODEL, - TRANSCRIPTION_MODELS, -} from "@/constants/transcription-constants"; -import type { WorkerMessage, WorkerResponse } from "./worker"; -import type { LanguageCode } from "@/types/language"; - -type ProgressCallback = (progress: TranscriptionProgress) => void; - -class TranscriptionService { - private worker: Worker | null = null; - private currentModelId: TranscriptionModelId | null = null; - private isInitialized = false; - private isInitializing = false; - - async transcribe({ - audioData, - language, - modelId = DEFAULT_TRANSCRIPTION_MODEL, - onProgress, - }: { - audioData: Float32Array; - language?: LanguageCode; - modelId?: TranscriptionModelId; - onProgress?: ProgressCallback; - }): Promise { - await this.ensureWorker({ modelId, onProgress }); - - return new Promise((resolve, reject) => { - if (!this.worker) { - reject(new Error("Worker not initialized")); - return; - } - - const handleMessage = (event: MessageEvent) => { - const response = event.data; - - switch (response.type) { - case "transcribe-progress": - onProgress?.({ - status: "transcribing", - progress: response.progress, - message: "Transcribing audio...", - }); - break; - - case "transcribe-complete": - this.worker?.removeEventListener("message", handleMessage); - resolve({ - text: response.text, - segments: response.segments, - language, - }); - break; - - case "transcribe-error": - this.worker?.removeEventListener("message", handleMessage); - reject(new Error(response.error)); - break; - - case "cancelled": - this.worker?.removeEventListener("message", handleMessage); - reject(new Error("Transcription cancelled")); - break; - } - }; - - this.worker.addEventListener("message", handleMessage); - - this.worker.postMessage({ - type: "transcribe", - audio: audioData, - language, - } satisfies WorkerMessage); - }); - } - - cancel() { - this.worker?.postMessage({ type: "cancel" } satisfies WorkerMessage); - } - - private async ensureWorker({ - modelId, - onProgress, - }: { - modelId: TranscriptionModelId; - onProgress?: ProgressCallback; - }): Promise { - const needsNewModel = this.currentModelId !== modelId; - - if (this.worker && this.isInitialized && !needsNewModel) { - return; - } - - if (this.isInitializing && !needsNewModel) { - await this.waitForInit(); - return; - } - - this.terminate(); - this.isInitializing = true; - this.isInitialized = false; - - const model = TRANSCRIPTION_MODELS.find((m) => m.id === modelId); - if (!model) { - throw new Error(`Unknown model: ${modelId}`); - } - - this.worker = new Worker(new URL("./worker.ts", import.meta.url), { - type: "module", - }); - - return new Promise((resolve, reject) => { - if (!this.worker) { - reject(new Error("Failed to create worker")); - return; - } - - const handleMessage = (event: MessageEvent) => { - const response = event.data; - - switch (response.type) { - case "init-progress": - onProgress?.({ - status: "loading-model", - progress: response.progress, - message: `Loading ${model.name} model...`, - }); - break; - - case "init-complete": - this.worker?.removeEventListener("message", handleMessage); - this.isInitialized = true; - this.isInitializing = false; - this.currentModelId = modelId; - resolve(); - break; - - case "init-error": - this.worker?.removeEventListener("message", handleMessage); - this.isInitializing = false; - this.terminate(); - reject(new Error(response.error)); - break; - } - }; - - this.worker.addEventListener("message", handleMessage); - - this.worker.postMessage({ - type: "init", - modelId: model.huggingFaceId, - } satisfies WorkerMessage); - }); - } - - private waitForInit(): Promise { - return new Promise((resolve) => { - const checkInit = () => { - if (this.isInitialized) { - resolve(); - } else if (!this.isInitializing) { - resolve(); - } else { - setTimeout(checkInit, 100); - } - }; - checkInit(); - }); - } - - terminate() { - this.worker?.terminate(); - this.worker = null; - this.isInitialized = false; - this.isInitializing = false; - this.currentModelId = null; - } -} - -export const transcriptionService = new TranscriptionService(); diff --git a/apps/web/src/services/transcription/service.ts b/apps/web/src/services/transcription/service.ts new file mode 100644 index 00000000..c34a82ce --- /dev/null +++ b/apps/web/src/services/transcription/service.ts @@ -0,0 +1,186 @@ +import type { + TranscriptionLanguage, + TranscriptionResult, + TranscriptionProgress, + TranscriptionModelId, +} from "@/types/transcription"; +import { + DEFAULT_TRANSCRIPTION_MODEL, + TRANSCRIPTION_MODELS, +} from "@/constants/transcription-constants"; +import type { WorkerMessage, WorkerResponse } from "./worker"; + +type ProgressCallback = (progress: TranscriptionProgress) => void; + +class TranscriptionService { + private worker: Worker | null = null; + private currentModelId: TranscriptionModelId | null = null; + private isInitialized = false; + private isInitializing = false; + + async transcribe({ + audioData, + language = "auto", + modelId = DEFAULT_TRANSCRIPTION_MODEL, + onProgress, + }: { + audioData: Float32Array; + language?: TranscriptionLanguage; + modelId?: TranscriptionModelId; + onProgress?: ProgressCallback; + }): Promise { + await this.ensureWorker({ modelId, onProgress }); + + return new Promise((resolve, reject) => { + if (!this.worker) { + reject(new Error("Worker not initialized")); + return; + } + + const handleMessage = (event: MessageEvent) => { + const response = event.data; + + switch (response.type) { + case "transcribe-progress": + onProgress?.({ + status: "transcribing", + progress: response.progress, + message: "Transcribing audio...", + }); + break; + + case "transcribe-complete": + this.worker?.removeEventListener("message", handleMessage); + resolve({ + text: response.text, + segments: response.segments, + language, + }); + break; + + case "transcribe-error": + this.worker?.removeEventListener("message", handleMessage); + reject(new Error(response.error)); + break; + + case "cancelled": + this.worker?.removeEventListener("message", handleMessage); + reject(new Error("Transcription cancelled")); + break; + } + }; + + this.worker.addEventListener("message", handleMessage); + + this.worker.postMessage({ + type: "transcribe", + audio: audioData, + language, + } satisfies WorkerMessage); + }); + } + + cancel() { + this.worker?.postMessage({ type: "cancel" } satisfies WorkerMessage); + } + + private async ensureWorker({ + modelId, + onProgress, + }: { + modelId: TranscriptionModelId; + onProgress?: ProgressCallback; + }): Promise { + const needsNewModel = this.currentModelId !== modelId; + + if (this.worker && this.isInitialized && !needsNewModel) { + return; + } + + if (this.isInitializing && !needsNewModel) { + await this.waitForInit(); + return; + } + + this.terminate(); + this.isInitializing = true; + this.isInitialized = false; + + const model = TRANSCRIPTION_MODELS.find((m) => m.id === modelId); + if (!model) { + throw new Error(`Unknown model: ${modelId}`); + } + + this.worker = new Worker(new URL("./worker.ts", import.meta.url), { + type: "module", + }); + + return new Promise((resolve, reject) => { + if (!this.worker) { + reject(new Error("Failed to create worker")); + return; + } + + const handleMessage = (event: MessageEvent) => { + const response = event.data; + + switch (response.type) { + case "init-progress": + onProgress?.({ + status: "loading-model", + progress: response.progress, + message: `Loading ${model.name} model...`, + }); + break; + + case "init-complete": + this.worker?.removeEventListener("message", handleMessage); + this.isInitialized = true; + this.isInitializing = false; + this.currentModelId = modelId; + resolve(); + break; + + case "init-error": + this.worker?.removeEventListener("message", handleMessage); + this.isInitializing = false; + this.terminate(); + reject(new Error(response.error)); + break; + } + }; + + this.worker.addEventListener("message", handleMessage); + + this.worker.postMessage({ + type: "init", + modelId: model.huggingFaceId, + } satisfies WorkerMessage); + }); + } + + private waitForInit(): Promise { + return new Promise((resolve) => { + const checkInit = () => { + if (this.isInitialized) { + resolve(); + } else if (!this.isInitializing) { + resolve(); + } else { + setTimeout(checkInit, 100); + } + }; + checkInit(); + }); + } + + terminate() { + this.worker?.terminate(); + this.worker = null; + this.isInitialized = false; + this.isInitializing = false; + this.currentModelId = null; + } +} + +export const transcriptionService = new TranscriptionService(); diff --git a/apps/web/src/services/video-cache/service.ts b/apps/web/src/services/video-cache/service.ts new file mode 100644 index 00000000..36441981 --- /dev/null +++ b/apps/web/src/services/video-cache/service.ts @@ -0,0 +1,316 @@ +import { + Input, + ALL_FORMATS, + BlobSource, + CanvasSink, + type WrappedCanvas, +} from "mediabunny"; + +interface VideoSinkData { + sink: CanvasSink; + iterator: AsyncGenerator | null; + currentFrame: WrappedCanvas | null; + nextFrame: WrappedCanvas | null; + lastTime: number; + prefetching: boolean; + prefetchPromise: Promise | null; +} + +export class VideoCache { + private sinks = new Map(); + private initPromises = new Map>(); + + async getFrameAt({ + mediaId, + file, + time, + }: { + mediaId: string; + file: File; + time: number; + }): Promise { + await this.ensureSink({ mediaId, file }); + + const sinkData = this.sinks.get(mediaId); + if (!sinkData) return null; + + if (sinkData.nextFrame && sinkData.nextFrame.timestamp <= time) { + sinkData.currentFrame = sinkData.nextFrame; + sinkData.nextFrame = null; + this.startPrefetch({ sinkData }); + } + + if ( + sinkData.currentFrame && + this.isFrameValid({ frame: sinkData.currentFrame, time }) + ) { + if (!sinkData.nextFrame && !sinkData.prefetching) { + this.startPrefetch({ sinkData }); + } + return sinkData.currentFrame; + } + + if ( + sinkData.iterator && + sinkData.currentFrame && + time >= sinkData.lastTime && + time < sinkData.lastTime + 2.0 + ) { + const frame = await this.iterateToTime({ sinkData, targetTime: time }); + if (frame) { + if (!sinkData.nextFrame && !sinkData.prefetching) { + this.startPrefetch({ sinkData }); + } + return frame; + } + } + + const frame = await this.seekToTime({ sinkData, time }); + if (frame && !sinkData.nextFrame && !sinkData.prefetching) { + this.startPrefetch({ sinkData }); + } + return frame; + } + + private isFrameValid({ + frame, + time, + }: { + frame: WrappedCanvas; + time: number; + }): boolean { + return time >= frame.timestamp && time < frame.timestamp + frame.duration; + } + private async iterateToTime({ + sinkData, + targetTime, + }: { + sinkData: VideoSinkData; + targetTime: number; + }): Promise { + if (!sinkData.iterator) return null; + + try { + while (true) { + // Wait for any pending prefetch to finish before touching iterator + if (sinkData.prefetching && sinkData.prefetchPromise) { + await sinkData.prefetchPromise; + } + + // Check if the nextFrame (which might have just arrived) is what we need + if ( + sinkData.nextFrame && + sinkData.nextFrame.timestamp <= targetTime + 0.05 // Tolerance + ) { + sinkData.currentFrame = sinkData.nextFrame; + sinkData.nextFrame = null; + } else { + const { value: frame, done } = await sinkData.iterator.next(); + + if (done || !frame) break; + + sinkData.currentFrame = frame; + } + + const frame = sinkData.currentFrame; + if (!frame) break; + + sinkData.lastTime = frame.timestamp; + + if (this.isFrameValid({ frame, time: targetTime })) { + return frame; + } + + if (frame.timestamp > targetTime + 1.0) break; + } + } catch (error) { + console.warn("Iterator failed, will restart:", error); + sinkData.iterator = null; + } + + return null; + } + private async seekToTime({ + sinkData, + time, + }: { + sinkData: VideoSinkData; + time: number; + }): Promise { + try { + if (sinkData.prefetching && sinkData.prefetchPromise) { + await sinkData.prefetchPromise; + } + + if (sinkData.iterator) { + await sinkData.iterator.return(); + sinkData.iterator = null; + } + + sinkData.nextFrame = null; + sinkData.iterator = sinkData.sink.canvases(time); + sinkData.lastTime = time; + + // Fetch current frame + const { value: frame } = await sinkData.iterator.next(); + + if (frame) { + sinkData.currentFrame = frame; + + // Aggressively fetch next frame immediately to fill buffer + // This matches the mediaplayer example which fetches 2 frames on start + try { + const { value: next } = await sinkData.iterator.next(); + if (next) { + sinkData.nextFrame = next; + } + } catch (e) { + console.warn("Failed to pre-fetch next frame on seek:", e); + } + + return frame; + } + } catch (error) { + console.warn("Failed to seek video:", error); + } + + return null; + } + + private startPrefetch({ sinkData }: { sinkData: VideoSinkData }): void { + if (sinkData.prefetching || !sinkData.iterator || sinkData.nextFrame) { + return; + } + + sinkData.prefetching = true; + sinkData.prefetchPromise = this.prefetchNextFrame({ sinkData }); + } + + private async prefetchNextFrame({ + sinkData, + }: { + sinkData: VideoSinkData; + }): Promise { + if (!sinkData.iterator) { + sinkData.prefetching = false; + sinkData.prefetchPromise = null; + return; + } + + try { + const { value: frame, done } = await sinkData.iterator.next(); + + if (done || !frame) { + sinkData.prefetching = false; + sinkData.prefetchPromise = null; + return; + } + + sinkData.nextFrame = frame; + sinkData.prefetching = false; + sinkData.prefetchPromise = null; + } catch (error) { + console.warn("Prefetch failed:", error); + sinkData.prefetching = false; + sinkData.prefetchPromise = null; + sinkData.iterator = null; + } + } + private async ensureSink({ + mediaId, + file, + }: { + mediaId: string; + file: File; + }): Promise { + if (this.sinks.has(mediaId)) return; + + if (this.initPromises.has(mediaId)) { + await this.initPromises.get(mediaId); + return; + } + + const initPromise = this.initializeSink({ mediaId, file }); + this.initPromises.set(mediaId, initPromise); + + try { + await initPromise; + } finally { + this.initPromises.delete(mediaId); + } + } + private async initializeSink({ + mediaId, + file, + }: { + mediaId: string; + file: File; + }): Promise { + try { + const input = new Input({ + source: new BlobSource(file), + formats: ALL_FORMATS, + }); + + const videoTrack = await input.getPrimaryVideoTrack(); + if (!videoTrack) { + throw new Error("No video track found"); + } + + const canDecode = await videoTrack.canDecode(); + if (!canDecode) { + throw new Error("Video codec not supported for decoding"); + } + + const sink = new CanvasSink(videoTrack, { + poolSize: 3, + fit: "contain", + }); + + this.sinks.set(mediaId, { + sink, + iterator: null, + currentFrame: null, + nextFrame: null, + lastTime: -1, + prefetching: false, + prefetchPromise: null, + }); + } catch (error) { + console.error(`Failed to initialize video sink for ${mediaId}:`, error); + throw error; + } + } + + clearVideo({ mediaId }: { mediaId: string }): void { + const sinkData = this.sinks.get(mediaId); + if (sinkData) { + if (sinkData.iterator) { + void sinkData.iterator.return(); + } + + this.sinks.delete(mediaId); + } + + this.initPromises.delete(mediaId); + } + + clearAll(): void { + for (const [mediaId] of this.sinks) { + this.clearVideo({ mediaId }); + } + } + + getStats() { + return { + totalSinks: this.sinks.size, + activeSinks: Array.from(this.sinks.values()).filter((s) => s.iterator) + .length, + cachedFrames: Array.from(this.sinks.values()).filter( + (s) => s.currentFrame, + ).length, + }; + } +} + +export const videoCache = new VideoCache(); diff --git a/apps/web/src/stores/sounds-store.ts b/apps/web/src/stores/sounds-store.ts index bea1a4bc..f393416a 100644 --- a/apps/web/src/stores/sounds-store.ts +++ b/apps/web/src/stores/sounds-store.ts @@ -1,6 +1,6 @@ import { create } from "zustand"; import type { SoundEffect, SavedSound } from "@/types/sounds"; -import { storageService } from "@/services/storage/storage-service"; +import { storageService } from "@/services/storage/service"; import { toast } from "sonner"; import { EditorCore } from "@/core"; import { buildLibraryAudioElement } from "@/lib/timeline/element-utils"; -- cgit v1.3.1