Open source CapCut alternative.
TypeScript
fix(cut): stop four page crashes at their call sites [rebuild]
David Lec47b15bdec87
diff --git a/site/src/cut/components/Lightbox.tsx b/site/src/cut/components/Lightbox.tsxindex 6f2caedb..c310b3d9 100644--- a/site/src/cut/components/Lightbox.tsx+++ b/site/src/cut/components/Lightbox.tsx@@ -280,7 +280,7 @@ function VideoBody({const toggle = () => {const el = videoRef.current;if (!el) return;- if (el.paused) void el.play();+ if (el.paused) void el.play().catch(() => {});else el.pause();};@@ -418,7 +418,7 @@ function AudioBody({ item }: { item: LightboxItem }) {onToggle={() => {const el = audioEl.current;if (!el) return;- if (el.paused) void el.play();+ if (el.paused) void el.play().catch(() => {});else el.pause();}}onSeek={(t) => {diff --git a/site/src/cut/components/PlatformPreview.tsx b/site/src/cut/components/PlatformPreview.tsxindex 57913395..a5f4f274 100644--- a/site/src/cut/components/PlatformPreview.tsx+++ b/site/src/cut/components/PlatformPreview.tsx@@ -84,7 +84,7 @@ export function PlatformPreviewDialog({const togglePlay = () => {const v = videoRef.current;if (!v) return;- if (v.paused) void v.play();+ if (v.paused) void v.play().catch(() => {});else v.pause();};diff --git a/site/src/cut/lib/assetRef.test.ts b/site/src/cut/lib/assetRef.test.tsindex 1927ceec..fb4bb0fd 100644--- a/site/src/cut/lib/assetRef.test.ts+++ b/site/src/cut/lib/assetRef.test.ts@@ -43,6 +43,21 @@ const sources = (patch: Partial<EntitySources> = {}): EntitySources => ({});describe("entityRefs", () => {+ test("text holding a lone surrogate still makes a ref", () => {+ // Text cut mid-emoji keeps half a surrogate pair, which encodeURIComponent+ // refuses: "\ud83d" is the first half of 😀.+ const refs = entityRefs(+ sources({+ overlays: [title("ov-1", 0, { text: "Hi \ud83d" })],+ subtitles: { cues: [{ id: "cue-1", start: 1, end: 2, text: "bye \ude00" }] },+ })+ );++ const payloads = refs.map((r) => decodeURIComponent(r.url.split(",")[1]));+ expect(payloads[0]).toContain('Text: "Hi \ufffd"');+ expect(payloads[1]).toContain('Text: "bye \ufffd"');+ });+test("elements name by content and carry ids in the payload", () => {const refs = entityRefs(sources({diff --git a/site/src/cut/lib/assetRef.ts b/site/src/cut/lib/assetRef.tsindex a1d76031..521f9300 100644--- a/site/src/cut/lib/assetRef.ts+++ b/site/src/cut/lib/assetRef.ts@@ -597,6 +597,10 @@ export interface EntitySources {const sec = (t: number) => `${t.toFixed(2)}s`;+// Half of a surrogate pair standing alone, e.g. text cut through the middle of+// an emoji. encodeURIComponent throws on one.+const LONE_SURROGATE = /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g;+const entityRef = (id: string,name: string,@@ -607,7 +611,7 @@ const entityRef = (id,name,kind: "text",- url: `data:text/plain;charset=utf-8,${encodeURIComponent(payload)}`,+ url: `data:text/plain;charset=utf-8,${encodeURIComponent(payload.replace(LONE_SURROGATE, "\uFFFD"))}`,...extra,});diff --git a/site/src/cut/lib/chatRecovery.test.ts b/site/src/cut/lib/chatRecovery.test.tsindex 52e58cee..17ec4edd 100644--- a/site/src/cut/lib/chatRecovery.test.ts+++ b/site/src/cut/lib/chatRecovery.test.ts@@ -32,3 +32,16 @@ test("an older scene cannot settle a later call for a different brief", () => {const result = recoverSceneCall(input, "chat", { ...scene("done"), brief: "The earlier video" });expect((result[0].parts[0] as { errorText: string }).errorText).toBe("Interrupted.");});++test("recovers in a browser without Array.prototype.toReversed", () => {+ // Chrome 109, the last release for Windows 7 and 8, predates toReversed.+ const toReversed = Object.getOwnPropertyDescriptor(Array.prototype, "toReversed")!;+ delete (Array.prototype as { toReversed?: unknown }).toReversed;+ try {+ const resumed = recoverSceneCall(messages(), "chat", scene("keyframes"));++ expect((resumed[0].parts[0] as { state: string }).state).toBe("input-available");+ } finally {+ Object.defineProperty(Array.prototype, "toReversed", toReversed);+ }+});diff --git a/site/src/cut/lib/chatRecovery.ts b/site/src/cut/lib/chatRecovery.tsindex 9f341bea..c72561cf 100644--- a/site/src/cut/lib/chatRecovery.ts+++ b/site/src/cut/lib/chatRecovery.ts@@ -10,8 +10,8 @@ export function recoverSceneCall(): UIMessage[] {if (!scene || scene.chatId !== threadId) return messages;let recovered = false;- return messages.toReversed().map((message) => {- const parts = message.parts.toReversed().map((part) => {+ return [...messages].reverse().map((message) => {+ const parts = [...message.parts].reverse().map((part) => {const tool = part as { type: string; toolName?: string; state?: string; errorText?: string; input?: { brief?: string; from_audio_asset_id?: string } };const name = tool.type === "dynamic-tool" ? tool.toolName : tool.type.slice(5);if (recovered || name !== "generate_scene") return part;@@ -27,7 +27,7 @@ export function recoverSceneCall(if (scene.phase === "storyboard" || scene.breakdownApproved || scene.phase === "done")return { ...rest, state: "output-available", output: { planned: true, shots: scene.shots.length } } as typeof part;return { ...rest, state: "input-available" } as typeof part;- }).toReversed();+ }).reverse();return parts.every((part, i) => part === message.parts[i]) ? message : { ...message, parts };- }).toReversed();+ }).reverse();}