feat: v0.7.4 时序语义修正 · 防线实效补漏 · 全量测试翻倍 — 2406 用例 + jsdom 组件测试全量回归
P1 修复面收口: - 超时三态区分(aborted→USER_INTERRUPT / ETIMEDOUT→TIMEOUT / 其余→ERROR), 根治"真实网络超时被误报为用户中断" - 流空闲超时统一(SSE/Ollama/Anthropic 读循环 60s 无数据抛 504 进重试通道) - 同会话并发 sendMessage 防重入(isRunning 守卫)+ 会话存在性预检 + 前置调用移入 try(ERROR+DONE 双事件保证,根治 isStreaming 假死) - 清空审计后 resetChainCache(根治 verifyChain 误报 TAMPERED) - DONE 不再提前清理 TRACE(TERMINATED 统一收尾,补全最终迭代录制) - IME 合成回车不发送(普通 Enter + Cmd/Ctrl+Enter 双分支)+ handleSend 闭包修复 P2 安全纵深: - preload 移除原始 electronAPI 暴露(渲染层零使用,关掉 XSS invoke 任意通道单点风险) - CORS 同源回显根治(仅当前浏览页面 Origin,did-navigate 同步) - MEMORY.md 命令保护正则扩展(括号/$/反引号/< 重定向边界 + 前导路径) - write_file append TOCTOU 统一(open 后 realpath 校验,新文件分支补漏) - 敏感键归一化(authKey 驼峰/连字符命中)+ MCP headers 鉴权值加密落库 - ReDoS 检测共享化(search_files/file_editor 统一拦截) - run_tests/lint_code 升风险 + 需确认 + npx --no-install(执行边界对齐 run_command) - MCP/SearXNG/llm.baseURL/updateFeedUrl 配置类 URL 高危目标校验(IPv6 去括号 + 十六进制映射解析 + 尾点剥离) P3 架构还债: - temperature/maxTokens 热生效(引擎/编排器/SubAgent 三处接线)+ setBatch 单事务落盘 - SessionRecorder flush 竞态根治(flushPromise 等待 + 超限内联落盘 + stopRecording async) - 内存收口(lastConsolidationBySession LRU / subTraces 清理 / 会话删除 disposeEngine) - i18n 全量收口(28 组件 + 353 key 双字典,状态标签改渲染时函数) - 死代码清理(updateTraceStep/HEADER_HEIGHT/void preA/失实注释) - 斜杠菜单 MUI 化 + 删除逻辑收敛 resetSessionState + Blob URL 统一释放 + 用户消息"仅保存"落库(saveMessage 透传前端 id 修复 id 错位) P4 能力演进: - 死循环检测拆分(驻留前置 + 乒乓后置带进度信号,合法交替不误报) - run-lock 30s 超时强制 abort(旧 run 卡死不无限排队) - RETRY 双通道 stream_reset(前端按 run 归属精确清空,根治重试文本重复) - FTS5 trigram 中文子串搜索(迁移 9 版本化 SCHEMA_VERSION=2,≤2 字符 LIKE 回退) - getContextWindow 兜底 1M→128K(未知模型防 413) 测试: - 855 → 2406 用例(+1551,2.8 倍):服务层 +325(含 MemoryManager 51 新用例)、 工具实体 +483、IPC/适配器 +390(含 OpenAI/Anthropic/Ollama 独立套件)、 纯函数表格化 +330;引入 jsdom + @testing-library(14 组件测试文件 249 用例) - 修复 R1(saveMessage id 透传)/ R2(stream_reset 精确归属)两个回归缺陷 - 遗留低危项清零:git-tools 顺序耦合 / web-fetch 真实时间退避 / slo 内存断言 / mcp-security 多余 skipIf / deepseek-balance 命名误导 / 组件 mock 注入脆弱性 版本: 0.7.4; README 同步(工具风险表/版本徽章); 依赖: 移除 @electron-toolkit/preload, 新增 jsdom/@testing-library(devDependencies 不打包) 回归: typecheck 双端 0 错误; ESLint 0/0; Electron ABI 全量 2406/2406 零跳过; 系统 Node 2110 通过 296 跳过(better-sqlite3 ABI)
This commit is contained in:
@@ -130,9 +130,10 @@ describe('BaseAdapter — getContextWindow', () => {
|
||||
expect(adapter.getContextWindow()).toBe(128_000);
|
||||
});
|
||||
|
||||
it('未配置时返回兜底默认值 1M(子类应覆盖真实窗口)', () => {
|
||||
// v0.7.4 P4-5: 兜底从 1M 降至 128K(未知模型按最保守主流窗口预算,防 413)
|
||||
it('未配置时返回兜底默认值 128K(子类应覆盖真实窗口)', () => {
|
||||
const adapter = makeAdapter();
|
||||
expect(adapter.getContextWindow()).toBe(1_000_000);
|
||||
expect(adapter.getContextWindow()).toBe(128_000);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -238,3 +239,234 @@ describe('BaseAdapter — 接口契约', () => {
|
||||
expect(MetonaStreamEventType.TEXT_DELTA).toBe('text_delta');
|
||||
});
|
||||
});
|
||||
|
||||
// ===== 追加:fetchWithTimeout 更多边界 =====
|
||||
|
||||
describe('BaseAdapter — fetchWithTimeout 补充边界', () => {
|
||||
afterEach(() => {
|
||||
vi.unstubAllGlobals();
|
||||
vi.restoreAllMocks();
|
||||
vi.useRealTimers();
|
||||
});
|
||||
|
||||
function hangingFetch(signalKey = 'signal'): ReturnType<typeof vi.fn> {
|
||||
return vi.fn(
|
||||
(_url: string, init: RequestInit) =>
|
||||
new Promise<Response>((resolve, reject) => {
|
||||
const signal = init[signalKey as 'signal'];
|
||||
// 模拟真实 fetch:信号已提前 abort 时同步拒绝
|
||||
if (signal?.aborted) {
|
||||
reject(new DOMException('This operation was aborted', 'AbortError'));
|
||||
return;
|
||||
}
|
||||
signal?.addEventListener('abort', () =>
|
||||
reject(new DOMException('This operation was aborted', 'AbortError')),
|
||||
);
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
it('底层网络错误(非超时非外部 abort)原样抛出', async () => {
|
||||
const adapter = makeAdapter();
|
||||
const fetchMock = vi.fn().mockRejectedValue(new Error('socket hang up'));
|
||||
vi.stubGlobal('fetch', fetchMock);
|
||||
|
||||
await expect(
|
||||
adapter.fetchWithTimeoutPublic('https://api.test.com/v1/chat', {}, 5_000),
|
||||
).rejects.toThrow('socket hang up');
|
||||
});
|
||||
|
||||
it('外部信号已提前 abort → 直接 AbortError,不注册监听', async () => {
|
||||
const adapter = makeAdapter();
|
||||
const controller = new AbortController();
|
||||
controller.abort();
|
||||
adapter.setAbortSignal(controller.signal);
|
||||
const addListenerSpy = vi.spyOn(controller.signal, 'addEventListener');
|
||||
const fetchMock = hangingFetch();
|
||||
vi.stubGlobal('fetch', fetchMock);
|
||||
|
||||
await adapter
|
||||
.fetchWithTimeoutPublic('https://api.test.com/v1/chat', {}, 30_000)
|
||||
.catch((e: Error) => {
|
||||
expect(e.name).toBe('AbortError');
|
||||
});
|
||||
// 已 aborted 的信号走 controller.abort() 分支,不再注册监听
|
||||
expect(addListenerSpy).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('外部 abort 后 listener 被移除(无监听泄漏)', async () => {
|
||||
const adapter = makeAdapter();
|
||||
const controller = new AbortController();
|
||||
adapter.setAbortSignal(controller.signal);
|
||||
const removeListenerSpy = vi.spyOn(controller.signal, 'removeEventListener');
|
||||
const fetchMock = hangingFetch();
|
||||
vi.stubGlobal('fetch', fetchMock);
|
||||
|
||||
const promise = adapter.fetchWithTimeoutPublic('https://api.test.com/v1/chat', {}, 30_000);
|
||||
controller.abort();
|
||||
await promise.catch(() => undefined);
|
||||
expect(removeListenerSpy).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('自身超时但外部信号同时触发 → 外部 abort 优先,抛 AbortError 而非 ETIMEDOUT', async () => {
|
||||
const adapter = makeAdapter();
|
||||
const controller = new AbortController();
|
||||
adapter.setAbortSignal(controller.signal);
|
||||
vi.useFakeTimers();
|
||||
const fetchMock = hangingFetch();
|
||||
vi.stubGlobal('fetch', fetchMock);
|
||||
|
||||
const promise = adapter.fetchWithTimeoutPublic('https://api.test.com/v1/chat', {}, 100);
|
||||
const assertion = expect(promise).rejects.toSatisfy((e: Error & { code?: string }) => {
|
||||
expect(e.name).toBe('AbortError');
|
||||
expect(e.code).not.toBe('ETIMEDOUT');
|
||||
return true;
|
||||
});
|
||||
controller.abort();
|
||||
await vi.advanceTimersByTimeAsync(150);
|
||||
await assertion;
|
||||
});
|
||||
|
||||
it('请求成功后 timer 已清理(fake timers 验证无残留定时器)', async () => {
|
||||
const adapter = makeAdapter();
|
||||
vi.useFakeTimers();
|
||||
const fetchMock = vi.fn().mockResolvedValue(new Response('{"ok":true}'));
|
||||
vi.stubGlobal('fetch', fetchMock);
|
||||
|
||||
await adapter.fetchWithTimeoutPublic('https://api.test.com/v1/chat', {}, 5_000);
|
||||
expect(vi.getTimerCount()).toBe(0);
|
||||
});
|
||||
|
||||
it('超时后 timer 已清理(无泄漏)', async () => {
|
||||
const adapter = makeAdapter();
|
||||
vi.useFakeTimers();
|
||||
const fetchMock = hangingFetch();
|
||||
vi.stubGlobal('fetch', fetchMock);
|
||||
|
||||
const promise = adapter.fetchWithTimeoutPublic('https://api.test.com/v1/chat', {}, 100);
|
||||
const assertion = expect(promise).rejects.toMatchObject({ code: 'ETIMEDOUT' });
|
||||
await vi.advanceTimersByTimeAsync(150);
|
||||
await assertion;
|
||||
expect(vi.getTimerCount()).toBe(0);
|
||||
});
|
||||
});
|
||||
|
||||
// ===== 追加:throwHttpError 错误体解析矩阵 =====
|
||||
|
||||
describe('BaseAdapter — throwHttpError 错误体解析', () => {
|
||||
function makeResponse(status: number, body: string): Response {
|
||||
return new Response(body, { status, statusText: 'Status' });
|
||||
}
|
||||
|
||||
it('OpenAI 格式 {error:{code,message}} 携带 code 时识别 content_filter(大小写不敏感)', async () => {
|
||||
const adapter = makeAdapter();
|
||||
for (const code of ['content_filter', 'Content_Filter', 'CONTENT_FILTER']) {
|
||||
const body = JSON.stringify({ error: { code, message: 'high risk' } });
|
||||
await expect(
|
||||
adapter.throwHttpErrorPublic(makeResponse(400, body), 'Ctx'),
|
||||
).rejects.toBeInstanceOf(ContentFilterError);
|
||||
}
|
||||
});
|
||||
|
||||
it('type 字段承载错误码时同样识别 content_filter(MiMo 兼容)', async () => {
|
||||
const adapter = makeAdapter();
|
||||
const body = JSON.stringify({ error: { type: 'content_filter', message: 'blocked' } });
|
||||
const err = await adapter
|
||||
.throwHttpErrorPublic(makeResponse(403, body), 'MiMo')
|
||||
.catch((e: unknown) => e);
|
||||
expect(err).toBeInstanceOf(ContentFilterError);
|
||||
expect((err as ContentFilterError).providerMessage).toBe('blocked');
|
||||
});
|
||||
|
||||
it('content_filter 无 message → 默认提示文案', async () => {
|
||||
const adapter = makeAdapter();
|
||||
const body = JSON.stringify({ error: { code: 'content_filter' } });
|
||||
const err = await adapter
|
||||
.throwHttpErrorPublic(makeResponse(400, body), 'Ctx')
|
||||
.catch((e: unknown) => e);
|
||||
expect((err as ContentFilterError).providerMessage).toBe('内容触发安全过滤策略');
|
||||
});
|
||||
|
||||
it('顶层 error 结构(无嵌套)识别 content_filter', async () => {
|
||||
const adapter = makeAdapter();
|
||||
const body = JSON.stringify({ code: 'content_filter', message: 'rejected' });
|
||||
const err = await adapter
|
||||
.throwHttpErrorPublic(makeResponse(400, body), 'Ctx')
|
||||
.catch((e: unknown) => e);
|
||||
expect(err).toBeInstanceOf(ContentFilterError);
|
||||
});
|
||||
|
||||
it('非 JSON 错误体 → 普通 Error 携带 status', async () => {
|
||||
const adapter = makeAdapter();
|
||||
const err = await adapter
|
||||
.throwHttpErrorPublic(makeResponse(502, '<html>bad gateway</html>'), 'GW')
|
||||
.catch((e: unknown) => e);
|
||||
expect(err).not.toBeInstanceOf(ContentFilterError);
|
||||
expect((err as Error & { status?: number }).status).toBe(502);
|
||||
expect((err as Error).message).toContain('<html>bad gateway</html>');
|
||||
});
|
||||
|
||||
it('错误体恰好 500 字符不截断;超过 500 字符截断并标注原长度', async () => {
|
||||
const adapter = makeAdapter();
|
||||
const exactly500 = 'x'.repeat(500);
|
||||
const err500 = await adapter
|
||||
.throwHttpErrorPublic(makeResponse(500, exactly500), 'Ctx')
|
||||
.catch((e: unknown) => e);
|
||||
expect((err500 as Error).message).toContain(exactly500);
|
||||
expect((err500 as Error).message).not.toContain('[truncated');
|
||||
|
||||
const over = 'x'.repeat(10_000);
|
||||
const errOver = await adapter
|
||||
.throwHttpErrorPublic(makeResponse(500, over), 'Ctx')
|
||||
.catch((e: unknown) => e);
|
||||
expect((errOver as Error).message).toContain('[truncated 10000 chars]');
|
||||
expect((errOver as Error).message.length).toBeLessThan(1_000);
|
||||
});
|
||||
|
||||
it('错误体为响应头 JSON 但带尾随空白 → 仍能解析(trim 后 JSON.parse 成功路径)', async () => {
|
||||
const adapter = makeAdapter();
|
||||
const body = `{"error":{"code":"content_filter","message":"blocked"}} `;
|
||||
const err = await adapter
|
||||
.throwHttpErrorPublic(makeResponse(400, body), 'Ctx')
|
||||
.catch((e: unknown) => e);
|
||||
// response.text() 返回原文,JSON.parse 对尾随空白容忍 → 走 content_filter 分支
|
||||
expect(err).toBeInstanceOf(ContentFilterError);
|
||||
});
|
||||
|
||||
it('statusText 拼接进错误消息', async () => {
|
||||
const adapter = makeAdapter();
|
||||
const res = new Response('', { status: 429, statusText: 'Too Many Requests' });
|
||||
const err = await adapter.throwHttpErrorPublic(res, 'Ctx').catch((e: unknown) => e);
|
||||
expect((err as Error).message).toContain('429 Too Many Requests');
|
||||
});
|
||||
});
|
||||
|
||||
// ===== 追加:getContextWindow / listModels / healthCheck =====
|
||||
|
||||
describe('BaseAdapter — getContextWindow 回退链', () => {
|
||||
it('contextWindow=0 视为未配置(需 >0)', () => {
|
||||
const adapter = makeAdapter({ contextWindow: 0 });
|
||||
expect(adapter.getContextWindow()).toBe(128_000);
|
||||
});
|
||||
|
||||
it('contextWindow 为负数视为未配置', () => {
|
||||
const adapter = makeAdapter({ contextWindow: -1 });
|
||||
expect(adapter.getContextWindow()).toBe(128_000);
|
||||
});
|
||||
});
|
||||
|
||||
describe('BaseAdapter — listModels 默认映射与 healthCheck', () => {
|
||||
it('listModels 映射保留默认模型顺序', async () => {
|
||||
const adapter = makeAdapter();
|
||||
const models = await adapter.listModels();
|
||||
expect(models).toHaveLength(2);
|
||||
expect(models[0]).toEqual({ id: 'test-model-a' });
|
||||
expect(models[1]).toEqual({ id: 'test-model-b' });
|
||||
});
|
||||
|
||||
it('healthCheck 在 listModels 抛错时返回 false', async () => {
|
||||
const adapter = makeAdapter();
|
||||
vi.spyOn(adapter, 'listModels').mockRejectedValue(new Error('API down'));
|
||||
expect(await adapter.healthCheck()).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user