fix(birthdays): Gracefully handle partial source failures

3 files changed, 73 insertions, 33 deletions

diff --git a/src/lib/Data/Birthday/primary.ts b/src/lib/Data/Birthday/primary.ts
index 89a765bc..5f8ee1d0 100644
--- a/src/lib/Data/Birthday/primary.ts
+++ b/src/lib/Data/Birthday/primary.ts
@@ -5,8 +5,23 @@ export interface aniSearchBirthday {
   image: string;
 }
 
+const isAniSearchBirthday = (entry: unknown): entry is aniSearchBirthday =>
+  typeof entry === 'object' &&
+  entry !== null &&
+  typeof (entry as { name?: unknown }).name === 'string' &&
+  typeof (entry as { image?: unknown }).image === 'string';
+
 export const aniSearchBirthdays = async (
   month: number,
   day: number
-): Promise<aniSearchBirthday[]> =>
-  await (await fetch(root(`/api/birthdays/primary?month=${month}&day=${day}`), {})).json();
+): Promise<aniSearchBirthday[]> => {
+  const response = await fetch(root(`/api/birthdays/primary?month=${month}&day=${day}`), {});
+
+  if (!response.ok) throw new Error(`Primary birthdays request failed with ${response.status}.`);
+
+  const data: unknown = await response.json();
+
+  if (!Array.isArray(data)) throw new Error('Primary birthdays response was not an array.');
+
+  return data.filter(isAniSearchBirthday);
+};
diff --git a/src/lib/Data/Birthday/secondary.ts b/src/lib/Data/Birthday/secondary.ts
index 5cf26c56..95a18eaf 100644
--- a/src/lib/Data/Birthday/secondary.ts
+++ b/src/lib/Data/Birthday/secondary.ts
@@ -6,15 +6,32 @@ export interface ACDBBirthday {
   origin: string;
 }
 
-export const ACDBBirthdays = async (month: number, day: number): Promise<ACDBBirthday[]> =>
-  (
-    await (
-      await fetch(root(`/api/birthdays/secondary?month=${month}&day=${day}`), {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-          'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:120.0) Gecko/20100101 Firefox/120.0'
-        }
-      })
-    ).json()
-  )['characters'];
+const isACDBBirthday = (entry: unknown): entry is ACDBBirthday =>
+  typeof entry === 'object' &&
+  entry !== null &&
+  typeof (entry as { character_image?: unknown }).character_image === 'string' &&
+  typeof (entry as { name?: unknown }).name === 'string' &&
+  typeof (entry as { origin?: unknown }).origin === 'string';
+
+export const ACDBBirthdays = async (month: number, day: number): Promise<ACDBBirthday[]> => {
+  const response = await fetch(root(`/api/birthdays/secondary?month=${month}&day=${day}`), {
+    headers: {
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+      'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:120.0) Gecko/20100101 Firefox/120.0'
+    }
+  });
+
+  if (!response.ok) throw new Error(`Secondary birthdays request failed with ${response.status}.`);
+
+  const data: unknown = await response.json();
+
+  if (
+    typeof data !== 'object' ||
+    data === null ||
+    !Array.isArray((data as { characters?: unknown }).characters)
+  )
+    throw new Error('Secondary birthdays response did not include a characters array.');
+
+  return (data as { characters: unknown[] }).characters.filter(isACDBBirthday);
+};
diff --git a/src/lib/Tools/Birthdays.svelte b/src/lib/Tools/Birthdays.svelte
index f4a4e9c5..e6654833 100644
--- a/src/lib/Tools/Birthdays.svelte
+++ b/src/lib/Tools/Birthdays.svelte
@@ -20,8 +20,7 @@
   let date = new Date();
   let month = parseOrDefault(urlParameters, 'month', date.getMonth() + 1);
   let day = parseOrDefault(urlParameters, 'day', date.getDate());
-  let anisearchBirthdays: Promise<aniSearchBirthday[]>;
-  let acdbBirthdays: Promise<ACDBBirthday[]>;
+  let birthdays: Promise<{ birthdays: Birthday[]; allSourcesFailed: boolean }>;
 
   $: {
     month = Math.min(month, 12);
@@ -29,9 +28,7 @@
     day = Math.min(day, new Date(2024, month, 0).getDate());
     day = Math.max(day, 1);
 
-    if (browser) anisearchBirthdays = aniSearchBirthdays(month, day);
-
-    acdbBirthdays = ACDBBirthdays(month, day);
+    birthdays = resolveBirthdays(month, day);
 
     if (browser) {
       $page.url.searchParams.set('month', month.toString());
@@ -92,20 +89,33 @@
 
     return Array.from(nameMap.values());
   };
+
+  const resolveBirthdays = async (
+    month: number,
+    day: number
+  ): Promise<{ birthdays: Birthday[]; allSourcesFailed: boolean }> => {
+    const [acdbResult, aniSearchResult] = await Promise.allSettled([
+      ACDBBirthdays(month, day),
+      browser ? aniSearchBirthdays(month, day) : Promise.resolve([])
+    ]);
+    const acdb = acdbResult.status === 'fulfilled' ? acdbResult.value : [];
+    const aniSearch = aniSearchResult.status === 'fulfilled' ? aniSearchResult.value : [];
+
+    return {
+      birthdays: combineBirthdaySources(acdb, aniSearch),
+      allSourcesFailed: acdbResult.status === 'rejected' && aniSearchResult.status === 'rejected'
+    };
+  };
 </script>
 
-{#await acdbBirthdays}
-  <Message message="Loading birthday set one ..." />
+{#await birthdays}
+  <Message message="Loading birthdays ..." />
 
   <Skeleton grid={true} count={100} width="150px" height="170px" />
-{:then acdbBirthdays}
-  {#await anisearchBirthdays}
-    <Message message="Loading birthday set two ..." />
-
-    <Skeleton grid={true} count={100} width="150px" height="170px" />
-  {:then anisearch}
-    {@const birthdays = combineBirthdaySources(acdbBirthdays, anisearch)}
-
+{:then resolved}
+  {#if resolved.allSourcesFailed}
+    <Error type="Character" card />
+  {:else}
     <p>
       <select bind:value={month}>
         {#each Array.from({ length: 12 }, (_, i) => i + 1) as month}
@@ -123,7 +133,7 @@
     </p>
 
     <div class="characters">
-      {#each birthdays as birthday}
+      {#each resolved.birthdays as birthday}
         <div class="card card-small">
           <a
             href={`https://anilist.co/search/characters?search=${encodeURIComponent(
@@ -146,9 +156,7 @@
         </div>
       {/each}
     </div>
-  {:catch}
-    <Error type="Character" card />
-  {/await}
+  {/if}
 {:catch}
   <Error type="Character" card />
 {/await}