Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-05-07 08:46:20 +02:00
Code Issues Packages Projects Releases Activity

fix: extract finalizeStream helper, re-throw non-AbortError exceptions

Browse Source 
- Extract duplicated cleanup logic into shared finalizeStream() function
- Add else branch to re-throw non-AbortError exceptions instead of swallowing them
This commit is contained in:
Tomáš Adámek
2026-04-08 16:17:37 +02:00
parent dc40f6b530
commit 01bee95833
1 changed files with 42 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
apps/client/src/widgets/type_widgets/llm_chat/useLlmChat.ts
View File

@@ -257,6 +257,43 @@ export function useLlmChat(
const abortController = new AbortController();
abortControllerRef.current = abortController;
/** Shared cleanup: finalize collected content and reset streaming state. */
function finalizeStream() {
const finalNewMessages: StoredMessage[] = [];
if (thinkingContent) {
finalNewMessages.push({
id: randomString(),
role: "assistant",
content: thinkingContent,
createdAt: new Date().toISOString(),
type: "thinking"
});
}
if (contentBlocks.length > 0) {
finalNewMessages.push({
id: randomString(),
role: "assistant",
content: contentBlocks,
createdAt: new Date().toISOString(),
citations: citations.length > 0 ? citations : undefined,
usage
});
}
if (finalNewMessages.length > 0) {
setMessages([...newMessages, ...finalNewMessages]);
}
setStreamingContent("");
setStreamingBlocks([]);
setStreamingThinking("");
setPendingCitations([]);
setIsStreaming(false);
abortControllerRef.current = null;
}
await streamChatCompletion(
apiMessages,
streamOptions,
@@ -326,75 +363,17 @@ export function useLlmChat(
setIsStreaming(false);
},
onDone: () => {
const finalNewMessages: StoredMessage[] = [];
if (thinkingContent) {
finalNewMessages.push({
id: randomString(),
role: "assistant",
content: thinkingContent,
createdAt: new Date().toISOString(),
type: "thinking"
});
}
if (contentBlocks.length > 0) {
finalNewMessages.push({
id: randomString(),
role: "assistant",
content: contentBlocks,
createdAt: new Date().toISOString(),
citations: citations.length > 0 ? citations : undefined,
usage
});
}
if (finalNewMessages.length > 0) {
const allMessages = [...newMessages, ...finalNewMessages];
setMessages(allMessages);
}
setStreamingContent("");
setStreamingBlocks([]);
setStreamingThinking("");
setPendingCitations([]);
setIsStreaming(false);
abortControllerRef.current = null;
finalizeStream();
}
},
abortController.signal
).catch((e) => {
// AbortError is expected when user stops generation
if (e instanceof DOMException && e.name === "AbortError") {
// Finalize whatever we have so far
const finalNewMessages: StoredMessage[] = [];
if (thinkingContent) {
finalNewMessages.push({
id: randomString(),
role: "assistant",
content: thinkingContent,
createdAt: new Date().toISOString(),
type: "thinking"
});
}
if (contentBlocks.length > 0) {
finalNewMessages.push({
id: randomString(),
role: "assistant",
content: contentBlocks,
createdAt: new Date().toISOString(),
citations: citations.length > 0 ? citations : undefined
});
}
if (finalNewMessages.length > 0) {
setMessages([...newMessages, ...finalNewMessages]);
}
setStreamingContent("");
setStreamingBlocks([]);
setStreamingThinking("");
setPendingCitations([]);
setIsStreaming(false);
abortControllerRef.current = null;
finalizeStream();
} else {
// Re-throw other errors so they are not swallowed
throw e;
}
});
}, [input, isStreaming, messages, selectedModel, enableWebSearch, enableNoteTools, enableExtendedThinking, contextNoteId, supportsExtendedThinking, setMessages]);