koishi-plugin-bilibili-notify 1.1.2 → 1.2.0-alpha.1

package/lib/biliAPI.d.ts

@@ -26,11 +26,15 @@ declare class BiliAPI extends Service {
     getLoginStatus(qrcodeKey: string): Promise<any>;
     getLiveRoomInfo(roomId: string): Promise<any>;
     getMasterInfo(mid: string): Promise<any>;
-    enableRefreshCookiesDetect(refreshToken: string, csrf?: string): void;
     disposeNotifier(): void;
     createNewClient(): void;
     getCookies(): string;
+    getLoginInfoFromDB(): Promise<{
+        cookies: any;
+        refresh_token: string;
+    }>;
     loadCookiesFromDatabase(): Promise<void>;
+    enableRefreshCookiesDetect(): void;
     checkIfTokenNeedRefresh(refreshToken: string, csrf: string, times?: number): Promise<void>;
 }
 export default BiliAPI;

package/lib/biliAPI.js

@@ -180,26 +180,6 @@ class BiliAPI extends koishi_1.Service {
             throw new Error('网络异常，本次请求失败！');
         }
     }
-    enableRefreshCookiesDetect(refreshToken, csrf) {
-        // 获取cookies
-        const cookies = JSON.parse(this.getCookies());
-        // 获取csrf
-        if (!csrf) {
-            cookies.find(cookie => {
-                // 获取key为bili_jct的值
-                if (cookie.key === 'bili_jct') {
-                    csrf = cookie.value;
-                    return true;
-                }
-            });
-        }
-        // 判断之前是否启动检测
-        this.refreshCookieTimer && this.refreshCookieTimer();
-        // Open scheduled tasks and check if token need refresh
-        this.refreshCookieTimer = this.ctx.setInterval(() => {
-            this.checkIfTokenNeedRefresh(refreshToken, csrf);
-        }, 43200000);
-    }
     disposeNotifier() { this.loginNotifier && this.loginNotifier.dispose(); }
     createNewClient() {
         this.jar = new tough_cookie_1.CookieJar();
@@ -218,7 +198,7 @@ class BiliAPI extends koishi_1.Service {
         cookies = JSON.stringify(this.jar.serializeSync().cookies);
         return cookies;
     }
-    async loadCookiesFromDatabase() {
+    async getLoginInfoFromDB() {
         // 读取数据库获取cookies
         const data = (await this.ctx.database.get('loginBili', 1))[0];
         // 判断是否登录
@@ -228,7 +208,11 @@ class BiliAPI extends koishi_1.Service {
                 type: 'warning',
                 content: '您尚未登录，将无法使用插件提供的指令'
             });
-            return;
+            // 返回空值
+            return {
+                cookies: null,
+                refresh_token: null
+            };
         }
         // 定义解密信息
         let decryptedCookies;
@@ -247,6 +231,18 @@ class BiliAPI extends koishi_1.Service {
         }
         // 解析从数据库读到的cookies
         const cookies = JSON.parse(decryptedCookies);
+        // 返回值
+        return {
+            cookies,
+            refresh_token: decryptedRefreshToken
+        };
+    }
+    async loadCookiesFromDatabase() {
+        // Get login info from db
+        const { cookies, refresh_token } = await this.getLoginInfoFromDB();
+        // 判断是否有值
+        if (!cookies || !refresh_token)
+            return;
         // 定义CSRF Token
         let csrf;
         cookies.forEach(cookieData => {
@@ -267,11 +263,31 @@ class BiliAPI extends koishi_1.Service {
             this.jar.setCookieSync(cookie, `http${cookie.secure ? 's' : ''}://${cookie.domain}${cookie.path}`, {});
         });
         // restart plugin check
-        this.checkIfTokenNeedRefresh(decryptedRefreshToken, csrf);
+        this.checkIfTokenNeedRefresh(refresh_token, csrf);
         // enable refresh cookies detect
-        this.enableRefreshCookiesDetect(decryptedRefreshToken, csrf);
+        this.enableRefreshCookiesDetect();
+    }
+    enableRefreshCookiesDetect() {
+        // 判断之前是否启动检测
+        this.refreshCookieTimer && this.refreshCookieTimer();
+        // Open scheduled tasks and check if token need refresh
+        this.refreshCookieTimer = this.ctx.setInterval(async () => {
+            // 从数据库获取登录信息
+            const { cookies, refresh_token } = await this.getLoginInfoFromDB();
+            // 判断是否有值
+            if (!cookies || !refresh_token)
+                return;
+            // 获取csrf
+            const csrf = cookies.find(cookie => {
+                // 判断key是否为bili_jct
+                if (cookie.key === 'bili_jct')
+                    return true;
+            }).value;
+            // 检查是否需要更新
+            this.checkIfTokenNeedRefresh(refresh_token, csrf);
+        }, 43200000);
     }
-    async checkIfTokenNeedRefresh(refreshToken, csrf, times = 0) {
+    async checkIfTokenNeedRefresh(refreshToken, csrf, times = 3) {
         // 定义数据
         let data;
         // 定义方法
@@ -295,11 +311,11 @@ class BiliAPI extends koishi_1.Service {
         }
         catch (e) {
             // 发送三次仍网络错误则给管理员发送错误信息
-            if (times > 3)
+            if (times < 1)
                 return;
             // 等待3秒再次尝试
             this.ctx.setTimeout(() => {
-                this.checkIfTokenNeedRefresh(refreshToken, csrf, times + 1);
+                this.checkIfTokenNeedRefresh(refreshToken, csrf, times - 1);
             }, 3000);
             return;
         }
@@ -361,11 +377,10 @@ class BiliAPI extends koishi_1.Service {
                 bili_refresh_token: encryptedRefreshToken
             }]);
         // Get new csrf from cookies
-        let newCsrf;
-        this.jar.serializeSync().cookies.forEach(cookie => {
+        let newCsrf = this.jar.serializeSync().cookies.find(cookie => {
             if (cookie.key === 'bili_jct')
-                newCsrf = cookie.value;
-        });
+                return true;
+        }).value;
         // Accept update
         const { data: aceeptData } = await this.client.post('https://passport.bilibili.com/x/passport-login/web/confirm/refresh', {
             csrf: newCsrf,

package/lib/comRegister.js

@@ -212,7 +212,7 @@ class ComRegister {
                         // bili show
                         await session.execute('bili show');
                         // 开启cookies刷新检测
-                        ctx.biliAPI.enableRefreshCookiesDetect(loginContent.data.refresh_token);
+                        ctx.biliAPI.enableRefreshCookiesDetect();
                         return;
                     }
                 }
@@ -777,11 +777,11 @@ class ComRegister {
                             // 主播信息不会变，开播时刷新一次即可
                             uData = userData;
                             // 发送直播通知卡片
-                            sendLiveNotifyCard(data, uData, LiveType.StartBroadcasting);
+                            await sendLiveNotifyCard(data, uData, LiveType.StartBroadcasting);
                             // 判断是否需要@全体成员
                             if (this.config.liveStartAtAll) {
                                 // 发送@全体成员通知
-                                bot.sendMessage(guildId, (0, jsx_runtime_1.jsx)("at", { type: "all" }));
+                                await bot.sendMessage(guildId, (0, jsx_runtime_1.jsx)("at", { type: "all" }));
                             }
                         }
                         else { // 还在直播

package/package.json

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

package/readme.md

@@ -96,6 +96,7 @@
 - ver 1.1.0 移除了直播艾特全体成员选项实验性的标志，优化了直播房间号的获取逻辑，移除了部分测试代码
 - ver 1.1.1 新增依赖axios
 - ver 1.1.2 修复了对red协议支持的一个bug
+- ver 1.2.0-alpha.0 对自动更新登录信息的功能做了提升，修复了一些bug
 
 ## 感谢