π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[space][web] Improve media error messages
Anand Baburajan8c8034e6b19c
diff --git a/web/apps/space/src/components/FileViewer.tsx b/web/apps/space/src/components/FileViewer.tsxindex be99923cae..102b82a121 100644--- a/web/apps/space/src/components/FileViewer.tsx+++ b/web/apps/space/src/components/FileViewer.tsx@@ -25,6 +25,7 @@ import { SpacePostPhotosCounter } from "components/PostPhotosCounter";import { SpacePostPhotosDots } from "components/PostPhotosDots";import { SpacePostReplyControls } from "components/PostReplyControls";import { createSpaceVideoContent } from "components/PostVideoContent";+import { SpaceVideoError } from "components/VideoError";import log from "ente-base/log";import type PhotoSwipe from "photoswipe";import React from "react";@@ -114,6 +115,8 @@ const spaceViewerPostActionConfigs: Record<};export interface SpaceViewerPhoto {+ preparationError?: string;+ isVideo?: boolean;video?: SpacePostVideo;alt?: string;avatarUrl?: string | null;@@ -144,7 +147,6 @@ interface SpaceFileViewerProps {closeOnSwipePastEnd?: boolean;draftPhotoControls?: React.ReactNode;onLoadPhoto?: SpacePostAssetURLLoader;- draftPostPreparationError?: string;isDraftPostPreviewPending?: boolean;onClose: () => void;onAddDraftPhoto?: () => void;@@ -189,7 +191,7 @@ const viewerTouchPoint = (event: Event) => {};const viewerPhotoContentKey = (photo: SpaceViewerPhoto) =>- `${photo.imageUrl}:${photo.width ?? ""}:${photo.height ?? ""}:${photo.postPhotoCount ?? ""}:${photo.video?.asset?.objectKey ?? photo.video?.url ?? ""}:${photo.video?.start ?? ""}:${photo.video?.end ?? ""}:${photo.video?.muted ?? ""}`;+ `${photo.imageUrl}:${photo.width ?? ""}:${photo.height ?? ""}:${photo.postPhotoCount ?? ""}:${photo.video?.asset?.objectKey ?? photo.video?.url ?? ""}:${photo.video?.start ?? ""}:${photo.video?.end ?? ""}:${photo.video?.muted ?? ""}:${photo.preparationError ?? ""}`;const viewerSwipeStartsOnInteractiveTarget = (target: EventTarget | null) =>target instanceof Element &&@@ -395,7 +397,6 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({closeOnSwipePastEnd = false,draftPhotoControls,onLoadPhoto,- draftPostPreparationError,focusReplyOnOpen = false,isDraftPostPreviewPending = false,onClose,@@ -467,6 +468,9 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({viewerPhotos.length - 1,);const activePhoto = viewerPhotos[activePhotoIndex] ?? photo;+ const draftPostPreparationError = isDraftPost+ ? activePhoto.preparationError+ : undefined;const postPhotoCount = activePhoto.postPhotoCount ?? 1;const postPhotoIndex = activePhoto.postPhotoIndex ?? 0;const activePhotoKey = photoKey(activePhoto);@@ -574,7 +578,8 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({!activePhoto.postId ||!onUpdatePostCaption;const isDraftPostActionRunning = draftPostActionPhase != null;- const hasDraftPostPreparationError = Boolean(draftPostPreparationError);+ const hasDraftPostPreparationError =+ isDraftPost && viewerPhotos.some((item) => item.preparationError);const isDraftPostPublishDisabled =isDraftPostActionRunning ||isDraftPostPreviewPending ||@@ -1237,7 +1242,9 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({html:item.postPhotoCount == 0? '<div class="space-photo-placeholder" role="status">Add photos or videos to your post</div>'- : '<div class="space-photo-placeholder" role="status" aria-label="Preparing preview" aria-busy="true"></div>',+ : item.preparationError+ ? '<div class="space-photo-placeholder"></div>'+ : '<div class="space-photo-placeholder" role="status" aria-label="Preparing preview" aria-busy="true"></div>',width: item.width ?? defaultPhotoWidth,height:item.height ??@@ -1639,6 +1646,7 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({title="Edit item"disabled={isDraftPostActionRunning ||+ isDraftPostPreviewPending ||Boolean(draftPostPreparationError)}onClick={() => {@@ -1922,6 +1930,32 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({</Box></Box>)}+ {isDraftPost && draftPostPreparationError && (+ <Box+ sx={{+ position: "absolute",+ top: "50%",+ left: "50%",+ transform: "translate(-50%, -50%)",+ width: "calc(100% - 48px)",+ maxWidth: 300,+ zIndex: 2,+ textAlign: "center",+ fontFamily: '"Inter Variable", Inter, sans-serif',+ fontSize: 14,+ lineHeight: "20px",+ color: textBase,+ }}+ >+ {activePhoto.isVideo ? (+ <SpaceVideoError message={draftPostPreparationError} />+ ) : (+ <Box role="alert" sx={{ textWrap: "balance" }}>+ {draftPostPreparationError}+ </Box>+ )}+ </Box>+ )}<Boxaria-hiddendata-space-viewer-chrome="true"@@ -1971,25 +2005,6 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({}}>{draftPhotoControls}- {draftPostPreparationError && (- <Box- role="alert"- sx={{- bgcolor: "rgba(246, 58, 58, 0.16)",- borderRadius: "12px",- color: "#FF8A8A",- fontFamily:- '"Inter Variable", Inter, sans-serif',- fontSize: 13,- fontWeight: 650,- lineHeight: "18px",- px: "12px",- py: "8px",- }}- >- {draftPostPreparationError}- </Box>- )}<Boxsx={{alignItems: "flex-end",@@ -2043,7 +2058,7 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({component="button"type="button"aria-label={- draftPostPreparationError+ hasDraftPostPreparationError? "Item could not be prepared": "Post"}diff --git a/web/apps/space/src/components/PostComposer.tsx b/web/apps/space/src/components/PostComposer.tsxindex f14035f6b2..a3791c535d 100644--- a/web/apps/space/src/components/PostComposer.tsx+++ b/web/apps/space/src/components/PostComposer.tsx@@ -211,13 +211,11 @@ export const SpacePostComposer: React.FC<{item.id == draft.id? {...item,- error:- isSpaceVideoFile(draft.file) &&- error instanceof Error- ? error.message- : spacePostImageErrorMessage(- error,- ),+ error: isSpaceVideoFile(draft.file)+ ? "Couldn't process this video."+ : spacePostImageErrorMessage(+ error,+ ),}: item,),@@ -319,6 +317,8 @@ export const SpacePostComposer: React.FC<{};const photos = drafts.map((draft, index) => ({...(draft.photo ?? placeholder),+ preparationError: draft.error,+ isVideo: isSpaceVideoFile(draft.file),postPhotoIndex: index,postPhotoCount: drafts.length,}));@@ -349,6 +349,8 @@ export const SpacePostComposer: React.FC<{id: draft.id,imageUrl: draft.photo?.imageUrl,isLoading: !draft.photo && !draft.error,+ hasError: Boolean(draft.error),+ isVideo: isSpaceVideoFile(draft.file),durationMs: draft.videoEdit? (draft.videoEdit.end - draft.videoEdit.start) * 1000: undefined,@@ -366,7 +368,6 @@ export const SpacePostComposer: React.FC<{<SpaceViewerPostBackdrop exiting={isExiting} /><SpaceFileViewerdraftPhotoControls={controls}- draftPostPreparationError={preparationError}isDraftPostPreviewPending={isPreparing || !drafts.length}onClose={() => {if (!isPublishing || isExiting) onClose();@@ -414,6 +415,7 @@ export const SpacePostComposer: React.FC<{height: draft.originalPhoto?.height ?? 0,isLoading: !draft.photo && !draft.error,preparationError: draft.error,+ isVideo: isSpaceVideoFile(draft.file),edit: draft.edit,video: draft.videoEdit? {diff --git a/web/apps/space/src/components/PostPhotoEditor.tsx b/web/apps/space/src/components/PostPhotoEditor.tsxindex 2c25628027..3df7625fe0 100644--- a/web/apps/space/src/components/PostPhotoEditor.tsx+++ b/web/apps/space/src/components/PostPhotoEditor.tsx@@ -4,6 +4,7 @@ import { Box, Dialog } from "@mui/material";import { SpacePostPhotoInput } from "components/PostPhotoInput";import { SpacePostPhotoStrip } from "components/PostPhotoStrip";import { SpacePostVideoEditor } from "components/PostVideoEditor";+import { SpaceVideoError } from "components/VideoError";import { SpacePhotoCrop } from "components/photo-crop/PhotoCrop";import {cropWithAspect,@@ -30,6 +31,7 @@ export interface SpaceEditablePostPhoto {height: number;isLoading?: boolean;preparationError?: string;+ isVideo?: boolean;edit?: SpacePostPhotoEdit;video?: {file: File;@@ -329,8 +331,33 @@ export const SpacePostPhotoEditor: React.FC<{photo.isLoading ? "Preparing preview" : undefined}aria-busy={photo.isLoading || undefined}- sx={{ width: "100%", height: "100%" }}- />+ sx={{+ width: "100%",+ height: "100%",+ display: "grid",+ placeItems: "center",+ }}+ >+ {photo.preparationError && (+ <Box sx={{ maxWidth: 300, p: "24px" }}>+ {photo.isVideo ? (+ <SpaceVideoError+ message={photo.preparationError}+ />+ ) : (+ <Box+ role="alert"+ sx={{+ textAlign: "center",+ textWrap: "balance",+ }}+ >+ {photo.preparationError}+ </Box>+ )}+ </Box>+ )}+ </Box>) : photo.video ? (<SpacePostVideoEditorkey={photo.id}@@ -367,18 +394,14 @@ export const SpacePostPhotoEditor: React.FC<{alignItems: "center",gap: "12px",px: "12px",- pt:- photo.video &&- (error || preparationError || showPhotoStrip)- ? "12px"- : 0,+ pt: photo.video && (error || showPhotoStrip) ? "12px" : 0,pb: "max(16px, env(safe-area-inset-bottom))",flexShrink: 0,}}>- {(error || preparationError) && (+ {error && (<Box role="alert" sx={{ color: "#FF8A8A", fontSize: 13 }}>- {error || preparationError}+ {error}</Box>)}{!photo.video && photo.imageURL && (@@ -532,6 +555,8 @@ export const SpacePostPhotoEditor: React.FC<{id: photo.id,imageUrl: photo.previewURL,isLoading: photo.isLoading,+ hasError: Boolean(photo.preparationError),+ isVideo: photo.isVideo,durationMs: photo.video? photo.video.duration * 1000: undefined,diff --git a/web/apps/space/src/components/PostPhotoStrip.tsx b/web/apps/space/src/components/PostPhotoStrip.tsxindex 3c9d16b406..a41db279a5 100644--- a/web/apps/space/src/components/PostPhotoStrip.tsx+++ b/web/apps/space/src/components/PostPhotoStrip.tsx@@ -10,6 +10,8 @@ interface StripPhoto {id: number;imageUrl?: string;isLoading?: boolean;+ hasError?: boolean;+ isVideo?: boolean;durationMs?: number;}@@ -240,6 +242,13 @@ export const SpacePostPhotoStrip: React.FC<{pointerEvents: "none",}}/>+ ) : photo.hasError ? (+ <Box+ component="span"+ sx={{ color: "#FF8A8A", fontSize: 20, fontWeight: 700 }}+ >+ !+ </Box>) : (<Skeletonanimation="wave"@@ -311,7 +320,7 @@ export const SpacePostPhotoStrip: React.FC<{component="button"type="button"data-photo-index={index}- aria-label={`${photo.durationMs ? "Video" : "Photo"} ${index + 1}`}+ aria-label={`${photo.isVideo || photo.durationMs ? "Video" : "Photo"} ${index + 1}${photo.hasError ? ", couldn't prepare" : ""}`}aria-pressed={photo.id == photos[activeIndex]?.id}@@ -352,9 +361,8 @@ export const SpacePostPhotoStrip: React.FC<{...iconButtonSx,bgcolor: "#242424",outline:- photo.imageUrl &&photo.id ==- photos[activeIndex]?.id+ photos[activeIndex]?.id? "1.5px solid #FFFFFF": "none",outlineOffset: "-1.5px",diff --git a/web/apps/space/src/components/PostVideoContent.ts b/web/apps/space/src/components/PostVideoContent.tsindex 7f1b0737d7..3f48864201 100644--- a/web/apps/space/src/components/PostVideoContent.ts+++ b/web/apps/space/src/components/PostVideoContent.ts@@ -1,5 +1,6 @@import type { SpaceViewerPhoto } from "components/FileViewer";import { logToDisk } from "ente-base/log-web";+import { SpaceMediaRateLimitError } from "services/media-load";import type { SpacePostAssetURLLoader } from "services/space";export const createSpaceVideoContent = (@@ -71,23 +72,41 @@ export const createSpaceVideoContent = (loading.setAttribute("aria-label", "Loading video");loading.innerHTML = '<span class="space-video-spinner"></span>';Object.assign(loading.style, { ...controlStyle, pointerEvents: "none" });- const errorMessage = document.createElement("span");- errorMessage.textContent = "Couldn't play this video. Tap to retry.";+ const errorMessage = document.createElement("div");errorMessage.hidden = true;errorMessage.setAttribute("role", "status");Object.assign(errorMessage.style, {position: "absolute",- bottom: "12px",- left: "12px",- right: "12px",- background: "rgba(0, 0, 0, 0.65)",- color: "white",- borderRadius: "6px",- padding: "8px",+ top: "50%",+ left: "50%",+ transform: "translate(-50%, -50%)",+ width: "max-content",+ maxWidth: "calc(100% - 32px)",+ color: "#D0D0D0",fontSize: "13px",+ fontWeight: "500",+ fontFamily: '"Inter Variable", Inter, sans-serif',+ lineHeight: "18px",textAlign: "center",+ textWrap: "balance",pointerEvents: "none",});+ const errorTitle = document.createElement("div");+ const supportMessage = document.createElement("div");+ supportMessage.textContent = "Please contact support.";+ for (const pill of [errorTitle, supportMessage]) {+ Object.assign(pill.style, {+ background: "rgba(28, 28, 30, 0.88)",+ borderRadius: "999px",+ boxSizing: "border-box",+ marginInline: "auto",+ maxWidth: "100%",+ padding: "6px 16px",+ width: "fit-content",+ });+ }+ supportMessage.style.marginTop = "2px";+ errorMessage.append(errorTitle, supportMessage);element.append(video, button, loading, errorMessage);let generation = 0;let sourceGeneration = 0;@@ -95,6 +114,9 @@ export const createSpaceVideoContent = (let ownedURL: string | undefined;let disposed = false;let active = false;+ let autoplayBlocked = false;+ let failure: "error" | "rate-limit" | undefined;+ let retryTimer: ReturnType<typeof setTimeout> | undefined;let loadingTimer: ReturnType<typeof setTimeout> | undefined;let playbackTimeout: ReturnType<typeof setTimeout> | undefined;const hideLoading = () => {@@ -127,13 +149,20 @@ export const createSpaceVideoContent = (};const showPlayButton = () => {hideLoading();- button.setAttribute("aria-hidden", String(!active));- button.disabled = false;- button.setAttribute("aria-label", "Play video");- video.setAttribute("aria-label", "Play video");+ const blocked = Boolean(failure);+ const label = blocked ? "Video unavailable" : "Play video";+ button.setAttribute("aria-hidden", String(!active || blocked));+ button.disabled = blocked;+ button.setAttribute("aria-label", label);+ video.setAttribute("aria-label", label);+ video.setAttribute("aria-disabled", String(blocked));+ video.style.cursor = blocked ? "default" : "pointer";+ errorMessage.hidden = !active || !failure;};const showPlaying = () => {hideLoading();+ failure = undefined;+ errorMessage.hidden = true;button.disabled = false;button.setAttribute("aria-hidden", "true");video.setAttribute("aria-label", "Pause video");@@ -151,12 +180,30 @@ export const createSpaceVideoContent = (video.removeAttribute("src");video.load();};- const failPlayback = (reason: "timeout" | "media" | "play") => {+ const failPlayback = (+ reason: "timeout" | "media" | "play",+ error?: unknown,+ ) => {logToDisk(- `[error] Space video playback failed reason=${reason} code=${video.error?.code ?? 0} readyState=${video.readyState} networkState=${video.networkState}`,+ `[error] Space video playback failed reason=${reason} errorName=${error instanceof Error ? error.name : "none"} rateLimited=${error instanceof SpaceMediaRateLimitError} code=${video.error?.code ?? 0} readyState=${video.readyState} networkState=${video.networkState}`,);+ failure =+ error instanceof SpaceMediaRateLimitError ? "rate-limit" : "error";+ errorTitle.textContent =+ failure == "rate-limit"+ ? "Couldn't load video. Please try again later."+ : "Couldn't play video.";+ supportMessage.hidden = failure == "rate-limit";+ clearTimeout(retryTimer);+ if (error instanceof SpaceMediaRateLimitError)+ retryTimer = setTimeout(+ () => {+ failure = undefined;+ showPlayButton();+ },+ Math.max(0, error.retryAt - Date.now()),+ );reset();- errorMessage.hidden = false;};const clear = () => {active = false;@@ -170,7 +217,8 @@ export const createSpaceVideoContent = (};document.addEventListener("visibilitychange", visibility);const preload = () => {- if (disposed || video.getAttribute("src")) return Promise.resolve();+ if (disposed || failure || video.getAttribute("src"))+ return Promise.resolve();if (pendingLoad) return pendingLoad;const current = sourceGeneration;pendingLoad = (async () => {@@ -191,9 +239,15 @@ export const createSpaceVideoContent = (});return pendingLoad;};- const play = () => {- if (button.disabled || !video.paused) return;+ const play = (userInitiated = false) => {+ if (disposed || !video.paused) return;active = true;+ if (failure || (!userInitiated && autoplayBlocked)) {+ showPlayButton();+ return;+ }+ if (button.disabled) return;+ autoplayBlocked = false;errorMessage.hidden = true;const current = ++generation;showLoading(false);@@ -202,10 +256,10 @@ export const createSpaceVideoContent = (await Promise.all([preload(),Promise.resolve(onPlay?.()).then(() => {- if (!disposed && generation == current) showLoading();+ if (generation == current) showLoading();}),]);- if (disposed || generation != current) return;+ if (generation != current) return;if (video.ended ||(media.end != undefined && video.currentTime >= media.end)@@ -214,14 +268,23 @@ export const createSpaceVideoContent = (}await video.play();if (generation == current) showPlaying();- })().catch(() => {- if (!disposed && generation == current) failPlayback("play");+ })().catch((error: unknown) => {+ if (disposed || generation != current) return;+ if (+ error instanceof DOMException &&+ error.name == "NotAllowedError"+ ) {+ autoplayBlocked = true;+ showPlayButton();+ } else {+ failPlayback("play", error);+ }});};const togglePlayback = () => {if (button.disabled) return;if (onTogglePlayback) onTogglePlayback(video.paused);- else if (video.paused) play();+ else if (video.paused) play(true);else pause();};button.onclick = togglePlayback;@@ -277,12 +340,13 @@ export const createSpaceVideoContent = (pause,deactivate: () => {if (inline) {- errorMessage.hidden = true;+ active = false;pause();} else clear();},destroy: () => {disposed = true;+ clearTimeout(retryTimer);clear();document.removeEventListener("visibilitychange", visibility);},diff --git a/web/apps/space/src/components/VideoError.tsx b/web/apps/space/src/components/VideoError.tsxnew file mode 100644index 0000000000..7adf6578e0--- /dev/null+++ b/web/apps/space/src/components/VideoError.tsx@@ -0,0 +1,32 @@+import { Box } from "@mui/material";+import type React from "react";++export const SpaceVideoError: React.FC<{ message: string }> = ({ message }) => (+ <Box+ role="alert"+ sx={{+ alignItems: "center",+ color: "#D0D0D0",+ display: "flex",+ flexDirection: "column",+ fontFamily: '"Inter Variable", Inter, sans-serif',+ fontSize: 13,+ fontWeight: 500,+ gap: "2px",+ lineHeight: "18px",+ textAlign: "center",+ textWrap: "balance",+ "& > div": {+ bgcolor: "rgba(28, 28, 30, 0.88)",+ borderRadius: "999px",+ boxSizing: "border-box",+ maxWidth: "100%",+ p: "6px 16px",+ width: "fit-content",+ },+ }}+ >+ <Box>{message}</Box>+ <Box>Please contact support.</Box>+ </Box>+);diff --git a/web/apps/space/src/components/feed-video-playback.ts b/web/apps/space/src/components/feed-video-playback.tsindex 89daa02091..ae1b5fd828 100644--- a/web/apps/space/src/components/feed-video-playback.ts+++ b/web/apps/space/src/components/feed-video-playback.ts@@ -20,11 +20,11 @@ let frame: number | undefined;let pending: FeedVideo | undefined;let selectionTimer: ReturnType<typeof setTimeout> | undefined;-const select = (next: FeedVideo | undefined) => {+const select = (next: FeedVideo | undefined, userInitiated = false) => {if (selected == next) return;selected?.player.deactivate();selected = next;- if (next && !next.manuallyPaused) next.player.play();+ if (next && !next.manuallyPaused) next.player.play(userInitiated);};const isVisible = (element: HTMLElement) => {@@ -170,8 +170,8 @@ export const registerFeedVideo = (manual = video;interactedPost = undefined;const wasSelected = selected == video;- select(video);- if (wasSelected) player.play();+ select(video, true);+ if (wasSelected) player.play(true);},pause: () => {video.manuallyPaused = true;diff --git a/web/apps/space/src/screens/MessagesScreen.tsx b/web/apps/space/src/screens/MessagesScreen.tsxindex f42b98ab34..7f54111f01 100644--- a/web/apps/space/src/screens/MessagesScreen.tsx+++ b/web/apps/space/src/screens/MessagesScreen.tsx@@ -1338,6 +1338,18 @@ const PostQuotePreview: React.FC<{const preview = activityPost ?? quote;const isUnavailable = !quote || Boolean(preview?.isUnavailable);const hasLoadError = Boolean(preview?.hasLoadError);+ const retryAt = preview?.retryAt;+ const [now, setNow] = React.useState(Date.now);+ const isRateLimited = retryAt !== undefined && now < retryAt;+ React.useEffect(() => {+ if (retryAt === undefined) return;+ setNow(Date.now());+ const timer = window.setTimeout(+ () => setNow(Date.now()),+ Math.max(0, retryAt - Date.now()),+ );+ return () => window.clearTimeout(timer);+ }, [retryAt]);const imageUrl =isUnavailable || hasLoadError ? undefined : preview?.imageUrl;const photoCount = preview?.photoCount ?? 1;@@ -1347,7 +1359,8 @@ const PostQuotePreview: React.FC<{quote && !imageUrl && !isUnavailable && !hasLoadError,);const canOpen = Boolean(loadedQuote);- const canRetry = hasLoadError && Boolean(onLoadActivityPost);+ const canRetry =+ hasLoadError && !isRateLimited && Boolean(onLoadActivityPost);const unavailableLabel =quote?.objectKey !== undefined && preview?.photoCount !== undefined? "Photo unavailable"@@ -1375,7 +1388,7 @@ const PostQuotePreview: React.FC<{canOpen? "Open quoted photo": canRetry- ? "Retry loading photo"+ ? "Retry loading post": undefined}onClick={(event: React.MouseEvent) => {@@ -1421,7 +1434,9 @@ const PostQuotePreview: React.FC<{isLoading? "Loading photo": hasLoadError- ? "Couldn't load photo"+ ? isRateLimited+ ? "Couldn't load post. Please try again later."+ : "Couldn't load post": unavailableLabel}sx={{@@ -1438,6 +1453,7 @@ const PostQuotePreview: React.FC<{justifyContent: "center",lineHeight: "16px",textAlign: "center",+ textWrap: "balance",width: postQuoteThumbnailSize,px: "12px",}}@@ -1452,7 +1468,11 @@ const PostQuotePreview: React.FC<{{isUnavailable ? (unavailableLabel) : hasLoadError ? (- "Couldn't load photo. Tap to retry."+ isRateLimited ? (+ "Couldn't load post. Please try again later."+ ) : (+ "Couldn't load post. Tap to retry."+ )) : (<SpaceLoadingSpinner />)}@@ -2112,6 +2132,8 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({const cached = activityPostsByKey[key];if ((cached && !cached.hasLoadError) ||+ (cached?.retryAt !== undefined &&+ Date.now() < cached.retryAt) ||activityPostLoadsInFlightRef.current.has(key))return;diff --git a/web/apps/space/src/services/media-cache.ts b/web/apps/space/src/services/media-cache.tsindex 03f69add24..fdde328aff 100644--- a/web/apps/space/src/services/media-cache.ts+++ b/web/apps/space/src/services/media-cache.ts@@ -2,6 +2,7 @@ import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";import { blobCache, clearBlobCache } from "ente-base/blob-cache";import log from "ente-base/log";import { apiOrigin } from "ente-base/origins";+import { clearSpaceMediaLoadCooldown } from "services/media-load";const maxSpaceMediaCacheEntries = 128;const spaceMediaURLCache = new Map<string, Promise<string>>();@@ -149,6 +150,7 @@ export const rememberCachedSpaceMediaBlobURL = async (};export const clearSpaceMediaURLCache = () => {+ clearSpaceMediaLoadCooldown();for (const promise of spaceMediaURLCache.values()) {void promise.then((url) => URL.revokeObjectURL(url),diff --git a/web/apps/space/src/services/media-load.ts b/web/apps/space/src/services/media-load.tsnew file mode 100644index 0000000000..0e4a1a697c--- /dev/null+++ b/web/apps/space/src/services/media-load.ts@@ -0,0 +1,33 @@+export class SpaceMediaRateLimitError extends Error {+ readonly retryAt = Date.now() + 60_000;++ constructor(cause: unknown) {+ super("Couldn't load media. Please try again later.", { cause });+ }+}++let rateLimitError: SpaceMediaRateLimitError | undefined;++export const clearSpaceMediaLoadCooldown = () => {+ rateLimitError = undefined;+};++export const loadSpaceMedia = async <T>(load: () => Promise<T>): Promise<T> => {+ if (rateLimitError && Date.now() < rateLimitError.retryAt)+ throw rateLimitError;++ try {+ return await load();+ } catch (error) {+ if (+ typeof error == "object" &&+ error !== null &&+ "status" in error &&+ error.status == 429+ ) {+ rateLimitError = new SpaceMediaRateLimitError(error);+ throw rateLimitError;+ }+ throw error;+ }+};diff --git a/web/apps/space/src/services/space.ts b/web/apps/space/src/services/space.tsindex db0adc99a9..ae4626d9b1 100644--- a/web/apps/space/src/services/space.ts+++ b/web/apps/space/src/services/space.ts@@ -35,6 +35,7 @@ import {spacePostMediaCacheKey,spaceProfileMediaCacheKey,} from "services/media-cache";+import { loadSpaceMedia } from "services/media-load";import {ensureCurrentSpaceContext,loadExistingSpaceProfile,@@ -150,6 +151,7 @@ export interface SpaceMessageQuote {imageUrl?: string;isUnavailable?: boolean;hasLoadError?: boolean;+ retryAt?: number;objectKey?: string;photoCount?: number;postId: number;@@ -403,7 +405,10 @@ const accountPostAssetURLFromAsset = () =>cachedSpaceMediaBlobURL(postAssetCacheKey(asset),- () => ctx.downloadPostAsset(asset, viewerSpaceId ?? null),+ () =>+ loadSpaceMedia(() =>+ ctx.downloadPostAsset(asset, viewerSpaceId ?? null),+ ),asset.mediaType,);@@ -561,7 +566,7 @@ export const openPublicSpaceLink = async (loadPostImage: (asset) =>cachedSpaceMediaBlobURL(postAssetCacheKey(asset),- () => ctx.downloadPostAsset(asset),+ () => loadSpaceMedia(() => ctx.downloadPostAsset(asset)),asset.mediaType,),loadProfileMedia: async () => {@@ -662,10 +667,12 @@ const messageQuoteFromReplyPost = async (if (!includeImage) return fallbackQuote;try {- const post = await ctx.getPost(- message.recipientSpaceId,- BigInt(message.replyPostId),- viewerSpaceId ?? null,+ const post = await loadSpaceMedia(() =>+ ctx.getPost(+ fallbackQuote.spaceId,+ BigInt(fallbackQuote.postId),+ viewerSpaceId ?? null,+ ),);return await messageQuoteFromPostResponse(ctx,@@ -748,10 +755,12 @@ export const loadCurrentMessageActivityPostPreview = async (): Promise<SpaceMessageActivityPost | undefined> => {const ctx = await ensureCurrentSpaceContext();try {- const response = await ctx.getPost(- post.spaceId,- BigInt(post.postId),- viewerSpaceId ?? null,+ const response = await loadSpaceMedia(() =>+ ctx.getPost(+ post.spaceId,+ BigInt(post.postId),+ viewerSpaceId ?? null,+ ),);return await messageQuoteFromPostResponse(ctx,diff --git a/web/apps/space/src/utils/post-quote.ts b/web/apps/space/src/utils/post-quote.tsindex fef0733fd8..2c83e6e621 100644--- a/web/apps/space/src/utils/post-quote.ts+++ b/web/apps/space/src/utils/post-quote.ts@@ -1,4 +1,5 @@import { isNamedError } from "ente-base/error";+import { SpaceMediaRateLimitError } from "services/media-load";export const postQuotePhotoIndex = (photos: { objectKey: string }[],@@ -20,4 +21,6 @@ export const postQuoteErrorState = (error: unknown) =>isNamedError(error, "content_unavailable") ||isNamedError(error, "permission_denied")? { isUnavailable: true }- : { hasLoadError: true };+ : error instanceof SpaceMediaRateLimitError+ ? { hasLoadError: true, retryAt: error.retryAt }+ : { hasLoadError: true };diff --git a/web/apps/space/tests/media-load.test.ts b/web/apps/space/tests/media-load.test.tsnew file mode 100644index 0000000000..9c29aa7c40--- /dev/null+++ b/web/apps/space/tests/media-load.test.ts@@ -0,0 +1,57 @@+import { afterEach, beforeEach, expect, test, vi } from "vitest";+import {+ clearSpaceMediaLoadCooldown,+ loadSpaceMedia,+ SpaceMediaRateLimitError,+} from "../src/services/media-load";++beforeEach(() => {+ vi.useFakeTimers();+ clearSpaceMediaLoadCooldown();+});++afterEach(() => {+ clearSpaceMediaLoadCooldown();+ vi.useRealTimers();+});++test("a rate limit pauses other media requests without extending the cooldown on retry", async () => {+ const cause = Object.assign(new Error("Rate limit breached"), {+ status: 429,+ });+ const first = vi.fn().mockRejectedValue(cause);+ const second = vi.fn().mockResolvedValue("photo");+ const error = await loadSpaceMedia(first).catch((error: unknown) => error);+ expect(error).toBeInstanceOf(SpaceMediaRateLimitError);+ expect((error as SpaceMediaRateLimitError).cause).toBe(cause);+ await vi.advanceTimersByTimeAsync(59_999);+ await expect(loadSpaceMedia(second)).rejects.toBe(error);+ expect(second).not.toHaveBeenCalled();+ await vi.advanceTimersByTimeAsync(1);+ await expect(loadSpaceMedia(second)).resolves.toBe("photo");+ expect(second).toHaveBeenCalledOnce();+});++test("network errors do not impose a rate-limit cooldown", async () => {+ const error = new Error("Offline");+ await expect(loadSpaceMedia(() => Promise.reject(error))).rejects.toBe(+ error,+ );+ await expect(loadSpaceMedia(() => Promise.resolve("video"))).resolves.toBe(+ "video",+ );+});++test("clearing the session clears the media cooldown", async () => {+ await expect(+ loadSpaceMedia(() =>+ Promise.reject(+ Object.assign(new Error("Rate limit"), { status: 429 }),+ ),+ ),+ ).rejects.toBeInstanceOf(SpaceMediaRateLimitError);+ clearSpaceMediaLoadCooldown();+ await expect(+ loadSpaceMedia(() => Promise.resolve("new session")),+ ).resolves.toBe("new session");+});diff --git a/web/apps/space/tests/post-quote.test.ts b/web/apps/space/tests/post-quote.test.tsindex 306af6c728..f764f2bb63 100644--- a/web/apps/space/tests/post-quote.test.ts+++ b/web/apps/space/tests/post-quote.test.ts@@ -1,4 +1,5 @@import { expect, test } from "vitest";+import { SpaceMediaRateLimitError } from "../src/services/media-load";import {postQuoteErrorState,postQuoteKey,@@ -64,3 +65,13 @@ test("unavailable posts and temporary failures have different states", () => {expect(postQuoteErrorState(error)).toEqual({ isUnavailable: true });}});++test("rate-limited photo previews preserve the cooldown for the retry control", () => {+ const error = new SpaceMediaRateLimitError(+ new Error("Rate limit breached"),+ );+ expect(postQuoteErrorState(error)).toEqual({+ hasLoadError: true,+ retryAt: error.retryAt,+ });+});diff --git a/web/apps/space/tests/post-video-content.test.ts b/web/apps/space/tests/post-video-content.test.tsindex 44f274d247..eff1520e25 100644--- a/web/apps/space/tests/post-video-content.test.ts+++ b/web/apps/space/tests/post-video-content.test.ts@@ -1,5 +1,6 @@import { afterEach, beforeEach, expect, test, vi } from "vitest";import { createSpaceVideoContent } from "../src/components/PostVideoContent";+import { SpaceMediaRateLimitError } from "../src/services/media-load";import type {SpacePostAsset,SpacePostAssetURLLoader,@@ -13,6 +14,7 @@ class Element extends EventTarget {children: Element[] = [];disabled = false;hidden = false;+ textContent = "";setAttribute(name: string, value: string) {this.attributes.set(name, value);}@@ -104,6 +106,8 @@ const create = (button: button!,loading: loading!,error: error!,+ errorTitle: error!.children[0]!,+ supportMessage: error!.children[1]!,};};@@ -149,7 +153,7 @@ test("the play button appears on pause and hides immediately on resume", async (await vi.advanceTimersByTimeAsync(0);content.pause();expect(content.button.getAttribute("aria-hidden")).toBe("false");- content.play();+ content.play(true);expect(content.button.getAttribute("aria-hidden")).toBe("true");await vi.advanceTimersByTimeAsync(0);expect(content.video.paused).toBe(false);@@ -219,20 +223,20 @@ test("a failed background preload can be retried by playback", async () => {expect(content.video.paused).toBe(false);});-test("a timed-out download cannot replace the source after retry", async () => {+test("a timed-out download cannot replace the failure with a late source", async () => {const download = Promise.withResolvers<string>();load.mockReturnValueOnce(download.promise);const content = create();content.play();await vi.advanceTimersByTimeAsync(30_000);expect(content.error.hidden).toBe(false);- expect(content.button.getAttribute("aria-hidden")).toBe("false");- content.play();+ expect(content.button.getAttribute("aria-hidden")).toBe("true");+ content.play(true);await vi.advanceTimersByTimeAsync(0);download.resolve("blob:late");await vi.advanceTimersByTimeAsync(0);- expect(content.video.getAttribute("src")).toBe("blob:video");- expect(content.video.play).toHaveBeenCalledTimes(1);+ expect(content.video.getAttribute("src")).toBeNull();+ expect(content.video.play).not.toHaveBeenCalled();expect(revokeURL).toHaveBeenCalledWith("blob:late");});@@ -304,3 +308,104 @@ test("fullscreen video still releases its source on deactivation", async () => {expect(revokeURL).toHaveBeenCalledExactlyOnceWith("blob:video");expect(content.button.getAttribute("aria-hidden")).toBe("true");});++test("blocked autoplay preserves the source and offers manual playback", async () => {+ const content = create();+ content.video.play.mockRejectedValueOnce(+ new DOMException("Blocked", "NotAllowedError"),+ );+ content.play();+ await vi.advanceTimersByTimeAsync(0);+ expect(content.error.hidden).toBe(true);+ expect(content.button.getAttribute("aria-label")).toBe("Play video");+ expect(content.button.getAttribute("aria-hidden")).toBe("false");+ expect(content.video.getAttribute("src")).toBe("blob:video");+ content.deactivate();+ content.play();+ await vi.advanceTimersByTimeAsync(0);+ expect(content.video.play).toHaveBeenCalledTimes(1);+ content.play(true);+ await vi.advanceTimersByTimeAsync(0);+ expect(content.video.paused).toBe(false);+ expect(load).toHaveBeenCalledTimes(1);+});++test("a failed video shows its error, keeps its poster, and does not retry", async () => {+ load.mockRejectedValueOnce(new Error("Offline"));+ const content = create();+ content.play();+ await vi.advanceTimersByTimeAsync(0);+ expect(content.errorTitle.textContent).toBe("Couldn't play video.");+ expect(content.supportMessage.textContent).toBe("Please contact support.");+ expect(content.supportMessage.hidden).toBe(false);+ expect(content.button.getAttribute("aria-hidden")).toBe("true");+ expect(content.button.disabled).toBe(true);+ expect((content.video as unknown as HTMLVideoElement).poster).toBe(+ "blob:poster",+ );+ content.deactivate();+ content.play();+ await vi.advanceTimersByTimeAsync(0);+ expect(load).toHaveBeenCalledTimes(1);+ content.play(true);+ await content.preload();+ await vi.advanceTimersByTimeAsync(0);+ expect(load).toHaveBeenCalledTimes(1);+ expect(content.error.hidden).toBe(false);+});++test.each([true, false])(+ "rate-limited video waits before enabling play, inline=%s",+ async (inline) => {+ load.mockRejectedValueOnce(+ new SpaceMediaRateLimitError(new Error("429")),+ );+ const content = create(inline);+ content.play();+ await vi.advanceTimersByTimeAsync(0);+ expect(content.errorTitle.textContent).toBe(+ "Couldn't load video. Please try again later.",+ );+ expect(content.error.hidden).toBe(false);+ expect(content.supportMessage.hidden).toBe(true);+ expect(content.button.disabled).toBe(true);+ content.deactivate();+ content.play(true);+ await vi.advanceTimersByTimeAsync(59_999);+ expect(load).toHaveBeenCalledTimes(1);+ expect(content.button.disabled).toBe(true);+ await vi.advanceTimersByTimeAsync(1);+ expect(content.button.disabled).toBe(false);+ expect(content.button.getAttribute("aria-hidden")).toBe("false");+ expect(content.button.getAttribute("aria-label")).toBe("Play video");+ expect(content.error.hidden).toBe(true);+ content.play(true);+ await vi.advanceTimersByTimeAsync(0);+ expect(load).toHaveBeenCalledTimes(2);+ expect(content.error.hidden).toBe(true);+ },+);++test("unsupported playback shows the error without retrying", async () => {+ const content = create();+ content.video.play.mockRejectedValueOnce(+ new DOMException("Unsupported", "NotSupportedError"),+ );+ content.play();+ await vi.advanceTimersByTimeAsync(0);+ expect(content.errorTitle.textContent).toBe("Couldn't play video.");+ expect(content.supportMessage.hidden).toBe(false);+ expect(content.button.disabled).toBe(true);+ content.play(true);+ await vi.advanceTimersByTimeAsync(0);+ expect(content.video.play).toHaveBeenCalledTimes(1);+});++test("destroying a rate-limited player cancels its cooldown timer", async () => {+ load.mockRejectedValueOnce(new SpaceMediaRateLimitError(new Error("429")));+ const content = create();+ content.play();+ await vi.advanceTimersByTimeAsync(0);+ content.destroy();+ expect(vi.getTimerCount()).toBe(0);+});