fix: prefer qdreader qdheader embedded user id

js/qdreader_sign_autman.js

@@ -142,8 +142,13 @@ function isRealUid(uid) {
 }
 function uidFromQDHeader(qdheader) {
     var decoded = b64decode(qdheader)
-    var uid = decoded ? trim(decoded.split("|")[0] || "") : ""
+    if (!decoded) return ""
-    return isRealUid(uid)
+    var parts = decoded.split("|").map(function (x) { return trim(x || "") })
+    for (var i = 0; i < [0, 11].length; i++) {
+        var uid = isRealUid(parts[[0, 11][i]])
+        if (uid) return uid
+    }
+    return ""
 }
 function extractUid(cookie) {
     var jar = parseCookieString(cookie)

plugins/qdreader/qdreader_sign_autman.js

@@ -142,8 +142,13 @@ function isRealUid(uid) {
 }
 function uidFromQDHeader(qdheader) {
     var decoded = b64decode(qdheader)
-    var uid = decoded ? trim(decoded.split("|")[0] || "") : ""
+    if (!decoded) return ""
-    return isRealUid(uid)
+    var parts = decoded.split("|").map(function (x) { return trim(x || "") })
+    for (var i = 0; i < [0, 11].length; i++) {
+        var uid = isRealUid(parts[[0, 11][i]])
+        if (uid) return uid
+    }
+    return ""
 }
 function extractUid(cookie) {
     var jar = parseCookieString(cookie)

tests/qdreader_plugin.test.mjs

@@ -73,6 +73,15 @@ test('manual cookie save falls back to ywguid when QDHeader uid is null', () =>
   assert.equal(JSON.parse(r.store.qdreader_cookie_json)['54321'], fallbackCookie);
 });
 
+test('manual cookie save falls back to QDHeader embedded UserId before ywguid', () => {
+  const streamQdheader = 'KG51bGwpfChudWxsKXwxMTc5fDI1NTZ8KG51bGwpfDE2LjEwfDB8aU9TL2lQaG9uZS8obnVsbCl8MHwobnVsbCl8KG51bGwpfDQ3NTcwMDk3NXwxNzc5MDA5MTM2MDAwfDB8KG51bGwpfHx8KG51bGwpfChudWxsKXww';
+  const streamCookie = `QDHeader=${streamQdheader}; ywguid=120098575768; qdh=qdh; sessionyw=s; appId=12`;
+  const r = runPlugin({ content: '启点ck ' + streamCookie });
+  assert.match(r.replies.join('\n'), /CK新增成功/);
+  assert.match(r.replies.join('\n'), /uid: 475700975/);
+  assert.equal(JSON.parse(r.store.qdreader_cookie_json)['475700975'], streamCookie);
+});
+
 test('manual sign and cron sign both call sign gateway then qidian checkin', () => {
   const store = { qdreader_cookie_json: JSON.stringify({ '12345': cookie }) };
   const manual = runPlugin({ content: '启点签到', store: { ...store } });