yz-yuki-plugin 2.0.6-6 → 2.0.6-8

package/lib/apps/weibo.js

@@ -1,8 +1,8 @@
 import { Messages } from 'yunzaijs';
-import { WeiboQuery } from '../models/weibo/weibo.query.js';
-import { WeiboTask } from '../models/weibo/weibo.task.js';
+import { WeiboQuery } from '../models/weibo/weibo.main.query.js';
+import { WeiboTask } from '../models/weibo/weibo.main.task.js';
 import Config from '../utils/config.js';
-import { WeiboGetWebData } from '../models/weibo/weibo.get.web.data.js';
+import { WeiboGetWebData } from '../models/weibo/weibo.main.get.web.data.js';
 
 const message = new Messages('message');
 let weiboPushData = Config.getConfigData('config', 'weibo', 'push');

package/lib/index.js

@@ -5,7 +5,7 @@ import path from 'path';
 import { _paths } from './utils/paths.js';
 import * as index$1 from './apps/index.js';
 import { BiliTask } from './models/bilibili/bilibili.main.task.js';
-import { WeiboTask } from './models/weibo/weibo.task.js';
+import { WeiboTask } from './models/weibo/weibo.main.task.js';
 
 const yukiPluginVersion = Config.getPackageJsonKey('version', path.join(_paths.pluginPath, 'package.json'));
 let biliConfigData = Config.getConfigData('config', 'bilibili', 'config');

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

