π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Fix Space home tile and avatar loading
Anand Baburajan3369939d6b92
diff --git a/web/apps/space/src/pages/app/index.tsx b/web/apps/space/src/pages/app/index.tsxindex cd1d3fa37a..3fdea0d55d 100644--- a/web/apps/space/src/pages/app/index.tsx+++ b/web/apps/space/src/pages/app/index.tsx@@ -5,6 +5,10 @@ import { SpaceRouteFallback } from "components/RouteFallback";import log from "ente-base/log";import React, { useEffect, useState } from "react";import { HomeScreen } from "screens/HomeScreen";+import {+ cacheSpaceHomeItems,+ loadCachedSpaceHomeItems,+} from "services/home-items";import {loadSpaceHomePosts,patchCachedSpaceHomePost,@@ -57,6 +61,7 @@ const Page: React.FC = () => {const [isFriendsLoading, setIsFriendsLoading] = useState(true);const [isFriendRequestsLoading, setIsFriendRequestsLoading] =useState(true);+ const [hasLoadedHomeItems, setHasLoadedHomeItems] = useState(false);const [showFriendRequestCanceledToast, setShowFriendRequestCanceledToast] =useState(false);const [showFriendLimitToast, setShowFriendLimitToast] = useState(false);@@ -100,6 +105,7 @@ const Page: React.FC = () => {setIsLatestPostsLoading(true);setIsFriendsLoading(true);setIsFriendRequestsLoading(true);+ setHasLoadedHomeItems(false);void (async () => {try {const nextSpaceId = await loadExistingSpaceId();@@ -129,48 +135,36 @@ const Page: React.FC = () => {"Failed to load Space friend requests",error,);- return [];+ return undefined;},),- loadSpaceHomePosts(nextSpaceId).then((savedHomePosts) => {- if (isCancelled() || !savedHomePosts) return;-- setLatestPosts(savedHomePosts.latestPosts);- setUnreadPosts(savedHomePosts.unreadPosts);- setFriends((currentFriends) => {- if (currentFriends.length > 0)- return currentFriends;+ Promise.all([+ loadSpaceHomePosts(nextSpaceId),+ loadCachedSpaceHomeItems(nextSpaceId),+ ]).then(([savedHomePosts, savedHomeItems]) => {+ if (isCancelled()) return;- return savedHomePosts.friendSpaceIds.map(- (friendSpaceId) => {- const post =- savedHomePosts.latestPosts.find(- (post) =>- post.spaceId == friendSpaceId,- );- return {- avatarKeyVersion:- post?.avatarKeyVersion,- avatarObjectID: post?.avatarObjectID,- avatarSize: post?.avatarSize,- avatarUpdatedAt: post?.avatarUpdatedAt,- friendsCount: 0,- fullName: post?.name ?? "",- id: friendSpaceId,- spaceId: friendSpaceId,- username: post?.username ?? "",- };- },- );- });- setIsLatestPostsLoading(false);- setIsFriendsLoading(false);+ if (savedHomePosts) {+ setLatestPosts(savedHomePosts.latestPosts);+ setUnreadPosts(savedHomePosts.unreadPosts);+ setIsLatestPostsLoading(false);+ }+ if (savedHomeItems) {+ setFriends(savedHomeItems.friends);+ setFriendRequests(savedHomeItems.friendRequests);+ setIsFriendsLoading(false);+ setIsFriendRequestsLoading(false);+ setHasLoadedHomeItems(true);+ }}),]);if (isCancelled()) return;setFriends(nextFriends);- setFriendRequests(nextFriendRequests);+ if (nextFriendRequests) {+ setFriendRequests(nextFriendRequests);+ setHasLoadedHomeItems(true);+ }setIsFriendsLoading(false);setIsFriendRequestsLoading(false);const refreshedHomePosts = await refreshSpaceHomePosts(@@ -196,6 +190,12 @@ const Page: React.FC = () => {};}, [setFriends]);+ useEffect(() => {+ if (spaceId && hasLoadedHomeItems) {+ void cacheSpaceHomeItems(spaceId, friends, friendRequests);+ }+ }, [spaceId, hasLoadedHomeItems, friends, friendRequests]);+const setLatestPostLiked = React.useCallback(async (postId: number, liked: boolean) => {if (!spaceId) throw new Error("Missing space.");diff --git a/web/apps/space/src/screens/HomeScreen.tsx b/web/apps/space/src/screens/HomeScreen.tsxindex e5c8a50b5e..6f070f152d 100644--- a/web/apps/space/src/screens/HomeScreen.tsx+++ b/web/apps/space/src/screens/HomeScreen.tsx@@ -320,11 +320,9 @@ export const FriendPostTile: React.FC<FriendPostTileProps> = ({? decodedPhoto.src: imageUrl) ?? undefined;const displayAvatarUrl =- (decodedAvatar.failed- ? undefined- : decodedAvatar.ready- ? decodedAvatar.src- : avatarUrl) ?? null;+ decodedAvatar.ready && !decodedAvatar.failed+ ? (decodedAvatar.src ?? null)+ : null;const isPhotoReady = Boolean(displayImageUrl) && decodedPhoto.ready;const canOpenPost = Boolean(post) && !postUnavailable && isPhotoReady;const isTileDisabled =@@ -679,70 +677,65 @@ export const FriendPostTile: React.FC<FriendPostTileProps> = ({)}{!isRead && <SpacePostUnreadBadge count={posts.length} />}</Box>- {friendRequestDirection != "received" && (- <Box- component="button"- type="button"- aria-label={- friendRequestDirection == "sent"- ? `Manage friend request sent to ${firstName}`- : `Open ${firstName}'s profile`- }- disabled={!canOpenFriend || isFriendRequestActionBusy}- onClick={openFriend}- sx={{- appearance: "none",- bgcolor: "transparent",- border: displayAvatarUrl- ? "2px solid rgba(255, 255, 255, 0.36)"- : "2px solid rgba(255, 255, 255, 0.28)",- borderRadius: "50%",- bottom: "10%",- boxSizing: "border-box",- cursor: canOpenFriend ? "pointer" : "default",- height: avatarSize,- left: "10%",- maxHeight: 36,- maxWidth: 36,- overflow: "hidden",- p: 0,- position: "absolute",- width: avatarSize,- zIndex: 2,- }}- >- {isAvatarPending ? (- <Skeleton- variant="circular"- sx={{- bgcolor: mediaPlaceholderColor,- height: "100%",- transform: "none",- width: "100%",- }}- />- ) : displayAvatarUrl ? (- <SpaceAvatarImage aria-hidden src={displayAvatarUrl} />- ) : (- <Box- aria-hidden- sx={{- alignItems: "center",- bgcolor: avatarFallbackColor,- color: avatarFallbackTextColor,- display: "flex",- fontSize: 14,- fontWeight: 700,- height: "100%",- justifyContent: "center",- width: "100%",- }}- >- {initial}- </Box>- )}- </Box>- )}+ {friendRequestDirection != "received" &&+ !isAvatarPending &&+ decodedAvatar.ready && (+ <Box+ component="button"+ type="button"+ aria-label={+ friendRequestDirection == "sent"+ ? `Manage friend request sent to ${firstName}`+ : `Open ${firstName}'s profile`+ }+ disabled={!canOpenFriend || isFriendRequestActionBusy}+ onClick={openFriend}+ sx={{+ appearance: "none",+ bgcolor: "transparent",+ border: displayAvatarUrl+ ? "2px solid rgba(255, 255, 255, 0.36)"+ : "2px solid rgba(255, 255, 255, 0.28)",+ borderRadius: "50%",+ bottom: "10%",+ boxSizing: "border-box",+ cursor: canOpenFriend ? "pointer" : "default",+ height: avatarSize,+ left: "10%",+ maxHeight: 36,+ maxWidth: 36,+ overflow: "hidden",+ p: 0,+ position: "absolute",+ width: avatarSize,+ zIndex: 2,+ }}+ >+ {displayAvatarUrl ? (+ <SpaceAvatarImage+ aria-hidden+ src={displayAvatarUrl}+ />+ ) : (+ <Box+ aria-hidden+ sx={{+ alignItems: "center",+ bgcolor: avatarFallbackColor,+ color: avatarFallbackTextColor,+ display: "flex",+ fontSize: 14,+ fontWeight: 700,+ height: "100%",+ justifyContent: "center",+ width: "100%",+ }}+ >+ {initial}+ </Box>+ )}+ </Box>+ )}{friendRequestDirection == "received" && (<Boxsx={{@@ -1759,7 +1752,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({width: "100%",}}>- {isHomeItemsLoading && orderedHomeItems.length == 0 ? (+ {isHomeItemsLoading ? (<Boxsx={{alignItems: "center",diff --git a/web/apps/space/src/services/home-items.ts b/web/apps/space/src/services/home-items.tsnew file mode 100644index 0000000000..d862fb1737--- /dev/null+++ b/web/apps/space/src/services/home-items.ts@@ -0,0 +1,77 @@+import type { FriendProfile } from "data/friends";+import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";+import { getKV, removeKV, setKV } from "ente-base/kv";+import log from "ente-base/log";+import { apiOrigin } from "ente-base/origins";+import type { SpaceFriendRequest } from "services/space";+import { z } from "zod";++const CachedFriendProfile = z.object({+ avatarKeyVersion: z.number().optional(),+ avatarObjectID: z.string().optional(),+ avatarSize: z.number().optional(),+ avatarUpdatedAt: z.string().optional(),+ friendsCount: z.number(),+ fullName: z.string(),+ id: z.string(),+ username: z.string(),+ spaceId: z.string().optional(),+});++const SpaceHomeItems = z.object({+ friends: CachedFriendProfile.array(),+ friendRequests: z+ .object({+ direction: z.enum(["received", "sent"]),+ friend: CachedFriendProfile,+ requestId: z.number(),+ })+ .array(),+});++const homeItemsKey = async (viewerSpaceId: string) => {+ const userID = savedPartialLocalUser()?.id;+ if (!userID) return undefined;+ return [+ "space-home-items",+ "v1",+ await apiOrigin(),+ userID,+ viewerSpaceId,+ ].join(":");+};++export const loadCachedSpaceHomeItems = async (viewerSpaceId: string) => {+ try {+ const key = await homeItemsKey(viewerSpaceId);+ if (!key) return undefined;+ const parsed = SpaceHomeItems.safeParse(await getKV(key));+ return parsed.success ? parsed.data : undefined;+ } catch (error) {+ log.warn("Failed to read Space home items cache", error);+ return undefined;+ }+};++export const cacheSpaceHomeItems = async (+ viewerSpaceId: string,+ friends: FriendProfile[],+ friendRequests: SpaceFriendRequest[],+) => {+ try {+ const key = await homeItemsKey(viewerSpaceId);+ if (key)+ await setKV(key, SpaceHomeItems.parse({ friends, friendRequests }));+ } catch (error) {+ log.warn("Failed to persist Space home items cache", error);+ }+};++export const clearCachedSpaceHomeItems = async (viewerSpaceId: string) => {+ try {+ const key = await homeItemsKey(viewerSpaceId);+ if (key) await removeKV(key);+ } catch (error) {+ log.warn("Failed to clear Space home items cache", error);+ }+};diff --git a/web/apps/space/src/services/space.ts b/web/apps/space/src/services/space.tsindex bb806638c2..6cf55d6060 100644--- a/web/apps/space/src/services/space.ts+++ b/web/apps/space/src/services/space.ts@@ -8,6 +8,7 @@ import {type SpaceAccountCtxHandle,type SpaceLinkCtxHandle,} from "ente-space-wasm";+import { clearCachedSpaceHomeItems } from "services/home-items";import type { PendingSpaceInvite } from "services/invite";import {cachedSpaceMediaBlobURL,@@ -1033,6 +1034,7 @@ export const requestFriendByUsername = async ({).requestFriendByUsername(spaceId, spaceUsername)) as {status?: string;};+ await clearCachedSpaceHomeItems(spaceId);return response.status == "friend" ? "friend" : "requested";} finally {releaseCurrentSpaceContext(ctx);@@ -1170,6 +1172,7 @@ export const removeCurrentSpaceFriend = async (const ctx = await ensureCurrentSpaceContext();try {await ctx.removeFriendBySpace(actorSpaceId, spaceId);+ await clearCachedSpaceHomeItems(actorSpaceId);await clearSpaceMediaCache();clearSpaceFriendsCache();} finally {@@ -1301,18 +1304,25 @@ export const loadCurrentFriendAvatarURL = async (return null;}+ const avatar = {+ keyVersion: friend.avatarKeyVersion,+ objectID: friend.avatarObjectID,+ size: friend.avatarSize,+ updatedAt: friend.avatarUpdatedAt,+ };+ const cachedAvatarURL = await cachedAccountAvatarURLIfPresent(+ friend.spaceId,+ avatar,+ );+ if (cachedAvatarURL) return cachedAvatarURL;+const profile = await loadExistingSpaceProfile();const ctx = await ensureCurrentSpaceContext();try {return await accountAvatarURL(ctx,friend.spaceId,- {- keyVersion: friend.avatarKeyVersion,- objectID: friend.avatarObjectID,- size: friend.avatarSize,- updatedAt: friend.avatarUpdatedAt,- },+ avatar,profile?.spaceId,);} finally {@@ -1621,6 +1631,12 @@ export const confirmCurrentFriendRequest = async (BigInt(requestId),);clearSpaceFriendsCache();+ await clearCachedSpaceHomeItems(spaceId);+ } catch (error) {+ if (isFriendRequestCanceledError(error)) {+ await clearCachedSpaceHomeItems(spaceId);+ }+ throw error;} finally {releaseCurrentSpaceContext(ctx);}@@ -1653,6 +1669,12 @@ export const deleteCurrentFriendRequest = async (spaceId,BigInt(requestId),);+ await clearCachedSpaceHomeItems(spaceId);+ } catch (error) {+ if (isFriendRequestCanceledError(error)) {+ await clearCachedSpaceHomeItems(spaceId);+ }+ throw error;} finally {releaseCurrentSpaceContext(ctx);}