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)
596 lines
21 KiB
TypeScript
596 lines
21 KiB
TypeScript
/**
|
||
* BrowserWindowManager — 单例浏览器窗口管理器
|
||
*
|
||
* 提供网页加载、截图、JS 执行、内容提取、交互操作能力。
|
||
* 单例懒加载,首次调用时创建,browserClose() 显式销毁。
|
||
*
|
||
* @see docs/Agent网络工具通用设计-v2.md — 第 4 章 browser 浏览器设计
|
||
*/
|
||
|
||
import { BrowserWindow, session } from 'electron';
|
||
import log from 'electron-log';
|
||
// v0.7.3 P2-2: CORS Origin 回显(纯函数在 network-utils,可表测)
|
||
import { corsAllowOrigin, extractOriginHeader } from './network-utils';
|
||
|
||
/** Agent 浏览器专用 session partition — 与主应用 default session 完全隔离 */
|
||
const AGENT_PARTITION = 'persist:metona-agent-browser';
|
||
|
||
export interface BrowserOpenOptions {
|
||
url: string;
|
||
waitSelector?: string;
|
||
}
|
||
|
||
export interface BrowserOpenResult {
|
||
title: string;
|
||
url: string;
|
||
}
|
||
|
||
export interface ScreenshotOptions {
|
||
fullPage?: boolean;
|
||
selector?: string;
|
||
}
|
||
|
||
export interface ScreenshotResult {
|
||
data: string; // Base64 PNG
|
||
width: number;
|
||
height: number;
|
||
}
|
||
|
||
export interface ExtractResult {
|
||
text: string;
|
||
links: Array<{ text: string; url: string }>;
|
||
}
|
||
|
||
export interface ScrollOptions {
|
||
direction?: 'down' | 'up' | 'top' | 'bottom';
|
||
selector?: string;
|
||
}
|
||
|
||
export interface WaitOptions {
|
||
selector?: string;
|
||
timeMs?: number;
|
||
}
|
||
|
||
export class BrowserWindowManager {
|
||
private win: BrowserWindow | null = null;
|
||
private currentUrl: string | null = null;
|
||
/**
|
||
* v0.3.0 修复 + 崩溃修复: 单一操作串行链 — open 与 fetchPageText 共用。
|
||
*
|
||
* 崩溃实证(main.log 三处异常终止点 100% 相关):web_search 并行抓取触发多个
|
||
* web_fetch 同时进入浏览器回退时,后到的 open() 因 URL 不同销毁前一个正在
|
||
* 加载/执行 JS 的窗口(ERR_ABORTED ×3 = 崩溃 ×3;无并发销毁的 53 次回退从未崩溃)。
|
||
* 串行化完整抓取序列(open→等待→evaluate)后,destroy 只会在链上发生。
|
||
*/
|
||
private openChain: Promise<unknown> = Promise.resolve();
|
||
|
||
/** 窗口是否就绪 */
|
||
get ready(): boolean {
|
||
return this.win !== null && !this.win.isDestroyed();
|
||
}
|
||
|
||
/**
|
||
* 崩溃修复: 安全获取当前 webContents — 窗口已销毁时抛出可捕获错误。
|
||
*
|
||
* 原实现的 ensureReady 检查与实际 executeJavaScript/loadURL 调用之间存在
|
||
* 竞态窗口(检查通过后窗口被并发 open() 的 destroy() 销毁),对已销毁
|
||
* webContents 调用 API 会同步抛 "Object has been destroyed" 或触发原生层
|
||
* use-after-free。所有窗口方法改为此守卫 + 即时校验。
|
||
*/
|
||
private safeWebContents(): Electron.WebContents {
|
||
if (!this.win || this.win.isDestroyed()) {
|
||
throw new Error('Browser window not ready or destroyed. Call open first.');
|
||
}
|
||
return this.win.webContents;
|
||
}
|
||
|
||
// ===== browserOpen =====
|
||
|
||
async open(options: BrowserOpenOptions): Promise<BrowserOpenResult> {
|
||
// v0.3.0 修复: 并发互斥锁 — 串行化所有 open 调用,避免竞态导致窗口状态混乱
|
||
const run = async (): Promise<BrowserOpenResult> => this.openInternal(options);
|
||
// 串行化:等待前一个操作完成(open 与 fetchPageText 共用一条链)
|
||
this.openChain = this.openChain.then(run, run);
|
||
return this.openChain as Promise<BrowserOpenResult>;
|
||
}
|
||
|
||
/**
|
||
* 内部实际执行 open(不排队 — 供已在链上的调用方直接使用)
|
||
*
|
||
* 崩溃修复: destroy() 仅在链上(openInternal / close)发生 —— 消除
|
||
* "后到 open 销毁前一个正在加载/执行 JS 的窗口" 的跨链竞态。
|
||
*/
|
||
private async openInternal(options: BrowserOpenOptions): Promise<BrowserOpenResult> {
|
||
// 若已有窗口加载了不同 URL → 先关闭重建
|
||
if (this.win && this.currentUrl !== options.url) {
|
||
this.destroy();
|
||
}
|
||
|
||
if (!this.win) {
|
||
this.win = new BrowserWindow({
|
||
width: 1280,
|
||
height: 800,
|
||
show: false,
|
||
webPreferences: {
|
||
nodeIntegration: false,
|
||
contextIsolation: true,
|
||
sandbox: true,
|
||
// v0.3.0 修复: 独立 partition,与主应用 default session 完全隔离
|
||
// 防止 Agent 浏览产生的 Cookie/缓存/存储污染主应用
|
||
partition: AGENT_PARTITION,
|
||
// v0.3.0 修复: 恢复 webSecurity,CORS 需求通过 session.webRequest 处理
|
||
webSecurity: true,
|
||
plugins: false,
|
||
webviewTag: false,
|
||
},
|
||
});
|
||
|
||
// v0.3.0 修复: 拦截 window.open,Agent 浏览的页面不允许再开新窗口
|
||
this.win.webContents.setWindowOpenHandler(() => ({ action: 'deny' }));
|
||
|
||
// v0.7.4 P2-2 修正: 页面内部整页导航(点击链接/服务端重定向)后同步 currentUrl,
|
||
// 否则 CORS allowedOrigin 停留在旧 origin,新页面跨域请求被误拦(fail-closed 方向,
|
||
// 属功能过度收紧而非安全漏洞)。destroy 时置 null 覆盖清理。
|
||
this.win.webContents.on('did-navigate', (_event, url) => {
|
||
this.currentUrl = url;
|
||
});
|
||
|
||
// v0.3.0 修复: 使用 CORS 放行替代 webSecurity: false
|
||
// 仅对 agent session 放行 CORS,不影响主应用
|
||
// v0.7.3 P2-2 收紧: ACAO 从通配 '*' 改为回显请求 Origin —— 通配值让任意
|
||
// 第三方页面都能借该分区跨域读取;回显等价保留截图/页面自身跨域能力,
|
||
// 并附加 Vary: Origin 防止共享缓存把定向值串到其他 Origin。
|
||
// v0.7.4 P2-2 根治: 回显任意 Origin 仍等价"允许凭据的全开放 CORS"(回显值
|
||
// 非 '*' 时浏览器会携带 cookies 跨域读取)。现仅当请求 Origin 与当前浏览
|
||
// 页面 Origin 完全一致时回显(同源请求本就不需要 CORS,放行无副作用);
|
||
// 跨域 Origin / 无 Origin 一律不加 ACAO 头 —— 保持默认同源策略阻止读取,
|
||
// 彻底堵死"第三方页面借该分区凭据读取跨域资源"的通道。
|
||
const agentSession = session.fromPartition(AGENT_PARTITION);
|
||
agentSession.webRequest.onHeadersReceived((details, callback) => {
|
||
// Electron 类型在此版本的 OnHeadersReceivedListenerDetails 上不暴露
|
||
// requestHeaders —— 显式声明读取面(Origin 大小写不敏感提取)
|
||
const requestHeaders = (
|
||
details as unknown as { requestHeaders?: Record<string, string | string[] | undefined> }
|
||
).requestHeaders;
|
||
const originHeader = extractOriginHeader(requestHeaders);
|
||
// 允许的 Origin = 当前浏览页面的 origin(URL 解析失败视为未知 → 不放行)
|
||
let allowedOrigin: string | null = null;
|
||
if (this.currentUrl) {
|
||
try {
|
||
allowedOrigin = new URL(this.currentUrl).origin;
|
||
} catch {
|
||
allowedOrigin = null;
|
||
}
|
||
}
|
||
const acao = corsAllowOrigin(originHeader, allowedOrigin);
|
||
if (!acao) {
|
||
// 跨域/无 Origin 请求 —— 不加 ACAO,保持浏览器默认同源策略
|
||
callback({ responseHeaders: details.responseHeaders });
|
||
return;
|
||
}
|
||
callback({
|
||
responseHeaders: {
|
||
...details.responseHeaders,
|
||
'Access-Control-Allow-Origin': acao,
|
||
Vary: [...(details.responseHeaders?.Vary ?? []), 'Origin'],
|
||
},
|
||
});
|
||
});
|
||
}
|
||
|
||
if (this.win.isDestroyed()) {
|
||
throw new Error('Browser window destroyed before navigation');
|
||
}
|
||
await this.loadURLWithTimeout(this.win, options.url, 30_000);
|
||
this.currentUrl = options.url;
|
||
|
||
// 可选等待选择器
|
||
if (options.waitSelector) {
|
||
await this.waitForSelector(options.waitSelector, 10_000);
|
||
}
|
||
|
||
const title = await this.evaluate('document.title');
|
||
return { title: String(title ?? ''), url: options.url };
|
||
}
|
||
|
||
// ===== browserScreenshot =====
|
||
|
||
async screenshot(options: ScreenshotOptions = {}): Promise<ScreenshotResult> {
|
||
// 崩溃修复: safeWebContents 即时校验(消除检查-使用间竞态)
|
||
const wc = this.safeWebContents();
|
||
const win = this.win!;
|
||
|
||
// 元素截图
|
||
if (options.selector) {
|
||
const rect = (await wc.executeJavaScript(
|
||
`(() => {
|
||
const el = document.querySelector(${JSON.stringify(options.selector)});
|
||
if (!el) return null;
|
||
const r = el.getBoundingClientRect();
|
||
return { x: r.x, y: r.y, width: r.width, height: r.height };
|
||
})()`,
|
||
true,
|
||
)) as { x: number; y: number; width: number; height: number } | null;
|
||
|
||
if (!rect) throw new Error(`Element not found: ${options.selector}`);
|
||
|
||
const image = await wc.capturePage({
|
||
x: Math.round(rect.x),
|
||
y: Math.round(rect.y),
|
||
width: Math.round(rect.width),
|
||
height: Math.round(rect.height),
|
||
});
|
||
return { data: image.toPNG().toString('base64'), width: rect.width, height: rect.height };
|
||
}
|
||
|
||
// 全页截图
|
||
if (options.fullPage) {
|
||
const dims = (await wc.executeJavaScript(
|
||
`({ width: document.documentElement.scrollWidth, height: document.documentElement.scrollHeight })`,
|
||
true,
|
||
)) as { width: number; height: number };
|
||
|
||
// 先滚动到底部触发懒加载
|
||
await wc.executeJavaScript(`window.scrollTo(0, document.body.scrollHeight)`, true);
|
||
await this.sleep(500);
|
||
await wc.executeJavaScript(`window.scrollTo(0, 0)`, true);
|
||
await this.sleep(300);
|
||
|
||
const image = await wc.capturePage({
|
||
x: 0,
|
||
y: 0,
|
||
width: dims.width,
|
||
height: dims.height,
|
||
});
|
||
return { data: image.toPNG().toString('base64'), width: dims.width, height: dims.height };
|
||
}
|
||
|
||
// 视口截图
|
||
const image = await wc.capturePage();
|
||
const size = win.isDestroyed() ? [0, 0] : win.getContentSize();
|
||
return { data: image.toPNG().toString('base64'), width: size[0], height: size[1] };
|
||
}
|
||
|
||
// ===== browserEvaluate =====
|
||
|
||
/**
|
||
* 在浏览器页面上下文中执行 JS
|
||
*
|
||
* #46 修复: 增强安全防护
|
||
* - 审计日志:记录所有 executeJavaScript 调用,便于事后追溯恶意操作
|
||
* - 超时控制:防止恶意 JS 无限阻塞主进程(Electron 原生不支持超时,用 Promise.race 模拟)
|
||
*
|
||
* 注意:完全沙箱隔离较难实现(需要 iframe/Web Worker + API 白名单),
|
||
* 当前先实现审计 + 超时作为缓解措施。webPreferences 已配置 contextIsolation: true
|
||
* 和 sandbox: true,Electron API 不会被暴露给页面。
|
||
*/
|
||
async evaluate(js: string): Promise<unknown> {
|
||
// 崩溃修复: safeWebContents 即时校验(ensureReady 与实际调用间的竞态会引发
|
||
// "Object has been destroyed" 同步抛出 / 原生层 use-after-free)
|
||
const wc = this.safeWebContents();
|
||
|
||
// #46 修复: 审计日志 — 记录所有 executeJavaScript 调用(截断前 500 字符),便于追溯
|
||
log.info('[BrowserWindowManager] evaluate JS (first 500 chars):', js.substring(0, 500));
|
||
|
||
// #46 修复: 超时控制 — 防止恶意 JS 无限阻塞主进程
|
||
const EVAL_TIMEOUT_MS = 10_000;
|
||
let timer: ReturnType<typeof setTimeout> | undefined;
|
||
try {
|
||
const result = await Promise.race([
|
||
wc.executeJavaScript(js, true),
|
||
new Promise<never>((_, reject) => {
|
||
timer = setTimeout(() => {
|
||
// 审查修复 M17: 超时后中止页面 JS 执行。
|
||
// executeJavaScript 返回的 Promise 无法取消,页面脚本仍会继续运行,
|
||
// 调用 webContents.stop() 中止页面正在执行的脚本(win 可能已销毁,try/catch 兜底)。
|
||
try {
|
||
this.win?.webContents.stop();
|
||
} catch {
|
||
/* 窗口可能已销毁,忽略 */
|
||
}
|
||
reject(new Error(`evaluate timed out after ${EVAL_TIMEOUT_MS}ms`));
|
||
}, EVAL_TIMEOUT_MS);
|
||
}),
|
||
]);
|
||
if (typeof result === 'string') return result;
|
||
return result;
|
||
} finally {
|
||
if (timer) clearTimeout(timer);
|
||
}
|
||
}
|
||
|
||
// ===== browserExtract =====
|
||
|
||
/**
|
||
* 崩溃修复: 排队版页面抓取 — 串行化完整 open→等待→evaluate 序列。
|
||
*
|
||
* web_fetch 浏览器回退的入口。并行回退(web_search 自动抓取并发 3)此前
|
||
* 各自直接 open/evaluate 共享单例,后到者销毁前者的窗口(崩溃根因,
|
||
* 见 openChain 注释)。排队后同一时刻只有一个抓取在使用窗口。
|
||
*
|
||
* @returns 提取的页面正文;失败/内容过短返回 null(调用方走失败路径)
|
||
*/
|
||
async fetchPageText(url: string): Promise<string | null> {
|
||
const run = async (): Promise<string | null> => {
|
||
await this.openInternal({ url });
|
||
await this.sleep(2_500);
|
||
const text = (await this.evaluate(`
|
||
(function() {
|
||
var clone = document.body.cloneNode(true);
|
||
var noise = clone.querySelectorAll('script, style, noscript, nav, header, footer, aside, iframe, svg');
|
||
noise.forEach(function(el) { el.remove(); });
|
||
return clone.innerText || '';
|
||
})();
|
||
`)) as string;
|
||
return text && text.trim() ? text : null;
|
||
};
|
||
this.openChain = this.openChain.then(run, run);
|
||
return this.openChain as Promise<string | null>;
|
||
}
|
||
|
||
async extract(selector?: string): Promise<ExtractResult> {
|
||
const wc = this.safeWebContents();
|
||
|
||
const result = (await wc.executeJavaScript(
|
||
`(() => {
|
||
const root = ${selector ? `document.querySelector(${JSON.stringify(selector)})` : 'document.body'};
|
||
if (!root) return null;
|
||
const clone = root.cloneNode(true);
|
||
clone.querySelectorAll('script, style, noscript, iframe, svg, nav, header, footer, aside').forEach(el => el.remove());
|
||
const text = (clone.innerText || '').trim();
|
||
|
||
const links = [];
|
||
const anchors = (selector ? root : document).querySelectorAll('a[href^="http"]');
|
||
for (const a of anchors) {
|
||
if (links.length >= 50) break;
|
||
const text = (a.textContent || '').trim();
|
||
if (text && a.href) links.push({ text, url: a.href });
|
||
}
|
||
return { text, links };
|
||
})()`,
|
||
true,
|
||
)) as { text: string; links: Array<{ text: string; url: string }> } | null;
|
||
|
||
if (!result) throw new Error(selector ? `Element not found: ${selector}` : 'No body content');
|
||
|
||
return { text: result.text, links: result.links };
|
||
}
|
||
|
||
// ===== browserClick =====
|
||
|
||
async click(selector: string, wait = false): Promise<void> {
|
||
if (wait) {
|
||
await this.waitForSelector(selector, 10_000);
|
||
}
|
||
const wc = this.safeWebContents();
|
||
|
||
const found = await wc.executeJavaScript(
|
||
`(() => {
|
||
const el = document.querySelector(${JSON.stringify(selector)});
|
||
if (!el) return false;
|
||
el.scrollIntoView({ behavior: 'smooth', block: 'center' });
|
||
return true;
|
||
})()`,
|
||
true,
|
||
);
|
||
|
||
if (!found) throw new Error(`Element not found: ${selector}`);
|
||
|
||
await this.sleep(300);
|
||
await this.safeWebContents().executeJavaScript(
|
||
`(() => {
|
||
const el = document.querySelector(${JSON.stringify(selector)});
|
||
if (!el) return;
|
||
el.click();
|
||
})()`,
|
||
true,
|
||
);
|
||
await this.sleep(500);
|
||
}
|
||
|
||
// ===== browserType =====
|
||
|
||
async type(
|
||
selector: string,
|
||
text: string,
|
||
options: { clear?: boolean; submit?: boolean } = {},
|
||
): Promise<void> {
|
||
const wc = this.safeWebContents();
|
||
|
||
const found = await wc.executeJavaScript(
|
||
`(() => {
|
||
const el = document.querySelector(${JSON.stringify(selector)});
|
||
if (!el) return false;
|
||
el.scrollIntoView({ behavior: 'smooth', block: 'center' });
|
||
el.focus();
|
||
return true;
|
||
})()`,
|
||
true,
|
||
);
|
||
|
||
if (!found) throw new Error(`Element not found: ${selector}`);
|
||
await this.sleep(300);
|
||
|
||
// 清空 + 赋值 + 触发事件(兼容 React/Vue)
|
||
await this.safeWebContents().executeJavaScript(
|
||
`(() => {
|
||
const el = document.querySelector(${JSON.stringify(selector)});
|
||
if (!el) return;
|
||
${options.clear ? 'el.value = "";' : ''}
|
||
el.value += ${JSON.stringify(text)};
|
||
el.dispatchEvent(new Event('input', { bubbles: true }));
|
||
el.dispatchEvent(new Event('change', { bubbles: true }));
|
||
})()`,
|
||
true,
|
||
);
|
||
|
||
if (options.submit) {
|
||
await this.safeWebContents().executeJavaScript(
|
||
`(() => {
|
||
const el = document.querySelector(${JSON.stringify(selector)});
|
||
if (!el) return;
|
||
if (el.form) el.form.submit();
|
||
else el.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true }));
|
||
})()`,
|
||
true,
|
||
);
|
||
await this.sleep(1_000);
|
||
} else {
|
||
await this.sleep(300);
|
||
}
|
||
}
|
||
|
||
// ===== browserScroll =====
|
||
|
||
async scroll(options: ScrollOptions = {}): Promise<void> {
|
||
const wc = this.safeWebContents();
|
||
|
||
if (options.selector) {
|
||
await wc.executeJavaScript(
|
||
`(() => {
|
||
const el = document.querySelector(${JSON.stringify(options.selector)});
|
||
if (el) el.scrollIntoView({ behavior: 'smooth', block: 'center' });
|
||
})()`,
|
||
true,
|
||
);
|
||
return;
|
||
}
|
||
|
||
const direction = options.direction ?? 'down';
|
||
const js =
|
||
{
|
||
down: 'window.scrollBy(0, 500)',
|
||
up: 'window.scrollBy(0, -500)',
|
||
top: 'window.scrollTo(0, 0)',
|
||
bottom: 'window.scrollTo(0, document.body.scrollHeight)',
|
||
}[direction] ?? 'window.scrollBy(0, 500)';
|
||
|
||
await wc.executeJavaScript(js, true);
|
||
await this.sleep(300);
|
||
}
|
||
|
||
// ===== browserWait =====
|
||
|
||
async wait(options: WaitOptions = {}): Promise<void> {
|
||
if (options.selector) {
|
||
await this.waitForSelector(options.selector, options.timeMs ?? 10_000);
|
||
} else {
|
||
await this.sleep(options.timeMs ?? 1_000);
|
||
}
|
||
}
|
||
|
||
// ===== browserClose =====
|
||
|
||
/**
|
||
* 关闭并清理(应用退出 / browser close 动作时调用)
|
||
*
|
||
* 崩溃修复: session 存储清理从 destroy() 迁移至此 —— destroy() 此前对
|
||
* 仍在使用中的 partition(紧随其后就会新建窗口)fire-and-forget 调用
|
||
* clearStorageData/clearCache,与新窗口初始化并发执行,构成原生存储层
|
||
* 竞态(崩溃引爆点)。close() 是终态路径,await 清理与窗口销毁不再交叠。
|
||
*/
|
||
async close(): Promise<void> {
|
||
this.destroy();
|
||
try {
|
||
const ses = session.fromPartition(AGENT_PARTITION);
|
||
await ses.clearStorageData({
|
||
storages: [
|
||
'cookies',
|
||
'localstorage',
|
||
'indexdb',
|
||
'shadercache',
|
||
'serviceworkers',
|
||
'cachestorage',
|
||
],
|
||
});
|
||
await ses.clearCache();
|
||
} catch {
|
||
/* ignore */
|
||
}
|
||
}
|
||
|
||
// ===== 内部辅助 =====
|
||
|
||
/** 带超时的 loadURL(Electron 原生不支持 timeout 选项) */
|
||
private async loadURLWithTimeout(
|
||
win: BrowserWindow,
|
||
url: string,
|
||
timeoutMs: number,
|
||
): Promise<void> {
|
||
let timer: NodeJS.Timeout | null = null;
|
||
const timeoutPromise = new Promise<never>((_, reject) => {
|
||
timer = setTimeout(
|
||
() => reject(new Error(`Page load timeout after ${timeoutMs}ms: ${url}`)),
|
||
timeoutMs,
|
||
);
|
||
});
|
||
|
||
// 崩溃修复: Race 落败方的 rejection 必须兜底 —— 超时/窗口销毁先触发时,
|
||
// loadURL 随后以 ERR_ABORTED 拒绝,无人处理会成为 unhandledRejection
|
||
const loadPromise = win.loadURL(url);
|
||
loadPromise.catch(() => {
|
||
/* 落败方 rejection 已由 race 胜者处理,此处仅防漏 */
|
||
});
|
||
|
||
try {
|
||
await Promise.race([loadPromise, timeoutPromise]);
|
||
} catch (e) {
|
||
// v0.3.0 修复: 超时后停止页面加载,避免后台继续消耗网络和 CPU 资源
|
||
if (!win.isDestroyed()) {
|
||
try {
|
||
win.webContents.stop();
|
||
} catch {
|
||
/* ignore */
|
||
}
|
||
}
|
||
throw e;
|
||
} finally {
|
||
if (timer) clearTimeout(timer);
|
||
}
|
||
}
|
||
|
||
private async waitForSelector(selector: string, timeoutMs: number): Promise<void> {
|
||
const startTime = Date.now();
|
||
while (Date.now() - startTime < timeoutMs) {
|
||
// 崩溃修复: 循环内即时校验(窗口可能在等待期间被链上操作销毁)
|
||
const found = await this.safeWebContents().executeJavaScript(
|
||
`!!document.querySelector(${JSON.stringify(selector)})`,
|
||
true,
|
||
);
|
||
if (found) return;
|
||
await this.sleep(300);
|
||
}
|
||
throw new Error(`Timeout waiting for selector: ${selector}`);
|
||
}
|
||
|
||
private destroy(): void {
|
||
if (this.win && !this.win.isDestroyed()) {
|
||
try {
|
||
this.win.webContents.stop();
|
||
} catch {
|
||
/* ignore */
|
||
}
|
||
try {
|
||
this.win.destroy();
|
||
} catch {
|
||
/* ignore */
|
||
}
|
||
}
|
||
this.win = null;
|
||
this.currentUrl = null;
|
||
// 崩溃修复: 移除 session 清理 —— 原实现 fire-and-forget 清理仍在使用的
|
||
// partition,与紧随其后的新窗口创建并发,构成原生存储层竞态。
|
||
// 存储清理迁移至 close()(终态路径,见方法注释)。
|
||
}
|
||
|
||
private sleep(ms: number): Promise<void> {
|
||
return new Promise((resolve) => setTimeout(resolve, ms));
|
||
}
|
||
|
||
/** 应用退出时清理(close 现为异步 — 含 session 存储终态清理) */
|
||
static async cleanup(manager: BrowserWindowManager | null): Promise<void> {
|
||
if (manager) await manager.close();
|
||
log.info('[BrowserWindowManager] Cleaned up');
|
||
}
|
||
}
|