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

package/lib/models/bilibili/{bilibili.models.js → bilibili.main.models.js}

@@ -9,9 +9,9 @@ import YAML from 'yaml';
 import { Segment, Bot, Redis } from 'yunzaijs';
 import { renderPage } from '../../utils/image.js';
 import { _paths } from '../../utils/paths.js';
-import { BiliApi } from './bilibili.api.js';
-import { gen_buvid_fp } from './bilibili.buid.fp.js';
-import { getBiliTicket } from './bilibili.ticket.js';
+import BiliApi from './bilibili.main.api.js';
+import { gen_buvid_fp } from './bilibili.risk.buid.fp.js';
+import { getBiliTicket } from './bilibili.risk.ticket.js';
 
 /**
  * *******************************************************************
@@ -61,8 +61,8 @@ async function applyLoginQRCode(e) {
         return qrcodeKey;
     }
     else {
-        e.reply(`获取B站登录二维码失败: ${res.data?.message}`);
-        throw new Error(`获取B站登录二维码失败: ${res.data?.message}`);
+        e.reply(`获取B站登录二维码失败: ${JSON.stringify(res.data)}`);
+        throw new Error(`获取B站登录二维码失败: ${JSON.stringify(res.data)}`);
     }
 }
 /**处理扫码结果 */
@@ -81,8 +81,17 @@ async function pollLoginQRCode(e, qrcodeKey) {
         if (data.data.code === 0) {
             // 登录成功，获取 cookie
             const LoginCookie = response.headers.get('set-cookie');
+            let loginCk = '';
+            try {
+                const nomalCk = await getNewTempCk();
+                loginCk = `${nomalCk}${LoginCookie}`;
+            }
+            catch (error) {
+                loginCk = LoginCookie;
+                logger.debug(`优纪插件: 获取B站登录ck缺失部分: ${error}`);
+            }
             e.reply(`~B站登陆成功~`);
-            return LoginCookie;
+            return loginCk;
         }
         else if (data.data.code === 86101) {
             // 未扫码
@@ -115,26 +124,33 @@ async function pollLoginQRCode(e, qrcodeKey) {
 /**查看app扫码登陆获取的ck的有效状态*/
 async function checkBiliLogin(e) {
     const LoginCookie = await readLoginCookie();
-    const res = await fetch('https://api.bilibili.com/x/web-interface/nav', {
-        method: 'GET',
-        headers: lodash.merge(BiliApi.BIlIBILI_LOGIN_HEADERS, { 'User-agent': BiliApi.BILIBILI_HEADERS['User-Agent'] }, { Cookie: `${LoginCookie}` }),
-        redirect: 'follow'
-    });
-    const resData = await res.json();
-    Bot.logger?.debug(`B站验证登录状态:${JSON.stringify(resData)}`);
-    if (resData.code === 0) {
-        let uname = resData.data?.uname;
-        let mid = resData.data?.mid;
-        let money = resData.data?.money;
-        let level_info = resData.data?.level_info;
-        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}`);
+    if (String(LoginCookie).trim().length < 10) {
+        e.reply('啊咧？B站登录CK呢？哦，没 #扫码B站登录# 或失效了啊，那没事了。');
+        return;
     }
     else {
-        // 处理其他情况
-        return;
+        const res = await fetch('https://api.bilibili.com/x/web-interface/nav', {
+            method: 'GET',
+            headers: lodash.merge(BiliApi.BIlIBILI_LOGIN_HEADERS, { 'User-agent': BiliApi.BILIBILI_HEADERS['User-Agent'] }, { Cookie: `${LoginCookie}` }),
+            redirect: 'follow'
+        });
+        const resData = await res.json();
+        Bot?.logger?.debug(`B站验证登录状态:${JSON.stringify(resData)}`);
+        if (resData.code === 0) {
+            let uname = resData.data?.uname;
+            let mid = resData.data?.mid;
+            let money = resData.data?.money;
+            let level_info = resData.data?.level_info;
+            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}`);
+        }
+        else {
+            // 处理其他情况
+            e.reply('意外情况，未能成功获取登录ck的有效状态');
+            return;
+        }
     }
 }
 /**退出B站账号登录，将会删除redis缓存的LoginCK，并在服务器注销该登录 Token (SESSDATA)*/
