新增无头运行能力,解决 Linux 无图形化服务器上无法常驻的问题;同时改掉 "遇到考试课/无进展课就跳过"的策略,改为在同门课上退避重试。 - runner/:自己起无头 Chromium,用 CDP 把构建产物注入页面主世界(等价 @grant none),不装插件、不需要桌面环境或 Xvfb;含浏览器探测与启动参数、 持久化 profile、陈旧 SingletonLock 清理、优雅退出、日志轮转、启动预检 - runner.config.mjs / start-headless.cmd:通用配置 + Windows 一键入口; 凭据只走 YUN_XUE_TANG_USR / YUN_XUE_TANG_PWD 环境变量 - src/exam.js:含考试章节的课程自动进考试 → 开始/继续 → 空卷提交 → 确定, 交卷后靠平台记账推进课程;maxExamTries 限制同门课交卷次数,防不记账时死循环 - 去掉跳过与黑名单:没学完就退避重试(30s 起翻倍,最长 5 分钟), 同门课超过 maxCourseRetries 次才停整轮并提示,替代原 maxConsecutiveFailures - 每完成一门都重新拉列表接口取平台实时状态再选下一门,避免用陈旧队列 - 学习进度改存 sessionStorage(yun-xue-tang-run-state-v3),整页跳转/刷新可续; 运行开关不跨会话,浏览器重启后必须显式开跑 - dev/:新增 real-cdp / real-run / real-test / real-e2e 实跑脚本与 check.mjs 统一静态检查(JS 22 + 批处理 2),替代逐文件 node --check - docs/evidence/headless-linux-evidence.txt + 实跑截图,README 补无头部署章节
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();
|
||
}
|