yz-yuki-plugin 2.0.4-9 → 2.0.5-1

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

@@ -12,9 +12,9 @@ class BiliTask {
     privateKey;
     e;
     constructor(e) {
-        this.taskName = "biliTask";
-        this.groupKey = "Yz:yuki:bili:upPush:group:";
-        this.privateKey = "Yz:yuki:bili:upPush:private:";
+        this.taskName = 'biliTask';
+        this.groupKey = 'Yz:yuki:bili:upPush:group:';
+        this.privateKey = 'Yz:yuki:bili:upPush:private:';
     }
     async hendleEventDynamicData(uid, count = 0) {
         const resp = await new BiliGetWebData().getBiliDynamicListDataByUid(uid);
@@ -40,13 +40,12 @@ class BiliTask {
         }
     }
     async runTask() {
-        let biliConfigData = await Config.getUserConfig("bilibili", "config");
-        let biliPushData = await Config.getUserConfig("bilibili", "push");
-        let interval = biliConfigData.interval || 7200;
-        let lastLiveStatus = JSON.parse(await Redis.get("yuki:bililive:lastlivestatus")) || {};
+        let biliConfigData = await Config.getUserConfig('bilibili', 'config');
+        let biliPushData = await Config.getUserConfig('bilibili', 'push');
+        let interval = biliConfigData?.interval || 7200;
         const uidMap = new Map(); // 存放group 和 private 对应所属 uid 与推送信息的映射
         const dynamicList = {}; // 存放获取的所有动态，键为 uid，值为动态数组
-        await this.processBiliData(biliPushData, uidMap, dynamicList, lastLiveStatus);
+        await this.processBiliData(biliPushData, biliConfigData, uidMap, dynamicList);
         let now = Date.now() / 1000; // 时间戳（秒）
         await this.pushDynamicMessages(uidMap, dynamicList, now, interval, biliConfigData);
     }
@@ -57,9 +56,11 @@ class BiliTask {
      * @param dynamicList 动态列表
      * @param lastLiveStatus 最后直播状态
      */
-    async processBiliData(biliPushData, uidMap, dynamicList, lastLiveStatus) {
+    async processBiliData(biliPushData, biliConfigData, uidMap, dynamicList) {
+        let getDataRandomDelay = biliConfigData?.getDataRandomDelay || 8000; // 获取相邻up动态数据的随机延时间隔
         const requestedDataOfUids = new Map(); // 存放已请求的 uid 映射
-        for (let chatType in biliPushData) { // 遍历 group 和 private
+        for (let chatType in biliPushData) {
+            // 遍历 group 和 private
             if (!uidMap.has(chatType)) {
                 uidMap.set(chatType, new Map());
             }
@@ -67,9 +68,6 @@ class BiliTask {
             for (let chatId in biliPushData[chatType]) {
                 const subUpsOfChat = Array.prototype.slice.call(biliPushData[chatType][chatId] || []);
                 for (let subInfoOfup of subUpsOfChat) {
-                    if (!lastLiveStatus[subInfoOfup.uid]) {
-                        lastLiveStatus[subInfoOfup.uid] = 0;
-                    }
                     let resp;
                     // 检查是否已经请求过该 uid
                     if (requestedDataOfUids.has(subInfoOfup.uid)) {
@@ -101,7 +99,7 @@ class BiliTask {
                     const bot_id = subInfoOfup.bot_id || [];
                     const { name, type } = subInfoOfup;
                     chatTypeMap.set(subInfoOfup.uid, { chatIds, bot_id, upName: name, type });
-                    await this.randomDelay(1000, 4000); // 随机延时1-4秒
+                    await this.randomDelay(2000, getDataRandomDelay); // 随机延时
                 }
             }
         }
@@ -133,7 +131,7 @@ class BiliTask {
                         logger.debug(`超过间隔，跳过  [ ${author?.name} : ${author?.mid} ] ${author?.pub_time} 的动态`);
                         continue;
                     } // 如果超过推送时间间隔，跳过当前循环
-                    if (dynamicItem.type === "DYNAMIC_TYPE_FORWARD" && !biliConfigData.pushTransmit)
+                    if (dynamicItem.type === 'DYNAMIC_TYPE_FORWARD' && !biliConfigData.pushTransmit)
                         continue; // 如果关闭了转发动态的推送，跳过当前循环
                     willPushDynamicList.push(dynamicItem);
                 }
@@ -158,11 +156,11 @@ class BiliTask {
     async sendDynamic(chatId, bot_id, upName, pushDynamicData, biliConfigData, chatType) {
         const id_str = pushDynamicData.id_str;
         let sended, markKey;
-        if (chatType === "group") {
+        if (chatType === 'group') {
             markKey = this.groupKey;
             sended = await Redis.get(`${markKey}${chatId}:${id_str}`);
         }
-        else if (chatType === "private") {
+        else if (chatType === 'private') {
             markKey = this.privateKey;
             sended = await Redis.get(`${markKey}${chatId}:${id_str}`);
         }
@@ -172,54 +170,54 @@ class BiliTask {
             const { data, uid } = await BiliQuery.formatDynamicData(pushDynamicData); // 处理动态数据
             const extentData = { ...data };
             const eval2 = eval;
-            let banWords = eval2(`/${biliConfigData.banWords.join("|")}/g`); // 构建屏蔽关键字正则表达式
+            let banWords = eval2(`/${biliConfigData.banWords.join('|')}/g`); // 构建屏蔽关键字正则表达式
             if (new RegExp(banWords).test(`${extentData?.title}${extentData?.content}`)) {
-                return "return"; // 如果动态包含屏蔽关键字，则直接返回
+                return 'return'; // 如果动态包含屏蔽关键字，则直接返回
             }
             let boxGrid = !!biliConfigData.boxGrid === false ? false : true; // 是否启用九宫格样式，默认为 true
             let isSplit = !!biliConfigData.isSplit === false ? false : true; // 是否启用分片截图，默认为 true
             let style = isSplit ? '' : `.unfold { max-height: ${biliConfigData?.noSplitHeight ?? 7500}px; }`; // 不启用分片截图模式的样式
-            let splitHeight = biliConfigData?.splitHeight ?? 8000; // 分片截图高度，默认 8000, 单位 px，启用分片截图时生效
+            let splitHeight = biliConfigData?.splitHeight || 8000; // 分片截图高度，默认 8000, 单位 px，启用分片截图时生效
             const urlQrcodeData = await QRCode.toDataURL(extentData?.url);
             let renderData = this.buildRenderData(extentData, urlQrcodeData, boxGrid);
             const ScreenshotOptionsData = {
                 addStyle: style,
-                header: { 'Referer': 'https://space.bilibili.com/' },
+                header: { Referer: 'https://space.bilibili.com/' },
                 isSplit: isSplit,
                 modelName: 'bilibili',
                 SOptions: {
                     type: 'webp',
-                    quality: 98,
+                    quality: 98
                 },
                 saveHtmlfile: false,
-                pageSplitHeight: splitHeight,
+                pageSplitHeight: splitHeight
             };
             let imgs = await this.renderDynamicCard(uid, renderData, ScreenshotOptionsData);
             if (!imgs)
                 return;
-            Redis.set(`${markKey}${chatId}:${id_str}`, "1", { EX: 3600 * 10 }); // 设置已发送标记
-            (logger ?? Bot.logger)?.mark("优纪插件：B站动态执行推送");
+            Redis.set(`${markKey}${chatId}:${id_str}`, '1', { EX: 3600 * 10 }); // 设置已发送标记
+            (logger ?? Bot.logger)?.mark('优纪插件：B站动态执行推送');
             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秒
+            await new Promise(resolve => setTimeout(resolve, 1000)); // 休眠1秒
         }
         else {
             const dynamicMsg = await BiliQuery.formatTextDynamicData(upName, pushDynamicData, false, biliConfigData); // 构建图文动态消息
-            Redis.set(`${markKey}${chatId}:${id_str}`, "1", { EX: 3600 * 10 }); // 设置已发送标记
-            if (dynamicMsg == "continue") {
-                return "return"; // 如果动态消息构建失败，则直接返回
+            Redis.set(`${markKey}${chatId}:${id_str}`, '1', { EX: 3600 * 10 }); // 设置已发送标记
+            if (dynamicMsg == 'continue') {
+                return 'return'; // 如果动态消息构建失败，则直接返回
             }
             if (biliConfigData.banWords.length > 0) {
-                const banWords = new RegExp(biliConfigData.banWords.join("|"), "g"); // 构建屏蔽关键字正则表达式
-                if (banWords.test(dynamicMsg.join(""))) {
-                    return "return"; // 如果动态消息包含屏蔽关键字，则直接返回
+                const banWords = new RegExp(biliConfigData.banWords.join('|'), 'g'); // 构建屏蔽关键字正则表达式
+                if (banWords.test(dynamicMsg.join(''))) {
+                    return 'return'; // 如果动态消息包含屏蔽关键字，则直接返回
                 }
             }
             await this.sendMessage(chatId, bot_id, chatType, dynamicMsg);
-            await new Promise((resolve) => setTimeout(resolve, 1000));
+            await new Promise(resolve => setTimeout(resolve, 1000));
         }
     }
     /**
@@ -230,10 +228,10 @@ class BiliTask {
      * @returns 渲染数据
      */
     buildRenderData(extentData, urlQrcodeData, boxGrid) {
-        if (extentData.orig && (extentData.orig).length !== 0) {
+        if (extentData.orig && extentData.orig.length !== 0) {
             return {
                 data: {
-                    appName: "bilibili",
+                    appName: 'bilibili',
                     boxGrid: boxGrid,
                     type: extentData?.type,
                     face: extentData?.face,
@@ -256,7 +254,7 @@ class BiliTask {
                             title: extentData?.orig?.data?.title,
                             content: extentData?.orig?.data?.content,
                             pics: extentData?.orig?.data?.pics,
-                            category: extentData?.orig?.data?.category,
+                            category: extentData?.orig?.data?.category
                         }
                     }
                 }
@@ -265,7 +263,7 @@ class BiliTask {
         else {
             return {
                 data: {
-                    appName: "bilibili",
+                    appName: 'bilibili',
                     boxGrid: boxGrid,
                     type: extentData?.type,
                     face: extentData?.face,
@@ -277,7 +275,7 @@ class BiliTask {
                     urlImgData: urlQrcodeData,
                     created: extentData?.created,
                     pics: extentData?.pics,
-                    category: extentData?.category,
+                    category: extentData?.category
                 }
             };
         }
@@ -290,7 +288,7 @@ class BiliTask {
      * @returns 图片数据
      */
     async renderDynamicCard(uid, renderData, ScreenshotOptionsData) {
-        const dynamicMsg = await renderPage(uid, "MainPage", renderData, ScreenshotOptionsData); // 渲染动态卡片
+        const dynamicMsg = await renderPage(uid, 'MainPage', renderData, ScreenshotOptionsData); // 渲染动态卡片
         if (dynamicMsg !== false) {
             return dynamicMsg.img; // 缓存图片数据
         }
@@ -306,14 +304,18 @@ class BiliTask {
      * @param message 消息内容
      */
     async sendMessage(chatId, bot_id, chatType, message) {
-        if (chatType === "group") {
-            await (Bot[bot_id] ?? Bot)?.pickGroup(String(chatId)).sendMsg(message) // 发送群聊
+        if (chatType === 'group') {
+            await (Bot[bot_id] ?? Bot)
+                ?.pickGroup(String(chatId))
+                .sendMsg(message) // 发送群聊
                 .catch((error) => {
                 (logger ?? Bot.logger)?.error(`群组[${chatId}]推送失败：${JSON.stringify(error)}`);
             });
         }
-        else if (chatType === "private") {
-            await (Bot[bot_id] ?? Bot)?.pickFriend(String(chatId)).sendMsg(message)
+        else if (chatType === 'private') {
+            await (Bot[bot_id] ?? Bot)
+                ?.pickFriend(String(chatId))
+                .sendMsg(message)
                 .catch((error) => {
                 (logger ?? Bot.logger)?.error(`用户[${chatId}]推送失败：${JSON.stringify(error)}`);
             }); // 发送好友私聊
@@ -325,7 +327,7 @@ class BiliTask {
      * @param max 最大延时时间
      */
     async randomDelay(min, max) {
-        await new Promise((resolve) => setTimeout(resolve, Math.floor(Math.random() * (max - min + 1) + min)));
+        await new Promise(resolve => setTimeout(resolve, Math.floor(Math.random() * (max - min + 1) + min)));
     }
 }
 

package/lib/models/bilibili/bilibili.ticket.js

@@ -22,10 +22,10 @@ async function getBiliTicket(csrf) {
     const hexSign = hmacSha256('XgwSnGZ1p', `ts${ts}`);
     const url = 'https://api.bilibili.com/bapis/bilibili.api.ticket.v1.Ticket/GenWebTicket';
     const params = new URLSearchParams({
-        key_id: 'ec02',
-        hexsign: hexSign,
+        'key_id': 'ec02',
+        'hexsign': hexSign,
         'context[ts]': String(ts),
-        csrf: csrf ?? '' // 使用空字符串代替null
+        'csrf': csrf ?? '' // 使用空字符串代替null
     });
     try {
         const response = await fetch(`${url}?${params}`, {

package/lib/models/bilibili/bilibili.wbi.js

@@ -2,15 +2,13 @@ import md5 from 'md5';
 import fetch from 'node-fetch';
 
 const mixinKeyEncTab = [
-    46, 47, 18, 2, 53, 8, 23, 32, 15, 50, 10, 31, 58, 3, 45, 35, 27, 43, 5, 49,
-    33, 9, 42, 19, 29, 28, 14, 39, 12, 38, 41, 13, 37, 48, 7, 16, 24, 55, 40,
-    61, 26, 17, 0, 1, 60, 51, 30, 4, 22, 25, 54, 21, 56, 59, 6, 63, 57, 62, 11,
-    36, 20, 34, 44, 52
+    46, 47, 18, 2, 53, 8, 23, 32, 15, 50, 10, 31, 58, 3, 45, 35, 27, 43, 5, 49, 33, 9, 42, 19, 29, 28, 14, 39, 12, 38, 41, 13, 37, 48, 7, 16, 24, 55, 40, 61, 26,
+    17, 0, 1, 60, 51, 30, 4, 22, 25, 54, 21, 56, 59, 6, 63, 57, 62, 11, 36, 20, 34, 44, 52
 ];
 // 对 imgKey 和 subKey 进行字符顺序打乱编码
 const getMixinKey = (orig) => mixinKeyEncTab
-    .map((n) => orig[n])
-    .join("")
+    .map(n => orig[n])
+    .join('')
     .slice(0, 32);
 // 为请求参数进行 wbi 签名
 function encWbi(params, img_key, sub_key) {
@@ -19,12 +17,12 @@ function encWbi(params, img_key, sub_key) {
     // 按照 key 重排参数
     const query = Object.keys(params)
         .sort()
-        .map((key) => {
+        .map(key => {
         // 过滤 value 中的 "!'()*" 字符
-        const value = params[key].toString().replace(chr_filter, "");
+        const value = params[key].toString().replace(chr_filter, '');
         return `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
     })
-        .join("&");
+        .join('&');
     const wbi_sign = md5(query + mixin_key); // 计算 w_rid
     //return query + "&w_rid=" + wbi_sign;
     return {
@@ -38,12 +36,12 @@ async function getWbiKeys(headers, cookie) {
     const res = await fetch('https://api.bilibili.com/x/web-interface/nav', {
         headers: {
             // SESSDATA 字段
-            Cookie: cookie,
+            'Cookie': cookie,
             'User-Agent': headers['User-Agent'],
-            Referer: 'https://www.bilibili.com/' //对于直接浏览器调用可能不适用
+            'Referer': 'https://www.bilibili.com/' //对于直接浏览器调用可能不适用
         }
     });
-    const { data: { wbi_img: { img_url, sub_url }, }, } = (await res.json());
+    const { data: { wbi_img: { img_url, sub_url } } } = (await res.json());
     return {
         img_key: img_url.slice(img_url.lastIndexOf('/') + 1, img_url.lastIndexOf('.')),
         sub_key: sub_url.slice(sub_url.lastIndexOf('/') + 1, sub_url.lastIndexOf('.'))

package/lib/models/help/help.js

@@ -4,7 +4,7 @@ class Help {
     e;
     model;
     constructor(e) {
-        this.model = "help";
+        this.model = 'help';
         this.e = e;
     }
     static async get(e) {
@@ -12,7 +12,7 @@ class Help {
         return await helpData.getData();
     }
     async getData() {
-        let helpData = Config.getDefaultConfig("help", "help");
+        let helpData = Config.getDefaultConfig('help', 'help');
         return helpData;
     }
 }

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

@@ -2,7 +2,7 @@ class WeiboApi {
     static WEIBO_API = {
         weiboGetIndex: 'https://m.weibo.cn/api/container/getIndex',
         //通过关键词${upKeyword}搜索博主 parama = { q: 'Keyword'},
-        weiboAjaxSearch: 'https://weibo.com/ajax/side/search',
+        weiboAjaxSearch: 'https://weibo.com/ajax/side/search'
     };
     /**统一设置header */
     static WEIBO_HEADERS = {
@@ -14,7 +14,7 @@ class WeiboApi {
         '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',
+        'User-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:127.0) Gecko/20100101 Firefox/127.0'
     };
 }
 

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

@@ -5,8 +5,7 @@ import { WeiboQuery } from './weibo.query.js';
 
 class WeiboGetWebData {
     e;
-    constructor(e) {
-    }
+    constructor(e) { }
     /**通过uid获取博主信息 */
     async getBloggerInfo(target) {
         const param = { containerid: '100505' + target };
@@ -14,7 +13,7 @@ class WeiboGetWebData {
         url.search = new URLSearchParams(param).toString();
         const resp = await axios.get(url.toString(), {
             timeout: 10000,
-            headers: { 'accept': '*/*', 'Content-Type': 'application/json', 'referer': 'https://m.weibo.cn' },
+            headers: { 'accept': '*/*', 'Content-Type': 'application/json', 'referer': 'https://m.weibo.cn' }
         });
         return resp;
     }
@@ -22,12 +21,12 @@ class WeiboGetWebData {
     async searchBloggerInfo(keyword) {
         const url = WeiboApi.WEIBO_API.weiboAjaxSearch;
         const params = {
-            q: keyword,
+            q: keyword
         };
         const resp = await axios.get(url, {
             params,
             timeout: 10000,
-            headers: { 'accept': '*/*', 'Content-Type': 'application/json', 'referer': 'https://s.weibo.com' },
+            headers: { 'accept': '*/*', 'Content-Type': 'application/json', 'referer': 'https://s.weibo.com' }
         });
         return resp;
     }
@@ -36,11 +35,11 @@ class WeiboGetWebData {
         const params = { containerid: '107603' + target };
         const url = new URL(WeiboApi.WEIBO_API.weiboGetIndex);
         url.search = new URLSearchParams(params).toString();
-        await new Promise((resolve) => setTimeout(resolve, Math.floor(Math.random() * (6500 - 1000 + 1) + 1000)));
+        await new Promise(resolve => setTimeout(resolve, Math.floor(Math.random() * (6500 - 1000 + 1) + 1000)));
         try {
             const response = await axios.get(url.toString(), {
                 timeout: 15000,
-                headers: { 'accept': '*/*', 'Content-Type': 'application/json', 'referer': 'https://m.weibo.cn' },
+                headers: { 'accept': '*/*', 'Content-Type': 'application/json', 'referer': 'https://m.weibo.cn' }
             });
             const { ok, data, msg } = response.data;
             if (!ok && msg !== '这里还没有内容') {

package/lib/models/weibo/weibo.query.d.ts

@@ -17,10 +17,10 @@ export declare class WeiboQuery {
         };
     }>;
     /**
-   * 动态内容富文本节点解析
-   * @param nodes - 动态内容富文本节点
-   * @returns 解析后的动态内容富文本
-   */
+     * 动态内容富文本节点解析
+     * @param nodes - 动态内容富文本节点
+     * @returns 解析后的动态内容富文本
+     */
     static parseRichTextNodes: (nodes: any[] | string | any) => any;
     /**
      * 生成动态消息文字内容