fix qdreader upstream task edge cases

docs/autman-plugin-rules.md

@@ -647,7 +647,7 @@ QDReader 签到结果判定补充：
 ## 12. QDReader 上游完全体任务修复记录
 
 - 不要只凭接口名猜测“激励任务/每日任务/大咖荐书”的调用链；应先反混淆上游 `Yuheng0101/X/Tasks/QDReader/qdreader.js`，再按真实流程移植。
-- 激励任务 `finishWatch` 可能返回 `result=9`，上游将其视为可继续/已受理，再回查 `mainPage` 判断任务是否完成；插件不能把 `result=9` 直接计为失败。
+- 激励任务 `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`，容易返回“参数错误”。
 - “无可领取礼包/今日已签到”属于幂等成功类提示；这类提示不应让整个账号汇总失败。

js/qdreader_sign_autman.js

@@ -4,7 +4,7 @@
 //[author: Hermes]
 //[service: BOSS]
 //[class: 工具类]
-//[version: 2.10.0]
+//[version: 2.10.1]
 //[platform: web,qq,wx,tg,tb,fs,we]
 //[public: false]
 //[price: 0]
@@ -276,7 +276,7 @@ function contentText() {
 }
 function usage() {
     return [
-        "启点读书签到插件 v2.10.0",
+        "启点读书签到插件 v2.10.1",
         "【一级菜单】",
         "账号管理：启点账号",
         "执行查询：启点查询",
@@ -404,7 +404,7 @@ function qidianRequest(path, method, data, cookie) {
     if (typeof out === "string") out = safeJsonParse(out, out)
     return out
 }
-function resultCode(obj) { return obj && (obj.Result !== undefined ? obj.Result : obj.Code !== undefined ? obj.Code : obj.code !== undefined ? obj.code : obj.retcode) }
+function resultCode(obj) { return obj && (obj.Result !== undefined ? obj.Result : obj.result !== undefined ? obj.result : obj.Code !== undefined ? obj.Code : obj.code !== undefined ? obj.code : obj.retcode) }
 function resultOk(obj) {
     var code = resultCode(obj)
     var status = obj && (obj.status || obj.Status)
@@ -598,7 +598,7 @@ function taskFinished(task) { return Number(field(task, ["IsFinished", "Finished
 function makeBase62Token(num) {
     var alphabet = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
     var n = BigInt(num)
-    if (n === 0n) return "0"
+    if (n === BigInt(0)) return "0"
     var out = ""
     while (n > 0n) { out = alphabet[Number(n % 62n)] + out; n = n / 62n }
     return out
@@ -684,7 +684,7 @@ function doChapterCard(cookie) {
 function messageTokenFromCookie(cookie) {
     var jar = parseCookieString(cookie)
     var uid = extractUid(cookie)
-    var raw = uid ? ((BigInt(uid) * 4n & 0x7ffffffffffffffcn) ^ 0x113a4fen) : 0n
+    var raw = uid ? ((BigInt(uid) * BigInt(4) & BigInt("0x7ffffffffffffffc")) ^ BigInt("0x113a4f")) : BigInt(0)
     return raw ? makeBase62Token(raw) : (uid || jar.ywguid || "")
 }
 function recentCreateTime(v) {

plugins/qdreader/README.md

@@ -192,3 +192,9 @@ node -c plugins/qdreader/qdreader_sign_autman.js
 node -c js/qdreader_sign_autman.js
 node tests/qdreader_plugin.test.mjs
 ```
+
+
+## v2.10.1 现场失败修正
+
+- `finishWatch` 的上游/签名网关响应可能使用小写 `result=9`，现在和 `Result=9` 一样按“已受理，需回查”处理，避免激励任务误报 `任务 ... 失败`。
+- 大咖荐书继续使用上游 base62 token，不再回退十进制 token；若线上仍返回“参数错误”，优先确认 Autman 已重新导入本版本，而不是旧版只请求一次 `pullmessage`。

plugins/qdreader/qdreader_sign_autman.js

@@ -4,7 +4,7 @@
 //[author: Hermes]
 //[service: BOSS]
 //[class: 工具类]
-//[version: 2.10.0]
+//[version: 2.10.1]
 //[platform: web,qq,wx,tg,tb,fs,we]
 //[public: false]
 //[price: 0]
@@ -276,7 +276,7 @@ function contentText() {
 }
 function usage() {
     return [
-        "启点读书签到插件 v2.10.0",
+        "启点读书签到插件 v2.10.1",
         "【一级菜单】",
         "账号管理：启点账号",
         "执行查询：启点查询",
@@ -404,7 +404,7 @@ function qidianRequest(path, method, data, cookie) {
     if (typeof out === "string") out = safeJsonParse(out, out)
     return out
 }
-function resultCode(obj) { return obj && (obj.Result !== undefined ? obj.Result : obj.Code !== undefined ? obj.Code : obj.code !== undefined ? obj.code : obj.retcode) }
+function resultCode(obj) { return obj && (obj.Result !== undefined ? obj.Result : obj.result !== undefined ? obj.result : obj.Code !== undefined ? obj.Code : obj.code !== undefined ? obj.code : obj.retcode) }
 function resultOk(obj) {
     var code = resultCode(obj)
     var status = obj && (obj.status || obj.Status)
@@ -598,7 +598,7 @@ function taskFinished(task) { return Number(field(task, ["IsFinished", "Finished
 function makeBase62Token(num) {
     var alphabet = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
     var n = BigInt(num)
-    if (n === 0n) return "0"
+    if (n === BigInt(0)) return "0"
     var out = ""
     while (n > 0n) { out = alphabet[Number(n % 62n)] + out; n = n / 62n }
     return out
@@ -684,7 +684,7 @@ function doChapterCard(cookie) {
 function messageTokenFromCookie(cookie) {
     var jar = parseCookieString(cookie)
     var uid = extractUid(cookie)
-    var raw = uid ? ((BigInt(uid) * 4n & 0x7ffffffffffffffcn) ^ 0x113a4fen) : 0n
+    var raw = uid ? ((BigInt(uid) * BigInt(4) & BigInt("0x7ffffffffffffffc")) ^ BigInt("0x113a4f")) : BigInt(0)
     return raw ? makeBase62Token(raw) : (uid || jar.ywguid || "")
 }
 function recentCreateTime(v) {

tests/qdreader_plugin.test.mjs

@@ -779,7 +779,7 @@ test('adv task treats upstream result 9 as accepted and verifies finished state'
       { body: { code: 0, data: { headers: { 'QD-Sign': 'sig' } } } },
       { statusCode: 200, body: { code: 0, Data: { VideoRewardTab: { TaskList: [{ TaskId: '1165585369246138372', Title: '看视频领福利', IsFinished: 0 }] } } } },
       { body: { code: 0, data: { headers: { 'QD-Sign': 'sig' } } } },
-      { statusCode: 200, body: { Result: 9, Message: '任务已受理' } },
+      { statusCode: 200, body: { result: 9, message: '' } },
       { body: { code: 0, data: { headers: { 'QD-Sign': 'sig' } } } },
       { statusCode: 200, body: { code: 0, Data: { VideoRewardTab: { TaskList: [{ TaskId: '1165585369246138372', Title: '看视频领福利', IsFinished: 1 }] } } } },
     ],
@@ -820,10 +820,37 @@ test('message box uses base62 token and senderId/detail/callback chain instead o
   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, '1dJ7c');
+  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.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)));
 });
+
+test('stream uid message token matches upstream operator precedence and avoids parameter-error decimal token', () => {
+  const streamQdheader = 'KG51bGwpfChudWxsKXwxMTc5fDI1NTZ8KG51bGwpfDE2LjEwfDB8aU9TL2lQaG9uZS8obnVsbCl8MHwobnVsbCl8KG51bGwpfDQ3NTcwMDk3NXwxNzc5MDA5MTM2MDAwfDB8KG51bGwpfHx8KG51bGwpfChudWxsKXww';
+  const streamCookie = `QDHeader=${streamQdheader}; ywguid=120098575768; qdh=qdh; sessionyw=s; appId=12`;
+  const store = {
+    qdreader_cookie_json: JSON.stringify({ '475700975': streamCookie }),
+    qdreader_user_bind_json: JSON.stringify({ '475700975': 'user-a' }),
+    qdreader_task_pref_json: JSON.stringify({ '475700975': { messageBox: true } }),
+  };
+  const r = runPlugin({
+    content: '启点签到',
+    store,
+    userId: 'user-a',
+    requests: [
+      { 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: 1, msg: '无可领取礼包' } },
+      { body: { code: 0, data: { headers: { 'QD-Sign': 'sig' } } } },
+      { statusCode: 200, body: { code: 0, Data: { List: [] } } },
+    ],
+  });
+  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');
+});