根目录原来平铺了构建脚本、运行器配置、两个 .cmd 启动器和一份中文名的 实跑报告,四类东西混在一起,新人分不清哪个是源码、哪个是产物。这次按 职责分层重排: - 构建与检查脚本收进 scripts/:build.mjs、check.mjs - 一键启动器收进 scripts/:start-headless.cmd、start-dev.cmd - 运行器配置独立成 config/runner.config.mjs(日常调参不用重新 build) - 真机测试收进 dev/tests/:real-cdp / real-test / real-e2e / real-run - 运行报告改成 ASCII 名并移入 docs/reports/run-report-v203.md - v2.0.x 时期的 7 份原始抓取片段归档到 docs/archive/v2.0-snapshots/, docs/evidence/ 只留当前版本的有效证据 - 测试每次重新生成的 3 张截图(e2e-01-after-login、e2e-02-playing、 real-chrome-login)移出仓库并加入 .gitignore,改写到 .run-tmp/screenshots/; docs/screenshots/ 只保留手工挑选的 5 张展示图 路径修正:build.mjs 的 ROOT 上跳一级;dev/tests/ 四个脚本 ROOT 上跳两级、 对 runner/browser.mjs 的引用改 ../../;runner/config.mjs 默认配置文件路径改 config/runner.config.mjs;两个 .cmd 的 cd 改为仓库根、start-dev.cmd 指向 dev/serve.mjs;package.json 全部 npm scripts 同步;README、dev/README、证据 文件与源码注释里的路径一并更新。 顺带修掉测试里硬编码的 v2.7.0 断言:版本号改为从 package.json 读取。 验证:npm run build(104798 字节 / 102.3 KB)、npm run check(24/24)、 npm run test:real:headless(24/24 通过)。
89 lines
3.0 KiB
JavaScript
89 lines
3.0 KiB
JavaScript
// 极简 CDP 客户端:Node 18+ 原生 WebSocket,无需 puppeteer / playwright。
|
||
// 只实现本项目真机测试用到的部分:send / waitEvent / 事件堆积。
|
||
// Linux 无图形化服务器 / 容器的浏览器探测与启动参数统一放在 runner/browser.mjs,
|
||
// 这里一并转发,避免 dev 测试脚本和 runner 两套逻辑跑偏。
|
||
import fs from 'node:fs';
|
||
import {
|
||
resolveBrowser as _resolveBrowser, safetyArgs as _safetyArgs, hasDisplay,
|
||
} from '../../runner/browser.mjs';
|
||
|
||
export { cleanStaleSingleton } from '../../runner/browser.mjs';
|
||
|
||
export async function connect(wsUrl) {
|
||
const ws = new WebSocket(wsUrl);
|
||
await new Promise((res, rej) => {
|
||
ws.addEventListener('open', res, { once: true });
|
||
ws.addEventListener('error', rej, { once: true });
|
||
});
|
||
|
||
let id = 0;
|
||
const pending = new Map();
|
||
const events = [];
|
||
const waiters = [];
|
||
const listeners = [];
|
||
|
||
ws.addEventListener('message', (ev) => {
|
||
const msg = JSON.parse(ev.data);
|
||
if (msg.id != null && pending.has(msg.id)) {
|
||
const { res, rej } = pending.get(msg.id);
|
||
pending.delete(msg.id);
|
||
if (msg.error) rej(new Error(msg.error.message));
|
||
else res(msg.result);
|
||
return;
|
||
}
|
||
events.push(msg);
|
||
for (const fn of listeners) {
|
||
try { fn(msg); } catch (e) { /* 忽略订阅者异常 */ }
|
||
}
|
||
for (let i = waiters.length - 1; i >= 0; i--) {
|
||
if (waiters[i].match(msg)) waiters.splice(i, 1)[0].res(msg);
|
||
}
|
||
});
|
||
|
||
const send = (method, params = {}) => new Promise((res, rej) => {
|
||
const mid = ++id;
|
||
pending.set(mid, { res, rej });
|
||
ws.send(JSON.stringify({ id: mid, method, params }));
|
||
});
|
||
|
||
const waitEvent = (name, timeoutMs = 30000) => new Promise((res, rej) => {
|
||
const timer = setTimeout(() => rej(new Error('等待事件超时: ' + name)), timeoutMs);
|
||
waiters.push({
|
||
match: (m) => m.method === name,
|
||
res: (m) => { clearTimeout(timer); res(m.params); },
|
||
});
|
||
});
|
||
|
||
const onEvent = (fn) => { listeners.push(fn); };
|
||
|
||
return { ws, send, waitEvent, onEvent, events, close: () => { try { ws.close(); } catch (e) {} } };
|
||
}
|
||
|
||
export const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
|
||
|
||
export async function httpJson(url, method = 'GET') {
|
||
const r = await fetch(url, { method });
|
||
const t = await r.text();
|
||
try { return JSON.parse(t); } catch (e) { return t; }
|
||
}
|
||
|
||
// ---- Linux 无图形化服务器 / 容器适配 ----
|
||
|
||
// 无显示环境:Linux 上没有 DISPLAY / WAYLAND_DISPLAY 就只能无头
|
||
// (跑在 Xvfb 下时 Xvfb 会设置 DISPLAY,因此这里只判断变量)
|
||
export function forceHeadless() {
|
||
return !hasDisplay();
|
||
}
|
||
|
||
// 按环境变量 / 常见安装位置找到真实存在的浏览器;找不到时返回 null
|
||
export function findChrome(candidates) {
|
||
return _resolveBrowser() || candidates.filter(Boolean).find(function (p) {
|
||
try { return fs.statSync(p).isFile(); } catch (e) { return false; }
|
||
}) || null;
|
||
}
|
||
|
||
// 必须追加给浏览器的平台安全参数(容器 /dev/shm 小、root 无沙箱)
|
||
export function safetyArgs() {
|
||
return _safetyArgs();
|
||
}
|