koishi-plugin-bilibili-notify 1.0.14 → 1.1.0-beta.0

package/lib/biliAPI.d.ts

@@ -15,6 +15,7 @@ declare class BiliAPI extends Service {
     refreshCookieTimer: Function;
     constructor(ctx: Context);
     protected start(): void | Promise<void>;
+    test_refresh_token(): Promise<void>;
     getServerUTCTime(): Promise<number>;
     getTimeNow(): Promise<any>;
     getUserSpaceDynamic(mid: string): Promise<any>;
@@ -25,6 +26,7 @@ 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;

package/lib/biliAPI.js

@@ -36,52 +36,50 @@ 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 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 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}`)
+        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;
+        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: string
-        const cookies = JSON.parse(this.getCookies())
+        let csrf;
+        const cookies = JSON.parse(this.getCookies());
         cookies.forEach(cookie => {
-            if (cookie.key === 'bili_jct') csrf = cookie.value
-        })
+            if (cookie.key === 'bili_jct')
+                csrf = cookie.value;
+        });
         // 读取数据库获取cookies
-        const database = (await this.ctx.database.get('loginBili', 1))[0]
+        const database = (await this.ctx.database.get('loginBili', 1))[0];
         // 获取refreshToken
-        const refresh_token = this.ctx.wbi.decrypt(database.bili_refresh_token)
+        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);
@@ -182,13 +180,33 @@ 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();
         this.client = (0, axios_cookiejar_support_1.wrapper)(axios_1.default.create({
             jar: this.jar,
             headers: {
-                'Content-Type': 'application/json; charset=utf-8',
+                'Content-Type': 'application/json',
                 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
                 'Origin': 'https://www.bilibili.com',
                 'Referer': 'https://www.bilibili.com/'
@@ -250,10 +268,8 @@ class BiliAPI extends koishi_1.Service {
         });
         // restart plugin check
         this.checkIfTokenNeedRefresh(decryptedRefreshToken, csrf);
-        // Open scheduled tasks and check if token need refresh
-        this.refreshCookieTimer = this.ctx.setInterval(() => {
-            this.checkIfTokenNeedRefresh(decryptedRefreshToken, csrf);
-        }, 43200000);
+        // enable refresh cookies detect
+        this.enableRefreshCookiesDetect(decryptedRefreshToken, csrf);
     }
     async checkIfTokenNeedRefresh(refreshToken, csrf, times = 0) {
         // 定义数据
@@ -318,6 +334,10 @@ class BiliAPI extends koishi_1.Service {
             refresh_csrf,
             source: 'main_web',
             refresh_token: refreshToken
+        }, {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+            }
         });
         // 检查是否有其他问题
         switch (refreshData.code) {
@@ -333,7 +353,7 @@ class BiliAPI extends koishi_1.Service {
             }
         }
         // 更新 新的cookies和refresh_token
-        const encryptedCookies = this.ctx.wbi.encrypt(this.ctx.biliAPI.getCookies());
+        const encryptedCookies = this.ctx.wbi.encrypt(this.getCookies());
         const encryptedRefreshToken = this.ctx.wbi.encrypt(refreshData.data.refresh_token);
         await this.ctx.database.upsert('loginBili', [{
                 id: 1,
@@ -350,6 +370,10 @@ class BiliAPI extends koishi_1.Service {
         const { data: aceeptData } = await this.client.post('https://passport.bilibili.com/x/passport-login/web/confirm/refresh', {
             csrf: newCsrf,
             refresh_token: refreshToken
+        }, {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+            }
         });
         // 检查是否有其他问题
         switch (aceeptData.code) {

package/lib/comRegister.js

@@ -187,7 +187,7 @@ class ComRegister {
                     }
                     if (loginContent.code !== 0) {
                         this.loginTimer();
-                        return await session.send('登录失败请联系管理员解决');
+                        return await session.send('登录失败请重试');
                     }
                     if (loginContent.data.code === 86038) {
                         this.loginTimer();
@@ -211,6 +211,8 @@ class ComRegister {
                         await session.send('登录成功');
                         // bili show
                         await session.execute('bili show');
+                        // 开启cookies刷新检测
+                        ctx.biliAPI.enableRefreshCookiesDetect(loginContent.data.refresh_token);
                         return;
                     }
                 }
@@ -650,7 +652,7 @@ class ComRegister {
         let uData;
         // 相当于锁的作用，防止上一个循环没处理完
         let flag = true;
-        async function sendLiveNotifyCard(data, uData, liveType) {
+        const sendLiveNotifyCard = async (data, uData, liveType) => {
             let attempts = 3;
             for (let i = 0; i < attempts; i++) {
                 try {
@@ -672,7 +674,7 @@ class ComRegister {
                     }
                 }
             }
-        }
+        };
         return async () => {
             try {
                 // 如果flag为false则说明前面的代码还未执行完，则直接返回

package/lib/generateImg.js

@@ -49,7 +49,7 @@ class GenerateImg extends koishi_1.Service {
     async generateLiveImg(data, userData, liveStatus /*0未开播 1刚开播 2已开播 */) {
         const [titleStatus, liveTime, cover] = await this.getLiveStatus(data.live_time, liveStatus);
         // 加载字体
-        const fontURL = (0, url_1.pathToFileURL)((0, path_1.resolve)(__dirname, './HYZhengYuan-55W.ttf'));
+        const fontURL = (0, url_1.pathToFileURL)((0, path_1.resolve)(__dirname, 'font/HYZhengYuan-75W.ttf'));
         // 卡片内容
         const html = `
             <!DOCTYPE html>