@@ -37,6 +37,7 @@ class BiliTask {
         let biliConfigData = await Config.getUserConfig('bilibili', 'config');
         let biliPushData = await Config.getUserConfig('bilibili', 'push');
         let interval = biliConfigData?.interval || 7200;
+        logger.debug(`当前B站功能配置：${JSON.stringify(biliConfigData)}`);
         const uidMap = new Map(); // 存放group 和 private 对应所属 uid 与推送信息的映射
         const dynamicList = {}; // 存放获取的所有动态，键为 uid，值为动态数组
         await this.processBiliData(biliPushData, biliConfigData, uidMap, dynamicList);
@@ -172,10 +173,11 @@ class BiliTask {
         }
         if (sended)
             return; // 如果已经发送过，则直接返回
-        let liveAtAll = biliConfigData.liveAtAll === true ? true : false; // 直播动态是否@全体成员，默认false
+        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) ? biliConfigData.liveAtAllGroupList : []); // 直播动态@全体成员的群组列表，默认空数组，为空则不进行@全体成员操作
+        // 直播动态@全体成员的群组列表，默认空数组，为空则不进行@全体成员操作
+        let liveAtAllGroupList = new Set(Array.isArray(biliConfigData?.liveAtAllGroupList) ? Array.from(biliConfigData.liveAtAllGroupList).map(item => String(item)) : []);
         if (!!biliConfigData.pushMsgMode) {
             const { data, uid } = await BiliQuery.formatDynamicData(pushDynamicData); // 处理动态数据
             const extentData = { ...data };
@@ -207,7 +209,7 @@ class BiliTask {
                 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(chatId)) {
+            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
@@ -238,9 +240,9 @@ class BiliTask {
                 }
             }
             let mergeTextPic = !!biliConfigData.mergeTextPic === false ? false : true; // 是否合并文本和图片，默认为 true
-            if (mergeTextPic) {
+            if (mergeTextPic === true) {
                 const mergeMsg = [...dynamicMsg.msg, ...dynamicMsg.pics];
-                if (liveAtAll && liveAtAllMark && dynamicMsg.dynamicType === 'DYNAMIC_TYPE_LIVE_RCMD' && liveAtAllGroupList.has(chatId)) {
+                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
@@ -253,7 +255,7 @@ class BiliTask {
                 await this.sendMessage(chatId, bot_id, chatType, mergeMsg);
             }
             else {
-                if (liveAtAll && liveAtAllMark && dynamicMsg.dynamicType === 'DYNAMIC_TYPE_LIVE_RCMD' && liveAtAllGroupList.has(chatId)) {
+                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

package/lib/models/bilibili/bilibili.risk.w_webid.js

@@ -7,7 +7,8 @@ import { readSyncCookie, cookieWithBiliTicket } from './bilibili.main.models.js'
 async function getWebId(uid) {
     const w_webid_key = 'Yz:yuki:bili:w_webid';
     const w_webid = await Redis.get(w_webid_key);
-    if (w_webid) {
+    const keyTTL = await Redis.ttl(w_webid_key);
+    if (w_webid && keyTTL < 259200) {
         return String(w_webid);
     }
     else {
@@ -28,8 +29,10 @@ async function getWebId(uid) {
             const decoded__RENDER_DATA__JsonString = decodeURIComponent(__RENDER_DATA__[1]);
             const accessIdRegex = /"access_id":"(.*?)"/;
             const access_id = decoded__RENDER_DATA__JsonString.match(accessIdRegex);
-            if (access_id && access_id[1]) {
-                await Redis.set(w_webid_key, access_id[1], { EX: 43197 * 1000 });
+            const ExpirationTimeRegex = /document.getElementById\("__RENDER_DATA__"\).*?setTimeout\(function\(\)\s*{window.location.reload\(true\);},\s*(\d+)\s*\*\s*(\d+)\);<\/script>/;
+            const ExpirationTime = htmlContent.match(ExpirationTimeRegex);
+            if (access_id && access_id[1] && ExpirationTime && ExpirationTime[1]) {
+                await Redis.set(w_webid_key, access_id[1], { EX: Number(ExpirationTime[1]) });
                 return String(access_id[1]);
             }
             else {

package/lib/models/weibo/{weibo.get.web.data.js → weibo.main.get.web.data.js}

@@ -1,6 +1,6 @@
 import axios from 'axios';
-import { WeiboApi } from './weibo.api.js';
-import { WeiboQuery } from './weibo.query.js';
+import { WeiboApi } from './weibo.main.api.js';
+import { WeiboQuery } from './weibo.main.query.js';
 
 class WeiboGetWebData {
     e;

package/lib/models/weibo/{weibo.query.js → weibo.main.query.js}

@@ -1,6 +1,6 @@
 import moment from 'moment';
 import fetch from 'node-fetch';
-import { WeiboApi } from './weibo.api.js';
+import { WeiboApi } from './weibo.main.api.js';
 import { Segment } from 'yunzaijs';
 import { JSDOM } from 'jsdom';
 

package/lib/models/weibo/{weibo.task.js → weibo.main.task.js}

@@ -2,8 +2,8 @@ import QRCode from 'qrcode';
 import { Redis, Segment, Bot } from 'yunzaijs';
 import Config from '../../utils/config.js';
 import { renderPage } from '../../utils/image.js';
-import { WeiboGetWebData } from './weibo.get.web.data.js';
-import { WeiboQuery } from './weibo.query.js';
+import { WeiboGetWebData } from './weibo.main.get.web.data.js';
+import { WeiboQuery } from './weibo.main.query.js';
 
 class WeiboTask {
     taskName;
@@ -19,6 +19,7 @@ class WeiboTask {
         let weiboConfigData = await Config.getUserConfig('weibo', 'config');
         let weiboPushData = await Config.getUserConfig('weibo', 'push');
         let interval = weiboConfigData.interval || 7200; // 推送间隔时间，单位为秒，默认2小时
+        logger.debug(`当前微博功能配置：${JSON.stringify(weiboConfigData)}`);
         const uidMap = new Map(); // 存放group 和 private 对应所属 uid 与推送信息的映射
         const dynamicList = {}; // 存放获取的所有动态，键为 uid，值为动态数组
         await this.processWeiboData(weiboPushData, uidMap, dynamicList);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yz-yuki-plugin",
-  "version": "2.0.6-6",
+  "version": "2.0.6-8",
   "description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
   "author": "snowtafir",
   "type": "module",
@@ -107,6 +107,6 @@
     "registry": "https://registry.npmjs.org"
   },
   "engines": {
-    "node": ">=16.14.0"
+    "node": ">=20"
   }
 }