修复:自动回收失效隧道占用并限制首次连接等待时间

This commit is contained in:
2026-10-23 17:47:29 +08:00
parent 3519dd0891
commit 8684ce1a4d
8 changed files with 216 additions and 13 deletions
+15 -11
View File
@@ -1,6 +1,7 @@
import { WORKSPACE_INVALIDATED } from './pageCache';
import { consumeEventStream, type StreamEvent } from './eventStream';
import { publicErrorMessage } from './publicDataDisplay';
import { RequestTimeoutError, withRequestDeadline } from './requestDeadline';
import type {
AuthUser,
FilterField,
@@ -65,16 +66,19 @@ async function readResponse<T>(response: Response): Promise<T> {
return payload as T;
}
async function request<T>(path: string, init: RequestInit = {}): Promise<T> {
async function request<T>(path: string, init: RequestInit = {}, timeoutMs?: number): Promise<T> {
const headers = new Headers(init.headers);
if (init.body && !(init.body instanceof FormData) && !headers.has('Content-Type')) headers.set('Content-Type', 'application/json');
const response = await fetchApi(path, {
...init,
headers,
credentials: 'same-origin',
cache: 'no-store',
});
return readResponse<T>(response);
const send = async (signal = init.signal) => {
const response = await fetchApi(path, { ...init, signal, headers, credentials: 'same-origin', cache: 'no-store' });
return readResponse<T>(response);
};
if (!timeoutMs) return send();
try { return await withRequestDeadline(signal => send(signal), timeoutMs); }
catch (error) {
if (error instanceof RequestTimeoutError) throw new ApiError(408, '连接质量数据服务超时,请点击重新连接;服务恢复后可继续使用。');
throw error;
}
}
async function requestBlob(path: string, signal?: AbortSignal): Promise<{ blob: Blob; filename: string }> {
@@ -113,7 +117,7 @@ async function readEventStream(path: string, options: { signal?: AbortSignal; la
}
export async function refreshCsrf(): Promise<string> {
const result = await request<{ token: string }>('/api/auth/csrf');
const result = await request<{ token: string }>('/api/auth/csrf', {}, 8000);
csrfToken = result.token;
return csrfToken;
}
@@ -143,14 +147,14 @@ async function mutateForm<T>(path: string, body: FormData): Promise<T> {
}
export const api = {
workspaceState() { return request<{ authRevision: string; dataRevision: string }>('/api/workspace/state'); },
workspaceState() { return request<{ authRevision: string; dataRevision: string }>('/api/workspace/state', {}, 8000); },
filterFields(manage = false) { return request<FilterField[]>(`/api/filter-fields?manage=${manage}`); },
filterFieldOptions(key: string, search = '') { return request<{ values: string[]; hasMore: boolean }>(`/api/filter-fields/options?${toQuery({key, search})}`); },
filterFieldColumns() { return request<{ black: string[]; bright: string[] }>('/api/filter-fields/columns'); },
saveFilterFields(fields: FilterField[]) { return mutate<FilterField[]>('/api/filter-fields', fields, 'PUT'); },
refreshCsrf,
async me(): Promise<AuthUser> {
const result = await request<{ user: AuthUser }>('/api/auth/me');
const result = await request<{ user: AuthUser }>('/api/auth/me', {}, 8000);
return result.user;
},
login(username: string, password: string) {