Hermes/autman-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(qdreader): treat duplicate sign and unsupported optional tasks correctly

Browse Source
This commit is contained in:
Hermes Agent
2026-05-20 17:47:54 +08:00
parent 6aa020ca49
commit 85405751b8
5 changed files with 118 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/qdreader_sign_autman.js
+22 -7
View File
@@ -4,7 +4,7 @@
//[author: Hermes]
//[service: BOSS]
//[class: 工具类]
//[version: 2.8.0]
//[version: 2.9.0]
//[platform: web,qq,wx,tg,tb,fs,we]
//[public: false]
//[price: 0]
@@ -276,7 +276,7 @@ function contentText() {
}
function usage() {
return [
"启点读书签到插件 v2.8.0",
"启点读书签到插件 v2.9.0",
"【一级菜单】",
"账号管理：启点账号",
"执行查询：启点查询",
@@ -413,6 +413,17 @@ 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)) || ""
}
function successLikeMsg(msg) {
msg = String(msg || "")
return /今日已签到|已经签到|已签到|重复签到|已领取|已经领取|已完成|完成/.test(msg)
}
function taskResultOk(obj) {
return resultOk(obj) || successLikeMsg(resultMsg(obj))
}
function isWhitelistBlockedError(msg) {
msg = String(msg || "")
return /url\s*不在允许的接口列表内|不在允许的接口列表|参数异常.*允许的接口/.test(msg)
}
function pad2(n) { n = String(n); return n.length < 2 ? "0" + n : n }
function beijingDate(dateLike) {
var d = dateLike ? new Date(dateLike) : new Date()
@@ -562,7 +573,7 @@ function taskMenuForUid(uid) {
function doExtraTask(task, cookie) {
var data = task.body || task.params || {}
var res = qidianRequest(task.path, task.method || "GET", data, cookie)
var ok = resultOk(res)
var ok = taskResultOk(res)
var msg = resultMsg(res) || (ok ? "完成" : ("失败" + (resultCode(res) !== undefined ? " code=" + resultCode(res) : "")))
return { name: task.label, ok: !!ok, msg: String(msg || ""), path: task.path }
}
@@ -570,20 +581,24 @@ function doTaskChain(uid, cookie, source, runId) {
var startedAt = nowIso()
var details = []
var checkin = qidianRequest(CHECKIN_PATH, "POST", {}, cookie)
var ok = resultOk(checkin)
var ok = taskResultOk(checkin)
var msg = resultMsg(checkin) || (ok ? "签到请求成功" : ("签到失败" + (resultCode(checkin) !== undefined ? " code=" + resultCode(checkin) : "")))
details.push({ name: "签到结果", ok: !!ok, msg: String(msg || ""), path: CHECKIN_PATH })
for (var i = 0; i < QD_TASKS.length; i++) {
var task = QD_TASKS[i]
if (!taskEnabledForUid(task, uid)) continue
try { details.push(doExtraTask(task, cookie)) }
catch (e) { details.push({ name: task.label, ok: false, msg: e && e.message ? e.message : String(e), path: task.path }) }
catch (e) {
var tmsg = e && e.message ? e.message : String(e)
if (isWhitelistBlockedError(tmsg)) details.push({ name: task.label, ok: true, skipped: true, msg: "签名网关暂不支持该接口，已跳过", rawMsg: tmsg, path: task.path })
else details.push({ name: task.label, ok: false, msg: tmsg, path: task.path })
}
}
var failed = []
for (var j = 0; j < details.length; j++) if (!details[j].ok) failed.push(details[j].name + ":" + details[j].msg)
for (var j = 0; j < details.length; j++) if (!details[j].ok && !details[j].skipped) failed.push(details[j].name + ":" + details[j].msg)
var finalOk = failed.length === 0
var detailMsg = []
for (var k = 0; k < details.length; k++) detailMsg.push(details[k].name + (details[k].ok ? "✅" : "❌") + (details[k].msg ? "(" + displayMsg(details[k].msg) + ")" : ""))
for (var k = 0; k < details.length; k++) detailMsg.push(details[k].name + (details[k].skipped ? "⏭" : (details[k].ok ? "✅" : "❌")) + (details[k].msg ? "(" + displayMsg(details[k].msg) + ")" : ""))
var finalMsg = (finalOk ? "完全体任务完成" : "部分任务失败") + "：" + detailMsg.join("；")
var result = { uid: String(uid), ok: !!finalOk, msg: String(finalMsg || ""), time: nowIso(), startedAt: startedAt, source: source || "manual", runId: runId || "", tasks: details }
setLastResult(uid, result)