diff --git a/README.md b/README.md index 124d0f0..c6aade5 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Tampermonkey 用户脚本。支持多课时课程与单视频/音频课程;含 | 防挂机验证 | 识别「已触发防挂机验证」弹窗并点「继续学习」;滑块/拼图类验证不绕过,提示人工处理 | | 课程列表自动刷课 | 在列表页逐门进入未学完的课程;每完成一门都重新调列表接口拿平台实时状态再选下一门,本次门数上限见下方配置表 | | 短课程优先 | 列表刷课默认按课程总时长**从短到长**选课(跨页),先完成 1 分钟的课再学 1 小时的课;面板可关闭 | -| 每日积分模式 | 按**课时类型**计分:文档 1 次、视频 3 次、音频 2 次、微课 2 次,每次 3 分,单日封顶 24 分。先补文档/音频/微课单条内容,视频额度靠课程里的视频课时;某类满额自动切下一类,四类都满(或剩余类型没内容)就停止刷课。计数存 localStorage、跨刷新/重启不丢、跨天清零;面板可随时关闭 | +| 每日积分模式 | **以平台积分台账为准**:整门课完成计 1 次,文档 1 次、视频 3 次、音频 2 次、微课 2 次,每次 3 分,单日封顶 24 分。多课时课程要所有课时(含考试)都完成才计分,按今天实际学过的课时类型归类;平台真的入账了才计数。先补文档/音频/微课单条内容,视频额度靠课程;某类满额自动切下一类,四类都满(或剩余类型没内容)就停止刷课。计数存 localStorage、跨刷新/重启不丢、跨天清零;面板可随时关闭 | | 考试自动空卷 | 含考试章节的课程不再跳过:自动点进考试节 → 开始/继续考试 → 一题不做直接「提交考试」→ 点「确定」交卷,交卷后课程进度被平台记账,课程即可完成。只有本页真的点过「提交考试/确定交卷」,看到的结果页才算一次交卷;平台恢复的旧结果页会先回「考试说明页」重新进入,不会在结果页和课程页之间空转。同一门课最多交卷 `maxExamTries` 次,超过仍不记账就跳过该课继续下一门(写明原因) | | 不跳过普通课程 | 没有任何「跳过本课」入口,也不会把普通课程加入黑名单;没学完就退避重试(30 秒起翻倍,最长 5 分钟),同一门课最多重试 `maxCourseRetries` 次,超过才停下整轮刷课并提示原因,等人工处理。**唯一例外**:考试空卷交卷达到 `maxExamTries` 仍未计入进度,或考试页始终没有可点的「开始考试/提交考试」——继续重试只会反复进同一门课,因此本轮跳过它、继续刷其它课 | | 进度可续 | 学习进度存在 `sessionStorage`(`yun-xue-tang-run-state-v3`),整页跳转/刷新后继续上次的队列和页码;**运行开关不跨会话** —— 浏览器重启、运行器新建标签页后一律回到待机,必须显式开跑(避免未登录就报「运行中」) | @@ -52,7 +52,7 @@ Tampermonkey 用户脚本。支持多课时课程与单视频/音频课程;含 | `courseRetryDelayMs` | `30000` | 首次重试前的等待;每次翻倍,最长 5 分钟 | | `alignToFirstIncomplete` | `true` | 进入课程先从第一个未学完的课时学起;`false` = 沿用平台上次位置 | | `preferShortCourses` | `true` | 列表刷课时优先总时长更短的课程(正序);面板勾选框「优先短课程(时长正序)」可随时切换 | -| `pointsEnabled`(`localStorage`) | `true` | 每日积分模式:文档 1 / 视频 3 / 音频 2 / 微课 2(每次 3 分,封顶 24 分);面板勾选框「每日积分模式」可随时切换 | +| `pointsEnabled`(`localStorage`) | `true` | 每日积分模式:整门课完成计 1 次,文档 1 / 视频 3 / 音频 2 / 微课 2(每次 3 分,封顶 24 分);面板勾选框「每日积分模式」可随时切换 | | `maxExamTries` | `2` | 同一门课「空卷交卷」的最大次数;超过仍没计入进度就本轮跳过该课、继续下一门(记录在会话里,重启后会重新尝试) | | `examClickCooldownMs` | `1500` | 考试页内两次点击的间隔(毫秒) | @@ -64,10 +64,16 @@ Tampermonkey 用户脚本。支持多课时课程与单视频/音频课程;含 逐个进入。接口不可用(未登录、跨域、平台改版)时自动降级为「当前页按时长正序」, 再不行就回到原来的列表顺序,不会让刷课任务卡住。 -每日积分模式按**课时**计数:多课时课程里每学完一节视频/文档/音频/微课各算一次, -单视频/音频/课件播放页学完也算一次。某类满额后自动换下一类;四类都满额, -或剩余额度的类型在当前目录里确认没有内容时,停止刷课并在面板/日志里汇报今日积分。 -识别不出类型的课时(例如考试节)不计分;同一课时当天重复上报只算一次。 +每日积分模式按**整门课**计数:多课时课程要所有课时(含考试)都完成才算一次, +按今天实际学过的课时类型(视频/文档/音频/微课)归类;单视频/音频/课件播放页学完也算一次。 +某类满额后自动换下一类;四类都满额,或剩余额度的类型在当前目录里确认没有内容时, +停止刷课并在面板/日志里汇报今日积分。只剩考试、今天没学内容的老课不计分; +同一门课当天重复上报只算一次。 + +积分是否真的拿到,以平台「我的积分」台账为准:`/ssp/#/my/point` 背后的 +`api-phx-tc.yunxuetang.cn/ssp/point/history/self` 和 `ssp/rule/org`。脚本完成一门课后 +等平台入账,只有台账新增学习记录才计数;今日学习积分达到规则上限即收尾。 +接口不可用(未登录 / 跨域 / 网络)时自动退回本地计数。 ## 无头运行(Linux / Windows 服务器) @@ -241,7 +247,7 @@ Windows 上要注意:`Ctrl+C` 会让运行器优雅收尾(暂停视频、停 | `--restart-minutes N`(旧名 `--restart`) | `YUN_XUE_TANG_RESTART_MINUTES` | `restartMinutes` | `0` | 脚本自己停下后等待多少分钟再开新一轮;`0` = 直接退出 | | `--idle-restart-minutes N`(旧名 `--idle`) | `YUN_XUE_TANG_IDLE_RESTART_MINUTES` | `idleRestartMinutes` | `30` | 连续多少分钟无进展判定卡死 | | `--prefer-short 0\|1` | `YUN_XUE_TANG_PREFER_SHORT` | `preferShort` | `1` | 是否优先短课程(时长正序) | -| `--points-mode 0\|1` | `YUN_XUE_TANG_POINTS_MODE` | `pointsMode` | `1` | 每日积分模式:文档1/视频3/音频2/微课2,封顶即停 | +| `--points-mode 0\|1` | `YUN_XUE_TANG_POINTS_MODE` | `pointsMode` | `1` | 每日积分模式:整门课完成计 1 次,文档1/视频3/音频2/微课2,封顶即停 | | `--headless 0\|1`(旧名 `--visible`) | `YUN_XUE_TANG_HEADLESS` | `headless` | `1` | `1` = 无头;`0` = 开有界面浏览器(仅本机调试;无图形会话时被忽略并强制无头) | | `--origin URL` | `YUN_XUE_TANG_ORIGIN` | `origin` | `https://kfmic.yunxuetang.cn` | 站点根地址(换分公司环境时改这个) | | `--url URL` | `YUN_XUE_TANG_URL` | `url` | `/login.html` | 起始页面 | @@ -565,10 +571,10 @@ v2.6.0 新增「优先短课程(时长正序)」:真实站点读取 5148 v2.8.0 状态分层重构:刷课开关不再进 localStorage(修「还没登录就开始刷课」)、字段名语义化、 短课程模式下页码导航所有权归一到 `chooseShortCourse`(省掉每次多跳一页+白等 3.5 秒)。 -每日积分模式:按课时类型(文档/视频/音频/微课)分别计数,文档 1、视频 3、音频 2、微课 2, -每次 3 分封顶 24 分;先补文档/音频/微课单条内容,视频靠课程课时;某类满额自动换下一类, -四类都满或无内容即停。计数落 localStorage 并跨天清零,面板与无头 TUI 都显示今日积分。 -离线回归见 `node dev/tests/points-test.mjs`(`npm run test:points`)。 +每日积分模式:整门课完成计 1 次(文档1 / 视频3 / 音频2 / 微课2),每次 3 分封顶 24 分; +多课时课程按今天实际学过的课时类型归类,只剩考试的老课不计分;先补文档/音频/微课单条内容, +视频靠课程;某类满额自动换下一类,四类都满或无内容即停。计数落 localStorage 并跨天清零, +面板与无头 TUI 都显示今日积分。离线回归见 `node dev/tests/points-test.mjs`(`npm run test:points`)。 v2.7.0 修复「进入课程有概率不自动播放」和「学完后不转下一门」:新增单视频/音频/课件播放页识别, 完成判定同时支持 `已完成 x/y`、`已完成 N%`、`已完成学习`;真机复现、修复前后对比与回归结果见 diff --git a/config/runner.config.mjs b/config/runner.config.mjs index ccea555..3c0e951 100644 --- a/config/runner.config.mjs +++ b/config/runner.config.mjs @@ -18,7 +18,7 @@ export default { budgetMinutes: 0, /** 优先总时长最短的课程(正序);false = 按列表原顺序 */ preferShort: true, - /** 每日积分模式:按课时类型计分(文档1/视频3/音频2/微课2,每次3分),四类封顶即停;false = 普通刷课 */ + /** 每日积分模式:整门课完成计 1 次(文档1/视频3/音频2/微课2,每次3分),四类封顶即停;false = 普通刷课 */ pointsMode: true, /** 脚本自己停下后等多少分钟再开新一轮;0 = 直接退出。配合 restartMinutes 可以分段刷完 */ restartMinutes: 0, diff --git a/dev/tests/points-api-probe.mjs b/dev/tests/points-api-probe.mjs new file mode 100644 index 0000000..be26263 --- /dev/null +++ b/dev/tests/points-api-probe.mjs @@ -0,0 +1,270 @@ +#!/usr/bin/env node +/** + * 只读探测:打开「我的积分」页,抓它真实调的接口与返回字段。 + * + * node dev/tests/points-api-probe.mjs + * + * 用现有 profile 里的登录态(不登录、不点课程、不动进度), + * 打印 /ssp/#/my/point 加载期间与积分/学时相关的 XHR 响应, + * 以及页面渲染出来的文本,用来确认「今日获得多少积分」该读哪个字段。 + */ +import path from 'node:path'; +import fs from 'node:fs'; +import { fileURLToPath } from 'node:url'; +import { connect, httpJson, sleep } from '../../runner/cdp.mjs'; +import { launchBrowser, resolveBrowser } from '../../runner/browser.mjs'; + +const HERE = path.dirname(fileURLToPath(import.meta.url)); +const ROOT = path.resolve(HERE, '..', '..'); +const PORT = Number(process.env.YUN_XUE_TANG_CDP_PORT || 9340); +const ORIGIN = (process.env.YUN_XUE_TANG_ORIGIN || 'https://kfmic.yunxuetang.cn').replace(/\/+$/, ''); +const TARGET = ORIGIN + '/ssp/#/my/point'; +const LOGIN = ORIGIN + '/login.html'; +const PROFILE = process.env.YUN_XUE_TANG_PROFILE_DIR + ? path.resolve(ROOT, process.env.YUN_XUE_TANG_PROFILE_DIR) + : path.join(ROOT, '.run-profile'); + +const INTERESTING = /point|jf|score|credit|study|history|\/ssp\/rule|\/user\/point/i; + +function trim(s, n = 1200) { + const t = String(s == null ? '' : s).replace(/\s+/g, ' '); + return t.length > n ? t.slice(0, n) + '…' : t; +} + +async function main() { + console.log('[探测] 浏览器:' + resolveBrowser()); + console.log('[探测] profile:' + PROFILE); + console.log('[探测] 页面:' + TARGET); + + const browser = await launchBrowser({ + binary: resolveBrowser(), + profileDir: PROFILE, + port: PORT, + headless: true, + log: (s) => console.log(s), + }); + let cdp = null; + try { + const target = await httpJson( + 'http://127.0.0.1:' + PORT + '/json/new?' + encodeURIComponent(LOGIN), 'PUT'); + cdp = await connect(target.webSocketDebuggerUrl); + await cdp.send('Page.enable'); + await cdp.send('Runtime.enable'); + await cdp.send('Network.enable'); + await cdp.send('Log.enable'); + + const reqs = new Map(); + const hits = []; + const all = []; + cdp.onEvent((m) => { + if (m.method === 'Runtime.consoleAPICalled') { + const text = (m.params.args || []).map((a) => (a.value !== undefined ? a.value : a.description || '')).join(' '); + console.log('[console.' + m.params.type + '] ' + trim(text, 400)); + return; + } + if (m.method === 'Log.entryAdded') { + console.log('[log.' + m.params.entry.level + '] ' + trim(m.params.entry.text, 400)); + return; + } + if (m.method === 'Network.requestWillBeSent') { + const info = { + url: m.params.request.url, + method: m.params.request.method, + type: m.params.type, + headers: m.params.request.headers, + postData: m.params.request.postData, + }; + reqs.set(m.params.requestId, info); + if (/XHR|Fetch/.test(info.type || '')) all.push(info); + return; + } + if (m.method === 'Network.responseReceived') { + const url = m.params.response.url || ''; + if (!INTERESTING.test(url)) return; + const req = reqs.get(m.params.requestId) || {}; + if (req.type && !/XHR|Fetch/.test(req.type)) return; + hits.push({ + requestId: m.params.requestId, + url: url, + method: req.method || '', + status: m.params.response.status, + mime: m.params.response.mimeType, + headers: req.headers || {}, + postData: req.postData || '', + }); + } + }); + + await sleep(6000); + + // 只登录,不启动刷课:注入脚本后自己填表 + 点「登录」,并清掉「登录后自动刷课」标记。 + const usr = process.env.YUN_XUE_TANG_USR || ''; + const pwd = process.env.YUN_XUE_TANG_PWD || ''; + const scriptSrc = fs.readFileSync(path.join(ROOT, 'yun-xue-tang-assistant.user.js'), 'utf8'); + await cdp.send('Runtime.evaluate', { expression: scriptSrc }); + await sleep(1200); + const filled = await cdp.send('Runtime.evaluate', { + expression: `(function () { + var a = window.__yunXueTangAuto; + if (!a) return 'no-api'; + try { localStorage.removeItem('yun-xue-tang-auto-start-after-login'); } catch (e) {} + var ok = a.fillLoginForm(${JSON.stringify(usr)}, ${JSON.stringify(pwd)}); + try { a.checkLoginAgreement(); } catch (e) {} + try { a.doLoginAndStart(); } catch (e) {} + // doLoginAndStart 会写「登录后自动刷课」标记;这里立刻清掉,保证只登录不刷课 + try { localStorage.removeItem('yun-xue-tang-auto-start-after-login'); } catch (e) {} + try { a.S.batchRunning = false; } catch (e) {} + return ok ? 'submitted' : 'no-fields'; + })()`, + returnByValue: true, + }); + console.log('[登录] 结果:' + filled.result.value); + await sleep(12000); + // 保险:登录页若把「自动刷课」标记写进 localStorage,这里再清一次并停批量 + await cdp.send('Runtime.evaluate', { + expression: `(function () { + try { localStorage.removeItem('yun-xue-tang-auto-start-after-login'); } catch (e) {} + var a = window.__yunXueTangAuto; + if (a) { try { a.S.batchRunning = false; a.S.batchFinished = false; } catch (e) {} } + return true; + })()`, + }); + + hits.length = 0; + all.length = 0; + await cdp.send('Page.navigate', { url: TARGET }); + await sleep(25000); + + const state = await cdp.send('Runtime.evaluate', { + expression: `JSON.stringify((function () { + function findTok(s) { + try { + for (var i = 0; i < s.length; i++) { + var k = s.key(i), v = s.getItem(k) || ''; + if (/eyJ[a-zA-Z0-9_-]{10,}/.test(v)) return k; + } + } catch (e) {} + return ''; + } + return { + href: location.href, + ready: document.readyState, + appLen: (document.getElementById('app') || {}).innerHTML ? document.getElementById('app').innerHTML.length : 0, + ls: Object.keys(localStorage || {}), + ss: Object.keys(sessionStorage || {}), + lsTok: findTok(localStorage), + ssTok: findTok(sessionStorage), + cookies: String(document.cookie || '').split(';').map(function (s) { return s.split('=')[0].trim(); }), + }; + })())`, + returnByValue: true, + }).then((r) => JSON.parse(r.result.value || '{}')).catch(() => ({})); + console.log('\n[状态] ' + JSON.stringify(state)); + + const info = await cdp.send('Runtime.evaluate', { + expression: 'JSON.stringify({ href: location.href, title: document.title, text: document.body ? document.body.innerText : "" })', + returnByValue: true, + }).then((r) => JSON.parse(r.result.value || '{}')).catch(() => ({})); + console.log('\n[页面] ' + info.href + ' title=' + info.title); + console.log('[页面文本] ' + trim(info.text, 800)); + + // 用构建产物自己的平台台账逻辑再拉一次,验证 token / CORS / 折算链路 + if (state.lsTok) { + await cdp.send('Runtime.evaluate', { expression: scriptSrc }); + await sleep(1200); + const ledger = await cdp.send('Runtime.evaluate', { + expression: `(async function () { + var tk = localStorage.getItem('token') || ''; + var h = { 'Content-Type': 'application/json;charset=UTF-8', source: '501', 'x-yxt-product': 'xxv2', token: tk }; + var d0 = new Date(); + var p2 = function (n) { return n < 10 ? '0' + n : '' + n; }; + var day = d0.getFullYear() + '-' + p2(d0.getMonth() + 1) + '-' + p2(d0.getDate()); + var body = JSON.stringify({ + startDate: day + ' 00:00:00', endDate: day + ' 23:59:59', + sourceType: -1, optionType: 0, type: 1, userId: '' + }); + var out = {}; + async function probe(name, url, opts) { + try { + var r = await fetch(url, opts); + out[name] = { status: r.status, body: (await r.text()).slice(0, 400) }; + } catch (e) { out[name] = { error: String(e) }; } + } + await probe('rules', 'https://api-phx-tc.yunxuetang.cn/ssp/rule/org', { headers: h }); + await probe('rulesQ', 'https://api-phx-tc.yunxuetang.cn/ssp/rule/org?0=' + Math.random(), { headers: h }); + await probe('ledger', 'https://api-phx-tc.yunxuetang.cn/ssp/point/history/self?limit=200&offset=0', { method: 'POST', headers: h, body: body }); + // 统计历史台账里 nameType / actionType 的分布,判断能否据此归类 + try { + var wide = JSON.stringify({ + startDate: '2025-01-01 00:00:00', endDate: d0.getFullYear() + '-12-31 23:59:59', + sourceType: -1, optionType: 0, type: 1, userId: '' + }); + var lr = await fetch('https://api-phx-tc.yunxuetang.cn/ssp/point/history/self?limit=200&offset=0', { method: 'POST', headers: h, body: wide }); + var lj = await lr.json(); + var combos = {}; + for (var rec of (lj.datas || [])) { + if (Number(rec.sourceType) !== 1002) continue; + var k = [rec.nameType, rec.actionType, rec.point].join('/'); + if (!combos[k]) combos[k] = { n: 0, samples: [] }; + combos[k].n++; + if (combos[k].samples.length < 3) combos[k].samples.push(String(rec.remark || '').slice(0, 40)); + } + out.combos = combos; + } catch (e) { out.combos = { error: String(e) }; } + var a = window.__yunXueTangAuto; + if (a) { + var d = await a.refreshPlatformPoints(a.points, { force: true }); + out.platform = { + ok: d.ok, todayPoints: d.todayPoints, maxPoints: d.maxPoints, rules: d.rules, + recordCount: d.records ? d.records.length : 0, reason: d.reason, + }; + out.counts = a.points.snapshot(); + } + return JSON.stringify(out); + })()`, + awaitPromise: true, + returnByValue: true, + }); + console.log('\n[台账] ' + trim(ledger.result.value, 3000)); + } + + console.log('\n[XHR/Fetch] 共 ' + all.length + ' 条:'); + const seen = new Set(); + for (const r of all) { + if (seen.has(r.url)) continue; + seen.add(r.url); + console.log(' ' + r.method + ' ' + r.url); + } + + console.log('\n[接口] 命中 ' + hits.length + ' 条:'); for (const h of hits) { + console.log('\n--- ' + h.method + ' ' + h.status + ' ' + h.url); + const hdr = h.headers || {}; + for (const [k, v] of Object.entries(hdr)) { + console.log(' ' + k + ': ' + String(v).slice(0, 120)); + } + if (h.postData) console.log(' body: ' + trim(h.postData, 600)); + try { + const body = await cdp.send('Network.getResponseBody', { requestId: h.requestId }); + const text = body.base64Encoded ? Buffer.from(body.body, 'base64').toString('utf8') : body.body; + console.log(trim(text, 4000)); + } catch (e) { + console.log('(响应体不可读:' + e.message + ')'); + } + } + + const res = await cdp.send('Runtime.evaluate', { + expression: `JSON.stringify(performance.getEntriesByType('resource').map(function(e){return e.name;}).filter(function(u){return ${INTERESTING}.test(u);}))`, + returnByValue: true, + }).then((r) => JSON.parse(r.result.value || '[]')).catch(() => []); + console.log('\n[资源] ' + res.length + ' 条'); + for (const u of res.slice(0, 60)) console.log(' ' + u); + } finally { + if (cdp) cdp.close(); + await browser.kill(); + } +} + +main().catch((e) => { + console.error('[失败] ' + (e && e.stack ? e.stack : e)); + process.exit(1); +}); diff --git a/dev/tests/points-platform-test.mjs b/dev/tests/points-platform-test.mjs new file mode 100644 index 0000000..dec5e7b --- /dev/null +++ b/dev/tests/points-platform-test.mjs @@ -0,0 +1,118 @@ +#!/usr/bin/env node +/** + * 平台积分台账(src/points-platform.js)自测: + * 平台台账才是权威计数,这里钉死「按课程名归类」「用待对账记录兜底」「同一条不重复计」。 + * + * 用法: + * node dev/tests/points-platform-test.mjs + */ +function fakeStorage() { + const mem = new Map(); + return { + getItem: (k) => (mem.has(k) ? mem.get(k) : null), + setItem: (k, v) => { mem.set(k, String(v)); }, + removeItem: (k) => { mem.delete(k); }, + clear: () => mem.clear(), + }; +} + +globalThis.localStorage = fakeStorage(); + +const { applyLedger, rememberCourseAward } = await import('../../src/points-platform.js'); + +let failed = 0; +function ok(cond, name, extra) { + if (cond) console.log(' ✔ ' + name); + else { failed++; console.log(' ✘ ' + name + (extra ? ' → ' + extra : '')); } +} +function eq(actual, expect, name) { + ok(actual === expect, name, '期望 ' + JSON.stringify(expect) + ',实际 ' + JSON.stringify(actual)); +} + +function tracker() { + const counts = { doc: 0, video: 0, audio: 0, micro: 0 }; + const seen = new Set(); + return { + counts, + record(type, id) { + if (seen.has(id)) return false; + seen.add(id); + counts[type] = (counts[type] || 0) + 1; + return true; + }, + resetCounts() { + for (const k of Object.keys(counts)) counts[k] = 0; + seen.clear(); + }, + summary() { return ''; }, + }; +} + +const now = new Date(); +const p = (n) => (n < 10 ? '0' + n : '' + n); +const day = now.getFullYear() + '-' + p(now.getMonth() + 1) + '-' + p(now.getDate()); + +console.log('按课程名归类'); +{ + const t = tracker(); + rememberCourseAward('课程 A', 'video'); + const data = { + ok: true, day, + records: [{ id: '1', point: 3, remark: '课程 A', sourceType: 1002 }], + }; + eq(applyLedger(data, t), 1, '平台入账 1 条'); + eq(t.counts.video, 1, '计入视频'); +} + +console.log('台账 nameType 优先于标题'); +{ + const t = tracker(); + const data = { + ok: true, day, + records: [{ id: '9', point: 3, remark: '不认识的标题', sourceType: 1002, nameType: 1008 }], + }; + eq(applyLedger(data, t), 1, '靠 nameType 归类'); + eq(t.counts.audio, 1, 'nameType 1008 = 音频'); +} + +console.log('平台用课时名时用待对账记录兜底'); +{ + const t = tracker(); + rememberCourseAward('课程 B', 'doc'); + const data = { + ok: true, day, + records: [{ id: '2', point: 3, remark: '第一节课时名', sourceType: 1002 }], + }; + eq(applyLedger(data, t), 1, '兜底计入'); + eq(t.counts.doc, 1, '计入文档'); +} + +console.log('同一条记录不重复计'); +{ + const t = tracker(); + rememberCourseAward('课程 C', 'audio'); + const data = { + ok: true, day, + records: [ + { id: '3', point: 3, remark: '课程 C', sourceType: 1002 }, + { id: '3', point: 3, remark: '课程 C', sourceType: 1002 }, + ], + }; + eq(applyLedger(data, t), 1, '同一 id 只计一次'); + eq(applyLedger(data, t), 0, '再次应用不重复计'); + eq(t.counts.audio, 1, '音频只计 1 次'); +} + +console.log('未登录 / 接口失败时不动计数'); +{ + const t = tracker(); + eq(applyLedger({ ok: false, reason: 'no-token' }, t), 0, 'ok:false 直接跳过'); + eq(t.counts.video, 0, '计数保持 0'); +} + +console.log(''); +if (failed) { + console.log('✘ ' + failed + ' 项失败'); + process.exit(1); +} +console.log('✔ 全部通过'); diff --git a/package.json b/package.json index bf2904f..03410b0 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "test:tui": "node dev/tests/tui-test.mjs", "test:study": "node dev/tests/study-test.mjs", "test:points": "node dev/tests/points-test.mjs", + "test:points-platform": "node dev/tests/points-platform-test.mjs", "test:notify": "node dev/tests/notify-test.mjs", "test:exam": "node dev/tests/exam-test.mjs", "docker:build": "node scripts/build-docker.mjs", diff --git a/runner/config.mjs b/runner/config.mjs index 0f18f1f..3e24587 100644 --- a/runner/config.mjs +++ b/runner/config.mjs @@ -25,7 +25,7 @@ export const SCRIPT_FILE = path.join(ROOT, 'yun-xue-tang-assistant.user.js'); const DEFAULTS = { budgetMinutes: 0, // 0 = 不限 preferShort: true, - pointsMode: true, // 每日积分模式:按课时类型计分,四类封顶后停止(文档1/视频3/音频2/微课2) + pointsMode: true, // 每日积分模式:整门课完成计 1 次,四类封顶后停止(文档1/视频3/音频2/微课2) restartMinutes: 0, // 0 = 停下就退出 idleRestartMinutes: 30, origin: 'https://kfmic.yunxuetang.cn', diff --git a/src/course.js b/src/course.js index 7fb2cff..1b29d02 100644 --- a/src/course.js +++ b/src/course.js @@ -2,7 +2,9 @@ import { CFG, TAG } from './config.js'; import { R, S, state, points, saveRunState, PHASE_LEARNING } from './state.js'; import { detectLessonType, pointLabel } from './points.js'; -import { pointsAfterLesson } from './list.js'; +import { + platformMode, rememberCourseAward, noteCourseCompleted, refreshPlatformPoints, +} from './points-platform.js'; import { goToList, mediaPage } from './route.js'; import { courseIdFromUrl, norm, textOf, truncate, findVisibleClickable } from './utils.js'; import { later } from './lifecycle.js'; @@ -17,7 +19,9 @@ import { import { examTick, examPhase } from './exam.js'; import { completeCurrent, failCurrent } from './complete.js'; -// ---- 每日积分:把「课时完成」折算成一次任务 ---- +// ---- 每日积分:整门课完成才计 1 次 ---- +// 多课时课程按「整门课」算一次任务,不按节数累计: +// 逐节只记住今天学过的类型,等整门课(含考试)完成时才计分。 // 类型在播放期间就按 lessonId 缓存下来:平台记账或自动切节后页面可能已经 // 跳到下一节,事后再读目录就不知道刚完成的是哪一类了。 function pointLessonId(key) { @@ -34,19 +38,44 @@ function rememberLessonType(key) { hash: location.hash, }); if (!type) return; - R.lessonType = type; R.lessonTypes[pointLessonId(key)] = type; } -// 记一次课时完成;返回计入的类型(没计入/识别不出来返回 '') -function recordLessonPoint(key) { +// 记下「这门课今天确实学了一节」,类型留给整门课完成时计分。 +// 只剩考试、今天没学内容的老课不会留下类型,因此不产出积分。 +function markLessonStudied(key) { if (!state.pointsEnabled) return ''; const id = pointLessonId(key); - const type = R.lessonTypes[id] || R.lessonType || detectLessonType({ hash: location.hash }); + const type = R.lessonTypes[id] || detectLessonType({ hash: location.hash }); if (!type) return ''; - if (!points.record(type, id)) return ''; + R.coursePointType = type; + return type; +} + +// 整门课完成 → 计 1 次。同一门课当天只计一次(去重键 courseId|course)。 +// 平台台账可用时以平台为准:先记下课程类型,等平台真的入账后再计入。 +function recordCoursePoint() { + if (!state.pointsEnabled) return ''; + const key = R.waitLessonKey || R.lastLessonKey || ''; + const type = R.coursePointType || R.lessonTypes[pointLessonId(key)] || ''; + if (!type) return ''; + + if (platformMode() === 'platform') { + const title = (S.activeCourse && S.activeCourse.title) || courseTitle() || ''; + rememberCourseAward(title, type); + noteCourseCompleted(); + refreshPlatformPoints(points, { force: true }); + // 平台入账有延迟:完成后再补拉两次 + later(function () { refreshPlatformPoints(points, { force: true }); }, 8000); + later(function () { refreshPlatformPoints(points, { force: true }); }, 25000); + setStatus('整门课完成,等待平台记账:' + pointLabel(type)); + return type; + } + + // 平台接口不可用(未登录 / 跨域):退回本地计数 + if (!points.record(type, pointLessonId('course'))) return ''; const text = points.snapshot().text; - console.log(TAG, '积分 +3:' + pointLabel(type) + '(' + text + ')'); + console.log(TAG, '积分 +3:' + pointLabel(type) + '(整门课完成 · ' + text + ')'); setStatus('积分 +3:' + pointLabel(type) + '(' + text + ')'); return type; } @@ -86,6 +115,13 @@ export function courseTick() { return; } + // 换了一门课就清掉「今天学过什么类型」,整门课完成时只按本课的类型计分 + const pointCourseKey = curId || urlId || ''; + if (R.coursePointCourseId !== pointCourseKey) { + R.coursePointCourseId = pointCourseKey; + R.coursePointType = ''; + } + if (S.coursePhase !== PHASE_LEARNING) { S.coursePhase = PHASE_LEARNING; saveRunState(); @@ -133,7 +169,7 @@ export function courseTick() { const confirmed = !!(R.lastSummary && R.lastSummary.complete); R.lastSummary = summary; if (confirmed) { - recordLessonPoint(R.waitLessonKey || R.lastLessonKey); + recordCoursePoint(); completeCurrent(); return; } @@ -147,10 +183,8 @@ export function courseTick() { const curKey = readActiveLessonKey(); R.lastSummary = summary; - // 平台刚记录了一节 → 按这一节的类型计一次积分 - const pointType = (!isMedia && summary.kind !== 'percent') - ? recordLessonPoint(prevKey) : ''; - if (pointType && pointsAfterLesson(pointType)) return; + // 平台刚记录了一节 → 只记住这一节的类型,整门课完成时才计分 + if (!isMedia && summary.kind !== 'percent') markLessonStudied(prevKey); // 单视频/音频页的百分比是播放进度,不是「一节学完」,不能据此切节 if (!isMedia && summary.kind !== 'percent' && (!prevKey || curKey === prevKey)) { @@ -253,7 +287,7 @@ export function courseTick() { } R.waitStart = 0; R.lastProgressAt = Date.now(); - recordLessonPoint(R.waitLessonKey || R.lastLessonKey); + recordCoursePoint(); completeCurrent(); return; } @@ -264,8 +298,7 @@ export function courseTick() { R.lastLessonKey = newKey; R.doneLatchKey = ''; R.lastProgressAt = Date.now(); - const pointType = recordLessonPoint(R.waitLessonKey); - if (pointType && pointsAfterLesson(pointType)) return; + markLessonStudied(R.waitLessonKey); setStatus('已自动进入下一节'); return; } @@ -274,10 +307,10 @@ export function courseTick() { if (!isMedia && s2 && s2.x > R.waitSummaryX) { R.waitStart = 0; R.lastProgressAt = Date.now(); - const pointType = recordLessonPoint(R.waitLessonKey || R.lastLessonKey); + markLessonStudied(R.waitLessonKey || R.lastLessonKey); if (s2.complete) { completeCurrent(); - } else if (!pointType || !pointsAfterLesson(pointType)) { + } else { advanceLesson(); } return; @@ -352,7 +385,7 @@ export function advanceLesson() { const s = readSummary(); if (s && s.complete) { - recordLessonPoint(R.waitLessonKey || R.lastLessonKey); + recordCoursePoint(); completeCurrent(); } else { setStatus('没有找到下一节,等待课程完成…'); diff --git a/src/index.js b/src/index.js index 05830d2..89f953a 100644 --- a/src/index.js +++ b/src/index.js @@ -12,7 +12,7 @@ import { chooseShortCourse, sortCardsByDuration, formatDuration, pendingShortItems, scanCards, currentPage, maxPageNumber, startCourse, jumpToPage, nextPage, - ensurePointsInventory, pointsAvailability, pointsDone, pointsTarget, pointsAfterLesson, startStandalone, + ensurePointsInventory, pointsAvailability, pointsDone, pointsTarget, startStandalone, } from './list.js'; import { courseTick, manualCourseTick } from './course.js'; import { @@ -20,6 +20,7 @@ import { completeCurrent, failCurrent, skipCurrent, courseSkipped, } from './complete.js'; import { examTick, examPhase } from './exam.js'; +import { refreshPlatformPoints, cachedPlatformPoints } from './points-platform.js'; import { hookAllVideos, readSummary, readCountdown, lessonItems, findNextLessonElement, clickLesson, alignToFirstIncomplete, @@ -78,6 +79,8 @@ try { Object.defineProperty(window, '__yunXueTangAuto', { value: { S, R, state, points, tick, save: saveRunState, flush: flushRunState, route, + // 平台积分台账:调试时可手动刷新(见 dev/tests/points-api-probe.mjs) + refreshPlatformPoints, cachedPlatformPoints, // CFG 暴露给无头运行器:脚本内可调参数(重试次数、冷却等) CFG, mediaPage, courseIdFromUrl, @@ -100,7 +103,7 @@ try { // 以下供开发/真机测试驱动内部路径使用: scanCards, currentPage, maxPageNumber, startCourse, jumpToPage, nextPage, ensurePointsInventory, pointsAvailability, pointsDone, pointsTarget, - pointsAfterLesson, startStandalone, + startStandalone, listTick, courseTick, manualCourseTick, loginFields, findLoginVm, checkLoginAgreement, setNativeValue, saveCreds, loadCreds, clearSavedCreds, diff --git a/src/list.js b/src/list.js index 9309e50..63b5fb6 100644 --- a/src/list.js +++ b/src/list.js @@ -7,7 +7,7 @@ import { invalidateShortCatalog, PHASE_ENTERING, PHASE_LEARNING, PHASE_IDLE, } from './state.js'; import { apiTypeKey, detectLessonType, nextTarget, pointLabel, POINT_RULES } from './points.js'; -import { goToList } from './route.js'; +import { cachedPlatformPoints, platformNoAward, refreshPlatformPoints } from './points-platform.js'; import { norm, textOf, truncate } from './utils.js'; import { clickNode } from './player.js'; import { setStatus, updatePanel } from './panel.js'; @@ -532,6 +532,9 @@ export function pointsAvailability(videoAvailable) { export function pointsDone() { if (!state.pointsEnabled) return false; + // 平台台账说今天的学习积分已经到上限 → 以平台为准直接收尾 + const p = cachedPlatformPoints(); + if (p && p.ok && p.maxPoints > 0 && p.todayPoints >= p.maxPoints) return true; return points.done(pointsAvailability()); } @@ -542,37 +545,6 @@ export function pointsTarget() { }); } -// 从当前课程页回列表,交给 listTick 停止或换下一类。 -function leaveForPoints(reason) { - if (S.activeCourse) { - S.activeCourse = null; - S.coursePhase = PHASE_IDLE; - } - S.awaitingListReturn = true; - saveRunState(); - setStatus(reason); - console.log(TAG, reason); - goToList(true); -} - - // 本类刚满额 / 今日任务已无内容时离开课程页。 - // 返回 true = 已经发起跳转,调用方不要再切下一节。 -export function pointsAfterLesson(type) { - if (!state.pointsEnabled) return false; - if (!R.pointsInventory) { ensurePointsInventory(); return false; } - if (pointsDone()) { - leaveForPoints('今日积分:可用内容已学完(' + points.summary() + ')'); - return true; - } - if (type && points.isFull(type)) { - const target = pointsTarget(); - if (target && target.type !== type) { - leaveForPoints('“' + pointLabel(type) + '”已满额,切换学习“' + pointLabel(target.type) + '”'); - return true; - } - } - return false; -} // 进入单条文档/音频/微课:直接按 kngId 打开对应播放页 export function startStandalone(item, type) { @@ -853,11 +825,17 @@ export function listTick() { // 每日积分模式:先补文档/音频/微课的单条内容;视频额度靠课程里的视频课时。 // 四类都满额(或剩余类型确认没内容)就收尾,不再无意义地刷课。 if (state.pointsEnabled) { + // 每次到列表页都顺带刷新平台台账(内部有 20 秒缓存,不会刷爆接口) + refreshPlatformPoints(points); const invStatus = ensurePointsInventory(); if (invStatus === 'loading') return; + if (platformNoAward()) { + stopBatch('今日积分:平台连续 3 门课未入账,判定今日积分已满或没有可计分内容'); + return; + } if (pointsDone()) { const text = points.summary(); - console.log(TAG, '今日积分:可用内容已学完', text); + console.log(TAG, '今日积分:平台台账已达上限或可用内容已学完', text); stopBatch('今日积分:可用内容已学完(' + text + ')'); return; } diff --git a/src/meta.js b/src/meta.js index 83149d8..7660c2c 100644 --- a/src/meta.js +++ b/src/meta.js @@ -29,7 +29,7 @@ * - 进入课程(列表刷课或自己点开)都会先对齐到「第一个未学完的课时」,即从第一章第一节起 * 顺序学习,不沿用平台上次停留的位置(否则前面的课时会被跳过,整门课永远学不完)。 * 切换成功与否以目录高亮为准:没切过去会重试并如实提示「未能切换」,不会假装已切换。 - * - 不按门数设上限:每日积分模式下按课时类型累计,积分目标完成或没有可学内容时收尾。 + * - 不按门数设上限:每日积分模式下整门课完成计 1 次,积分目标完成或没有可学内容时收尾。 * - 脚本不跳过普通课程:没有「跳过本课」,也不会把课程拉黑。某门课没学完(例如遇到 * 需要人工完成的滑块/拼图验证、答题/测验章节、长时间无计时进展)就退避重试: * 30 秒起每次翻倍、最长 5 分钟,同一门课最多重试 CFG.maxCourseRetries 次, diff --git a/src/panel.js b/src/panel.js index e5f4d0c..1415127 100644 --- a/src/panel.js +++ b/src/panel.js @@ -2,6 +2,7 @@ import { VERSION, LS_ENABLED, LS_PREFER_SHORT, SS_SHORT_CATALOG, PANEL_ID, TAG } from './config.js'; import { R, S, state, points, saveRunState } from './state.js'; import { LS_POINTS_MODE } from './points.js'; +import { cachedPlatformPoints } from './points-platform.js'; import { route } from './route.js'; import { isLoginPage, startBatch, doLoginAndStart, clearSavedCreds } from './login.js'; @@ -44,6 +45,12 @@ export function setStatus(text) { if (statusEl) statusEl.textContent = text; } +// 面板上再带一份平台台账的真实今日积分,避免本地未归类的记录让数字偏小 +function platformSuffix() { + const p = cachedPlatformPoints(); + return p && p.ok ? ' · 平台 ' + p.todayPoints + '/' + p.maxPoints : ''; +} + export function updatePanel() { if (cbBatch) cbBatch.checked = S.batchRunning; if (statsEl) { @@ -64,7 +71,7 @@ export function updatePanel() { if (cbPoints) cbPoints.checked = state.pointsEnabled; if (pointsEl) { pointsEl.style.display = state.pointsEnabled ? 'block' : 'none'; - pointsEl.textContent = state.pointsEnabled ? points.summary() : ''; + pointsEl.textContent = state.pointsEnabled ? points.summary() + platformSuffix() : ''; } const onLogin = isLoginPage(); @@ -271,7 +278,7 @@ export function buildPanel() { cbPoints.type = 'checkbox'; cbPoints.id = 'yun-xue-tang-points-enabled'; cbPoints.checked = state.pointsEnabled; - cbPoints.title = '按课时类型计分:文档1 / 视频3 / 音频2 / 微课2,每天最多 24 分'; + cbPoints.title = '整门课完成计 1 次:文档1 / 视频3 / 音频2 / 微课2,每天最多 24 分'; cbPoints.addEventListener('change', function () { state.pointsEnabled = cbPoints.checked; points.setEnabled(state.pointsEnabled); diff --git a/src/points-platform.js b/src/points-platform.js new file mode 100644 index 0000000..1c930ef --- /dev/null +++ b/src/points-platform.js @@ -0,0 +1,255 @@ +// ======== 平台积分台账 ======== +// 「我的积分」页 /ssp/#/my/point 背后的接口才是最直接的证据: +// GET /ssp/rule/org 各积分规则的每日上限(文档/视频/音频/微课) +// POST /ssp/point/history/self 今日积分明细 +// 脚本不再假设「学完一门就该 +3」,只把平台真实入账的记录折算成积分。 +// +// 鉴权:接口认 localStorage.token(登录后由平台写入),不用 cookie。 +// 接口不可用(未登录 / 跨域 / 网络)时返回 ok:false,调用方退回本地计数。 +import { norm } from './utils.js'; +import { pointLabel } from './points.js'; + +const API = 'https://api-phx-tc.yunxuetang.cn/ssp/'; +const RULE_CODES = { doc: 'SB1031', video: 'SB1032', audio: 'SB1033', micro: 'SB1034' }; +// 台账里的 nameType 就是平台自己的课件类型:1006 文档 / 1007 视频 / 1008 音频 / 1009 微课 +const NAME_TYPES = { 1006: 'doc', 1007: 'video', 1008: 'audio', 1009: 'micro' }; +const CACHE_TTL = 20000; +const TAGS_KEY = 'yun-xue-tang-point-awards-v1'; +const PENDING_TTL = 6 * 60 * 60 * 1000; +const NO_AWARD_LIMIT = 3; + +let cache = null; +let inflight = null; +let mode = ''; // '' | 'platform' | 'local':首次刷新成功与否决定本次会话的计数方式 +let completionsSinceAward = 0; +let lastLedgerCount = -1; + +function pad2(n) { + return n < 10 ? '0' + n : '' + n; +} + +function dayKey(ms) { + const d = new Date(ms); + return d.getFullYear() + '-' + pad2(d.getMonth() + 1) + '-' + pad2(d.getDate()); +} + +function token() { + try { return localStorage.getItem('token') || ''; } catch (e) { return ''; } +} + +export function platformAvailable() { + return !!token(); +} + +/** 首次刷新是否已经确定计数方式;未确定前调用方按本地模式处理 */ +export function platformMode() { + return mode; +} + +export function cachedPlatformPoints() { + return cache; +} + +/** 平台连续多少门课没有新增入账记录(用于判断「积分其实已满」) */ +export function platformNoAward() { + return mode === 'platform' && completionsSinceAward >= NO_AWARD_LIMIT; +} + +// ---- 本地保存「课程名 -> 类型」和「等待对账的完成记录」---- + +function loadTags(day) { + try { + const o = JSON.parse(localStorage.getItem(TAGS_KEY) || '{}'); + if (o && o.day === day) { + return { + day: day, + titles: o.titles && typeof o.titles === 'object' ? o.titles : {}, + pending: Array.isArray(o.pending) ? o.pending : [], + unknown: o.unknown && typeof o.unknown === 'object' ? o.unknown : {}, + }; + } + } catch (e) { /* ignore */ } + return { day: day, titles: {}, pending: [], unknown: {} }; +} + +function saveTags(t) { + try { localStorage.setItem(TAGS_KEY, JSON.stringify(t)); } catch (e) { /* ignore */ } +} + +/** 整门课完成时记下「这门课算哪一类」,等平台台账入账后据此归类 */ +export function rememberCourseAward(title, type) { + if (!title || !type) return; + const t = loadTags(dayKey(Date.now())); + t.titles[norm(title)] = type; + t.pending.push({ type: type, at: Date.now(), title: norm(title) }); + if (t.pending.length > 50) t.pending = t.pending.slice(-50); + saveTags(t); +} + +/** 一门课完成了(平台模式下用来判断「连续 N 门没有入账」) */ +export function noteCourseCompleted() { + if (mode === 'platform') completionsSinceAward++; +} + +/** + * 把平台台账折算进本地计数器。纯逻辑,方便离线测试。 + * @returns {number} 本次新增计入的条数 + */ +export function applyLedger(data, tracker, opts = {}) { + if (!data || !data.ok) return 0; + const t = loadTags(data.day); + if (opts.reset) { + // 切换到平台模式时丢弃旧口径的本地计数,完全以台账重建 + if (typeof tracker.resetCounts === 'function') tracker.resetCounts(); + t.unknown = {}; + } + let added = 0; + for (const r of data.records || []) { + const id = 'platform:' + r.id; + const key = norm(r.remark || ''); + // 优先用平台台账自带的 nameType,它比标题/待对账记录都可靠 + let type = NAME_TYPES[Number(r.nameType)] || ''; + if (!type) type = key && t.titles[key] ? t.titles[key] : ''; + if (type) { + // 这条记录已经对上类型了,把它对应的待对账记录撤掉,避免后面串号 + const j = t.pending.findIndex((p) => p.title === key && p.type === type); + if (j >= 0) t.pending.splice(j, 1); + } else { + // 平台有时用课时名而不是课程名:把它归给最近一次还没对上的完成记录 + const i = t.pending.findIndex((p) => Date.now() - (p.at || 0) < PENDING_TTL); + if (i >= 0) { + type = t.pending[i].type; + t.pending.splice(i, 1); + } + } + if (type) { + if (tracker.record(type, id)) { + added++; + console.log('[云学堂助手] 积分 +' + r.point + '(平台入账):' + pointLabel(type) + + ' · ' + tracker.summary()); + } + } else if (!t.unknown[id]) { + t.unknown[id] = 1; + console.warn('[云学堂助手] 平台积分 +' + r.point + ' 未能归类:' + (r.remark || r.id)); + } + } + saveTags(t); + return added; +} + +// ---- 拉取 ---- + +async function getJson(url, opts) { + const res = await fetch(url, opts); + if (!res.ok) throw new Error('HTTP ' + res.status); + return res.json(); +} + +export async function fetchPlatformPoints(now) { + const tk = token(); + const at = now || Date.now(); + if (!tk) return { ok: false, at: at, reason: 'no-token' }; + const day = dayKey(at); + // 平台网关要求 source 头(501 = PC 端);缺了会返回 400「请求头 source 为空」 + const headers = { + 'Content-Type': 'application/json;charset=UTF-8', + source: '501', + 'x-yxt-product': 'xxv2', + token: tk, + }; + const body = JSON.stringify({ + startDate: day + ' 00:00:00', + endDate: day + ' 23:59:59', + sourceType: -1, + optionType: 0, + type: 1, + userId: '', + }); + + const results = await Promise.all([ + getJson(API + 'rule/org', { headers: headers }), + getJson(API + 'point/history/self?limit=200&offset=0', { + method: 'POST', headers: headers, body: body, + }), + ]); + const rules = results[0]; + const ledger = results[1]; + + const ruleMap = {}; + for (const r of (rules && rules.datas) || []) { + if (!r || Number(r.enable) !== 1) continue; + for (const key of Object.keys(RULE_CODES)) { + if (r.code === RULE_CODES[key]) { + ruleMap[key] = { + cap: Math.max(0, Number(r.times) || 0), + point: Math.max(0, Number(r.point) || 0), + }; + } + } + } + + // sourceType 1002 = 在线学习;登录奖励等其它来源不算每日学习积分 + const records = ((ledger && ledger.datas) || []).filter((r) => + r && r.id && Number(r.point) > 0 && Number(r.sourceType) === 1002); + const todayPoints = records.reduce((n, r) => n + (Number(r.point) || 0), 0); + const maxPoints = Object.keys(ruleMap).reduce((n, k) => n + ruleMap[k].cap * ruleMap[k].point, 0); + + return { + ok: true, + at: at, + day: day, + rules: ruleMap, + records: records, + todayPoints: todayPoints, + maxPoints: maxPoints, + }; +} + +/** + * 刷新平台台账并折算进计数器。并发调用共用一个请求;失败不抛错。 + * @param {object} tracker points.js 的 tracker(需要 record / resetCounts) + * @param {{force?:boolean}} [opts] + */ +export function refreshPlatformPoints(tracker, opts = {}) { + if (!force(opts) && cache && Date.now() - cache.at < CACHE_TTL) { + return Promise.resolve(cache); + } + if (inflight) return inflight; + inflight = fetchPlatformPoints().then((data) => { + cache = data; + if (data.ok) { + if (mode !== 'platform') { + mode = 'platform'; + applyLedger(data, tracker, { reset: true }); + } else { + applyLedger(data, tracker); + } + if (data.records.length > lastLedgerCount) completionsSinceAward = 0; + lastLedgerCount = data.records.length; + } else if (!mode) { + mode = 'local'; + } + return data; + }).catch((e) => { + cache = { ok: false, at: Date.now(), reason: e && e.message ? e.message : String(e) }; + if (!mode) mode = 'local'; + return cache; + }).finally(() => { inflight = null; }); + return inflight; +} + +function force(opts) { + return !!(opts && opts.force); +} + +/** 某个类型在平台规则里是否启用/上限多少;没有平台数据时返回 null */ +export function platformRule(key) { + if (!cache || !cache.ok) return null; + return cache.rules[key] || null; +} + +/** 全部启用规则加起来的每日积分上限;没有平台数据时返回 0 */ +export function platformMaxPoints() { + if (!cache || !cache.ok) return 0; + return cache.maxPoints; +} diff --git a/src/points.js b/src/points.js index dcc34eb..f9925eb 100644 --- a/src/points.js +++ b/src/points.js @@ -2,11 +2,12 @@ // 平台按「学习完成」发积分,四类任务各有每日上限: // 文档 1 次 + 视频 3 次 + 音频 2 次 + 微课 2 次,每次 3 分,单日最多 24 分。 // -// 这里的口径是「完成一个课时算一次」,不是「完成一整门课」: -// · 多课时课程里每学完一节视频/文档/音频/微课,各计一次; +// 这里的口径是「整门课完成算一次」,不是「完成一节课时就算一次」: +// · 多课时课程要所有课时(含考试)都完成后才计一次,按今天实际学过的课时类型归类; // · 单视频/音频/课件播放页学完即计一次; +// · 只剩考试、今天没学内容的课程不计分; // · 类型识别不出来的课时不猜、不计分; -// · 同一天同一课时重复上报(刷新、重进、平台重发)只计一次。 +// · 同一天同一门课重复上报(刷新、重进、平台重发)只计一次。 // // 计数落 localStorage 并带日期,跨刷新/运行器重启不丢,跨天自动清零。 // 纯数据逻辑,不碰 DOM,方便脱离浏览器直接测。 @@ -183,24 +184,32 @@ export function createPointsTracker(opts = {}) { } /** - * 记一次课时完成。 - * @param {string} key detectLessonType 的返回值 - * @param {string} [lessonId] 当天去重键(建议 courseId|lessonKey);空串表示不去重 + * 记一次任务完成(整门课或单条内容)。 + * @param {string} key detectLessonType 的返回值 + * @param {string} [taskId] 当天去重键(建议 courseId|course / kngId|media);空串表示不去重 * @returns {boolean} 是否真的计入了 */ - function record(key, lessonId) { + function record(key, taskId) { rollover(); if (!enabled) return false; if (!ruleOf(key) || isFull(key)) return false; - if (lessonId) { - if (state.seen[lessonId]) return false; - state.seen[lessonId] = 1; + if (taskId) { + if (state.seen[taskId]) return false; + state.seen[taskId] = 1; } state.counts[key] = count(key) + 1; save(); return true; } + /** 切换到平台台账口径时清零并重建 */ + function resetCounts() { + rollover(); + for (const rule of POINT_RULES) state.counts[rule.key] = 0; + state.seen = {}; + save(); + } + function totalPoints() { let total = 0; for (const rule of POINT_RULES) { @@ -263,5 +272,6 @@ export function createPointsTracker(opts = {}) { return { record, count, cap, isFull, remaining, totalPoints, maxPoints, allFull, done, progress, summary, snapshot, setEnabled, isEnabled, rollover, + resetCounts, }; } diff --git a/src/state.js b/src/state.js index 33c5be2..d10610c 100644 --- a/src/state.js +++ b/src/state.js @@ -19,7 +19,7 @@ import { createPointsTracker, LS_POINTS_MODE } from './points.js'; export const state = { autoPlayEnabled: true, // 当前课程自动连播(自己点开的课) preferShortCourses: CFG.preferShortCourses, // 列表刷课时优先后时长更短的课程(正序) - pointsEnabled: true, // 每日积分模式:按课时类型计分并封顶 + pointsEnabled: true, // 每日积分模式:整门课完成计 1 次,按课时类型封顶 }; try { state.autoPlayEnabled = localStorage.getItem(LS_ENABLED) !== '0'; @@ -259,6 +259,8 @@ export const R = { // 每日积分模式:当前课时的类型缓存(课时 id → doc/video/audio/micro), // 以及文档/音频/微课的单条库存(视频靠课程里的课时,不单独存) lessonTypes: {}, + coursePointCourseId: '', // 「今天学过的类型」所属课程 id + coursePointType: '', // 这门课今天学过的类型,整门课完成时计一次 pointsInventory: null, pointsInventoryLoading: false, pointsInventoryFailedAt: 0, @@ -282,6 +284,8 @@ export function resetCourseRuntime() { R.lastLessonKey = ''; R.doneLatchKey = ''; R.lessonTypes = {}; + R.coursePointCourseId = ''; + R.coursePointType = ''; R.lastSummary = null; R.lastCountdown = null; R.lastProgressAt = Date.now(); diff --git a/yun-xue-tang-assistant.user.js b/yun-xue-tang-assistant.user.js index b26becc..42ae5b6 100644 --- a/yun-xue-tang-assistant.user.js +++ b/yun-xue-tang-assistant.user.js @@ -29,7 +29,7 @@ * - 进入课程(列表刷课或自己点开)都会先对齐到「第一个未学完的课时」,即从第一章第一节起 * 顺序学习,不沿用平台上次停留的位置(否则前面的课时会被跳过,整门课永远学不完)。 * 切换成功与否以目录高亮为准:没切过去会重试并如实提示「未能切换」,不会假装已切换。 - * - 不按门数设上限:每日积分模式下按课时类型累计,积分目标完成或没有可学内容时收尾。 + * - 不按门数设上限:每日积分模式下整门课完成计 1 次,积分目标完成或没有可学内容时收尾。 * - 脚本不跳过普通课程:没有「跳过本课」,也不会把课程拉黑。某门课没学完(例如遇到 * 需要人工完成的滑块/拼图验证、答题/测验章节、长时间无计时进展)就退避重试: * 30 秒起每次翻倍、最长 5 分钟,同一门课最多重试 CFG.maxCourseRetries 次, @@ -231,18 +231,24 @@ function remaining(key) { return Math.max(0, cap(key) - count(key)); } - function record(key, lessonId) { + function record(key, taskId) { rollover(); if (!enabled) return false; if (!ruleOf(key) || isFull(key)) return false; - if (lessonId) { - if (state2.seen[lessonId]) return false; - state2.seen[lessonId] = 1; + if (taskId) { + if (state2.seen[taskId]) return false; + state2.seen[taskId] = 1; } state2.counts[key] = count(key) + 1; save(); return true; } + function resetCounts() { + rollover(); + for (const rule of POINT_RULES) state2.counts[rule.key] = 0; + state2.seen = {}; + save(); + } function totalPoints() { let total = 0; for (const rule of POINT_RULES) { @@ -303,7 +309,8 @@ snapshot, setEnabled, isEnabled, - rollover + rollover, + resetCounts }; } @@ -314,7 +321,7 @@ preferShortCourses: CFG.preferShortCourses, // 列表刷课时优先后时长更短的课程(正序) pointsEnabled: true - // 每日积分模式:按课时类型计分并封顶 + // 每日积分模式:整门课完成计 1 次,按课时类型封顶 }; try { state.autoPlayEnabled = localStorage.getItem(LS_ENABLED) !== "0"; @@ -560,6 +567,10 @@ // 每日积分模式:当前课时的类型缓存(课时 id → doc/video/audio/micro), // 以及文档/音频/微课的单条库存(视频靠课程里的课时,不单独存) lessonTypes: {}, + coursePointCourseId: "", + // 「今天学过的类型」所属课程 id + coursePointType: "", + // 这门课今天学过的类型,整门课完成时计一次 pointsInventory: null, pointsInventoryLoading: false, pointsInventoryFailedAt: 0, @@ -581,6 +592,8 @@ R.lastLessonKey = ""; R.doneLatchKey = ""; R.lessonTypes = {}; + R.coursePointCourseId = ""; + R.coursePointType = ""; R.lastSummary = null; R.lastCountdown = null; R.lastProgressAt = Date.now(); @@ -763,8 +776,8 @@ function mediaPage() { return /^#\/(?:video|audio|ppt|document|article|micro|microcourse)\/play(?:[?/]|$)/i.test(location.hash || ""); } - function goToList(force) { - if (!force && Date.now() - R.lastGoListAt < 5e3) return; + function goToList(force2) { + if (!force2 && Date.now() - R.lastGoListAt < 5e3) return; R.lastGoListAt = Date.now(); const url = S.catalogUrl || location.origin + "/kng/#/list"; if (route() === "list") { @@ -779,6 +792,202 @@ } } + // src/points-platform.js + var API = "https://api-phx-tc.yunxuetang.cn/ssp/"; + var RULE_CODES = { doc: "SB1031", video: "SB1032", audio: "SB1033", micro: "SB1034" }; + var NAME_TYPES = { 1006: "doc", 1007: "video", 1008: "audio", 1009: "micro" }; + var CACHE_TTL = 2e4; + var TAGS_KEY = "yun-xue-tang-point-awards-v1"; + var PENDING_TTL = 6 * 60 * 60 * 1e3; + var NO_AWARD_LIMIT = 3; + var cache = null; + var inflight = null; + var mode = ""; + var completionsSinceAward = 0; + var lastLedgerCount = -1; + function pad22(n) { + return n < 10 ? "0" + n : "" + n; + } + function dayKey2(ms) { + const d = new Date(ms); + return d.getFullYear() + "-" + pad22(d.getMonth() + 1) + "-" + pad22(d.getDate()); + } + function token() { + try { + return localStorage.getItem("token") || ""; + } catch (e) { + return ""; + } + } + function platformMode() { + return mode; + } + function cachedPlatformPoints() { + return cache; + } + function platformNoAward() { + return mode === "platform" && completionsSinceAward >= NO_AWARD_LIMIT; + } + function loadTags(day) { + try { + const o = JSON.parse(localStorage.getItem(TAGS_KEY) || "{}"); + if (o && o.day === day) { + return { + day, + titles: o.titles && typeof o.titles === "object" ? o.titles : {}, + pending: Array.isArray(o.pending) ? o.pending : [], + unknown: o.unknown && typeof o.unknown === "object" ? o.unknown : {} + }; + } + } catch (e) { + } + return { day, titles: {}, pending: [], unknown: {} }; + } + function saveTags(t) { + try { + localStorage.setItem(TAGS_KEY, JSON.stringify(t)); + } catch (e) { + } + } + function rememberCourseAward(title, type) { + if (!title || !type) return; + const t = loadTags(dayKey2(Date.now())); + t.titles[norm(title)] = type; + t.pending.push({ type, at: Date.now(), title: norm(title) }); + if (t.pending.length > 50) t.pending = t.pending.slice(-50); + saveTags(t); + } + function noteCourseCompleted() { + if (mode === "platform") completionsSinceAward++; + } + function applyLedger(data, tracker, opts = {}) { + if (!data || !data.ok) return 0; + const t = loadTags(data.day); + if (opts.reset) { + if (typeof tracker.resetCounts === "function") tracker.resetCounts(); + t.unknown = {}; + } + let added = 0; + for (const r of data.records || []) { + const id = "platform:" + r.id; + const key = norm(r.remark || ""); + let type = NAME_TYPES[Number(r.nameType)] || ""; + if (!type) type = key && t.titles[key] ? t.titles[key] : ""; + if (type) { + const j = t.pending.findIndex((p) => p.title === key && p.type === type); + if (j >= 0) t.pending.splice(j, 1); + } else { + const i = t.pending.findIndex((p) => Date.now() - (p.at || 0) < PENDING_TTL); + if (i >= 0) { + type = t.pending[i].type; + t.pending.splice(i, 1); + } + } + if (type) { + if (tracker.record(type, id)) { + added++; + console.log("[云学堂助手] 积分 +" + r.point + "(平台入账):" + pointLabel(type) + " · " + tracker.summary()); + } + } else if (!t.unknown[id]) { + t.unknown[id] = 1; + console.warn("[云学堂助手] 平台积分 +" + r.point + " 未能归类:" + (r.remark || r.id)); + } + } + saveTags(t); + return added; + } + async function getJson(url, opts) { + const res = await fetch(url, opts); + if (!res.ok) throw new Error("HTTP " + res.status); + return res.json(); + } + async function fetchPlatformPoints(now) { + const tk = token(); + const at = now || Date.now(); + if (!tk) return { ok: false, at, reason: "no-token" }; + const day = dayKey2(at); + const headers = { + "Content-Type": "application/json;charset=UTF-8", + source: "501", + "x-yxt-product": "xxv2", + token: tk + }; + const body = JSON.stringify({ + startDate: day + " 00:00:00", + endDate: day + " 23:59:59", + sourceType: -1, + optionType: 0, + type: 1, + userId: "" + }); + const results = await Promise.all([ + getJson(API + "rule/org", { headers }), + getJson(API + "point/history/self?limit=200&offset=0", { + method: "POST", + headers, + body + }) + ]); + const rules = results[0]; + const ledger = results[1]; + const ruleMap = {}; + for (const r of rules && rules.datas || []) { + if (!r || Number(r.enable) !== 1) continue; + for (const key of Object.keys(RULE_CODES)) { + if (r.code === RULE_CODES[key]) { + ruleMap[key] = { + cap: Math.max(0, Number(r.times) || 0), + point: Math.max(0, Number(r.point) || 0) + }; + } + } + } + const records = (ledger && ledger.datas || []).filter((r) => r && r.id && Number(r.point) > 0 && Number(r.sourceType) === 1002); + const todayPoints = records.reduce((n, r) => n + (Number(r.point) || 0), 0); + const maxPoints = Object.keys(ruleMap).reduce((n, k) => n + ruleMap[k].cap * ruleMap[k].point, 0); + return { + ok: true, + at, + day, + rules: ruleMap, + records, + todayPoints, + maxPoints + }; + } + function refreshPlatformPoints(tracker, opts = {}) { + if (!force(opts) && cache && Date.now() - cache.at < CACHE_TTL) { + return Promise.resolve(cache); + } + if (inflight) return inflight; + inflight = fetchPlatformPoints().then((data) => { + cache = data; + if (data.ok) { + if (mode !== "platform") { + mode = "platform"; + applyLedger(data, tracker, { reset: true }); + } else { + applyLedger(data, tracker); + } + if (data.records.length > lastLedgerCount) completionsSinceAward = 0; + lastLedgerCount = data.records.length; + } else if (!mode) { + mode = "local"; + } + return data; + }).catch((e) => { + cache = { ok: false, at: Date.now(), reason: e && e.message ? e.message : String(e) }; + if (!mode) mode = "local"; + return cache; + }).finally(() => { + inflight = null; + }); + return inflight; + } + function force(opts) { + return !!(opts && opts.force); + } + // src/login.js var tick = function() { }; @@ -1119,6 +1328,10 @@ console.log(TAG, text); if (statusEl) statusEl.textContent = text; } + function platformSuffix() { + const p = cachedPlatformPoints(); + return p && p.ok ? " · 平台 " + p.todayPoints + "/" + p.maxPoints : ""; + } function updatePanel() { if (cbBatch) cbBatch.checked = S.batchRunning; if (statsEl) { @@ -1139,7 +1352,7 @@ if (cbPoints) cbPoints.checked = state.pointsEnabled; if (pointsEl) { pointsEl.style.display = state.pointsEnabled ? "block" : "none"; - pointsEl.textContent = state.pointsEnabled ? points.summary() : ""; + pointsEl.textContent = state.pointsEnabled ? points.summary() + platformSuffix() : ""; } const onLogin = isLoginPage(); if (loginBox) loginBox.style.display = onLogin ? "block" : "none"; @@ -1359,7 +1572,7 @@ cbPoints.type = "checkbox"; cbPoints.id = "yun-xue-tang-points-enabled"; cbPoints.checked = state.pointsEnabled; - cbPoints.title = "按课时类型计分:文档1 / 视频3 / 音频2 / 微课2,每天最多 24 分"; + cbPoints.title = "整门课完成计 1 次:文档1 / 视频3 / 音频2 / 微课2,每天最多 24 分"; cbPoints.addEventListener("change", function() { state.pointsEnabled = cbPoints.checked; points.setEnabled(state.pointsEnabled); @@ -2200,8 +2413,8 @@ } function shortCatalogRequest(vm) { const orgId = vm && vm.collegeId || localStorage.getItem("orgId") || ""; - const token = localStorage.getItem("token") || ""; - if (!token) throw new Error("未找到登录 token,可能尚未登录或登录已过期"); + const token2 = localStorage.getItem("token") || ""; + if (!token2) throw new Error("未找到登录 token,可能尚未登录或登录已过期"); const body = JSON.stringify({ collegeId: orgId, catalogId: vm && vm.currentCatalogId || "", @@ -2213,7 +2426,7 @@ const headers = { "content-type": "application/json;charset=UTF-8", accept: "application/json, text/plain, */*", - token, + token: token2, "yxt-orgdomain": location.hostname, source: "501" }; @@ -2518,6 +2731,8 @@ } function pointsDone() { if (!state.pointsEnabled) return false; + const p = cachedPlatformPoints(); + if (p && p.ok && p.maxPoints > 0 && p.todayPoints >= p.maxPoints) return true; return points.done(pointsAvailability()); } function pointsTarget() { @@ -2528,36 +2743,6 @@ available: pointsAvailability() }); } - function leaveForPoints(reason) { - if (S.activeCourse) { - S.activeCourse = null; - S.coursePhase = PHASE_IDLE; - } - S.awaitingListReturn = true; - saveRunState(); - setStatus(reason); - console.log(TAG, reason); - goToList(true); - } - function pointsAfterLesson(type) { - if (!state.pointsEnabled) return false; - if (!R.pointsInventory) { - ensurePointsInventory(); - return false; - } - if (pointsDone()) { - leaveForPoints("今日积分:可用内容已学完(" + points.summary() + ")"); - return true; - } - if (type && points.isFull(type)) { - const target = pointsTarget(); - if (target && target.type !== type) { - leaveForPoints("“" + pointLabel(type) + "”已满额,切换学习“" + pointLabel(target.type) + "”"); - return true; - } - } - return false; - } function startStandalone(item, type) { if (!item) return false; R.lastCardClickAt = Date.now(); @@ -2792,11 +2977,16 @@ } R.retryStatusSec = -1; if (state.pointsEnabled) { + refreshPlatformPoints(points); const invStatus = ensurePointsInventory(); if (invStatus === "loading") return; + if (platformNoAward()) { + stopBatch("今日积分:平台连续 3 门课未入账,判定今日积分已满或没有可计分内容"); + return; + } if (pointsDone()) { const text = points.summary(); - console.log(TAG, "今日积分:可用内容已学完", text); + console.log(TAG, "今日积分:平台台账已达上限或可用内容已学完", text); stopBatch("今日积分:可用内容已学完(" + text + ")"); return; } @@ -3186,17 +3376,38 @@ hash: location.hash }); if (!type) return; - R.lessonType = type; R.lessonTypes[pointLessonId(key)] = type; } - function recordLessonPoint(key) { + function markLessonStudied(key) { if (!state.pointsEnabled) return ""; const id = pointLessonId(key); - const type = R.lessonTypes[id] || R.lessonType || detectLessonType({ hash: location.hash }); + const type = R.lessonTypes[id] || detectLessonType({ hash: location.hash }); if (!type) return ""; - if (!points.record(type, id)) return ""; + R.coursePointType = type; + return type; + } + function recordCoursePoint() { + if (!state.pointsEnabled) return ""; + const key = R.waitLessonKey || R.lastLessonKey || ""; + const type = R.coursePointType || R.lessonTypes[pointLessonId(key)] || ""; + if (!type) return ""; + if (platformMode() === "platform") { + const title = S.activeCourse && S.activeCourse.title || courseTitle() || ""; + rememberCourseAward(title, type); + noteCourseCompleted(); + refreshPlatformPoints(points, { force: true }); + later(function() { + refreshPlatformPoints(points, { force: true }); + }, 8e3); + later(function() { + refreshPlatformPoints(points, { force: true }); + }, 25e3); + setStatus("整门课完成,等待平台记账:" + pointLabel(type)); + return type; + } + if (!points.record(type, pointLessonId("course"))) return ""; const text = points.snapshot().text; - console.log(TAG, "积分 +3:" + pointLabel(type) + "(" + text + ")"); + console.log(TAG, "积分 +3:" + pointLabel(type) + "(整门课完成 · " + text + ")"); setStatus("积分 +3:" + pointLabel(type) + "(" + text + ")"); return type; } @@ -3235,6 +3446,11 @@ } return; } + const pointCourseKey = curId || urlId || ""; + if (R.coursePointCourseId !== pointCourseKey) { + R.coursePointCourseId = pointCourseKey; + R.coursePointType = ""; + } if (S.coursePhase !== PHASE_LEARNING) { S.coursePhase = PHASE_LEARNING; saveRunState(); @@ -3262,7 +3478,7 @@ const confirmed = !!(R.lastSummary && R.lastSummary.complete); R.lastSummary = summary; if (confirmed) { - recordLessonPoint(R.waitLessonKey || R.lastLessonKey); + recordCoursePoint(); completeCurrent(); return; } @@ -3274,8 +3490,7 @@ const prevKey = R.lastLessonKey; const curKey = readActiveLessonKey(); R.lastSummary = summary; - const pointType = !isMedia && summary.kind !== "percent" ? recordLessonPoint(prevKey) : ""; - if (pointType && pointsAfterLesson(pointType)) return; + if (!isMedia && summary.kind !== "percent") markLessonStudied(prevKey); if (!isMedia && summary.kind !== "percent" && (!prevKey || curKey === prevKey)) { setStatus("本节已记录,切换下一节…"); advanceLesson(); @@ -3353,7 +3568,7 @@ } R.waitStart = 0; R.lastProgressAt = Date.now(); - recordLessonPoint(R.waitLessonKey || R.lastLessonKey); + recordCoursePoint(); completeCurrent(); return; } @@ -3362,18 +3577,17 @@ R.lastLessonKey = newKey; R.doneLatchKey = ""; R.lastProgressAt = Date.now(); - const pointType = recordLessonPoint(R.waitLessonKey); - if (pointType && pointsAfterLesson(pointType)) return; + markLessonStudied(R.waitLessonKey); setStatus("已自动进入下一节"); return; } if (!isMedia && s2 && s2.x > R.waitSummaryX) { R.waitStart = 0; R.lastProgressAt = Date.now(); - const pointType = recordLessonPoint(R.waitLessonKey || R.lastLessonKey); + markLessonStudied(R.waitLessonKey || R.lastLessonKey); if (s2.complete) { completeCurrent(); - } else if (!pointType || !pointsAfterLesson(pointType)) { + } else { advanceLesson(); } return; @@ -3445,7 +3659,7 @@ } const s = readSummary(); if (s && s.complete) { - recordLessonPoint(R.waitLessonKey || R.lastLessonKey); + recordCoursePoint(); completeCurrent(); } else { setStatus("没有找到下一节,等待课程完成…"); @@ -3593,6 +3807,9 @@ save: saveRunState, flush: flushRunState, route, + // 平台积分台账:调试时可手动刷新(见 dev/tests/points-api-probe.mjs) + refreshPlatformPoints, + cachedPlatformPoints, // CFG 暴露给无头运行器:脚本内可调参数(重试次数、冷却等) CFG, mediaPage, @@ -3639,7 +3856,6 @@ pointsAvailability, pointsDone, pointsTarget, - pointsAfterLesson, startStandalone, listTick, courseTick,