From 594c06bb98f24641784dd1a2209b1b4ea430f4f6 Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Sun, 17 May 2026 20:23:06 +0800 Subject: [PATCH] fix: detect qdreader user id in autman js --- js/qdreader_sign_autman.js | 29 ++++++++++++++++++------ plugins/qdreader/qdreader_sign_autman.js | 29 ++++++++++++++++++------ tests/qdreader_plugin.test.mjs | 25 +++++++++++++++----- 3 files changed, 63 insertions(+), 20 deletions(-) diff --git a/js/qdreader_sign_autman.js b/js/qdreader_sign_autman.js index 79d1cbc..2c16d39 100644 --- a/js/qdreader_sign_autman.js +++ b/js/qdreader_sign_autman.js @@ -4,7 +4,7 @@ //[author: Hermes] //[service: BOSS] //[class: 工具类] -//[version: 2.3.6] +//[version: 2.3.7] //[platform: web,qq,wx,tg,tb,fs,we] //[public: false] //[price: 0] @@ -88,14 +88,29 @@ function getBindStore() { return cleanStringMap(safeJsonParse(cfgGet(BIND_KEY, " function setBindStore(obj) { return cfgSet(BIND_KEY, JSON.stringify(obj || {})) } function getRemarkStore() { return cleanStringMap(safeJsonParse(cfgGet(REMARK_KEY, "{}"), {})) } function setRemarkStore(obj) { return cfgSet(REMARK_KEY, JSON.stringify(obj || {})) } +function callNoArg(obj, name) { + try { if (obj && typeof obj[name] === "function") return obj[name]() } catch (e) {} + return "" +} function currentUserId() { var v = "" - try { if (typeof sender !== "undefined" && sender && sender.getUserID) v = sender.getUserID() || "" } catch (e) {} - try { if (!v && typeof sender !== "undefined" && sender && sender.getUserId) v = sender.getUserId() || "" } catch (e) {} - try { if (!v && typeof userId !== "undefined") v = String(userId || "") } catch (e) {} - try { if (!v && typeof getUserID === "function") v = getUserID() || "" } catch (e) {} + var names = ["getUserID", "getUserId", "getUserid", "getUser", "getSenderID", "getSenderId", "getSender", "getFromUserID", "getFromUserId", "getChatID", "getChatId"] + try { if (typeof sender !== "undefined" && sender) for (var i = 0; i < names.length && !v; i++) v = callNoArg(sender, names[i]) || "" } catch (e) {} + var globals = ["userId", "userID", "uid", "senderID", "senderId", "chatId", "chatID", "fromUserId", "fromUserID"] + for (var j = 0; j < globals.length && !v; j++) { try { if (typeof this[globals[j]] !== "undefined") v = this[globals[j]] || "" } catch (e) {} } + for (var k = 0; k < names.length && !v; k++) { try { if (typeof this[names[k]] === "function") v = this[names[k]]() || "" } catch (e) {} } return trim(v) } +function currentUserDebug() { + var parts = [] + try { if (typeof sender !== "undefined" && sender) { + var names = ["getUserID", "getUserId", "getUserid", "getUser", "getSenderID", "getSenderId", "getSender", "getFromUserID", "getFromUserId", "getChatID", "getChatId", "getImtype"] + for (var i = 0; i < names.length; i++) if (typeof sender[names[i]] === "function") { + var v = callNoArg(sender, names[i]); parts.push(names[i] + "=" + (v ? maskUid(String(v)) : "空")) + } + } } catch (e) {} + return parts.length ? parts.join("; ") : "未发现可用用户方法" +} function boundToCurrent(uid, bind) { var owner = bind && bind[String(uid)] ? String(bind[String(uid)]) : "" var me = currentUserId() @@ -180,7 +195,7 @@ function contentText() { } function usage() { return [ - "启点读书签到插件 v2.3.6", + "启点读书签到插件 v2.3.7", "【一级菜单】", "账号管理：启点账号", "执行查询：启点查询", @@ -595,7 +610,7 @@ function handleSaveCookie(arg, store, bind) { continue } if (!me) { - lines.push("无法识别当前用户，拒绝保存 uid: " + uid) + lines.push("无法识别当前用户，拒绝保存 uid: " + uid + "。诊断: " + currentUserDebug()) continue } var changed = store[uid] !== cookie diff --git a/plugins/qdreader/qdreader_sign_autman.js b/plugins/qdreader/qdreader_sign_autman.js index 79d1cbc..2c16d39 100644 --- a/plugins/qdreader/qdreader_sign_autman.js +++ b/plugins/qdreader/qdreader_sign_autman.js @@ -4,7 +4,7 @@ //[author: Hermes] //[service: BOSS] //[class: 工具类] -//[version: 2.3.6] +//[version: 2.3.7] //[platform: web,qq,wx,tg,tb,fs,we] //[public: false] //[price: 0] @@ -88,14 +88,29 @@ function getBindStore() { return cleanStringMap(safeJsonParse(cfgGet(BIND_KEY, " function setBindStore(obj) { return cfgSet(BIND_KEY, JSON.stringify(obj || {})) } function getRemarkStore() { return cleanStringMap(safeJsonParse(cfgGet(REMARK_KEY, "{}"), {})) } function setRemarkStore(obj) { return cfgSet(REMARK_KEY, JSON.stringify(obj || {})) } +function callNoArg(obj, name) { + try { if (obj && typeof obj[name] === "function") return obj[name]() } catch (e) {} + return "" +} function currentUserId() { var v = "" - try { if (typeof sender !== "undefined" && sender && sender.getUserID) v = sender.getUserID() || "" } catch (e) {} - try { if (!v && typeof sender !== "undefined" && sender && sender.getUserId) v = sender.getUserId() || "" } catch (e) {} - try { if (!v && typeof userId !== "undefined") v = String(userId || "") } catch (e) {} - try { if (!v && typeof getUserID === "function") v = getUserID() || "" } catch (e) {} + var names = ["getUserID", "getUserId", "getUserid", "getUser", "getSenderID", "getSenderId", "getSender", "getFromUserID", "getFromUserId", "getChatID", "getChatId"] + try { if (typeof sender !== "undefined" && sender) for (var i = 0; i < names.length && !v; i++) v = callNoArg(sender, names[i]) || "" } catch (e) {} + var globals = ["userId", "userID", "uid", "senderID", "senderId", "chatId", "chatID", "fromUserId", "fromUserID"] + for (var j = 0; j < globals.length && !v; j++) { try { if (typeof this[globals[j]] !== "undefined") v = this[globals[j]] || "" } catch (e) {} } + for (var k = 0; k < names.length && !v; k++) { try { if (typeof this[names[k]] === "function") v = this[names[k]]() || "" } catch (e) {} } return trim(v) } +function currentUserDebug() { + var parts = [] + try { if (typeof sender !== "undefined" && sender) { + var names = ["getUserID", "getUserId", "getUserid", "getUser", "getSenderID", "getSenderId", "getSender", "getFromUserID", "getFromUserId", "getChatID", "getChatId", "getImtype"] + for (var i = 0; i < names.length; i++) if (typeof sender[names[i]] === "function") { + var v = callNoArg(sender, names[i]); parts.push(names[i] + "=" + (v ? maskUid(String(v)) : "空")) + } + } } catch (e) {} + return parts.length ? parts.join("; ") : "未发现可用用户方法" +} function boundToCurrent(uid, bind) { var owner = bind && bind[String(uid)] ? String(bind[String(uid)]) : "" var me = currentUserId() @@ -180,7 +195,7 @@ function contentText() { } function usage() { return [ - "启点读书签到插件 v2.3.6", + "启点读书签到插件 v2.3.7", "【一级菜单】", "账号管理：启点账号", "执行查询：启点查询", @@ -595,7 +610,7 @@ function handleSaveCookie(arg, store, bind) { continue } if (!me) { - lines.push("无法识别当前用户，拒绝保存 uid: " + uid) + lines.push("无法识别当前用户，拒绝保存 uid: " + uid + "。诊断: " + currentUserDebug()) continue } var changed = store[uid] !== cookie diff --git a/tests/qdreader_plugin.test.mjs b/tests/qdreader_plugin.test.mjs index 6ba54c5..88c73ab 100644 --- a/tests/qdreader_plugin.test.mjs +++ b/tests/qdreader_plugin.test.mjs @@ -5,22 +5,23 @@ import vm from 'node:vm'; const pluginPath = new URL('../plugins/qdreader/qdreader_sign_autman.js', import.meta.url).pathname; const code = fs.readFileSync(pluginPath, 'utf8'); -function runPlugin({ content = '', store = {}, bucketStore = {}, requests = [], userId = 'user-a', listens = [] } = {}) { +function runPlugin({ content = '', store = {}, bucketStore = {}, requests = [], userId = 'user-a', listens = [], senderOverrides = {}, globals = {} } = {}) { const replies = []; const calls = []; let requestIndex = 0; let listenIndex = 0; - const ctx = { - console, - Buffer, - sender: { + const baseSender = { reply: (msg) => replies.push(String(msg)), getMessage: () => content, getContent: () => content, isAdmin: () => true, getUserID: () => userId, listen: () => (listenIndex < listens.length ? listens[listenIndex++] : 'q'), - }, + }; + const ctx = { + console, + Buffer, + sender: { ...baseSender, ...senderOverrides }, GetContent: () => content, getContent: () => content, get: (key) => store[key] || '', @@ -36,6 +37,7 @@ function runPlugin({ content = '', store = {}, bucketStore = {}, requests = [], if (String(req.url).includes('/sign')) return { body: { code: 0, data: { headers: { 'QD-Sign': 'sig' } } } }; return { statusCode: 200, body: { code: 0, msg: '签到成功' } }; }, + ...globals, }; vm.createContext(ctx); vm.runInContext(code, ctx, { filename: pluginPath }); @@ -98,6 +100,17 @@ test('quick submit prompts remark after saving cookie', () => { assert.equal(JSON.parse(r.store.qdreader_remark_json)['12345'], '主号'); }); +test('quick submit can bind user from alternate Autman sender fields', () => { + const r = runPlugin({ + content: '启点ck ' + cookie, + userId: '', + senderOverrides: { getUserID: undefined, getSenderID: () => 'sender-42' }, + listens: ['n'], + }); + assert.match(r.replies.join('\n'), /CK新增成功/); + assert.equal(JSON.parse(r.store.qdreader_user_bind_json)['12345'], 'sender-42'); +}); + test('manual sign and cron sign both call sign gateway then qidian checkin', () => { const store = { qdreader_cookie_json: JSON.stringify({ '12345': cookie }),