yz-yuki-plugin 2.0.6-11 → 2.0.6-12

package/defaultConfig/bilibili/config.yaml

@@ -10,9 +10,9 @@ pushTime: '*/23  * * * *'
 
 # 请求头 User-Agent 列表。如出现 -352 风控，可尝试更换请求头，请根据需要自行添加或修改。可设置多个请求头，每次重启后会随机选择一个。获取方法请浏览器自行搜索。
 userAgentList:
-  - Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36
-  #- Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:131.0) Gecko/20100101 Firefox/131.0
-  #- Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 Edg/130.0.0.0
+  - Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36
+  #- Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:134.0) Gecko/20100101 Firefox/134.0
+  #- Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36 Edg/132.0.0.0
 
 # 推送监测间隔，单位为秒，默认7200秒即2小时，即以当前时间为基准，监测过去2小时内的动态，并推送。取值范围：3600-36000秒，即过去的1-10h。应大于pushTime的周期。
 interval: 7200

package/lib/apps/bilibili.js

@@ -5,7 +5,7 @@ import { BiliQuery } from '../models/bilibili/bilibili.main.query.js';
 import { BiliTask } from '../models/bilibili/bilibili.main.task.js';
 import Config from '../utils/config.js';
 import { BiliGetWebData } from '../models/bilibili/bilibili.main.get.web.data.js';
-import { applyLoginQRCode, pollLoginQRCode, saveLoginCookie, postGateway, exitBiliLogin, checkBiliLogin, readSavedCookieItems, saveLocalBiliCk, readSyncCookie, getNewTempCk, saveTempCk } from '../models/bilibili/bilibili.main.models.js';
+import { readLoginCookie, applyLoginQRCode, pollLoginQRCode, saveLoginCookie, postGateway, exitBiliLogin, checkBiliLogin, readSavedCookieItems, saveLocalBiliCk, readSyncCookie, getNewTempCk, saveTempCk } from '../models/bilibili/bilibili.main.models.js';
 
 const message = new Messages('message');
 let biliPushData = Config.getConfigData('config', 'bilibili', 'push');
@@ -167,38 +167,44 @@ message.use(async (e) => {
 }, [/^(#|\/)(yuki|优纪)?(取消|删除|del|DEL)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)推送\s*(视频\s*|图文\s*|文章\s*|转发\s*|直播\s*)*.*$/]);
 /** 扫码登录B站 */
 message.use(async (e) => {
-    if (e.isMaster) {
-        try {
-            const token = await applyLoginQRCode(e);
-            if (token) {
-                let biliLoginCk = await pollLoginQRCode(e, token);
-                if (biliLoginCk) {
-                    if (lodash.trim(biliLoginCk).length != 0) {
-                        await saveLoginCookie(e, biliLoginCk);
-                        e.reply(`get bilibili LoginCk：成功！`);
-                        const result = await postGateway(biliLoginCk); //激活ck
-                        const { code, data } = await result.data; // 解析校验结果
-                        switch (code) {
-                            case 0:
-                                global?.logger?.mark(`优纪插件：获取biliLoginCK，Gateway校验成功：${JSON.stringify(data)}`);
-                                break;
-                            default:
-                                global?.logger?.mark(`优纪插件：获取biliLoginCK，Gateway校验失败：${JSON.stringify(data)}`);
-                                break;
+    if (!e.isMaster) {
+        e.reply('未取得bot主人身份，无权限配置B站登录ck');
+    }
+    else {
+        const LoginCk = await readLoginCookie();
+        if (LoginCk) {
+            e.reply(`当前已有B站登录ck，请勿重复扫码！\n如需更换，请先删除当前登录再扫码：\n#yuki删除B站登录`);
+        }
+        else {
+            try {
+                const token = await applyLoginQRCode(e);
+                if (token) {
+                    let biliLoginCk = await pollLoginQRCode(e, token);
+                    if (biliLoginCk) {
+                        if (lodash.trim(biliLoginCk).length != 0) {
+                            await saveLoginCookie(e, biliLoginCk);
+                            e.reply(`get bilibili LoginCk：成功！`);
+                            const result = await postGateway(biliLoginCk); //激活ck
+                            const { code, data } = await result.data; // 解析校验结果
+                            switch (code) {
+                                case 0:
+                                    global?.logger?.mark(`优纪插件：获取biliLoginCK，Gateway校验成功：${JSON.stringify(data)}`);
+                                    break;
+                                default:
+                                    global?.logger?.mark(`优纪插件：获取biliLoginCK，Gateway校验失败：${JSON.stringify(data)}`);
+                                    break;
+                            }
+                        }
+                        else {
+                            e.reply(`get bilibili LoginCk：失败X﹏X`);
                         }
-                    }
-                    else {
-                        e.reply(`get bilibili LoginCk：失败X﹏X`);
                     }
                 }
             }
+            catch (Error) {
+                global?.logger?.info(`yuki-plugin Login bilibili Failed：${Error}`);
+            }
         }
-        catch (Error) {
-            global?.logger?.info(`yuki-plugin Login bilibili Failed：${Error}`);
-        }
-    }
-    else {
-        e.reply('未取得bot主人身份，无权限配置B站登录ck');
     }
 }, [/^(#|\/)(yuki|优纪)?(扫码|添加|ADD|add)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)登录$/]);
 /** 删除登陆的B站ck */

package/lib/apps/weibo.js

@@ -58,7 +58,7 @@ message.use(async (e) => {
         }
         const userInfo = data.userInfo || {};
         let name = uid;
-        if (userInfo.length !== 0) {
+        if (userInfo && userInfo.length !== 0) {
             name = userInfo.screen_name || uid;
         }
         // 添加新的推送数据

package/lib/components/dynamic/Footer.js

@@ -1,8 +1,8 @@
 import React from 'react';
-import { ConfigController, BOT_NAME } from 'yunzaijs';
+import { BOT_NAME, ConfigController } from 'yunzaijs';
 import Config from '../../utils/config.js';
 import path from 'path';
-import { _paths, createRequire } from '../../utils/paths.js';
+import { createRequire, _paths } from '../../utils/paths.js';
 
 // Footer.tsx
 const require = createRequire(import.meta.url);

package/lib/components/help/Help.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { BOT_NAME, ConfigController } from 'yunzaijs';
 import Config from '../../utils/config.js';
 import path from 'path';
-import { _paths, createRequire } from '../../utils/paths.js';
+import { createRequire, _paths } from '../../utils/paths.js';
 
 //help.tsx
 const require = createRequire(import.meta.url);

package/lib/components/version/Version.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { BOT_NAME, ConfigController } from 'yunzaijs';
 import Config from '../../utils/config.js';
 import path from 'path';
-import { _paths, createRequire } from '../../utils/paths.js';
+import { createRequire, _paths } from '../../utils/paths.js';
 
 const require = createRequire(import.meta.url);
 const botVersion = ConfigController.package?.version;

package/lib/index.js

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import { applicationOptions, setBotTask, useEvent } from 'yunzaijs';
+import { applicationOptions, useEvent, setBotTask } from 'yunzaijs';
 import Config from './utils/config.js';
 import path from 'path';
 import { _paths } from './utils/paths.js';

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

@@ -8,7 +8,7 @@ class BiliApi {
         this.USER_AGENT = BiliApi.BILIBILI_USER_AGENT;
         this.initialize();
     }
-    static BILIBILI_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36';
+    static BILIBILI_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();

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站账号已登陆~，有效期至：${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

@@ -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();

package/package.json

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