Merge pull request #187 from azzzy/improve-error-handling

Improve error handling
triggerdotdev · Aug 22, 2024 · d33e7cc · d33e7cc
2 parents b97e322 + acaea20
commit d33e7cc
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/app/routes/j/$id.tsx b/app/routes/j/$id.tsx
@@ -3,7 +3,7 @@ import {
   LoaderFunction,
   MetaFunction,
   Outlet,
-  redirect,
+  redirect, ThrownResponse, useCatch,
   useLoaderData,
   useLocation,
   useParams,
@@ -62,19 +62,17 @@ export const loader: LoaderFunction = async ({ params, request }) => {
     });
 
     if (!jsonResponse.ok) {
-      console.log(
-        `Failed to fetch ${doc.url}: ${jsonResponse.status} (${jsonResponse.statusText})`
-      );
+      const jsonResponseText = await jsonResponse.text();
+      const error = `Failed to fetch ${doc.url}. HTTP status: ${jsonResponse.status} (${jsonResponseText}})`;
+      console.error(error);
 
-      throw new Response(jsonResponse.statusText, {
+      throw new Response(error, {
         status: jsonResponse.status,
       });
     }
 
     const json = await jsonResponse.json();
 
-    console.log(`Fetched ${doc.url} with json, returning...`);
-
     return {
       doc,
       json,
@@ -166,7 +164,7 @@ export const meta: MetaFunction = ({
 }) => {
   let title = "JSON Hero";
 
-  if (data) {
+  if (data?.doc?.title) {
     title += ` - ${data.doc.title}`;
   }
 
@@ -250,7 +248,10 @@ export default function JsonDocumentRoute() {
 }
 
 export function CatchBoundary() {
+  const error = useCatch();
   const params = useParams();
+  console.log("error", error)
+
   return (
     <div className="flex items-center justify-center w-screen h-screen bg-[rgb(56,52,139)]">
       <div className="w-2/3">
@@ -259,15 +260,19 @@ export function CatchBoundary() {
             <Logo />
           </div>
           <PageNotFoundTitle className="text-center leading-tight">
-            404
+            {error.status}
           </PageNotFoundTitle>
         </div>
         <div className="text-center leading-snug text-white">
           <ExtraLargeTitle className="text-slate-200 mb-8">
             <b>Sorry</b>! Something went wrong...
           </ExtraLargeTitle>
           <SmallSubtitle className="text-slate-200 mb-8">
-            We couldn't find the page <b>'https://jsonhero.io/j/{params.id}</b>'
+            {error.data || (
+              error.status === 404
+                ? <>We couldn't find the page <b>'https://jsonhero.io/j/{params.id}'</b></>
+                : "Unknown error occurred."
+            )}
           </SmallSubtitle>
           <a
             href="/"