Proper API error handling

web/src/routes/api/v1/auth/reset/+server.ts

@@ -1,7 +1,6 @@
 import { pb } from "$lib/pocketbase";
 import { handleError } from "$lib/util/api_util";
 import { error, json, type RequestEvent } from "@sveltejs/kit";
-import { ClientResponseError } from "pocketbase";
 import { z } from "zod";
 
 export async function POST(event: RequestEvent) {

web/src/routes/api/v1/trail/upload/+server.ts

@@ -1,6 +1,7 @@
 import { SummitLog } from "$lib/models/summit_log";
 import type { Trail } from "$lib/models/trail";
 import { trails_create } from "$lib/stores/trail_store";
+import { handleError } from "$lib/util/api_util";
 import { fromFile, fromFIT, fromKML, fromTCX, gpx2trail, isFITFile } from "$lib/util/gpx_util";
 import { error, json, type RequestEvent } from "@sveltejs/kit";
 import { ClientResponseError } from "pocketbase";
@@ -35,15 +36,11 @@ export async function PUT(event: RequestEvent) {
         try {
             trail = await trails_create(trail, [], gpxFile, event.fetch);
         } catch (e: any) {
-            console.log(e);
-
-            throw e
+            throw handleError(e)
         }
         return json(trail);
 
     } catch (e: any) {
-        console.log(e);
-
-        throw error(e.status, e)
+        throw handleError(e)
     }
 }

web/src/routes/lists/+page.ts

@@ -1,7 +1,8 @@
 import type { List, ListFilter } from "$lib/models/list";
 import { lists_index, lists_show } from "$lib/stores/list_store";
