add APIException

evansloan · Mar 5, 2024 · b752f3f · b752f3f
1 parent f567222
commit b752f3f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/app/log/[username]/[[...page]]/page.tsx b/app/log/[username]/[[...page]]/page.tsx
@@ -6,7 +6,10 @@ import { CollectionLog } from '@/components/collection-log';
 import Item from '@/components/item';
 import { Card, CardContent } from '@/components/ui/card';
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
-import { CollectionLogAPI } from '@/lib/api/collection-log/collection-log-api';
+import {
+  APIException,
+  CollectionLogAPI,
+} from '@/lib/api/collection-log/collection-log-api';
 import { getFullCollectionLog } from '@/lib/collection-log-helpers';
 
 interface PageProps {
@@ -30,7 +33,11 @@ const fetchCollectionLogData = async (username: string) => {
       recentItems: await CollectionLogAPI.getRecentItems(username),
     };
   } catch (e) {
-    return notFound();
+    if (e instanceof APIException && e.code === 404) {
+      return notFound();
+    }
+
+    throw e;
   }
 };
 
@@ -40,12 +47,8 @@ const Page = async ({ params: { username, page } }: PageProps) => {
     page = decodeURI(page);
   }
 
-  const {
-    collectionLog,
-    ranks,
-    recentItems,
-    settings,
-  } = await fetchCollectionLogData(username);
+  const { collectionLog, ranks, recentItems, settings } =
+    await fetchCollectionLogData(username);
 
   return (
     <main className='flex flex-col items-center justify-between'>

diff --git a/lib/api/collection-log/collection-log-api.ts b/lib/api/collection-log/collection-log-api.ts
@@ -13,6 +13,16 @@ import {
   UserSettingsResponse,
 } from './responses';
 
+class APIException extends Error {
+  constructor(
+    public code: number,
+    message: string,
+    options?: ErrorOptions
+  ) {
+    super(message, options);
+  }
+}
+
 class CollectionLogAPI {
   private static readonly BASE_URL = 'https://api.collectionlog.net';
   private static readonly COLLECTION_LOG_ENDPOINT = 'collectionlog';
@@ -58,9 +68,11 @@ class CollectionLogAPI {
     const response = await fetch(url, config);
     if (!response.ok) {
       const error = (await response.json()) as BaseResponse;
-      throw new Error(`${response.status}: ${error.error}`, {
-        cause: response.url,
-      });
+      throw new APIException(
+        response.status,
+        `${response.status}: ${error.error}`,
+        { cause: response.url }
+      );
     }
 
     return await response.json();
@@ -341,4 +353,4 @@ class CollectionLogAPI {
   };
 }
 
-export { CollectionLogAPI };
+export { APIException, CollectionLogAPI };