51ea254dde
The streamed loaders on bookmarks, collections, library, search, and the
collection detail page swallowed only ApiError into their in-band `error`
field and re-threw anything else. A raw network failure (a non-ApiError
TypeError from fetch) therefore escaped the `{#await}` to SvelteKit's
generic error page. On the collection detail page a content-load failure
showed a misleading "this collection is empty", and on search a failed
results query showed a false "no matches" because the streamed `error`
was never rendered.
Fold non-ApiError failures into the same in-band `error` so every
transient blip renders as an inline message, add a `contentError` branch
to the collection detail grid, and render the search results `error` in
both result views.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
31 lines
1.4 KiB
TypeScript
31 lines
1.4 KiB
TypeScript
import { listMyBookmarks } from '$lib/api/bookmarks';
|
|
import { ApiError } from '$lib/api/client';
|
|
import type { PageLoad } from './$types';
|
|
|
|
export const ssr = false;
|
|
|
|
export const load: PageLoad = async () => {
|
|
// Streamed (the load itself doesn't await) so the list shows a skeleton
|
|
// while the single fetch — which is also the auth gate — is in flight.
|
|
return {
|
|
result: (async () => {
|
|
try {
|
|
const page = await listMyBookmarks();
|
|
return { bookmarks: page.items, authenticated: true, error: null as string | null };
|
|
} catch (e) {
|
|
if (e instanceof ApiError && e.status === 401) {
|
|
return { bookmarks: [], authenticated: false, error: null as string | null };
|
|
}
|
|
// Anything else — an HTTP error (502 upstream_unavailable from
|
|
// a backend restart, 500 internal_error) or a raw network
|
|
// failure (a non-ApiError TypeError) — renders inline rather
|
|
// than re-thrown: SvelteKit's generic error.html is not the
|
|
// right UX for a transient API blip and the user is already
|
|
// authenticated as far as we know.
|
|
const message = e instanceof ApiError ? e.message : 'Something went wrong.';
|
|
return { bookmarks: [], authenticated: true, error: message };
|
|
}
|
|
})()
|
|
};
|
|
};
|