koishi-plugin-bilibili-notify 1.0.13 → 1.0.14

package/lib/biliAPI.d.ts

@@ -12,6 +12,7 @@ declare class BiliAPI extends Service {
     client: any;
     loginData: any;
     loginNotifier: Notifier;
+    refreshCookieTimer: Function;
     constructor(ctx: Context);
     protected start(): void | Promise<void>;
     getServerUTCTime(): Promise<number>;

package/lib/biliAPI.js

@@ -25,6 +25,7 @@ class BiliAPI extends koishi_1.Service {
     client;
     loginData;
     loginNotifier;
+    refreshCookieTimer;
     constructor(ctx) {
         super(ctx, 'biliAPI');
     }
@@ -35,6 +36,52 @@ class BiliAPI extends koishi_1.Service {
         this.loadCookiesFromDatabase();
         // this.logger.info('BiliAPI已被注册到Context中')
     }
+    /* async test_refresh_token() {
+        const publicKey = await crypto.subtle.importKey(
+            "jwk",
+            {
+                kty: "RSA",
+                n: "y4HdjgJHBlbaBN04VERG4qNBIFHP6a3GozCl75AihQloSWCXC5HDNgyinEnhaQ_4-gaMud_GF50elYXLlCToR9se9Z8z433U3KjM-3Yx7ptKkmQNAMggQwAVKgq3zYAoidNEWuxpkY_mAitTSRLnsJW-NCTa0bqBFF6Wm1MxgfE",
+                e: "AQAB",
+            },
+            { name: "RSA-OAEP", hash: "SHA-256" },
+            true,
+            ["encrypt"],
+        )
+
+        async function getCorrespondPath(timestamp) {
+            const data = new TextEncoder().encode(`refresh_${timestamp}`);
+            const encrypted = new Uint8Array(await crypto.subtle.encrypt({ name: "RSA-OAEP" }, publicKey, data))
+            return encrypted.reduce((str, c) => str + c.toString(16).padStart(2, "0"), "")
+        }
+
+        const ts = Date.now()
+        const correspondPath = await getCorrespondPath(ts)
+        const { data } = await this.client.get(`https://www.bilibili.com/correspond/1/${correspondPath}`)
+        // 创建一个虚拟的DOM元素
+        const { document } = new JSDOM(data).window;
+        // 提取标签name为1-name的内容
+        const targetElement = document.getElementById('1-name');
+        const refresh_csrf = targetElement ? targetElement.textContent : null;
+        // 获取csrf
+        let csrf: string
+        const cookies = JSON.parse(this.getCookies())
+        cookies.forEach(cookie => {
+            if (cookie.key === 'bili_jct') csrf = cookie.value
+        })
+        // 读取数据库获取cookies
+        const database = (await this.ctx.database.get('loginBili', 1))[0]
+        // 获取refreshToken
+        const refresh_token = this.ctx.wbi.decrypt(database.bili_refresh_token)
+        // 发送请求
+        const { data: refreshData } = await this.client.post('https://passport.bilibili.com/x/passport-login/web/cookie/refresh', {
+            csrf,
+            refresh_csrf,
+            source: 'main_web',
+            refresh_token
+        })
+        console.log(refreshData);
+    } */
     async getServerUTCTime() {
         try {
             const { data } = await this.client.get(GET_SERVER_UTC_TIME);
@@ -204,12 +251,28 @@ class BiliAPI extends koishi_1.Service {
         // restart plugin check
         this.checkIfTokenNeedRefresh(decryptedRefreshToken, csrf);
         // Open scheduled tasks and check if token need refresh
-        this.ctx.setInterval(() => {
+        this.refreshCookieTimer = this.ctx.setInterval(() => {
             this.checkIfTokenNeedRefresh(decryptedRefreshToken, csrf);
         }, 43200000);
     }
     async checkIfTokenNeedRefresh(refreshToken, csrf, times = 0) {
+        // 定义数据
         let data;
+        // 定义方法
+        const notifyAndError = (info) => {
+            // 设置控制台通知
+            this.loginNotifier = this.ctx.notifier.create({
+                type: 'warning',
+                content: info
+            });
+            // 重置为未登录状态
+            this.createNewClient();
+            // 关闭定时器
+            this.refreshCookieTimer();
+            // 抛出错误
+            throw new Error(info);
+        };
+        // 尝试获取Cookieinfo
         try {
             const { data: cookieData } = await this.getCookieInfo(refreshToken);
             data = cookieData;
@@ -227,17 +290,21 @@ class BiliAPI extends koishi_1.Service {
         // 不需要刷新，直接返回
         if (!data.refresh)
             return;
+        // 定义Key
         const publicKey = await crypto.subtle.importKey("jwk", {
             kty: "RSA",
             n: "y4HdjgJHBlbaBN04VERG4qNBIFHP6a3GozCl75AihQloSWCXC5HDNgyinEnhaQ_4-gaMud_GF50elYXLlCToR9se9Z8z433U3KjM-3Yx7ptKkmQNAMggQwAVKgq3zYAoidNEWuxpkY_mAitTSRLnsJW-NCTa0bqBFF6Wm1MxgfE",
             e: "AQAB",
         }, { name: "RSA-OAEP", hash: "SHA-256" }, true, ["encrypt"]);
+        // 定义获取CorrespondPath方法
         async function getCorrespondPath(timestamp) {
             const data = new TextEncoder().encode(`refresh_${timestamp}`);
             const encrypted = new Uint8Array(await crypto.subtle.encrypt({ name: "RSA-OAEP" }, publicKey, data));
             return encrypted.reduce((str, c) => str + c.toString(16).padStart(2, "0"), "");
         }
-        const correspondPath = await getCorrespondPath(data.timestamp);
+        // 获取CorrespondPath
+        const ts = Date.now();
+        const correspondPath = await getCorrespondPath(ts);
         // 获取refresh_csrf
         const { data: refreshCsrfHtml } = await this.client.get(`https://www.bilibili.com/correspond/1/${correspondPath}`);
         // 创建一个虚拟的DOM元素
@@ -247,19 +314,11 @@ class BiliAPI extends koishi_1.Service {
         const refresh_csrf = targetElement ? targetElement.textContent : null;
         // 发送刷新请求
         const { data: refreshData } = await this.client.post('https://passport.bilibili.com/x/passport-login/web/cookie/refresh', {
-            csrf: csrf.trim(),
+            csrf,
             refresh_csrf,
             source: 'main_web',
             refresh_token: refreshToken
         });
-        const notifyAndError = (info) => {
-            // 设置控制台通知
-            this.loginNotifier = this.ctx.notifier.create({
-                type: 'warning',
-                content: info
-            });
-            throw new Error(info);
-        };
         // 检查是否有其他问题
         switch (refreshData.code) {
             // 账号未登录
@@ -283,12 +342,6 @@ class BiliAPI extends koishi_1.Service {
             }]);
         // Get new csrf from cookies
         let newCsrf;
-        /* this.jar.store.getAllCookies((err, c) => {
-            if (err) throw err;
-            c.forEach(cookie => {
-                if (cookie.key === 'bili_jct') newCsrf = cookie.value
-            });
-        }) */
         this.jar.serializeSync().cookies.forEach(cookie => {
             if (cookie.key === 'bili_jct')
                 newCsrf = cookie.value;

package/lib/comRegister.d.ts

@@ -20,6 +20,7 @@ declare class ComRegister {
     qqBot: Bot<Context>;
     qqguildBot: Bot<Context>;
     oneBot: Bot<Context>;
+    redBot: Bot<Context>;
     constructor(ctx: Context, config: ComRegister.Config);
     dynamicDetect(ctx: Context, bot: Bot<Context>, guildId: string, uid: string): () => Promise<void>;
     liveDetect(ctx: Context, bot: Bot<Context>, guildId: string, roomId: string): () => Promise<string[]>;
@@ -33,6 +34,7 @@ declare class ComRegister {
 declare namespace ComRegister {
     interface Config {
         unlockSubLimits: boolean;
+        liveStartAtAll: boolean;
         pushTime: number;
         liveLoopTime: number;
         dynamicLoopTime: number;

package/lib/comRegister.js

@@ -27,15 +27,20 @@ class ComRegister {
     qqguildBot;
     // OneBot机器人
     oneBot;
+    // Red机器人
+    redBot;
     constructor(ctx, config) {
         this.logger = ctx.logger('commandRegister');
         this.config = config;
-        // 拿到QQ群机器人
-        this.qqBot = ctx.bots.find(bot => bot.platform === 'qq');
-        // 拿到QQ频道机器人
-        this.qqguildBot = ctx.bots.find(bot => bot.platform === 'qqguild');
-        // 拿到OneBot机器人
-        this.oneBot = ctx.bots.find(bot => bot.platform === 'onebot');
+        // 拿到各类机器人
+        ctx.bots.forEach(bot => {
+            switch (bot.platform) {
+                case 'qq': this.qqBot = bot;
+                case 'qqguild': this.qqguildBot = bot;
+                case 'onebot': this.oneBot = bot;
+                case ' red': this.redBot = bot;
+            }
+        });
         // 从数据库获取订阅
         this.getSubFromDatabase(ctx);
         /* const testCom = ctx.command('test', { hidden: true, permissions: ['authority:5'] })
@@ -45,7 +50,7 @@ class ComRegister {
             .action(async () => {
                 this.logger.info('调用test cookies指令')
                 // await ctx.biliAPI.loadCookiesFromDatabase()
-                console.log(ctx.biliAPI.getCookies());
+                console.log(JSON.parse(ctx.biliAPI.getCookies()));
             })
 
         testCom
@@ -120,6 +125,14 @@ class ComRegister {
             .example('test utc')
             .action(async ({ session }) => {
                 session.send((await ctx.biliAPI.getServerUTCTime()).toString())
+            })
+
+        testCom
+            .subcommand('.refresh')
+            .usage('测试cookie刷新方法')
+            .example('test refresh')
+            .action(async ({ session }) => {
+                ctx.biliAPI.test_refresh_token()
             }) */
         const biliCom = ctx.command('bili', 'bili-notify插件相关指令', { permissions: ['authority:3'] });
         biliCom.subcommand('.login', '登录B站之后才可以进行之后的操作')
@@ -154,43 +167,55 @@ class ComRegister {
             });
             // 检查之前是否存在登录定时器
             this.loginTimer && this.loginTimer();
+            // 设置flag
+            let flag = true;
             // 发起登录请求检查登录状态
             this.loginTimer = ctx.setInterval(async () => {
-                let loginContent;
                 try {
-                    loginContent = await ctx.biliAPI.getLoginStatus(content.data.qrcode_key);
-                }
-                catch (e) {
-                    this.logger.error(e);
-                    return;
-                }
-                if (loginContent.code !== 0) {
-                    this.loginTimer();
-                    return await session.send('登录失败请联系管理员解决');
-                }
-                if (loginContent.data.code === 86038) {
-                    this.loginTimer();
-                    return await session.send('二维码已失效，请重新登录');
+                    // 判断上一个循环是否完成
+                    if (!flag)
+                        return;
+                    flag = false;
+                    // 获取登录信息
+                    let loginContent;
+                    try {
+                        loginContent = await ctx.biliAPI.getLoginStatus(content.data.qrcode_key);
+                    }
+                    catch (e) {
+                        this.logger.error(e);
+                        return;
+                    }
+                    if (loginContent.code !== 0) {
+                        this.loginTimer();
+                        return await session.send('登录失败请联系管理员解决');
+                    }
+                    if (loginContent.data.code === 86038) {
+                        this.loginTimer();
+                        return await session.send('二维码已失效，请重新登录');
+                    }
+                    if (loginContent.data.code === 0) { // 登录成功
+                        const encryptedCookies = ctx.wbi.encrypt(ctx.biliAPI.getCookies());
+                        const encryptedRefreshToken = ctx.wbi.encrypt(loginContent.data.refresh_token);
+                        await ctx.database.upsert('loginBili', [{
+                                id: 1,
+                                bili_cookies: encryptedCookies,
+                                bili_refresh_token: encryptedRefreshToken
+                            }]);
+                        // 销毁定时器
+                        this.loginTimer();
+                        // 订阅之前的订阅
+                        await this.getSubFromDatabase(ctx);
+                        // 清除控制台通知
+                        ctx.biliAPI.disposeNotifier();
+                        // 发送成功登录推送
+                        await session.send('登录成功');
+                        // bili show
+                        await session.execute('bili show');
+                        return;
+                    }
                 }
-                if (loginContent.data.code === 0) { // 登录成功
-                    const encryptedCookies = ctx.wbi.encrypt(ctx.biliAPI.getCookies());
-                    const encryptedRefreshToken = ctx.wbi.encrypt(loginContent.data.refresh_token);
-                    await ctx.database.upsert('loginBili', [{
-                            id: 1,
-                            bili_cookies: encryptedCookies,
-                            bili_refresh_token: encryptedRefreshToken
-                        }]);
-                    // 销毁定时器
-                    this.loginTimer();
-                    // 订阅之前的订阅
-                    await this.getSubFromDatabase(ctx);
-                    // 清除控制台通知
-                    ctx.biliAPI.disposeNotifier();
-                    // 发送成功登录推送
-                    await session.send('登录成功');
-                    // bili show
-                    await session.execute('bili show');
-                    return;
+                finally {
+                    flag = true;
                 }
             }, 1000);
         });
@@ -315,11 +340,12 @@ class ComRegister {
             if (!liveMsg && !dynamicMsg) {
                 return '您未订阅该UP的任何消息';
             }
-            // 设置群号
-            if (!guildId) { // 没有输入群号，默认当前聊天环境
+            // 设置频道号
+            if (!guildId) { // 没有输入频道号，默认当前聊天环境
                 switch (session.event.platform) {
-                    case 'qqguild':
+                    case 'red':
                     case 'onebot':
+                    case 'qqguild':
                         guildId = session.event.channel.id;
                         break;
                     case 'qq':
@@ -413,6 +439,9 @@ class ComRegister {
                 case 'onebot':
                     bot = this.oneBot;
                     break;
+                case 'red':
+                    bot = this.redBot;
+                    break;
                 default: return '非法调用';
             }
             // 开始循环检测
@@ -451,6 +480,9 @@ class ComRegister {
                 case 'onebot':
                     bot = this.oneBot;
                     break;
+                case 'red':
+                    bot = this.redBot;
+                    break;
                 default: return '非法调用';
             }
             // 开始循环检测
@@ -753,6 +785,11 @@ class ComRegister {
                             uData = userData;
                             // 发送直播通知卡片
                             sendLiveNotifyCard(data, uData, LiveType.StartBroadcasting);
+                            // 判断是否需要@全体成员
+                            if (this.config.liveStartAtAll) {
+                                // 发送@全体成员通知
+                                bot.sendMessage(guildId, (0, jsx_runtime_1.jsx)("at", { type: "all" }));
+                            }
                         }
                         else { // 还在直播
                             if (this.config.pushTime > 0) {
@@ -881,6 +918,9 @@ class ComRegister {
                 case 'onebot':
                     bot = this.oneBot;
                     break;
+                case 'red':
+                    bot = this.redBot;
+                    break;
                 default: {
                     // 本条数据被篡改，删除该条订阅
                     ctx.database.remove('bilibili', { id: sub.id });
@@ -1040,6 +1080,7 @@ class ComRegister {
 (function (ComRegister) {
     ComRegister.Config = koishi_1.Schema.object({
         unlockSubLimits: koishi_1.Schema.boolean().required(),
+        liveStartAtAll: koishi_1.Schema.boolean().required(),
         pushTime: koishi_1.Schema.number().required(),
         liveLoopTime: koishi_1.Schema.number().default(10),
         dynamicLoopTime: koishi_1.Schema.number().default(60),

package/lib/index.d.ts

@@ -6,6 +6,7 @@ export interface Config {
     key: string;
     basicSettings: {};
     unlockSubLimits: boolean;
+    liveStartAtAll: boolean;
     pushTime: number;
     dynamicCheckNumber: number;
     dynamicLoopTime: '1分钟' | '2分钟' | '3分钟' | '5分钟';

package/lib/index.js

@@ -49,6 +49,10 @@ exports.Config = koishi_1.Schema.object({
     unlockSubLimits: koishi_1.Schema.boolean()
         .default(false)
         .description('解锁3个订阅限制，默认只允许订阅3位UP主。订阅过多用户可能有导致IP暂时被封禁的风险'),
+    liveStartAtAll: koishi_1.Schema.boolean()
+        .default(false)
+        .experimental()
+        .description('直播开始时艾特全体成员，默认关闭'),
     pushTime: koishi_1.Schema.number()
         .min(0)
         .max(12)
@@ -61,7 +65,7 @@ exports.Config = koishi_1.Schema.object({
         .role('slider')
         .step(1)
         .default(5)
-        .description('设定每次检查动态的数量。若订阅的UP主经常在短时间内连着发多条动态可以将该值提高，若订阅的UP主有置顶动态，在计算该值时应-1。默认值为5条'),
+        .description('设定每次检查动态的数量。若订阅的UP主经常在短时间内连着发多条动态可以将该值提高，若订阅的UP主有置顶动态，在计算该值时应+1。默认值为5条'),
     dynamicLoopTime: koishi_1.Schema.union(['1分钟', '2分钟', '3分钟', '5分钟'])
         .role('')
         .default('2分钟')
@@ -163,6 +167,7 @@ function apply(ctx, config) {
     // ctx.plugin(Authority)
     ctx.plugin(comRegister_1.default, {
         unlockSubLimits: config.unlockSubLimits,
+        liveStartAtAll: config.liveStartAtAll,
         pushTime: config.pushTime,
         dynamicCheckNumber: config.dynamicCheckNumber,
         dynamicLoopTime

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],

package/readme.md

@@ -89,6 +89,7 @@
 - ver 1.0.11 修复了render渲染模式下，动态重复推送的问题，修复了没有订阅时，控制台空白提示的问题。优化了视频动态缩略图显示不全的问题，优化了部分逻辑。增强容错和增加错误提示
 - ver 1.0.12 提供用户选择动态推送卡片字体增大的选项
 - ver 1.0.13 修复了直播通知卡片连续发三次的bug，修复了多次调用指令 `bili login` 产生的bug
+- ver 1.0.14 修复了获取二维码，二维码失效后会多次发生提示的bug，新增对red的支持，新增开播艾特全体成员功能，优化了部分逻辑
 
 ## 感谢