feat: update icon fetching logic to support multiple upstream sources

.github/workflows/sync-upstream.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

src/router-public.ts

@@ -92,10 +92,27 @@ async function handleWebsiteIcon(host: string): Promise<Response> {
   const normalizedHost = normalizeIconHost(host);
   if (!normalizedHost) return handleNwFavicon();
 
-  const upstream = `https://favicon.im/${encodeURIComponent(normalizedHost)}`;
+  const encodedHost = encodeURIComponent(normalizedHost);
+  const requestHeaders = { 'User-Agent': 'NodeWarden/1.0' };
+  const upstreamSources: Array<{ url: string; headers?: HeadersInit }> = [
+    {
+      url: `https://icons.bitwarden.net/${encodedHost}/icon.png`,
+      headers: requestHeaders,
+    },
+    {
+      url: `https://favicon.im/${encodedHost}`,
+      headers: requestHeaders,
+    },
+    {
+      url: `https://icons.duckduckgo.com/ip3/${encodedHost}.ico`,
+      headers: requestHeaders,
+    },
+  ];
+
   try {
-    const resp = await fetch(upstream, {
+    for (const source of upstreamSources) {
-      headers: { 'User-Agent': 'NodeWarden/1.0' },
+      const resp = await fetch(source.url, {
+        headers: source.headers,
         redirect: 'follow',
         cf: {
           cacheEverything: true,
@@ -103,9 +120,9 @@ async function handleWebsiteIcon(host: string): Promise<Response> {
         },
       } as RequestInit & { cf: { cacheEverything: boolean; cacheTtl: number } });
 
-    if (!resp.ok) return handleNwFavicon();
+      if (!resp.ok) continue;
       const contentType = String(resp.headers.get('Content-Type') || '').toLowerCase();
-    if (!contentType.startsWith('image/')) return handleNwFavicon();
+      if (!contentType.startsWith('image/')) continue;
 
       return new Response(resp.body, {
         status: 200,
@@ -114,6 +131,9 @@ async function handleWebsiteIcon(host: string): Promise<Response> {
           'Cache-Control': `public, max-age=${LIMITS.cache.iconTtlSeconds}`,
         },
       });
+    }
+
+    return handleNwFavicon();
   } catch {
     return handleNwFavicon();
   }