@@ -1,7 +1,8 @@
11 import { useState, useEffect, useCallback, useRef } from "react";
22 import type { Message } from "@/src/lib/db/schema";
3-import { getParseErrorMessage, handleError } from "@/src/lib/errors";
3+import { handleError } from "@/src/lib/errors";
44 import { useMessageDisplaySettings } from "./useMessageDisplaySettings";
5+import { useFetch } from "./useFetch";
56 import {
67 createUserMessage,
78 createAssistantMessage,
@@ -39,6 +40,7 @@ export function useMessages(
3940 const sendingToThreadIdRef = useRef<number | null>(null);
4041 const abortControllerRef = useRef<AbortController | null>(null);
4142 const [messageDisplaySettings] = useMessageDisplaySettings();
43+ const fetchWithErrorHandling = useFetch();
4244
4345 const loadMessages = useCallback(
4446 async (id: number, onError?: (error: string) => void) => {
@@ -57,20 +59,23 @@ export function useMessages(
5759 url += `?optional_roles=${optionalRoles.join(",")}`;
5860 }
5961
60- const res = await fetch(url);
61- if (!res.ok) {
62- throw new Error(`Failed to load messages: ${res.status}`);
62+ const data = await fetchWithErrorHandling<{ messages: Message[] }>(url, {
63+ errorMessage: "Failed to load messages",
64+ onError,
65+ });
66+ if (data) {
67+ const loadedMessages = data.messages || [];
68+ setMessages(loadedMessages);
6369 }
64- const data = await res.json();
65- const loadedMessages = data.messages || [];
66- setMessages(loadedMessages);
67- } catch (error) {
68- handleError(error, onError);
6970 } finally {
7071 setIsLoadingMessages(false);
7172 }
7273 },
73- [messageDisplaySettings.showSystemMessages, messageDisplaySettings.showToolMessages]
74+ [
75+ messageDisplaySettings.showSystemMessages,
76+ messageDisplaySettings.showToolMessages,
77+ fetchWithErrorHandling,
78+ ]
7479 );
7580
7681 const updateAssistantMessage = (
@@ -316,20 +321,14 @@ export function useMessages(
316321 threadId: number,
317322 onError?: (error: string) => void
318323 ) => {
319- try {
320- const res = await fetch(`/api/threads/${threadId}/messages/${messageId}`, {
321- method: "DELETE",
322- });
323- if (!res.ok) {
324- const errorData = await res.json().catch((parseError) => {
325- throw new Error(getParseErrorMessage(parseError));
326- });
327- throw new Error(errorData.error || "Failed to delete message");
328- }
324+ const result = await fetchWithErrorHandling(`/api/threads/${threadId}/messages/${messageId}`, {
325+ method: "DELETE",
326+ errorMessage: "Failed to delete message",
327+ onError,
328+ });
329+ if (result !== null) {
329330 // Remove the message from local state
330331 setMessages((prev) => prev.filter((msg) => msg.id !== messageId));
331- } catch (error) {
332- handleError(error, onError);
333332 }
334333 };
335334