From 7237c6448a7037bb0e71c81830d38ec4b4c5d357 Mon Sep 17 00:00:00 2001 From: Nathan Sarrazin Date: Fri, 15 Mar 2024 10:24:49 +0100 Subject: [PATCH] Show error when webpage cannot be reached or parsed --- src/lib/components/OpenWebSearchResults.svelte | 10 ++++------ src/lib/server/websearch/runWebSearch.ts | 1 + 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/lib/components/OpenWebSearchResults.svelte b/src/lib/components/OpenWebSearchResults.svelte index 28ad35df23..bd219ec104 100644 --- a/src/lib/components/OpenWebSearchResults.svelte +++ b/src/lib/components/OpenWebSearchResults.svelte @@ -9,8 +9,8 @@ export let webSearchMessages: WebSearchUpdate[] = []; $: sources = webSearchMessages.find((m) => m.sources)?.sources; - $: error = webSearchMessages.find((m) => m.messageType === "error"); - $: loading = !sources && !error; + $: lastMessage = webSearchMessages.filter((m) => m.messageType !== "sources").slice(-1)[0]; + $: loading = !sources && lastMessage.messageType !== "error";
Web Search
- {#if error} - {error.message} - {:else if sources} + {#if sources} Completed {:else} - {webSearchMessages[webSearchMessages.length - 1].message} + {lastMessage.message} {/if}
diff --git a/src/lib/server/websearch/runWebSearch.ts b/src/lib/server/websearch/runWebSearch.ts index be31b40742..8f054051f8 100644 --- a/src/lib/server/websearch/runWebSearch.ts +++ b/src/lib/server/websearch/runWebSearch.ts @@ -128,6 +128,7 @@ export async function runWebSearch( text = await parseWeb(link); appendUpdate("Browsing webpage", [link]); } catch (e) { + appendUpdate("Failed to parse webpage", [(e as Error).message, link], "error"); // ignore errors } }