Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Load Space avatar from cache on startup

Anand Baburajand1b0e21e7e18
diff --git a/web/apps/space/src/screens/HomeScreen.tsx b/web/apps/space/src/screens/HomeScreen.tsx
index 3dc5216b84..6806e62995 100644
--- a/web/apps/space/src/screens/HomeScreen.tsx
+++ b/web/apps/space/src/screens/HomeScreen.tsx
@@ -72,6 +72,11 @@ const feedHorizontalPadding = "16px";
const minimumFeedPhotoFrameAspectRatio = 3 / 4;
const feedMediaLoadRootMargin = "640px 0px";
const feedLoadMoreRootMargin = "0px 0px 160px 0px";
+const avatarFadeSx = {
+ "@keyframes spaceAvatarFade": { from: { opacity: 0 }, to: { opacity: 1 } },
+ animation: "spaceAvatarFade 320ms cubic-bezier(0.22, 1, 0.36, 1) both",
+ "@media (prefers-reduced-motion: reduce)": { animation: "none" },
+} as const;
const feedCaptionTextSx = {
color: textBase,
fontFamily: '"Inter Variable", Inter, sans-serif',
@@ -875,21 +880,13 @@ const FeedItem: React.FC<FeedItemProps> = ({
<Box
key={displayAvatarUrl ?? "default-avatar"}
sx={{
- "@keyframes spaceFeedAvatarFade": {
- from: { opacity: 0 },
- to: { opacity: 1 },
- },
- animation:
- "spaceFeedAvatarFade 320ms cubic-bezier(0.22, 1, 0.36, 1) both",
+ ...avatarFadeSx,
borderRadius: "50%",
height: feedAvatarSize,
overflow: "hidden",
position: "relative",
width: feedAvatarSize,
zIndex: 1,
- "@media (prefers-reduced-motion: reduce)": {
- animation: "none",
- },
}}
>
<SpaceAvatarImage
@@ -1859,10 +1856,19 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
>
{profile &&
(profile.avatarUrl || !profile.avatarObjectID) ? (
- <SpaceAvatarImage
- src={profile.avatarUrl}
- borderRadius="50%"
- />
+ <Box
+ key={profile.avatarUrl ?? "default-avatar"}
+ sx={{
+ ...avatarFadeSx,
+ height: "100%",
+ width: "100%",
+ }}
+ >
+ <SpaceAvatarImage
+ src={profile.avatarUrl}
+ borderRadius="50%"
+ />
+ </Box>
) : (
<Skeleton
variant="circular"
diff --git a/web/apps/space/src/services/spaceMediaCache.ts b/web/apps/space/src/services/spaceMediaCache.ts
index e67e419289..38f8a559ea 100644
--- a/web/apps/space/src/services/spaceMediaCache.ts
+++ b/web/apps/space/src/services/spaceMediaCache.ts
@@ -111,6 +111,26 @@ export const cachedSpaceMediaBlobURL = async (
return promise;
};
+export const cachedSpaceMediaBlobURLIfPresent = async (cacheKey: string) => {
+ const storageKey = await spaceMediaStorageKey(cacheKey);
+ const cached = spaceMediaURLCache.get(storageKey);
+ if (cached) {
+ spaceMediaURLCache.delete(storageKey);
+ spaceMediaURLCache.set(storageKey, cached);
+ return await cached;
+ }
+
+ const blob = await cachedSpaceMediaBlob(storageKey);
+ const loadedWhileReading = spaceMediaURLCache.get(storageKey);
+ if (loadedWhileReading) return await loadedWhileReading;
+ if (!blob) return undefined;
+
+ const url = URL.createObjectURL(blob);
+ spaceMediaURLCache.set(storageKey, Promise.resolve(url));
+ trimSpaceMediaURLCache();
+ return url;
+};
+
export const rememberCachedSpaceMediaBlobURL = async (
cacheKey: string,
blob: Blob,
diff --git a/web/apps/space/src/services/spacePersistentSession.ts b/web/apps/space/src/services/spacePersistentSession.ts
index e34cee8095..dd9b3a6566 100644
--- a/web/apps/space/src/services/spacePersistentSession.ts
+++ b/web/apps/space/src/services/spacePersistentSession.ts
@@ -41,11 +41,19 @@ const OwnedSpace = z.object({
const OwnedSpaces = OwnedSpace.array();
export type OwnedSpace = z.infer<typeof OwnedSpace>;
+const SpaceProfileAvatar = z.object({
+ keyVersion: z.number(),
+ objectID: z.string(),
+ spaceId: z.string(),
+});
+export type SpaceProfileAvatar = z.infer<typeof SpaceProfileAvatar>;
+
const PersistedSpaceBrowserSession = z.object({
encryptedSpaceRootKey: z.string(),
email: z.string(),
nonce: z.string(),
ownedSpaces: OwnedSpaces.optional(),
+ profileAvatar: SpaceProfileAvatar.optional(),
sessionToken: z.string(),
userId: z.number(),
});
@@ -145,6 +153,9 @@ export const savedSpaceSessionToken = () =>
export const savedSpaceOwnedSpaces = () => savedPersistedSession()?.ownedSpaces;
+export const savedSpaceProfileAvatar = () =>
+ savedPersistedSession()?.profileAvatar;
+
export const saveSpaceOwnedSpaces = (
sessionToken: string,
ownedSpaces: OwnedSpace[],
@@ -160,6 +171,18 @@ export const saveSpaceOwnedSpaces = (
);
};
+export const saveSpaceProfileAvatar = (
+ sessionToken: string,
+ profileAvatar: SpaceProfileAvatar | undefined,
+) => {
+ const persisted = savedPersistedSession();
+ if (persisted?.sessionToken != sessionToken) return;
+ localStorage.setItem(
+ spaceBrowserSessionStorageKey,
+ JSON.stringify({ ...persisted, profileAvatar }),
+ );
+};
+
const forgetBootstrapToken = async () => {
const user = savedPartialLocalUser();
if (user?.id && user.email) {
diff --git a/web/apps/space/src/services/spaceProfile.ts b/web/apps/space/src/services/spaceProfile.ts
index cb29bfa37f..28640f1605 100644
--- a/web/apps/space/src/services/spaceProfile.ts
+++ b/web/apps/space/src/services/spaceProfile.ts
@@ -8,14 +8,17 @@ import type {
} from "screens/SetupProfileScreen";
import {
cachedSpaceMediaBlobURL,
+ cachedSpaceMediaBlobURLIfPresent,
rememberCachedSpaceMediaBlobURL,
spaceProfileMediaCacheKey,
} from "services/spaceMediaCache";
import {
restoreSpaceBrowserSessionIfNeeded,
savedSpaceOwnedSpaces,
+ savedSpaceProfileAvatar,
savedSpaceSessionToken,
saveSpaceOwnedSpaces,
+ saveSpaceProfileAvatar,
type OwnedSpace,
} from "services/spacePersistentSession";
import {
@@ -322,6 +325,22 @@ const profileFromDecryptedSpaceProfile = (
};
};
+const persistSpaceProfileAvatar = (profile: SetupProfile) => {
+ const sessionToken = savedSpaceSessionToken();
+ if (!sessionToken) return;
+ const { avatarKeyVersion, avatarObjectID, spaceId } = profile;
+ saveSpaceProfileAvatar(
+ sessionToken,
+ avatarKeyVersion && avatarObjectID && spaceId
+ ? {
+ keyVersion: avatarKeyVersion,
+ objectID: avatarObjectID,
+ spaceId,
+ }
+ : undefined,
+ );
+};
+
const loadExistingOwnedSpace = async () => {
const config = await currentSpaceContextConfig();
if (!config) return undefined;
@@ -385,7 +404,9 @@ export const loadExistingSpaceProfile = async (options?: {
space.spaceId,
)) as DecryptedSpaceProfile;
await persistCurrentOwnedSpaces(ctx);
- return profileFromDecryptedSpaceProfile(spaceProfile);
+ const profile = profileFromDecryptedSpaceProfile(spaceProfile);
+ persistSpaceProfileAvatar(profile);
+ return profile;
})();
const pendingProfile = { cacheKey: config.cacheKey, promise };
@@ -403,6 +424,21 @@ export const loadExistingSpaceProfile = async (options?: {
}
};
+export const loadCachedCurrentSpaceAvatar = async () => {
+ const avatar = savedSpaceProfileAvatar();
+ if (!avatar) return undefined;
+ await restoreSpaceBrowserSessionIfNeeded();
+ const avatarUrl = await cachedSpaceMediaBlobURLIfPresent(
+ spaceProfileMediaCacheKey(
+ avatar.spaceId,
+ "avatar",
+ avatar.objectID,
+ avatar.keyVersion,
+ ),
+ );
+ return avatarUrl ? { ...avatar, avatarUrl } : undefined;
+};
+
export const loadExistingSpaceAvatar = async (
spaceId: string | undefined,
avatarObjectID: string | undefined,
@@ -582,6 +618,7 @@ export const saveSpaceProfile = async (
spaceId,
spaceSlug,
};
+ persistSpaceProfileAvatar(savedProfile);
currentSpaceProfile = undefined;
pendingCurrentSpaceProfile = undefined;
return savedProfile;
diff --git a/web/apps/space/src/state/SpaceAppStateProvider.tsx b/web/apps/space/src/state/SpaceAppStateProvider.tsx
index f7b5f9c0a3..45a72d7f1d 100644
--- a/web/apps/space/src/state/SpaceAppStateProvider.tsx
+++ b/web/apps/space/src/state/SpaceAppStateProvider.tsx
@@ -16,6 +16,7 @@ import { logoutRevokedSpaceSession } from "services/spacePersistentSession";
import {
clearCurrentSpaceContext,
isSpaceSessionUnauthorized,
+ loadCachedCurrentSpaceAvatar,
loadExistingSpaceAvatar,
loadExistingSpaceCover,
loadExistingSpaceProfile,
@@ -176,14 +177,26 @@ export const SpaceAppStateProvider: React.FC<React.PropsWithChildren> = ({
setProfileLoadStatus("loading");
try {
- const nextProfile = await loadExistingSpaceProfile({
- force: true,
- });
+ const [nextProfile, cachedAvatar] = await Promise.all([
+ loadExistingSpaceProfile({ force: true }),
+ loadCachedCurrentSpaceAvatar(),
+ ]);
if (profileLoadGenerationRef.current == generation) {
+ const hydratedProfile =
+ nextProfile &&
+ cachedAvatar &&
+ cachedAvatar.spaceId == nextProfile.spaceId &&
+ cachedAvatar.objectID == nextProfile.avatarObjectID &&
+ cachedAvatar.keyVersion == nextProfile.avatarKeyVersion
+ ? {
+ ...nextProfile,
+ avatarUrl: cachedAvatar.avatarUrl,
+ }
+ : nextProfile;
setProfileLoadError(undefined);
- applyProfile(nextProfile);
- void loadProfileAvatar(nextProfile, generation);
- void loadProfileCover(nextProfile, generation);
+ applyProfile(hydratedProfile);
+ void loadProfileAvatar(hydratedProfile, generation);
+ void loadProfileCover(hydratedProfile, generation);
setProfileLoadStatus("ready");
}
return nextProfile;