yz-yuki-plugin 2.0.6-8 → 2.0.7-0

package/lib/models/bilibili/bilibili.main.models.js

@@ -6,7 +6,7 @@ import { promisify } from 'node:util';
 import path from 'path';
 import QRCode from 'qrcode';
 import YAML from 'yaml';
-import { Segment, Redis } from 'yunzaijs';
+import { Redis, Segment } from 'yunzaijs';
 import { renderPage } from '../../utils/image.js';
 import { _paths } from '../../utils/paths.js';
 import BiliApi from './bilibili.main.api.js';
@@ -144,7 +144,9 @@ async function checkBiliLogin(e) {
             let current_level = level_info?.current_level;
             let current_exp = level_info?.current_exp;
             let next_exp = level_info?.next_exp;
-            e.reply(`~B站账号已登陆~\n昵称：${uname}\nuid：${mid}\n硬币：${money}\n经验等级：${current_level}\n当前经验值exp：${current_exp}\n下一等级所需exp：${next_exp}`);
+            const LoginCookieTTL = await readLoginCookieTTL();
+            const LoginCookieTTLStr = LoginCookieTTL === -1 ? '永久' : LoginCookieTTL === -2 ? '-' : `${new Date(Date.now() + LoginCookieTTL * 1000).toLocaleString()}`;
+            e.reply(`~B站账号已登陆~\n有效期至：${LoginCookieTTLStr}。\n昵称：${uname}\nuid：${mid}\n硬币：${money}\n经验等级：${current_level}\n当前经验值exp：${current_exp}\n下一等级所需exp：${next_exp}`);
         }
         else {
             // 处理其他情况
@@ -228,6 +230,18 @@ async function readLoginCookie() {
     const tempCk = await Redis.get(CK_KEY);
     return tempCk ? tempCk : '';
 }
+/** 读取扫码登陆后缓存的cookie的有效时间 */
+async function readLoginCookieTTL() {
+    const CK_KEY = 'Yz:yuki:bili:loginCookie';
+    const tempCk = await Redis.get(CK_KEY);
+    if (tempCk) {
+        const LoginCookieTTL = await Redis.ttl(CK_KEY);
+        return LoginCookieTTL;
+    }
+    else {
+        return -2;
+    }
+}
 /** 读取手动绑定的B站ck */
 async function readLocalBiliCk() {
     const dir = path.join(_paths.root, 'data/yuki-plugin/');
@@ -473,4 +487,4 @@ async function cookieWithBiliTicket(cookie) {
     }
 }
 
-export { applyLoginQRCode, checkBiliLogin, cookieWithBiliTicket, exitBiliLogin, genUUID, gen_b_lsid, getNewTempCk, get_buvid_fp, pollLoginQRCode, postGateway, readSavedCookieItems, readSavedCookieOtherItems, readSyncCookie, readTempCk, saveLocalBiliCk, saveLoginCookie, saveTempCk };
+export { applyLoginQRCode, checkBiliLogin, cookieWithBiliTicket, exitBiliLogin, genUUID, gen_b_lsid, getNewTempCk, get_buvid_fp, pollLoginQRCode, postGateway, readLoginCookie, readSavedCookieItems, readSavedCookieOtherItems, readSyncCookie, readTempCk, saveLocalBiliCk, saveLoginCookie, saveTempCk };

package/lib/models/bilibili/bilibili.main.query.js

@@ -99,7 +99,7 @@ class BiliQuery {
                         }) || [];
                     formatData.data.title = desc?.title;
                     // 文章内容过长，则尝试获取全文
