From b7afbf421a55af458a0cf536e09cd1d0d65c2967 Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Fri, 22 May 2026 19:00:30 +0800 Subject: [PATCH] fix: align qdreader message box upstream flow --- docs/autman-plugin-rules.md | 2 +- js/qdreader_sign_autman.js | 31 ++++++++++++----------- plugins/qdreader/qdreader_sign_autman.js | 31 ++++++++++++----------- tests/qdreader_plugin.test.mjs | 32 +++++++++++++----------- 4 files changed, 50 insertions(+), 46 deletions(-) diff --git a/docs/autman-plugin-rules.md b/docs/autman-plugin-rules.md index 6940e31..4cd751a 100644 --- a/docs/autman-plugin-rules.md +++ b/docs/autman-plugin-rules.md @@ -649,7 +649,7 @@ QDReader 签到结果判定补充： - 不要只凭接口名猜测“激励任务/每日任务/大咖荐书”的调用链；应先反混淆上游 `Yuheng0101/X/Tasks/QDReader/qdreader.js`，再按真实流程移植。 - 激励任务 `finishWatch` 可能返回 `result=9` 或 `Result=9`，上游将其视为可继续/已受理，再回查 `mainPage` 判断任务是否完成；插件不能把大小写不同的 `result=9` 直接计为失败。 - 每日任务不是简单取任务列表第一个。上游会先处理 `packagelist` 里的惊喜/前置任务，再从任务列表按标题定位“每日任务”，执行多次 `finishWatch` 后回查完成状态。 -- 大咖荐书不是一次 `pullmessage` 即结束。消息 token 需要由 `UserId` 经过 `(uid * 4 & 0x7ffffffffffffffc) ^ 0x113a4f` 后转 base62；流程是：拉会话列表 → 对红点会话带 `senderId` 拉消息 → 从最近消息提取 `orderId` → `getrewarddetail` → 根据奖励类型走 `rewardcallback` 或 `addbookshelf`。如果直接用十进制 token 或缺少 `senderId`，容易返回“参数错误”。 +- 大咖荐书不是一次 `pullmessage` 即结束。消息 token 需要由 `UserId` 经过 `(uid * 4 & 0x7ffffffffffffffc) ^ 0x113a4f` 后转 base62；流程是：拉会话列表（`appappend` + `categoryIds=0`）→ 对红点会话带 `fromId` 拉消息 → 从最近消息的 `ActionUrl/RefUrl` 提取 `orderId` → `/argus/api/v1/interaction/rewarddetail`（`refresh=0`）→ 根据 `ChanceCount/BookStatus` 走 `/argus/api/v1/interaction/rewardcallback` 或 `/argus/api/v1/interaction/rewardaddshelf`。如果直接用十进制 token、旧的 `token/type/senderId` 参数，或旧的 `/argus/api/v2/recommend/...` 路径，实测会偏离当前上游并容易返回“参数错误”。 - 大咖荐书应限制在北京时间 `20:00-22:00` 窗口执行；窗口外要标记为跳过并避免调用消息接口，否则晚间窗口后容易返回“参数错误”并污染整账号结果。 - “无可领取礼包/今日已签到”属于幂等成功类提示；这类提示不应让整个账号汇总失败。 - 每次修复这类链路必须补 VM 回归测试：请求路径、签名 payload 里的参数、特殊返回码分类、最终账号成功/失败汇总。 diff --git a/js/qdreader_sign_autman.js b/js/qdreader_sign_autman.js index 5fa926f..41bebda 100644 --- a/js/qdreader_sign_autman.js +++ b/js/qdreader_sign_autman.js @@ -757,37 +757,38 @@ function doMessageBox(cookie) { if (!messageBoxAllowedNow()) return { name: "大咖荐书", ok: true, skipped: true, msg: "不在执行时间 " + messageBoxWindowLabel() + "，已跳过", path: "https://magev6.if.qidian.com/argus/api/v2/message/pullmessage" } var token = messageTokenFromCookie(cookie) if (!token) return { name: "大咖荐书", ok: true, msg: "缺少消息 token，已跳过", path: "https://magev6.if.qidian.com/argus/api/v2/message/pullmessage" } - var baseParams = { token: token, type: "0", pg: "1", pz: "10" } + var baseParams = { appappend: token, categoryIds: "0", pg: "1", pz: "10" } var res = qdGet("https://magev6.if.qidian.com/argus/api/v2/message/pullmessage", baseParams, cookie) - if (!taskResultOk(res)) return { name: "大咖荐书", ok: false, msg: resultMsg(res) || "消息检查失败", path: "https://magev6.if.qidian.com/argus/api/v2/message/pullmessage" } - var groups = firstArray(nested(res, ["Data", "List"]), nested(res, ["data", "List"]), nested(res, ["Data", "MsgList"]), nested(res, ["data", "MsgList"])) + if (!taskResultOk(res)) return { name: "大咖荐书", ok: false, msg: resultMsg(res) || "获取消息列表失败", path: "https://magev6.if.qidian.com/argus/api/v2/message/pullmessage" } + var groups = firstArray(nested(res, ["Data", "UserList"]), nested(res, ["data", "UserList"]), nested(res, ["Data", "List"]), nested(res, ["data", "List"]), nested(res, ["Data", "MsgList"]), nested(res, ["data", "MsgList"])) if (!groups.length) return { name: "大咖荐书", ok: true, msg: "无消息", path: "https://magev6.if.qidian.com/argus/api/v2/message/pullmessage" } var senders = [] - for (var i = 0; i < groups.length; i++) if (Number(field(groups[i], ["RedPoint", "redPoint"], 0)) === 1 && field(groups[i], ["SenderId", "senderId", "FromUserId", "fromUserId"], "")) senders.push(groups[i]) - if (!senders.length) return { name: "大咖荐书", ok: true, msg: "暂无未读荐书", path: "https://magev6.if.qidian.com/argus/api/v2/message/pullmessage" } + for (var i = 0; i < groups.length; i++) if (Number(field(groups[i], ["RedPoint", "redPoint"], 0)) === 1 && field(groups[i], ["FromId", "fromId", "SenderId", "senderId", "FromUserId", "fromUserId"], "")) senders.push(groups[i]) + if (!senders.length) return { name: "大咖荐书", ok: true, msg: "无未读消息", path: "https://magev6.if.qidian.com/argus/api/v2/message/pullmessage" } var handled = 0 for (var s = 0; s < senders.length; s++) { - var sid = field(senders[s], ["SenderId", "senderId", "FromUserId", "fromUserId"], "") - var msgRes = qdGet("https://magev6.if.qidian.com/argus/api/v2/message/pullmessage", { token: token, type: "0", senderId: sid, pg: "1", pz: "10" }, cookie) + var sid = field(senders[s], ["FromId", "fromId", "SenderId", "senderId", "FromUserId", "fromUserId"], "") + var msgRes = qdGet("https://magev6.if.qidian.com/argus/api/v2/message/pullmessage", { appappend: token, categoryIds: "0", fromId: sid, pg: "1", pz: "10" }, cookie) if (!taskResultOk(msgRes)) continue - var msgs = firstArray(nested(msgRes, ["Data", "List"]), nested(msgRes, ["data", "List"]), nested(msgRes, ["Data", "Messages"]), nested(msgRes, ["data", "Messages"])) + var msgs = firstArray(nested(msgRes, ["Data", "MsgList"]), nested(msgRes, ["data", "MsgList"]), nested(msgRes, ["Data", "List"]), nested(msgRes, ["data", "List"]), nested(msgRes, ["Data", "Messages"]), nested(msgRes, ["data", "Messages"])) for (var j = 0; j < msgs.length; j++) { if (!recentCreateTime(field(msgs[j], ["CreateTime", "createTime"], ""))) continue - var orderId = orderIdFromText(field(msgs[j], ["Content", "content", "Link", "link", "Url", "url"], "")) + var orderId = orderIdFromText(field(msgs[j], ["ActionUrl", "actionUrl", "RefUrl", "refUrl", "Content", "content", "Link", "link", "Url", "url"], "")) if (!orderId) continue - var detail = qdGet("/argus/api/v2/recommend/getrewarddetail", { orderId: orderId, checkRisk: "0" }, cookie) + var detail = qdGet("/argus/api/v1/interaction/rewarddetail", { orderId: orderId, refresh: "0" }, cookie) if (!taskResultOk(detail)) continue var data = detail.Data || detail.data || {} var chance = Number(data.ChanceCount || 0) - var rewardType = Number(data.RewardType || data.Type || 0) + var bookStatus = Number(data.BookStatus || 0) var bookId = data.BookId || "" if (data.Status !== undefined && Number(data.Status) !== 1) continue - if (chance > 0) { var cb = qdPost("/argus/api/v2/recommend/rewardcallback", { orderId: orderId, checkRisk: "1" }, cookie); if (taskResultOk(cb)) handled++; continue } - if (rewardType === 1 || rewardType === 2) { if (!bookId) continue; var add = qdPost("/argus/api/v2/recommend/addbookshelf", { orderId: orderId, bookId: bookId }, cookie); if (taskResultOk(add)) handled++; continue } - if (rewardType === 3) { var rc = qdPost("/argus/api/v2/recommend/rewardcallback", { orderId: orderId, checkRisk: "1" }, cookie); if (!taskResultOk(rc)) continue; var r2 = qdPost("/argus/api/v2/recommend/rewardcallback", { orderId: orderId, checkRisk: "0" }, cookie); if (taskResultOk(r2)) handled++ } + if (chance <= 0 && bookStatus !== 0 && bookStatus !== 1 && bookStatus !== 2) continue + if (chance > 0) { var cb = qdPost("/argus/api/v1/interaction/rewardcallback", { orderId: orderId, checkRisk: "1" }, cookie); if (taskResultOk(cb) || String(resultCode(cb)) === "0") handled++; continue } + if (bookStatus === 0 || bookStatus === 1) { if (!bookId) continue; var add = qdPost("/argus/api/v1/interaction/rewardaddshelf", { orderId: orderId, bookId: bookId }, cookie); if (taskResultOk(add) || String(resultCode(add)) === "0") handled++; continue } + if (bookStatus === 2) { var rc = qdPost("/argus/api/v1/interaction/rewardcallback", { orderId: orderId, checkRisk: "1" }, cookie); if (!taskResultOk(rc) && String(resultCode(rc)) !== "0") continue; var r2 = qdPost("/argus/api/v1/interaction/rewardcallback", { orderId: orderId, checkRisk: "0" }, cookie); if (taskResultOk(r2) || String(resultCode(r2)) === "0") handled++ } } } - return { name: "大咖荐书", ok: true, msg: handled ? ("处理 " + handled + " 条荐书奖励") : "暂无可处理荐书", path: "https://magev6.if.qidian.com/argus/api/v2/message/pullmessage" } + return { name: "大咖荐书", ok: true, msg: handled ? ("成功处理 " + handled + " 个荐书") : "无待处理荐书", path: "https://magev6.if.qidian.com/argus/api/v2/message/pullmessage" } } function doExtraTask(task, cookie) { if (task.handler === "receiveGifts") return doReceiveGifts(cookie) diff --git a/plugins/qdreader/qdreader_sign_autman.js b/plugins/qdreader/qdreader_sign_autman.js index 5fa926f..41bebda 100644 --- a/plugins/qdreader/qdreader_sign_autman.js +++ b/plugins/qdreader/qdreader_sign_autman.js @@ -757,37 +757,38 @@ function doMessageBox(cookie) { if (!messageBoxAllowedNow()) return { name: "大咖荐书", ok: true, skipped: true, msg: "不在执行时间 " + messageBoxWindowLabel() + "，已跳过", path: "https://magev6.if.qidian.com/argus/api/v2/message/pullmessage" } var token = messageTokenFromCookie(cookie) if (!token) return { name: "大咖荐书", ok: true, msg: "缺少消息 token，已跳过", path: "https://magev6.if.qidian.com/argus/api/v2/message/pullmessage" } - var baseParams = { token: token, type: "0", pg: "1", pz: "10" } + var baseParams = { appappend: token, categoryIds: "0", pg: "1", pz: "10" } var res = qdGet("https://magev6.if.qidian.com/argus/api/v2/message/pullmessage", baseParams, cookie) - if (!taskResultOk(res)) return { name: "大咖荐书", ok: false, msg: resultMsg(res) || "消息检查失败", path: "https://magev6.if.qidian.com/argus/api/v2/message/pullmessage" } - var groups = firstArray(nested(res, ["Data", "List"]), nested(res, ["data", "List"]), nested(res, ["Data", "MsgList"]), nested(res, ["data", "MsgList"])) + if (!taskResultOk(res)) return { name: "大咖荐书", ok: false, msg: resultMsg(res) || "获取消息列表失败", path: "https://magev6.if.qidian.com/argus/api/v2/message/pullmessage" } + var groups = firstArray(nested(res, ["Data", "UserList"]), nested(res, ["data", "UserList"]), nested(res, ["Data", "List"]), nested(res, ["data", "List"]), nested(res, ["Data", "MsgList"]), nested(res, ["data", "MsgList"])) if (!groups.length) return { name: "大咖荐书", ok: true, msg: "无消息", path: "https://magev6.if.qidian.com/argus/api/v2/message/pullmessage" } var senders = [] - for (var i = 0; i < groups.length; i++) if (Number(field(groups[i], ["RedPoint", "redPoint"], 0)) === 1 && field(groups[i], ["SenderId", "senderId", "FromUserId", "fromUserId"], "")) senders.push(groups[i]) - if (!senders.length) return { name: "大咖荐书", ok: true, msg: "暂无未读荐书", path: "https://magev6.if.qidian.com/argus/api/v2/message/pullmessage" } + for (var i = 0; i < groups.length; i++) if (Number(field(groups[i], ["RedPoint", "redPoint"], 0)) === 1 && field(groups[i], ["FromId", "fromId", "SenderId", "senderId", "FromUserId", "fromUserId"], "")) senders.push(groups[i]) + if (!senders.length) return { name: "大咖荐书", ok: true, msg: "无未读消息", path: "https://magev6.if.qidian.com/argus/api/v2/message/pullmessage" } var handled = 0 for (var s = 0; s < senders.length; s++) { - var sid = field(senders[s], ["SenderId", "senderId", "FromUserId", "fromUserId"], "") - var msgRes = qdGet("https://magev6.if.qidian.com/argus/api/v2/message/pullmessage", { token: token, type: "0", senderId: sid, pg: "1", pz: "10" }, cookie) + var sid = field(senders[s], ["FromId", "fromId", "SenderId", "senderId", "FromUserId", "fromUserId"], "") + var msgRes = qdGet("https://magev6.if.qidian.com/argus/api/v2/message/pullmessage", { appappend: token, categoryIds: "0", fromId: sid, pg: "1", pz: "10" }, cookie) if (!taskResultOk(msgRes)) continue - var msgs = firstArray(nested(msgRes, ["Data", "List"]), nested(msgRes, ["data", "List"]), nested(msgRes, ["Data", "Messages"]), nested(msgRes, ["data", "Messages"])) + var msgs = firstArray(nested(msgRes, ["Data", "MsgList"]), nested(msgRes, ["data", "MsgList"]), nested(msgRes, ["Data", "List"]), nested(msgRes, ["data", "List"]), nested(msgRes, ["Data", "Messages"]), nested(msgRes, ["data", "Messages"])) for (var j = 0; j < msgs.length; j++) { if (!recentCreateTime(field(msgs[j], ["CreateTime", "createTime"], ""))) continue - var orderId = orderIdFromText(field(msgs[j], ["Content", "content", "Link", "link", "Url", "url"], "")) + var orderId = orderIdFromText(field(msgs[j], ["ActionUrl", "actionUrl", "RefUrl", "refUrl", "Content", "content", "Link", "link", "Url", "url"], "")) if (!orderId) continue - var detail = qdGet("/argus/api/v2/recommend/getrewarddetail", { orderId: orderId, checkRisk: "0" }, cookie) + var detail = qdGet("/argus/api/v1/interaction/rewarddetail", { orderId: orderId, refresh: "0" }, cookie) if (!taskResultOk(detail)) continue var data = detail.Data || detail.data || {} var chance = Number(data.ChanceCount || 0) - var rewardType = Number(data.RewardType || data.Type || 0) + var bookStatus = Number(data.BookStatus || 0) var bookId = data.BookId || "" if (data.Status !== undefined && Number(data.Status) !== 1) continue - if (chance > 0) { var cb = qdPost("/argus/api/v2/recommend/rewardcallback", { orderId: orderId, checkRisk: "1" }, cookie); if (taskResultOk(cb)) handled++; continue } - if (rewardType === 1 || rewardType === 2) { if (!bookId) continue; var add = qdPost("/argus/api/v2/recommend/addbookshelf", { orderId: orderId, bookId: bookId }, cookie); if (taskResultOk(add)) handled++; continue } - if (rewardType === 3) { var rc = qdPost("/argus/api/v2/recommend/rewardcallback", { orderId: orderId, checkRisk: "1" }, cookie); if (!taskResultOk(rc)) continue; var r2 = qdPost("/argus/api/v2/recommend/rewardcallback", { orderId: orderId, checkRisk: "0" }, cookie); if (taskResultOk(r2)) handled++ } + if (chance <= 0 && bookStatus !== 0 && bookStatus !== 1 && bookStatus !== 2) continue + if (chance > 0) { var cb = qdPost("/argus/api/v1/interaction/rewardcallback", { orderId: orderId, checkRisk: "1" }, cookie); if (taskResultOk(cb) || String(resultCode(cb)) === "0") handled++; continue } + if (bookStatus === 0 || bookStatus === 1) { if (!bookId) continue; var add = qdPost("/argus/api/v1/interaction/rewardaddshelf", { orderId: orderId, bookId: bookId }, cookie); if (taskResultOk(add) || String(resultCode(add)) === "0") handled++; continue } + if (bookStatus === 2) { var rc = qdPost("/argus/api/v1/interaction/rewardcallback", { orderId: orderId, checkRisk: "1" }, cookie); if (!taskResultOk(rc) && String(resultCode(rc)) !== "0") continue; var r2 = qdPost("/argus/api/v1/interaction/rewardcallback", { orderId: orderId, checkRisk: "0" }, cookie); if (taskResultOk(r2) || String(resultCode(r2)) === "0") handled++ } } } - return { name: "大咖荐书", ok: true, msg: handled ? ("处理 " + handled + " 条荐书奖励") : "暂无可处理荐书", path: "https://magev6.if.qidian.com/argus/api/v2/message/pullmessage" } + return { name: "大咖荐书", ok: true, msg: handled ? ("成功处理 " + handled + " 个荐书") : "无待处理荐书", path: "https://magev6.if.qidian.com/argus/api/v2/message/pullmessage" } } function doExtraTask(task, cookie) { if (task.handler === "receiveGifts") return doReceiveGifts(cookie) diff --git a/tests/qdreader_plugin.test.mjs b/tests/qdreader_plugin.test.mjs index ad2db1a..8a368bf 100644 --- a/tests/qdreader_plugin.test.mjs +++ b/tests/qdreader_plugin.test.mjs @@ -1185,7 +1185,7 @@ test('message box skips outside Beijing 20-22 window without calling message API assert.equal(r.calls.some(c => /message\/pullmessage/.test(c.url)), false); }); -test('message box uses base62 token and senderId/detail/callback chain instead of parameter-error one-shot', () => { +test('message box uses upstream appappend/fromId/interaction reward chain instead of parameter-error one-shot', () => { const store = { qdreader_cookie_json: JSON.stringify({ '12345': cookie }), qdreader_user_bind_json: JSON.stringify({ '12345': 'user-a' }), @@ -1203,24 +1203,24 @@ test('message box uses base62 token and senderId/detail/callback chain instead o { body: { code: 0, data: { headers: { 'QD-Sign': 'sig' } } } }, { statusCode: 200, body: { code: 1, msg: '无可领取礼包' } }, { body: { code: 0, data: { headers: { 'QD-Sign': 'sig' } } } }, - { statusCode: 200, body: { code: 0, Data: { List: [{ RedPoint: 1, SenderId: 'sender-1', SenderName: '大咖' }] } } }, + { statusCode: 200, body: { code: 0, Data: { UserList: [{ RedPoint: 1, FromId: 'sender-1', Name: '大咖' }] } } }, { body: { code: 0, data: { headers: { 'QD-Sign': 'sig' } } } }, - { statusCode: 200, body: { code: 0, Data: { List: [{ CreateTime: '2026-05-20T21:20:00+08:00', Content: 'https://example.com/?orderId=abcdef123456' }] } } }, + { statusCode: 200, body: { code: 0, Data: { MsgList: [{ CreateTime: '2026-05-20T21:20:00+08:00', ActionUrl: 'https://example.com/?orderId=abcdef123456' }] } } }, { body: { code: 0, data: { headers: { 'QD-Sign': 'sig' } } } }, - { statusCode: 200, body: { code: 0, Data: { ChanceCount: 1, Status: 1, RewardType: 0, RewardName: '经验' } } }, + { statusCode: 200, body: { code: 0, Data: { ChanceCount: 1, Status: 1, BookStatus: 3, RewardName: '经验' } } }, { body: { code: 0, data: { headers: { 'QD-Sign': 'sig' } } } }, { statusCode: 200, body: { code: 0, msg: '领取成功' } }, ], }); - assert.match(r.replies[0], /大咖荐书✅\(处理 1 条荐书奖励\)/); - const firstMessageCall = r.calls.find(c => /^https:\/\/magev6\.if\.qidian\.com\/argus\/api\/v2\/message\/pullmessage/.test(c.url)); - const firstMessageSign = r.calls.find(c => /api\.120399\.xyz\/qdreader\/sign$/.test(c.url) && JSON.parse(c.body).url === 'https://magev6.if.qidian.com/argus/api/v2/message/pullmessage' && JSON.parse(c.body).data.token); - assert.equal(JSON.parse(firstMessageSign.body).data.token, '4Wwz'); - assert.notEqual(JSON.parse(firstMessageSign.body).data.token, '144445'); - const senderMessageCall = r.calls.find(c => /senderId=sender-1/.test(c.url)); + assert.match(r.replies[0], /大咖荐书✅\(成功处理 1 个荐书\)/); + const firstMessageSign = r.calls.find(c => /api\.120399\.xyz\/qdreader\/sign$/.test(c.url) && JSON.parse(c.body).url === 'https://magev6.if.qidian.com/argus/api/v2/message/pullmessage' && JSON.parse(c.body).data.appappend); + assert.equal(JSON.parse(firstMessageSign.body).data.appappend, '4Wwz'); + assert.equal(JSON.parse(firstMessageSign.body).data.categoryIds, '0'); + assert.equal(JSON.parse(firstMessageSign.body).data.token, undefined); + const senderMessageCall = r.calls.find(c => /fromId=sender-1/.test(c.url)); assert.ok(senderMessageCall); - assert.ok(r.calls.some(c => /argus\/api\/v2\/recommend\/getrewarddetail/.test(c.url) && /orderId=abcdef123456/.test(c.url))); - assert.ok(r.calls.some(c => /argus\/api\/v2\/recommend\/rewardcallback/.test(c.url) && /orderId=abcdef123456/.test(c.body))); + assert.ok(r.calls.some(c => /argus\/api\/v1\/interaction\/rewarddetail/.test(c.url) && /orderId=abcdef123456/.test(c.url) && /refresh=0/.test(c.url))); + assert.ok(r.calls.some(c => /argus\/api\/v1\/interaction\/rewardcallback/.test(c.url) && /orderId=abcdef123456/.test(c.body))); }); test('stream uid message token matches upstream operator precedence and avoids parameter-error decimal token', () => { @@ -1247,8 +1247,10 @@ test('stream uid message token matches upstream operator precedence and avoids p ], }); assert.match(r.replies[0], /大咖荐书✅\(无消息\)/); - const firstMessageSign = r.calls.find(c => /api\.120399\.xyz\/qdreader\/sign$/.test(c.url) && JSON.parse(c.body).url === 'https://magev6.if.qidian.com/argus/api/v2/message/pullmessage' && JSON.parse(c.body).data.token); - assert.equal(JSON.parse(firstMessageSign.body).data.token, '24QAcr'); - assert.notEqual(JSON.parse(firstMessageSign.body).data.token, '1903903219'); + const firstMessageSign = r.calls.find(c => /api\.120399\.xyz\/qdreader\/sign$/.test(c.url) && JSON.parse(c.body).url === 'https://magev6.if.qidian.com/argus/api/v2/message/pullmessage' && JSON.parse(c.body).data.appappend); + assert.equal(JSON.parse(firstMessageSign.body).data.appappend, '24QAcr'); + assert.equal(JSON.parse(firstMessageSign.body).data.categoryIds, '0'); + assert.equal(JSON.parse(firstMessageSign.body).data.token, undefined); + assert.notEqual(JSON.parse(firstMessageSign.body).data.appappend, '1903903219'); });