koishi-plugin-bind-bot 2.1.5 → 2.1.7

package/lib/handlers/group-request-review.handler.d.ts

@@ -79,7 +79,7 @@ export declare class GroupRequestReviewHandler extends BaseHandler {
      */
     private checkAdminPermission;
     /**
-     * 解析UID（支持多种格式）
+     * 解析UID（支持多种格式，参考BuidHandler.parseUidInput实现）
      */
     private parseUID;
     /**

package/lib/handlers/group-request-review.handler.js

@@ -98,41 +98,25 @@ class GroupRequestReviewHandler extends base_handler_1.BaseHandler {
      */
     async handleNotice(session) {
         try {
-            // 调试日志：记录所有notice事件
-            this.logger.info('入群审批', `[DEBUG] 收到notice事件 - type: ${session.type}, subtype: ${session.subtype}, guildId: ${session.guildId}`, true);
             // 只处理群表情回应事件
             if (session.subtype !== 'group-msg-emoji-like') {
-                this.logger.info('入群审批', `[DEBUG] 跳过: subtype不匹配 (${session.subtype})`, true);
                 return;
             }
-            // 只处理管理群的表情
-            if (session.guildId !== this.reviewConfig.reviewGroupId) {
-                this.logger.info('入群审批', `[DEBUG] 跳过: guildId不匹配 (收到: ${session.guildId}, 需要: ${this.reviewConfig.reviewGroupId})`, true);
-                return;
-            }
-            // 获取原始事件数据（使用类型断言访问 onebot 扩展属性）
-            const onebotSession = session;
-            const onebotData = onebotSession.onebot;
-            this.logger.info('入群审批', `[DEBUG] onebot数据: ${JSON.stringify(onebotData)}`, true);
-            if (!onebotData?.likes || onebotData.likes.length === 0) {
-                this.logger.info('入群审批', '[DEBUG] 跳过: 没有likes数据', true);
-                return;
-            }
-            // 从原始 OneBot 数据中读取（更可靠）
-            const msgId = onebotData.message_id?.toString() || session.messageId;
-            const userId = onebotData.user_id?.toString() || session.userId;
-            const emojiData = onebotData.likes;
-            if (!msgId || !userId) {
-                this.logger.warn('入群审批', '表情回应事件缺少必要数据: messageId 或 userId');
+            // 获取原始事件数据（直接访问 session.onebot，参考luckydraw实现）
+            const data = session.onebot;
+            const messageId = data?.message_id;
+            const userId = data?.user_id?.toString();
+            const likes = data?.likes || [];
+            if (!messageId || !userId || likes.length === 0) {
                 return;
             }
+            const msgId = messageId.toString();
+            const emojiData = likes;
             const operatorId = this.deps.normalizeQQId(userId);
-            this.logger.info('入群审批', `收到表情回应 - 消息: ${msgId}, 操作者: ${operatorId}, 表情数: ${emojiData.length}`, true);
+            this.logger.debug('入群审批', `收到表情回应 - 消息: ${msgId}, 操作者: ${operatorId}, 表情数: ${emojiData.length}`);
             // 检查是否是待审批的消息
             const pendingReq = this.pendingRequests.get(msgId);
             if (!pendingReq) {
-                this.logger.info('入群审批', `[DEBUG] 跳过: 消息${msgId}不在待审批列表中`, true);
-                this.logger.info('入群审批', `[DEBUG] 当前待审批列表: ${Array.from(this.pendingRequests.keys()).join(', ')}`, true);
                 return;
             }
             // 检查是否已处理
@@ -185,7 +169,9 @@ class GroupRequestReviewHandler extends base_handler_1.BaseHandler {
         let buidUsername = null;
         let medalInfo = null;
         let bindStatus = '❌ UID 未提供';
+        this.logger.debug('入群审批', `[DEBUG] 准备解析UID - 原始answer: "${answer}"`);
         const parsedUid = this.parseUID(answer);
+        this.logger.debug('入群审批', `[DEBUG] parseUID结果: ${parsedUid ? parsedUid : 'null'}`);
         if (parsedUid) {
             buidUid = parsedUid;
             // 并行查询官方API和ZMINFO API
@@ -520,26 +506,59 @@ class GroupRequestReviewHandler extends base_handler_1.BaseHandler {
         }
     }
     /**
-     * 解析UID（支持多种格式）
+     * 解析UID（支持多种格式，参考BuidHandler.parseUidInput实现）
      */
     parseUID(input) {
         if (!input)
             return null;
         input = input.trim();
-        // 格式1: 纯数字
+        // 格式1: 纯数字（整行都是数字）
         if (/^\d+$/.test(input)) {
+            this.logger.debug('入群审批', `parseUID: 识别为纯数字 -> ${input}`);
             return input;
         }
-        // 格式2: UID:123456789
-        const uidMatch = input.match(/^UID:(\d+)$/i);
-        if (uidMatch) {
-            return uidMatch[1];
+        // 格式2: 包含"答案："标记的多行文本（如：问题\n答案：123456789）
+        const answerMatch = input.match(/答案[：:]\s*(\d+)/i);
+        if (answerMatch) {
+            this.logger.debug('入群审批', `parseUID: 从"答案："提取 -> ${answerMatch[1]}`);
+            return answerMatch[1];
+        }
+        // 格式3: UID:123456789（参考BuidHandler）
+        if (input.toLowerCase().startsWith('uid:')) {
+            const uid = input.substring(4).trim();
+            if (/^\d+$/.test(uid)) {
+                this.logger.debug('入群审批', `parseUID: 从"UID:"前缀提取 -> ${uid}`);
+                return uid;
+            }
+        }
+        // 格式4: https://space.bilibili.com/123456789（参考BuidHandler的完善处理）
+        if (input.includes('space.bilibili.com/')) {
+            try {
+                let urlPart = input.replace(/^https?:\/\/space\.bilibili\.com\//, '');
+                // 移除查询参数
+                if (urlPart.includes('?')) {
+                    urlPart = urlPart.split('?')[0];
+                }
+                // 移除路径
+                if (urlPart.includes('/')) {
+                    urlPart = urlPart.split('/')[0];
+                }
+                if (/^\d+$/.test(urlPart)) {
+                    this.logger.debug('入群审批', `parseUID: 从B站空间URL提取 -> ${urlPart}`);
+                    return urlPart;
+                }
+            }
+            catch (error) {
+                this.logger.warn('入群审批', `parseUID: URL解析失败 - ${error.message}`);
+            }
         }
-        // 格式3: https://space.bilibili.com/123456789
-        const urlMatch = input.match(/space\.bilibili\.com\/(\d+)/);
-        if (urlMatch) {
-            return urlMatch[1];
+        // 格式5: 从文本中提取第一个长数字串（8-12位，B站UID的典型长度）
+        const numberMatch = input.match(/\b(\d{8,12})\b/);
+        if (numberMatch) {
+            this.logger.debug('入群审批', `parseUID: 从文本提取长数字串 -> ${numberMatch[1]}`);
+            return numberMatch[1];
         }
+        this.logger.warn('入群审批', `parseUID: 无法解析 - "${input}"`);
         return null;
     }
     /**
@@ -558,20 +577,35 @@ class GroupRequestReviewHandler extends base_handler_1.BaseHandler {
      * 执行自动绑定
      */
     async performAutoBind(qq, uid, bot) {
-        const axios = require('axios');
         try {
-            // 1. 验证 UID
-            this.logger.debug('入群审批', `验证 B站 UID: ${uid}`);
-            const response = await axios.get(`${this.config.zminfoApiUrl}/api/user/${uid}`, {
-                timeout: 10000,
-                headers: {
-                    'User-Agent': 'Koishi-MCID-Bot/1.0'
+            // 1. 使用双API数据源获取最新用户信息（优先B站官方API）
+            this.logger.debug('入群审批', `开始获取 B站 UID ${uid} 的信息`);
+            // 尝试获取B站官方API的用户信息（最权威）
+            let officialUsername = null;
+            try {
+                this.logger.debug('入群审批', '正在查询B站官方API...');
+                const officialInfo = await this.deps.apiService.getBilibiliOfficialUserInfo(uid);
+                if (officialInfo && officialInfo.name) {
+                    officialUsername = officialInfo.name;
+                    this.logger.info('入群审批', `[官方API] ✅ 获取到用户名: "${officialUsername}"`, true);
                 }
-            });
-            if (response.status !== 200 || !response.data || !response.data.uid) {
+                else {
+                    this.logger.warn('入群审批', '[官方API] ❌ 查询失败');
+                }
+            }
+            catch (officialError) {
+                this.logger.warn('入群审批', `[官方API] ❌ 查询出错: ${officialError.message}`);
+            }
+            // 获取ZMINFO API的完整用户信息（包含粉丝牌、大航海等数据）
+            this.logger.debug('入群审批', '正在查询ZMINFO API...');
+            const zminfoUser = await this.deps.apiService.validateBUID(uid);
+            if (!zminfoUser) {
                 throw new Error(`无法验证B站UID: ${uid}`);
             }
-            const buidUser = response.data;
+            this.logger.debug('入群审批', `[ZMINFO] 获取到用户名: "${zminfoUser.username}"`);
+            // 使用官方API的用户名（如果可用），否则使用ZMINFO的
+            const finalUsername = officialUsername || zminfoUser.username;
+            this.logger.info('入群审批', `🎯 最终采用用户名: "${finalUsername}"`, true);
             // 2. 检查是否已被其他人绑定
             const existingBind = await this.repos.mcidbind.findByBuidUid(uid);
             if (existingBind && existingBind.qqId !== qq) {
@@ -586,15 +620,15 @@ class GroupRequestReviewHandler extends base_handler_1.BaseHandler {
                     qqId: qq,
                     mcUsername: tempMcUsername,
                     mcUuid: '',
-                    buidUid: buidUser.uid,
-                    buidUsername: buidUser.username,
-                    guardLevel: buidUser.guard_level || 0,
-                    guardLevelText: buidUser.guard_level_text || '',
-                    maxGuardLevel: buidUser.guard_level || 0,
-                    maxGuardLevelText: buidUser.guard_level_text || '',
-                    medalName: buidUser.medal?.name || '',
-                    medalLevel: buidUser.medal?.level || 0,
-                    wealthMedalLevel: buidUser.wealth_medal_level || 0,
+                    buidUid: zminfoUser.uid,
+                    buidUsername: finalUsername,
+                    guardLevel: zminfoUser.guard_level || 0,
+                    guardLevelText: zminfoUser.guard_level_text || '',
+                    maxGuardLevel: zminfoUser.guard_level || 0,
+                    maxGuardLevelText: zminfoUser.guard_level_text || '',
+                    medalName: zminfoUser.medal?.name || '',
+                    medalLevel: zminfoUser.medal?.level || 0,
+                    wealthMedalLevel: zminfoUser.wealthMedalLevel || 0,
                     lastActiveTime: new Date(),
                     lastModified: new Date()
                 });
@@ -603,26 +637,29 @@ class GroupRequestReviewHandler extends base_handler_1.BaseHandler {
             else {
                 // 更新现有绑定
                 await this.repos.mcidbind.update(qq, {
-                    buidUid: buidUser.uid,
-                    buidUsername: buidUser.username,
-                    guardLevel: buidUser.guard_level || 0,
-                    guardLevelText: buidUser.guard_level_text || '',
-                    maxGuardLevel: Math.max(bind.maxGuardLevel || 0, buidUser.guard_level || 0),
-                    maxGuardLevelText: buidUser.guard_level > (bind.maxGuardLevel || 0)
-                        ? buidUser.guard_level_text
+                    buidUid: zminfoUser.uid,
+                    buidUsername: finalUsername,
+                    guardLevel: zminfoUser.guard_level || 0,
+                    guardLevelText: zminfoUser.guard_level_text || '',
+                    maxGuardLevel: Math.max(bind.maxGuardLevel || 0, zminfoUser.guard_level || 0),
+                    maxGuardLevelText: zminfoUser.guard_level > (bind.maxGuardLevel || 0)
+                        ? zminfoUser.guard_level_text
                         : bind.maxGuardLevelText,
-                    medalName: buidUser.medal?.name || '',
-                    medalLevel: buidUser.medal?.level || 0,
-                    wealthMedalLevel: buidUser.wealth_medal_level || 0,
+                    medalName: zminfoUser.medal?.name || '',
+                    medalLevel: zminfoUser.medal?.level || 0,
+                    wealthMedalLevel: zminfoUser.wealthMedalLevel || 0,
                     lastActiveTime: new Date(),
                     lastModified: new Date()
                 });
                 this.logger.info('入群审批', `已更新绑定 - QQ: ${qq}, UID: ${uid}`, true);
             }
-            // 4. 更新群昵称
+            // 4. 更新群昵称（使用标准格式）
             try {
                 const groupId = this.reviewConfig.targetGroupId;
-                const nickname = `${buidUser.username}_${bind.mcUsername || 'MCID'}`;
+                const mcInfo = bind.mcUsername && !bind.mcUsername.startsWith('_temp_')
+                    ? bind.mcUsername
+                    : '未绑定';
+                const nickname = `${finalUsername}（ID:${mcInfo}）`;
                 await bot.internal.setGroupCard(groupId, qq, nickname);
                 this.logger.info('入群审批', `已更新群昵称 - QQ: ${qq}, 昵称: ${nickname}`);
             }
@@ -630,7 +667,7 @@ class GroupRequestReviewHandler extends base_handler_1.BaseHandler {
                 this.logger.warn('入群审批', `更新群昵称失败: ${error.message}`);
                 // 昵称更新失败不影响绑定
             }
-            this.logger.info('入群审批', `自动绑定完成 - QQ: ${qq}, UID: ${uid}, 用户名: ${buidUser.username}`, true);
+            this.logger.info('入群审批', `自动绑定完成 - QQ: ${qq}, UID: ${uid}, 用户名: ${finalUsername}`, true);
         }
         catch (error) {
             this.logger.error('入群审批', `自动绑定失败: ${error.message}`, error);

package/lib/services/api.service.d.ts

@@ -7,9 +7,15 @@ import type { MojangProfile, ZminfoUser } from '../types';
 export declare class ApiService {
     private logger;
     private config;
+    private cookieString;
     constructor(logger: LoggerService, config: {
         zminfoApiUrl: string;
+        SESSDATA?: string;
     });
+    /**
+     * 处理cookie字符串，支持完整cookie或单独SESSDATA
+     */
+    private processCookie;
     /**
      * 验证 Minecraft 用户名是否存在
      * @param username MC 用户名

package/lib/services/api.service.js

@@ -12,9 +12,30 @@ const axios_1 = __importDefault(require("axios"));
 class ApiService {
     logger;
     config;
+    cookieString;
     constructor(logger, config) {
         this.logger = logger;
         this.config = config;
+        this.cookieString = this.processCookie(config.SESSDATA || '');
+    }
+    /**
+     * 处理cookie字符串，支持完整cookie或单独SESSDATA
+     */
+    processCookie(input) {
+        if (!input || input.trim() === '') {
+            return '';
+        }
+        const trimmedInput = input.trim();
+        // 如果输入包含多个cookie字段（包含分号），则认为是完整cookie
+        if (trimmedInput.includes(';')) {
+            return trimmedInput;
+        }
+        // 如果输入只是SESSDATA值（不包含"SESSDATA="前缀）
+        if (!trimmedInput.startsWith('SESSDATA=')) {
+            return `SESSDATA=${trimmedInput}`;
+        }
+        // 如果输入已经是"SESSDATA=xxx"格式
+        return trimmedInput;
     }
     // =========== Mojang API ===========
     /**
@@ -197,14 +218,20 @@ class ApiService {
                 return null;
             }
             this.logger.debug('B站官方API', `开始查询UID ${uid} 的官方信息`);
+            const headers = {
+                'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
+                Referer: 'https://space.bilibili.com/',
+                Origin: 'https://space.bilibili.com'
+            };
+            // 如果配置了Cookie，则添加到请求头（避免被风控）
+            if (this.cookieString) {
+                headers.Cookie = this.cookieString;
+                this.logger.debug('B站官方API', '使用Cookie进行请求');
+            }
             const response = await axios_1.default.get('https://api.bilibili.com/x/space/acc/info', {
                 params: { mid: uid },
                 timeout: 10000,
-                headers: {
-                    'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
-                    Referer: 'https://space.bilibili.com/',
-                    Origin: 'https://space.bilibili.com'
-                }
+                headers
             });
             if (response.data.code === 0 && response.data.data) {
                 const userData = response.data.data;

package/lib/services/service-container.js

@@ -14,7 +14,10 @@ class ServiceContainer {
     nickname;
     constructor(ctx, config, logger, mcidbindRepo, normalizeQQId) {
         // 1. 实例化 API 服务（无依赖）
-        this.api = new api_service_1.ApiService(logger.createChild('API服务'), { zminfoApiUrl: config.zminfoApiUrl });
+        this.api = new api_service_1.ApiService(logger.createChild('API服务'), {
+            zminfoApiUrl: config.zminfoApiUrl,
+            SESSDATA: config.forceBindSessdata
+        });
         // 2. 实例化数据库服务（依赖 API 服务）
         this.database = new database_service_1.DatabaseService(ctx, logger.createChild('数据库服务'), mcidbindRepo, normalizeQQId, (uuid) => this.api.getUsernameByUuid(uuid));
         // 3. 实例化群昵称服务（依赖 API 和数据库服务）

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bind-bot",
   "description": "[WittF自用] BIND-BOT - 账号绑定管理机器人，支持Minecraft账号和B站账号绑定与管理。",
-  "version": "2.1.5",
+  "version": "2.1.7",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [