yz-yuki-plugin 2.0.5-1 → 2.0.5-10

package/.puppeteerrc.cjs

@@ -1,4 +1,4 @@
 /**
  * @type {import("puppeteer").Configuration}
  */
-module.exports = require('react-puppeteer/.puppeteerrc');
+module.exports = require('jsxp/.puppeteerrc');

package/CHANGELOG.md

@@ -1,4 +1,6 @@
 # 2.0.5
+* 新增 User-Agent 配置项
+* 优化获取动态数据
 * 新增获取B站up数据的随机延迟配置项
 * 新增puppeteer渲染图片测试脚本
 

package/README.md

@@ -11,12 +11,12 @@
 # 🌰一、安装插件
 
 ## 选择安装方式
-按照网络情况以及使用的bot框架是`Yunzai-Next`还是`Yunzai-V3`，选择对应的安装方式。
+按照网络情况以及使用的bot框架是`Yunzaijs`还是`Yunzai-V3`，选择对应的安装方式。
 
-### ***（一）Yunzai-Next***
+### ***（一）YunzaiJS***
 > 选择其中一种方式安装插件：
 
-1. npm包安装到`yunzai-next/node_modules`的方式，仅Yunzai-Next支持：
+1. npm包安装到`yunzaijs/node_modules`的方式，仅YunzaiJS支持：
 ```
  yarn add yz-yuki-plugin -W
 ```
@@ -25,26 +25,26 @@
 
 * 方式1（推荐）：
 
-手动新建 `yunzai-next/yunzai.config.json` 文件，输入如下内容，`applications`字段添加的 `"yz-yuki-plugin"`即为启用本插件：
+手动新建 `yunzaijs/yunzai.config.json` 文件，输入如下内容，`applications`字段添加的 `"yz-yuki-plugin"`即为启用本插件：
 
 ```json
 {
-  "applications": ["yz-system", "yz-yuki-plugin"],
-  "middlewares": ["yunzai-mys/runtime", "yunzai-mys/mw"]
+  "applications": ["@yunzaijs/system", "yz-yuki-plugin"],
+  "middlewares": ["@yunzaijs/mys/message", "@yunzaijs/mys/runtime"]
 }
 ```
 * 方式2：
 
-修改 `yunzai-next/yunzai.config.js`：
+修改 `yunzaijs/yunzai.config.js`：
 ```js
-import { defineConfig } from 'yunzai'
+import { defineConfig } from 'yunzaijs'
 export default defineConfig({
-  applications: ['yz-system', 'yz-yuki-plugin'], //该行添加 'yz-yuki-plugin'
-  middlewares: ['yunzai-mys/runtime', 'yunzai-mys/message']
+  applications: ["@yunzaijs/system", "yz-yuki-plugin"], //该行添加 'yz-yuki-plugin'
+  middlewares: ["@yunzaijs/mys/message", "@yunzaijs/mys/runtime"]
 })
 ```
 
-2. 安装到 `yunzai-next/plugins` 的方式：
+2. 安装到 `yunzaijs/plugins` 的方式：
 
 > 仅支持Yunzai-Next的分支，选择仓库：
 
@@ -179,14 +179,8 @@ https://m.weibo.cn/u/7643376782 # 7643376782 为崩坏星穹铁道博主uid
 ||||
 | **其他指令** |  |  |
 | 查看版本信息 | 查看版本信息 | `#优纪版本` |
-| 更新yuki插件 | 系统指令更新yuki插件，yunzai-next需安装yz-system | `#更新yuki-plugin` |
-| 强制更新yuki插件 | 强制更新yuki插件，yunzai-next需安装yz-system| `#强制更新yuki-plugin` |
-
-</details>
-
-<details><summary>样式预览，点击展开</summary>
-
-![](/resources/img/readme/mini-help.jpg)
+| 更新yuki插件 | 系统指令更新yuki插件，yunzaiJS需安装`@yunzaijs/system` | `#更新yuki-plugin` |
+| 强制更新yuki插件 | 强制更新yuki插件，yunzaiJS需安装`@yunzaijs/system`| `#强制更新yuki-plugin` |
 
 </details>
 
@@ -229,8 +223,8 @@ yarn install
 |                              Nickname                               | Contribution            |
 | :-----------------------------------------------------------------: | ----------------------- |
 |Yunzai-Next||
