yz-yuki-plugin 2.0.4-6 → 2.0.4-7

package/README.md

@@ -196,6 +196,10 @@ https://m.weibo.cn/u/7643376782 # 7643376782 为崩坏星穹铁道博主uid
 
 有意见或者建议也欢迎提交 [Issues](https://github.com/snowtafir/yuki-plugin/issues) 和 [Pull requests](https://github.com/snowtafir/yuki-plugin/pulls)。
 
+> [!TIP] 
+> 1. main、main3分支为编译分支，请勿直接在该分支上进行开发，请使用dev、dev3、npm分支进行同步开发，并提交Pull requests。
+> 2. 提交PR后由管理员审核，审核成功并合并后会自动进行github actions编译，最终提交编译好的代码到main、main3分支以及发布到npm。
+
 # 🌟 六、license/声明
 - this project is inspired by [trss-xianxin-plugin](https://github.com/snowtafir/xianxin-plugin)
 - 基于  `MIT` 协议开源，但有如下额外限制：

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

@@ -26,7 +26,7 @@ class BiliTask {
         else if (resjson.code === -352) {
             await postGateway(cookie);
             if (count < 3) {
-                await new Promise((resolve) => setTimeout(resolve, Math.floor(Math.random() * (10500 - 2000 + 1) + 2000))); // 随机延时2-10.5秒
+                await this.randomDelay(2000, 8000); // 随机延时2-8秒
                 await this.hendleEventDynamicData(uid, count + 1);
                 logger.error(`获取 ${uid} 动态，Gateway count：${String(count)}`);
             }
@@ -58,6 +58,7 @@ class BiliTask {
      * @param lastLiveStatus 最后直播状态
      */
     async processBiliData(biliPushData, uidMap, dynamicList, lastLiveStatus) {
+        const requestedDataOfUids = new Map(); // 存放已请求的 uid 映射
         for (let chatType in biliPushData) { // 遍历 group 和 private
             if (!uidMap.has(chatType)) {
                 uidMap.set(chatType, new Map());
@@ -69,7 +70,15 @@ class BiliTask {
                     if (!lastLiveStatus[subInfoOfup.uid]) {
                         lastLiveStatus[subInfoOfup.uid] = 0;
                     }
-                    const resp = await this.hendleEventDynamicData(subInfoOfup.uid);
+                    let resp;
+                    // 检查是否已经请求过该 uid
+                    if (requestedDataOfUids.has(subInfoOfup.uid)) {
+                        resp = requestedDataOfUids.get(subInfoOfup.uid); // 从已请求的映射中获取响应数据
+                    }
+                    else {
+                        resp = await this.hendleEventDynamicData(subInfoOfup.uid);
+                        requestedDataOfUids.set(subInfoOfup.uid, resp); // 将响应数据存储到映射中
+                    }
                     if (resp) {
                         if (resp.code === 0) {
                             const dynamicData = resp.data?.items || [];
@@ -92,10 +101,11 @@ class BiliTask {
                     const bot_id = subInfoOfup.bot_id || [];
                     const { name, type } = subInfoOfup;
                     chatTypeMap.set(subInfoOfup.uid, { chatIds, bot_id, upName: name, type });
-                    await new Promise((resolve) => setTimeout(resolve, Math.floor(Math.random() * (8000 - 2000 + 1) + 2000))); // 随机延时2-8秒
+                    await this.randomDelay(1000, 4000); // 随机延时1-4秒
                 }
             }
         }
+        requestedDataOfUids.clear(); // 清空已请求的映射
     }
     /**
      * 推送动态消息
@@ -137,7 +147,7 @@ class BiliTask {
                             if (type && type.length && !type.includes(pushDynamicData.type))
                                 continue; // 如果禁用了某类型的动态推送，跳过当前循环
                             await this.sendDynamic(chatId, bot_id, upName, pushDynamicData, biliConfigData, chatType); // 发送动态消息
-                            await new Promise((resolve) => setTimeout(resolve, Math.floor(Math.random() * (6500 - 2000 + 1) + 2000))); // 随机延时2-6.5秒
+                            await this.randomDelay(1000, 2000); // 随机延时1-2秒
                         }
                     }
                 }
@@ -190,7 +200,7 @@ class BiliTask {
             for (let i = 0; i < imgs.length; i++) {
                 const image = imgs[i];
                 await this.sendMessage(chatId, bot_id, chatType, Segment.image(image));
-                await new Promise((resolve) => setTimeout(resolve, Math.floor(Math.random() * (6500 - 2000 + 1) + 2000))); // 随机延时2-6.5秒
+                await this.randomDelay(1000, 2000); // 随机延时1-2秒
             }
             await new Promise((resolve) => setTimeout(resolve, 1000)); // 休眠1秒
         }

package/lib/models/weibo/weibo.task.js

@@ -32,6 +32,7 @@ class WeiboTask {
      * @param dynamicList 动态列表
      */
     async processWeiboData(weiboPushData, uidMap, dynamicList) {
+        const requestedDataOfUids = new Map(); // 存放已请求的 uid 映射
         for (let chatType in weiboPushData) { // 遍历 group 和 private
             if (!uidMap.has(chatType)) {
                 uidMap.set(chatType, new Map());
@@ -40,7 +41,15 @@ class WeiboTask {
             for (let chatId in weiboPushData[chatType]) {
                 const subUpsOfChat = Array.prototype.slice.call(weiboPushData[chatType][chatId] || []);
                 for (let subInfoOfup of subUpsOfChat) {
-                    const resp = await new WeiboGetWebData().getBloggerDynamicList(subInfoOfup.uid); // 获取指定 uid 的动态列表
+                    let resp;
+                    // 检查是否已经请求过该 uid
+                    if (requestedDataOfUids.has(subInfoOfup.uid)) {
+                        resp = requestedDataOfUids.get(subInfoOfup.uid); // 从已请求的映射中获取响应数据
+                    }
+                    else {
+                        resp = await await new WeiboGetWebData().getBloggerDynamicList(subInfoOfup.uid); // 获取指定 uid 的动态列表
+                        requestedDataOfUids.set(subInfoOfup.uid, resp); // 将响应数据存储到映射中
+                    }
                     if (resp) {
                         const dynamicData = resp || [];
                         dynamicList[subInfoOfup.uid] = dynamicData;
@@ -53,6 +62,7 @@ class WeiboTask {
                 }
             }
         }
+        requestedDataOfUids.clear(); // 清空已请求的映射
     }
     /**
      * 推送动态消息
@@ -95,7 +105,7 @@ class WeiboTask {
                             if (type && type.length && !type.includes(pushDynamicData.type))
                                 continue; // 如果禁用了某类型的动态推送，跳过当前循环
                             await this.sendDynamic(chatId, bot_id, upName, pushDynamicData, weiboConfigData, chatType); // 发送动态消息
-                            await this.randomDelay(2000, 10500); // 随机延时2-10.5秒
+                            await this.randomDelay(1000, 2000); // 随机延时1-2秒
                         }
                     }
                 }
@@ -156,9 +166,9 @@ class WeiboTask {
             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(2000, 6500); // 随机延时2-6.5秒
+                await this.randomDelay(1000, 2000); // 随机延时1-2秒
             }
-            await this.randomDelay(1000, 2000);
+            await new Promise((resolve) => setTimeout(resolve, 1000));
         }
         else {
             const dynamicMsg = await WeiboQuery.formatTextDynamicData(upName, pushDynamicData, false, weiboConfigData); //构建文字动态消息
@@ -173,7 +183,7 @@ class WeiboTask {
                 }
             }
             await this.sendMessage(chatId, bot_id, chatType, dynamicMsg);
-            await this.randomDelay(1000, 2000);
+            await new Promise((resolve) => setTimeout(resolve, 1000));
         }
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yz-yuki-plugin",
-  "version": "2.0.4-6",
+  "version": "2.0.4-7",
   "description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
   "author": "snowtafir",
   "type": "module",