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)
203 lines
6.9 KiB
TypeScript
203 lines
6.9 KiB
TypeScript
/**
|
||
* Network Proxy 测试(v0.7.2 覆盖补齐 —— 此前零测试)
|
||
*
|
||
* 锁定 session 级代理应用契约(v0.6.4 P4-5 的回归防线):
|
||
* 1. 配置 proxyUrl → Chromium 双分区(default + agent-browser)+ undici ProxyAgent
|
||
* 2. 环境变量回退(HTTPS_PROXY/HTTP_PROXY)
|
||
* 3. 双空 → 显式直连(direct mode + 直连 Agent)
|
||
* 4. 失败语义:任一通道失败仅 WARN 不阻断主流程
|
||
*/
|
||
|
||
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
||
|
||
const sessionMocks = vi.hoisted(() => ({
|
||
defaultSetProxy: vi.fn(async (..._args: unknown[]) => undefined),
|
||
partitionSetProxy: vi.fn(async (..._args: unknown[]) => undefined),
|
||
throwOnDefaultSetProxy: false,
|
||
throwOnPartitionSetProxy: false,
|
||
}));
|
||
|
||
vi.mock('electron', () => ({
|
||
session: {
|
||
defaultSession: {
|
||
setProxy: (...args: unknown[]) => {
|
||
if (sessionMocks.throwOnDefaultSetProxy) {
|
||
return Promise.reject(new Error('setProxy exploded'));
|
||
}
|
||
return sessionMocks.defaultSetProxy(...args);
|
||
},
|
||
},
|
||
fromPartition: () => ({
|
||
setProxy: (...args: unknown[]) => {
|
||
if (sessionMocks.throwOnPartitionSetProxy) {
|
||
return Promise.reject(new Error('partition setProxy exploded'));
|
||
}
|
||
return sessionMocks.partitionSetProxy(...args);
|
||
},
|
||
}),
|
||
},
|
||
}));
|
||
|
||
vi.mock('electron-log', () => ({
|
||
default: { info: vi.fn(), warn: vi.fn(), error: vi.fn(), debug: vi.fn() },
|
||
}));
|
||
|
||
const undiciMocks = vi.hoisted(() => ({
|
||
setGlobalDispatcher: vi.fn(),
|
||
proxyAgentCalls: [] as string[],
|
||
agentCalls: 0,
|
||
}));
|
||
|
||
vi.mock('undici', () => ({
|
||
Agent: class {
|
||
constructor() {
|
||
undiciMocks.agentCalls++;
|
||
}
|
||
},
|
||
ProxyAgent: class {
|
||
constructor(opts: { uri: string }) {
|
||
undiciMocks.proxyAgentCalls.push(opts.uri);
|
||
}
|
||
},
|
||
setGlobalDispatcher: (...args: unknown[]) => undiciMocks.setGlobalDispatcher(...args),
|
||
}));
|
||
|
||
import { applySessionProxy, isProxyActive } from '../network-proxy';
|
||
|
||
beforeEach(() => {
|
||
sessionMocks.defaultSetProxy.mockClear();
|
||
sessionMocks.partitionSetProxy.mockClear();
|
||
sessionMocks.throwOnDefaultSetProxy = false;
|
||
sessionMocks.throwOnPartitionSetProxy = false;
|
||
undiciMocks.setGlobalDispatcher.mockClear();
|
||
undiciMocks.proxyAgentCalls.length = 0;
|
||
undiciMocks.agentCalls = 0;
|
||
delete process.env['HTTPS_PROXY'];
|
||
delete process.env['HTTP_PROXY'];
|
||
});
|
||
|
||
afterEach(() => {
|
||
delete process.env['HTTPS_PROXY'];
|
||
delete process.env['HTTP_PROXY'];
|
||
});
|
||
|
||
describe('applySessionProxy — 双通道应用', () => {
|
||
it('配置代理 → default + agent-browser 分区均设置 proxyRules,undici 走 ProxyAgent', async () => {
|
||
await applySessionProxy('http://127.0.0.1:7890');
|
||
|
||
const expected = { proxyRules: 'http://127.0.0.1:7890' };
|
||
expect(sessionMocks.defaultSetProxy).toHaveBeenCalledWith(expected);
|
||
expect(sessionMocks.partitionSetProxy).toHaveBeenCalledWith(expected);
|
||
expect(undiciMocks.proxyAgentCalls).toEqual(['http://127.0.0.1:7890']);
|
||
expect(undiciMocks.setGlobalDispatcher).toHaveBeenCalledTimes(1);
|
||
});
|
||
|
||
it('代理地址两侧空白被 trim', async () => {
|
||
await applySessionProxy(' http://proxy.local:8080 ');
|
||
expect(sessionMocks.defaultSetProxy).toHaveBeenCalledWith({
|
||
proxyRules: 'http://proxy.local:8080',
|
||
});
|
||
});
|
||
});
|
||
|
||
describe('applySessionProxy — 环境变量回退链', () => {
|
||
it('未配置 proxyUrl 时回退 HTTPS_PROXY 环境变量', async () => {
|
||
process.env['HTTPS_PROXY'] = 'http://env-proxy:3128';
|
||
await applySessionProxy(null);
|
||
|
||
expect(sessionMocks.defaultSetProxy).toHaveBeenCalledWith({
|
||
proxyRules: 'http://env-proxy:3128',
|
||
});
|
||
});
|
||
|
||
it('HTTPS_PROXY 缺失时回退 HTTP_PROXY', async () => {
|
||
process.env['HTTP_PROXY'] = 'http://env-http:3128';
|
||
await applySessionProxy(undefined);
|
||
|
||
expect(sessionMocks.defaultSetProxy).toHaveBeenCalledWith({
|
||
proxyRules: 'http://env-http:3128',
|
||
});
|
||
});
|
||
|
||
it('双空 → 显式直连(direct mode + 直连 Agent)', async () => {
|
||
await applySessionProxy(null);
|
||
|
||
expect(sessionMocks.defaultSetProxy).toHaveBeenCalledWith({ mode: 'direct' });
|
||
expect(undiciMocks.agentCalls).toBe(1); // 直连 Agent
|
||
expect(undiciMocks.proxyAgentCalls).toHaveLength(0);
|
||
});
|
||
|
||
it('配置空串视为未配置(回退环境变量)', async () => {
|
||
process.env['HTTPS_PROXY'] = 'http://env-fallback:1';
|
||
await applySessionProxy(' ');
|
||
expect(sessionMocks.defaultSetProxy).toHaveBeenCalledWith({
|
||
proxyRules: 'http://env-fallback:1',
|
||
});
|
||
});
|
||
|
||
it('proxyUrl 与 HTTPS_PROXY 同时存在 → proxyUrl 优先(显式配置覆盖环境变量)', async () => {
|
||
process.env['HTTPS_PROXY'] = 'http://env-ignored:3128';
|
||
await applySessionProxy('http://explicit:8080');
|
||
expect(sessionMocks.defaultSetProxy).toHaveBeenCalledWith({
|
||
proxyRules: 'http://explicit:8080',
|
||
});
|
||
});
|
||
|
||
it('HTTPS_PROXY 为空串时回退 HTTP_PROXY', async () => {
|
||
process.env['HTTPS_PROXY'] = '';
|
||
process.env['HTTP_PROXY'] = 'http://fallback:3128';
|
||
await applySessionProxy(null);
|
||
expect(sessionMocks.defaultSetProxy).toHaveBeenCalledWith({
|
||
proxyRules: 'http://fallback:3128',
|
||
});
|
||
});
|
||
});
|
||
|
||
describe('applySessionProxy — 失败语义(绝不阻断主流程)', () => {
|
||
it('Chromium 通道失败 → 仅 WARN,undici 通道照常设置', async () => {
|
||
sessionMocks.throwOnDefaultSetProxy = true;
|
||
await expect(applySessionProxy('http://proxy:1')).resolves.toBeUndefined();
|
||
expect(undiciMocks.proxyAgentCalls).toEqual(['http://proxy:1']);
|
||
});
|
||
|
||
it('agent-browser 分区失败 → 仅 WARN,default 与 undici 不受影响', async () => {
|
||
sessionMocks.throwOnPartitionSetProxy = true;
|
||
await expect(applySessionProxy('http://proxy:2')).resolves.toBeUndefined();
|
||
expect(sessionMocks.defaultSetProxy).toHaveBeenCalledWith({
|
||
proxyRules: 'http://proxy:2',
|
||
});
|
||
expect(undiciMocks.proxyAgentCalls).toEqual(['http://proxy:2']);
|
||
});
|
||
|
||
it('双通道均失败 → 不抛错(resolve undefined)', async () => {
|
||
sessionMocks.throwOnDefaultSetProxy = true;
|
||
sessionMocks.throwOnPartitionSetProxy = true;
|
||
await expect(applySessionProxy('http://proxy:3')).resolves.toBeUndefined();
|
||
});
|
||
});
|
||
|
||
describe('isProxyActive — 代理激活标志(P2-1)', () => {
|
||
it('配置代理后标志为 true', async () => {
|
||
await applySessionProxy('http://proxy:8080');
|
||
expect(isProxyActive()).toBe(true);
|
||
});
|
||
|
||
it('回退环境变量后标志为 true', async () => {
|
||
process.env['HTTPS_PROXY'] = 'http://env:3128';
|
||
await applySessionProxy(null);
|
||
expect(isProxyActive()).toBe(true);
|
||
});
|
||
|
||
it('双空直连后标志为 false', async () => {
|
||
await applySessionProxy(null);
|
||
expect(isProxyActive()).toBe(false);
|
||
});
|
||
|
||
it('先激活再切回直连 → 标志复位为 false', async () => {
|
||
await applySessionProxy('http://proxy:1');
|
||
expect(isProxyActive()).toBe(true);
|
||
await applySessionProxy(null);
|
||
expect(isProxyActive()).toBe(false);
|
||
});
|
||
});
|