From 66646663b295bb50dbc932f3ed36698ac288b073 Mon Sep 17 00:00:00 2001 From: Xylight Date: Wed, 5 Jun 2024 17:33:39 -0700 Subject: [PATCH] misc: improve error handling for translator --- .../components/translate/Translation.svelte | 50 ++++++++++++++----- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/src/lib/components/translate/Translation.svelte b/src/lib/components/translate/Translation.svelte index f95a3476..cad6ae7b 100644 --- a/src/lib/components/translate/Translation.svelte +++ b/src/lib/components/translate/Translation.svelte @@ -11,8 +11,11 @@ } export let open: boolean = false + let error = false - $: if (open && $text) translate($text) + const opened = () => translate($text) + + $: if (open) opened() let result: Promise | undefined = undefined let from = 'auto' @@ -25,6 +28,8 @@ return } + error = false + const requestURL = new URL(`https://${url}/translate`) requestURL.searchParams.set('q', text) requestURL.searchParams.set('source', from) @@ -33,18 +38,32 @@ result = fetch(requestURL.toString(), { method: 'POST', - }).then(async (res) => await res.json()) + }).then(async (res) => { + if (!res.ok) { + error = true + throw new Error(`${res.status} ${res.statusText}`) + return { + translatedText: `${res.status} ${res.statusText}`, + } + } + + return await res.json() + }) } - +
- translate($text)} bind:value={to} class="flex-1"> @@ -64,27 +83,34 @@ {#if result} {#await result}
{:then result} + {#if !error} + + {/if} + {:catch err} - {:catch err} - {/await} {:else}