The VS Code of video editing, built for agents.
TypeScript
Refactor asset file retrieval to improve performance and consistency
konstantin-paulusf1ddb006ca5b
diff --git a/apps/web/src/components/assets/actions.ts b/apps/web/src/components/assets/actions.tsindex d25a0297..a2c6d213 100644--- a/apps/web/src/components/assets/actions.ts+++ b/apps/web/src/components/assets/actions.ts@@ -3,6 +3,7 @@* file, You can obtain one at http://mozilla.org/MPL/2.0/. */import { toast } from "somoto";+import { getAssetFile } from "@/components/engine";import type { Asset } from "@/components/engine/db";@@ -13,7 +14,7 @@ export async function downloadAsset(asset: Asset): Promise<void> {let url: string | null = null;try {- const file = await asset.handle.getFile();+ const file = await getAssetFile(asset);url = URL.createObjectURL(file);const anchor = document.createElement("a");diff --git a/apps/web/src/components/canvas/canvas.tsx b/apps/web/src/components/canvas/canvas.tsxindex 69be03f1..13d97e82 100644--- a/apps/web/src/components/canvas/canvas.tsx+++ b/apps/web/src/components/canvas/canvas.tsx@@ -3,7 +3,7 @@* file, You can obtain one at http://mozilla.org/MPL/2.0/. */import { useEngine } from "@/context/engine";-import { loadAsset } from "@/components/engine";+import { loadAsset, getAssetFile } from "@/components/engine";import { Toolbar } from "./toolbar";import { DrawOverlay } from "./draw-overlay";import { toast } from "somoto"@@ -62,7 +62,7 @@ export function Canvas() {// one synchronous, undoable transaction.let transcriptTrim: { start: number; end: number } | null = null;if (asset.type === 'TRANSCRIPT') {- const file = await asset.handle.getFile();+ const file = await getAssetFile(asset);const transcript = JSON.parse(await file.text()) as Transcript;const lastWord = transcript.at(-1)?.words.at(-1);const firstWord = transcript.at(0)?.words.at(0);diff --git a/apps/web/src/components/engine/api/assets.ts b/apps/web/src/components/engine/api/assets.tsindex 56ade102..1e041458 100644--- a/apps/web/src/components/engine/api/assets.ts+++ b/apps/web/src/components/engine/api/assets.ts@@ -481,12 +481,36 @@ export async function restoreAssets(world: EngineWorld): Promise<void> {invalidateAssets(world);}+/** The file-backing handle shared by every asset variant. */+type AssetHandle = Asset['handle'];++const assetFileCache = new WeakMap<AssetHandle, Promise<File>>();++/**+ * Returns the File backing an asset, reusing an in-flight or already-resolved+ * read for the same handle.+ */+export function getAssetFile(asset: Pick<Asset, 'handle'>): Promise<File> {+ const { handle } = asset;+ const cached = assetFileCache.get(handle);+ if (cached) return cached;++ const promise = handle.getFile();+ assetFileCache.set(handle, promise);+ promise.catch(() => {+ if (assetFileCache.get(handle) === promise) {+ assetFileCache.delete(handle);+ }+ });+ return promise;+}+/** Returns the File/Blob backing an asset, or null if the asset is missing. */export async function getAssetBlob(world: EngineWorld, id: string): Promise<Blob | null> {const asset = world.assets.get(id);if (!asset) return null;- return await asset.handle.getFile();+ return await getAssetFile(asset);}/**@@ -682,7 +706,7 @@ export async function insertAssetInTimeline(world: EngineWorld, asset: Asset, molet transcriptTrim: { start: number; end: number } | null = null;if (asset.type === "TRANSCRIPT") {// Transcript should be trimmed to the span of recognized words- const file = await asset.handle.getFile();+ const file = await getAssetFile(asset);const transcript = JSON.parse(await file.text()) as Transcript;const lastWord = transcript.at(-1)?.words.at(-1);const firstWord = transcript.at(0)?.words.at(0);diff --git a/apps/web/src/components/engine/decoders/audio.ts b/apps/web/src/components/engine/decoders/audio.tsindex cd6d0a57..cfe787c1 100644--- a/apps/web/src/components/engine/decoders/audio.ts+++ b/apps/web/src/components/engine/decoders/audio.ts@@ -7,6 +7,7 @@ import { AsyncMutex } from '@/utils';import { assert } from '@/utils';import { TimeStretcher } from './time-stretcher';import { addComponent } from '../api/events';+import { getAssetFile } from '../api/assets';import type { EngineWorld } from '../api/world';import type { AudioAsset, VideoAsset } from '../db';@@ -28,7 +29,7 @@ export function getAudioTrack(source: AudioAsset | VideoAsset) {promise = (async () => {try {- const blob = await source.handle.getFile();+ const blob = await getAssetFile(source);const input = new Input({formats: ALL_FORMATS,source: new BlobSource(blob),diff --git a/apps/web/src/components/engine/decoders/caption/utils.ts b/apps/web/src/components/engine/decoders/caption/utils.tsindex c4d2e8d2..de7cb6bd 100644--- a/apps/web/src/components/engine/decoders/caption/utils.ts+++ b/apps/web/src/components/engine/decoders/caption/utils.ts@@ -5,6 +5,7 @@import { query } from 'bitecs';import { ChildOf } from '../../components/relations';import { deleteEntity } from '../../api/entities';+import { getAssetFile } from '../../api/assets';import type { Transcript, WordGroup } from '@diffusionstudio/api-contract';import type { EngineWorld } from '../../api/world';@@ -107,7 +108,7 @@ export function splitSequence(sequence: WordGroup): [WordGroup, WordGroup] {*/export async function resolveTranscript(asset: Asset): Promise<Transcript> {if (asset.type === 'TRANSCRIPT') {- const file = await asset.handle.getFile();+ const file = await getAssetFile(asset);const text = await file.text();return JSON.parse(text);}diff --git a/apps/web/src/components/engine/decoders/image.ts b/apps/web/src/components/engine/decoders/image.tsindex 3632bdf8..d98965bf 100644--- a/apps/web/src/components/engine/decoders/image.ts+++ b/apps/web/src/components/engine/decoders/image.ts@@ -3,6 +3,7 @@* file, You can obtain one at http://mozilla.org/MPL/2.0/. */import { addComponent } from '../api/events';+import { getAssetFile } from '../api/assets';import type { EngineWorld } from '../api/world';import type { ImageAsset } from '../db';@@ -37,7 +38,7 @@ export class BitmapImageDecoder implements ImageDecoder {if (this.disposed) return;try {- const file = await this.asset.handle.getFile();+ const file = await getAssetFile(this.asset);const result = await createImageBitmap(file);if (this.disposed) {result.close();@@ -98,7 +99,7 @@ export class ElementImageDecoder implements ImageDecoder {if (this.disposed) return;try {- const file = await this.asset.handle.getFile();+ const file = await getAssetFile(this.asset);const url = URL.createObjectURL(file);await new Promise<void>((resolve) => {diff --git a/apps/web/src/components/engine/decoders/video.ts b/apps/web/src/components/engine/decoders/video.tsindex b1e6f9ff..84759d6e 100644--- a/apps/web/src/components/engine/decoders/video.ts+++ b/apps/web/src/components/engine/decoders/video.ts@@ -4,6 +4,7 @@import { BlobSource, ALL_FORMATS, Input, InputVideoTrack, EncodedPacketSink, EncodedPacket, CanvasSink, type WrappedCanvas } from 'mediabunny';import { addComponent } from '../api/events';+import { getAssetFile } from '../api/assets';import { assert } from '@/utils/common';import { FrameCache } from './frame-cache';@@ -427,7 +428,7 @@ export class VideoExporter {private async initialize() {try {- const blob = await this.asset.handle.getFile();+ const blob = await getAssetFile(this.asset);this.input = new Input({ formats: ALL_FORMATS, source: new BlobSource(blob) });const track = await this.input.getPrimaryVideoTrack();assert(track, 'Video track not found');@@ -510,7 +511,7 @@ export function getVideoTrack(source: VideoAsset) {promise = (async () => {try {- const blob = await source.handle.getFile();+ const blob = await getAssetFile(source);const input = new Input({formats: ALL_FORMATS,source: new BlobSource(blob)diff --git a/apps/web/src/components/engine/timeline/render/image.ts b/apps/web/src/components/engine/timeline/render/image.tsindex 2b929ef4..29866a68 100644--- a/apps/web/src/components/engine/timeline/render/image.ts+++ b/apps/web/src/components/engine/timeline/render/image.ts@@ -4,6 +4,7 @@import { framesToPixels, getRelativeViewport } from "../utils";import { CLIP_BREAKPOINTS, CLIP_LABEL_HEIGHT, MAX_CLIP_HEIGHT } from '../config';+import { getAssetFile } from '../../api/assets';import type { EngineWorld } from "../../api/world";import type { TimelineContext } from "../world";@@ -140,7 +141,7 @@ async function updateThumbnailCache(asset: ThumbnailAsset, options: ThumbnailOpttry {if (hash != thumbnailCache.get(asset)?.hash && !decoding) {decoding = true;- const blob = await asset.handle.getFile();+ const blob = await getAssetFile(asset);const bitmap = await createImageBitmap(blob);const dpr = window.devicePixelRatio;diff --git a/apps/web/src/components/engine/utils/audio-sync.ts b/apps/web/src/components/engine/utils/audio-sync.tsindex 4cc1254e..85c65648 100644--- a/apps/web/src/components/engine/utils/audio-sync.ts+++ b/apps/web/src/components/engine/utils/audio-sync.ts@@ -4,6 +4,7 @@import { ALL_FORMATS, AudioSampleSink, BlobSource, Input } from 'mediabunny';import { assert } from '@/utils';+import { getAssetFile } from '../api/assets';import type { Asset } from '../db';@@ -26,7 +27,7 @@ export type AudioSyncResult = {// RMS energy envelope of an asset's primary audio track, at `rate` bins/sec.async function extractAudioEnvelope(asset: Asset, rate: number): Promise<Float32Array> {- const blob = await asset.handle.getFile();+ const blob = await getAssetFile(asset);const input = new Input({ formats: ALL_FORMATS, source: new BlobSource(blob) });try {const track = await input.getPrimaryAudioTrack();diff --git a/apps/web/src/components/engine/utils/transcode.ts b/apps/web/src/components/engine/utils/transcode.tsindex 209bdf51..a08ba255 100644--- a/apps/web/src/components/engine/utils/transcode.ts+++ b/apps/web/src/components/engine/utils/transcode.ts@@ -4,11 +4,12 @@import { ALL_FORMATS, AudioSampleSink, BlobSource, BufferTarget, CanvasSink, Conversion, Input, InputAudioTrack, Mp4OutputFormat, OggOutputFormat, Output, StreamTarget } from 'mediabunny';import { assert } from '@/utils';+import { getAssetFile } from '../api/assets';import type { StreamTargetChunk } from 'mediabunny';import type { Asset } from '../db';export async function transcodeForTranscription(asset: Asset): Promise<File> {- const blob = await asset.handle.getFile();+ const blob = await getAssetFile(asset);const input = new Input({ formats: ALL_FORMATS, source: new BlobSource(blob) });try {const output = new Output({ format: new OggOutputFormat(), target: new BufferTarget() });@@ -32,7 +33,7 @@ export async function transcodeForTranscription(asset: Asset): Promise<File> {}export async function transcodeForAnalysis(asset: Asset, window?: TimeWindow & { stripVideo?: boolean }) {- const blob = await asset.handle.getFile();+ const blob = await getAssetFile(asset);const hasWindow = window?.start !== undefined || window?.end !== undefined;if (!(asset.type === "VIDEO" || asset.type === "AUDIO")) {@@ -134,7 +135,7 @@ function resolveWindow(duration: number, window?: TimeWindow): { start: number;}export async function visualizeAsset(asset: Asset, options?: VisualizeOptions): Promise<AssetVisualization> {- const blob = await asset.handle.getFile();+ const blob = await getAssetFile(asset);const scale = resolveScale(options?.scale);if (asset.type === "IMAGE") {diff --git a/apps/web/src/components/sidebar-left/project-menu/file-menu.tsx b/apps/web/src/components/sidebar-left/project-menu/file-menu.tsxindex efe0cf03..52563f24 100644--- a/apps/web/src/components/sidebar-left/project-menu/file-menu.tsx+++ b/apps/web/src/components/sidebar-left/project-menu/file-menu.tsx@@ -19,7 +19,7 @@ import { nanoid } from "nanoid";import { toast } from "somoto";import { deleteProject, duplicateProject, DEFAULT_PROJECT_ID } from "@/components/engine/db";import { Not } from "bitecs";-import { ChildOf, isScene, useQuery, loadAsset, changeAssetDirectory, removeAsset } from "@/components/engine";+import { ChildOf, isScene, useQuery, loadAsset, changeAssetDirectory, removeAsset, getAssetFile } from "@/components/engine";import { useProjectId } from "@/hooks/use-project-id";import { useEngine } from "@/context/engine";import { useExport } from "@/context/export";@@ -185,7 +185,7 @@ export function FileAssetMenu() {const usedNames = new Set<string>();await Promise.all(all.map(async (asset) => {- const file = await asset.handle.getFile();+ const file = await getAssetFile(asset);const base = asset.name.match(/\.[^.]+$/)? asset.name: asset.name + mimeTypeToExtension(asset.mimeType);diff --git a/apps/web/src/components/sidebar-right/inspector/asset-info-preview.tsx b/apps/web/src/components/sidebar-right/inspector/asset-info-preview.tsxindex 10ff361f..1ae1b10a 100644--- a/apps/web/src/components/sidebar-right/inspector/asset-info-preview.tsx+++ b/apps/web/src/components/sidebar-right/inspector/asset-info-preview.tsx@@ -10,7 +10,7 @@ import { Icon } from "@/components/ui/icon";import { formatDuration } from "@/utils/formatters";import { getAudioPeaksAsync } from "@/components/engine/decoders/audio-peaks";import { useEngine } from "@/context/engine";-import { assetsVersion } from "@/components/engine";+import { assetsVersion, getAssetFile } from "@/components/engine";import type { Asset, AudioAsset, VideoAsset } from '@/components/engine/db';@@ -30,7 +30,7 @@ export function AssetInfoPreview(props: { asset: Asset }) {}try {- const file = await props.asset.handle.getFile();+ const file = await getAssetFile(props.asset);prevObjectUrl = URL.createObjectURL(file);return prevObjectUrl;} catch {diff --git a/apps/web/src/components/timeline/timeline.tsx b/apps/web/src/components/timeline/timeline.tsxindex 3c156e4f..294c9643 100644--- a/apps/web/src/components/timeline/timeline.tsx+++ b/apps/web/src/components/timeline/timeline.tsx@@ -6,7 +6,7 @@import { onCleanup, onMount } from 'solid-js';import { toast } from 'somoto';import { useEngine } from '@/context/engine';-import { secondsToFrames, getNextName, GeometryType, PaintType, createEntity, switchActiveScene, addComponent, appendChild, setComponent, resizeEntity } from '@/components/engine';+import { secondsToFrames, getNextName, GeometryType, PaintType, createEntity, switchActiveScene, addComponent, appendChild, setComponent, resizeEntity, getAssetFile } from '@/components/engine';import { loadAsset } from "@/components/engine";import { useTimeline } from '@/context/timeline';@@ -99,7 +99,7 @@ export function Timeline() {// must not interleave inside a shared transaction.let transcriptTrim: { start: number; end: number } | null = null;if (asset.type === 'TRANSCRIPT') {- const file = await asset.handle.getFile();+ const file = await getAssetFile(asset);const transcript = JSON.parse(await file.text()) as Transcript;const lastWord = transcript.at(-1)?.words.at(-1);const firstWord = transcript.at(0)?.words.at(0);diff --git a/apps/web/src/components/ui/asset-thumbnail.tsx b/apps/web/src/components/ui/asset-thumbnail.tsxindex 8d82014d..0fcf651c 100644--- a/apps/web/src/components/ui/asset-thumbnail.tsx+++ b/apps/web/src/components/ui/asset-thumbnail.tsx@@ -7,7 +7,7 @@ import { Show, For, createResource } from 'solid-js';import { cx } from '@/lib/cva';import { getAudioPeaksAsync } from '@/components/engine/decoders/audio-peaks';import { useEngine } from '@/context/engine';-import { assetsVersion } from '@/components/engine';+import { assetsVersion, getAssetFile } from '@/components/engine';import type { AudioAsset, ImageAsset, VideoAsset } from '@/components/engine/db';import type { Asset } from '@/components/engine/db';@@ -27,7 +27,7 @@ function ImageThumbnail(props: { asset: Asset; size: ThumbnailSize }) {const [url] = createResource(() => `${props.asset.id}:${assetsVersion(engine.world)}`,async () => {- const objectUrl = URL.createObjectURL(await props.asset.handle.getFile());+ const objectUrl = URL.createObjectURL(await getAssetFile(props.asset));try {const image = await new Promise<HTMLImageElement>((resolve, reject) => {const img = new Image();@@ -82,7 +82,7 @@ function VideoThumbnail(props: { asset: Asset; size: ThumbnailSize }) {() => `${props.asset.id}:${assetsVersion(engine.world)}`,async () => {try {- const file = await props.asset.handle.getFile();+ const file = await getAssetFile(props.asset);const input = new Input({formats: ALL_FORMATS,diff --git a/apps/web/src/context/editor-api/assets.ts b/apps/web/src/context/editor-api/assets.tsindex 6ecc32af..94135654 100644--- a/apps/web/src/context/editor-api/assets.ts+++ b/apps/web/src/context/editor-api/assets.ts@@ -6,7 +6,7 @@ import { ALL_FORMATS, BlobSource, CanvasSink, Input } from 'mediabunny';import { ElectronFileHandle } from '@/lib/electron-file-handle';import { ElectronWritableFileHandle } from '@/lib/electron-file-writable';import { trpc } from '@/lib/trpc';-import { uploadBlob, visualizeAsset, loadAsset, removeAsset, describeFileAsset } from '@/components/engine';+import { uploadBlob, visualizeAsset, loadAsset, removeAsset, describeFileAsset, getAssetFile } from '@/components/engine';import { assert, mimeTypeToExtension } from '@/utils';import {transcodeForTranscription,@@ -152,7 +152,7 @@ export function handleAssetsExport(engine: Accessor<Engine>) {const asset = world.assets.get(id);assert(asset, `Asset ${id} not found.`);assert(asset.type !== "SEQUENCE", `Asset ${id} is an image sequence; export is not supported.`);- const blob = await asset.handle.getFile();+ const blob = await getAssetFile(asset);const path = isDir? await streamBlobToDir(blob, output, exportFileName(asset)): await streamBlobToFile(blob, output);@@ -249,7 +249,7 @@ export function handleAssetProbe(engine: Accessor<Engine>) {const { world } = engine();const asset = await resolveAssetRef(world, req);- const blob = await asset.handle.getFile();+ const blob = await getAssetFile(asset);const base = {id: asset.id,name: asset.name,@@ -328,7 +328,7 @@ export function handleAssetFrame(engine: Accessor<Engine>) {// A budget of 0 means "native resolution"; anything else caps the pixel count.const budget = resolution ?? DEFAULT_FRAME_PIXEL_BUDGET;- const blob = await asset.handle.getFile();+ const blob = await getAssetFile(asset);const input = new Input({ formats: ALL_FORMATS, source: new BlobSource(blob) });try {const track = await input.getPrimaryVideoTrack();