koishi-plugin-bilibili-notify 1.0.10-alpha.0 → 1.0.11

package/lib/biliAPI.js

@@ -150,11 +150,7 @@ class BiliAPI extends koishi_1.Service {
     }
     getCookies() {
         let cookies;
-        this.jar.store.getAllCookies((err, c) => {
-            if (err)
-                throw err;
-            cookies = JSON.stringify(c, null, 2);
-        });
+        cookies = JSON.stringify(this.jar.serializeSync().cookies);
         return cookies;
     }
     async loadCookiesFromDatabase() {
@@ -205,6 +201,8 @@ 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);
         // Open scheduled tasks and check if token need refresh
         this.ctx.setInterval(() => {
             this.checkIfTokenNeedRefresh(decryptedRefreshToken, csrf);
@@ -285,13 +283,15 @@ class BiliAPI extends koishi_1.Service {
             }]);
         // Get new csrf from cookies
         let newCsrf;
-        this.jar.store.getAllCookies((err, c) => {
-            if (err)
-                throw err;
+        /* this.jar.store.getAllCookies((err, c) => {
+            if (err) throw err;
             c.forEach(cookie => {
-                if (cookie.key === 'bili_jct')
-                    newCsrf = cookie.value;
+                if (cookie.key === 'bili_jct') newCsrf = cookie.value
             });
+        }) */
+        this.jar.serializeSync().cookies.forEach(cookie => {
+            if (cookie.key === 'bili_jct')
+                newCsrf = cookie.value;
         });
         // Accept update
         const { data: aceeptData } = await this.client.post('https://passport.bilibili.com/x/passport-login/web/confirm/refresh', {

package/lib/comRegister.d.ts

@@ -20,8 +20,8 @@ declare class ComRegister {
     qqguildBot: Bot<Context>;
     oneBot: Bot<Context>;
     constructor(ctx: Context, config: ComRegister.Config);
-    dynamicDetect(ctx: Context, bot: Bot<Context>, guildId: string, uid: string): () => Promise<void | string[]>;
-    liveDetect(ctx: Context, bot: Bot<Context>, guildId: string, roomId: string): () => Promise<void>;
+    dynamicDetect(ctx: Context, bot: Bot<Context>, guildId: string, uid: string): () => Promise<void>;
+    liveDetect(ctx: Context, bot: Bot<Context>, guildId: string, roomId: string): () => Promise<string[]>;
     subShow(): string;
     checkIfNeedSub(comNeed: boolean, subType: string, session: Session, data?: any): Promise<boolean>;
     updateSubNotifier(ctx: Context): void;

package/lib/comRegister.js

@@ -42,7 +42,9 @@ class ComRegister {
         testCom.subcommand('.cookies')
             .usage('测试指令，用于测试从数据库读取cookies')
             .action(async () => {
-                await ctx.biliAPI.loadCookiesFromDatabase()
+                this.logger.info('调用test cookies指令')
+                // await ctx.biliAPI.loadCookiesFromDatabase()
+                console.log(ctx.biliAPI.getCookies());
             })
 
         testCom
@@ -135,19 +137,16 @@ class ComRegister {
             // 判断是否出问题
             if (content.code !== 0)
                 return await session.send('出问题咯，请联系管理员解决！');
-            // 设置二维码参数
-            let options = {
+            // 生成二维码
+            qrcode_1.default.toBuffer(content.data.url, {
                 errorCorrectionLevel: 'H', // 错误更正水平
-                type: 'image/png', // 输出类型
-                quality: 0.92, // 图像质量（仅适用于'image/jpeg'）
+                type: 'png', // 输出类型
                 margin: 1, // 边距大小
                 color: {
                     dark: '#000000', // 二维码颜色
                     light: '#FFFFFF' // 背景颜色
                 }
-            };
-            // 生成二维码
-            qrcode_1.default.toBuffer(content.data.url, options, async (err, buffer) => {
+            }, async (err, buffer) => {
                 if (err)
                     return await session.send('二维码生成出错，请联系管理员解决！');
                 await session.send(koishi_1.h.image(buffer, 'image/png'));
@@ -586,10 +585,14 @@ class ComRegister {
                                 }
                             }
                             // 如果pic存在，则直接返回pic
-                            if (pic)
-                                return await bot.sendMessage(guildId, pic);
-                            // pic不存在，说明使用的是page模式
-                            await bot.sendMessage(guildId, koishi_1.h.image(buffer, 'image/png'));
+                            if (pic) {
+                                // pic存在，使用的是render模式
+                                await bot.sendMessage(guildId, pic);
+                            }
+                            else {
+                                // pic不存在，说明使用的是page模式
+                                await bot.sendMessage(guildId, koishi_1.h.image(buffer, 'image/png'));
+                            }
                             // 如果成功，那么跳出循环
                             break;
                         }
@@ -638,14 +641,25 @@ class ComRegister {
         // 相当于锁的作用，防止上一个循环没处理完
         let flag = true;
         async function sendLiveNotifyCard(data, uData, liveType) {
-            // 获取直播通知卡片
-            const { pic, buffer } = await ctx.gimg.generateLiveImg(data, uData, liveType);
-            // 推送直播信息
-            // pic 存在，使用的是render模式
-            if (pic)
-                return bot.sendMessage(guildId, pic);
-            // pic不存在，说明使用的是page模式
-            await bot.sendMessage(guildId, koishi_1.h.image(buffer, 'image/png'));
+            let attempts = 3;
+            for (let i = 0; i < attempts; i++) {
+                try {
+                    // 获取直播通知卡片
+                    const { pic, buffer } = await ctx.gimg.generateLiveImg(data, uData, liveType);
+                    // 推送直播信息
+                    // pic 存在，使用的是render模式
+                    if (pic)
+                        return bot.sendMessage(guildId, pic);
+                    // pic不存在，说明使用的是page模式
+                    await bot.sendMessage(guildId, koishi_1.h.image(buffer, 'image/png'));
+                }
+                catch (e) {
+                    this.logger.error('liveDetect generateLiveImg() 推送卡片发送失败');
+                    if (i === attempts - 1) { // 已尝试三次
+                        return bot.sendMessage(guildId, '插件可能出现某些未知错误，请尝试重启插件，如果仍然会发生该错误，请向作者反馈');
+                    }
+                }
+            }
         }
         return async () => {
             try {
@@ -655,11 +669,17 @@ class ComRegister {
                 flag && (flag = false);
                 // 发送请求检测直播状态
                 let content;
-                try {
-                    content = await ctx.biliAPI.getLiveRoomInfo(roomId);
-                }
-                catch (e) {
-                    return this.logger.error('liveDetect getLiveRoomInfo 网络请求失败');
+                let attempts = 3;
+                for (let i = 0; i < attempts; i++) {
+                    try {
+                        content = await ctx.biliAPI.getLiveRoomInfo(roomId);
+                    }
+                    catch (e) {
+                        this.logger.error('liveDetect getLiveRoomInfo 网络请求失败');
+                        if (i === attempts - 1) { // 已尝试三次
+                            return bot.sendMessage(guildId, '你的网络可能出现了某些问题，请检查后重启插件');
+                        }
+                    }
                 }
                 const { data } = content;
                 // B站出问题了
@@ -678,12 +698,18 @@ class ComRegister {
                     firstSubscription = false;
                     // 获取主播信息
                     let userData;
-                    try {
-                        const { data: userInfo } = await ctx.biliAPI.getMasterInfo(data.uid);
-                        userData = userInfo;
-                    }
-                    catch (e) {
-                        return this.logger.error('liveDetect first sub getMasterInfo() 网络请求错误');
+                    let attempts = 3;
+                    for (let i = 0; i < attempts; i++) {
+                        try {
+                            const { data: userInfo } = await ctx.biliAPI.getMasterInfo(data.uid);
+                            userData = userInfo;
+                        }
+                        catch (e) {
+                            this.logger.error('liveDetect getMasterInfo() 本次网络请求失败');
+                            if (i === attempts - 1) { // 已尝试三次
+                                return bot.sendMessage(guildId, '你的网络可能出现了某些问题，请检查后重启插件');
+                            }
+                        }
                     }
                     // 主播信息不会变，请求一次即可
                     uData = userData;
@@ -708,7 +734,7 @@ class ComRegister {
                             // 下播了将定时器清零
                             timer = 0;
                             // 发送下播通知
-                            bot.sendMessage(guildId, `${uData.info.uname}下播啦，本次直播了${await ctx.gimg.getTimeDifference(liveTime)}`);
+                            await bot.sendMessage(guildId, `${uData.info.uname}下播啦，本次直播了${await ctx.gimg.getTimeDifference(liveTime)}`);
                         }
                         // 未进循环，还未开播，继续循环
                         break;
@@ -721,12 +747,18 @@ class ComRegister {
                             liveTime = data.live_time;
                             // 获取主播信息
                             let userData;
-                            try {
-                                const { data: userInfo } = await ctx.biliAPI.getMasterInfo(data.uid);
-                                userData = userInfo;
-                            }
-                            catch (e) {
-                                return this.logger.error('liveDetect open getMasterInfo() 网络请求错误');
+                            let attempts = 3;
+                            for (let i = 0; i < attempts; i++) {
+                                try {
+                                    const { data: userInfo } = await ctx.biliAPI.getMasterInfo(data.uid);
+                                    userData = userInfo;
+                                }
+                                catch (e) {
+                                    this.logger.error('liveDetect open getMasterInfo() 网络请求错误');
+                                    if (i === attempts - 1) { // 已尝试三次
+                                        return bot.sendMessage(guildId, '你的网络可能出现了某些问题，请检查后重启插件');
+                                    }
+                                }
                             }
                             // 主播信息不会变，开播时刷新一次即可
                             uData = userData;
@@ -801,14 +833,20 @@ class ComRegister {
     updateSubNotifier(ctx) {
         // 更新控制台提示
         this.subNotifier && this.subNotifier.dispose();
-        // 获取subTable
-        let subTableArray = this.subShow().split('\n');
-        subTableArray.splice(subTableArray.length - 1, 1);
-        // 定义Table
-        let table = (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: (0, jsx_runtime_1.jsx)("ul", { children: subTableArray.map(str => ((0, jsx_runtime_1.jsx)("li", { children: str }))) }) });
-        /* subTableArray.forEach(str => {
-            table +=
-        }) */
+        // 获取订阅信息
+        const subInfo = this.subShow();
+        // 定义table
+        let table = '';
+        if (subInfo === '没有订阅任何UP') {
+            table = subInfo;
+        }
+        else {
+            // 获取subTable
+            let subTableArray = subInfo.split('\n');
+            subTableArray.splice(subTableArray.length - 1, 1);
+            // 定义Table
+            table = (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: (0, jsx_runtime_1.jsx)("ul", { children: subTableArray.map(str => ((0, jsx_runtime_1.jsx)("li", { children: str }))) }) });
+        }
         // 设置更新后的提示
         this.subNotifier = ctx.notifier.create(table);
     }

package/lib/generateImg.js

@@ -696,7 +696,7 @@ class GenerateImg extends koishi_1.Service {
                         overflow: hidden;
                         border-radius: 5px 0 0 5px;
                         margin-top: 10px;
-                        height: 132px;
+                        height: 147px;
                     }
             
                     .card .video-cover {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "1.0.10-alpha.0",
+  "version": "1.0.11",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],
@@ -17,7 +17,6 @@
     "url": "git+https://github.com/Akokk0/koishi-plugin-bilibili-notify"
   },
   "homepage": "https://www.npmjs.com/package/koishi-plugin-bilibili-notify",
-  "scripts": {},
   "keywords": [
     "chatbot",
     "koishi",
@@ -25,16 +24,19 @@
     "bilibili"
   ],
   "peerDependencies": {
-    "koishi": "^4.16.4"
+    "koishi": "^4.16.6"
   },
   "dependencies": {
-    "axios-cookiejar-support": "^4.0.7",
-    "jsdom": "^23.2.0",
+    "axios-cookiejar-support": "^5.0.0",
+    "jsdom": "^24.0.0",
     "md5": "^2.3.0",
     "qrcode": "^1.5.3",
     "tough-cookie": "^4.1.3"
   },
   "devDependencies": {
+    "@types/md5": "^2",
+    "@types/qrcode": "^1",
+    "@types/tough-cookie": "^4",
     "koishi-plugin-puppeteer": "^3.7.3"
   },
   "koishi": {

package/readme.md

@@ -86,6 +86,7 @@
 - ver 1.0.8 修复了取消订阅的bug
 - ver 1.0.9 更新请求客户端header信息。优化了动态推送卡片的页面布局，增加了字体大小。提供用户开放订阅数量限制的选项，提供用户移除推送卡片边框的选项。在控制台页面增加订阅信息提示
 - ver 1.0.10 增加对onebot的支持，添加动态关键字屏蔽功能
+- ver 1.0.11 修复了render渲染模式下，动态重复推送的问题，修复了没有订阅时，控制台空白提示的问题。优化了视频动态缩略图显示不全的问题，优化了部分逻辑。增强容错和增加错误提示
 
 ## 感谢
 

package/lib/authority.d.ts

@@ -1,5 +0,0 @@
-import { Context } from "koishi";
-declare class Authority {
-    constructor(ctx: Context);
-}
-export default Authority;

package/lib/authority.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class Authority {
-    constructor(ctx) {
-        // 授予权限
-        /* ctx.permissions.provide('telegram:admin', async (name, session) => {
-            console.log(session);
-            return session.telegram?.sender?.role === 'admin'
-        }) */
-    }
-}
-exports.default = Authority;