koishi-plugin-bilibili-notify 1.2.1 → 1.2.2-beta.0

package/lib/biliAPI.d.ts

@@ -13,9 +13,9 @@ declare class BiliAPI extends Service {
     loginData: any;
     loginNotifier: Notifier;
     refreshCookieTimer: Function;
+    loginInfoIsLoaded: boolean;
     constructor(ctx: Context);
     protected start(): void | Promise<void>;
-    test_refresh_token(): Promise<void>;
     getServerUTCTime(): Promise<number>;
     getTimeNow(): Promise<any>;
     getUserSpaceDynamic(mid: string): Promise<any>;
@@ -30,6 +30,7 @@ declare class BiliAPI extends Service {
     createNewClient(): void;
     getTimeOfUTC8(): number;
     getCookies(): string;
+    getLoginInfoIsLoaded(): boolean;
     getLoginInfoFromDB(): Promise<{
         cookies: any;
         refresh_token: string;

package/lib/biliAPI.js

@@ -29,6 +29,7 @@ class BiliAPI extends koishi_1.Service {
     loginData;
     loginNotifier;
     refreshCookieTimer;
+    loginInfoIsLoaded = false;
     constructor(ctx) {
         super(ctx, 'biliAPI');
     }
@@ -39,50 +40,6 @@ 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_1.JSDOM(data).window;
-        // 提取标签name为1-name的内容
-        const targetElement = document.getElementById('1-name');
-        const refresh_csrf = targetElement ? targetElement.textContent : null;
-        // 获取csrf
-        let csrf;
-        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=${csrf}&refresh_csrf=${refresh_csrf}&source=main_web&refresh_token=${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
-        }, {
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
-            }
-        });
-        console.log(refreshData);
-    }
     async getServerUTCTime() {
         try {
             const { data } = await this.client.get(GET_SERVER_UTC_TIME);
@@ -209,6 +166,9 @@ class BiliAPI extends koishi_1.Service {
         cookies = JSON.stringify(this.jar.serializeSync().cookies);
         return cookies;
     }
+    getLoginInfoIsLoaded() {
+        return this.loginInfoIsLoaded;
+    }
     async getLoginInfoFromDB() {
         // 读取数据库获取cookies
         const data = (await this.ctx.database.get('loginBili', 1))[0];
@@ -273,6 +233,8 @@ class BiliAPI extends koishi_1.Service {
             });
             this.jar.setCookieSync(cookie, `http${cookie.secure ? 's' : ''}://${cookie.domain}${cookie.path}`, {});
         });
+        // Login info is loaded
+        this.loginInfoIsLoaded = true;
         // restart plugin check
         this.checkIfTokenNeedRefresh(refresh_token, csrf);
         // enable refresh cookies detect

package/lib/comRegister.d.ts

@@ -24,6 +24,7 @@ declare class ComRegister {
     redBot: Bot<Context>;
     telegramBot: Bot<Context>;
     satoriBot: Bot<Context>;
+    chronocatBot: Bot<Context>;
     constructor(ctx: Context, config: ComRegister.Config);
     dynamicDetect(ctx: Context, bot: Bot<Context>, uid: string, guildId: Array<string>): () => Promise<void>;
     sendMsg(targets: Array<string>, bot: Bot<Context>, content: any): Promise<void>;
@@ -31,6 +32,7 @@ declare class ComRegister {
     subShow(): string;
     checkIfNeedSub(comNeed: boolean, subType: string, session: Session, data?: any): Promise<boolean>;
     updateSubNotifier(ctx: Context): void;
+    checkIfLoginInfoIsLoaded(ctx: Context): Promise<unknown>;
     getSubFromDatabase(ctx: Context): Promise<void>;
     unsubSingle(ctx: Context, id: string, type: number): string;
     checkIfIsLogin(ctx: Context): Promise<boolean>;

package/lib/comRegister.js

@@ -33,6 +33,8 @@ class ComRegister {
     telegramBot;
     // Satori机器人
     satoriBot;
+    // Chronocat机器人
+    chronocatBot;
     constructor(ctx, config) {
         this.logger = ctx.logger('commandRegister');
         this.config = config;
@@ -57,6 +59,9 @@ class ComRegister {
                 case 'satori':
                     this.satoriBot = bot;
                     break;
+                case 'chronocat':
+                    this.chronocatBot = bot;
+                    break;
             }
         });
         // 从数据库获取订阅
@@ -311,6 +316,7 @@ class ComRegister {
                 case 'onebot':
                 case 'telegram':
                 case 'satori':
+                case 'chronocat':
                 case 'qq':
                 case 'qqguild': break;
                 default: return '暂不支持该平台';
@@ -404,6 +410,10 @@ class ComRegister {
                         okGuild = await checkIfGuildHasJoined(this.satoriBot);
                         break;
                     }
+                    case 'chronocat': {
+                        okGuild = await checkIfGuildHasJoined(this.chronocatBot);
+                        break;
+                    }
                     default: {
                         // 发送错误提示并返回
                         session.send('您尚未配置任何QQ群相关机器人，不能对QQ群进行操作');
@@ -517,6 +527,9 @@ class ComRegister {
                 case 'satori':
                     bot = this.satoriBot;
                     break;
+                case 'chronocat':
+                    bot = this.chronocatBot;
+                    break;
                 default: {
                     this.logger.warn(`${uid}非法调用 dynamic 指令，不支持该平台`);
                     return '非法调用';
@@ -563,6 +576,9 @@ class ComRegister {
                 case 'satori':
                     bot = this.satoriBot;
                     break;
+                case 'chronocat':
+                    bot = this.chronocatBot;
+                    break;
                 default: {
                     this.logger.warn(`${roomId}非法调用 dynamic 指令，不支持该平台`);
                     return `${roomId}非法调用 dynamic 指令`;
@@ -616,6 +632,19 @@ class ComRegister {
             // pic不存在，说明使用的是page模式
             await session.send(koishi_1.h.image(buffer, 'image/png'));
         });
+        biliCom
+            .subcommand('.bot', '查询当前拥有的机器人信息', { hidden: true })
+            .usage('查询当前拥有的机器人信息')
+            .example('bili bot 查询当前拥有的机器人信息')
+            .action(() => {
+            this.logger.info('开始输出BOT信息');
+            ctx.bots.forEach(bot => {
+                this.logger.info('--------------------------------');
+                this.logger.info('平台：' + bot.platform);
+                this.logger.info('名称：' + bot.user.name);
+                this.logger.info('--------------------------------');
+            });
+        });
     }
     dynamicDetect(ctx, bot, uid, guildId) {
         let firstSubscription = true;
@@ -966,11 +995,29 @@ class ComRegister {
         // 设置更新后的提示
         this.subNotifier = ctx.notifier.create(table);
     }
+    async checkIfLoginInfoIsLoaded(ctx) {
+        return new Promise(resolve => {
+            const check = () => {
+                if (!ctx.biliAPI.getLoginInfoIsLoaded()) {
+                    ctx.setTimeout(check, 500);
+                }
+                else {
+                    resolve('success');
+                }
+            };
+            check();
+        });
+    }
     async getSubFromDatabase(ctx) {
         this.logger.info('开始执行数据库读取操作');
+        // 判断登录信息是否已加载完毕
+        await this.checkIfLoginInfoIsLoaded(ctx);
         // 如果未登录，则直接返回
-        if (!(await this.checkIfIsLogin(ctx)))
+        if (!(await this.checkIfIsLogin(ctx))) {
+            // log
+            this.logger.info(`账号未登录，请登录`);
             return;
+        }
         this.logger.info('已登录账号');
         // 已存在订阅管理对象，不再进行订阅操作
         if (this.subManager.length !== 0)
@@ -1024,6 +1071,9 @@ class ComRegister {
                 case 'satori':
                     bot = this.satoriBot;
                     break;
+                case 'chronocat':
+                    bot = this.chronocatBot;
+                    break;
                 default: {
                     // 本条数据被篡改，删除该条订阅
                     ctx.database.remove('bilibili', { id: sub.id });

package/package.json

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

package/readme.md

@@ -115,6 +115,8 @@
 - ver 1.2.0-rc.5 屏蔽动态设置新增是否发送动态被屏蔽消息的选项
 - ver 1.2.0 添加屏蔽转发动态功能，添加发送动态卡片时附带文本信息和动态链接功能，支持订阅哔哩哔哩番剧出差
 - ver 1.2.1 现已支持Satori平台(实验性)
+- ver 1.2.2-alpha.0 bug测试
+- ver 1.2.2-beta.0 修复重启koishi后，提示没有任何订阅的bug，新增对chronocat的支持(实验性)
 
 ## 交流群
 801338523 使用问题或bug都可以在群里提出