-                    if (desc?.summary?.text?.length >= 480) {
+                    if (String(desc?.summary?.text).length >= 480) {
                         const fullArticleContent = await this.getFullArticleContent(this.formatUrl(desc?.jump_url));
                         if (fullArticleContent) {
                             const { readInfo, articleType } = fullArticleContent;
@@ -227,7 +227,7 @@ class BiliQuery {
                     case 'RICH_TEXT_NODE_TYPE_EMOJI':
                         // 处理表情类型，使用 img 标签显示表情
                         const emoji = node.emoji;
-                        return `<img src="${emoji?.icon_url}" alt="${emoji?.text}" title="${emoji?.text}" style="vertical-align: middle; width: ${emoji?.size}em; height: ${emoji?.size}em;">`;
+                        return `<img src="${emoji?.icon_url}" alt="${emoji?.text}" title="${emoji?.text}" style="vertical-align: middle; width: ${emoji?.size ? Number(emoji?.size) * 2 : 2}em; height: ${emoji?.size ? Number(emoji?.size) * 2 : 2}em;">`;
                     case 'RICH_TEXT_NODE_TYPE_GOODS':
                         // 处理商品推广类型，使用官方的HTML标签写法
                         const goods_url = node?.jump_url;
@@ -245,7 +245,7 @@ class BiliQuery {
     };
     /**获取完整B站文章内容
      * @param postUrl - 文章链接: https://www.bilibili.com/read/cvxxxx 或者 https://www.bilibili.com/opus/xxxx
-     * @returns {Json} 完整的B站文章内容json数据
+     * @returns {JSON} 完整的B站文章内容json数据
      */
     static async getFullArticleContent(postUrl) {
         let { cookie } = await readSyncCookie();
@@ -346,7 +346,7 @@ class BiliQuery {
                                         case 'RICH_TEXT_NODE_TYPE_EMOJI':
                                             // 处理表情类型，使用 img 标签显示表情
                                             const emoji = node?.rich?.emoji;
-                                            return `<img src="${emoji?.icon_url}" alt="${emoji?.text}" title="${emoji?.text}" style="vertical-align: middle; width: ${emoji?.size}em; height: ${emoji?.size}em;">`;
+                                            return `<img src="${emoji?.icon_url}" alt="${emoji?.text}" title="${emoji?.text}" style="vertical-align: middle; width: ${emoji?.size ? Number(emoji?.size) * 2 : 2}em; height: ${emoji?.size ? Number(emoji?.size) * 2 : 2}em;">`;
                                         case 'RICH_TEXT_NODE_TYPE_GOODS':
                                             // 处理商品推广类型，使用官方的HTML标签写法
                                             const goods_url = node?.rich?.jump_url;
@@ -396,7 +396,7 @@ class BiliQuery {
         let desc, msg = [], pics = [], author, majorType, content, dynamicTitle;
         let title = `B站【${upName}】动态推送：\n`;
         let dynamicType = data.type;
-        switch (data.type) {
+        switch (dynamicType) {
             case 'DYNAMIC_TYPE_AV':
                 // 处理视频动态
                 desc = data?.modules?.module_dynamic?.major?.archive;

package/lib/models/bilibili/bilibili.main.task.js

@@ -2,7 +2,7 @@ import QRCode from 'qrcode';
 import { Redis, Segment, Bot } from 'yunzaijs';
 import Config from '../../utils/config.js';
 import { renderPage } from '../../utils/image.js';
-import { BiliGetWebData } from './bilibili.main.get.web.data.js';
+import { BilibiliWebDataFetcher } from './bilibili.main.get.web.data.js';
 import { readSyncCookie, postGateway } from './bilibili.main.models.js';
 import { BiliQuery } from './bilibili.main.query.js';
 
@@ -18,8 +18,8 @@ class BiliTask {
     }
     async hendleEventDynamicData(uid, count = 0) {
         let { cookie } = await readSyncCookie();
-        const resp = await new BiliGetWebData().getBiliDynamicListDataByUid(uid);
-        const resjson = await resp.data;
+        const resp = await new BilibiliWebDataFetcher().getBiliDynamicListDataByUid(uid);
+        const resjson = await resp?.data;
         if (!resjson || resjson.code !== 0 || resjson.code === -352) {
             await postGateway(cookie);
             if (count < 2) {
@@ -33,16 +33,22 @@ class BiliTask {
         }
         return resjson;
     }
+    /**
+     * 执行动态推送任务
+     */
     async runTask() {
         let biliConfigData = await Config.getUserConfig('bilibili', 'config');
         let biliPushData = await Config.getUserConfig('bilibili', 'push');
-        let interval = biliConfigData?.interval || 7200;
+        let dynamicTimeRange = biliConfigData?.dynamicTimeRange || 7200; // 筛选何时发布的动态，单位为秒，默认2小时内发布的动态
         logger.debug(`当前B站功能配置：${JSON.stringify(biliConfigData)}`);
         const uidMap = new Map(); // 存放group 和 private 对应所属 uid 与推送信息的映射
         const dynamicList = {}; // 存放获取的所有动态，键为 uid，值为动态数组
         await this.processBiliData(biliPushData, biliConfigData, uidMap, dynamicList);
         let now = Date.now() / 1000; // 时间戳（秒）
-        await this.pushDynamicMessages(uidMap, dynamicList, now, interval, biliConfigData);
+        // 定义待推送动态消息映射
+        const messageMap = new Map();
+        await this.makeUidDynamicDataMap(uidMap, dynamicList, now, dynamicTimeRange, biliConfigData, messageMap);
+        await this.sendDynamicMessage(messageMap, biliConfigData);
     }
     /**
      * 处理Bilibili数据，获取动态列表并构建 uid 映射
@@ -102,17 +108,17 @@ class BiliTask {
                 }
             }
         }
-        requestedDataOfUids.clear(); // 清空已请求的映射
+        requestedDataOfUids.clear(); // 清空已请求的 uid 映射
     }
     /**
-     * 推送动态消息
+     * 构建uid对应动态数据映射
      * @param uidMap uid 映射
      * @param dynamicList 动态列表
      * @param now 当前时间戳
-     * @param interval 推送间隔时间
+     * @param dynamicTimeRange 筛选何时发布的动态
      * @param biliConfigData Bilibili配置数据
      */
-    async pushDynamicMessages(uidMap, dynamicList, now, interval, biliConfigData) {
+    async makeUidDynamicDataMap(uidMap, dynamicList, now, dynamicTimeRange, biliConfigData, messageMap) {
         for (let [chatType, chatTypeMap] of uidMap) {
             for (let [key, value] of chatTypeMap) {
                 const tempDynamicList = dynamicList[key] || [];
@@ -126,7 +132,7 @@ class BiliTask {
                     }
                     if (!author?.pub_ts)
                         continue; // 如果动态没有发布时间，跳过当前循环
-                    if (Number(now - author.pub_ts) > interval) {
+                    if (Number(now - author.pub_ts) > dynamicTimeRange) {
                         logger.debug(`超过间隔，跳过  [ ${author?.name} : ${author?.mid} ] ${author?.pub_time} 的动态`);
                         continue;
                     } // 如果超过推送时间间隔，跳过当前循环
@@ -143,7 +149,7 @@ class BiliTask {
                         for (let chatId of chatIds) {
                             if (type && type.length && !type.includes(pushDynamicData.type))
                                 continue; // 如果禁用了某类型的动态推送，跳过当前循环
-                            await this.sendDynamic(chatId, bot_id, upName, pushDynamicData, biliConfigData, chatType); // 发送动态消息
+                            await this.makeDynamicMessageMap(chatId, bot_id, upName, pushDynamicData, biliConfigData, chatType, messageMap); // 发送动态消息
                             await this.randomDelay(1000, 2000); // 随机延时1-2秒
                         }
                     }
@@ -152,15 +158,15 @@ class BiliTask {
         }
     }
     /**
-     * 发送动态消息
+     * 渲染构建待发送的动态消息数据的映射数组
      * @param chatId 聊天 ID
      * @param bot_id 机器人 ID
-     * @param upName 用户名
+     * @param upName up主用户名
      * @param pushDynamicData 推送动态数据
      * @param biliConfigData 哔哩配置数据
      * @param chatType 聊天类型
      */
-    async sendDynamic(chatId, bot_id, upName, pushDynamicData, biliConfigData, chatType) {
+    async makeDynamicMessageMap(chatId, bot_id, upName, pushDynamicData, biliConfigData, chatType, messageMap) {
         const id_str = pushDynamicData.id_str;
         let sended = null, markKey = '';
         if (chatType === 'group') {
@@ -173,18 +179,21 @@ class BiliTask {
         }
         if (sended)
             return; // 如果已经发送过，则直接返回
-        let liveAtAll = !!biliConfigData.liveAtAll === true ? true : false; // 直播动态是否@全体成员，默认false
-        let liveAtAllCD = biliConfigData.liveAtAllCD || 1800; // 直播动态@全体成员 冷却时间CD，默认 30 分钟
-        let liveAtAllMark = await Redis.get(`${markKey}${chatId}:liveAtAllMark`); // 直播动态@全体成员标记，默认 0
-        // 直播动态@全体成员的群组列表，默认空数组，为空则不进行@全体成员操作
-        let liveAtAllGroupList = new Set(Array.isArray(biliConfigData?.liveAtAllGroupList) ? Array.from(biliConfigData.liveAtAllGroupList).map(item => String(item)) : []);
-        if (!!biliConfigData.pushMsgMode) {
+        // 判断推送内容模式
+        let pushMsgMode = !!biliConfigData.pushMsgMode === false ? 'TEXT' : 'PIC'; // 是否启用图文模式，默认为 PIC 截图模式
+        if (pushMsgMode === 'PIC') {
             const { data, uid } = await BiliQuery.formatDynamicData(pushDynamicData); // 处理动态数据
             const extentData = { ...data };
-            const eval2 = eval;
-            let banWords = eval2(`/${biliConfigData.banWords.join('|')}/g`); // 构建屏蔽关键字正则表达式
-            if (new RegExp(banWords).test(`${extentData?.title}${extentData?.content}`)) {
-                return 'return'; // 如果动态包含屏蔽关键字，则直接返回
+            const getBanWords = biliConfigData?.banWords;
+            if (getBanWords && Array.isArray(getBanWords) && getBanWords.length > 0) {
+                // 构建屏蔽关键字正则表达式，转义特殊字符
+                const banWords = new RegExp(getBanWords.map(word => word.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')).join('|'), 'g');
+                if (banWords.test(`${extentData?.title}${extentData?.content}`)) {
+                    return 'return'; // 如果动态消息包含屏蔽关键字，则直接返回
+                }
+            }
+            else if (getBanWords && !Array.isArray(getBanWords)) {
+                logger.error(`B站动态：Yaml配置文件中，banWords 字段格式不是数组格式，请检查！`);
             }
             let boxGrid = !!biliConfigData.boxGrid === false ? false : true; // 是否启用九宫格样式，默认为 true
             let isSplit = !!biliConfigData.isSplit === false ? false : true; // 是否启用分片截图，默认为 true
@@ -206,74 +215,35 @@ class BiliTask {
             };
             let imgs = await this.renderDynamicCard(uid, renderData, ScreenshotOptionsData);
             if (!imgs)
-                return;
-            Redis.set(`${markKey}${chatId}:${id_str}`, '1', { EX: 3600 * 72 }); // 设置已发送标记
-            global?.logger?.mark('优纪插件：B站动态执行推送');
-            if (liveAtAll && !liveAtAllMark && extentData?.type === 'DYNAMIC_TYPE_LIVE_RCMD' && liveAtAllGroupList.has(String(chatId))) {
-                try {
-                    await this.sendMessage(chatId, bot_id, chatType, Segment.at('all'));
-                    await Redis.set(`${markKey}${chatId}:liveAtAllMark`, 1, { EX: liveAtAllCD }); // 设置直播动态@全体成员标记为 1
-                }
-                catch (error) {
-                    logger.error(`直播动态发送@全体成员失败，请检查 <机器人> 是否有 [管理员权限] 或 [聊天平台是否支持] ：${error}`);
-                    await this.sendMessage(chatId, bot_id, chatType, ['直播动态发送@全体成员失败，请检查权限或平台是否支持']);
-                }
-            }
-            for (let i = 0; i < imgs.length; i++) {
-                const image = imgs[i];
-                await this.sendMessage(chatId, bot_id, chatType, Segment.image(image));
-                await this.randomDelay(1000, 2000); // 随机延时1-2秒
-            }
-            await new Promise(resolve => setTimeout(resolve, 1000)); // 休眠1秒
+                return; // 如果渲染失败，则直接返回
+            await this.addMessageToMap(messageMap, chatType, bot_id, chatId, 'SINGLE', id_str, extentData?.type, imgs.map(img => Segment.image(img)));
         }
         else {
             const dynamicMsg = await BiliQuery.formatTextDynamicData(upName, pushDynamicData, false, biliConfigData); // 构建图文动态消息
-            Redis.set(`${markKey}${chatId}:${id_str}`, '1', { EX: 3600 * 72 }); // 设置已发送标记
             if (dynamicMsg === undefined || dynamicMsg === 'continue') {
                 return 'return'; // 如果动态消息构建失败，则直接返回
             }
             const getBanWords = biliConfigData?.banWords;
             if (getBanWords && Array.isArray(getBanWords) && getBanWords.length > 0) {
-                const banWords = new RegExp(getBanWords.join('|'), 'g'); // 构建屏蔽关键字正则表达式
+                // 构建屏蔽关键字正则表达式，转义特殊字符
+                const banWords = new RegExp(getBanWords.map(word => word.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')).join('|'), 'g');
                 if (banWords.test(dynamicMsg.msg.join(''))) {
                     return 'return'; // 如果动态消息包含屏蔽关键字，则直接返回
                 }
             }
+            else if (getBanWords && !Array.isArray(getBanWords)) {
+                logger.error(`B站动态：Yaml配置文件中，banWords 字段格式不是数组格式，请检查！`);
+            }
             let mergeTextPic = !!biliConfigData.mergeTextPic === false ? false : true; // 是否合并文本和图片，默认为 true
+            //开启了合并文本和图片
             if (mergeTextPic === true) {
                 const mergeMsg = [...dynamicMsg.msg, ...dynamicMsg.pics];
-                if (liveAtAll && !liveAtAllMark && dynamicMsg.dynamicType === 'DYNAMIC_TYPE_LIVE_RCMD' && liveAtAllGroupList.has(String(chatId))) {
-                    try {
-                        await this.sendMessage(chatId, bot_id, chatType, Segment.at('all'));
-                        await Redis.set(`${markKey}${chatId}:liveAtAllMark`, 1, { EX: liveAtAllCD }); // 设置直播动态@全体成员标记为 1
-                    }
-                    catch (error) {
-                        global?.logger.error(`直播动态发送@全体成员失败，请检查 <机器人> 是否有 [管理员权限] 或 [聊天平台是否支持] ：${error}`);
-                        await this.sendMessage(chatId, bot_id, chatType, ['直播动态发送@全体成员失败，请检查权限或平台是否支持']);
-                    }
-                }
-                await this.sendMessage(chatId, bot_id, chatType, mergeMsg);
+                await this.addMessageToMap(messageMap, chatType, bot_id, chatId, 'MERGE', id_str, dynamicMsg.dynamicType, mergeMsg);
             }
             else {
-                if (liveAtAll && !liveAtAllMark && dynamicMsg.dynamicType === 'DYNAMIC_TYPE_LIVE_RCMD' && liveAtAllGroupList.has(String(chatId))) {
-                    try {
-                        await this.sendMessage(chatId, bot_id, chatType, Segment.at('all'));
-                        await Redis.set(`${markKey}${chatId}:liveAtAllMark`, 1, { EX: liveAtAllCD }); // 设置直播动态@全体成员标记为 1
-                    }
-                    catch (error) {
-                        global?.logger.error(`直播动态发送@全体成员失败，请检查 <机器人> 是否有 [管理员权限] 或 [聊天平台是否支持] ：${error}`);
-                        await this.sendMessage(chatId, bot_id, chatType, ['直播动态发送@全体成员失败，请检查权限或平台是否支持']);
-                    }
-                }
-                await this.sendMessage(chatId, bot_id, chatType, dynamicMsg.msg);
-                const pics = dynamicMsg.pics;
-                if (pics && pics.length > 0) {
-                    for (let i = 0; i < pics.length; i++) {
-                        await this.sendMessage(chatId, bot_id, chatType, pics[i]);
-                        await this.randomDelay(1000, 2000); // 随机延时1-2秒
-                    }
-                }
-                await new Promise(resolve => setTimeout(resolve, 1000));
+                //不合并文本和图片
+                await this.addMessageToMap(messageMap, chatType, bot_id, chatId, 'MERGE', id_str, dynamicMsg.dynamicType, dynamicMsg.msg);
+                await this.addMessageToMap(messageMap, chatType, bot_id, chatId, 'SINGLE', id_str, dynamicMsg.dynamicType, dynamicMsg.pics);
             }
         }
     }
@@ -354,13 +324,105 @@ class BiliTask {
         }
     }
     /**
-     * 发送消息
+     * 收集消息映射
+     * @param messageMap 消息映射
+     * @param chatType 聊天类型
+     * @param bot_id 机器人 ID
+     * @param chatId 聊天 ID
+     * @param sendMode 发送模式: SINGLE 逐条发送，MERGE 合并发送
+     * @param dynamicUUid_str 动态 UUID
+     * @param dynamicType 动态类型
+     * @param message 消息内容
+     */
+    async addMessageToMap(messageMap, chatType, bot_id, chatId, sendMode, dynamicUUid_str, dynamicType, messages) {
+        if (!messageMap.has(chatType)) {
+            messageMap.set(chatType, new Map());
+        }
+        const botMap = messageMap.get(chatType);
+        if (!botMap?.has(bot_id)) {
+            botMap?.set(bot_id, new Map());
+        }
+        const chatMap = botMap?.get(bot_id);
+        if (!chatMap?.has(chatId)) {
+            chatMap?.set(chatId, []);
+        }
+        chatMap?.get(chatId)?.push({ sendMode, dynamicUUid_str, dynamicType, messages });
+    }
+    /**
+     * 推送动态消息
+     * @param messageMap 消息映射
+     * @param biliConfigData 哔哩配置数据
+     */
+    async sendDynamicMessage(messageMap, biliConfigData) {
+        let liveAtAll = !!biliConfigData.liveAtAll === true ? true : false; // 直播动态是否@全体成员，默认false
+        let liveAtAllCD = biliConfigData.liveAtAllCD || 1800; // 直播动态@全体成员 冷却时间CD，默认 30 分钟
+        // 直播动态@全体成员的群组/好友列表，默认空数组，为空则不进行@全体成员操作
+        let liveAtAllGroupList = new Set(Array.isArray(biliConfigData?.liveAtAllGroupList) ? Array.from(biliConfigData.liveAtAllGroupList).map(item => String(item)) : []);
+        const LogMark = new Set(); // 日志mark
+        for (const [chatType, botMap] of messageMap) {
+            for (const [bot_id, chatMap] of botMap) {
+                for (const [chatId, messageCombinationList] of chatMap) {
+                    // 遍历组合消息
+                    for (const messageCombination of messageCombinationList) {
+                        const { sendMode, dynamicUUid_str, dynamicType, messages } = messageCombination;
+                        let sended = null;
+                        let markKey = '';
+                        if (chatType === 'group') {
+                            markKey = this.groupKey;
+                            sended = await Redis.get(`${markKey}${chatId}:${dynamicUUid_str}`);
+                        }
+                        else if (chatType === 'private') {
+                            markKey = this.privateKey;
+                            sended = await Redis.get(`${markKey}${chatId}:${dynamicUUid_str}`);
+                        }
+                        const sendMarkKey = `${markKey}${chatId}:${dynamicUUid_str}`;
+                        if (sended) {
+                            continue; // 如果已经发送过，则直接跳过
+                        }
+                        if (!LogMark.has('1')) {
+                            global?.logger?.mark('优纪插件: B站动态执行推送');
+                            LogMark.add('1');
+                        }
+                        let liveAtAllMark = await Redis.get(`${markKey}${chatId}:liveAtAllMark`); // 直播动态@全体成员标记，默认 0
+                        // 如果开启了直播动态@全体成员
+                        if (liveAtAll && !liveAtAllMark && dynamicType === 'DYNAMIC_TYPE_LIVE_RCMD' && liveAtAllGroupList.has(String(chatId))) {
+                            try {
+                                await this.sendMessageApi(chatId, bot_id, chatType, [Segment.at('all')]);
+                                await Redis.set(`${markKey}${chatId}:liveAtAllMark`, 1, { EX: liveAtAllCD }); // 设置直播动态@全体成员标记为 1
+                            }
+                            catch (error) {
+                                logger.error(`直播动态发送@全体成员失败，请检查 <机器人> 是否有 [管理员权限] 或 [聊天平台是否支持] ：${error}`);
+                                let liveAtAllErrMsg = !!biliConfigData.liveAtAllErrMsg === false ? false : true; // 直播动态@全体成员失败是否发送错误提示消息，默认 false
+                                if (liveAtAllErrMsg) {
+                                    await this.sendMessageApi(chatId, bot_id, chatType, ['直播动态发送@全体成员失败，请检查权限或平台是否支持']);
+                                }
+                            }
+                        }
+                        if (sendMode === 'SINGLE') {
+                            for (let i = 0; i < messages.length; i++) {
+                                await this.sendMessageApi(chatId, bot_id, chatType, messages[i]);
+                            }
+                            await Redis.set(sendMarkKey, '1', { EX: 3600 * 72 }); // 发送成功后设置标记
+                            await this.randomDelay(1000, 2000); // 随机延时1-2秒
+                        }
+                        else if (sendMode === 'MERGE') {
+                            await this.sendMessageApi(chatId, bot_id, chatType, messages);
+                            await Redis.set(sendMarkKey, '1', { EX: 3600 * 72 }); // 发送成功后设置标记
+                        }
+                    }
+                }
+            }
+        }
+        LogMark.clear(); // 清空日志mark
+    }
+    /**
+     * 发送消息api
      * @param chatId 聊天 ID
      * @param bot_id 机器人 ID
      * @param chatType 聊天类型
      * @param message 消息内容
      */
-    async sendMessage(chatId, bot_id, chatType, message) {
+    async sendMessageApi(chatId, bot_id, chatType, message) {
         if (chatType === 'group') {
             await (Bot[bot_id] ?? Bot)
                 ?.pickGroup(String(chatId))

package/lib/models/weibo/weibo.main.api.js

@@ -1,21 +1,47 @@
+import Config from '../../utils/config.js';
+
 class WeiboApi {
-    static WEIBO_API = {
-        weiboGetIndex: 'https://m.weibo.cn/api/container/getIndex',
-        //通过关键词${upKeyword}搜索博主 parama = { q: 'Keyword'},
-        weiboAjaxSearch: 'https://weibo.com/ajax/side/search'
-    };
+    weiboConfigData;
+    USER_AGENT;
+    constructor() {
+        this.weiboConfigData = Config.getUserConfig('weibo', 'config');
+        this.USER_AGENT = WeiboApi.WEIBO_USER_AGENT;
+        this.initialize();
+    }
+    static WEIBO_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36';
+    //初始化User-Agent
+    async initialize() {
+        await this.initUserAgent();
+    }
+    async initUserAgent() {
+        const userAgentList = await this.weiboConfigData.userAgentList;
+        if (userAgentList && userAgentList.length > 0) {
+            const randomIndex = Math.floor(Math.random() * userAgentList.length);
+            this.USER_AGENT = String(userAgentList[randomIndex]);
+        }
+    }
+    get WEIBO_API() {
+        return {
+            weiboGetIndex: 'https://m.weibo.cn/api/container/getIndex',
+            //通过关键词${upKeyword}搜索博主 parama = { q: 'Keyword'},
+            weiboAjaxSearch: 'https://weibo.com/ajax/side/search'
+        };
+    }
     /**统一设置header */
-    static WEIBO_HEADERS = {
-        'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9',
-        'Accept-language': 'zh-CN,zh;q=0.9',
-        'Authority': 'm.weibo.cn',
-        'Cache-control': 'max-age=0',
-        'Sec-fetch-dest': 'empty',
-        'Sec-fetch-mode': 'same-origin',
-        'Sec-fetch-site': 'same-origin',
-        'Upgrade-insecure-requests': '1',
-        'User-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:127.0) Gecko/20100101 Firefox/127.0'
-    };
+    get WEIBO_HEADERS() {
+        return {
+            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9',
+            'Accept-language': 'zh-CN,zh;q=0.9',
+            'Authority': 'm.weibo.cn',
+            'Cache-control': 'max-age=0',
+            'Sec-fetch-dest': 'empty',
+            'Sec-fetch-mode': 'same-origin',
+            'Sec-fetch-site': 'same-origin',
+            'Upgrade-insecure-requests': '1',
+            'User-agent': this.USER_AGENT
+        };
+    }
 }
+var WeiboApi$1 = new WeiboApi();
 
-export { WeiboApi };
+export { WeiboApi$1 as default };

package/lib/models/weibo/weibo.main.get.web.data.js

@@ -1,8 +1,8 @@
 import axios from 'axios';
-import { WeiboApi } from './weibo.main.api.js';
+import WeiboApi from './weibo.main.api.js';
 import { WeiboQuery } from './weibo.main.query.js';
 
-class WeiboGetWebData {
+class WeiboWebDataFetcher {
     e;
     constructor(e) { }
     /**通过uid获取博主信息 */
@@ -10,7 +10,8 @@ class WeiboGetWebData {
         const param = { containerid: '100505' + target };
         const url = new URL(WeiboApi.WEIBO_API.weiboGetIndex);
         url.search = new URLSearchParams(param).toString();
-        const resp = await axios.get(url.toString(), {
+        const resp = await axios(url.toString(), {
+            method: 'GET',
             timeout: 10000,
             headers: { 'accept': '*/*', 'Content-Type': 'application/json', 'referer': 'https://m.weibo.cn' }
         });
@@ -22,7 +23,8 @@ class WeiboGetWebData {
         const params = {
             q: keyword
         };
-        const resp = await axios.get(url, {
+        const resp = await axios(url, {
+            method: 'GET',
             params,
             timeout: 10000,
             headers: { 'accept': '*/*', 'Content-Type': 'application/json', 'referer': 'https://s.weibo.com' }
@@ -36,13 +38,14 @@ class WeiboGetWebData {
         url.search = new URLSearchParams(params).toString();
         await new Promise(resolve => setTimeout(resolve, Math.floor(Math.random() * (6500 - 1000 + 1) + 1000)));
         try {
-            const response = await axios.get(url.toString(), {
-                timeout: 15000,
+            const response = await axios(url.toString(), {
+                method: 'GET',
+                timeout: 10000,
                 headers: { 'accept': '*/*', 'Content-Type': 'application/json', 'referer': 'https://m.weibo.cn' }
             });
-            const { ok, data, msg } = response.data;
+            const { ok, data, msg } = response?.data;
             if (!ok && msg !== '这里还没有内容') {
-                throw new Error(response.config.url);
+                throw new Error(response?.config.url);
             }
             return data.cards.filter(WeiboQuery.filterCardTypeCustom);
         }
@@ -53,4 +56,4 @@ class WeiboGetWebData {
     }
 }
 
-export { WeiboGetWebData };
+export { WeiboWebDataFetcher };

package/lib/models/weibo/weibo.main.query.js

@@ -1,6 +1,6 @@
 import moment from 'moment';
 import fetch from 'node-fetch';
-import { WeiboApi } from './weibo.main.api.js';
+import WeiboApi from './weibo.main.api.js';
 import { Segment } from 'yunzaijs';
 import { JSDOM } from 'jsdom';
 
@@ -186,7 +186,7 @@ class WeiboQuery {
         let info = raw_post?.mblog || raw_post;
         let retweeted = info && info.retweeted_status ? true : false; //是否为转发动态
         let pic_num = retweeted ? info?.retweeted_status?.pic_num : info?.pic_num;
-        let type = this.MakeCategory(raw_post);
+        let dynamicType = this.MakeCategory(raw_post);
         /**获取动态全文 */
         if (info?.isLongText || pic_num > 9) {
             const res = await fetch(`https://m.weibo.cn/detail/${info.mid}`, { headers: WeiboApi.WEIBO_HEADERS });
@@ -207,7 +207,7 @@ class WeiboQuery {
         let detail_url = `https://weibo.com/${info?.user?.id}/${info?.bid}`;
         let title = `微博【${upName}】动态推送：\n`;
         const dynamicPicCountLimit = setData.pushPicCountLimit || 3;
-        switch (type) {
+        switch (dynamicType) {
             case 'DYNAMIC_TYPE_AV':
                 if (!info)
                     return;
@@ -223,7 +223,7 @@ class WeiboQuery {
                     `时间：${created_time ? moment(created_time).format('YYYY年MM月DD日 HH:mm:ss') : ''}`
                 ];
                 pics = [cover_img];
-                return { msg, pics };
+                return { msg, pics, dynamicType };
             case 'DYNAMIC_TYPE_DRAW':
                 raw_pics_list = retweeted ? info?.retweeted_status?.pics || [] : info?.pics || [];
                 if (!info && !raw_pics_list)
@@ -243,7 +243,7 @@ class WeiboQuery {
                     `链接：${detail_url}\n`,
                     `时间：${created_time ? moment(created_time).format('YYYY年MM月DD日 HH:mm:ss') : ''}`
                 ];
-                return { msg, pics };
+                return { msg, pics, dynamicType };
             case 'DYNAMIC_TYPE_ARTICLE':
                 if (!info)
                     return;
@@ -263,7 +263,7 @@ class WeiboQuery {
                     `链接：${detail_url}\n`,
                     `时间：${created_time ? moment(created_time).format('YYYY年MM月DD日 HH:mm:ss') : ''}`
                 ];
-                return { msg, pics };
+                return { msg, pics, dynamicType };
             case 'DYNAMIC_TYPE_FORWARD':
                 if (!info)
                     return;
@@ -290,9 +290,9 @@ class WeiboQuery {
                     '\n---以下为转发内容---\n',
                     ...origContent
                 ];
-                return { msg, pics };
+                return { msg, pics, dynamicType };
             default:
-                logger?.mark(`未处理的微博推送【${upName}】：${type}`);
+                logger?.mark(`未处理的微博推送【${upName}】：${dynamicType}`);
                 return 'continue';
         }
     }