Cache profile fields and assets behind one shared store.
Trigger cinny-mobile / dispatch (push) Successful in 1s
Trigger cinny-mobile / dispatch (push) Successful in 1s
Colour, banner, collectibles, and profile each read the same extended profile endpoint through separate caches with mismatched TTLs, so a single profile view fired three round trips. They now read through one cache with a shared TTL and in-flight dedupe, and profile media is kept as blob URLs instead of being re-downloaded per mount. useUserProfile now prefers the SDK's sync-cached user and only fetches when both the SDK and the cache are cold.
This commit is contained in:
@@ -1,14 +1,13 @@
|
||||
import { useCallback, useEffect, useState } from 'react';
|
||||
import { useMatrixClient } from './useMatrixClient';
|
||||
import { useMediaAuthentication } from './useMediaAuthentication';
|
||||
import { mxcUrlToHttp } from '../utils/matrix';
|
||||
import { getCurrentAccessToken } from '../utils/auth';
|
||||
import {
|
||||
extractBannerUrlFromProfile,
|
||||
deleteBannerUrl,
|
||||
loadBannerUrl,
|
||||
registerBannerCacheClear,
|
||||
saveBannerUrl,
|
||||
} from '../utils/profileFields';
|
||||
import { getProfileFields, registerProfileCacheListener } from '../utils/profileCache';
|
||||
import { getProfileAssetUrl } from '../utils/profileAssetCache';
|
||||
|
||||
/**
|
||||
* Hook to manage the user's profile banner (MSC4427 via MSC4133).
|
||||
@@ -34,7 +33,7 @@ export function useUserBanner(): [
|
||||
const load = async () => {
|
||||
setLoading(true);
|
||||
try {
|
||||
const bannerMxc = await loadBannerUrl(mx, userId);
|
||||
const bannerMxc = extractBannerUrlFromProfile(await getProfileFields(mx, userId));
|
||||
if (!cancelled) setBanner(bannerMxc);
|
||||
} catch {
|
||||
if (!cancelled) setBanner(undefined);
|
||||
@@ -65,40 +64,15 @@ export function useUserBanner(): [
|
||||
return [banner, updateBanner, loading];
|
||||
}
|
||||
|
||||
const userBannerCache = new Map<string, { bannerMxc: string | undefined; timestamp: number }>();
|
||||
const CACHE_TTL_MS = 5 * 60 * 1000;
|
||||
|
||||
registerBannerCacheClear((userId: string) => {
|
||||
userBannerCache.delete(userId);
|
||||
});
|
||||
|
||||
async function fetchBannerBlobUrl(
|
||||
mx: ReturnType<typeof useMatrixClient>,
|
||||
bannerMxc: string,
|
||||
useAuthentication: boolean
|
||||
): Promise<string | undefined> {
|
||||
const bannerHttpUrl = mxcUrlToHttp(mx, bannerMxc, useAuthentication);
|
||||
if (!bannerHttpUrl) return undefined;
|
||||
|
||||
const accessToken = getCurrentAccessToken();
|
||||
const headers: HeadersInit = {};
|
||||
if (useAuthentication && accessToken) {
|
||||
headers.Authorization = `Bearer ${accessToken}`;
|
||||
}
|
||||
|
||||
const response = await fetch(bannerHttpUrl, { headers });
|
||||
if (!response.ok) return undefined;
|
||||
|
||||
const blob = await response.blob();
|
||||
return URL.createObjectURL(blob);
|
||||
}
|
||||
|
||||
/**
|
||||
* Hook to get another user's profile banner as a blob URL.
|
||||
* Profile fields come from the shared profile cache, and the media itself is
|
||||
* cached so reopening the same profile does not re-download the banner.
|
||||
*/
|
||||
export function useOtherUserBanner(userId: string): string | undefined {
|
||||
const mx = useMatrixClient();
|
||||
const useAuthentication = useMediaAuthentication();
|
||||
|
||||
const [bannerBlobUrl, setBannerBlobUrl] = useState<string | undefined>();
|
||||
|
||||
useEffect(() => {
|
||||
@@ -107,34 +81,31 @@ export function useOtherUserBanner(userId: string): string | undefined {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
let blobUrl: string | undefined;
|
||||
let cancelled = false;
|
||||
|
||||
const load = async () => {
|
||||
const cached = userBannerCache.get(userId);
|
||||
let bannerMxc: string | undefined;
|
||||
|
||||
if (cached && Date.now() - cached.timestamp < CACHE_TTL_MS) {
|
||||
bannerMxc = cached.bannerMxc;
|
||||
} else {
|
||||
bannerMxc = await loadBannerUrl(mx, userId);
|
||||
userBannerCache.set(userId, { bannerMxc, timestamp: Date.now() });
|
||||
}
|
||||
const fields = await getProfileFields(mx, userId);
|
||||
if (cancelled) return;
|
||||
|
||||
const bannerMxc = extractBannerUrlFromProfile(fields);
|
||||
if (!bannerMxc) {
|
||||
if (!cancelled) setBannerBlobUrl(undefined);
|
||||
setBannerBlobUrl(undefined);
|
||||
return;
|
||||
}
|
||||
|
||||
blobUrl = await fetchBannerBlobUrl(mx, bannerMxc, useAuthentication);
|
||||
const blobUrl = await getProfileAssetUrl(mx, bannerMxc, useAuthentication);
|
||||
if (!cancelled) setBannerBlobUrl(blobUrl);
|
||||
};
|
||||
|
||||
const unsubscribe = registerProfileCacheListener((changedUserId) => {
|
||||
if (changedUserId === userId) load();
|
||||
});
|
||||
|
||||
load();
|
||||
|
||||
return () => {
|
||||
cancelled = true;
|
||||
if (blobUrl) URL.revokeObjectURL(blobUrl);
|
||||
unsubscribe();
|
||||
};
|
||||
}, [mx, useAuthentication, userId]);
|
||||
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
import { useCallback, useEffect, useState } from 'react';
|
||||
import { useMatrixClient } from './useMatrixClient';
|
||||
import { useMediaAuthentication } from './useMediaAuthentication';
|
||||
import { mxcUrlToHttp } from '../utils/matrix';
|
||||
import { getCurrentAccessToken } from '../utils/auth';
|
||||
import {
|
||||
CollectibleProfileFields,
|
||||
StoredCollectible,
|
||||
loadUserCollectibles,
|
||||
extractCollectiblesFromProfile,
|
||||
saveAvatarDecoration,
|
||||
saveNameplate,
|
||||
saveProfileEffect,
|
||||
} from '../utils/profileFields';
|
||||
import { clearProfileCache, getCachedProfileFields, getProfileFields, registerProfileCacheListener } from '../utils/profileCache';
|
||||
import { getProfileAssetUrl } from '../utils/profileAssetCache';
|
||||
import { CollectibleKind } from '../utils/discordCollectibles';
|
||||
|
||||
export function useUserCollectibles(): [
|
||||
@@ -34,7 +34,7 @@ export function useUserCollectibles(): [
|
||||
const load = async () => {
|
||||
setLoading(true);
|
||||
try {
|
||||
const data = await loadUserCollectibles(mx, userId);
|
||||
const data = extractCollectiblesFromProfile(await getProfileFields(mx, userId));
|
||||
if (!cancelled) setCollectibles(data);
|
||||
} catch {
|
||||
if (!cancelled) setCollectibles({});
|
||||
@@ -52,19 +52,14 @@ export function useUserCollectibles(): [
|
||||
async (kind: CollectibleKind, collectible: StoredCollectible | undefined) => {
|
||||
if (kind === 'profile_effect') {
|
||||
await saveProfileEffect(mx, collectible);
|
||||
clearUserCollectiblesCache(mx.getUserId());
|
||||
setCollectibles((prev) => ({ ...prev, profile_effect: collectible }));
|
||||
return;
|
||||
}
|
||||
if (kind === 'nameplate') {
|
||||
} else if (kind === 'nameplate') {
|
||||
await saveNameplate(mx, collectible);
|
||||
clearUserCollectiblesCache(mx.getUserId());
|
||||
setCollectibles((prev) => ({ ...prev, nameplate: collectible }));
|
||||
return;
|
||||
} else {
|
||||
await saveAvatarDecoration(mx, collectible);
|
||||
}
|
||||
await saveAvatarDecoration(mx, collectible);
|
||||
clearUserCollectiblesCache(mx.getUserId());
|
||||
setCollectibles((prev) => ({ ...prev, avatar_decoration: collectible }));
|
||||
|
||||
clearProfileCache(mx.getUserId());
|
||||
setCollectibles((prev) => ({ ...prev, [kind]: collectible }));
|
||||
},
|
||||
[mx]
|
||||
);
|
||||
@@ -72,55 +67,21 @@ export function useUserCollectibles(): [
|
||||
return [collectibles, updateCollectible, loading];
|
||||
}
|
||||
|
||||
const collectibleCache = new Map<string, { data: CollectibleProfileFields; timestamp: number }>();
|
||||
const collectibleCacheListeners = new Set<(userId: string) => void>();
|
||||
const CACHE_TTL_MS = 5 * 60 * 1000;
|
||||
|
||||
export function clearUserCollectiblesCache(userId?: string): void {
|
||||
if (!userId) return;
|
||||
collectibleCache.delete(userId);
|
||||
collectibleCacheListeners.forEach((listener) => listener(userId));
|
||||
}
|
||||
|
||||
async function fetchMxcBlobUrl(
|
||||
mx: ReturnType<typeof useMatrixClient>,
|
||||
mxc: string,
|
||||
useAuthentication: boolean
|
||||
): Promise<string | undefined> {
|
||||
const httpUrl = mxcUrlToHttp(mx, mxc, useAuthentication);
|
||||
if (!httpUrl) return undefined;
|
||||
|
||||
const accessToken = getCurrentAccessToken();
|
||||
const headers: HeadersInit = {};
|
||||
if (useAuthentication && accessToken) {
|
||||
headers.Authorization = `Bearer ${accessToken}`;
|
||||
}
|
||||
|
||||
const response = await fetch(httpUrl, { headers });
|
||||
if (!response.ok) return undefined;
|
||||
|
||||
const blob = await response.blob();
|
||||
return URL.createObjectURL(blob);
|
||||
}
|
||||
|
||||
/**
|
||||
* Shared profile fields for another user, served from the profile cache so a
|
||||
* timeline of many messages by the same author resolves one request per user.
|
||||
*/
|
||||
export function useOtherUserCollectibles(userId: string): CollectibleProfileFields & {
|
||||
assetUrls: Record<string, string | undefined>;
|
||||
} {
|
||||
const mx = useMatrixClient();
|
||||
const useAuthentication = useMediaAuthentication();
|
||||
const [collectibles, setCollectibles] = useState<CollectibleProfileFields>({});
|
||||
const [assetUrls, setAssetUrls] = useState<Record<string, string | undefined>>({});
|
||||
const [cacheVersion, setCacheVersion] = useState(0);
|
||||
|
||||
useEffect(() => {
|
||||
const handleCacheClear = (clearedUserId: string) => {
|
||||
if (clearedUserId === userId) {
|
||||
setCacheVersion((version) => version + 1);
|
||||
}
|
||||
};
|
||||
collectibleCacheListeners.add(handleCacheClear);
|
||||
return () => collectibleCacheListeners.delete(handleCacheClear);
|
||||
}, [userId]);
|
||||
const [collectibles, setCollectibles] = useState<CollectibleProfileFields>(() => {
|
||||
const cached = getCachedProfileFields(userId);
|
||||
return cached ? extractCollectiblesFromProfile(cached) : {};
|
||||
});
|
||||
const [assetUrls, setAssetUrls] = useState<Record<string, string | undefined>>({});
|
||||
|
||||
useEffect(() => {
|
||||
if (!userId) {
|
||||
@@ -130,19 +91,9 @@ export function useOtherUserCollectibles(userId: string): CollectibleProfileFiel
|
||||
}
|
||||
|
||||
let cancelled = false;
|
||||
const blobUrls: string[] = [];
|
||||
|
||||
const load = async () => {
|
||||
const cached = collectibleCache.get(userId);
|
||||
let data: CollectibleProfileFields;
|
||||
|
||||
if (cached && Date.now() - cached.timestamp < CACHE_TTL_MS) {
|
||||
data = cached.data;
|
||||
} else {
|
||||
data = await loadUserCollectibles(mx, userId);
|
||||
collectibleCache.set(userId, { data, timestamp: Date.now() });
|
||||
}
|
||||
|
||||
const data = extractCollectiblesFromProfile(await getProfileFields(mx, userId));
|
||||
if (cancelled) return;
|
||||
setCollectibles(data);
|
||||
|
||||
@@ -156,24 +107,25 @@ export function useOtherUserCollectibles(userId: string): CollectibleProfileFiel
|
||||
for (const [kind, collectible] of entries) {
|
||||
if (!collectible) continue;
|
||||
for (const [role, mxc] of Object.entries(collectible.assets)) {
|
||||
const blobUrl = await fetchMxcBlobUrl(mx, mxc, useAuthentication);
|
||||
if (blobUrl) {
|
||||
blobUrls.push(blobUrl);
|
||||
urls[`${kind}:${role}`] = blobUrl;
|
||||
}
|
||||
const blobUrl = await getProfileAssetUrl(mx, mxc, useAuthentication);
|
||||
if (blobUrl) urls[`${kind}:${role}`] = blobUrl;
|
||||
}
|
||||
}
|
||||
|
||||
if (!cancelled) setAssetUrls(urls);
|
||||
};
|
||||
|
||||
const unsubscribe = registerProfileCacheListener((changedUserId) => {
|
||||
if (changedUserId === userId) load();
|
||||
});
|
||||
|
||||
load();
|
||||
|
||||
return () => {
|
||||
cancelled = true;
|
||||
blobUrls.forEach((url) => URL.revokeObjectURL(url));
|
||||
unsubscribe();
|
||||
};
|
||||
}, [cacheVersion, mx, useAuthentication, userId]);
|
||||
}, [mx, useAuthentication, userId]);
|
||||
|
||||
return { ...collectibles, assetUrls };
|
||||
}
|
||||
|
||||
@@ -5,13 +5,13 @@ import { ThemeKind, useTheme } from './useTheme';
|
||||
import {
|
||||
ColorPreference,
|
||||
deleteColorPreference,
|
||||
extractColorPreferenceFromProfile,
|
||||
extractMemberColorPreference,
|
||||
hasColorPreference,
|
||||
loadColorPreference,
|
||||
registerPreferenceCacheClear,
|
||||
resolveColorForTheme,
|
||||
saveColorPreference,
|
||||
} from '../utils/profileFields';
|
||||
import { getCachedProfileFields, getProfileFields, registerProfileCacheListener } from '../utils/profileCache';
|
||||
|
||||
/**
|
||||
* Hook to manage the user's MSC4522 color preference on their global profile.
|
||||
@@ -37,7 +37,7 @@ export function useUserColorPreference(): [
|
||||
const load = async () => {
|
||||
setLoading(true);
|
||||
try {
|
||||
const loaded = await loadColorPreference(mx, userId);
|
||||
const loaded = extractColorPreferenceFromProfile(await getProfileFields(mx, userId));
|
||||
if (!cancelled) setPreference(loaded);
|
||||
} catch (e) {
|
||||
console.error('Failed to load color preference:', e);
|
||||
@@ -69,80 +69,48 @@ export function useUserColorPreference(): [
|
||||
return [preference, updatePreference, loading];
|
||||
}
|
||||
|
||||
class LRUCache<K, V> {
|
||||
private cache = new Map<K, V>();
|
||||
|
||||
constructor(private maxSize: number) {}
|
||||
|
||||
get(key: K): V | undefined {
|
||||
const value = this.cache.get(key);
|
||||
if (value !== undefined) {
|
||||
this.cache.delete(key);
|
||||
this.cache.set(key, value);
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
set(key: K, value: V): void {
|
||||
if (this.cache.has(key)) {
|
||||
this.cache.delete(key);
|
||||
} else if (this.cache.size >= this.maxSize) {
|
||||
const firstKey = this.cache.keys().next().value;
|
||||
if (firstKey !== undefined) this.cache.delete(firstKey);
|
||||
}
|
||||
this.cache.set(key, value);
|
||||
}
|
||||
|
||||
delete(key: K): void {
|
||||
this.cache.delete(key);
|
||||
}
|
||||
}
|
||||
|
||||
const preferenceCache = new LRUCache<string, { preference: ColorPreference | undefined; timestamp: number }>(200);
|
||||
const CACHE_TTL_MS = 30 * 60 * 1000;
|
||||
|
||||
registerPreferenceCacheClear((userId: string) => {
|
||||
preferenceCache.delete(userId);
|
||||
});
|
||||
|
||||
/**
|
||||
* Hook to get another user's MSC4522 color preference from their global profile.
|
||||
* Reads through the shared profile cache so the same request is not repeated for
|
||||
* every message, reply, or profile view by the same user.
|
||||
*/
|
||||
export function useOtherUserColorPreference(userId: string): ColorPreference | undefined {
|
||||
const mx = useMatrixClient();
|
||||
const cachedEntry = preferenceCache.get(userId);
|
||||
const cachedPreference =
|
||||
cachedEntry && Date.now() - cachedEntry.timestamp < CACHE_TTL_MS ? cachedEntry.preference : undefined;
|
||||
|
||||
const [preference, setPreference] = useState<ColorPreference | undefined>(cachedPreference);
|
||||
const [preference, setPreference] = useState<ColorPreference | undefined>(() => {
|
||||
const cached = getCachedProfileFields(userId);
|
||||
return cached ? extractColorPreferenceFromProfile(cached) : undefined;
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
if (!userId) {
|
||||
setPreference(undefined);
|
||||
return;
|
||||
}
|
||||
|
||||
const cached = preferenceCache.get(userId);
|
||||
if (cached && Date.now() - cached.timestamp < CACHE_TTL_MS) {
|
||||
setPreference(cached.preference);
|
||||
return;
|
||||
return undefined;
|
||||
}
|
||||
|
||||
let cancelled = false;
|
||||
|
||||
const load = async () => {
|
||||
try {
|
||||
const loaded = await loadColorPreference(mx, userId);
|
||||
preferenceCache.set(userId, { preference: loaded, timestamp: Date.now() });
|
||||
if (!cancelled) setPreference(loaded);
|
||||
} catch {
|
||||
if (!cancelled) setPreference(undefined);
|
||||
}
|
||||
const apply = (fields: Record<string, unknown>) => {
|
||||
if (cancelled) return;
|
||||
setPreference(extractColorPreferenceFromProfile(fields));
|
||||
};
|
||||
|
||||
load();
|
||||
const unsubscribe = registerProfileCacheListener((changedUserId) => {
|
||||
if (changedUserId === userId) {
|
||||
const fields = getCachedProfileFields(userId);
|
||||
if (fields) apply(fields);
|
||||
}
|
||||
});
|
||||
|
||||
getProfileFields(mx, userId)
|
||||
.then(apply)
|
||||
.catch(() => {
|
||||
if (!cancelled) setPreference(undefined);
|
||||
});
|
||||
|
||||
return () => {
|
||||
cancelled = true;
|
||||
unsubscribe();
|
||||
};
|
||||
}, [mx, userId]);
|
||||
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { UserEvent, UserEventHandlerMap } from 'matrix-js-sdk';
|
||||
import { useMatrixClient } from './useMatrixClient';
|
||||
import { getCachedProfileFields, getProfileFields, registerProfileCacheListener } from '../utils/profileCache';
|
||||
|
||||
export type UserProfile = {
|
||||
avatarUrl?: string;
|
||||
displayName?: string;
|
||||
};
|
||||
|
||||
export const useUserProfile = (userId: string): UserProfile => {
|
||||
const mx = useMatrixClient();
|
||||
|
||||
@@ -18,8 +20,33 @@ export const useUserProfile = (userId: string): UserProfile => {
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
if (!userId) return undefined;
|
||||
|
||||
const user = mx.getUser(userId);
|
||||
const onAvatarChange: UserEventHandlerMap[UserEvent.AvatarUrl] = (event, myUser) => {
|
||||
let disposed = false;
|
||||
|
||||
const applyFields = (fields: Record<string, unknown>) => {
|
||||
const avatarUrl = typeof fields.avatar_url === 'string' ? fields.avatar_url : undefined;
|
||||
const displayName = typeof fields.displayname === 'string' ? fields.displayname : undefined;
|
||||
if (!avatarUrl && !displayName) return;
|
||||
setProfile((cp) => ({
|
||||
avatarUrl: avatarUrl ?? cp.avatarUrl,
|
||||
displayName: displayName ?? cp.displayName,
|
||||
}));
|
||||
};
|
||||
|
||||
// The SDK already holds profile data from sync, so only hit the network when
|
||||
// both the SDK and the shared profile cache are cold.
|
||||
const cached = getCachedProfileFields(userId);
|
||||
if (cached) {
|
||||
applyFields(cached);
|
||||
} else if (!user?.displayName && !user?.avatarUrl) {
|
||||
getProfileFields(mx, userId).then((fields) => {
|
||||
if (!disposed) applyFields(fields);
|
||||
});
|
||||
}
|
||||
|
||||
const onProfileChange: UserEventHandlerMap[UserEvent.AvatarUrl] = (event, myUser) => {
|
||||
setProfile((cp) => ({
|
||||
...cp,
|
||||
avatarUrl: myUser.avatarUrl,
|
||||
@@ -32,17 +59,18 @@ export const useUserProfile = (userId: string): UserProfile => {
|
||||
}));
|
||||
};
|
||||
|
||||
mx.getProfileInfo(userId).then((info) =>
|
||||
setProfile({
|
||||
avatarUrl: info.avatar_url,
|
||||
displayName: info.displayname,
|
||||
})
|
||||
);
|
||||
const unsubscribeCache = registerProfileCacheListener((changedUserId) => {
|
||||
if (changedUserId !== userId) return;
|
||||
const fields = getCachedProfileFields(userId);
|
||||
if (fields) applyFields(fields);
|
||||
});
|
||||
|
||||
user?.on(UserEvent.AvatarUrl, onAvatarChange);
|
||||
user?.on(UserEvent.AvatarUrl, onProfileChange);
|
||||
user?.on(UserEvent.DisplayName, onDisplayNameChange);
|
||||
return () => {
|
||||
user?.removeListener(UserEvent.AvatarUrl, onAvatarChange);
|
||||
disposed = true;
|
||||
unsubscribeCache();
|
||||
user?.removeListener(UserEvent.AvatarUrl, onProfileChange);
|
||||
user?.removeListener(UserEvent.DisplayName, onDisplayNameChange);
|
||||
};
|
||||
}, [mx, userId]);
|
||||
|
||||
Reference in New Issue
Block a user