From 87817aaa34d1f54560ed1bb87bac985d8c3e0eb8 Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Tue, 4 Jul 2023 14:26:39 -0700 Subject: [PATCH] fix: Fix error handling (i hope) --- src/hooks.server.ts | 16 ++++++++++++---- src/routes/+error.svelte | 1 + src/routes/post/[id]/+page.svelte | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/hooks.server.ts b/src/hooks.server.ts index 9d3a1319..b64e6aec 100644 --- a/src/hooks.server.ts +++ b/src/hooks.server.ts @@ -30,7 +30,7 @@ export async function handle({ event, resolve }) { }) if (!data.ok) { - console.log(`${data.status}: ${data.statusText}`) + await resolve(event) return new Response( JSON.stringify({ message: await data.text(), @@ -44,10 +44,17 @@ export async function handle({ event, resolve }) { try { const json = await data.json() - return new Response(JSON.stringify(json), { - status: data.status, - }) + await resolve(event) + return new Response( + JSON.stringify({ + message: 'Failed to fetch', + }), + { + status: data.status, + } + ) } catch (err) { + await resolve(event) return new Response( JSON.stringify({ message: 'Failed to fetch', @@ -58,6 +65,7 @@ export async function handle({ event, resolve }) { ) } } catch (error) { + await resolve(event) return new Response( JSON.stringify({ message: 'the proxy failed to fetch from server', diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte index d57b73b3..2d2be96c 100644 --- a/src/routes/+error.svelte +++ b/src/routes/+error.svelte @@ -1,6 +1,7 @@
diff --git a/src/routes/post/[id]/+page.svelte b/src/routes/post/[id]/+page.svelte index f0e5065b..b3d95787 100644 --- a/src/routes/post/[id]/+page.svelte +++ b/src/routes/post/[id]/+page.svelte @@ -156,7 +156,7 @@ /> {:catch}
- Failed to load posts + Failed to load comments.
{/await}