yz-yuki-plugin 2.0.8-3 → 2.0.8-5

package/CHANGELOG.md

@@ -1,4 +1,5 @@
 # 2.0.8
+* 添加微博登录功能（待续）
 * 更新B站动态标题获取
 * 合并分支dev与dev3，减少维护成本
 

package/README.md

@@ -186,7 +186,7 @@ https://m.weibo.cn/u/7643376782 # 7643376782 为崩坏星穹铁道博主uid
 | 扫码B站登录 | app扫码获取登录ck | `#扫码B站登录` |
 | 取消B站登录 | 删除扫码获取的B站CK | `#取消B站登陆` |
 | 查看B站登录信息 | 查看app扫码登录的信息和状态 | `#我的B站登录` |
-| 绑定B站ck | 配置手动本地获取的B站CK，仅限私聊/私信，权限：Master | `#绑定B本地站ck: xxx` |
+| 绑定B站ck | 配置手动本地获取的B站CK，仅限私聊/私信，权限：Master | `#绑定B站本地ck: xxx` |
 | 删除B站ck | 删除手动获取的B站cookie，权限：Master | `#删除B站本地ck` |
 | 查看B站ck | 查看当前启用的B站ck,仅限私聊 | `#我的B站ck` |
 | 刷新B站临时ck | 重新获取并刷新redis缓存的未绑定自己的B站ck而自动获取的 临时B站cookie | `#刷新B站临时ck` |
@@ -200,6 +200,12 @@ https://m.weibo.cn/u/7643376782 # 7643376782 为崩坏星穹铁道博主uid
 | 手动推送微博订阅 | 手动触发定时推送任务，权限：Bot的Master | `#执行微博任务` |
 | 查看博主信息 | 通过uid查看博主信息 | `#微博博主 uid` |
 | 搜索微博博主 | 根据关键词在微博搜索大V博主的信息 | `#搜索微博博主 xxx` |
+| 扫码微博登录（待完成） | app扫码获取登录ck | `#扫码微博登录` |
+| 取消微博登录 | 删除扫码获取的微博CK | `#取消微博登陆` |
+| 查看微博登录信息 | 查看app扫码登录的信息和状态 | `#我的微博登录` |
+| 绑定微博ck | 配置手动本地获取的微博CK，仅限私聊/私信，权限：Master | `#绑定微博本地ck: xxx` |
+| 删除微博ck | 删除手动获取的微博cookie，权限：Master | `#删除微博本地ck` |
+| 查看微博ck | 查看当前启用的微博ck,仅限私聊 | `#我的微博ck` |
 ||||
 | **其他指令** |  |  |
 | 查看版本信息 | 查看版本信息 | `#优纪版本` |

package/defaultConfig/help/help.yaml

@@ -50,6 +50,9 @@
     - icon: wondrous_lovely_flower
       title: '#刷新B站临时ck'
       desc: '刷新自动获取的临时B站cookie'
+    - icon: romaritime_flower
+      title: 'B站视频链接解析'
+      desc: '直接发送B站视频链接即可'
 - group: 微博功能
   list:
     - icon: diagram
@@ -73,6 +76,24 @@
     - icon: shell
       title: '#搜索微博博主原神'
       desc: '根据关键词在微博搜索大V博主的信息'
+    - icon: 雷神瞳共鸣石
+      title: '#扫码微博登录'
+      desc: 'app扫码获取登录ck（待完成）'
+    - icon: everamber
+      title: '#取消微博登陆'
+      desc: '删除扫码获取的微博CK'
+    - icon: condessence_crystal
+      title: '#我的微博登录'
+      desc: '查看app扫码登录的信息和状态'
+    - icon: romaritime_flower
+      title: '#绑定微博本地ck: ***'
+      desc: '配置本地获取的微博CK'
+    - icon: unfading_silky_grace
+      title: '#删除微博本地ck'
+      desc: '删除手动获取的微博ck'
+    - icon: delightful_encounter
+      title: '#我的微博ck'
+      desc: '查看当前启用的微博ck,仅限私聊'
 - group: 其他指令
   list:
     - icon: 风车

package/lib/apps/bilibili.js

