feat: 每日积分模式与 Bark 完成提醒
- 按课时类型计分:文档 1 / 视频 3 / 音频 2 / 微课 2,每次 3 分,单日封顶 24 分;满额换类,无内容即停 - 积分计数落 localStorage,跨刷新/重启保留、跨天清零;面板与无头 TUI 都显示今日积分 - 运行器自己收尾时通过 Bark 推送今日积分、完成门数、用时和结束原因;手动停止与 --check 不推送 - 新增 --points-mode / --bark-* 参数及对应 YUN_XUE_TANG_* 环境变量 - 补充 points / notify 离线回归测试与 OpenSpec 配置 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
1 parent
17217dbeb1
commit
0eb4c40629
31 files changed
+2954
-21
No files matched your search
+35
-3
@@ -26,6 +26,7 @@ const DEFAULTS = {
|
||||
maxCourses: 0, // 0 = 不限(一直刷到没有未学完的课)
|
||||
budgetMinutes: 0, // 0 = 不限
|
||||
preferShort: true,
|
||||
pointsMode: true, // 每日积分模式:按课时类型计分,四类封顶后停止(文档1/视频3/音频2/微课2)
|
||||
restartMinutes: 0, // 0 = 停下就退出
|
||||
idleRestartMinutes: 30,
|
||||
origin: 'https://kfmic.yunxuetang.cn',
|
||||
@@ -39,6 +40,12 @@ const DEFAULTS = {
|
||||
logMaxBytes: 5 * 1024 * 1024,
|
||||
tui: true, // true = 交互式终端里启用面板;非 TTY 自动退化为逐行日志
|
||||
color: true, // false = 面板不用 ANSI 颜色(也认 NO_COLOR 环境变量)
|
||||
// Bark 推送:运行器自己收尾时发一条手机通知(正常刷完 / 卡死 / 登录失败)。
|
||||
// barkUrl 是含设备 key 的地址(https://api.day.app/<key>),留空 = 不推送。
|
||||
// key 等价于「谁能往你手机推通知」,别提交到公开仓库;可用环境变量覆盖。
|
||||
barkUrl: '',
|
||||
barkGroup: '', // 通知分组(Bark App 里按组折叠),留空 = Bark 默认
|
||||
barkTtl: 0, // 通知在 Bark 服务端保留多少秒;0 = Bark 默认
|
||||
};
|
||||
|
||||
const argv = process.argv.slice(2);
|
||||
@@ -102,9 +109,9 @@ if (CONFIG_FILE) {
|
||||
// ---------------------------------------------------------------------------
|
||||
// 命令行解析:--key value / --key=value / --flag
|
||||
// ---------------------------------------------------------------------------
|
||||
const BOOL_KEYS = ['preferShort', 'headless', 'check', 'tui', 'color'];
|
||||
const NUM_KEYS = ['maxCourses', 'budgetMinutes', 'restartMinutes', 'idleRestartMinutes', 'port', 'logMaxBytes'];
|
||||
const STR_KEYS = ['origin', 'url', 'profile', 'logFile', 'chrome', 'extraArgs', 'config'];
|
||||
const BOOL_KEYS = ['preferShort', 'pointsMode', 'headless', 'check', 'tui', 'color'];
|
||||
const NUM_KEYS = ['maxCourses', 'budgetMinutes', 'restartMinutes', 'idleRestartMinutes', 'port', 'logMaxBytes', 'barkTtl'];
|
||||
const STR_KEYS = ['origin', 'url', 'profile', 'logFile', 'chrome', 'extraArgs', 'config', 'barkUrl', 'barkGroup'];
|
||||
|
||||
/** kebab-case → camelCase:--max-courses → maxCourses */
|
||||
function toCamel(flag) {
|
||||
@@ -207,6 +214,7 @@ merged.idleRestartMinutes = envNum('YUN_XUE_TANG_IDLE_RESTART_MINUTES', merged.i
|
||||
merged.port = envNum('YUN_XUE_TANG_CDP_PORT', merged.port);
|
||||
merged.logMaxBytes = envNum('YUN_XUE_TANG_LOG_MAX_BYTES', merged.logMaxBytes);
|
||||
merged.preferShort = envBool('YUN_XUE_TANG_PREFER_SHORT', merged.preferShort);
|
||||
merged.pointsMode = envBool('YUN_XUE_TANG_POINTS_MODE', merged.pointsMode);
|
||||
merged.headless = envBool('YUN_XUE_TANG_HEADLESS', merged.headless);
|
||||
merged.origin = envStr('YUN_XUE_TANG_ORIGIN', merged.origin);
|
||||
merged.url = envStr('YUN_XUE_TANG_URL', merged.url);
|
||||
@@ -216,6 +224,9 @@ merged.chrome = envStr('YUN_XUE_TANG_CHROME_BIN', merged.chrome);
|
||||
merged.extraArgs = envStr('YUN_XUE_TANG_EXTRA_ARGS', merged.extraArgs);
|
||||
merged.tui = envBool('YUN_XUE_TANG_TUI', merged.tui);
|
||||
merged.color = envBool('YUN_XUE_TANG_COLOR', merged.color);
|
||||
merged.barkTtl = envNum('YUN_XUE_TANG_BARK_TTL', merged.barkTtl);
|
||||
merged.barkUrl = envStr('YUN_XUE_TANG_BARK_URL', merged.barkUrl);
|
||||
merged.barkGroup = envStr('YUN_XUE_TANG_BARK_GROUP', merged.barkGroup);
|
||||
|
||||
// 命令行最后覆盖
|
||||
const numBad = [];
|
||||
@@ -243,6 +254,7 @@ if (numBad.length === 0) {
|
||||
if (!(merged.restartMinutes >= 0)) problems.push('restartMinutes 不能为负,收到 ' + merged.restartMinutes);
|
||||
if (!(merged.idleRestartMinutes >= 0)) problems.push('idleRestartMinutes 不能为负,收到 ' + merged.idleRestartMinutes);
|
||||
if (!(merged.logMaxBytes >= 0)) problems.push('logMaxBytes 不能为负,收到 ' + merged.logMaxBytes);
|
||||
if (!(merged.barkTtl >= 0)) problems.push('barkTtl 不能为负,收到 ' + merged.barkTtl);
|
||||
}
|
||||
if (unknownFlags.length) {
|
||||
const uniq = [...new Set(unknownFlags)];
|
||||
@@ -285,6 +297,7 @@ export const WANT_VISIBLE = !merged.headless;
|
||||
export const VISIBLE = WANT_VISIBLE && hasDisplay();
|
||||
|
||||
export const PREFER_SHORT = merged.preferShort;
|
||||
export const POINTS_MODE = merged.pointsMode;
|
||||
/** 脚本自己停下后等待多少分钟再开新一轮(0 = 直接退出) */
|
||||
export const RESTART_MINUTES = merged.restartMinutes;
|
||||
/** 连续多少分钟没有任何进展判定卡死 */
|
||||
@@ -296,8 +309,21 @@ export const LOG_MAX_BYTES = merged.logMaxBytes;
|
||||
export const EXTRA_ARGS = String(merged.extraArgs || '').split(/\s+/).filter(Boolean);
|
||||
/** 配置文件里指定的浏览器路径(空 = 自动探测;优先级低于 YUN_XUE_TANG_CHROME_BIN,见 browser.mjs) */
|
||||
export const CHROME_BIN = merged.chrome || '';
|
||||
/** Bark 推送地址(含设备 key);空 = 不推送 */
|
||||
export const BARK_URL = String(merged.barkUrl || '').trim();
|
||||
export const BARK_GROUP = String(merged.barkGroup || '').trim();
|
||||
export const BARK_TTL = merged.barkTtl;
|
||||
export const WARNINGS = configWarnings;
|
||||
|
||||
/** 打印/展示 Bark 地址时把路径里的第一段(设备 key)打码,避免日志泄露推送权限 */
|
||||
export function maskBarkUrl(url) {
|
||||
const s = String(url || '');
|
||||
if (!s) return '(未配置)';
|
||||
const m = s.match(/^(https?:\/\/[^/]+)(\/.*)?$/i);
|
||||
if (!m) return '(已配置)';
|
||||
return m[1] + (m[2] || '').replace(/^\/([^/?]*)/, '/***');
|
||||
}
|
||||
|
||||
/** 面板是否带颜色:配置 / 环境变量 / 行业惯例的 NO_COLOR 都生效 */
|
||||
export const COLOR = merged.color && !process.env.NO_COLOR;
|
||||
|
||||
@@ -329,12 +355,14 @@ export function describeRun() {
|
||||
maxCourses: MAX_COURSES > 0 ? MAX_COURSES : '不限',
|
||||
budgetMinutes: BUDGET_MINUTES > 0 ? BUDGET_MINUTES : '不限',
|
||||
preferShort: PREFER_SHORT,
|
||||
pointsMode: POINTS_MODE,
|
||||
restartMinutes: RESTART_MINUTES,
|
||||
idleRestartMinutes: IDLE_RESTART_MINUTES,
|
||||
profileDir: PROFILE_DIR,
|
||||
logFile: LOG_FILE,
|
||||
tui: TUI,
|
||||
color: COLOR,
|
||||
bark: BARK_URL ? (maskBarkUrl(BARK_URL) + (BARK_GROUP ? '(分组 ' + BARK_GROUP + ')' : '')) : '(未配置)',
|
||||
};
|
||||
}
|
||||
|
||||
@@ -345,6 +373,7 @@ export function helpText() {
|
||||
['maxCourses', '--max-courses', 'YUN_XUE_TANG_MAX_COURSES', MAX_COURSES, '本次最多完成几门课;0 = 不限'],
|
||||
['budgetMinutes', '--budget-minutes', 'YUN_XUE_TANG_BUDGET_MINUTES', BUDGET_MINUTES, '跑多少分钟后收尾;0 = 不限'],
|
||||
['preferShort', '--prefer-short', 'YUN_XUE_TANG_PREFER_SHORT', PREFER_SHORT, '优先总时长最短的课程'],
|
||||
['pointsMode', '--points-mode', 'YUN_XUE_TANG_POINTS_MODE', POINTS_MODE, '每日积分模式:文档1/视频3/音频2/微课2,封顶即停'],
|
||||
['restartMinutes', '--restart-minutes', 'YUN_XUE_TANG_RESTART_MINUTES', RESTART_MINUTES, '脚本停下后等几分钟开新一轮;0 = 退出'],
|
||||
['idleRestartMinutes', '--idle-restart-minutes', 'YUN_XUE_TANG_IDLE_RESTART_MINUTES', IDLE_RESTART_MINUTES, '多少分钟无进展判卡死'],
|
||||
['origin', '--origin', 'YUN_XUE_TANG_ORIGIN', ORIGIN, '站点根地址'],
|
||||
@@ -358,6 +387,9 @@ export function helpText() {
|
||||
['color', '--no-color', 'YUN_XUE_TANG_COLOR', COLOR ? '开' : '关', '面板是否用 ANSI 颜色(也认 NO_COLOR)'],
|
||||
['logFile', '--log-file', 'YUN_XUE_TANG_LOG_FILE', LOG_FILE, '日志文件'],
|
||||
['logMaxBytes', '--log-max-bytes', 'YUN_XUE_TANG_LOG_MAX_BYTES', LOG_MAX_BYTES, '单文件上限,超出轮转'],
|
||||
['barkUrl', '--bark-url', 'YUN_XUE_TANG_BARK_URL', maskBarkUrl(BARK_URL), 'Bark 推送地址(含设备 key);留空 = 不推送'],
|
||||
['barkGroup', '--bark-group', 'YUN_XUE_TANG_BARK_GROUP', BARK_GROUP || '(Bark 默认)', 'Bark 通知分组'],
|
||||
['barkTtl', '--bark-ttl', 'YUN_XUE_TANG_BARK_TTL', BARK_TTL, 'Bark 通知在服务端保留秒数;0 = 默认'],
|
||||
['(字段 check)', '--check', '', CHECK_ONLY, '只做环境自检,不动进度'],
|
||||
['(无字段)', '--config', 'YUN_XUE_TANG_CONFIG', CONFIG_FILE || '(内置默认)', '指定配置文件路径'],
|
||||
];
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
* page.mjs 注入后要调用的页面 JS 表达式 + page 求值封装
|
||||
* session.mjs 单次会话:起浏览器 → 注入 → 自动登录 → 刷课 → 监控 → 收尾
|
||||
* selfcheck.mjs --check 的只读环境自检
|
||||
* notify.mjs 任务结束时的 Bark 手机通知
|
||||
* supervisor.mjs 崩溃重启循环与退出码
|
||||
* tui.mjs 交互式终端面板(框线 + 进度条,q 退出;非 TTY 自动关闭)
|
||||
*
|
||||
@@ -42,6 +43,7 @@
|
||||
* YUN_XUE_TANG_CHROME_BIN Chrome/Chromium 可执行文件路径(默认自动探测)
|
||||
* YUN_XUE_TANG_EXTRA_ARGS 追加给浏览器的命令行参数(空格分隔)
|
||||
* YUN_XUE_TANG_PREFER_SHORT 1/0,是否优先短课程(默认 1)
|
||||
* YUN_XUE_TANG_POINTS_MODE 1/0,每日积分模式(默认 1;文档1/视频3/音频2/微课2,封顶即停)
|
||||
* YUN_XUE_TANG_RESTART_MINUTES 脚本停止/无进展后等待多久重新开始(0 = 直接退出,默认 0)
|
||||
* YUN_XUE_TANG_IDLE_RESTART_MINUTES 连续无进展多少分钟后判定卡死(默认 30)
|
||||
* YUN_XUE_TANG_LOG_FILE 日志文件路径(默认 ./run-logs/headless.log)
|
||||
@@ -49,6 +51,9 @@
|
||||
* YUN_XUE_TANG_HAS_DISPLAY 0/1,强制认定「有没有图形显示会话」(自动判断不准时用)
|
||||
* YUN_XUE_TANG_TUI 0/1,是否启用终端面板(默认 1,非 TTY 时无效)
|
||||
* YUN_XUE_TANG_COLOR 0/1,面板是否带颜色(也认 NO_COLOR)
|
||||
* YUN_XUE_TANG_BARK_URL Bark 推送地址(含设备 key);留空 = 不推送
|
||||
* YUN_XUE_TANG_BARK_GROUP Bark 通知分组(默认 Bark 自己的分组)
|
||||
* YUN_XUE_TANG_BARK_TTL Bark 通知在服务端保留多少秒(0 = 默认)
|
||||
*
|
||||
* 退出码:0 正常收尾 / 1 无进展卡死 / 2 环境或参数问题 / 3 连续登录失败
|
||||
*/
|
||||
|
||||
@@ -0,0 +1,114 @@
|
||||
// Bark 推送:运行器自己收尾时把结果发到手机。
|
||||
//
|
||||
// 只覆盖「运行器自己结束」的场景(正常刷完 / 长时间无进展 / 登录失败),
|
||||
// 手动 Ctrl+C 主动停止不发:人就在键盘前,不需要再提醒一次。
|
||||
// 通知是附加信息:发送失败只记告警,绝不影响退出码,也不阻塞下一次会话。
|
||||
//
|
||||
// Bark 接口:GET https://api.day.app/<key>/<title>/<body>?group=<分组>&ttl=<秒>
|
||||
|
||||
/** 单次请求超时:Bark 正常在 1 秒内返回,卡住就当失败,别拖慢收尾 */
|
||||
export const BARK_TIMEOUT_MS = 8000;
|
||||
|
||||
function withParam(url, key, val) {
|
||||
if (val === '' || val == null) return url;
|
||||
// 地址里已经写了同名参数(例如配置里直接粘了完整 curl 地址)就不再追加
|
||||
if (new RegExp('[?&]' + key + '=').test(url)) return url;
|
||||
return url + (url.includes('?') ? '&' : '?') + key + '=' + encodeURIComponent(val);
|
||||
}
|
||||
|
||||
/**
|
||||
* 拼 Bark 请求地址。
|
||||
* base 可以是:
|
||||
* · 含设备 key 的根地址:https://api.day.app/KEY
|
||||
* · 带 {title}/{body} 占位符的完整模板:https://api.day.app/KEY/{title}/{body}?group=x
|
||||
*/
|
||||
export function buildBarkUrl(base, title, body, opts = {}) {
|
||||
let url = String(base || '').trim();
|
||||
if (!url) return '';
|
||||
const t = encodeURIComponent(title || '');
|
||||
const b = encodeURIComponent(body || '');
|
||||
if (/\{title\}|\{body\}/.test(url)) {
|
||||
url = url.replace(/\{title\}/g, t).replace(/\{body\}/g, b);
|
||||
} else {
|
||||
url = url.replace(/\/+$/, '') + '/' + t + '/' + b;
|
||||
}
|
||||
url = withParam(url, 'group', opts.group);
|
||||
url = withParam(url, 'ttl', opts.ttl ? String(opts.ttl) : '');
|
||||
return url;
|
||||
}
|
||||
|
||||
/** 收尾通知的标题与正文:把本次刷课的结论压缩成手机上能一眼看懂的两三行 */
|
||||
export function buildFinishMessage(result) {
|
||||
const r = result || {};
|
||||
const kind = r.kind || 'done';
|
||||
const title = kind === 'login'
|
||||
? '云学堂助手:登录失败'
|
||||
: kind === 'stalled' ? '云学堂助手:长时间无进展'
|
||||
: '云学堂助手:任务完成';
|
||||
|
||||
const lines = [];
|
||||
// 积分模式关闭时 snapshot 里仍是 0/24,直接贴出来会让人以为今天一条都没刷到
|
||||
if (r.points && r.points.enabled === false) lines.push('每日积分模式:关');
|
||||
else if (r.points && r.points.text) lines.push(String(r.points.text));
|
||||
// 登录失败时还没开始刷,「完成 0 门 · 用时 0 秒」只会让人以为跑过一轮
|
||||
if (kind !== 'login') {
|
||||
const secs = Number(r.elapsed) || 0;
|
||||
const used = secs >= 60
|
||||
? Math.floor(secs / 60) + ' 分 ' + (secs % 60) + ' 秒'
|
||||
: secs + ' 秒';
|
||||
lines.push('完成 ' + (Number(r.completed) || 0) + ' 门 · 用时 ' + used);
|
||||
}
|
||||
if (r.finishReason) lines.push(String(r.finishReason));
|
||||
return { title, body: lines.join('\n') };
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送 Bark 通知。永远不抛异常。
|
||||
* @returns {Promise<{ok?:boolean, skipped?:boolean, status?:number}>}
|
||||
*/
|
||||
export async function sendBark(opts) {
|
||||
const o = opts || {};
|
||||
const log = o.log || (() => {});
|
||||
const warn = o.warn || (() => {});
|
||||
const url = buildBarkUrl(o.url, o.title, o.body, { group: o.group, ttl: o.ttl });
|
||||
if (!url) return { skipped: true };
|
||||
if (typeof fetch !== 'function') {
|
||||
warn('当前 Node 没有全局 fetch(需要 Node 18+),跳过 Bark 通知');
|
||||
return { skipped: true };
|
||||
}
|
||||
|
||||
try {
|
||||
const res = await fetch(url, {
|
||||
method: 'GET',
|
||||
signal: AbortSignal.timeout(o.timeoutMs || BARK_TIMEOUT_MS),
|
||||
});
|
||||
let data = null;
|
||||
try { data = await res.json(); } catch (e) { /* 非 JSON 响应按状态码判断 */ }
|
||||
const code = data && data.code != null ? Number(data.code) : 200;
|
||||
if (!res.ok || code !== 200) {
|
||||
warn('Bark 通知发送失败:HTTP ' + res.status +
|
||||
(data && data.message ? '(' + data.message + ')' : ''));
|
||||
return { ok: false, status: res.status };
|
||||
}
|
||||
log('已发送 Bark 通知:' + o.title);
|
||||
return { ok: true, status: res.status };
|
||||
} catch (e) {
|
||||
warn('Bark 通知发送失败:' + (e && e.message ? e.message : e));
|
||||
return { ok: false };
|
||||
}
|
||||
}
|
||||
|
||||
/** 按运行器配置发送收尾通知;没配 barkUrl 时是空操作 */
|
||||
export function notifyRunFinished(cfg, result, io) {
|
||||
if (!cfg || !cfg.BARK_URL) return Promise.resolve({ skipped: true });
|
||||
const msg = buildFinishMessage(result);
|
||||
return sendBark({
|
||||
url: cfg.BARK_URL,
|
||||
group: cfg.BARK_GROUP,
|
||||
ttl: cfg.BARK_TTL,
|
||||
title: msg.title,
|
||||
body: msg.body,
|
||||
log: io && io.log,
|
||||
warn: io && io.warn,
|
||||
});
|
||||
}
|
||||
+9
-2
@@ -104,6 +104,8 @@ export const EXPR_SNAPSHOT = `JSON.stringify((function () {
|
||||
return m ? Number(m[1]) : null;
|
||||
})(),
|
||||
status: (document.getElementById('yun-xue-tang-status') || {}).textContent || '',
|
||||
// 每日积分:{ enabled, total, max, progress:[{label,count,cap}], text }
|
||||
points: (a.points && a.points.snapshot ? a.points.snapshot() : null),
|
||||
doneCount: Object.keys(a.S.completedTitles || {}).length,
|
||||
retryCount: Object.keys(a.S.courseRetries || {}).length,
|
||||
retryWait: (a.retryWaitSeconds ? a.retryWaitSeconds() : 0),
|
||||
@@ -123,6 +125,8 @@ export const EXPR_FINAL_STATS = `JSON.stringify((function () {
|
||||
completed: a.S.completedThisRun,
|
||||
doneCount: Object.keys(a.S.completedTitles || {}).length,
|
||||
retryCount: Object.keys(a.S.courseRetries || {}).length,
|
||||
// 每日积分:收尾通知里要带上「今日积分 X/24 · 各类次数」
|
||||
points: (a.points && a.points.snapshot ? a.points.snapshot() : null),
|
||||
};
|
||||
})())`;
|
||||
|
||||
@@ -137,11 +141,14 @@ export const EXPR_PAUSE_AND_SAVE = `(function () {
|
||||
export const exprSetMaxCourses = (max) =>
|
||||
`(function(){ var a = window.__yunXueTangAuto; if (a && a.CFG) a.CFG.maxCourses = ${Number(max)}; return true; })()`;
|
||||
|
||||
/** 启动 / 接续批量刷课,同时同步「优先短课程」偏好 */
|
||||
export const exprStartBatch = (preferShort) => `(function () {
|
||||
/** 启动 / 接续批量刷课,同时同步「优先短课程」「每日积分」偏好 */
|
||||
export const exprStartBatch = (preferShort, pointsMode) => `(function () {
|
||||
var a = window.__yunXueTangAuto;
|
||||
try { localStorage.setItem('yun-xue-tang-prefer-short', '${preferShort ? '1' : '0'}'); } catch (e) {}
|
||||
try { localStorage.setItem('yun-xue-tang-daily-points-mode', '${pointsMode ? '1' : '0'}'); } catch (e) {}
|
||||
a.state.preferShortCourses = ${preferShort ? 'true' : 'false'};
|
||||
a.state.pointsEnabled = ${pointsMode ? 'true' : 'false'};
|
||||
try { a.points.setEnabled(${pointsMode ? 'true' : 'false'}); } catch (e) {}
|
||||
a.startBatch();
|
||||
return true;
|
||||
})()`;
|
||||
|
||||
+8
-3
@@ -212,10 +212,11 @@ export async function runSession(o) {
|
||||
return;
|
||||
}
|
||||
if (!st.batchRunning && st.route !== 'other') {
|
||||
const ok = await page.tryEval(exprStartBatch(cfg.PREFER_SHORT));
|
||||
const ok = await page.tryEval(exprStartBatch(cfg.PREFER_SHORT, cfg.POINTS_MODE));
|
||||
if (ok) {
|
||||
tui.set({ phase: '刷课中', tone: 'ok' });
|
||||
log('已启动列表刷课' + (cfg.PREFER_SHORT ? '(优先短课程)' : ''));
|
||||
log('已启动列表刷课' + (cfg.PREFER_SHORT ? '(优先短课程)' : '') +
|
||||
(cfg.POINTS_MODE ? '(每日积分模式)' : ''));
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -239,6 +240,7 @@ export async function runSession(o) {
|
||||
' 上限 ' + (cfg.MAX_COURSES > 0 ? cfg.MAX_COURSES + ' 门' : '不限') +
|
||||
' 预算 ' + (cfg.BUDGET_MINUTES > 0 ? cfg.BUDGET_MINUTES + ' 分钟' : '不限') +
|
||||
' 短课程优先 ' + (cfg.PREFER_SHORT ? '开' : '关') +
|
||||
' 每日积分 ' + (cfg.POINTS_MODE ? '开' : '关') +
|
||||
' 无进展 ' + cfg.IDLE_RESTART_MINUTES + ' 分钟');
|
||||
|
||||
watchdog = setInterval(() => {
|
||||
@@ -363,5 +365,8 @@ export async function runSession(o) {
|
||||
unregister();
|
||||
activeCleanup = null;
|
||||
|
||||
return { finishReason, limitReached, completed: final.completed || 0, elapsed, injected, ok: true };
|
||||
return {
|
||||
finishReason, limitReached, completed: final.completed || 0, elapsed, injected, ok: true,
|
||||
points: final.points || null,
|
||||
};
|
||||
}
|
||||
@@ -8,6 +8,7 @@ import { runSession, disposeActiveSession } from './session.mjs';
|
||||
import { openLog } from './log.mjs';
|
||||
import { noDisplayReason, platformName } from './platform.mjs';
|
||||
import { createTui } from './tui.mjs';
|
||||
import { notifyRunFinished } from './notify.mjs';
|
||||
|
||||
const RETRY_BASE_MS = 15000;
|
||||
const RETRY_MAX_MS = 120000;
|
||||
@@ -58,6 +59,30 @@ export async function runSupervisor(o) {
|
||||
|
||||
let attempt = 0;
|
||||
let last = null;
|
||||
let lastNotified = '';
|
||||
|
||||
/**
|
||||
* 收尾 Bark 通知。通知识别键相同的只发一次:配了 restartMinutes 时,
|
||||
* 「今日积分已学完」这类结论会在每一轮重启后原样重复,没必要每小时推一次。
|
||||
* 用户按 Ctrl+C 主动停的不发;自检模式不发。
|
||||
*/
|
||||
const notify = async (result) => {
|
||||
if (stop.stopping || cfg.CHECK_ONLY) return;
|
||||
const key = [result.kind, result.finishReason, result.completed,
|
||||
result.points && result.points.text].join('|');
|
||||
if (key === lastNotified) return;
|
||||
lastNotified = key;
|
||||
await notifyRunFinished(cfg, result, { log, warn });
|
||||
};
|
||||
|
||||
/** 一次会话的结果 → 通知入参:卡死和无进展在退出码里是两种结论,标题也不同 */
|
||||
const finishResult = (s) => ({
|
||||
kind: /没有任何进展/.test((s && s.finishReason) || '') ? 'stalled' : 'done',
|
||||
finishReason: (s && s.finishReason) || '',
|
||||
completed: (s && s.completed) || 0,
|
||||
elapsed: (s && s.elapsed) || 0,
|
||||
points: s && s.points,
|
||||
});
|
||||
|
||||
/** 收尾时先把面板收掉,退出日志和退出码提示才会逐行打印出来 */
|
||||
const finishTui = (phase, tone) => {
|
||||
@@ -73,6 +98,10 @@ export async function runSupervisor(o) {
|
||||
last = await runSession({ ...o, cfg, tui });
|
||||
if (stop.stopping) break;
|
||||
if (cfg.CHECK_ONLY) break;
|
||||
// 每轮会话自己结束就先推一次:配了 restartMinutes 时进程不会退出,
|
||||
// 只在最终收尾推就等于永远不推。重复结论由 notify() 的识别键挡掉。
|
||||
tui.set({ phase: '发送 Bark 通知', tone: 'info' });
|
||||
await notify(finishResult(last));
|
||||
// 正常结束:只有「脚本自己停了 / 无进展」且配了重启间隔才再来一轮
|
||||
const restartable = !last.limitReached && cfg.RESTART_MINUTES > 0;
|
||||
if (!restartable) break;
|
||||
@@ -90,6 +119,8 @@ export async function runSupervisor(o) {
|
||||
tui.set({ phase: '会话异常,准备重试', tone: 'error' });
|
||||
// 连登 5 次失败基本都是密码错 / 要验证码,重试没意义,直接用专门的退出码结束
|
||||
if (e && e.message && /连续 \d+ 次登录失败/.test(e.message)) {
|
||||
tui.set({ phase: '发送 Bark 通知', tone: 'info' });
|
||||
await notify({ kind: 'login', finishReason: e.message, completed: 0, elapsed: 0 });
|
||||
finishTui('登录失败,检查账号密码 / 验证码', 'error');
|
||||
return { exitCode: 3, last };
|
||||
}
|
||||
@@ -107,6 +138,10 @@ export async function runSupervisor(o) {
|
||||
const phase = cfg.CHECK_ONLY
|
||||
? (exitCode === 0 ? '自检通过' : '自检失败')
|
||||
: stalled ? '退出:长时间无进展' : '正常收尾';
|
||||
if (last) {
|
||||
tui.set({ phase: '发送 Bark 通知', tone: 'info' });
|
||||
await notify(finishResult(last));
|
||||
}
|
||||
finishTui(phase, exitCode === 0 ? 'ok' : (stalled ? 'warn' : 'error'));
|
||||
|
||||
log('=== 运行器退出 ===');
|
||||
|
||||
@@ -181,6 +181,7 @@ export function createTui(opts = {}) {
|
||||
studySeconds: 0, // 学习时长:只累加视频真正在播的时间
|
||||
creditEarned: 0, // 获得学分:只算本次运行里完成(刷完)的课程
|
||||
credit: null, // 当前课程可得多少学分(平台只在播放期间写在倒计时文案里)
|
||||
points: null, // 每日积分:{ enabled, total, max, progress, text }
|
||||
injected: 0,
|
||||
logFile: opts.logFile || '',
|
||||
startedAt: Date.now(),
|
||||
@@ -296,6 +297,10 @@ export function createTui(opts = {}) {
|
||||
const parts = [C.cyan('已学 ' + formatDuration(state.studySeconds))];
|
||||
parts.push(C.green('学分 ' + study.creditText(state.creditEarned)));
|
||||
const used = () => textWidth(parts.join(' · '));
|
||||
if (state.points && state.points.enabled) {
|
||||
const p = '积分 ' + state.points.total + '/' + state.points.max;
|
||||
if (used() + 3 + textWidth(p) <= width) parts.push(C.cyan(p));
|
||||
}
|
||||
if (state.credit != null) {
|
||||
const now = '本门 ' + study.creditText(state.credit);
|
||||
if (used() + 3 + textWidth(now) <= width) parts.push(now);
|
||||
@@ -529,6 +534,7 @@ export function createTui(opts = {}) {
|
||||
state.studySeconds = st.studySeconds;
|
||||
state.creditEarned = st.creditEarned;
|
||||
state.credit = st.credit;
|
||||
state.points = s.points || null;
|
||||
|
||||
state.course = pick(s.course, '');
|
||||
state.lesson = pick(s.lesson, '');
|
||||
|
||||
Reference in new issue
Block a user