-import { error, type Load } from "@sveltejs/kit";
-import { ClientResponseError, type ListResult } from "pocketbase";
+import { APIError } from "$lib/util/api_util";
+import { error, type Load, type NumericRange } from "@sveltejs/kit";
+import { type ListResult } from "pocketbase";
 
 export const load: Load = async ({ params, fetch, url }) => {
     const filter: ListFilter = {
@@ -20,9 +21,9 @@ export const load: Load = async ({ params, fetch, url }) => {
 
             lists = { items: [list], page: 1, perPage: 1, totalItems: 1, totalPages: 1 }
         } catch (e) {
-            if (e instanceof ClientResponseError && e.status == 404) {
-                error(404, {
-                    message: 'Not found'
+            if (e instanceof APIError) {
+                error(e.status as NumericRange<400, 599>, {
+                    message: e.status == 404 ? 'Not found' : e.message
                 });
             }
             throw e

web/src/routes/lists/edit/[id]/+page.ts

@@ -1,8 +1,8 @@
 import { List } from "$lib/models/list";
 import { lists_show } from "$lib/stores/list_store";
+import { APIError } from "$lib/util/api_util";
 import { getFileURL } from "$lib/util/file_util";
-import { error, type Load } from "@sveltejs/kit";
-import { ClientResponseError } from "pocketbase";
+import { error, type Load, type NumericRange } from "@sveltejs/kit";
 
 export const load: Load = async ({ params, fetch, data }) => {
     if (!params.id) {
@@ -20,9 +20,9 @@ export const load: Load = async ({ params, fetch, data }) => {
 
             return { list: list, previewUrl: previewURL }
 
-        } catch (e) {           
-            if (e instanceof ClientResponseError) {
-                throw error(e.status as any, e.message)
+        } catch (e) {
+            if (e instanceof APIError) {
+                throw error(e.status as NumericRange<400, 599>, e.message)
             }
             throw e
         }

web/src/routes/login/+page.svelte

@@ -9,9 +9,10 @@
     import { theme } from "$lib/stores/theme_store";
     import { show_toast } from "$lib/stores/toast_store";
     import { login } from "$lib/stores/user_store";
+    import { APIError } from "$lib/util/api_util";
     import { validator } from "@felte/validator-zod";
     import { createForm } from "felte";
-    import { ClientResponseError, type AuthProviderInfo } from "pocketbase";
+    import { type AuthProviderInfo } from "pocketbase";
     import { _ } from "svelte-i18n";
     import { z } from "zod";
 
@@ -51,7 +52,7 @@
                 window.location.href = $page.url.searchParams.get("r") ?? "/";
             } catch (e) {
                 if (
-                    e instanceof ClientResponseError &&
+                    e instanceof APIError &&
                     e.message == "Failed to authenticate."
                 ) {
                     show_toast({

web/src/routes/map/trail/[id]/+page.ts

@@ -1,15 +1,14 @@
-import { lists_index } from "$lib/stores/list_store";
 import { trails_show } from "$lib/stores/trail_store";
-import { error, type ServerLoad } from "@sveltejs/kit";
-import { ClientResponseError } from "pocketbase";
+import { APIError } from "$lib/util/api_util";
+import { error, type NumericRange, type ServerLoad } from "@sveltejs/kit";
 
 export const load: ServerLoad = async ({ params, locals, fetch }) => {
     try {
         await trails_show(params.id!, true, fetch)
     } catch (e) {
-        if (e instanceof ClientResponseError && e.status == 404) {
-            error(404, {
-                message: 'Not found'
+        if (e instanceof APIError) {
+            error(e.status as NumericRange<400, 599>, {
+                message: e.status == 404 ? 'Not found' : e.message
             });
         }
 

web/src/routes/map/trail/[id]/print/+page.ts

@@ -1,14 +1,14 @@
 import { trails_show } from "$lib/stores/trail_store";
-import { error, type Load } from "@sveltejs/kit";
-import { ClientResponseError } from "pocketbase";
+import { APIError } from "$lib/util/api_util";
+import { error, type Load, type NumericRange } from "@sveltejs/kit";
 
 export const load: Load = async ({ params, fetch }) => {
     try {
         await trails_show(params.id!, true, fetch)
     } catch (e) {
-        if (e instanceof ClientResponseError && e.status == 404) {
-            error(404, {
-                message: 'Not found'
+        if (e instanceof APIError) {
+            error(e.status as NumericRange<400, 599>, {
+                message: e.status == 404 ? 'Not found' : e.message
             });
         }
         console.log(e);

web/src/routes/profile/[id]/+layout.server.ts

@@ -1,7 +1,7 @@
 import { follows_a_b, follows_counts } from "$lib/stores/follow_store";
 import { users_show } from "$lib/stores/user_store";
-import { error, type ServerLoad } from "@sveltejs/kit";
-import { ClientResponseError } from "pocketbase";
+import { APIError } from "$lib/util/api_util";
+import { error, type NumericRange, type ServerLoad } from "@sveltejs/kit";
 
 export const load: ServerLoad = async ({ params, locals, fetch }) => {
 
@@ -23,9 +23,9 @@ export const load: ServerLoad = async ({ params, locals, fetch }) => {
         return { user, isOwnProfile, ...followCounts, follow: follow }
 
     } catch (e) {
-        if (e instanceof ClientResponseError && e.status == 404) {
-            error(404, {
-                message: 'Not found'
+        if (e instanceof APIError) {
+            error(e.status as NumericRange<400, 599>, {
+                message: e.status == 404 ? 'Not found' : e.message
             });
         } else {
             throw e

web/src/routes/trail/view/[id]/+page.ts

@@ -1,8 +1,6 @@
-import { pb } from "$lib/pocketbase";
-import { lists_index } from "$lib/stores/list_store";
 import { trails_show } from "$lib/stores/trail_store";
+import { APIError } from "$lib/util/api_util";
 import { error, type Load } from "@sveltejs/kit";
-import { ClientResponseError } from "pocketbase";
 
 export const load: Load = async ({ params, fetch }) => {
     try {
@@ -10,7 +8,7 @@ export const load: Load = async ({ params, fetch }) => {
 
         return { trail }
     } catch (e) {
-        if (e instanceof ClientResponseError && e.status == 404) {
+        if (e instanceof APIError && e.status == 404) {
             error(404, {
                 message: 'Not found'
             });