@@ -245,7 +261,22 @@ async function saveLocalBiliCk(data) {
 async function readTempCk() {
     const CK_KEY = 'Yz:yuki:bili:tempCookie';
     const tempCk = await Redis.get(CK_KEY);
-    return tempCk ?? '';
+    if (!tempCk) {
+        const newTempCk = await getNewTempCk();
+        await saveTempCk(newTempCk);
+        const result = await postGateway(newTempCk);
+        const data = await result.data; // 解析校验结果
+        if (data?.code !== 0) {
+            logger?.error(`优纪插件：tempCK，Gateway校验失败：${JSON.stringify(data)}`);
+        }
+        else if (data?.code === 0) {
+            logger?.mark(`优纪插件：tempCK，Gateway校验成功：${JSON.stringify(data)}`);
+        }
+        return newTempCk;
+    }
+    else {
+        return tempCk;
+    }
 }
 /**保存tempCK*/
 async function saveTempCk(newTempCk) {
@@ -362,231 +393,26 @@ async function getBuvid3_4(uuid) {
 /**获取新的tempCK*/
 async function getNewTempCk() {
     const uuid = await genUUID();
+    const b_nut = `b_nut=${Date.now() / 1000};`;
     const buvid3_buvid4 = await getBuvid3_4(uuid);
     const b_lsid = await gen_b_lsid();
-    //const buvid_fp = await get_buvid_fp(uuid);
-    let newTempCk = `${uuid}${buvid3_buvid4}${b_lsid}`; //${buvid_fp}`;
-    await saveTempCk(newTempCk);
-    const result = await postGateway(newTempCk);
-    const data = await result.data; // 解析校验结果
-    if (data?.code !== 0) {
-        logger?.error(`优纪插件：tempCK，Gateway校验失败：${JSON.stringify(data)}`);
-    }
-    else if (data?.code === 0) {
-        logger?.mark(`优纪插件：tempCK，Gateway校验成功：${JSON.stringify(data)}`);
-    }
+    const buvid_fp = await get_buvid_fp(uuid);
+    return `${uuid}${buvid3_buvid4}${b_lsid}${buvid_fp}${b_nut}`;
 }
 /**
  * *******************************************************************
  * 风控相关函数
  * *******************************************************************
  */
-/**获取GatWay payload */
-async function getPayload(cookie) {
-    const payloadOriginData = {
-        '3064': 1, // ptype, mobile => 2, others => 1
-        '5062': `${Date.now()}`, // timestamp
-        '03bf': 'https://www.bilibili.com/', // url accessed
-        '39c8': '333.999.fp.risk',
-        '34f1': '', // target_url, default empty now
-        'd402': '', // screenx, default empty
-        '654a': '', // screeny, default empty
-        '6e7c': '878x1066', // browser_resolution, window.innerWidth || document.body && document.body.clientWidth + "x" + window.innerHeight || document.body && document.body.clientHeight
-        '3c43': {
-            // 3c43 => msg
-            '2673': 0, // hasLiedResolution, window.screen.width < window.screen.availWidth || window.screen.height < window.screen.availHeight
-            '5766': 24, // colorDepth, window.screen.colorDepth
-            '6527': 0, // addBehavior, !!window.HTMLElement.prototype.addBehavior, html5 api
-            '7003': 1, // indexedDb, !!window.indexedDB, html5 api
-            '807e': 1, // cookieEnabled, navigator.cookieEnabled
-            'b8ce': BiliApi.BILIBILI_HEADERS['User-Agent'], // ua "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:127.0) Gecko/20100101 Firefox/127.0",
-            '641c': 0, // webdriver, navigator.webdriver, like Selenium
-            '07a4': 'zh-CN', // language
-            '1c57': 'not available', // deviceMemory in GB, navigator.deviceMemory
-            '0bd0': 16, // hardwareConcurrency, navigator.hardwareConcurrency
-            '748e': [1920, 1200], // window.screen.width window.screen.height
-            'd61f': [1920, 1152], // window.screen.availWidth window.screen.availHeight
-            'fc9d': -480, // timezoneOffset, (new Date).getTimezoneOffset()
-            '6aa9': 'Asia/Shanghai', //Intl.DateTimeFormat().resolvedOptions().timeZone, // timezone, (new window.Intl.DateTimeFormat).resolvedOptions().timeZone
-            '75b8': 1, // sessionStorage, window.sessionStorage, html5 api
-            '3b21': 1, // localStorage, window.localStorage, html5 api
-            '8a1c': 0, // openDatabase, window.openDatabase, html5 api
-            'd52f': 'not available', // cpuClass, navigator.cpuClass
-            'adca': BiliApi.BILIBILI_HEADERS['User-Agent'].includes('Windows') ? 'Win32' : 'Linux', // platform, navigator.platform
-            '80c9': [
-                [
-                    'PDF Viewer',
-                    'Portable Document Format',
-                    [
-                        ['application/pdf', 'pdf'],
-                        ['text/pdf', 'pdf']
-                    ]
-                ],
-                [
-                    'Chrome PDF Viewer',
-                    'Portable Document Format',
-                    [
-                        ['application/pdf', 'pdf'],
-                        ['text/pdf', 'pdf']
-                    ]
-                ],
-                [
-                    'Chromium PDF Viewer',
-                    'Portable Document Format',
-                    [
-                        ['application/pdf', 'pdf'],
-                        ['text/pdf', 'pdf']
-                    ]
-                ],
-                [
-                    'Microsoft Edge PDF Viewer',
-                    'Portable Document Format',
-                    [
-                        ['application/pdf', 'pdf'],
-                        ['text/pdf', 'pdf']
-                    ]
-                ],
-                [
-                    'WebKit built-in PDF',
-                    'Portable Document Format',
-                    [
-                        ['application/pdf', 'pdf'],
-                        ['text/pdf', 'pdf']
-                    ]
-                ]
-            ], // plugins
-            '13ab': 'f3YAAAAASUVORK5CYII=', // canvas fingerprint
-            'bfe9': 'kABYpRAGAVYzWJooB9Bf4P+UortSvxRY0AAAAASUVORK5CYII=', // webgl_str
-            'a3c1': [
-                'extensions:ANGLE_instanced_arrays;EXT_blend_minmax;EXT_color_buffer_half_float;EXT_float_blend;EXT_frag_depth;EXT_shader_texture_lod;EXT_sRGB;EXT_texture_compression_bptc;EXT_texture_compression_rgtc;EXT_texture_filter_anisotropic;OES_element_index_uint;OES_fbo_render_mipmap;OES_standard_derivatives;OES_texture_float;OES_texture_float_linear;OES_texture_half_float;OES_texture_half_float_linear;OES_vertex_array_object;WEBGL_color_buffer_float;WEBGL_compressed_texture_s3tc;WEBGL_compressed_texture_s3tc_srgb;WEBGL_debug_renderer_info;WEBGL_debug_shaders;WEBGL_depth_texture;WEBGL_draw_buffers;WEBGL_lose_context;WEBGL_provoking_vertex',
-                'webgl aliased line width range:[1, 1]',
-                'webgl aliased point size range:[1, 1024]',
-                'webgl alpha bits:8',
-                'webgl antialiasing:yes',
-                'webgl blue bits:8',
-                'webgl depth bits:24',
-                'webgl green bits:8',
-                'webgl max anisotropy:16',
-                'webgl max combined texture image units:32',
-                'webgl max cube map texture size:16384',
-                'webgl max fragment uniform vectors:1024',
-                'webgl max render buffer size:16384',
-                'webgl max texture image units:16',
-                'webgl max texture size:16384',
-                'webgl max varying vectors:30',
-                'webgl max vertex attribs:16',
-                'webgl max vertex texture image units:16',
-                'webgl max vertex uniform vectors:4096',
-                'webgl max viewport dims:[32767, 32767]',
-                'webgl red bits:8',
-                'webgl renderer:ANGLE (Intel, Intel(R) HD Graphics Direct3D11 vs_5_0 ps_5_0), or similar',
-                'webgl shading language version:WebGL GLSL ES 1.0',
-                'webgl stencil bits:0',
-                'webgl vendor:Mozilla',
-                'webgl version:WebGL 1.0',
-                'webgl unmasked vendor:Google Inc. (Intel)',
-                'webgl unmasked renderer:ANGLE (Intel, Intel(R) HD Graphics Direct3D11 vs_5_0 ps_5_0), or similar',
-                'webgl vertex shader high float precision:23',
-                'webgl vertex shader high float precision rangeMin:127',
-                'webgl vertex shader high float precision rangeMax:127',
-                'webgl vertex shader medium float precision:23',
-                'webgl vertex shader medium float precision rangeMin:127',
-                'webgl vertex shader medium float precision rangeMax:127',
-                'webgl vertex shader low float precision:23',
-                'webgl vertex shader low float precision rangeMin:127',
-                'webgl vertex shader low float precision rangeMax:127',
-                'webgl fragment shader high float precision:23',
-                'webgl fragment shader high float precision rangeMin:127',
-                'webgl fragment shader high float precision rangeMax:127',
-                'webgl fragment shader medium float precision:23',
-                'webgl fragment shader medium float precision rangeMin:127',
-                'webgl fragment shader medium float precision rangeMax:127',
-                'webgl fragment shader low float precision:23',
-                'webgl fragment shader low float precision rangeMin:127',
-                'webgl fragment shader low float precision rangeMax:127',
-                'webgl vertex shader high int precision:0',
-                'webgl vertex shader high int precision rangeMin:31',
-                'webgl vertex shader high int precision rangeMax:30',
-                'webgl vertex shader medium int precision:0',
-                'webgl vertex shader medium int precision rangeMin:31',
-                'webgl vertex shader medium int precision rangeMax:30',
-                'webgl vertex shader low int precision:0',
-                'webgl vertex shader low int precision rangeMin:31',
-                'webgl vertex shader low int precision rangeMax:30',
-                'webgl fragment shader high int precision:0',
-                'webgl fragment shader high int precision rangeMin:31',
-                'webgl fragment shader high int precision rangeMax:30',
-                'webgl fragment shader medium int precision:0',
-                'webgl fragment shader medium int precision rangeMin:31',
-                'webgl fragment shader medium int precision rangeMax:30',
-                'webgl fragment shader low int precision:0',
-                'webgl fragment shader low int precision rangeMin:31',
-                'webgl fragment shader low int precision rangeMax:30'
-            ], // webgl_params, cab be set to [] if webgl is not supported
-            '6bc5': 'Google Inc. (Intel)~ANGLE (Intel, Intel(R) HD Graphics Direct3D11 vs_5_0 ps_5_0), or similar', // webglVendorAndRenderer
-            'ed31': 0,
-            '72bd': 0,
-            '097b': 0,
-            '52cd': [0, 0, 0],
-            'a658': [
-                'Arial',
-                'Arial Black',
-                'Calibri',
-                'Cambria',
-                'Cambria Math',
-                'Comic Sans MS',
-                'Consolas',
-                'Courier',
-                'Courier New',
-                'Georgia',
-                'Helvetica',
-                'Impact',
-                'Lucida Console',
-                'Lucida Sans Unicode',
-                'Microsoft Sans Serif',
-                'MS Gothic',
-                'MS PGothic',
-                'MS Sans Serif',
-                'MS Serif',
-                'Palatino Linotype',
-                'Segoe Print',
-                'Segoe Script',
-                'Segoe UI',
-                'Segoe UI Light',
-                'Segoe UI Symbol',
-                'Tahoma',
-                'Times',
-                'Times New Roman',
-                'Trebuchet MS',
-                'Verdana',
-                'Wingdings'
-            ],
-            'd02f': '35.749972093850374'
-        },
-        '54ef': {
-            'in_new_ab ': true,
-            'ab_version ': {
-                'waterfall_article ': 'SHOW '
-            },
-            'ab_split_num ': {
-                'waterfall_article ': 0
-            }
-        },
-        '8b94': '',
-        'df35': `${await readSavedCookieItems(cookie, ['_uuid'], false)}`, // _uuid, set from cookie, generated by client side(algorithm remains unknown)
-        '07a4': 'zh-CN',
-        '5f45': null,
-        'db46': 0
-    };
-    return JSON.stringify(payloadOriginData);
-}
 /**
  * 请求参数POST接口(ExClimbWuzhi)过校验
  * @param cookie 请求所需的cookie
  * @returns 返回POST请求的结果
  */
 async function postGateway(cookie) {
-    const data = { payload: await getPayload(cookie) };
+    const _uuid = await readSavedCookieItems(cookie, ['_uuid'], false);
+    const payloadJsonData = await BiliApi.BILIBILI_BROWSER_DATA(_uuid);
+    const data = { payload: JSON.stringify(payloadJsonData) };
     const requestUrl = 'https://api.bilibili.com/x/internal/gaia-gateway/ExClimbWuzhi';
     const config = {
         headers: lodash.merge({}, BiliApi.BILIBILI_HEADERS, {
@@ -612,8 +438,8 @@ async function postGateway(cookie) {
  */
 async function get_buvid_fp(cookie) {
     const uuid = await readSavedCookieItems(cookie, ['_uuid'], false);
-    const seedget = Math.floor(Math.random() * (60 - 1 + 1) + 1);
-    let buvidFp = gen_buvid_fp(uuid, seedget);
+    const fingerprintData = BiliApi.BILIBILI_FINGERPRINT_DATA(uuid);
+    const buvidFp = gen_buvid_fp(fingerprintData);
     return `buvid_fp=${buvidFp};`;
 }
 /**

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

@@ -1,7 +1,7 @@
 import moment from 'moment';
 import { Bot, Segment } from 'yunzaijs';
-import { readSyncCookie, cookieWithBiliTicket } from './bilibili.models.js';
-import { BiliApi } from './bilibili.api.js';
+import { readSyncCookie, cookieWithBiliTicket } from './bilibili.main.models.js';
+import BiliApi from './bilibili.main.api.js';
 import axios from 'axios';
 import lodash from 'lodash';
 
@@ -26,7 +26,7 @@ class BiliQuery {
                 desc = data?.modules?.module_dynamic?.major?.archive || {};
                 formatData.data.title = desc?.title;
                 formatData.data.content = this.parseRichTextNodes(desc?.desc);
-                formatData.data.url = this.formatUrl(desc?.jump_url);
+                formatData.data.url = this.formatUrl(desc?.jump_url) || '';
                 formatData.data.pubTime = author.pub_time;
                 formatData.data.pubTs = moment(author.pub_ts * 1000).format('YYYY年MM月DD日 HH:mm:ss');
                 formatData.data.category = '视频动态';
@@ -146,7 +146,7 @@ class BiliQuery {
                     formatData.data.pics = pics;
                     formatData.data.content = '';
                 }
-                formatData.data.url = this.formatUrl(desc?.jump_url);
+                formatData.data.url = this.formatUrl(desc?.jump_url) || '';
                 formatData.data.pubTime = author.pub_time;
                 formatData.data.pubTs = moment(author.pub_ts * 1000).format('YYYY年MM月DD日 HH:mm:ss');
                 formatData.data.category = '文章动态';
@@ -272,7 +272,7 @@ class BiliQuery {
         }
         catch (err) {
             logger?.error(`优纪插件：获取B站完整文章内容失败 [ ${postUrl} ] : ${err}`);
-            return null;
+            return { readInfo: null, articleType: null };
         }
     }
     /**解析旧版完整文章内容 */
@@ -372,7 +372,7 @@ class BiliQuery {
      */
     static async formatTextDynamicData(upName, data, isForward, setData) {
         const BiliDrawDynamicLinkUrl = 'https://m.bilibili.com/dynamic/';
-        let desc, msg, pics, author, majorType, content, dynamicTitle;
+        let desc, msg = [], pics = [], author, majorType, content, dynamicTitle;
         let title = `B站【${upName}】动态推送：\n`;
         switch (data.type) {
             case 'DYNAMIC_TYPE_AV':
@@ -388,10 +388,10 @@ class BiliQuery {
                     `标题：${desc.title}\n`,
                     `${desc.desc}\n`,
                     `链接：${this.formatUrl(desc.jump_url)}\n`,
-                    `时间：${author ? moment(author.pub_ts * 1000).format('YYYY年MM月DD日 HH:mm:ss') : ''}\n`,
-                    Segment.image(desc?.cover)
+                    `时间：${author ? moment(author.pub_ts * 1000).format('YYYY年MM月DD日 HH:mm:ss') : ''}`
                 ];
-                return msg;
+                pics = [Segment.image(desc?.cover)];
+                return { msg, pics };
             case 'DYNAMIC_TYPE_WORD':
                 // 处理文字动态
                 author = data?.modules?.module_author;
@@ -421,7 +421,7 @@ class BiliQuery {
                     `链接：${BiliDrawDynamicLinkUrl}${data.id_str}\n`,
                     `时间：${author ? moment(author.pub_ts * 1000).format('YYYY年MM月DD日 HH:mm:ss') : ''}`
                 ];
-                return msg;
+                return { msg, pics };
             case 'DYNAMIC_TYPE_DRAW':
                 // 处理图文动态
                 author = data?.modules?.module_author;
@@ -465,10 +465,9 @@ class BiliQuery {
                     `-----------------------------\n`,
                     `${this.dynamicContentLimit(content, setData)}\n`,
                     `链接：${BiliDrawDynamicLinkUrl}${data.id_str}\n`,
-                    `时间：${author ? moment(author.pub_ts * 1000).format('YYYY年MM月DD日 HH:mm:ss') : ''}\n`,
-                    ...pics
+                    `时间：${author ? moment(author.pub_ts * 1000).format('YYYY年MM月DD日 HH:mm:ss') : ''}`
                 ];
-                return msg;
+                return { msg, pics };
             case 'DYNAMIC_TYPE_ARTICLE':
                 // 处理文章动态
                 author = data?.modules?.module_author;
@@ -509,10 +508,9 @@ class BiliQuery {
                     `-----------------------------\n`,
                     `标题：${dynamicTitle}\n`,
                     `链接：${this.formatUrl(desc.jump_url)}\n`,
-                    `时间：${author ? moment(author.pub_ts * 1000).format('YYYY年MM月DD日 HH:mm:ss') : ''}\n`,
-                    ...pics
+                    `时间：${author ? moment(author.pub_ts * 1000).format('YYYY年MM月DD日 HH:mm:ss') : ''}`
                 ];
-                return msg;
+                return { msg, pics };
             case 'DYNAMIC_TYPE_FORWARD':
                 // 处理转发动态
                 author = data?.modules?.module_author;
@@ -524,11 +522,13 @@ class BiliQuery {
                     return;
                 isForward = true;
                 let orig = await this.formatTextDynamicData(upName, data.orig, isForward, setData);
-                if (orig && orig.length) {
-                    orig = orig.slice(2);
+                let origContent = [];
+                if (orig && typeof orig === 'object') {
+                    origContent = orig.msg.slice(2);
+                    pics = orig.pics;
                 }
                 else {
-                    return false;
+                    return 'continue';
                 }
                 title = `B站【${upName}】转发动态推送：\n`;
                 msg = [
@@ -538,9 +538,9 @@ class BiliQuery {
                     `链接：${BiliDrawDynamicLinkUrl}${data.id_str}\n`,
                     `时间：${author ? moment(author.pub_ts * 1000).format('YYYY年MM月DD日 HH:mm:ss') : ''}\n`,
                     '\n---以下为转发内容---\n',
-                    ...orig
+                    ...origContent
                 ];
-                return msg;
+                return { msg, pics };
             case 'DYNAMIC_TYPE_LIVE_RCMD':
                 // 处理直播动态
                 desc = data?.modules?.module_dynamic?.major?.live_rcmd?.content;
@@ -551,8 +551,9 @@ class BiliQuery {
                 if (!desc)
                     return;
                 title = `B站【${upName}】直播动态推送：\n`;
-                msg = [title, `-----------------------------\n`, `标题：${desc.title}\n`, `链接：https:${desc.link}\n`, Segment.image(desc.cover)];
-                return msg;
+                msg = [title, `-----------------------------\n`, `标题：${desc.title}\n`, `链接：https:${desc.link}`];
+                pics = [Segment.image(desc.cover)];
+                return { msg, pics };
             default:
                 // 处理未定义的动态类型
                 (Bot.logger ?? logger)?.mark(`未处理的B站推送【${upName}】：${data.type}`);

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

@@ -2,9 +2,9 @@ import QRCode from 'qrcode';
 import { Redis, Bot, Segment } from 'yunzaijs';
 import Config from '../../utils/config.js';
 import { renderPage } from '../../utils/image.js';
-import { BiliGetWebData } from './bilibili.get.web.data.js';
-import { readSyncCookie, postGateway } from './bilibili.models.js';
-import { BiliQuery } from './bilibili.query.js';
+import { BiliGetWebData } from './bilibili.main.get.web.data.js';
+import { readSyncCookie, postGateway } from './bilibili.main.models.js';
+import { BiliQuery } from './bilibili.main.query.js';
 
 class BiliTask {
     taskName;
@@ -22,7 +22,7 @@ class BiliTask {
         const resjson = await resp.data;
         if (!resjson || resjson.code !== 0 || resjson.code === -352) {
             await postGateway(cookie);
-            if (count < 3) {
+            if (count < 2) {
                 await this.randomDelay(2000, 8000); // 随机延时2-8秒
                 await this.hendleEventDynamicData(uid, count + 1);
                 logger.error(`获取 ${uid} 动态，Gateway count：${String(count)}`);
@@ -78,11 +78,11 @@ class BiliTask {
                                 dynamicList[subInfoOfup.uid] = dynamicData;
                             }
                             else if (resp.code === -352) {
-                                logger.error(`获取 ${subInfoOfup.uid} 动态失败，resCode：-352`);
-                                continue;
+                                logger.error(`获取 ${subInfoOfup.uid} 动态失败，resCode：-352，请待下次任务自动重试`);
+                                return;
                             }
                             else if (resp.code !== 0) {
-                                logger.error(`获取 ${subInfoOfup.uid} 动态失败，resCode：${resp.code}`);
+                                logger.error(`获取 ${subInfoOfup.uid} 动态失败，resCode：${resp.code}，请待下次任务自动重试`);
                                 return;
                             }
                         }
@@ -191,7 +191,7 @@ class BiliTask {
             let imgs = await this.renderDynamicCard(uid, renderData, ScreenshotOptionsData);
             if (!imgs)
                 return;
-            Redis.set(`${markKey}${chatId}:${id_str}`, '1', { EX: 3600 * 10 }); // 设置已发送标记
+            Redis.set(`${markKey}${chatId}:${id_str}`, '1', { EX: 3600 * 72 }); // 设置已发送标记
             (logger ?? Bot.logger)?.mark('优纪插件：B站动态执行推送');
             for (let i = 0; i < imgs.length; i++) {
                 const image = imgs[i];
@@ -202,17 +202,24 @@ class BiliTask {
         }
         else {
             const dynamicMsg = await BiliQuery.formatTextDynamicData(upName, pushDynamicData, false, biliConfigData); // 构建图文动态消息
-            Redis.set(`${markKey}${chatId}:${id_str}`, '1', { EX: 3600 * 10 }); // 设置已发送标记
+            Redis.set(`${markKey}${chatId}:${id_str}`, '1', { EX: 3600 * 72 }); // 设置已发送标记
             if (dynamicMsg == 'continue') {
                 return 'return'; // 如果动态消息构建失败，则直接返回
             }
             if (biliConfigData.banWords.length > 0) {
                 const banWords = new RegExp(biliConfigData.banWords.join('|'), 'g'); // 构建屏蔽关键字正则表达式
-                if (banWords.test(dynamicMsg.join(''))) {
+                if (banWords.test(dynamicMsg.msg.join(''))) {
                     return 'return'; // 如果动态消息包含屏蔽关键字，则直接返回
                 }
             }
-            await this.sendMessage(chatId, bot_id, chatType, dynamicMsg);
+            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));
         }
     }