Improved error handling and logout redirection

Author: jason0x43

app/src/routes/(app)/+layout.server.ts

@@ -2,7 +2,8 @@ export const ssr = false;
 
 import { Api } from "$lib/api.server.js";
 import { isArticleFilter, type ArticleFilter } from "$lib/types.js";
-import { redirect } from "@sveltejs/kit";
+import { error, redirect } from "@sveltejs/kit";
+import { ResponseError } from "simple-news-client";
 
 export async function load({ url, depends, locals, fetch }) {
 	if (!locals.sessionId) {
@@ -17,12 +18,24 @@ export async function load({ url, depends, locals, fetch }) {
 
 	const api = new Api({ fetch, sessionId: locals.sessionId });
 
-	depends("app:feeds");
-	const feeds = await api.getFeeds();
-	depends("app:feedGroups");
-	const feedGroups = await api.getFeedGroups();
-	depends("app:feedStats");
-	const feedStats = await api.getFeedStats();
+	try {
+		depends("app:feeds");
+		const feeds = await api.getFeeds();
+		depends("app:feedGroups");
+		const feedGroups = await api.getFeedGroups();
+		depends("app:feedStats");
+		const feedStats = await api.getFeedStats();
 
-	return { feeds, feedGroups, feedStats, articleFilter };
+		return { feeds, feedGroups, feedStats, articleFilter };
+	} catch (err) {
+		if (err instanceof ResponseError) {
+			if (err.status === 401) {
+				return redirect(303, `/login?next=${url.pathname}`);
+			}
+
+			return error(err.status, { message: err.message });
+		}
+
+		return error(500, `${err}`);
+	}
 }

client/src/error.ts

@@ -8,20 +8,19 @@ const defaultMessages: Record<number, string> = {
 
 export class ResponseError extends Error {
 	#status: number;
+	#details: string | undefined;
 
 	constructor(status: number, message?: string) {
-		const parts = [`[${status}]`];
-		if (message) {
-			parts.push(message)
-		} else if (defaultMessages[status]) {
-			parts.push(defaultMessages[status])
-		}
-
-		super(parts.join(" "));
+		super(defaultMessages[status] || "Internal Server Error");
+		this.#details = message;
 		this.#status = status;
 	}
 
 	get status(): number {
 		return this.#status;
 	}
+
+	get details(): string | undefined {
+		return this.#details;
+	}
 }

client/src/index.ts

@@ -22,6 +22,8 @@ import {
 import { AccountResponse, SessionResponse } from "simple-news-types";
 import { ResponseError } from "./error.js";
 
+export { ResponseError };
+
 export class Client {
 	#apiHost: string;
 	#sessionId: string | undefined;