fix(qdreader): align optional tasks with upstream
This commit is contained in:
@@ -159,12 +159,12 @@ set(key, value)
|
||||
4. “今日已签到/已经签到/重复签到”等签到响应按成功处理,避免重复执行时误计失败。
|
||||
5. 按账号读取 `qdreader_task_pref_json` 后追加完全体任务链路:
|
||||
- 固定执行领取奖励:`POST /argus/api/v3/checkin/receivegifts`;
|
||||
- 可选激励任务:`GET /argus/api/v2/video/adv/mainPage`,再对未完成任务调用 `POST /argus/api/v1/video/adv/finishWatch`;
|
||||
- 可选每日任务:`GET /argus/api/v3/checkin/packagelist`,按返回任务调用 `POST /argus/api/v1/video/adv/finishWatch`;
|
||||
- 可选激励任务:`GET /argus/api/v2/video/adv/mainPage`,再对未完成任务调用 `POST /argus/api/v1/video/adv/finishWatch`;上游返回 `result=9` 表示视频完成已受理,需要再拉取 `mainPage` 校验,不应直接判失败;
|
||||
- 可选每日任务:`GET /argus/api/v3/checkin/packagelist`,先处理惊喜福利/前置任务,再按标题精确选择“每日任务”执行三次 `finishWatch` 并回查完成状态;
|
||||
- 可选每日抽奖:先 `GET /argus/api/v2/checkin/detail`,有次数时 `POST /argus/api/v2/checkin/lottery`;
|
||||
- 可选每周兑换:`GET /argus/api/v3/checkin/checkinexchangepage`,可兑换时 `POST /argus/api/v3/checkin/exchangegoods`,仅北京时间周日执行;
|
||||
- 可选章节卡片:`GET /argus/api/v1/readtime/scoremall/chaptercardwithbook`;
|
||||
- 可选大咖荐书:`GET https://magev6.if.qidian.com/argus/api/v2/message/pullmessage`。
|
||||
- 可选大咖荐书:按上游逻辑用 `UserId` 生成 base62 消息 token,先 `pullmessage` 拉会话列表,再带 `senderId` 拉消息、提取最近消息里的 `orderId`,随后调用 `/argus/api/v2/recommend/getrewarddetail` 和 `rewardcallback/addbookshelf` 处理奖励;不是只请求一次 `pullmessage`。
|
||||
6. 对签名网关返回 `url 不在允许的接口列表内` 的可选任务,记为“已跳过”而不是账号失败,用于兼容网关白名单尚未覆盖的上游接口。
|
||||
7. 写入单账号当日结果 `qdreader_last_result_json`,包括 `ok/msg/time/source/runId/tasks`。
|
||||
8. 写入当日批次日志 `qdreader_last_run_json`,包括触发来源、开始/结束时间、成功/失败/总数和每账号结果;即使账号执行异常也会记录失败日志。
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
//[author: Hermes]
|
||||
//[service: BOSS]
|
||||
//[class: 工具类]
|
||||
//[version: 2.9.0]
|
||||
//[version: 2.10.0]
|
||||
//[platform: web,qq,wx,tg,tb,fs,we]
|
||||
//[public: false]
|
||||
//[price: 0]
|
||||
@@ -276,7 +276,7 @@ function contentText() {
|
||||
}
|
||||
function usage() {
|
||||
return [
|
||||
"启点读书签到插件 v2.9.0",
|
||||
"启点读书签到插件 v2.10.0",
|
||||
"【一级菜单】",
|
||||
"账号管理:启点账号",
|
||||
"执行查询:启点查询",
|
||||
@@ -412,11 +412,11 @@ function resultOk(obj) {
|
||||
}
|
||||
function resultMsg(obj) {
|
||||
if (!obj) return ""
|
||||
return obj.Message || obj.Msg || obj.message || obj.msg || obj.toast || (obj.data && (obj.data.message || obj.data.msg || obj.data.toast)) || ""
|
||||
return obj.Message || obj.Msg || obj.message || obj.msg || obj.toast || (obj.data && (obj.data.message || obj.data.msg || obj.data.toast)) || (obj.Data && (obj.Data.message || obj.Data.msg || obj.Data.toast)) || ""
|
||||
}
|
||||
function successLikeMsg(msg) {
|
||||
msg = String(msg || "")
|
||||
return /今日已签到|已经签到|已签到|重复签到|已领取|已经领取|已完成|完成/.test(msg)
|
||||
return /今日已签到|已经签到|已签到|重复签到|已领取|已经领取|已完成|完成|无可领取|无礼包|暂无可领取/.test(msg)
|
||||
}
|
||||
function taskResultOk(obj) {
|
||||
return resultOk(obj) || successLikeMsg(resultMsg(obj))
|
||||
@@ -588,6 +588,21 @@ function nested(obj, path) {
|
||||
function makeVideoPayload(taskId) {
|
||||
return { TaskId: String(taskId || ""), BanId: "0", BanMessage: "", Challenge: "", CaptchaType: "0", Fee: "", Gif: "", Gt: "", NewCaptcha: "0", Offline: "0", PhoneTicket: "", SessionKey: "" }
|
||||
}
|
||||
function field(obj, names, def) {
|
||||
for (var i = 0; i < names.length; i++) if (obj && obj[names[i]] !== undefined && obj[names[i]] !== null) return obj[names[i]]
|
||||
return def
|
||||
}
|
||||
function taskTitle(task) { return String(field(task, ["Title", "TaskName", "Name", "TaskTitle", "Desc", "Description"], "")) }
|
||||
function taskIdOf(task) { return field(task, ["TaskId", "TaskID", "taskId", "TaskIDStr", "Id", "id"], "") }
|
||||
function taskFinished(task) { return Number(field(task, ["IsFinished", "Finished", "Status", "status"], 0)) === 1 }
|
||||
function makeBase62Token(num) {
|
||||
var alphabet = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
var n = BigInt(num)
|
||||
if (n === 0n) return "0"
|
||||
var out = ""
|
||||
while (n > 0n) { out = alphabet[Number(n % 62n)] + out; n = n / 62n }
|
||||
return out
|
||||
}
|
||||
function doReceiveGifts(cookie) {
|
||||
var res = qdPost("/argus/api/v3/checkin/receivegifts", { GameId: "0" }, cookie)
|
||||
var ok = taskResultOk(res)
|
||||
@@ -597,32 +612,45 @@ function doAdvTask(cookie) {
|
||||
var main = qdGet("/argus/api/v2/video/adv/mainPage", {}, cookie)
|
||||
if (!taskResultOk(main)) return { name: "激励任务", ok: false, msg: resultMsg(main) || "获取任务失败", path: "/argus/api/v2/video/adv/mainPage" }
|
||||
var tasks = firstArray(nested(main, ["Data", "VideoRewardTab", "TaskList"]), nested(main, ["data", "VideoRewardTab", "TaskList"]), nested(main, ["Data", "TaskList"]), nested(main, ["data", "TaskList"]))
|
||||
if (!tasks.length) return { name: "激励任务", ok: true, msg: "无待完成任务", path: "/argus/api/v2/video/adv/mainPage" }
|
||||
if (taskFinished(tasks[tasks.length - 1])) return { name: "激励任务", ok: true, msg: "已完成", path: "/argus/api/v2/video/adv/mainPage" }
|
||||
var done = 0
|
||||
for (var i = 0; i < tasks.length; i++) {
|
||||
var t = tasks[i] || {}
|
||||
if (Number(t.IsFinished) === 1) continue
|
||||
var tid = t.TaskId || t.TaskID || t.taskId || ""
|
||||
if (taskFinished(t)) continue
|
||||
var tid = taskIdOf(t)
|
||||
if (!tid) continue
|
||||
var r = qdPost("/argus/api/v1/video/adv/finishWatch", makeVideoPayload(tid), cookie)
|
||||
if (taskResultOk(r)) done++
|
||||
if (taskResultOk(r) || Number(resultCode(r)) === 9) done++
|
||||
else return { name: "激励任务", ok: false, msg: resultMsg(r) || ("任务 " + tid + " 失败"), path: "/argus/api/v1/video/adv/finishWatch" }
|
||||
}
|
||||
return { name: "激励任务", ok: true, msg: done ? ("完成 " + done + " 个视频任务") : "无待完成任务", path: "/argus/api/v2/video/adv/mainPage" }
|
||||
var verify = qdGet("/argus/api/v2/video/adv/mainPage", {}, cookie)
|
||||
var after = firstArray(nested(verify, ["Data", "VideoRewardTab", "TaskList"]), nested(verify, ["data", "VideoRewardTab", "TaskList"]), nested(verify, ["Data", "TaskList"]), nested(verify, ["data", "TaskList"]))
|
||||
var finished = false
|
||||
for (var v = 0; v < after.length; v++) if (taskFinished(after[v])) { finished = true; break }
|
||||
return { name: "激励任务", ok: finished || done > 0, msg: finished ? "已完成" : (done ? ("完成 " + done + " 个视频任务") : "无待完成任务"), path: "/argus/api/v2/video/adv/mainPage" }
|
||||
}
|
||||
function doDailyTask(cookie) {
|
||||
var list = qdGet("/argus/api/v3/checkin/packagelist", {}, cookie)
|
||||
if (!taskResultOk(list)) return { name: "每日任务", ok: false, msg: resultMsg(list) || "获取任务列表失败", path: "/argus/api/v3/checkin/packagelist" }
|
||||
var tasks = firstArray(nested(list, ["Data", "TaskList"]), nested(list, ["data", "TaskList"]), nested(list, ["Data", "PackageList"]), nested(list, ["data", "PackageList"]))
|
||||
var data = list.Data || list.data || {}
|
||||
var pre = field(data, ["Task", "SurpriseTask", "CurrentTask"], null)
|
||||
if (pre && !taskFinished(pre) && taskIdOf(pre)) qdPost("/argus/api/v1/video/adv/finishWatch", makeVideoPayload(taskIdOf(pre)), cookie)
|
||||
var tasks = firstArray(nested(list, ["Data", "PackageList", "TaskList"]), nested(list, ["data", "PackageList", "TaskList"]), nested(list, ["Data", "TaskList"]), nested(list, ["data", "TaskList"]), nested(list, ["Data", "PackageList"]), nested(list, ["data", "PackageList"]))
|
||||
var target = null
|
||||
for (var i = 0; i < tasks.length; i++) { var n = String(tasks[i].TaskName || tasks[i].Name || tasks[i].Title || ""); if (/每日|daily/i.test(n)) { target = tasks[i]; break } }
|
||||
if (!target && tasks.length) target = tasks[0]
|
||||
for (var i = 0; i < tasks.length; i++) { var n = taskTitle(tasks[i]); if (n === "每日任务") { target = tasks[i]; break } }
|
||||
if (!target) for (var k = 0; k < tasks.length; k++) { var n2 = taskTitle(tasks[k]); if (/每日|daily/i.test(n2)) { target = tasks[k]; break } }
|
||||
if (!target) return { name: "每日任务", ok: true, msg: "无每日任务", path: "/argus/api/v3/checkin/packagelist" }
|
||||
if (Number(target.IsFinished) === 1) return { name: "每日任务", ok: true, msg: "已完成", path: "/argus/api/v3/checkin/packagelist" }
|
||||
var count = Math.max(1, Math.min(3, Number(target.NeedWatchCount || target.Times || 1) || 1))
|
||||
var tid = target.TaskId || target.TaskID || target.taskId || ""
|
||||
if (taskFinished(target)) return { name: "每日任务", ok: true, msg: "已完成", path: "/argus/api/v3/checkin/packagelist" }
|
||||
var tid = taskIdOf(target)
|
||||
if (!tid) return { name: "每日任务", ok: true, msg: "无每日任务", path: "/argus/api/v3/checkin/packagelist" }
|
||||
var done = 0
|
||||
for (var j = 0; j < count; j++) { var r = qdPost("/argus/api/v1/video/adv/finishWatch", makeVideoPayload(tid), cookie); if (taskResultOk(r)) done++ }
|
||||
return { name: "每日任务", ok: done > 0, msg: done > 0 ? ("完成 " + done + " 次") : "任务未完成", path: "/argus/api/v3/checkin/packagelist" }
|
||||
for (var j = 0; j < 3; j++) { var r = qdPost("/argus/api/v1/video/adv/finishWatch", makeVideoPayload(tid), cookie); if (taskResultOk(r) || Number(resultCode(r)) === 9) done++ }
|
||||
var verify = qdGet("/argus/api/v2/video/adv/mainPage", {}, cookie)
|
||||
var after = firstArray(nested(verify, ["Data", "VideoRewardTab", "TaskList"]), nested(verify, ["data", "VideoRewardTab", "TaskList"]))
|
||||
var finished = false
|
||||
for (var v = 0; v < after.length; v++) if (taskTitle(after[v]) === "每日任务" && taskFinished(after[v])) { finished = true; break }
|
||||
return { name: "每日任务", ok: finished || done > 0, msg: finished ? "已完成" : (done > 0 ? ("完成 " + done + " 次") : "任务未完成"), path: "/argus/api/v3/checkin/packagelist" }
|
||||
}
|
||||
function doLotteryTask(cookie) {
|
||||
var detail = qdGet("/argus/api/v2/checkin/detail", {}, cookie)
|
||||
@@ -656,14 +684,55 @@ function doChapterCard(cookie) {
|
||||
function messageTokenFromCookie(cookie) {
|
||||
var jar = parseCookieString(cookie)
|
||||
var uid = extractUid(cookie)
|
||||
var raw = uid ? String((BigInt(uid) * 4n & 0x7ffffffffffffffcn) ^ 0x113a4fen) : ""
|
||||
return raw || uid || jar.ywguid || ""
|
||||
var raw = uid ? ((BigInt(uid) * 4n & 0x7ffffffffffffffcn) ^ 0x113a4fen) : 0n
|
||||
return raw ? makeBase62Token(raw) : (uid || jar.ywguid || "")
|
||||
}
|
||||
function recentCreateTime(v) {
|
||||
if (!v) return false
|
||||
var t = typeof v === "string" ? new Date(v).getTime() : Number(v)
|
||||
if (!t || isNaN(t)) return false
|
||||
if (t < 1000000000000) t = t * 1000
|
||||
var now = (new Date()).getTime()
|
||||
return now - t >= 0 && now - t <= 24 * 60 * 60 * 1000
|
||||
}
|
||||
function orderIdFromText(s) {
|
||||
var m = String(s || "").match(/orderId=([a-f0-9]+)/i)
|
||||
return m ? m[1] : ""
|
||||
}
|
||||
function doMessageBox(cookie) {
|
||||
var token = messageTokenFromCookie(cookie)
|
||||
if (!token) return { name: "大咖荐书", ok: true, msg: "缺少消息 token,已跳过", path: "https://magev6.if.qidian.com/argus/api/v2/message/pullmessage" }
|
||||
var res = qdGet("https://magev6.if.qidian.com/argus/api/v2/message/pullmessage", { token: token, type: "0", pg: "1", pz: "10" }, cookie)
|
||||
return { name: "大咖荐书", ok: taskResultOk(res), msg: taskResultOk(res) ? "消息检查完成" : (resultMsg(res) || "消息检查失败"), path: "https://magev6.if.qidian.com/argus/api/v2/message/pullmessage" }
|
||||
var baseParams = { token: token, type: "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 (!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" }
|
||||
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)
|
||||
if (!taskResultOk(msgRes)) continue
|
||||
var msgs = firstArray(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"], ""))
|
||||
if (!orderId) continue
|
||||
var detail = qdGet("/argus/api/v2/recommend/getrewarddetail", { orderId: orderId, checkRisk: "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 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++ }
|
||||
}
|
||||
}
|
||||
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)
|
||||
|
||||
Reference in New Issue
Block a user