apunkt/SurfSense
1
0
Fork 0
mirror of https://github.com/MODSetter/SurfSense.git synced 2026-07-06 22:12:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

refactor(chat): use shared authenticated fetch for chat requests

Browse source
This commit is contained in:
Anish Sarkar 2026-06-26 22:04:33 +05:30
parent 4c257e9122
commit 652a25be37
1 changed files with 14 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

52
surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
View file

@ -71,8 +71,7 @@ import { useMessagesSync } from "@/hooks/use-messages-sync";
import { useThreadDetail, useThreadMessages } from "@/hooks/use-thread-queries"; import { useThreadDetail, useThreadMessages } from "@/hooks/use-thread-queries";
import { getAgentFilesystemSelection } from "@/lib/agent-filesystem"; import { getAgentFilesystemSelection } from "@/lib/agent-filesystem";
import { documentsApiService } from "@/lib/apis/documents-api.service"; import { documentsApiService } from "@/lib/apis/documents-api.service";
import { getDesktopAccessToken } from "@/lib/auth-fetch"; import { authenticatedFetch } from "@/lib/auth-fetch";
import { refreshSession } from "@/lib/auth-utils";
import { type ChatFlow, classifyChatError } from "@/lib/chat/chat-error-classifier"; import { type ChatFlow, classifyChatError } from "@/lib/chat/chat-error-classifier";
import { tagPreAcceptSendFailure, toHttpResponseError } from "@/lib/chat/chat-request-errors"; import { tagPreAcceptSendFailure, toHttpResponseError } from "@/lib/chat/chat-request-errors";
import { getMentionDocKey } from "@/lib/chat/mention-doc-key"; import { getMentionDocKey } from "@/lib/chat/mention-doc-key";
@ -289,16 +288,6 @@ const TURN_CANCELLING_BACKOFF_FACTOR = 2;
const TURN_CANCELLING_MAX_DELAY_MS = 1500; const TURN_CANCELLING_MAX_DELAY_MS = 1500;
const RECENT_CANCEL_WINDOW_MS = 5_000; const RECENT_CANCEL_WINDOW_MS = 5_000;
async function getRequestHeadersWithCurrentDesktopAuth(
headers: Record<string, string> = {}
): Promise<Record<string, string>> {
const token = await getDesktopAccessToken({ forceRefresh: true });
return {
...headers,
...(token ? { Authorization: `Bearer ${token}` } : {}),
};
}
function sleep(ms: number): Promise<void> { function sleep(ms: number): Promise<void> {
return new Promise((resolve) => setTimeout(resolve, ms)); return new Promise((resolve) => setTimeout(resolve, ms));
} }
@ -699,19 +688,11 @@ export default function NewChatPage() {
const fetchWithTurnCancellingRetry = useCallback(async (runFetch: () => Promise<Response>) => { const fetchWithTurnCancellingRetry = useCallback(async (runFetch: () => Promise<Response>) => {
const maxAttempts = 4; const maxAttempts = 4;
let didRefreshAuth = false;
for (let attempt = 1; attempt <= maxAttempts; attempt += 1) { for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
const response = await runFetch(); const response = await runFetch();
if (response.ok) { if (response.ok) {
return response; return response;
} }
if (response.status === 401 && !didRefreshAuth) {
didRefreshAuth = true;
const refreshed = await refreshSession();
if (refreshed) {
continue;
}
}
const error = await toHttpResponseError(response); const error = await toHttpResponseError(response);
const withMeta = error as Error & { errorCode?: string; retryAfterMs?: number }; const withMeta = error as Error & { errorCode?: string; retryAfterMs?: number };
const isTurnCancelling = withMeta.errorCode === "TURN_CANCELLING"; const isTurnCancelling = withMeta.errorCode === "TURN_CANCELLING";
@ -952,12 +933,10 @@ export default function NewChatPage() {
const cancelRun = useCallback(async () => { const cancelRun = useCallback(async () => {
if (threadId) { if (threadId) {
try { try {
const response = await fetch( const response = await authenticatedFetch(
buildBackendUrl(`/api/v1/threads/${threadId}/cancel-active-turn`), buildBackendUrl(`/api/v1/threads/${threadId}/cancel-active-turn`),
{ {
method: "POST", method: "POST",
headers: await getRequestHeadersWithCurrentDesktopAuth(),
credentials: "include",
} }
); );
if (response.ok) { if (response.ok) {
@ -1174,13 +1153,12 @@ export default function NewChatPage() {
const hasConnectorIds = mentionPayload.connector_ids.length > 0; const hasConnectorIds = mentionPayload.connector_ids.length > 0;
const hasThreadIds = mentionPayload.thread_ids.length > 0; const hasThreadIds = mentionPayload.thread_ids.length > 0;
const response = await fetchWithTurnCancellingRetry(async () => const response = await fetchWithTurnCancellingRetry(() =>
fetch(buildBackendUrl("/api/v1/new_chat"), { authenticatedFetch(buildBackendUrl("/api/v1/new_chat"), {
method: "POST", method: "POST",
headers: await getRequestHeadersWithCurrentDesktopAuth({ headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
}), },
credentials: "include",
body: JSON.stringify({ body: JSON.stringify({
chat_id: currentThreadId, chat_id: currentThreadId,
user_query: userQuery.trim(), user_query: userQuery.trim(),
@ -1660,13 +1638,12 @@ export default function NewChatPage() {
const selection = await getAgentFilesystemSelection(searchSpaceId, { const selection = await getAgentFilesystemSelection(searchSpaceId, {
localFilesystemEnabled, localFilesystemEnabled,
}); });
const response = await fetchWithTurnCancellingRetry(async () => const response = await fetchWithTurnCancellingRetry(() =>
fetch(buildBackendUrl(`/api/v1/threads/${resumeThreadId}/resume`), { authenticatedFetch(buildBackendUrl(`/api/v1/threads/${resumeThreadId}/resume`), {
method: "POST", method: "POST",
headers: await getRequestHeadersWithCurrentDesktopAuth({ headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
}), },
credentials: "include",
body: JSON.stringify({ body: JSON.stringify({
search_space_id: searchSpaceId, search_space_id: searchSpaceId,
decisions, decisions,
@ -2114,13 +2091,12 @@ export default function NewChatPage() {
requestBody.revert_actions = true; requestBody.revert_actions = true;
} }
} }
const response = await fetchWithTurnCancellingRetry(async () => const response = await fetchWithTurnCancellingRetry(() =>
fetch(getRegenerateUrl(threadId), { authenticatedFetch(getRegenerateUrl(threadId), {
method: "POST", method: "POST",
headers: await getRequestHeadersWithCurrentDesktopAuth({ headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
}), },
credentials: "include",
body: JSON.stringify(requestBody), body: JSON.stringify(requestBody),
signal: controller.signal, signal: controller.signal,
}) })