π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[space][web] Show video duration and smooth viewer playback
Anand Baburajan707fc97469fc
diff --git a/web/apps/space/src/components/FileViewer.tsx b/web/apps/space/src/components/FileViewer.tsxindex cc1336fd75..30c51c4547 100644--- a/web/apps/space/src/components/FileViewer.tsx+++ b/web/apps/space/src/components/FileViewer.tsx@@ -605,6 +605,10 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({closing: false,landed: false,});+ const initialVideoRef = React.useRef<{+ initialTime: number;+ initialFrame?: HTMLCanvasElement;+ }>(undefined);const isSyncingPhotosRef = React.useRef(false);const videoContentsRef = React.useRef(new Map<object, ReturnType<typeof createSpaceVideoContent>>(),@@ -1456,6 +1460,13 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({);if (!origin) return stopMotion;+ const video = origin.querySelector("video");+ if (item.video && video && !video.paused && !video.ended)+ initialVideoRef.current = {+ initialTime: video.currentTime,+ initialFrame: viewerVideoFrame(video),+ };+const width = item.width ?? defaultPhotoWidth;const height = item.height ?? defaultPhotoHeight;const flight = playViewerOpen(@@ -1541,8 +1552,19 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({event.preventDefault();videos.get(event.content)?.destroy();const item = viewerPhotosRef.current[event.content.index]!;- const video = createSpaceVideoContent(item, (asset) =>- videoLoaderRef.current!(asset),+ const initialVideo =+ event.content.index == initialPhotoIndexRef.current+ ? initialVideoRef.current+ : undefined;+ if (initialVideo) initialVideoRef.current = undefined;+ const video = createSpaceVideoContent(+ item,+ (asset) => videoLoaderRef.current!(asset),+ {+ ...initialVideo,+ showDuration: isDraftPost,+ onPlay: () => motionRef.current.flight?.landed,+ },);event.content.element = video.element;event.content.onLoaded();diff --git a/web/apps/space/src/components/PostVideoContent.ts b/web/apps/space/src/components/PostVideoContent.tsindex cae7f6a089..8ef043dd81 100644--- a/web/apps/space/src/components/PostVideoContent.ts+++ b/web/apps/space/src/components/PostVideoContent.ts@@ -12,11 +12,17 @@ export const createSpaceVideoContent = (load?: SpacePostAssetURLLoader,{inline = false,+ showDuration = false,+ initialTime,+ initialFrame,onPlay,onPause,onTogglePlayback,}: {inline?: boolean;+ showDuration?: boolean;+ initialTime?: number;+ initialFrame?: HTMLCanvasElement;onPlay?: () => Promise<void> | void;onPause?: () => void;onTogglePlayback?: (play: boolean) => void;@@ -112,22 +118,43 @@ export const createSpaceVideoContent = (supportMessage.style.marginTop = "2px";errorMessage.append(errorTitle, supportMessage);element.append(video);- let cover: HTMLImageElement | undefined;- if (!inline && item.imageUrl) {- cover = document.createElement("img");- cover.src = item.imageUrl;- cover.alt = "";+ let cover: HTMLDivElement | undefined;+ if (!inline && (item.imageUrl || initialFrame)) {+ cover = document.createElement("div");Object.assign(cover.style, {position: "absolute",inset: "0",- width: "100%",- height: "100%",- objectFit: "contain",+ opacity: "1",pointerEvents: "none",});+ if (item.imageUrl) {+ const image = document.createElement("img");+ image.src = item.imageUrl;+ image.alt = "";+ cover.append(image);+ }+ if (initialFrame) cover.append(initialFrame);+ for (const layer of cover.children)+ Object.assign((layer as HTMLElement).style, {+ position: "absolute",+ inset: "0",+ width: "100%",+ height: "100%",+ objectFit: "contain",+ });element.append(cover);}element.append(button, loading, errorMessage);+ if (showDuration) {+ const duration = Math.ceil(+ (media.end ?? media.durationMs / 1000) - (media.start ?? 0),+ );+ const badge = document.createElement("span");+ badge.className = "space-video-duration";+ badge.textContent = `${duration}s`;+ badge.setAttribute("aria-label", `Video duration: ${duration} seconds`);+ element.append(badge);+ }const cacheReadController = new AbortController();let generation = 0;let sourceGeneration = 0;@@ -140,6 +167,7 @@ export const createSpaceVideoContent = (let retryTimer: ReturnType<typeof setTimeout> | undefined;let loadingTimer: ReturnType<typeof setTimeout> | undefined;let playbackTimeout: ReturnType<typeof setTimeout> | undefined;+ let coverFrame: number | undefined;const hideLoading = () => {clearTimeout(loadingTimer);loadingTimer = undefined;@@ -170,6 +198,8 @@ export const createSpaceVideoContent = (};const showPlayButton = () => {hideLoading();+ if (coverFrame != undefined) video.cancelVideoFrameCallback(coverFrame);+ coverFrame = undefined;const blocked = Boolean(failure);const label = blocked ? "Video unavailable" : "Play video";button.setAttribute("aria-hidden", String(!active || blocked));@@ -187,6 +217,16 @@ export const createSpaceVideoContent = (button.disabled = false;button.setAttribute("aria-hidden", "true");video.setAttribute("aria-label", "Pause video");+ if (cover && cover.style.opacity != "0" && coverFrame == undefined)+ coverFrame = video.requestVideoFrameCallback(() => {+ coverFrame = undefined;+ cover.style.transition = window.matchMedia(+ "(prefers-reduced-motion: reduce)",+ ).matches+ ? "none"+ : "opacity 150ms ease-out";+ cover.style.opacity = "0";+ });};const pause = () => {generation++;@@ -198,7 +238,12 @@ export const createSpaceVideoContent = (sourceGeneration++;pendingLoad = undefined;pause();- if (cover) cover.hidden = false;+ initialTime = undefined;+ initialFrame?.remove();+ if (cover) {+ cover.style.transition = "none";+ cover.style.opacity = "1";+ }if (item.imageUrl) video.poster = item.imageUrl;video.removeAttribute("src");video.load();@@ -354,10 +399,11 @@ export const createSpaceVideoContent = (else reset();};video.onloadedmetadata = () => {- if (media.start) video.currentTime = media.start;+ const time = initialTime ?? media.start;+ if (time) video.currentTime = time;+ initialTime = undefined;};video.onloadeddata = () => {- if (cover) cover.hidden = true;video.removeAttribute("poster");};video.ontimeupdate = () => {diff --git a/web/apps/space/src/components/viewer-transition.ts b/web/apps/space/src/components/viewer-transition.tsindex a04fa44a80..65b4989952 100644--- a/web/apps/space/src/components/viewer-transition.ts+++ b/web/apps/space/src/components/viewer-transition.ts@@ -316,6 +316,14 @@ export const playViewerOpen = (let rider: ReturnType<typeof createRider>;let started = false;let disposed = false;+ let resolveLanded!: () => void;+ const landed = new Promise<void>((resolve) => {+ resolveLanded = resolve;+ });+ const land = () => {+ resolveLanded();+ onLanded();+ };let stopSpring: () => void = () => undefined;const drawAt = (value: number) => {const state = mixPhotoState(from, end, value);@@ -329,6 +337,7 @@ export const playViewerOpen = (const release = () => {disposed = true;+ resolveLanded();flyer.remove();rider?.remove();};@@ -357,15 +366,16 @@ export const playViewerOpen = (drawAt(t);setProgress(t);},- onDone: onLanded,+ onDone: land,});},() => {- if (!disposed) onLanded();+ if (!disposed) land();},);return {src: flightSrc,+ landed,current: () => (started ? mixPhotoState(from, end, t) : undefined),release,reveal,diff --git a/web/apps/space/src/styles/globals.css b/web/apps/space/src/styles/globals.cssindex eb95946f0a..0b70784d20 100644--- a/web/apps/space/src/styles/globals.css+++ b/web/apps/space/src/styles/globals.css@@ -288,6 +288,21 @@ html[data-space-route-motion]::view-transition-new(root) {pointer-events: auto;}+.space-video-duration {+ position: absolute;+ top: 12px;+ right: 12px;+ padding: 4px 8px;+ border-radius: 999px;+ background: rgba(0, 0, 0, 0.55);+ color: #fff;+ font-size: 12px;+ font-weight: 500;+ font-variant-numeric: tabular-nums;+ line-height: 16px;+ pointer-events: none;+}+.space-video-spinner {display: block;box-sizing: border-box;diff --git a/web/apps/space/tests/post-video-content.test.ts b/web/apps/space/tests/post-video-content.test.tsindex 511be25a17..83b65309bc 100644--- a/web/apps/space/tests/post-video-content.test.ts+++ b/web/apps/space/tests/post-video-content.test.ts@@ -17,7 +17,7 @@ vi.mock("../src/services/media-cache", () => ({const loadCached = vi.mocked(cachedSpaceMediaBlobURLIfPresent);class Element extends EventTarget {- style = {};+ style: Record<string, string> = {};attributes = new Map<string, string>();children: Element[] = [];disabled = false;@@ -38,6 +38,7 @@ class Element extends EventTarget {append(...children: Element[]) {this.children.push(...children);}+ remove = vi.fn();}class Video extends Element {@@ -48,8 +49,24 @@ class Video extends Element {onpause?: () => void;onplaying?: () => void;onloadeddata?: () => void;+ onloadedmetadata?: () => void;onended?: () => void;ontimeupdate?: () => void;+ frameCallbacks = new Map<number, () => void>();+ nextFrame = 0;+ requestVideoFrameCallback = vi.fn((callback: () => void) => {+ const id = ++this.nextFrame;+ this.frameCallbacks.set(id, callback);+ return id;+ });+ cancelVideoFrameCallback = vi.fn((id: number) => {+ this.frameCallbacks.delete(id);+ });+ presentFrame() {+ const callbacks = [...this.frameCallbacks.values()];+ this.frameCallbacks.clear();+ callbacks.forEach((callback) => callback());+ }get poster() {return this.getAttribute("poster") ?? "";}@@ -69,7 +86,9 @@ class Video extends Element {this.paused = true;this.onpause?.();}- load = vi.fn();+ load = vi.fn(() => {+ this.currentTime = 0;+ });}let contents: ReturnType<typeof createSpaceVideoContent>[];@@ -92,6 +111,7 @@ beforeEach(() => {tag == "video" ? new Video() : new Element(tag),}),);+ vi.stubGlobal("window", { matchMedia: vi.fn(() => ({ matches: false })) });});afterEach(() => {@@ -127,7 +147,7 @@ const create = (const children = (content.element as unknown as Element).children;const [video] = children;const [button, loading, error] = children.slice(-3);- const cover = children.find((child) => child.tagName == "img");+ const cover = children.length == 5 ? children[1] : undefined;return {...content,video: video as Video,@@ -161,7 +181,7 @@ test("a video can download and play before its cover image is available", asyncexpect(content.video.getAttribute("poster")).toBeNull();});-test("a preloaded viewer video shows its decoded frame before activation", async () => {+test("a preloaded viewer video dissolves its cover only after playback presents a frame", async () => {loadCached.mockResolvedValue("blob:cached-video");const content = create(false);await content.preload({ cachedOnly: true });@@ -172,22 +192,111 @@ test("a preloaded viewer video shows its decoded frame before activation", async);expect(content.video.getAttribute("src")).toBe("blob:cached-video");expect(content.video.poster).toBe("blob:poster");- expect(content.cover?.hidden).toBe(false);+ expect(content.cover?.style.opacity).toBe("1");content.video.onloadeddata?.();expect(content.video.getAttribute("poster")).toBeNull();- expect(content.cover?.hidden).toBe(true);+ expect(content.cover?.style.opacity).toBe("1");expect(content.video.play).not.toHaveBeenCalled();content.play();await vi.advanceTimersByTimeAsync(0);+ expect(content.cover?.style.opacity).toBe("1");+ content.video.presentFrame();+ expect(content.cover?.style.opacity).toBe("0");+ expect(content.cover?.style.transition).toBe("opacity 150ms ease-out");content.deactivate();expect(content.video.getAttribute("poster")).toBeNull();- expect(content.cover?.hidden).toBe(true);+ expect(content.cover?.style.opacity).toBe("0");content.play();await vi.advanceTimersByTimeAsync(0);expect(content.video.getAttribute("poster")).toBeNull();expect(load).not.toHaveBeenCalled();});+test("viewer playback loads during the opening animation and waits for it to land", async () => {+ const opening = Promise.withResolvers<undefined>();+ const content = create(false, "blob:poster", {+ onPlay: () => opening.promise,+ });+ content.play();+ await vi.advanceTimersByTimeAsync(0);+ expect(load).toHaveBeenCalledOnce();+ content.video.onloadeddata?.();+ content.video.presentFrame();+ expect(content.cover?.style.opacity).toBe("1");+ expect(content.video.play).not.toHaveBeenCalled();+ opening.resolve(undefined);+ await vi.advanceTimersByTimeAsync(0);+ expect(content.video.play).toHaveBeenCalledOnce();+ expect(content.cover?.style.opacity).toBe("1");+ content.video.presentFrame();+ expect(content.cover?.style.opacity).toBe("0");+});++test("a viewer opened from the feed resumes at the captured time and replays from the start", async () => {+ const frame = new Element("canvas");+ const content = create(false, "blob:poster", {+ initialTime: 0.4,+ initialFrame: frame as unknown as HTMLCanvasElement,+ });+ expect(content.cover?.children).toContain(frame);+ await content.preload();+ content.video.onloadedmetadata?.();+ expect(content.video.currentTime).toBe(0.4);+ content.play();+ await vi.advanceTimersByTimeAsync(0);+ expect(content.video.currentTime).toBe(0.4);+ content.video.presentFrame();+ content.video.onended?.();+ expect(frame.remove).toHaveBeenCalledOnce();+ expect(content.cover?.style.opacity).toBe("1");+ content.play(true);+ await vi.advanceTimersByTimeAsync(0);+ content.video.onloadedmetadata?.();+ expect(content.video.currentTime).toBe(0);+});++test("blocked viewer autoplay keeps the cover until manual playback presents a frame", async () => {+ const content = create(false);+ content.video.play.mockRejectedValueOnce(+ new DOMException("Blocked", "NotAllowedError"),+ );+ content.play();+ await vi.advanceTimersByTimeAsync(0);+ content.video.onloadeddata?.();+ content.video.presentFrame();+ expect(content.cover?.style.opacity).toBe("1");+ expect(content.button.getAttribute("aria-hidden")).toBe("false");+ content.play(true);+ await vi.advanceTimersByTimeAsync(0);+ content.video.presentFrame();+ expect(content.cover?.style.opacity).toBe("0");+});++test.each(["deactivate", "destroy"] as const)(+ "%s cancels a pending cover reveal",+ async (action) => {+ const content = create(false);+ content.play();+ await vi.advanceTimersByTimeAsync(0);+ content[action]();+ expect(content.video.cancelVideoFrameCallback).toHaveBeenCalledOnce();+ content.video.presentFrame();+ expect(content.cover?.style.opacity).toBe("1");+ },+);++test("reduced motion reveals the playing video without a dissolve", async () => {+ vi.mocked(window.matchMedia).mockReturnValue({+ matches: true,+ } as MediaQueryList);+ const content = create(false);+ content.play();+ await vi.advanceTimersByTimeAsync(0);+ content.video.presentFrame();+ expect(content.cover?.style.opacity).toBe("0");+ expect(content.cover?.style.transition).toBe("none");+});+test("preparing an uncached viewer slide does not start a download", async () => {const content = create(false);await content.preload({ cachedOnly: true });@@ -259,21 +368,23 @@ test.each([undefined, 0.5])(content.play();await vi.advanceTimersByTimeAsync(0);content.video.onloadeddata?.();- expect(content.cover?.hidden).toBe(true);+ content.video.presentFrame();+ expect(content.cover?.style.opacity).toBe("0");if (end == undefined) content.video.onended?.();else {content.video.currentTime = end;content.video.ontimeupdate?.();}- expect(content.cover?.hidden).toBe(false);+ expect(content.cover?.style.opacity).toBe("1");expect(content.video.poster).toBe("blob:poster");expect(content.video.getAttribute("src")).toBeNull();expect(content.button.getAttribute("aria-hidden")).toBe("false");content.play(true);- expect(content.cover?.hidden).toBe(false);+ expect(content.cover?.style.opacity).toBe("1");await vi.advanceTimersByTimeAsync(0);content.video.onloadeddata?.();- expect(content.cover?.hidden).toBe(true);+ content.video.presentFrame();+ expect(content.cover?.style.opacity).toBe("0");expect(content.video.getAttribute("poster")).toBeNull();expect(content.video.paused).toBe(false);expect(load).toHaveBeenCalledTimes(1);diff --git a/web/apps/space/tests/viewer-transition.test.ts b/web/apps/space/tests/viewer-transition.test.tsindex 61e20df8cf..8c831a5cbe 100644--- a/web/apps/space/tests/viewer-transition.test.ts+++ b/web/apps/space/tests/viewer-transition.test.ts@@ -128,6 +128,7 @@ test("closing before decoding cannot hide the tile afterward", async () => {expect(origin.style.opacity).toBe("");expect(flyer.remove).toHaveBeenCalledOnce();expect(requestFrame).not.toHaveBeenCalled();+ await expect(flight.landed).resolves.toBeUndefined();});test("a failed flyer leaves the tile visible and allows viewer handover", async () => {@@ -137,6 +138,25 @@ test("a failed flyer leaves the tile visible and allows viewer handover", asyncexpect(origin.style.opacity).toBe("");expect(onLanded).toHaveBeenCalledOnce();+ await expect(flight.landed).resolves.toBeUndefined();+ flight.stop();+});++test("video playback can wait until the opening spring lands", async () => {+ const { flight, requestFrame, resolveDecode, onLanded } = pendingFlight();+ const play = vi.fn();+ void flight.landed.then(play);+ resolveDecode();+ await Promise.resolve();+ expect(play).not.toHaveBeenCalled();+ let now = performance.now();+ for (let i = 0; i < 200 && !onLanded.mock.calls.length; i++) {+ now += 16;+ requestFrame.mock.lastCall;+ }+ expect(onLanded).toHaveBeenCalledOnce();+ await flight.landed;+ expect(play).toHaveBeenCalledOnce();flight.stop();});