fix: close browser session lifecycle gaps
This commit is contained in:
@@ -40,6 +40,9 @@ function mapError(error: FastifyError | Error): {
|
||||
if ("statusCode" in error && error.statusCode === 413) {
|
||||
return { statusCode: 413, code: "PAYLOAD_TOO_LARGE", message: "Request payload is too large", details: {} };
|
||||
}
|
||||
if ("statusCode" in error && error.statusCode === 400) {
|
||||
return { statusCode: 400, code: "INVALID_REQUEST_BODY", message: "Request body could not be processed", details: {} };
|
||||
}
|
||||
return { statusCode: 500, code: "INTERNAL_ERROR", message: "Internal server error", details: {} };
|
||||
}
|
||||
|
||||
|
||||
@@ -53,4 +53,21 @@ describe("HTTP API", () => {
|
||||
expect(busy.statusCode).toBe(409);
|
||||
expect(busy.body).not.toContain("stack");
|
||||
});
|
||||
|
||||
it("keeps Fastify body parse errors as safe client errors", async () => {
|
||||
const { app } = createTestApp();
|
||||
apps.push(app);
|
||||
const response = await app.inject({
|
||||
method: "POST",
|
||||
url: "/api/sessions",
|
||||
headers: { "content-type": "application/json" },
|
||||
payload: "",
|
||||
});
|
||||
|
||||
expect(response.statusCode).toBe(400);
|
||||
expect(response.json()).toMatchObject({
|
||||
error: { code: "INVALID_REQUEST_BODY", message: "Request body could not be processed" },
|
||||
});
|
||||
expect(response.body).not.toContain("stack");
|
||||
});
|
||||
});
|
||||
|
||||
+12
-1
@@ -14,6 +14,7 @@ import { HarnessClientStore } from "./store/harness-client-store.js";
|
||||
|
||||
type AppStore = HarnessRuntimeStore & {
|
||||
start(): Promise<void>;
|
||||
dispose?: () => Promise<void>;
|
||||
getModelConfig(): Promise<{ modelConfig: ModelView }>;
|
||||
putModelConfig?: (input: ModelConnectionInput) => Promise<{ modelConfig: ModelView }>;
|
||||
testModelConfig?: () => Promise<{ status: "ok" | "deferred"; message: string }>;
|
||||
@@ -87,7 +88,17 @@ export function App({ store: suppliedStore, autoStart = true, modelConfigured: s
|
||||
modelLabel: model.modelId ?? "No model",
|
||||
supportsImages: model.supportsImages ?? false,
|
||||
onOpenSettings: () => setSettingsOpen(true),
|
||||
onReset: () => window.location.reload(),
|
||||
onReset: () => {
|
||||
if (store.dispose === undefined) {
|
||||
window.location.reload();
|
||||
return;
|
||||
}
|
||||
void store.dispose()
|
||||
.then(() => store.start())
|
||||
.then(() => store.getModelConfig())
|
||||
.then((response) => setModel(response.modelConfig))
|
||||
.catch(() => undefined);
|
||||
},
|
||||
}}
|
||||
skills={<SkillsPanel skills={snapshot.skills} />}
|
||||
chat={<Thread
|
||||
|
||||
@@ -87,7 +87,7 @@ export class HarnessApi {
|
||||
const { body, ...init } = options;
|
||||
const isForm = body instanceof FormData;
|
||||
const headers = new Headers(init.headers);
|
||||
if (!isForm) headers.set("Content-Type", "application/json");
|
||||
if (body !== undefined && !isForm) headers.set("Content-Type", "application/json");
|
||||
const response = await fetch(`${this.baseUrl}${path}`, {
|
||||
...init,
|
||||
headers,
|
||||
|
||||
@@ -83,17 +83,17 @@ export function ModelSettings({ open, busy, current, onClose, onSave, onTest, on
|
||||
<button className="icon-button" type="button" aria-label="关闭模型设置" onClick={onClose}><X size={19} /></button>
|
||||
</div>
|
||||
<p className="settings-intro">密钥仅发送到本机服务并保存在当前会话内存中,不会写入浏览器存储。</p>
|
||||
<form className="settings-form" onSubmit={(event) => void submit(event)}>
|
||||
<form className="settings-form" autoComplete="off" onSubmit={(event) => void submit(event)}>
|
||||
<label>服务商<select ref={firstInput} value={providerId} onChange={(event) => {
|
||||
const value = event.target.value;
|
||||
setProviderId(value);
|
||||
setApi(value === "anthropic" ? "anthropic-messages" : "openai-responses");
|
||||
}}><option value="openai">OpenAI</option><option value="anthropic">Anthropic</option><option value="compatible">OpenAI Compatible</option></select></label>
|
||||
<label>API 类型<select value={api} onChange={(event) => setApi(event.target.value as ModelApi)}><option value="openai-responses">OpenAI Responses</option><option value="openai-completions">OpenAI Completions</option><option value="anthropic-messages">Anthropic Messages</option></select></label>
|
||||
<label className="settings-form__wide">Base URL(可选)<input type="url" value={baseUrl} placeholder="https://api.example.com/v1" onChange={(event) => setBaseUrl(event.target.value)} /></label>
|
||||
<label>模型 ID<input aria-label="模型 ID" required value={modelId} onChange={(event) => setModelId(event.target.value)} /></label>
|
||||
<label className="settings-form__wide">Base URL(可选)<input name="agent-base-url" autoComplete="off" type="url" value={baseUrl} placeholder="https://api.example.com/v1" onChange={(event) => setBaseUrl(event.target.value)} /></label>
|
||||
<label>模型 ID<input name="agent-model-id" autoComplete="off" aria-label="模型 ID" required value={modelId} onChange={(event) => setModelId(event.target.value)} /></label>
|
||||
<label>图片能力<select value={supportsImages ? "yes" : "no"} onChange={(event) => setSupportsImages(event.target.value === "yes")}><option value="yes">支持图片</option><option value="no">仅文本</option></select></label>
|
||||
<label className="settings-form__wide">API Key<div className="password-field"><KeyRound size={17} /><input aria-label="API Key" type={reveal ? "text" : "password"} value={apiKey} autoComplete="off" onChange={(event) => setApiKey(event.target.value)} /><button type="button" aria-label={reveal ? "隐藏 API Key" : "显示 API Key"} onClick={() => setReveal((value) => !value)}>{reveal ? <EyeOff size={17} /> : <Eye size={17} />}</button></div></label>
|
||||
<label className="settings-form__wide">API Key<div className="password-field"><KeyRound size={17} /><input name="agent-api-key" aria-label="API Key" type={reveal ? "text" : "password"} value={apiKey} autoComplete="new-password" onChange={(event) => setApiKey(event.target.value)} /><button type="button" aria-label={reveal ? "隐藏 API Key" : "显示 API Key"} onClick={() => setReveal((value) => !value)}>{reveal ? <EyeOff size={17} /> : <Eye size={17} />}</button></div></label>
|
||||
{saved?.keyHint === undefined ? null : <p className="key-hint">服务器中的密钥:<strong>{saved.keyHint}</strong></p>}
|
||||
{message === "" ? null : <p className="settings-message" role="status">{message}</p>}
|
||||
{busy ? <p className="settings-message settings-message--warning">运行期间不能更改模型配置</p> : null}
|
||||
|
||||
@@ -38,6 +38,7 @@ export class HarnessClientStore {
|
||||
public async dispose(): Promise<void> {
|
||||
this.#eventSource?.close();
|
||||
this.#eventSource = undefined;
|
||||
this.#starting = undefined;
|
||||
const sessionId = this.#state.sessionId;
|
||||
if (sessionId !== undefined) await this.api.deleteSession(sessionId);
|
||||
this.#setState(createInitialHarnessState());
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
.side-panel { display: flex; flex-direction: column; overflow: hidden; background: var(--surface); }
|
||||
.chat-panel { background: var(--bg); }
|
||||
.mobile-tabs { display: none; }
|
||||
@media (max-width: 1080px) {
|
||||
@media (min-width: 721px) and (max-width: 1080px) {
|
||||
.workspace-grid { grid-template-columns: minmax(210px, 240px) minmax(400px, 1fr); }
|
||||
.workspace-grid > div:last-child { display: none; }
|
||||
}
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||
import { HarnessApi } from "../src/api/harness-api.js";
|
||||
|
||||
afterEach(() => vi.unstubAllGlobals());
|
||||
|
||||
describe("HarnessApi request headers", () => {
|
||||
it("does not claim an empty POST contains JSON", async () => {
|
||||
const fetchMock = vi.fn().mockResolvedValue(new Response(JSON.stringify({
|
||||
sessionId: "ses_1",
|
||||
requestId: "req_1",
|
||||
}), { status: 201, headers: { "Content-Type": "application/json" } }));
|
||||
vi.stubGlobal("fetch", fetchMock);
|
||||
|
||||
await new HarnessApi().createSession();
|
||||
|
||||
const request = fetchMock.mock.calls[0]?.[1] as RequestInit;
|
||||
expect(new Headers(request.headers).has("Content-Type")).toBe(false);
|
||||
expect(request.body).toBeUndefined();
|
||||
});
|
||||
|
||||
it("sets JSON content type when a structured body is present", async () => {
|
||||
const fetchMock = vi.fn().mockResolvedValue(new Response(JSON.stringify({
|
||||
runId: "run_1",
|
||||
requestId: "req_1",
|
||||
}), { status: 202, headers: { "Content-Type": "application/json" } }));
|
||||
vi.stubGlobal("fetch", fetchMock);
|
||||
|
||||
await new HarnessApi().sendMessage("ses_1", { text: "hello", attachmentIds: [] });
|
||||
|
||||
const request = fetchMock.mock.calls[0]?.[1] as RequestInit;
|
||||
expect(new Headers(request.headers).get("Content-Type")).toBe("application/json");
|
||||
expect(request.body).toBe(JSON.stringify({ text: "hello", attachmentIds: [] }));
|
||||
});
|
||||
});
|
||||
@@ -1,7 +1,7 @@
|
||||
import { render, screen } from "@testing-library/react";
|
||||
import "@testing-library/jest-dom/vitest";
|
||||
import userEvent from "@testing-library/user-event";
|
||||
import { describe, expect, it, vi } from "vitest";
|
||||
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||
import { App } from "../src/App.js";
|
||||
import { createInitialHarnessState, type HarnessClientState } from "../src/store/reducer.js";
|
||||
|
||||
@@ -24,6 +24,7 @@ function makeStore() {
|
||||
subscribe: () => () => undefined,
|
||||
sendMessage,
|
||||
cancel: vi.fn().mockResolvedValue({ cancelled: false }),
|
||||
dispose: vi.fn().mockResolvedValue(undefined),
|
||||
start: vi.fn().mockResolvedValue(undefined),
|
||||
getModelConfig: vi.fn().mockResolvedValue({
|
||||
modelConfig: { configured: true, source: "environment", providerId: "openai", api: "openai-responses", modelId: "gpt-test", supportsImages: true },
|
||||
@@ -31,6 +32,8 @@ function makeStore() {
|
||||
};
|
||||
}
|
||||
|
||||
afterEach(() => vi.unstubAllGlobals());
|
||||
|
||||
describe("App", () => {
|
||||
it("renders the three primary work areas", () => {
|
||||
render(<App store={makeStore()} autoStart={false} modelConfigured />);
|
||||
@@ -55,4 +58,37 @@ describe("App", () => {
|
||||
expect(screen.getByRole("button", { name: "发送消息" })).toBeDisabled();
|
||||
expect(screen.getByText("请先配置模型连接")).toBeVisible();
|
||||
});
|
||||
|
||||
it("switches to the event timeline in the mobile tab layout", async () => {
|
||||
vi.stubGlobal("matchMedia", vi.fn(() => ({
|
||||
matches: true,
|
||||
media: "(max-width: 720px)",
|
||||
onchange: null,
|
||||
addEventListener: vi.fn(),
|
||||
removeEventListener: vi.fn(),
|
||||
addListener: vi.fn(),
|
||||
removeListener: vi.fn(),
|
||||
dispatchEvent: vi.fn(),
|
||||
})));
|
||||
const user = userEvent.setup();
|
||||
render(<App store={makeStore()} autoStart={false} modelConfigured />);
|
||||
|
||||
await user.click(screen.getByRole("tab", { name: "Events" }));
|
||||
|
||||
expect(screen.getByRole("tab", { name: "Events" })).toHaveAttribute("aria-selected", "true");
|
||||
expect(screen.getByRole("region", { name: "Event Timeline" })).toBeVisible();
|
||||
expect(screen.queryByRole("main", { name: "Streaming Chat" })).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("deletes the old session before starting a reset session", async () => {
|
||||
const user = userEvent.setup();
|
||||
const store = makeStore();
|
||||
render(<App store={store} autoStart={false} modelConfigured />);
|
||||
|
||||
await user.click(screen.getByRole("button", { name: "重置训练会话" }));
|
||||
|
||||
expect(store.dispose).toHaveBeenCalledTimes(1);
|
||||
expect(store.start).toHaveBeenCalledTimes(1);
|
||||
expect(store.dispose.mock.invocationCallOrder[0]).toBeLessThan(store.start.mock.invocationCallOrder[0] ?? 0);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
import { describe, expect, it, vi } from "vitest";
|
||||
import type { HarnessApi } from "../src/api/harness-api.js";
|
||||
import { HarnessClientStore } from "../src/store/harness-client-store.js";
|
||||
|
||||
describe("HarnessClientStore lifecycle", () => {
|
||||
it("deletes the current session and can start a fresh session after dispose", async () => {
|
||||
const createSession = vi.fn()
|
||||
.mockResolvedValueOnce({ sessionId: "ses_1", requestId: "req_1" })
|
||||
.mockResolvedValueOnce({ sessionId: "ses_2", requestId: "req_2" });
|
||||
const deleteSession = vi.fn().mockResolvedValue({ deleted: true, requestId: "req_delete" });
|
||||
const api = {
|
||||
createSession,
|
||||
deleteSession,
|
||||
getSkills: vi.fn().mockResolvedValue({ skills: [], requestId: "req_skills" }),
|
||||
eventsUrl: (sessionId: string) => `/api/sessions/${sessionId}/events`,
|
||||
} as unknown as HarnessApi;
|
||||
const eventSources: Array<{ close: ReturnType<typeof vi.fn> }> = [];
|
||||
const store = new HarnessClientStore(api, () => {
|
||||
const source = { addEventListener: vi.fn(), close: vi.fn() };
|
||||
eventSources.push(source);
|
||||
return source;
|
||||
});
|
||||
|
||||
await store.start();
|
||||
expect(store.getSnapshot().sessionId).toBe("ses_1");
|
||||
await store.dispose();
|
||||
await store.start();
|
||||
|
||||
expect(deleteSession).toHaveBeenCalledWith("ses_1");
|
||||
expect(createSession).toHaveBeenCalledTimes(2);
|
||||
expect(eventSources[0]?.close).toHaveBeenCalledTimes(1);
|
||||
expect(store.getSnapshot().sessionId).toBe("ses_2");
|
||||
});
|
||||
});
|
||||
@@ -10,6 +10,8 @@ describe("ModelSettings", () => {
|
||||
const save = vi.fn().mockResolvedValue({ configured: true, source: "session", keyHint: "••••cret" });
|
||||
render(<ModelSettings open onClose={vi.fn()} busy={false} onSave={save} onTest={vi.fn()} onClear={vi.fn()} />);
|
||||
|
||||
expect(screen.getByLabelText("模型 ID")).toHaveAttribute("autocomplete", "off");
|
||||
expect(screen.getByLabelText("API Key")).toHaveAttribute("autocomplete", "new-password");
|
||||
await user.type(screen.getByLabelText("API Key"), "sk-browser-secret");
|
||||
await user.type(screen.getByLabelText("模型 ID"), "gpt-test");
|
||||
await user.click(screen.getByRole("button", { name: "保存配置" }));
|
||||
|
||||
Reference in New Issue
Block a user