Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Update logo fetch flow (#2159)

Leendert de Borstfad680eb50f6
diff --git a/apps/browser-extension/src/entrypoints/popup/hooks/useItemLogo.ts b/apps/browser-extension/src/entrypoints/popup/hooks/useItemLogo.ts
index 87ff57ed2..3d7240080 100644
--- a/apps/browser-extension/src/entrypoints/popup/hooks/useItemLogo.ts
+++ b/apps/browser-extension/src/entrypoints/popup/hooks/useItemLogo.ts
@@ -42,12 +42,15 @@ const useItemLogo = ({ url, currentLogoKind, isReady, isExistingItem, onLogoByte
const [logoSelection, setLogoSelection] = useState<LogoSelection | undefined>(undefined);
const [isFetchingLogo, setIsFetchingLogo] = useState(false);
+ const [isResolvePending, setIsResolvePending] = useState(!isExistingItem);
const [resolvedFaviconSource, setResolvedFaviconSource] = useState<string | null>(null);
const [websiteSource, setWebsiteSource] = useState<string | null>(null);
const resolvedSourceRef = useRef<string | null>(null);
const requestIdRef = useRef(0);
const hasInitialisedRef = useRef(false);
+ const fetchedRef = useRef(new Map<string, Uint8Array | null>());
+ const fetchInFlightRef = useRef<Promise<unknown> | null>(null);
const usesWebsiteIcon = logoSelection ? usesWebsiteLogo(logoSelection) : (currentLogoKind ?? LogoKinds.Favicon) === LogoKinds.Favicon;
/**
@@ -60,40 +63,56 @@ const useItemLogo = ({ url, currentLogoKind, isReady, isExistingItem, onLogoByte
return;
}
- const target = await FaviconService.resolveTarget(url);
- const source = target?.source ?? null;
- const previousSource = resolvedSourceRef.current;
const requestId = ++requestIdRef.current;
+ setIsFetchingLogo(true);
+ try {
+ const target = await FaviconService.resolveTarget(url);
+ if (requestId !== requestIdRef.current) {
+ return;
+ }
- resolvedSourceRef.current = source;
- setResolvedFaviconSource(source);
- setLogoSelection({ Kind: LogoKinds.Favicon });
+ const source = target?.source ?? null;
+ resolvedSourceRef.current = source;
+ setResolvedFaviconSource(source);
+ setLogoSelection({ Kind: LogoKinds.Favicon });
- // Without a domain there is nothing to fetch from, so automatic means no icon at all.
- if (!target) {
- onLogoBytesChange(undefined);
- return;
- }
+ if (!target) {
+ onLogoBytesChange(undefined);
+ return;
+ }
- // The vault already holds this domain's favicon: show that one.
- if (!force) {
const stored = await FaviconService.getStoredFavicon(target, sqliteClient.logos);
if (requestId !== requestIdRef.current) {
return;
}
- if (stored) {
- onLogoBytesChange(stored);
+ onLogoBytesChange(stored ?? undefined);
+ if (stored && !force) {
return;
}
- }
- if (previousSource !== source) {
- onLogoBytesChange(undefined);
- }
+ while (fetchInFlightRef.current) {
+ await fetchInFlightRef.current;
+ if (requestId !== requestIdRef.current) {
+ return;
+ }
+ }
- setIsFetchingLogo(true);
- try {
- const result = await FaviconService.fetchFavicon(target, sqliteClient.logos, webApi, { ignoreStored: true });
+ if (!force && fetchedRef.current.has(target.source)) {
+ const cached = fetchedRef.current.get(target.source);
+ if (cached) {
+ onLogoBytesChange(cached);
+ }
+ return;
+ }
+
+ const request = FaviconService.fetchFavicon(target, sqliteClient.logos, webApi, { ignoreStored: true });
+ fetchInFlightRef.current = request;
+ const result = await request.finally(() => {
+ if (fetchInFlightRef.current === request) {
+ fetchInFlightRef.current = null;
+ }
+ });
+ fetchedRef.current.set(target.source, result.success && result.imageData ? result.imageData : null);
if (requestId !== requestIdRef.current) {
return;
}
@@ -101,8 +120,6 @@ const useItemLogo = ({ url, currentLogoKind, isReady, isExistingItem, onLogoByte
if (result.success && result.imageData) {
onLogoBytesChange(result.imageData);
setLogoSelection(force ? { Kind: LogoKinds.Favicon, Data: result.imageData } : { Kind: LogoKinds.Favicon });
- } else if (previousSource !== source) {
- onLogoBytesChange(undefined);
}
} finally {
if (requestId === requestIdRef.current) {
@@ -129,19 +146,30 @@ const useItemLogo = ({ url, currentLogoKind, isReady, isExistingItem, onLogoByte
}
setWebsiteSource(source);
- if (!hasInitialisedRef.current) {
- hasInitialisedRef.current = true;
- if (isExistingItem) {
- resolvedSourceRef.current = source;
- return;
- }
+ const isFirstRun = !hasInitialisedRef.current;
+ hasInitialisedRef.current = true;
+ if (isFirstRun && isExistingItem) {
+ resolvedSourceRef.current = source;
+ setIsResolvePending(false);
+ return;
}
if (!usesWebsiteIcon || resolvedSourceRef.current === source) {
+ setIsResolvePending(false);
+ return;
+ }
+
+ if (isFirstRun) {
+ void resolveFromWebsite(false);
+ setIsResolvePending(false);
return;
}
- timer = setTimeout(() => void resolveFromWebsite(false), URL_SETTLE_MS);
+ setIsResolvePending(true);
+ timer = setTimeout(() => {
+ void resolveFromWebsite(false);
+ setIsResolvePending(false);
+ }, URL_SETTLE_MS);
})();
return (): void => {
@@ -156,6 +184,7 @@ const useItemLogo = ({ url, currentLogoKind, isReady, isExistingItem, onLogoByte
const selectLogo = useCallback((selection: LogoSelection): void => {
requestIdRef.current++;
setIsFetchingLogo(false);
+ setIsResolvePending(false);
setLogoSelection(selection);
}, []);
@@ -164,7 +193,7 @@ const useItemLogo = ({ url, currentLogoKind, isReady, isExistingItem, onLogoByte
*/
const fetchLogoFromWebsite = useCallback((): Promise<void> => resolveFromWebsite(true), [resolveFromWebsite]);
- return { logoSelection, isFetchingLogo, resolvedFaviconSource, websiteSource, selectLogo, fetchLogoFromWebsite };
+ return { logoSelection, isFetchingLogo: isFetchingLogo || isResolvePending, resolvedFaviconSource, websiteSource, selectLogo, fetchLogoFromWebsite };
};
export default useItemLogo;
diff --git a/apps/mobile-app/hooks/useItemLogo.ts b/apps/mobile-app/hooks/useItemLogo.ts
index 878224891..bb25a64ba 100644
--- a/apps/mobile-app/hooks/useItemLogo.ts
+++ b/apps/mobile-app/hooks/useItemLogo.ts
@@ -42,12 +42,15 @@ export function useItemLogo({ url, currentLogoKind, isReady, isExistingItem, onL
const [logoSelection, setLogoSelection] = useState<LogoSelection | undefined>(undefined);
const [isFetchingLogo, setIsFetchingLogo] = useState(false);
+ const [isResolvePending, setIsResolvePending] = useState(!isExistingItem);
const [resolvedFaviconSource, setResolvedFaviconSource] = useState<string | null>(null);
const [websiteSource, setWebsiteSource] = useState<string | null>(null);
const resolvedSourceRef = useRef<string | null>(null);
const requestIdRef = useRef(0);
const hasInitialisedRef = useRef(false);
+ const fetchedRef = useRef(new Map<string, Uint8Array | null>());
+ const fetchInFlightRef = useRef<Promise<unknown> | null>(null);
const usesWebsiteIcon = logoSelection ? usesWebsiteLogo(logoSelection) : (currentLogoKind ?? LogoKinds.Favicon) === LogoKinds.Favicon;
/**
@@ -59,40 +62,56 @@ export function useItemLogo({ url, currentLogoKind, isReady, isExistingItem, onL
return;
}
- const target = await FaviconService.resolveTarget(url);
- const source = target?.source ?? null;
- const previousSource = resolvedSourceRef.current;
const requestId = ++requestIdRef.current;
+ setIsFetchingLogo(true);
+ try {
+ const target = await FaviconService.resolveTarget(url);
+ if (requestId !== requestIdRef.current) {
+ return;
+ }
- resolvedSourceRef.current = source;
- setResolvedFaviconSource(source);
- setLogoSelection({ Kind: LogoKinds.Favicon });
+ const source = target?.source ?? null;
+ resolvedSourceRef.current = source;
+ setResolvedFaviconSource(source);
+ setLogoSelection({ Kind: LogoKinds.Favicon });
- // Without a domain there is nothing to fetch from, so automatic means no icon at all.
- if (!target) {
- onLogoBytesChange(undefined);
- return;
- }
+ if (!target) {
+ onLogoBytesChange(undefined);
+ return;
+ }
- // The vault already holds this domain's favicon: show that one.
- if (!force) {
const stored = await FaviconService.getStoredFavicon(target, sqliteClient.logos);
if (requestId !== requestIdRef.current) {
return;
}
- if (stored) {
- onLogoBytesChange(stored);
+ onLogoBytesChange(stored ?? undefined);
+ if (stored && !force) {
return;
}
- }
- if (previousSource !== source) {
- onLogoBytesChange(undefined);
- }
+ while (fetchInFlightRef.current) {
+ await fetchInFlightRef.current;
+ if (requestId !== requestIdRef.current) {
+ return;
+ }
+ }
- setIsFetchingLogo(true);
- try {
- const result = await FaviconService.fetchFavicon(target, sqliteClient.logos, webApi, { ignoreStored: true });
+ if (!force && fetchedRef.current.has(target.source)) {
+ const cached = fetchedRef.current.get(target.source);
+ if (cached) {
+ onLogoBytesChange(cached);
+ }
+ return;
+ }
+
+ const request = FaviconService.fetchFavicon(target, sqliteClient.logos, webApi, { ignoreStored: true });
+ fetchInFlightRef.current = request;
+ const result = await request.finally(() => {
+ if (fetchInFlightRef.current === request) {
+ fetchInFlightRef.current = null;
+ }
+ });
+ fetchedRef.current.set(target.source, result.success && result.imageData ? result.imageData : null);
if (requestId !== requestIdRef.current) {
return;
}
@@ -100,8 +119,6 @@ export function useItemLogo({ url, currentLogoKind, isReady, isExistingItem, onL
if (result.success && result.imageData) {
onLogoBytesChange(result.imageData);
setLogoSelection(force ? { Kind: LogoKinds.Favicon, Data: result.imageData } : { Kind: LogoKinds.Favicon });
- } else if (previousSource !== source) {
- onLogoBytesChange(undefined);
}
} finally {
if (requestId === requestIdRef.current) {
@@ -128,19 +145,30 @@ export function useItemLogo({ url, currentLogoKind, isReady, isExistingItem, onL
}
setWebsiteSource(source);
- if (!hasInitialisedRef.current) {
- hasInitialisedRef.current = true;
- if (isExistingItem) {
- resolvedSourceRef.current = source;
- return;
- }
+ const isFirstRun = !hasInitialisedRef.current;
+ hasInitialisedRef.current = true;
+ if (isFirstRun && isExistingItem) {
+ resolvedSourceRef.current = source;
+ setIsResolvePending(false);
+ return;
}
if (!usesWebsiteIcon || resolvedSourceRef.current === source) {
+ setIsResolvePending(false);
+ return;
+ }
+
+ if (isFirstRun) {
+ void resolveFromWebsite(false);
+ setIsResolvePending(false);
return;
}
- timer = setTimeout(() => void resolveFromWebsite(false), URL_SETTLE_MS);
+ setIsResolvePending(true);
+ timer = setTimeout(() => {
+ void resolveFromWebsite(false);
+ setIsResolvePending(false);
+ }, URL_SETTLE_MS);
})();
return (): void => {
@@ -155,13 +183,14 @@ export function useItemLogo({ url, currentLogoKind, isReady, isExistingItem, onL
const selectLogo = useCallback((selection: LogoSelection): void => {
requestIdRef.current++;
setIsFetchingLogo(false);
+ setIsResolvePending(false);
setLogoSelection(selection);
}, []);
/**
- * Fetch the website's favicon on request, replacing a favicon that has gone stale.
+ * Fetch the website's favicon.
*/
const fetchLogoFromWebsite = useCallback((): Promise<void> => resolveFromWebsite(true), [resolveFromWebsite]);
- return { logoSelection, isFetchingLogo, resolvedFaviconSource, websiteSource, selectLogo, fetchLogoFromWebsite };
+ return { logoSelection, isFetchingLogo: isFetchingLogo || isResolvePending, resolvedFaviconSource, websiteSource, selectLogo, fetchLogoFromWebsite };
}