@@ -61,7 +61,7 @@ class GenerateImg extends koishi_1.Service {
                         font-family: "Custom Font";
                         src: url(${fontURL});
                     }
-            
+
                     * {
                         margin: 0;
                         padding: 0;
@@ -187,7 +187,7 @@ class GenerateImg extends koishi_1.Service {
         `;
         // 判断渲染方式
         if (this.config.renderType) { // 为1则为真，进入page模式
-            const htmlPath = 'file://' + __dirname.replaceAll('\\', '/') + '/0.html';
+            const htmlPath = 'file://' + __dirname.replaceAll('\\', '/') + '/page/0.html';
             const page = await this.ctx.puppeteer.page();
             await page.goto(htmlPath);
             await page.setContent(html, { waitUntil: 'networkidle0' });
@@ -514,7 +514,7 @@ class GenerateImg extends koishi_1.Service {
         // 获取动态主要内容
         const [main, link] = await getDynamicMajor(data, false);
         // 加载字体
-        const fontURL = (0, url_1.pathToFileURL)((0, path_1.resolve)(__dirname, './HYZhengYuan-55W.ttf'));
+        const fontURL = (0, url_1.pathToFileURL)((0, path_1.resolve)(__dirname, 'font/HYZhengYuan-75W.ttf'));
         // 判断是否开启大字体模式
         let style;
         if (this.config.enableLargeFont) {
@@ -1259,7 +1259,7 @@ class GenerateImg extends koishi_1.Service {
         `;
         // 判断渲染方式
         if (this.config.renderType) { // 为1则为真，进入page模式
-            const htmlPath = 'file://' + __dirname.replaceAll('\\', '/') + '/0.html';
+            const htmlPath = 'file://' + __dirname.replaceAll('\\', '/') + '/page/0.html';
             const page = await this.ctx.puppeteer.page();
             await page.goto(htmlPath);
             await page.setContent(html, { waitUntil: 'networkidle0' });

package/package.json

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

package/readme.md

@@ -81,15 +81,17 @@
 - ver 1.0.3 修复了一些bug，提供用户自己选择推送卡片字体样式的选项
 - ver 1.0.4 修复了重复推送的bug，提供用户选择推送卡片渲染方式的选项
 - ver 1.0.5 修复了用户非法篡改数据库内容可能导致程序异常运行的bug，修复了UP主开播动态推送空白卡片的bug
-- ver 1.0.6 修复了转发动态转发信息出现undefined的bug，修复了再次登录订阅显示错误的bug，优化了动态推送的逻辑
-- ver 1.0.7 修复了在已登录情况下，再次登录会导致重复订阅和提示用户未订阅任何UP主的提示（实际上已订阅）的bug，新增了订阅对象在控制台的显示，优化了bili show指令的逻辑
+- ver 1.0.6 修复了转发动态转发信息出现`undefined`的bug，修复了再次登录订阅显示错误的bug，优化了动态推送的逻辑
+- ver 1.0.7 修复了在已登录情况下，再次登录会导致重复订阅和提示用户未订阅任何UP主的提示（实际上已订阅）的bug，新增了订阅对象在控制台的显示，优化了`bili show`指令的逻辑
 - ver 1.0.8 修复了取消订阅的bug
 - ver 1.0.9 更新请求客户端header信息。优化了动态推送卡片的页面布局，增加了字体大小。提供用户开放订阅数量限制的选项，提供用户移除推送卡片边框的选项。在控制台页面增加订阅信息提示
-- ver 1.0.10 增加对onebot的支持，添加动态关键字屏蔽功能
-- ver 1.0.11 修复了render渲染模式下，动态重复推送的问题，修复了没有订阅时，控制台空白提示的问题。优化了视频动态缩略图显示不全的问题，优化了部分逻辑。增强容错和增加错误提示
+- ver 1.0.10 增加对`onebot`的支持，添加动态关键字屏蔽功能
+- ver 1.0.11 修复了`render`渲染模式下，动态重复推送的问题，修复了没有订阅时，控制台空白提示的问题。优化了视频动态缩略图显示不全的问题，优化了部分逻辑。增强容错和增加错误提示
 - ver 1.0.12 提供用户选择动态推送卡片字体增大的选项
 - ver 1.0.13 修复了直播通知卡片连续发三次的bug，修复了多次调用指令 `bili login` 产生的bug
-- ver 1.0.14 修复了获取二维码，二维码失效后会多次发生提示的bug，新增对red的支持，新增开播艾特全体成员功能，优化了部分逻辑
+- ver 1.0.14 修复了获取二维码，二维码失效后会多次发送提示的bug，新增对`red`的支持，新增开播艾特全体成员功能，优化了部分逻辑
+- ver 1.1.0-alpha.0 修复了直播订阅一段时间过后提示房间不存在的bug，修复了自动登录刷新错误的bug
+- ver 1.1.0-beta.0 修复了一个bug(如果本身已经存在乱码问题的情况下，使用page模式仍然会乱码)，修复了日志bug
 
 ## 感谢