@@ -297,7 +297,7 @@ message.use(async (e) => {
         e.reply('未取得bot主人身份，无权限删除B站登录ck');
     }
 }, [/^(#|\/)(yuki|优纪)?(取消|删除|del|DEL)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)本地(ck|CK|cookie|COOKIE)$/]);
-/** 当前正在使用的B站ck */
+/** 当前正在使用的本地B站ck */
 message.use(async (e) => {
     if (e.isGroup) {
         await e.reply('注意账号安全，请私聊查看叭');
@@ -325,7 +325,7 @@ message.use(async (e) => {
             e.reply('未取得bot主人身份，无权限查看当前使用的B站cookie');
         }
     }
-}, [/^(#|\/)(yuki|优纪)?(取消|删除|del|DEL)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)本地(ck|CK|cookie|COOKIE)$/]);
+}, [/^(#|\/)(yuki|优纪)?我的(b站|B站|bili|bilibili|哔哩|哔哩哔哩)(ck|CK|cookie|COOKIE)$/]);
 /** 删除并刷新redis缓存的临时B站ck */
 message.use(async (e) => {
     try {

package/lib/apps/weibo.js

@@ -1,8 +1,10 @@
-import { Messages } from 'yunzaijs';
+import { WeiboWebDataFetcher } from '../models/weibo/weibo.main.get.web.data.js';
+import { WeiboMainModels } from '../models/weibo/weibo.main.models.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 { WeiboWebDataFetcher } from '../models/weibo/weibo.main.get.web.data.js';
+import lodash from 'lodash';
+import { Messages, Redis } from 'yunzaijs';
 
 const message = new Messages('message');
 let weiboPushData = Config.getConfigData('config', 'weibo', 'push');
@@ -124,6 +126,119 @@ message.use(async (e) => {
         e.reply(`${isDel ? '删除' : '修改'}微博推送成功~\n${uid}`);
     }
 }, [/^(#|\/)(yuki|优纪)?(取消|删除|del|DEL)(微博|weibo|WEIBO)推送\s*(视频\s*|图文\s*|文章\s*|转发\s*)*.*$/]);
+/** 扫码登录微博 */
+message.use(async (e) => {
+    if (!e.isMaster) {
+        e.reply('未取得bot主人身份，无权限配置微博登录ck');
+    }
+    else {
+        const LoginCk = await WeiboMainModels.readLoginCookie();
+        if (LoginCk) {
+            e.reply(`当前已有微博登录ck，请勿重复扫码！\n如需更换，请先删除当前登录再扫码：\n#yuki删除微博登录`);
+        }
+        else {
+            try {
+                const tokenKey = await WeiboMainModels.applyLoginQRCode(e);
+                if (tokenKey && tokenKey.rid) {
+                    let weiboLoginCk = await WeiboMainModels.pollLoginQRCode(e, tokenKey.qrid, tokenKey.rid, tokenKey.X_CSRF_TOKEN);
+                    if (weiboLoginCk) {
+                        if (lodash.trim(weiboLoginCk).length != 0) {
+                            await WeiboMainModels.saveLoginCookie(e, weiboLoginCk);
+                            e.reply(`get weibo LoginCk：成功！`);
+                        }
+                        else {
+                            e.reply(`get weibo LoginCk：失败X﹏X`);
+                        }
+                    }
+                }
+            }
+            catch (Error) {
+                global?.logger?.info(`yuki-plugin Login weibo Failed：${Error}`);
+            }
+        }
+    }
+}, [/^(#|\/)(yuki|优纪)?(扫码|添加|ADD|add)(微博|weibo|WEIBO)登录$/]);
+/** 删除登陆的微博ck */
+message.use(async (e) => {
+    if (e.isMaster) {
+        await Redis.set('Yz:yuki:weibo:loginCookie', '', { EX: 3600 * 24 * 180 });
+        e.reply(`扫码登陆的微博cookie已删除~`);
+    }
+    else {
+        e.reply('未取得bot主人身份，无权限删除微博登录ck');
+    }
+}, [/^(#|\/)(yuki|优纪)?(取消|删除|del|DEL)(微博|weibo|WEIBO)登录$/]);
+/** 显示我的微博登录信息 */
+message.use(async (e) => {
+    if (e.isMaster) {
+        await WeiboMainModels.checkWeiboLogin(e);
+    }
+    else {
+        e.reply('未取得bot主人身份，无权限查看微博登录状态');
+    }
+}, [/^(#|\/)(yuki|优纪)?我的(微博|weibo|WEIBO)登录$/]);
+/** 手动绑定本地获取的微博cookie */
+message.use(async (e) => {
+    if (e.isMaster) {
+        if (e.isPrivate) {
+            await e.reply('请注意账号安全，请手动撤回发送的cookie，并私聊进行添加绑定！');
+        }
+        else {
+            let localBiliCookie = e.msg.replace(/^(#|\/)(yuki|优纪)?(绑定|添加|ADD|add)(微博|weibo|WEIBO)(ck|CK|cookie|COOKIE)(:|：)?/g, '').trim();
+            const XSRF_TOKEN = await WeiboMainModels.readSavedCookieItems(localBiliCookie, ['XSRF-TOKEN'], false);
+            if (XSRF_TOKEN) {
+                //筛选ck
+                localBiliCookie = await WeiboMainModels.readSavedCookieItems(localBiliCookie, ['XSRF-TOKEN', 'SUB', 'SUBP', 'SRF', 'SCF', 'SRT', ' _T_WM', 'M_WEIBOCN_PARAMS', 'SSOLoginState', 'ALF'], false);
+                await WeiboMainModels.saveLocalBiliCk(localBiliCookie);
+                logger.mark(`${e.logFnc} 保存微博cookie成功 [XSRF_TOKEN: ${XSRF_TOKEN}]`);
+                let uidMsg = [`好耶~绑定微博cookie成功：\nXSRF_TOKEN: ${XSRF_TOKEN}`];
+                await e.reply(uidMsg);
+            }
+            else {
+                e.reply('绑定的微博cookie无效，请检查后重新添加！');
+                return false;
+            }
+        }
+    }
+    else {
+        e.reply('未取得bot主人身份，无权限配置B站登录ck');
+    }
+}, [/^^(#|\/)(yuki|优纪)?(绑定|添加|ADD|add)(微博|weibo|WEIBO)本地(ck|CK|cookie|COOKIE)(:|：)?.*$/]);
+/** 删除绑定的本地微博ck */
+message.use(async (e) => {
+    if (e.isMaster) {
+        await WeiboMainModels.saveLocalBiliCk('');
+        await e.reply(`手动绑定的微博ck已删除~`);
+    }
+    else {
+        e.reply('未取得bot主人身份，无权限删除B站登录ck');
+    }
+}, [/^(#|\/)(yuki|优纪)?(取消|删除|del|DEL)(微博|weibo|WEIBO)本地(ck|CK|cookie|COOKIE)$/]);
+/** 查看当前正在使用的本地微博ck */
+message.use(async (e) => {
+    if (e.isGroup) {
+        await e.reply('注意账号安全，请私聊查看叭');
+    }
+    else {
+        if (e.isMaster) {
+            let { cookie, mark } = await WeiboMainModels.readSyncCookie();
+            if (mark === 'localCk') {
+                e.reply(`当前使用本地获取的微博cookie：`);
+                e.reply(`${cookie}`);
+            }
+            else if (mark === 'loginCk') {
+                e.reply(`当前使用扫码登录的微博cookie：`);
+                e.reply(`${cookie}`);
+            }
+            else if (mark == 'ckIsEmpty') {
+                e.reply(`当前无可使用的微博cookie。`);
+            }
+        }
+        else {
+            e.reply('未取得bot主人身份，无权限查看当前使用的B站cookie');
+        }
+    }
+}, [/^(#|\/)(yuki|优纪)?我的(微博|weibo|WEIBO)(ck|CK|cookie|COOKIE)$/]);
 /** 订阅的全部微博推送列表 */
 message.use(async (e) => {
     if (!e.isMaster) {
@@ -155,17 +270,19 @@ message.use(async (e) => {
             messages.push('\n>>>>>>群组微博订阅<<<<<<');
             Object.keys(subData.group).forEach(groupId => {
                 messages.push(`\n<群组${groupId}>：`);
-                subData.group[groupId].forEach((item) => {
-                    const types = new Set();
-                    if (item.type && item.type.length) {
-                        item.type.forEach((typeItem) => {
-                            if (typeMap[typeItem]) {
-                                types.add(typeMap[typeItem]);
-                            }
-                        });
-                    }
-                    messages.push(`${item.uid}：${item.name}  ${types.size ? `[${Array.from(types).join('、')}]` : ' [全部动态]'}`);
-                });
+                if (subData.group) {
+                    subData.group[groupId].forEach((item) => {
+                        const types = new Set();
+                        if (item.type && item.type.length) {
+                            item.type.forEach((typeItem) => {
+                                if (typeMap[typeItem]) {
+                                    types.add(typeMap[typeItem]);
+                                }
+                            });
+                        }
+                        messages.push(`${item.uid}：${item.name}  ${types.size ? `[${Array.from(types).join('、')}]` : ' [全部动态]'}`);
+                    });
+                }
             });
         }
         else {
@@ -176,17 +293,19 @@ message.use(async (e) => {
             messages.push('\n>>>>>>私聊微博订阅<<<<<<');
             Object.keys(subData.private).forEach(userId => {
                 messages.push(`\n<用户${userId}>：`);
-                subData.private[userId].forEach((item) => {
-                    const types = new Set();
-                    if (item.type && item.type.length) {
-                        item.type.forEach((typeItem) => {
-                            if (typeMap[typeItem]) {
-                                types.add(typeMap[typeItem]);
-                            }
-                        });
-                    }
-                    messages.push(`${item.uid}：${item.name}  ${types.size ? `[${Array.from(types).join('、')}]` : ' [全部动态]'}`);
-                });
+                if (subData.private) {
+                    subData.private[userId].forEach((item) => {
+                        const types = new Set();
+                        if (item.type && item.type.length) {
+                            item.type.forEach((typeItem) => {
+                                if (typeMap[typeItem]) {
+                                    types.add(typeMap[typeItem]);
+                                }
+                            });
+                        }
+                        messages.push(`${item.uid}：${item.name}  ${types.size ? `[${Array.from(types).join('、')}]` : ' [全部动态]'}`);
+                    });
+                }
             });
         }
         else {

package/lib/components/loginQrcode/Page.js

@@ -11,7 +11,9 @@ function App({ data }) {
             React.createElement("div", { className: "txt-0 text-center mt-3 mb-3 p-1 text-blue-500" },
                 "Created By yuki-plugin",
                 React.createElement("br", null),
-                "\u626B\u7801\u767B\u5F55B\u7AD9\u83B7\u53D6CK"),
+                "\u626B\u7801\u767B\u5F55",
+                data.name,
+                "\u83B7\u53D6CK"),
             React.createElement("div", { className: "QrCode m-auto" },
                 React.createElement("img", { className: "qr-code w-72 h-72 ml-7", src: data.url, alt: "\u4E8C\u7EF4\u7801" })),
             React.createElement("div", { className: "txt-1 text-center mt-3 mb-3 p-1 text-red-600" },

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

@@ -1,3 +1,8 @@
+import BiliApi from './bilibili.main.api.js';
+import { gen_buvid_fp } from './bilibili.risk.buid.fp.js';
+import { getBiliTicket } from './bilibili.risk.ticket.js';
+import { renderPage } from '../../utils/image.js';
+import { _paths } from '../../utils/paths.js';
 import axios from 'axios';
 import fs__default from 'fs';
 import lodash from 'lodash';
@@ -7,11 +12,6 @@ import path from 'path';
 import QRCode from 'qrcode';
 import YAML from 'yaml';
 import { Redis, Segment } from 'yunzaijs';
-import { renderPage } from '../../utils/image.js';
-import { _paths } from '../../utils/paths.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';
 
 /**
  * *******************************************************************
@@ -35,7 +35,7 @@ async function applyLoginQRCode(e) {
         const qrcodeUrl = res?.data?.url;
         let loginUrlQrcodeData = await QRCode.toDataURL(`${qrcodeUrl}`);
         const LoginPropsData = {
-            data: { url: loginUrlQrcodeData }
+            data: { name: 'B站', url: loginUrlQrcodeData }
         };
         const ScreenshotOptionsData = {
             saveHtmlfile: false,
@@ -251,7 +251,7 @@ async function readLocalBiliCk() {
     if (!fs__default.existsSync(dir)) {
         fs__default.mkdirSync(dir, { recursive: true }); // 创建目录，包括父目录
     }
-    const files = fs__default.readdirSync(dir).filter((file) => file.endsWith('.yaml'));
+    const files = fs__default.readdirSync(dir).filter((file) => file.endsWith('biliCookie.yaml'));
     const readFile = promisify(fs__default.readFile);
     const promises = files.map((file) => readFile(path.join(dir, file), 'utf8'));
     const contents = await Promise.all(promises);

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

@@ -30,14 +30,121 @@ class WeiboApi {
     /**统一设置header */
     get WEIBO_HEADERS() {
         return {
-            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9',
-            'Accept-language': 'zh-CN,zh;q=0.9',
-            'Authority': 'm.weibo.cn',
-            'Cache-control': 'max-age=0',
-            'Sec-fetch-dest': 'empty',
-            'Sec-fetch-mode': 'same-origin',
-            'Sec-fetch-site': 'same-origin',
-            'Upgrade-insecure-requests': '1',
+            'Accept': 'application/json, text/plain, */*',
+            'Accept-Language': 'zh-CN,en-US;q=0.5',
+            'Accept-Encoding': 'gzip, deflate, br, zstd',
+            'X-Requested-With': 'XMLHttpRequest',
+            'MWeibo-Pwa': '1',
+            'X-XSRF-TOKEN': '',
+            'Sec-Fetch-Dest': 'empty',
+            'Sec-Fetch-Mode': 'cors',
+            'Sec-Fetch-Site': 'same-origin',
+            'Connection': 'keep-alive',
+            'User-agent': this.USER_AGENT
+        };
+    }
+    get WEIBO_GET_X_CSRF_TOKEN_HEADERS() {
+        return {
+            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+            'Accept-Language': 'zh-CN,en-US;q=0.5',
+            'Accept-Encoding': 'gzip, deflate, br, zstd',
+            'Sec-GPC': '1',
+            'Connection': 'keep-alive',
+            'Upgrade-Insecure-Requests': '1',
+            'Sec-Fetch-Dest': 'document',
+            'Sec-Fetch-Mode': 'navigate',
+            'Sec-Fetch-Site': 'none',
+            'Sec-Fetch-User': '?1',
+            'Priority': 'u=0, i',
+            'User-agent': this.USER_AGENT
+        };
+    }
+    get WEIBO_LOGIN_QR_CODE_HEADERS() {
+        return {
+            'Accept': `application/json, text/plain, */*`,
+            'Accept-Language': 'zh-CN,en-US;q=0.5',
+            'Accept-Encoding': 'gzip, deflate, br, zstd',
+            'X-Requested-With': 'XMLHttpRequest',
+            'X-CSRF-TOKEN': '',
+            'Sec-GPC': '1',
+            'Connection': 'keep-alive',
+            'Referer': 'https://passport.weibo.com/sso/signin?entry=wapsso&source=wapssowb&url=https%3A%2F%2Fm.weibo.cn%2F',
+            'Cookie': '',
+            'Sec-Fetch-Dest': 'empty',
+            'Sec-Fetch-Mode': 'cors',
+            'Sec-Fetch-Site': 'same-origin',
+            'Priority': 'u=0',
+            'User-agent': this.USER_AGENT
+        };
+    }
+    get WEIBO_LOGIN_QR_CODE_IMAGE_HEADERS() {
+        return {
+            'Accept': `image/avif,image/webp,image/png,image/svg+xml,image/*;q=0.8,*/*;q=0.5`,
+            'Accept-Language': 'zh-CN,en-US;q=0.5',
+            'Accept-Encoding': 'gzip, deflate, br, zstd',
+            'Sec-GPC': '1',
+            'Connection': 'keep-alive',
+            'Referer': 'https://passport.weibo.com/',
+            'Cookie': '',
+            'Sec-Fetch-Dest': 'Image',
+            'Sec-Fetch-Mode': 'no-cors',
+            'Sec-Fetch-Site': 'cross-site',
+            'Priority': 'u=4, i',
+            'User-agent': this.USER_AGENT
+        };
+    }
+    get WEIBO_GET_BD_TOKEN_HEADERS() {
+        return {
+            'Accept': '*/*',
+            'Accept-Language': 'zh-CN,en-US;q=0.5',
+            'Accept-Encoding': 'gzip, deflate, br, zstd',
+            'Content-Type': 'application/x-www-form-urlencoded',
+            'Host': 'passport.weibo.com',
+            'Origin': 'https://passport.weibo.com',
+            'Priority': 'u=4',
+            'Referer': 'https://passport.weibo.com/sso/signin?entry=wapsso&source=wapsso&url=https%3A%2F%2Fm.weibo.cn%2F',
+            'Connection': 'keep-alive',
+            'Cookie': '',
+            'Sec-Fetch-Dest': 'empty',
+            'Sec-Fetch-Mode': 'no-cors',
+            'Sec-Fetch-Site': 'same-origin',
+            'Sec-GPC': '1',
+            'TE': 'trailers',
+            'User-Agent': this.USER_AGENT
+        };
+    }
+    get WEIBO_POLL_LOGIN_STATUS_HEADERS() {
+        return {
+            'Accept': 'application/json, text/plain, */*',
+            'Accept-Language': 'zh-CN,en-US;q=0.5',
+            'Accept-Encoding': 'gzip, deflate, br, zstd',
+            'X-Requested-With': 'XMLHttpRequest',
+            'X-CSRF-TOKEN': '',
+            'Sec-GPC': '1',
+            'Connection': 'keep-alive',
+            'Referer': 'https://passport.weibo.com/sso/signin?entry=wapsso&source=wapssowb&url=https%3A%2F%2Fm.weibo.cn%2F',
+            'Cookie': '',
+            'Sec-Fetch-Dest': 'empty',
+            'Sec-Fetch-Mode': 'cors',
+            'Sec-Fetch-Site': 'same-origin',
+            'TE': 'trailers',
+            'User-agent': this.USER_AGENT
+        };
+    }
+    get WEIBO_COOKIE_HEADERS() {
+        return {
+            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+            'Accept-Language': 'zh-CN,en-US;q=0.5',
+            'Accept-Encoding': 'gzip, deflate, br, zstd',
+            'Connection': 'keep-alive',
+            'Referer': 'https://passport.weibo.com/sso/signin?entry=wapsso&source=wapsso&url=https%3A%2F%2Fm.weibo.cn%2F%3Fjumpfrom%3Dweibocom',
+            'Cookie': '',
+            'Upgrade-Insecure-Requests': '1',
+            'Sec-Fetch-Dest': 'document',
+            'Sec-Fetch-Mode': 'navigate',
+            'Sec-Fetch-Site': 'same-origin',
+            'Priority': 'u=0, i',
+            'TE': 'trailers',
             'User-agent': this.USER_AGENT
         };
     }

package/lib/models/weibo/weibo.main.get.web.data.js

@@ -1,7 +1,19 @@
-import axios from 'axios';
 import WeiboApi from './weibo.main.api.js';
+import { WeiboMainModels } from './weibo.main.models.js';
 import { WeiboQuery } from './weibo.main.query.js';
+import axios from 'axios';
+import { randomInt } from 'crypto';
+import lodash from 'lodash';
 
+function generateRandomString(length = 6) {
+    const characters = 'abcdefghijklmnopqrstuvwxyz0123456789';
+    let result = '';
+    for (let i = 0; i < length; i++) {
+        const randomIndex = randomInt(0, characters.length);
+        result += characters[randomIndex];
+    }
+    return result;
+}
 class WeiboWebDataFetcher {
     e;
     constructor(e) { }
@@ -10,25 +22,55 @@ class WeiboWebDataFetcher {
         const param = { containerid: '100505' + target };
         const url = new URL(WeiboApi.WEIBO_API.weiboGetIndex);
         url.search = new URLSearchParams(param).toString();
+        const { cookie, mark } = await WeiboMainModels.readSyncCookie();
+        let COOKIE = '', XSRF_TOKEN = '';
+        if (String(cookie).includes('XSRF-TOKEN')) {
+            COOKIE = cookie;
+            XSRF_TOKEN = await WeiboMainModels.readSavedCookieItems(cookie, ['XSRF-TOKEN'], false);
+        }
+        else {
+            logger.warn(`优纪插件：获取博主信息，未登录，如获取报错或失败请先 #扫码微博登录`);
+            XSRF_TOKEN = generateRandomString();
+            COOKIE = `XSRF_TOKEN=${XSRF_TOKEN}`;
+        }
         const resp = await axios(url.toString(), {
             method: 'GET',
             timeout: 10000,
-            headers: { 'accept': '*/*', 'Content-Type': 'application/json', 'referer': 'https://m.weibo.cn' }
+            headers: lodash.merge(WeiboApi.WEIBO_HEADERS, { 'X-XSRF-TOKEN': `${XSRF_TOKEN}`, 'Cookie': `${COOKIE}`, 'referer': 'https://m.weibo.cn' })
         });
+        // 处理 Set-Cookie 响应头
+        if (resp.headers['set-cookie']) {
+            await WeiboMainModels.updateCookieWithSetCookie(resp.headers['set-cookie'], mark);
+        }
         return resp;
     }
     /**通过关键词搜索微博大v */
     async searchBloggerInfo(keyword) {
         const url = WeiboApi.WEIBO_API.weiboAjaxSearch;
+        const { cookie, mark } = await WeiboMainModels.readSyncCookie();
+        let COOKIE = '', XSRF_TOKEN = '';
         const params = {
             q: keyword
         };
+        if (String(cookie).includes('XSRF-TOKEN')) {
+            COOKIE = cookie;
+            XSRF_TOKEN = await WeiboMainModels.readSavedCookieItems(cookie, ['XSRF-TOKEN'], false);
+        }
+        else {
+            logger.warn(`优纪插件：搜索微博大V，未登录，如获取报错或失败请先 #扫码微博登录`);
+            XSRF_TOKEN = generateRandomString();
+            COOKIE = `XSRF_TOKEN=${XSRF_TOKEN}`;
+        }
         const resp = await axios(url, {
             method: 'GET',
             params,
             timeout: 10000,
-            headers: { 'accept': '*/*', 'Content-Type': 'application/json', 'referer': 'https://s.weibo.com' }
+            headers: lodash.merge(WeiboApi.WEIBO_HEADERS, { 'X-XSRF-TOKEN': `${XSRF_TOKEN}`, 'Cookie': `${COOKIE}`, 'referer': 'https://m.weibo.cn' })
         });
+        // 处理 Set-Cookie 响应头
+        if (resp.headers['set-cookie']) {
+            await WeiboMainModels.updateCookieWithSetCookie(resp.headers['set-cookie'], mark);
+        }
         return resp;
     }
     /**获取主页动态资源相关数组 */
@@ -37,12 +79,27 @@ class WeiboWebDataFetcher {
         const url = new URL(WeiboApi.WEIBO_API.weiboGetIndex);
         url.search = new URLSearchParams(params).toString();
         await new Promise(resolve => setTimeout(resolve, Math.floor(Math.random() * (6500 - 1000 + 1) + 1000)));
+        const { cookie, mark } = await WeiboMainModels.readSyncCookie();
+        let COOKIE = '', XSRF_TOKEN = '';
+        if (String(cookie).includes('XSRF-TOKEN')) {
+            COOKIE = cookie;
+            XSRF_TOKEN = await WeiboMainModels.readSavedCookieItems(cookie, ['XSRF-TOKEN'], false);
+        }
+        else {
+            logger.warn(`优纪插件：获取主页动态资源，未登录，如获取报错或失败请先 #扫码微博登录`);
+            XSRF_TOKEN = generateRandomString();
+            COOKIE = `XSRF_TOKEN=${XSRF_TOKEN}`;
+        }
         try {
             const response = await axios(url.toString(), {
                 method: 'GET',
                 timeout: 10000,
-                headers: { 'accept': '*/*', 'Content-Type': 'application/json', 'referer': 'https://m.weibo.cn' }
+                headers: lodash.merge(WeiboApi.WEIBO_HEADERS, { 'X-XSRF-TOKEN': `${XSRF_TOKEN}`, 'Cookie': `${COOKIE}`, 'referer': 'https://m.weibo.cn' })
             });
+            // 处理 Set-Cookie 响应头
+            if (response.headers['set-cookie']) {
+                await WeiboMainModels.updateCookieWithSetCookie(response.headers['set-cookie'], mark);
+            }
             const { ok, data, msg } = response?.data;
             if (!ok && msg !== '这里还没有内容') {
                 throw new Error(response?.config.url);

package/lib/models/weibo/weibo.main.models.js

@@ -0,0 +1,347 @@
+import WeiboApi from './weibo.main.api.js';
+import { getRidFromBd } from './weibo.risk.bd.rid.js';
+import { parse, serialize } from 'cookie';
+import lodash from 'lodash';
+import moment from 'moment';
+import fetch from 'node-fetch';
+import { Segment, Redis } from 'yunzaijs';
+
+class WeiboMainModels {
+    /**
+     * *******************************************************************
+     * Login 相关
+     * *******************************************************************
+     */
+    /**申请登陆二维码(web端) */
+    static async applyLoginQRCode(e) {
+        const response = await fetch('https://passport.weibo.com/sso/signin?entry=wapsso&source=wapssowb&url=https://m.weibo.cn/', {
+            method: 'GET',
+            headers: lodash.merge(WeiboApi.WEIBO_GET_X_CSRF_TOKEN_HEADERS, { Host: 'passport.weibo.com' }),
+            redirect: 'follow'
+        });
+        const setCookie = response.headers.get('set-cookie');
+        const tokenMatch = setCookie?.match(/X-CSRF-TOKEN=([^;]+)/);
+        const X_CSRF_TOKEN = tokenMatch ? tokenMatch[1].replace(/X-CSRF-TOKEN=/g, '') : null;
+        if (X_CSRF_TOKEN) {
+            const resData = (await fetch('https://passport.weibo.com/sso/v2/qrcode/image?entry=wapsso&size=180', {
+                method: 'GET',
+                headers: lodash.merge(WeiboApi.WEIBO_LOGIN_QR_CODE_HEADERS, {
+                    'Host': 'passport.weibo.com',
+                    'X-CSRF-TOKEN': X_CSRF_TOKEN,
+                    'Cookie': `X-CSRF-TOKEN=${X_CSRF_TOKEN}`
+                }),
+                redirect: 'follow'
+            }).then(res => res.json()));
+            if (resData?.retcode === 20000000) {
+                const qrid = resData?.data?.qrid;
+                const qrcodeUrl = resData?.data?.image;
+                let msg = [];
+                if (qrid && qrcodeUrl) {
+                    const imgResponse = await fetch(qrcodeUrl, {
+                        method: 'GET',
+                        headers: WeiboApi.WEIBO_LOGIN_QR_CODE_IMAGE_HEADERS,
+                        redirect: 'follow'
+                    });
+                    if (!imgResponse.ok) {
+                        logger.error(`获取微博登录二维码失败: ${imgResponse.status}`);
+                        throw new Error(`获取微博登录图片失败，状态码: ${imgResponse.status}`);
+                    }
+                    // 等待3秒再获取rid
+                    await new Promise(resolve => setTimeout(resolve, 3000));
+                    const ridData = await getRidFromBd(X_CSRF_TOKEN);
+                    if (ridData?.retcode === 20000000) {
+                        const rid = ridData?.data?.rid;
+                        const arrayBuffer = await imgResponse.arrayBuffer();
+                        msg.push(Segment.image(Buffer.from(arrayBuffer)));
+                        e.reply('请在3分钟内扫码以完成微博登陆绑定');
+                        e.reply(msg);
+                        logger.info(`优纪插件: 如果发送二维码图片消息失败可复制如下URL, 浏览器访问此URL查看二维码并扫码`);
+                        logger.info(`优纪插件: 微博登陆二维码URL: ${qrcodeUrl}`);
+                        return { qrid, rid, X_CSRF_TOKEN };
+                    }
+                    else {
+                        logger.error('微博登录：获取rid失败');
+                        e.reply(`获取微博登录rid密钥失败: ${JSON.stringify(ridData)}，\n接口逆向进度受阻，未完成，无法登录。\n无妨，已切换启用临时ck`);
+                        throw new Error(`获取微博登录rid密钥失败: ${JSON.stringify(ridData)}，\n接口逆向进度受阻，未完成，无法登录。\n无妨，已切换启用临时ck`);
+                    }
+                }
+            }
+            else {
+                e.reply(`获取微博登录二维码失败: ${JSON.stringify(resData)}`);
+                throw new Error(`获取微博登录二维码失败: ${JSON.stringify(resData)}`);
+            }
+        }
+        else {
+            logger.error('微博登录：获取X_CSRF_TOKEN失败');
+            return false;
+        }
+    }
+    /**处理扫码结果 */
+    static async pollLoginQRCode(e, qrid, rid, X_CSRF_TOKEN) {
+        const url = `https://passport.weibo.com/sso/v2/qrcode/check?entry=wapsso&source=wapssowb&url=https://m.weibo.cn/&qrid=${qrid}&rid=${rid}&ver=20250520`;
+        const response = await fetch(url, {
+            method: 'GET',
+            headers: lodash.merge(WeiboApi.WEIBO_POLL_LOGIN_STATUS_HEADERS, {
+                'X-CSRF-TOKEN': X_CSRF_TOKEN,
+                'Cookie': `X-CSRF-TOKEN=${X_CSRF_TOKEN}`
+            }),
+            redirect: 'follow'
+        });
+        if (!response.ok) {
+            throw new Error(`处理B站登录token网络请求失败，状态码: ${response.status}`);
+        }
+        const data = (await response.json());
+        if (data?.retcode === 20000000) {
+            // 获取 cookie url
+            const getCookieUrl = data?.data?.url;
+            if (getCookieUrl) {
+                const CookieResp = await fetch(getCookieUrl, {
+                    method: 'GET',
+                    headers: lodash.merge(WeiboApi.WEIBO_COOKIE_HEADERS, { Cookie: `X-CSRF-TOKEN=${X_CSRF_TOKEN}` }),
+                    redirect: 'follow'
+                });
+                const setCookie = CookieResp.headers.get('set-cookie');
+                if (setCookie) {
+                    await this.saveLoginCookie(e, setCookie);
+                    e.reply(`~微博登陆成功~`);
+                    return setCookie;
+                }
+                else {
+                    e.reply(`获取微博登录Cookie失败: ${JSON.stringify(CookieResp.headers)}`);
+                    return null;
+                }
+            }
+        }
+        else if (data?.retcode === 50114001) {
+            // 未扫码
+            // 继续轮询
+            await new Promise(resolve => setTimeout(resolve, 2000));
+            global?.logger?.mark(`优纪插件：扫码微博登录：未扫码，轮询中...`);
+            return this.pollLoginQRCode(e, qrid, rid, X_CSRF_TOKEN);
+        }
+        else if (data?.retcode === 50114002) {
+            // 已扫码未确认
+            // 继续轮询
+            await new Promise(resolve => setTimeout(resolve, 2000));
+            return this.pollLoginQRCode(e, qrid, rid, X_CSRF_TOKEN);
+        }
+        else if (data?.retcode === 50114003) {
+            // 二维码已失效
+            e.reply('微博登陆二维码已失效');
+            return null;
+        }
+        else {
+            e.reply('处理微博登录扫码结果出错');
+            throw new Error(`处理微博登录扫码结果出错: ${JSON.stringify(data)}`);
+        }
+        return null;
+    }
+    /**查看app扫码登陆获取的ck的有效状态*/
+    static async checkWeiboLogin(e) {
+        const LoginCookie = await this.readLoginCookie();
+        if (String(LoginCookie).trim().length < 10) {
+            e.reply('啊咧？微博登录CK呢？哦，没 #扫码微博登录# 或缓存失效了啊，那没事了。');
+            return;
+        }
+        else {
+            const { cookie, mark } = await WeiboMainModels.readSyncCookie();
+            let COOKIE = '', XSRF_TOKEN = '';
+            if (String(cookie).includes('XSRF-TOKEN')) {
+                COOKIE = cookie;
+                XSRF_TOKEN = await WeiboMainModels.readSavedCookieItems(cookie, ['XSRF-TOKEN'], false);
+            }
+            const resData = (await fetch('https://m.weibo.cn/api/config', {
+                method: 'GET',
+                headers: lodash.merge(WeiboApi.WEIBO_HEADERS, {
+                    'X-XSRF-TOKEN': `${XSRF_TOKEN}`,
+                    'Cookie': `${COOKIE}`,
+                    'Host': 'm.weibo.cn',
+                    'Referer': 'https://m.weibo.cn'
+                }),
+                redirect: 'follow'
+            }).then(res => res.json()));
+            global?.logger?.debug(`微博验证登录状态:${JSON.stringify(resData)}`);
+            if (resData.data?.login === true) {
+                const uid = Number(resData.data.uid);
+                const user_token = resData.data.user_token;
+                const infoRes = (await fetch(`https://m.weibo.cn/profile/info?uid=${uid}`, {
+                    method: 'GET',
+                    headers: lodash.merge(WeiboApi.WEIBO_HEADERS, {
+                        'X-XSRF-TOKEN': `${XSRF_TOKEN}`,
+                        'Cookie': `${COOKIE}`,
+                        'Host': 'm.weibo.cn',
+                        'x-h5-user-token': `${user_token}`,
+                        'Referer': `https://m.weibo.cn/profile/${uid}?user_token=${user_token}`
+                    }),
+                    redirect: 'follow'
+                }).then(res => res.json()));
+                let uname = infoRes.data?.user?.screen_name;
+                let mid = infoRes.data?.user?.id;
+                let follow_count = infoRes.data?.user?.follow_count;
+                let svip = infoRes.data?.user?.svip;
+                const cookie = await this.readLoginCookie();
+                const ALF = this.extractALFValue(cookie);
+                let TLL = 0;
+                if (ALF) {
+                    TLL = Number(ALF) * 1000;
+                }
+                const EXP_TIME = moment(TLL * 1000).format('YYYY年MM月DD日 HH:mm:ss');
+                e.reply(`~微博账号已登陆~\n昵称：${uname}\nuid：${mid}\nsvip等级：${svip}\n关注：${follow_count}\n登录失效时间：${EXP_TIME}`);
+            }
+            else {
+                // 处理其他情况
+                e.reply('意外情况，未能获取微博登录ck的有效状态');
+                return;
+            }
+        }
+    }
+    /** 获取ALF值*/
+    static extractALFValue(cookieString) {
+        const match = cookieString.match(/ALF=(\d+)/);
+        if (match && match[1]) {
+            return parseInt(match[1], 10);
+        }
+        return null;
+    }
+    /**
+     * *******************************************************************
+     * cookie相关
+     * *******************************************************************
+     */
+    /**保存扫码登录的weiboLoginCK*/
+    static async saveLoginCookie(e, weiboLoginCk) {
+        if (weiboLoginCk && weiboLoginCk.length > 0) {
+            const weiboLoginCkKey = 'Yz:yuki:weibo:loginCookie';
+            Redis.set(weiboLoginCkKey, weiboLoginCk, { EX: 3600 * 24 * 300 });
+        }
+        else {
+            e.reply('扫码超时');
+        }
+    }
+    /** 读取扫码登陆后缓存的weiboCookie */
+    static async readLoginCookie() {
+        const CK_KEY = 'Yz:yuki:weibo:loginCookie';
+        const tempCk = await Redis.get(CK_KEY);
+        return tempCk ? tempCk : '';
+    }
+    /** 读取手动绑定的weibo CK */
+    static async readLocalBiliCk() {
+        const CK_KEY = 'Yz:yuki:weibo:localCookie';
+        const tempCk = await Redis.get(CK_KEY);
+        return tempCk ? tempCk : '';
+    }
+    /** 覆盖保存手动获取绑定的weibo ck */
+    static async saveLocalBiliCk(data) {
+        const weiboLoginCkKey = 'Yz:yuki:weibo:localCookie';
+        Redis.set(weiboLoginCkKey, data, { EX: 3600 * 24 * 300 });
+    }
+    /** 读取扫码登陆后缓存的weibo cookie的有效时间 */
+    static async readLoginCookieTTL() {
+        const CK_KEY = 'Yz:yuki:weibo:loginCookie';
+        const tempCk = await Redis.get(CK_KEY);
+        if (tempCk) {
+            const LoginCookieTTL = await Redis.ttl(CK_KEY);
+            return LoginCookieTTL;
+        }
+        else {
+            return -2;
+        }
+    }
+    /** 综合获取ck，返回优先级：localCK > loginCK */
+    static async readSyncCookie() {
+        const localCk = await this.readLocalBiliCk();
+        const loginCk = await this.readLoginCookie();
+        const validCk = (ck) => ck?.includes('SUB=') && ck?.includes('SUBP=');
+        if (validCk(localCk)) {
+            return { cookie: localCk, mark: 'localCk' };
+        }
+        else if (validCk(loginCk)) {
+            return { cookie: loginCk + ';', mark: 'loginCk' };
+        }
+        else {
+            return { cookie: '', mark: 'ckIsEmpty' };
+        }
+    }
+    /**
+     * 综合读取、筛选 传入的或本地或redis存储的cookie的item
+     * @param {string} mark 读取存储的CK类型，'localCK'  'loginCK' 或传入值 'xxx'并进行筛选
+     * @param {Array} items 选取获取CK的项 选全部值：items[0] = 'all' ，或选取其中的值 ['XSRF-TOKEN', 'SUB', 'SUBP', 'SRF', 'SCF', 'SRT', ' _T_WM', 'M_WEIBOCN_PARAMS', 'SSOLoginState','ALF']
+     * @param {boolean} isInverted 控制正取和反取，true为反取，默认为false正取
+     * @returns {string}
+     **/
+    static async readSavedCookieItems(mark, items, isInverted = false) {
+        let ckString;
+        switch (mark) {
+            case 'localCK':
+                ckString = await this.readLocalBiliCk();
+                break;
+            case 'loginCK':
+                ckString = await this.readLoginCookie();
+                break;
+            default:
+                ckString = mark;
+        }
+        const Wck = lodash.trim(ckString);
+        if (!Wck) {
+            return '';
+        }
+        if (items[0] === 'all') {
+            return Wck;
+        }
+        const cookiePairs = String(Wck)
+            .trim()
+            .match(/(\w+)=([^;|,]+)/g) //正则 /(\w+)=([^;]+);/g 匹配 a=b 的内容，并分组为 [^;|,]+ 来匹配值，其中 [^;|,] 表示除了分号和,以外的任意字符
+            ?.map(match => match.split('='))
+            .filter(([key, value]) => (isInverted ? !items.includes(key) : items.includes(key)) && value !== '')
+            .map(([key, value]) => `${key}=${value}`)
+            .join(';') || '';
+        return cookiePairs;
+    }
+    // 取反读取ck、筛选 传入的或本地或redis存储的cookie的item
+    static async readSavedCookieOtherItems(mark, items) {
+        return await this.readSavedCookieItems(mark, items, true);
+    }
+    /**更新cookie */
+    static async updateCookieWithSetCookie(setCookieHeaders, mark) {
+        // 1. 读取当前保存的 Cookie
+        const currentCookie = await this.readLoginCookie();
+        // 使用 Record<string, string | undefined> 类型接收解析结果
+        const cookieObj = currentCookie ? parse(currentCookie) : {};
+        // 2. 解析 Set-Cookie 响应头并更新 Cookie 对象
+        setCookieHeaders.forEach(header => {
+            const parsedCookie = parse(header.split(';')[0]);
+            Object.entries(parsedCookie).forEach(([key, value]) => {
+                if (value === 'deleted') {
+                    delete cookieObj[key];
+                }
+                else if (value !== undefined) {
+                    // 添加类型守卫
+                    cookieObj[key] = value;
+                }
+            });
+        });
+        // 3. 过滤掉 undefined 值并重新组合为字符串
+        const validCookies = {};
+        Object.entries(cookieObj).forEach(([key, value]) => {
+            if (value !== undefined) {
+                validCookies[key] = value;
+            }
+        });
+        const updatedCookie = Object.entries(validCookies)
+            .map(([key, value]) => serialize(key, value))
+            .join('; ');
+        // 4. 保存更新后的 Cookie
+        if (updatedCookie) {
+            let key = '';
+            if (mark === 'loginCK') {
+                key = 'Yz:yuki:weibo:loginCookie';
+            }
+            else if (mark === 'localCK') {
+                key = 'Yz:yuki:weibo:localCookie';
+            }
+            Redis.set(key, updatedCookie, { EX: 3600 * 24 * 300 });
+        }
+    }
+}
+
+export { WeiboMainModels };

package/lib/models/weibo/weibo.risk.bd.rid.js

@@ -0,0 +1,309 @@
+import WeiboApi from './weibo.main.api.js';
+import lodash from 'lodash';
+import crypto from 'crypto';
+
+/**
+ * 生成更真实的鼠标轨迹数据（贝塞尔曲线模拟）
+ * @returns {Array<Array<number>>} 鼠标轨迹数据 [[x偏移, y偏移, 时间戳], ...]
+ */
+function generateRealisticMouseTrack() {
+    const tracks = [];
+    const now = Date.now();
+    // 生成最近5分钟内的时间点
+    const startTime = now - 5 * 60 * 1000;
+    const endTime = now;
+    // 起始点和结束点
+    const startX = Math.floor(Math.random() * 200);
+    const startY = Math.floor(Math.random() * 200);
+    const endX = 200 + Math.floor(Math.random() * 800); // 页面常见宽度范围内
+    const endY = 100 + Math.floor(Math.random() * 600); // 页面常见高度范围内
+    // 控制点（用于贝塞尔曲线）
+    const controlX = startX + (endX - startX) * 0.3 + Math.random() * 200 - 100;
+    const controlY = startY + (endY - startY) * 0.7 + Math.random() * 200 - 100;
+    // 生成轨迹点数量
+    const pointCount = 30 + Math.floor(Math.random() * 40);
+    // 时间间隔
+    let currentTime = startTime;
+    const timeStep = (endTime - startTime) / pointCount;
+    for (let i = 0; i <= pointCount; i++) {
+        const t = i / pointCount;
+        // 二次贝塞尔曲线计算当前位置
+        const x = (1 - t) * (1 - t) * startX + 2 * (1 - t) * t * controlX + t * t * endX;
+        const y = (1 - t) * (1 - t) * startY + 2 * (1 - t) * t * controlY + t * t * endY;
+        // 计算与上一个点的偏移量
+        if (i === 0) {
+            // 第一个点，偏移量为0
+            tracks.push([0, 0, Math.floor(currentTime)]);
+        }
+        else {
+            const prevPoint = tracks[tracks.length - 1];
+            const deltaX = Math.round(x - (prevPoint[0] + prevPoint[0])); // 简化计算
+            const deltaY = Math.round(y - (prevPoint[1] + prevPoint[1]));
+            tracks.push([deltaX, deltaY, Math.floor(currentTime)]);
+        }
+        // 更新时间戳
+        currentTime += timeStep + (Math.random() * 200 - 100); // 添加随机波动
+    }
+    return tracks;
+}
+/**
+ * 生成浏览器指纹数据
+ * @returns {Object} 包含浏览器指纹信息的对象
+ */
+function generateFingerprint() {
+    const fingerprintData = { fp: {}, bh: {}, r: {} };
+    // 浏览器指纹信息
+    fingerprintData.fp = {
+        // 版本信息
+        0: '1.2.1',
+        // 是否支持某特性（布尔值）
+        1: {
+            s: 1,
+            v: false
+        },
+        // 语言信息
+        2: {
+            s: 1,
+            v: ['lang']
+        },
+        // User Agent 字符串
+        3: {
+            s: 1,
+            v: WeiboApi.USER_AGENT.replace(/Mozilla\//g, '')
+        },
+        // 错误信息
+        4: {
+            s: 1,
+            v: "TypeError: Cannot read properties of null (reading '0')\n    at W (https://passport.sinaimg.cn/js/fp/1.2.1.umd.js:1:14066)\n    at Object.NiOqR (https://passport.sinaimg.cn/js/fp/1.2.1.umd.js:1:3108)\n    at https://passport.sinaimg.cn/js/fp/1.2.1.umd.js:1:29253\n    at Array.map (<anonymous>)\n    at je (https://passport.sinaimg.cn/js/fp/1.2.1.umd.js:1:29193)\n    at Object.Qhlex (https://passport.sinaimg.cn/js/fp/1.2.1.umd.js:1:5250)\n    at Ie (https://passport.sinaimg.cn/js/fp/1.2.1.umd.js:1:25296)\n    at Object.NsuAP (https://passport.sinaimg.cn/js/fp/1.2.1.umd.js:1:4977)\n    at Pe (https://passport.sinaimg.cn/js/fp/1.2.1.umd.js:1:24928)\n    at Module.Ve [as get] (https://passport.sinaimg.cn/js/fp/1.2.1.umd.js:1:24667)"
+        },
+        // 数值型数据
+        5: {
+            s: 1,
+            v: 33
+        },
+        // 函数字符串表示
+        6: {
+            s: 1,
+            v: 'function bind() { [native code] }'
+        },
+        // 语言环境
+        7: {
+            s: 1,
+            v: [['zh-CN']]
+        },
+        // 布尔值
+        8: {
+            s: 1,
+            v: true
+        },
+        // 布尔值
+        9: {
+            s: 1,
+            v: false
+        },
+        // 布尔值
+        10: {
+            s: 1,
+            v: true
+        },
+        // 数值
+        11: {
+            s: 1,
+            v: 5
+        },
+        // 错误信息
+        12: {
+            s: -1,
+            e: ''
+        },
+        // 日期字符串
+        13: {
+            s: 1,
+            v: '20030107'
+        },
+        // 数值
+        14: {
+            s: 1,
+            v: 50
+        },
+        // 完整的 User Agent
+        15: {
+            s: 1,
+            v: WeiboApi.USER_AGENT
+        },
+        // WebGL 信息
+        16: {
+            s: 1,
+            v: {
+                vendor: 'WebKit',
+                renderer: 'WebKit WebGL'
+            }
+        },
+        // 外部对象字符串表示
+        17: {
+            s: 1,
+            v: '[object External]'
+        },
+        // 屏幕尺寸信息
+        18: {
+            s: 1,
+            v: {
+                ow: 1920,
+                oh: 1152,
+                iw: 257,
+                ih: 1031
+            }
+        },
+        // 浏览器名称
+        19: {
+            s: 1,
+            v: 'chrome'
+        },
+        // 浏览器内核
+        20: {
+            s: 1,
+            v: 'chromium'
+        },
+        // 布尔值
+        21: {
+            s: 1,
+            v: false
+        },
+        // 布尔值
+        22: {
+            s: 1,
+            v: true
+        },
+        // 触摸支持信息
+        23: {
+            s: 1,
+            v: {
+                ots: false,
+                mtp: 0,
+                mmtp: -1
+            }
+        }
+    };
+    // 行为数据（鼠标轨迹和键盘操作）
+    fingerprintData.bh = {
+        // 鼠标移动轨迹 [x偏移, y偏移, 时间戳毫秒]
+        mt: generateRealisticMouseTrack(),
+        // 键盘操作统计
+        kt: {
+            down: 0,
+            up: 0
+        }
+    };
+    // 追踪设置
+    fingerprintData.r = {
+        isTraceKeyboard: true,
+        isTraceMouse: true
+    };
+    return fingerprintData;
+}
+/**
+ * 生成 AES 加密密钥和初始化向量
+ * @returns {Promise<Object>} 包含 key 和 iv 的对象
+ */
+function generateAESKey() {
+    // 生成 AES 密钥 (16位)
+    const key = crypto.randomBytes(16);
+    // 生成初始化向量
+    const iv = crypto.randomBytes(16);
+    return {
+        key: Buffer.from(key).toString('base64'),
+        iv: Buffer.from(iv).toString('base64')
+    };
+}
+/**
+ * RSA 加密函数 (模拟浏览器 Web Crypto API)
+ * @param {string} data - 待加密数据
+ * @param {Uint8Array} publicKeyDer - DER 格式的公钥
+ * @returns {Buffer} 加密后的数据
+ */
+function rsaEncrypt(data, publicKeyDer) {
+    // 将 DER 格式的公钥转换为 PEM 格式
+    const base64Key = Buffer.from(publicKeyDer).toString('base64');
+    const keyLines = base64Key.match(/.{1,64}/g) ?? [];
+    const publicKeyPem = `-----BEGIN PUBLIC KEY-----\n${keyLines.join('\n')}\n-----END PUBLIC KEY-----`;
+    // 使用 RSA-OAEP-SHA256 算法加密
+    return crypto.publicEncrypt({
+        key: publicKeyPem,
+        padding: crypto.constants.RSA_PKCS1_OAEP_PADDING,
+        oaepHash: 'sha256'
+    }, Buffer.from(data, 'binary'));
+}
+/**
+ * AES CBC 加密函数 (模拟浏览器 Web Crypto API)
+ * @param {string} data - 待加密数据
+ * @param {string} keyBase64 - Base64 编码的密钥
+ * @param {string} ivBase64 - Base64 编码的初始化向量
+ * @returns {string} Base64 编码的加密结果
+ */
+function aesEncrypt(data, keyBase64, ivBase64) {
+    const key = Buffer.from(keyBase64, 'base64');
+    const iv = Buffer.from(ivBase64, 'base64');
+    const cipher = crypto.createCipheriv('aes-128-cbc', key, iv);
+    cipher.setAutoPadding(true);
+    let encrypted = cipher.update(data, 'utf8', 'binary');
+    encrypted += cipher.final('binary');
+    return Buffer.from(encrypted, 'binary').toString('base64');
+}
+/**
+ * 数据加密主函数
+ * @param {string} jsonData - JSON 格式的指纹数据
+ * @returns {Promise<string>} 加密后的数据
+ */
+async function encryptData(jsonData) {
+    // 原始的 RSA 公钥（DER 格式），与源代码完全一致
+    const publicKeyDer = new Uint8Array([
+        48, 129, 159, 48, 13, 6, 9, 42, 134, 72, 134, 247, 13, 1, 1, 1, 5, 0, 3, 129, 141, 0, 48, 129, 137, 2, 129, 129, 0, 180, 249, 101, 74, 227, 247, 222, 230,
+        24, 220, 10, 149, 183, 131, 164, 185, 20, 166, 164, 114, 158, 71, 46, 151, 77, 71, 226, 23, 78, 67, 177, 246, 197, 249, 213, 39, 243, 55, 38, 112, 17, 64,
+        135, 155, 109, 50, 185, 61, 21, 105, 106, 245, 148, 212, 127, 7, 18, 227, 255, 40, 199, 241, 65, 211, 167, 185, 232, 5, 186, 189, 245, 59, 161, 214, 48,
+        160, 251, 21, 92, 187, 172, 83, 152, 11, 85, 72, 37, 137, 87, 104, 63, 39, 86, 6, 150, 84, 6, 178, 229, 220, 144, 133, 131, 212, 47, 139, 232, 185, 192, 97,
+        89, 137, 170, 141, 39, 19, 85, 4, 153, 238, 75, 93, 243, 96, 206, 72, 135, 91, 2, 3, 1, 0, 1
+    ]);
+    // 生成 AES 密钥和 IV
+    const { key, iv } = generateAESKey();
+    // RSA 加密 AES 密钥（将密钥重复两次后加密）
+    const keyBinary = Buffer.from(key, 'base64').toString('binary');
+    const encryptedKey = rsaEncrypt(keyBinary + keyBinary, publicKeyDer);
+    // AES 加密数据
+    const encryptedData = aesEncrypt(jsonData, key, iv);
+    // 组合加密数据（与原始代码保持一致的格式）
+    const result = '01' + Buffer.from('01' + encryptedKey.toString('binary') + '02' + Buffer.from(encryptedData, 'base64').toString('binary')).toString('base64');
+    return result;
+}
+/**
+ * 生成请求载荷
+ * @returns {Promise<string>} 加密后的载荷数据
+ */
+async function genBdPayload() {
+    const fingerprint = generateFingerprint();
+    const jsonString = JSON.stringify(fingerprint);
+    const encryptedData = await encryptData(jsonString);
+    return encryptedData;
+}
+/**
+ * 访问bd接口获取rid
+ * @param {string} X_CSRF_TOKEN - X_CSRF_TOKEN
+ * @returns {Promise<JSON>} 服务器响应结果
+ */
+async function getRidFromBd(X_CSRF_TOKEN) {
+    const params = new URLSearchParams();
+    const payload = await genBdPayload();
+    payload && params.append('data', payload);
+    params.append('from', 'weibo');
+    const ridData = (await fetch('https://passport.weibo.com/sso/bd', {
+        method: 'POST',
+        headers: lodash.merge(WeiboApi.WEIBO_GET_BD_TOKEN_HEADERS, {
+            Origin: 'https://passport.weibo.com',
+            Cookie: `X-CSRF-TOKEN=${X_CSRF_TOKEN}`
+        }),
+        body: params,
+        redirect: 'follow'
+    }).then(res => res.json()));
+    return ridData;
+}
+
+export { genBdPayload, getRidFromBd };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yz-yuki-plugin",
-  "version": "2.0.8-3",
+  "version": "2.0.8-5",
   "description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
   "author": "snowtafir",
   "type": "module",
@@ -28,6 +28,7 @@
     "axios": "^1.7.9",
     "chalk": "^5.3.0",
     "chokidar": "4.0.1",
+    "cookie": "^1.0.2",
     "debug": "^4.3.6",
     "jsdom": "^25.0.1",
     "json5": "^2.2.3",