From a5460a03b403a6cb0341debbd82956d5824ffe0d Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Mon, 3 Jul 2023 12:33:04 -0700 Subject: [PATCH] misc: Improve error handling --- src/hooks.server.ts | 6 +- src/lib/components/CommunityLink.svelte | 19 --- src/lib/components/Navbar.svelte | 7 +- .../components/community/CommunityLink.svelte | 32 +++++ src/lib/lemmy.ts | 5 +- src/routes/+error.svelte | 10 +- src/routes/+layout.server.ts | 7 - src/routes/+layout.svelte | 4 +- src/routes/+page.svelte | 98 +++++++++----- src/routes/{+page.server.ts => +page.ts} | 8 +- src/routes/c/[name]/+layout.svelte | 1 - src/routes/c/[name]/+layout.ts | 5 - src/routes/c/[name]/+page.svelte | 120 ++++++++++++++++++ src/routes/c/[name]/+page.ts | 26 +++- src/routes/c/[name]/posts/+page.server.ts | 16 --- src/routes/c/[name]/posts/+page.svelte | 90 ------------- src/routes/communities/+page.svelte | 2 +- .../communities/{+page.server.ts => +page.ts} | 6 +- src/routes/post/[id]/+page.svelte | 8 +- .../post/[id]/{+page.server.ts => +page.ts} | 6 +- src/routes/post/[id]/Comments.svelte | 2 +- src/routes/post/[id]/Post.svelte | 7 +- svelte.config.js | 2 +- 23 files changed, 285 insertions(+), 202 deletions(-) delete mode 100644 src/lib/components/CommunityLink.svelte create mode 100644 src/lib/components/community/CommunityLink.svelte delete mode 100644 src/routes/+layout.server.ts rename src/routes/{+page.server.ts => +page.ts} (73%) delete mode 100644 src/routes/c/[name]/+layout.svelte delete mode 100644 src/routes/c/[name]/+layout.ts create mode 100644 src/routes/c/[name]/+page.svelte delete mode 100644 src/routes/c/[name]/posts/+page.server.ts delete mode 100644 src/routes/c/[name]/posts/+page.svelte rename src/routes/communities/{+page.server.ts => +page.ts} (75%) rename src/routes/post/[id]/{+page.server.ts => +page.ts} (57%) diff --git a/src/hooks.server.ts b/src/hooks.server.ts index 03b23a70..f1800a07 100644 --- a/src/hooks.server.ts +++ b/src/hooks.server.ts @@ -1,4 +1,4 @@ -import { instance_url } from '$lib/lemmy.js' +import { DEFAULT_INSTANCE_URL } from '$lib/lemmy.js' import { error } from '@sveltejs/kit' export async function handle({ event, resolve }) { @@ -14,16 +14,18 @@ export async function handle({ event, resolve }) { event.request.headers.delete('host') try { + console.log(`https://${instance}/${url.toString()}`) const data = await fetch(`https://${instance}/${url.toString()}`, { method: event.request.method, body: event.request.body, headers: event.request.headers, + signal: AbortSignal.timeout(20 * 1000), }) return new Response(JSON.stringify(await data.json())) } catch (err) { console.error(err) - throw error(500, `The proxy failed to fetch from ${instance}.`) + throw error(500, { message: 'The proxy failed to fetch from the server' }) } } diff --git a/src/lib/components/CommunityLink.svelte b/src/lib/components/CommunityLink.svelte deleted file mode 100644 index 28bc8795..00000000 --- a/src/lib/components/CommunityLink.svelte +++ /dev/null @@ -1,19 +0,0 @@ - - -{community.title} diff --git a/src/lib/components/Navbar.svelte b/src/lib/components/Navbar.svelte index 080885ce..da131e14 100644 --- a/src/lib/components/Navbar.svelte +++ b/src/lib/components/Navbar.svelte @@ -1,8 +1,7 @@