-| [Yunzai-org文档](https://yunzai-org.github.io/docs/)               | Yunzai Next 文档      |
-| [Yunzai-Next 仓库](https://github.com/yunzai-org/yunzaijs/)           |  Yunzai Next       |
+| [YunzaiJS文档](https://yunzaijs.github.io/docs/)               | YunzaiJS 文档      |
+| [YunzaiJS 仓库](https://github.com/yunzaijs/core)           |  YunzaiJS       |
 |Yunzai-V3||
 | [功能/插件库](https://gitee.com/yhArcadia/Yunzai-Bot-plugins-index) | Yunzai-Bot 相关内容索引 |
 |       [TRSS-Yunzai](https://gitee.com/TimeRainStarSky/Yunzai)       | 时雨🌌星空的 TRSS-Yunzai |

package/defaultConfig/bilibili/config.yaml

@@ -8,6 +8,12 @@ pushStatus: 1
 # "0 5,35,51 * * * *" #每小时固定第5分0秒、第35分0秒、第51分0秒检测一次，共3次/h
 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
+
 # 推送监测间隔，单位为秒，默认7200秒即2小时，即以当前时间为基准，监测过去2小时内的动态，并推送。取值范围：3600-36000秒，即过去的1-10h。应大于pushTime的周期。
 interval: 7200
 

package/defaultConfig/help/help.yaml

@@ -80,7 +80,7 @@
       desc: 查看版本信息
     - icon: 钓鱼
       title: '#更新yuki-plugin'
-      desc: '系统指令更新yuki插件,yz-next需安装yz-system'
+      desc: '系统指令更新yuki插件,yunzaiJS需安装`@yunzaijs/system`'
     - icon: pluie_lotus
       title: '#强制更新yuki-plugin'
-      desc: '强制更新yuki插件,yz-next需安装yz-system'
+      desc: '强制更新yuki插件,yunzaiJS需安装`@yunzaijs/system`'

package/lib/apps/bilibili.js

@@ -1,11 +1,11 @@
 import JSON from 'json5';
 import lodash from 'lodash';
-import { Messages, Bot, Redis } from 'yunzai';
-import { BiliQuery } from '../models/bilibili/bilibili.query.js';
-import { BiliTask } from '../models/bilibili/bilibili.task.js';
+import { Messages, Bot, Redis } from 'yunzaijs';
+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.get.web.data.js';
-import { applyLoginQRCode, pollLoginQRCode, saveLoginCookie, postGateway, exitBiliLogin, checkBiliLogin, readSavedCookieItems, saveLocalBiliCk, readSyncCookie, getNewTempCk, readTempCk } from '../models/bilibili/bilibili.models.js';
+import { BiliGetWebData } from '../models/bilibili/bilibili.main.get.web.data.js';
+import { applyLoginQRCode, pollLoginQRCode, saveLoginCookie, postGateway, exitBiliLogin, checkBiliLogin, readSavedCookieItems, saveLocalBiliCk, readSyncCookie, getNewTempCk, readTempCk } from '../models/bilibili/bilibili.main.models.js';
 
 const message = new Messages('message');
 let biliPushData = Config.getConfigData('config', 'bilibili', 'push');
@@ -205,7 +205,7 @@ message.use(async (e) => {
     if (e.isMaster) {
         await exitBiliLogin(e);
         await Redis.set('Yz:yuki:bili:loginCookie', '', { EX: 3600 * 24 * 180 });
-        e.reply(`登陆的B站ck并已删除~`);
+        e.reply(`扫码登陆的B站cookie已删除~`);
     }
     else {
         e.reply('未取得bot主人身份，无权限删除B站登录ck');

package/lib/apps/help.js

@@ -1,4 +1,4 @@
-import { Messages, Segment } from 'yunzai';
+import { Messages, Segment } from 'yunzaijs';
 import { renderPage } from '../utils/image.js';
 import Help from '../models/help/help.js';
 

package/lib/apps/version.js

@@ -1,4 +1,4 @@
-import { Messages, Segment } from 'yunzai';
+import { Messages, Segment } from 'yunzaijs';
 import { renderPage } from '../utils/image.js';
 import VersionData from '../models/version/version.js';
 

package/lib/apps/weibo.js

@@ -1,4 +1,4 @@
-import { Messages } from 'yunzai';
+import { Messages } from 'yunzaijs';
 import { WeiboQuery } from '../models/weibo/weibo.query.js';
 import { WeiboTask } from '../models/weibo/weibo.task.js';
 import Config from '../utils/config.js';

package/lib/components/dynamic/Footer.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ConfigController, BOT_NAME } from 'yunzai';
+import { ConfigController, BOT_NAME } from 'yunzaijs';
 import Config from '../../utils/config.js';
 import path from 'path';
 import { _paths, createRequire } from '../../utils/paths.js';

package/lib/components/help/Help.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { BOT_NAME, ConfigController } from 'yunzai';
+import { BOT_NAME, ConfigController } from 'yunzaijs';
 import Config from '../../utils/config.js';
 import path from 'path';
 import { _paths, createRequire } from '../../utils/paths.js';

package/lib/components/version/Version.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { BOT_NAME, ConfigController } from 'yunzai';
+import { BOT_NAME, ConfigController } from 'yunzaijs';
 import Config from '../../utils/config.js';
 import path from 'path';
 import { _paths, createRequire } from '../../utils/paths.js';

package/lib/index.js

@@ -1,10 +1,10 @@
 import chalk from 'chalk';
-import { applicationOptions, setBotTask, useEvent } from 'yunzai';
+import { applicationOptions, setBotTask, useEvent } from 'yunzaijs';
 import Config from './utils/config.js';
 import path from 'path';
 import { _paths } from './utils/paths.js';
 import * as index$1 from './apps/index.js';
-import { BiliTask } from './models/bilibili/bilibili.task.js';
+import { BiliTask } from './models/bilibili/bilibili.main.task.js';
 import { WeiboTask } from './models/weibo/weibo.task.js';
 
 const yukiPluginVersion = Config.getPackageJsonKey('version', path.join(_paths.pluginPath, 'package.json'));

package/lib/main.js

@@ -0,0 +1,11 @@
+import { createLogin, Client, Processor } from 'yunzaijs';
+
+setTimeout(async () => {
+    // 登录
+    await createLogin();
+    // 运行
+    await Client.run().then(async () => {
+        // 读取yunzai.config.js
+        await Processor.install('yunzaijs.config.ts');
+    });
+});

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

@@ -0,0 +1,125 @@
+import Config from '../../utils/config.js';
+
+class BiliApi {
+    biliConfigData;
+    USER_AGENT;
+    constructor() {
+        this.biliConfigData = Config.getUserConfig('bilibili', 'config');
+        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';
+    //初始化User-Agent
+    async initialize() {
+        await this.initUserAgent();
+    }
+    async initUserAgent() {
+        const userAgentList = await this.biliConfigData.userAgentList;
+        if (userAgentList && userAgentList.length > 0) {
+            const randomIndex = Math.floor(Math.random() * userAgentList.length);
+            this.USER_AGENT = String(userAgentList[randomIndex]);
+        }
+    }
+    // 将静态常量赋值给实例属性
+    get BILIBIL_API() {
+        return {
+            //获取动态资源列表 wbi/无wbi parama = { host_mid: uid, timezone_offset: -480, platform: 'web', features: 'itemOpusStyle,listOnlyfans,opusBigCover,onlyfansVote', web_location: "333.999", ...getDmImg(), "x-bili-device-req-json": { "platform": "web", "device": "pc" }, "x-bili-web-req-json": { "spm_id": "333.999" }, w_rid, wts }
+            biliDynamicInfoList: `https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/space`,
+            //获取关注数与粉丝数 parama = { vmid: uid }
+            biliUpFollowFans: `https://api.bilibili.com/x/relation/stat`,
+            //通过uid获取up详情 parama = { mid: uid, jsonp: jsonp }
+            biliSpaceUserInfo: `https://api.bilibili.com/x/space/acc/info`,
+            //parama = { mid: uid, token: '',platform: 'web', web_location: 1550101, w_webid, w_rid, wts }
+            biliSpaceUserInfoWbi: `https://api.bilibili.com/x/space/wbi/acc/info`,
+            //通过关键词${upKeyword}搜索up主 parama = { keyword: 'upKeyword', page: 1, search_type: 'bili_user', order: 'totalrank', pagesize: 5  }
+            biliSearchUp: `https://api.bilibili.com/x/web-interface/search/type`,
+            //通过关键词${upKeyword}搜索up主 parama = { keyword: 'upKeyword', page: 1, search_type: 'bili_user', order: 'totalrank'  }，需要wbi签名
+            biliSearchUpWbi: `https://api.bilibili.com/x/web-interface/wbi/search/type`,
+            biliLiveStatus: 'https://api.live.bilibili.com/room/v1/Room/get_status_info_by_uids',
+            biliCard: 'https://api.bilibili.com/x/web-interface/card',
+            biliStat: 'https://api.bilibili.com/x/relation/stat',
+            biliLiveUserInfo: 'https://api.live.bilibili.com/live_user/v1/Master/info',
+            biliOpusDetail: 'https://api.bilibili.com/x/polymer/web-dynamic/v1/opus/detail'
+        };
+    }
+    /**header */
+    get BILIBILI_HEADERS() {
+        return {
+            'Accept': '*/*',
+            'Accept-Language': 'zh-CN,en-US;q=0.5',
+            'Connection': 'keep-alive',
+            'Accept-Encoding': 'gzip, deflate, br, zstd',
+            'Cookie': '',
+            'pragma': 'no-cache',
+            'Cache-control': 'max-age=0',
+            'DNT': '1',
+            'Sec-GPC': '1',
+            'sec-ch-ua-platform': '',
+            'sec-ch-ua-mobile': '?0',
+            'Sec-Fetch-Dest': 'empty',
+            'Sec-Fetch-Mode': 'cors',
+            'Sec-Fetch-Site': 'same-site',
+            'Sec-Fetch-User': '?0',
+            'Priority': 'u=4',
+            'TE': 'trailers',
+            'User-Agent': this.USER_AGENT
+        };
+    }
+    /**Login header */
+    get BIlIBILI_LOGIN_HEADERS() {
+        return {
+            'Accept': '*/*',
+            'Accept-Language': 'zh-CN,en-US;q=0.5',
+            'Accept-Encoding': 'gzip, deflate, br, zstd',
+            'DNT': '1',
+            'Sec-GPC': '1',
+            'Upgrade-Insecure-Requests': '1',
+            'Sec-Fetch-Dest': 'document',
+            'Sec-Fetch-Mode': 'navigate',
+            'Sec-Fetch-Site': 'none',
+            'Sec-Fetch-User': '?1',
+            'TE': 'trailers'
+        };
+    }
+    /**FullArticle header */
+    get BILIBILI_ARTICLE_HEADERS() {
+        return {
+            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/png,image/svg+xml,*/*;q=0.8',
+            'Accept-Language': 'zh-CN,en-US;q=0.5',
+            'Accept-Encoding': 'gzip, deflate, br, zstd',
+            'Content-type': 'text/html; charset=utf-8',
+            'Cookie': '',
+            'pragma': 'no-cache',
+            'Cache-control': 'no-cache',
+            'DNT': '1',
+            'Sec-GPC': '1',
+            'sec-ch-ua-mobile': '?0',
+            'Sec-Fetch-Dest': 'document',
+            'Sec-Fetch-Mode': 'navigate',
+            'Sec-Fetch-Site': 'same-site',
+            'Sec-Fetch-User': '?1',
+            'TE': 'trailers',
+            'Upgrade-Insecure-Requests': '1',
+            'User-Agent': this.USER_AGENT
+        };
+    }
+    get BILIBILI_DYNAMIC_SPACE_HEADERS() {
+        return {
+            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+            'Accept-Encoding': 'gzip, deflate, br, zstd',
+            'Accept-Language': 'zh-CN,en-US;q=0.5',
+            'Connection': 'keep-alive',
+            'Priority': 'u=0, i',
+            'Sec-Fetch-Dest': 'document',
+            'Sec-Fetch-Mode': 'navigate',
+            'Sec-Fetch-Site': 'none',
+            'Sec-Fetch-User': '?1',
+            'Sec-GPC': '1',
+            'Upgrade-Insecure-Requests': '1',
+            'User-Agent': this.USER_AGENT
+        };
+    }
+}
+var BiliApi$1 = new BiliApi();
+
+export { BiliApi$1 as default };

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

@@ -1,8 +1,10 @@
 import axios from 'axios';
 import lodash from 'lodash';
-import { BiliApi } from './bilibili.api.js';
-import { readSyncCookie, cookieWithBiliTicket, readSavedCookieItems, readSavedCookieOtherItems } from './bilibili.models.js';
-import { getWbiSign } from './bilibili.wbi.js';
+import BiliApi from './bilibili.main.api.js';
+import { readSyncCookie, cookieWithBiliTicket, readSavedCookieItems, readSavedCookieOtherItems } from './bilibili.main.models.js';
+import { getWbiSign } from './bilibili.risk.wbi.js';
+import { getDmImg } from './bilibili.risk.dm.img.js';
+import { getWebId } from './bilibili.risk.w_webid.js';
 
 class BiliGetWebData {
     constructor(e) { }
@@ -11,14 +13,15 @@ class BiliGetWebData {
         const url = BiliApi.BILIBIL_API.biliDynamicInfoList;
         let { cookie } = await readSyncCookie();
         cookie = await cookieWithBiliTicket(cookie);
+        const dmImg = await getDmImg();
         const data = {
             'offset': '',
             'host_mid': uid,
             'timezone_offset': -480,
             'platform': 'web',
-            'features': 'itemOpusStyle,listOnlyfans,opusBigCover,onlyfansVote',
+            'features': 'itemOpusStyle,listOnlyfans,opusBigCover,onlyfansVote,decorationCard,forwardListHidden,ugcDelete,onlyfansQaCard',
             'web_location': '333.999',
-            //...getDmImg(),
+            ...dmImg,
             'x-bili-device-req-json': { platform: 'web', device: 'pc' },
             'x-bili-web-req-json': { spm_id: '333.999' }
         };
@@ -35,8 +38,8 @@ class BiliGetWebData {
             headers: lodash.merge(BiliApi.BILIBILI_HEADERS, {
                 Cookie: `${cookie}`,
                 Host: `api.bilibili.com`,
-                Origin: 'https://www.bilibili.com',
-                Referer: `https://www.bilibili.com/`
+                Origin: 'https://space.bilibili.com',
+                Referer: `https://space.bilibili.com/${uid}/dynamic`
             })
         });
         return res;
@@ -46,14 +49,20 @@ class BiliGetWebData {
         const url = BiliApi.BILIBIL_API.biliSpaceUserInfoWbi;
         let { cookie } = await readSyncCookie();
         cookie = await cookieWithBiliTicket(cookie);
+        const dmImg = await getDmImg();
         const data = {
             mid: uid,
-            jsonp: 'jsonp'
+            token: '',
+            platform: 'web',
+            web_location: 1550101,
+            ...dmImg
         };
         let signCookie = (await readSavedCookieItems(cookie, ['SESSDATA'], false)) || (await readSavedCookieOtherItems(cookie, ['SESSDATA']));
+        const w_webid = await getWebId(uid);
         const { w_rid, time_stamp } = await getWbiSign(data, BiliApi.BILIBILI_HEADERS, signCookie);
         const params = {
             ...data,
+            w_webid: w_webid,
             w_rid: w_rid,
             wts: time_stamp
         };
@@ -63,8 +72,8 @@ class BiliGetWebData {
             headers: lodash.merge(BiliApi.BILIBILI_HEADERS, {
                 Cookie: `${cookie}`,
                 Host: `api.bilibili.com`,
-                Origin: 'https://www.bilibili.com',
-                Referer: `https://www.bilibili.com/`
+                Origin: 'https://space.bilibili.com',
+                Referer: `https://space.bilibili.com/${uid}/dynamic`
             })
         });
         return res;

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

@@ -6,11 +6,12 @@ import { promisify } from 'node:util';
 import path from 'path';
 import QRCode from 'qrcode';
 import YAML from 'yaml';
-import { Segment, Bot, Redis } from 'yunzai';
+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 { 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';
 
 /**
  * *******************************************************************
@@ -60,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站登录二维码失败: ${res.data?.message}`);
+        throw new Error(`获取B站登录二维码失败: ${res.data?.message}`);
     }
 }
 /**处理扫码结果 */
@@ -149,12 +150,16 @@ async function exitBiliLogin(e) {
         e.reply('当前无可用的B站登录CK可退出登录');
         return;
     }
-    const postData = new URLSearchParams({ biliCSRF: biliCSRF });
+    const postData = String(biliCSRF)
+        .trim()
+        .replace(/^bili_jct=/g, '')
+        .replace(/;*$/g, '');
     try {
-        const resp = await axios.post(url, postData.toString(), {
+        const resp = await axios.post(url, { biliCSRF: postData }, {
             headers: {
                 'Host': 'passport.bilibili.com',
-                'Cookie': `DedeUserID=${DedeUserID}; bili_jct=${biliCSRF}; SESSDATA=${SESSDATA}`,
+                'User-Agent': BiliApi.BILIBILI_HEADERS['User-Agent'],
+                'Cookie': `${DedeUserID};${biliCSRF};${SESSDATA}`,
                 'Content-Type': 'application/x-www-form-urlencoded'
             }
         });
@@ -163,29 +168,27 @@ async function exitBiliLogin(e) {
             e.reply('当前缓存的B站登录CK早已失效！');
             return;
         }
-        const { code, status, data } = resp.data;
-        logger.mark('Response Data:', data);
-        if (status) {
-            switch (code) {
-                case 0:
-                    e.reply('当前缓存的B站登录CK已在服务器注销~');
-                    await Redis.set('Yz:yuki:bili:loginCookie', '', { EX: 3600 * 24 * 180 });
-                    e.reply(`登陆的B站ck并已删除~`);
-                    break;
-                case 2202:
-                    e.reply('csrf 请求非法，退出登录请求出错');
-                    break;
-                default:
-                    e.reply('当前缓存的B站登录CK早已失效！');
-            }
-        }
-        else {
-            e.reply('服务器响应异常，退出登录请求出错');
+        const res = resp.data;
+        logger?.debug(`exitBiliLogin:  ${JSON.stringify(res)}`);
+        const { code } = res;
+        switch (code) {
+            case 0:
+                e.reply('当前缓存的B站登录CK已在B站服务器退出登录~');
+                break;
+            case 2202:
+                e.reply('csrf 请求非法，退出登录请求出错');
+                break;
+            case -101:
+                e.reply('当前缓存的扫码B站ck未登录！');
+                break;
+            default:
+                e.reply('未知情况！无妨');
+                return;
         }
     }
     catch (error) {
+        e.reply('退出登录请求出错');
         console.error('Error during Bili login exit:', error);
-        e.reply('退出登录请求出错，请稍后再试');
     }
 }
 /**
@@ -397,18 +400,18 @@ async function getPayload(cookie) {
             '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,
-            '07a4': 'zh-CN',
-            '1c57': 'not available',
-            '0bd0': 16,
-            '748e': [1920, 1200],
-            'd61f': [1920, 1152],
-            'fc9d': -480,
-            '6aa9': 'Asia/Shanghai',
-            '75b8': 1,
-            '3b21': 1,
-            '8a1c': 0,
-            'd52f': 'not available',
+            '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': [
                 [
@@ -451,9 +454,9 @@ async function getPayload(cookie) {
                         ['text/pdf', 'pdf']
                     ]
                 ]
-            ],
-            '13ab': 'f3YAAAAASUVORK5CYII=',
-            'bfe9': 'kABYpRAGAVYzWJooB9Bf4P+UortSvxRY0AAAAASUVORK5CYII=',
+            ], // 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]',
@@ -519,8 +522,8 @@ async function getPayload(cookie) {
                 'webgl fragment shader low int precision:0',
                 'webgl fragment shader low int precision rangeMin:31',
                 'webgl fragment shader low int precision rangeMax:30'
-            ],
-            '6bc5': 'Google Inc. (Intel)~ANGLE (Intel, Intel(R) HD Graphics Direct3D11 vs_5_0 ps_5_0), or similar',
+            ], // 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,
@@ -604,6 +607,15 @@ async function postGateway(cookie) {
         throw error;
     }
 }
+/**生成buvid_fp
+ * @param {string} uuid
+ */
+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);
+    return `buvid_fp=${buvidFp};`;
+}
 /**
  * 获取有效bili_ticket并添加到cookie
  * @param {string} cookie
@@ -630,4 +642,4 @@ async function cookieWithBiliTicket(cookie) {
     }
 }
 
-export { applyLoginQRCode, checkBiliLogin, cookieWithBiliTicket, exitBiliLogin, genUUID, gen_b_lsid, getNewTempCk, pollLoginQRCode, postGateway, readSavedCookieItems, readSavedCookieOtherItems, readSyncCookie, readTempCk, saveLocalBiliCk, saveLoginCookie, saveTempCk };
+export { applyLoginQRCode, checkBiliLogin, cookieWithBiliTicket, exitBiliLogin, genUUID, gen_b_lsid, getNewTempCk, get_buvid_fp, pollLoginQRCode, postGateway, readSavedCookieItems, readSavedCookieOtherItems, readSyncCookie, readTempCk, saveLocalBiliCk, saveLoginCookie, saveTempCk };

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

@@ -1,7 +1,7 @@
 import moment from 'moment';
-import { Bot, Segment } from 'yunzai';
-import { readSyncCookie, cookieWithBiliTicket } from './bilibili.models.js';
-import { BiliApi } from './bilibili.api.js';
+import { Bot, Segment } from 'yunzaijs';
+import { readSyncCookie, cookieWithBiliTicket } from './bilibili.main.models.js';
+import BiliApi from './bilibili.main.api.js';
 import axios from 'axios';
 import lodash from 'lodash';