Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix(embed): handle metadata and playback from delayed players

Rishabh Bothrac3c3ac43b12d
diff --git a/apps/web/__tests__/unit/embed-video-playback-chrome.test.ts b/apps/web/__tests__/unit/embed-video-playback-chrome.test.ts
index 8fc144009..adf7f4425 100644
--- a/apps/web/__tests__/unit/embed-video-playback-chrome.test.ts
+++ b/apps/web/__tests__/unit/embed-video-playback-chrome.test.ts
@@ -26,9 +26,12 @@ import {
} from "@/lib/share-branding";
const dynamicImports = vi.hoisted(() => [] as Promise<unknown>[]);
+const dynamicControl = vi.hoisted(() => ({
+ gate: null as Promise<void> | null,
+}));
vi.mock("next/dynamic", async () => {
- const { createElement } = await import("react");
+ const { createElement, useEffect, useState } = await import("react");
return {
default: (
loader: () => Promise<
@@ -41,7 +44,26 @@ vi.mock("next/dynamic", async () => {
Loaded = "default" in module ? module.default : module;
}),
);
- return (props: object) => (Loaded ? createElement(Loaded, props) : null);
+ return (props: object) => {
+ const [Player, setPlayer] = useState<ComponentType<object> | null>(
+ () => (dynamicControl.gate ? null : Loaded),
+ );
+ useEffect(() => {
+ let cancelled = false;
+ const pendingLoad = async () => {
+ await dynamicControl.gate;
+ const module = await loader();
+ if (!cancelled) {
+ setPlayer(() => ("default" in module ? module.default : module));
+ }
+ };
+ void pendingLoad();
+ return () => {
+ cancelled = true;
+ };
+ }, []);
+ return Player ? createElement(Player, props) : null;
+ };
},
};
});
@@ -208,9 +230,53 @@ describe("EmbedVideo playback chrome", () => {
});
afterEach(() => {
+ dynamicControl.gate = null;
document.body.replaceChildren();
});
+ it.each([{ type: "desktopMP4" } as const, { type: "MediaConvert" } as const])(
+ "seeks and updates chrome when the $type player loads after mount",
+ async (source) => {
+ let release = () => {};
+ dynamicControl.gate = new Promise<void>((resolve) => {
+ release = resolve;
+ });
+ const container = document.createElement("div");
+ document.body.append(container);
+ const root = createRoot(container);
+ await act(async () => {
+ root.render(
+ createElement(EmbedVideo, { ...createProps(source), startTime: 15 }),
+ );
+ });
+ expect(container.querySelector("video")).toBeNull();
+ expectChromeVisible(container);
+ await act(async () => {
+ release();
+ await dynamicControl.gate;
+ });
+ const video = container.querySelector("video");
+ if (!video) throw new Error("Player did not load");
+ Object.defineProperty(video, "duration", { value: 60 });
+ await act(async () => {
+ video.dispatchEvent(new Event("loadedmetadata"));
+ });
+ expect(video.currentTime).toBe(15);
+ await act(async () => {
+ video.dispatchEvent(new Event("play"));
+ });
+ expectChromeHidden(container);
+ video.currentTime = 25;
+ await act(async () => {
+ video.dispatchEvent(new Event("pause"));
+ video.dispatchEvent(new Event("loadedmetadata"));
+ });
+ expectChromeVisible(container);
+ expect(video.currentTime).toBe(25);
+ await act(async () => root.unmount());
+ },
+ );
+
afterAll(() => {
delete actEnvironment.IS_REACT_ACT_ENVIRONMENT;
});
diff --git a/apps/web/app/embed/[videoId]/_components/EmbedVideo.tsx b/apps/web/app/embed/[videoId]/_components/EmbedVideo.tsx
index 8bef36ed0..9a549c894 100644
--- a/apps/web/app/embed/[videoId]/_components/EmbedVideo.tsx
+++ b/apps/web/app/embed/[videoId]/_components/EmbedVideo.tsx
@@ -11,6 +11,7 @@ import dynamic from "next/dynamic";
import Image from "next/image";
import {
forwardRef,
+ useCallback,
useEffect,
useImperativeHandle,
useRef,
@@ -234,10 +235,8 @@ export const EmbedVideo = forwardRef<
videoSrc = `/api/playlist?userId=${data.ownerId}&videoId=${data.id}&videoType=video`;
}
- useEffect(() => {
- if (!videoRef.current) return;
- const player = videoRef.current;
- const handleLoadedMetadata = () => {
+ const handleLoadedMetadata = useCallback(
+ (player: HTMLVideoElement) => {
setLongestDuration(player.duration);
// Once only. HLS level switches and source swaps fire this again, and
@@ -253,18 +252,14 @@ export const EmbedVideo = forwardRef<
} catch (error) {
console.warn("Failed to seek embed to start time", error);
}
- };
-
- if (player.readyState >= 1) {
- handleLoadedMetadata();
- } else {
- player.addEventListener("loadedmetadata", handleLoadedMetadata);
- }
+ },
+ [startTime],
+ );
- return () => {
- player.removeEventListener("loadedmetadata", handleLoadedMetadata);
- };
- }, [startTime]);
+ useEffect(() => {
+ const player = videoRef.current;
+ if (player && player.readyState >= 1) handleLoadedMetadata(player);
+ }, [handleLoadedMetadata]);
return (
<>
@@ -274,6 +269,11 @@ export const EmbedVideo = forwardRef<
onPlayCapture={() => setIsPlaying(true)}
onPauseCapture={() => setIsPlaying(false)}
onEndedCapture={() => setIsPlaying(false)}
+ onLoadedMetadataCapture={(event) => {
+ if (event.target instanceof HTMLVideoElement) {
+ handleLoadedMetadata(event.target);
+ }
+ }}
>
{isActivelyRecording ? (
<RecordingInProgressOverlay