xonecas.io
53129
Pa

PAT / commit 37af3c1

refactor: extract formatting and message creation utilities

- extract formatTimestamp to src/lib/format-timestamp.ts
- extract message metadata formatting to src/lib/format-message-metadata.ts
- extract message creation helpers to src/lib/message-helpers.ts
- update message components to use shared utilities
- add JSDoc comments to all new exported functions

xonecas2025-12-19 37af3c1649558f5c3616c2282e9f13abecf3b31d parent 316acbe

1 file changed

src/hooks/useMessages.ts+82−138
@@ -8,6 +8,7 @@ import {
88 createToolMessage,
99 createSystemMessage,
1010 } from "@/src/lib/message-helpers";
11+import { fetchAndParseMessageStream } from "@/src/lib/parse-message-stream";
1112
1213 /**
1314 * Custom hook for managing messages within a thread.
@@ -196,158 +197,101 @@ export function useMessages(
196197 const userMsg = createUserMessage(message, targetThreadId);
197198 setMessages((prev) => [...prev, userMsg]);
198199
199- // Create assistant message placeholder (but don't add it yet - wait for content)
200200 const assistantMsgId = Date.now() + 1;
201201 setStreamingMessageId(assistantMsgId);
202202
203- // Create AbortController for this request
204203 abortControllerRef.current = new AbortController();
204+ let messageAdded = false;
205+ let accumulatedContent = "";
205206
206207 try {
207- const res = await fetch("/api/chat", {
208- method: "POST",
209- headers: { "Content-Type": "application/json" },
210- body: JSON.stringify({ message: message.trim(), threadId: targetThreadId }),
211- signal: abortControllerRef.current.signal,
212- });
213-
214- if (!res.ok) {
215- const errorData = await res.json().catch((parseError) => {
216- throw new Error(getParseErrorMessage(parseError));
217- });
218- throw new Error(errorData.error || `HTTP error! status: ${res.status}`);
219- }
220-
221- if (!res.body) {
222- throw new Error("Response body is null");
223- }
224-
225- const reader = res.body.getReader();
226- const decoder = new TextDecoder();
227- let buffer = "";
228- let accumulatedContent = "";
229- let shouldStop = false;
230- let messageAdded = false;
231-
232- while (true) {
233- const { done, value } = await reader.read();
234- if (done) break;
235-
236- buffer += decoder.decode(value, { stream: true });
237- const lines = buffer.split("\n");
238- buffer = lines.pop() || ""; // Keep incomplete line in buffer
239-
240- for (const line of lines) {
241- if (line.trim() === "") continue; // Skip empty lines
242- if (line.startsWith("data: ")) {
243- try {
244- const data = JSON.parse(line.slice(6));
245- if (data.type === "content") {
246- accumulatedContent += data.content || "";
247- // Only add the message when we have content
248- if (!messageAdded && accumulatedContent.trim()) {
249- const botMsg = createAssistantMessage(
250- assistantMsgId,
251- targetThreadId,
252- accumulatedContent
253- );
254- setMessages((prev) => [...prev, botMsg]);
255- messageAdded = true;
256- } else if (messageAdded) {
257- updateAssistantMessage(assistantMsgId, accumulatedContent);
258- }
259- } else if (data.type === "toolMessage") {
260- // Add tool message to state in real-time
261- const toolMsg = createToolMessage(
262- data.id,
263- data.threadId,
264- data.content,
265- data.createdAt
266- );
267- setMessages((prev) => [...prev, toolMsg]);
268- } else if (data.type === "done") {
269- // Final update with complete answer and metadata
270- const finalContent = data.answer || accumulatedContent;
271- const metadata = {
272- model: data.model || null,
273- maxPromptLength: data.maxPromptLength !== undefined ? data.maxPromptLength : null,
274- toolCallCounts: data.toolCallCounts !== undefined ? data.toolCallCounts : null,
275- };
276-
277- if (!messageAdded) {
278- const botMsg = createAssistantMessage(
279- assistantMsgId,
280- targetThreadId,
281- finalContent,
282- metadata
283- );
284- setMessages((prev) => [...prev, botMsg]);
285- } else {
286- updateAssistantMessage(assistantMsgId, finalContent, metadata);
287- }
288- setStreamingMessageId(null);
289-
290- // Generate title after first assistant response
291- const previousUserMessages = messages.filter(
292- (m) => m.role === "user" && m.threadId === targetThreadId
293- );
294- const previousAssistantMessages = messages.filter(
295- (m) => m.role === "assistant" && m.threadId === targetThreadId
296- );
297-
298- const totalUserMessages = previousUserMessages.length + 1;
299- const totalAssistantMessages = previousAssistantMessages.length + 1;
300-
301- if (
302- totalUserMessages === 1 &&
303- totalAssistantMessages === 1 &&
304- onUpdateThreadTitle &&
305- data.model
306- ) {
307- await handleTitleGeneration(targetThreadId, data.model, onUpdateThreadTitle);
308- }
309-
310- shouldStop = true;
311- break;
312- } else if (data.type === "error") {
313- // If it's a stop error, keep the partial content
314- // Note: metadata will be sent via "done" message after the message is saved
315- if (data.error === "Generation stopped") {
316- // If we have content but message wasn't added, add it now
317- if (!messageAdded && accumulatedContent.trim()) {
318- const botMsg = createAssistantMessage(
319- assistantMsgId,
320- targetThreadId,
321- accumulatedContent
322- );
323- setMessages((prev) => [...prev, botMsg]);
324- }
325- setStreamingMessageId(null);
326- shouldStop = true;
327- break;
328- }
329- const errorMsg = data.error || "Unknown error";
330- if (onError) onError(errorMsg);
331- throw new Error(errorMsg);
332- }
333- } catch (parseError) {
334- handleError(parseError, onError);
208+ await fetchAndParseMessageStream(
209+ message,
210+ targetThreadId,
211+ {
212+ onContent: (content) => {
213+ accumulatedContent = content;
214+ if (!messageAdded && accumulatedContent.trim()) {
215+ const botMsg = createAssistantMessage(
216+ assistantMsgId,
217+ targetThreadId,
218+ accumulatedContent
219+ );
220+ setMessages((prev) => [...prev, botMsg]);
221+ messageAdded = true;
222+ } else if (messageAdded) {
223+ updateAssistantMessage(assistantMsgId, accumulatedContent);
335224 }
336- }
337- }
338- if (shouldStop) break;
339- }
225+ },
226+ onToolMessage: (id, threadId, content, createdAt) => {
227+ const toolMsg = createToolMessage(id, threadId, content, createdAt);
228+ setMessages((prev) => [...prev, toolMsg]);
229+ },
230+ onDone: async (data) => {
231+ const finalContent = data.answer || accumulatedContent;
232+ const metadata = {
233+ model: data.model || null,
234+ maxPromptLength: data.maxPromptLength !== undefined ? data.maxPromptLength : null,
235+ toolCallCounts: data.toolCallCounts !== undefined ? data.toolCallCounts : null,
236+ };
237+
238+ if (!messageAdded) {
239+ const botMsg = createAssistantMessage(
240+ assistantMsgId,
241+ targetThreadId,
242+ finalContent,
243+ metadata
244+ );
245+ setMessages((prev) => [...prev, botMsg]);
246+ } else {
247+ updateAssistantMessage(assistantMsgId, finalContent, metadata);
248+ }
249+ setStreamingMessageId(null);
250+
251+ const previousUserMessages = messages.filter(
252+ (m) => m.role === "user" && m.threadId === targetThreadId
253+ );
254+ const previousAssistantMessages = messages.filter(
255+ (m) => m.role === "assistant" && m.threadId === targetThreadId
256+ );
257+
258+ const totalUserMessages = previousUserMessages.length + 1;
259+ const totalAssistantMessages = previousAssistantMessages.length + 1;
260+
261+ if (
262+ totalUserMessages === 1 &&
263+ totalAssistantMessages === 1 &&
264+ onUpdateThreadTitle &&
265+ data.model
266+ ) {
267+ await handleTitleGeneration(targetThreadId, data.model, onUpdateThreadTitle);
268+ }
269+ },
270+ onStop: () => {
271+ if (!messageAdded && accumulatedContent.trim()) {
272+ const botMsg = createAssistantMessage(
273+ assistantMsgId,
274+ targetThreadId,
275+ accumulatedContent
276+ );
277+ setMessages((prev) => [...prev, botMsg]);
278+ }
279+ setStreamingMessageId(null);
280+ },
281+ onError: (errorMsg) => {
282+ if (onError) onError(errorMsg);
283+ },
284+ },
285+ abortControllerRef.current.signal,
286+ onError
287+ );
340288
341- // Reload threads to update the order
342289 onThreadsReload();
343290 } catch (error) {
344- // Don't log abort errors as they're intentional
345291 if (error instanceof Error && error.name !== "AbortError") {
346- // Only remove the assistant message on non-abort errors (if it was added)
347292 setMessages((prev) => prev.filter((msg) => msg.id !== assistantMsgId));
348293 handleError(error, onError);
349294 }
350- // For abort errors, keep the partial content (message will be added if it has content)
351295 setStreamingMessageId(null);
352296 } finally {
353297 setIsLoading(false);