Open source CapCut alternative.
TypeScript
feat(site): media redirects for write-once keys are browser-cacheable [rebuild]
David Le8a1f6aadb7ef
diff --git a/site/src/cut/server/cloud/jobs.ts b/site/src/cut/server/cloud/jobs.tsindex edc4d5a8..6ae6fc45 100644--- a/site/src/cut/server/cloud/jobs.ts+++ b/site/src/cut/server/cloud/jobs.ts@@ -6,7 +6,7 @@ import { prisma } from "@/lib/prisma";import { EXPORT_QUOTA_MARGIN, renderJobCheck } from "./limits";import { wakeRenderWorker } from "./wake";import { getProject } from "./projects";-import { mediaObjectUrl } from "./mediaCdn";+import { MEDIA_REDIRECT_HEADERS, mediaObjectUrl } from "./mediaCdn";import { head, overlayKey, presignPut, projectExportKey } from "./r2";import { addUsage, quotaCheck } from "./usage";import { caught, err, redirect } from "./util";@@ -367,8 +367,10 @@ export const jobsCloud = {if (!row || row.state !== "done" || !row.outputKey) {return new Response("Export not ready.", { status: 404 });}+ // A finished job's output never changes, so the redirect is cacheable.return redirect(- mediaObjectUrl(row.outputKey, row.outName ? { downloadName: row.outName } : undefined)+ mediaObjectUrl(row.outputKey, row.outName ? { downloadName: row.outName } : undefined),+ MEDIA_REDIRECT_HEADERS);} catch (e) {return caught(e, "Export not ready.");diff --git a/site/src/cut/server/cloud/library.ts b/site/src/cut/server/cloud/library.tsindex dd3916f3..eff72958 100644--- a/site/src/cut/server/cloud/library.ts+++ b/site/src/cut/server/cloud/library.ts@@ -14,7 +14,7 @@ import type {import type { StoredAsset } from "@/cut/lib/types";import type { Prisma } from "@/generated/prisma/client";import { prisma } from "@/lib/prisma";-import { mediaObjectUrl } from "./mediaCdn";+import { MEDIA_REDIRECT_HEADERS, mediaObjectUrl } from "./mediaCdn";import { getProject, takenMediaNames } from "./projects";import { copy, del, head, libraryKey, presignPut, projectMediaKey } from "./r2";import { addUsage, quotaCheck } from "./usage";@@ -522,11 +522,15 @@ export const libraryCloud = {async serveMedia(userId: string, file: string, download = false) {try {const fileName = decodeFileParam(file);+ // Library files are written once — an import lands under a fresh name —+ // so the redirect itself is cacheable and a revisit paints every poster+ // from the browser's cache.return redirect(mediaObjectUrl(libraryKey(userId, fileName),download ? { downloadName: fileName } : undefined,),+ MEDIA_REDIRECT_HEADERS,);} catch (e) {return caught(e, "Bad request.", 400);diff --git a/site/src/cut/server/cloud/mediaCdn.ts b/site/src/cut/server/cloud/mediaCdn.tsindex ea29a861..412b3dfe 100644--- a/site/src/cut/server/cloud/mediaCdn.ts+++ b/site/src/cut/server/cloud/mediaCdn.ts@@ -65,6 +65,17 @@ function tokenExpiry(minLifetimeSeconds = TOKEN_GRACE_SECONDS, at = Date.now()):* ahead of expiry rather than after a 403. */export const mediaUrlLifetime = (): number => tokenExpiry() - Math.floor(Date.now() / 1000);+/** Headers for a 302 that points at a signed object URL for a write-once key.+ * Every token carries at least TOKEN_GRACE_SECONDS of life at mint, so a+ * redirect replayed from the browser's cache within that window still opens —+ * posters and thumbnails paint straight from disk with zero round trips.+ * Private: these routes answer for one signed-in user. A key whose bytes+ * rotate (preview proxies, versioned media) keeps its uncached redirect, since+ * a cached one would pin the version it was minted with. */+export const MEDIA_REDIRECT_HEADERS: Record<string, string> = {+ "Cache-Control": `private, max-age=${TOKEN_GRACE_SECONDS}`,+};+/** The longest a tree token may live. A tree token is the revocation window for* everything under its prefix, so a very long cut does not get to hold one* open indefinitely. */diff --git a/site/src/cut/server/cloud/projects.ts b/site/src/cut/server/cloud/projects.tsindex 47c0c7bb..1d4305f9 100644--- a/site/src/cut/server/cloud/projects.ts+++ b/site/src/cut/server/cloud/projects.ts@@ -4,7 +4,7 @@ import { normalizeAspect, type ProjectDoc, type ProjectFolder, type ProjectSummaimport type { Prisma } from "@/generated/prisma/client";import { prisma } from "@/lib/prisma";import { deleteLadder } from "./ladderStore";-import { mediaObjectUrl } from "./mediaCdn";+import { MEDIA_REDIRECT_HEADERS, mediaObjectUrl } from "./mediaCdn";import { del, deletePrefix, projectExportKey, projectHlsRoot, projectMediaKey } from "./r2";import { addUsage } from "./usage";import { caught, decodeFileParam, err, redirect } from "./util";@@ -387,7 +387,12 @@ export const projectsCloud = {try {const fileName = decodeFileParam(file);const key = projectExportKey(userId, id, fileName);- return redirect(mediaObjectUrl(key, download ? { downloadName: fileName } : undefined));+ // Export names are reserved once (exportName), so the mapping is+ // write-once and the redirect is cacheable.+ return redirect(+ mediaObjectUrl(key, download ? { downloadName: fileName } : undefined),+ MEDIA_REDIRECT_HEADERS+ );} catch (e) {return caught(e, "Bad request.", 400);}