koishi-plugin-bilibili-notify 1.3.6-alpha.0 → 1.3.6-beta.0

package/lib/biliAPI.js

@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unsafe-function-type */
 /* eslint-disable @typescript-eslint/no-namespace */
-/* eslint-disable @typescript-eslint/ban-types */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 const koishi_1 = require("koishi");
 const axios_1 = __importDefault(require("axios"));
@@ -154,7 +155,8 @@ class BiliAPI extends koishi_1.Service {
             throw new Error('网络异常，本次请求失败！');
         }
     }
-    disposeNotifier() { this.loginNotifier && this.loginNotifier.dispose(); }
+    disposeNotifier() { if (this.loginNotifier)
+        this.loginNotifier.dispose(); }
     getRandomUserAgent() {
         const userAgents = [
             'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36',
@@ -271,7 +273,8 @@ class BiliAPI extends koishi_1.Service {
     }
     enableRefreshCookiesDetect() {
         // 判断之前是否启动检测
-        this.refreshCookieTimer && this.refreshCookieTimer();
+        if (this.refreshCookieTimer)
+            this.refreshCookieTimer();
         // Open scheduled tasks and check if token need refresh
         this.refreshCookieTimer = this.ctx.setInterval(async () => {
             // 从数据库获取登录信息

package/lib/comRegister.d.ts

@@ -32,6 +32,7 @@ declare class ComRegister {
     getTheCorrespondingBotBasedOnTheSession(session: Session): Bot<Context, any>;
     sendPrivateMsg(bot: Bot<Context>, content: string): Promise<void>;
     sendPrivateMsgAndRebootService(ctx: Context, bot: Bot<Context>): Promise<void>;
+    sendPrivateMsgAndStopService(ctx: Context, bot: Bot<Context>): Promise<void>;
     sendMsg(targets: Array<string>, bot: Bot<Context>, content: any): Promise<void>;
     dynamicDetect(ctx: Context, bot: Bot<Context>, uid: string, guildId: Array<string>): () => Promise<void>;
     debug_dynamicDetect(ctx: Context, bot: Bot<Context>, uid: string, guildId: Array<string>): () => Promise<void>;

package/lib/comRegister.js

@@ -4,13 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("@satorijs/element/jsx-runtime");
+/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unsafe-function-type */
 /* eslint-disable @typescript-eslint/no-namespace */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/ban-types */
 const koishi_1 = require("koishi");
 // 导入qrcode
 const qrcode_1 = __importDefault(require("qrcode"));
-const jimp_1 = __importDefault(require("jimp"));
+const jimp_1 = require("jimp");
 var LiveType;
 (function (LiveType) {
     LiveType[LiveType["NotLiveBroadcast"] = 0] = "NotLiveBroadcast";
@@ -261,7 +262,8 @@ class ComRegister {
                 await session.send(koishi_1.h.image(buffer, 'image/png'));
             });
             // 检查之前是否存在登录定时器
-            this.loginTimer && this.loginTimer();
+            if (this.loginTimer)
+                this.loginTimer();
             // 设置flag
             let flag = true;
             // 发起登录请求检查登录状态
@@ -364,7 +366,8 @@ class ComRegister {
                 }
             }));
             // 未订阅该用户，无需取消订阅
-            !exist && session.send('未订阅该用户，无需取消订阅');
+            if (!exist)
+                session.send('未订阅该用户，无需取消订阅');
         });
         biliCom
             .subcommand('.show', '展示订阅对象')
@@ -708,7 +711,7 @@ class ComRegister {
                 // 获得对应bot
                 const bot = this.getTheCorrespondingBotBasedOnTheSession(session)
                 // 发送提示消息，重启服务
-                await this.sendPrivateMsgAndRebootService(ctx, bot, '测试biliAPI等服务自动重启功能')
+                await this.sendPrivateMsgAndStopService(ctx, bot, '测试biliAPI等服务自动重启功能')
             }) */
         /* biliCom
             .subcommand('.sendall', '测试给机器人加入的所有群发送消息', { hidden: true })
@@ -812,6 +815,16 @@ class ComRegister {
             await ctx.sm.disposePlugin();
         }
     }
+    async sendPrivateMsgAndStopService(ctx, bot) {
+        // 发送消息
+        await this.sendPrivateMsg(bot, '插件发生未知错误，请检查机器人状态后使用指令 sys start 启动插件');
+        // logger
+        this.logger.error('插件发生未知错误，请检查机器人状态后使用指令 sys start 启动插件');
+        // 关闭插件
+        await ctx.sm.disposePlugin();
+        // 结束
+        return;
+    }
     async sendMsg(targets, bot, content) {
         // 定义需要发送的数组
         let sendArr = [];
@@ -946,18 +959,22 @@ class ComRegister {
                                     return updatePoint(num);
                                 if (e.message === '出现关键词，屏蔽该动态') {
                                     // 如果需要发送才发送
-                                    this.config.filter.notify && await this.sendMsg(guildId, bot, `${upName}发布了一条含有屏蔽关键字的动态`);
+                                    if (this.config.filter.notify) {
+                                        await this.sendMsg(guildId, bot, `${upName}发布了一条含有屏蔽关键字的动态`);
+                                    }
                                     return updatePoint(num);
                                 }
                                 if (e.message === '已屏蔽转发动态') {
-                                    this.config.filter.notify && await this.sendMsg(guildId, bot, `${upName}发布了一条转发动态，已屏蔽`);
+                                    if (this.config.filter.notify) {
+                                        await this.sendMsg(guildId, bot, `${upName}发布了一条转发动态，已屏蔽`);
+                                    }
                                     return updatePoint(num);
                                 }
                                 // 未知错误
                                 if (i === attempts - 1) {
                                     this.logger.error('dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：' + e.message);
                                     // 发送私聊消息并重启服务
-                                    return await this.sendPrivateMsgAndRebootService(ctx, bot);
+                                    return await this.sendPrivateMsgAndStopService(ctx, bot);
                                 }
                             }
                         }
@@ -1109,18 +1126,22 @@ class ComRegister {
                                     return updatePoint(num);
                                 if (e.message === '出现关键词，屏蔽该动态') {
                                     // 如果需要发送才发送
-                                    this.config.filter.notify && await this.sendMsg(guildId, bot, `${upName}发布了一条含有屏蔽关键字的动态`);
+                                    if (this.config.filter.notify) {
+                                        await this.sendMsg(guildId, bot, `${upName}发布了一条含有屏蔽关键字的动态`);
+                                    }
                                     return updatePoint(num);
                                 }
                                 if (e.message === '已屏蔽转发动态') {
-                                    this.config.filter.notify && await this.sendMsg(guildId, bot, `${upName}发布了一条转发动态，已屏蔽`);
+                                    if (this.config.filter.notify) {
+                                        await this.sendMsg(guildId, bot, `${upName}发布了一条转发动态，已屏蔽`);
+                                    }
                                     return updatePoint(num);
                                 }
                                 // 未知错误
                                 if (i === attempts - 1) {
                                     this.logger.error('dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：' + e.message);
                                     // 发送私聊消息并重启服务
-                                    return await this.sendPrivateMsgAndRebootService(ctx, bot);
+                                    return await this.sendPrivateMsgAndStopService(ctx, bot);
                                 }
                             }
                         }
@@ -1185,7 +1206,7 @@ class ComRegister {
                         if (i === attempts - 1) { // 已尝试三次
                             this.logger.error('liveDetect generateLiveImg() 推送卡片生成失败，原因：' + e.message);
                             // 发送私聊消息并重启服务
-                            return await this.sendPrivateMsgAndRebootService(ctx, bot);
+                            return await this.sendPrivateMsgAndStopService(ctx, bot);
                         }
                     }
                 }
@@ -1221,7 +1242,7 @@ class ComRegister {
                         if (i === attempts - 1) { // 已尝试三次
                             this.logger.error('liveDetect generateLiveImg() 推送卡片生成失败，原因：' + e.message);
                             // 发送私聊消息并重启服务
-                            return await this.sendPrivateMsgAndRebootService(ctx, bot);
+                            return await this.sendPrivateMsgAndStopService(ctx, bot);
                         }
                     }
                 }
@@ -1273,7 +1294,7 @@ class ComRegister {
                         this.logger.error('liveDetect getLiveRoomInfo 发生了错误，错误为：' + e.message);
                         if (i === attempts - 1) { // 已尝试三次
                             // 发送私聊消息并重启服务
-                            return await this.sendPrivateMsgAndRebootService(ctx, bot);
+                            return await this.sendPrivateMsgAndStopService(ctx, bot);
                         }
                     }
                 }
@@ -1294,7 +1315,7 @@ class ComRegister {
                             this.logger.error('liveDetect getMasterInfo() 发生了错误，错误为：' + e.message);
                             if (i === attempts - 1) { // 已尝试三次
                                 // 发送私聊消息并重启服务
-                                return await this.sendPrivateMsgAndRebootService(ctx, bot);
+                                return await this.sendPrivateMsgAndStopService(ctx, bot);
                             }
                         }
                     }
@@ -1326,8 +1347,8 @@ class ComRegister {
                             let resizedImage;
                             // Jimp无法处理Webp格式，直接跳过
                             try {
-                                resizedImage = await jimp_1.default.read(userface).then(async (image) => {
-                                    return await image.resize(100, 100).getBufferAsync(jimp_1.default.MIME_PNG);
+                                resizedImage = await jimp_1.Jimp.read(userface).then(async (image) => {
+                                    return await image.resize({ w: 100, h: 100 }).getBuffer(jimp_1.JimpMime.png);
                                 });
                             }
                             catch (e) {
@@ -1362,7 +1383,7 @@ class ComRegister {
                                     this.logger.error('liveDetect open getMasterInfo() 发生了错误，错误为：' + e.message);
                                     if (i === attempts - 1) { // 已尝试三次
                                         // 发送私聊消息并重启服务
-                                        return await this.sendPrivateMsgAndRebootService(ctx, bot);
+                                        return await this.sendPrivateMsgAndStopService(ctx, bot);
                                     }
                                 }
                             }
@@ -1448,7 +1469,8 @@ class ComRegister {
     }
     updateSubNotifier(ctx) {
         // 更新控制台提示
-        this.subNotifier && this.subNotifier.dispose();
+        if (this.subNotifier)
+            this.subNotifier.dispose();
         // 获取订阅信息
         const subInfo = this.subShow();
         // 定义table
@@ -1571,7 +1593,7 @@ class ComRegister {
                     this.logger.error('getSubFromDatabase() getUserInfo() 发生了错误，错误为：' + e.message);
                     if (i === attempts - 1) { // 已尝试三次
                         // 发送私聊消息并重启服务
-                        return await this.sendPrivateMsgAndRebootService(ctx, bot);
+                        return await this.sendPrivateMsgAndStopService(ctx, bot);
                     }
                 }
             }
@@ -1674,7 +1696,8 @@ class ComRegister {
                     if (index === -1)
                         return '未订阅该用户，无需取消订阅';
                     // 取消订阅
-                    this.subManager[index].live && this.subManager[index].liveDispose();
+                    if (this.subManager[index].live)
+                        this.subManager[index].liveDispose();
                     this.subManager[index].liveDispose = null;
                     this.subManager[index].live = false;
                     // 如果没有对这个UP的任何订阅，则移除
@@ -1693,7 +1716,8 @@ class ComRegister {
                     if (index === -1)
                         return '未订阅该用户，无需取消订阅';
                     // 取消订阅
-                    this.subManager[index].dynamic && this.subManager[index].dynamicDispose();
+                    if (this.subManager[index].dynamic)
+                        this.subManager[index].dynamicDispose();
                     this.subManager[index].dynamicDispose = null;
                     this.subManager[index].dynamic = false;
                     // 如果没有对这个UP的任何订阅，则移除

package/lib/index.js

@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Config = exports.name = exports.inject = void 0;
 exports.apply = apply;
-/* eslint-disable @typescript-eslint/ban-types */
+/* eslint-disable @typescript-eslint/no-empty-object-type */
 const koishi_1 = require("koishi");
 // import plugins
 // import Authority from './authority'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "1.3.6-alpha.0",
+  "version": "1.3.6-beta.0",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],
@@ -27,25 +27,25 @@
     "koishi": "^4.17.5"
   },
   "dependencies": {
-    "axios": "^1.7.0-beta.1",
-    "axios-cookiejar-support": "^5.0.2",
-    "jimp": "^0.22.12",
-    "jsdom": "^24.0.0",
-    "luxon": "^3.4.4",
+    "axios": "^1.7.7",
+    "axios-cookiejar-support": "^5.0.3",
+    "jimp": "^1.6.0",
+    "jsdom": "^24.1.3",
+    "luxon": "^3.5.0",
     "md5": "^2.3.0",
-    "qrcode": "^1.5.3",
+    "qrcode": "^1.5.4",
     "tough-cookie": "^4.1.4"
   },
   "devDependencies": {
-    "@eslint/js": "^9.6.0",
-    "@types/luxon": "^3",
-    "@types/md5": "^2",
-    "@types/qrcode": "^1",
-    "@types/tough-cookie": "^4",
-    "eslint": "9.x",
-    "globals": "^15.6.0",
-    "koishi-plugin-puppeteer": "^3.8.4",
-    "typescript-eslint": "^7.14.1"
+    "@eslint/js": "^9.12.0",
+    "@types/luxon": "^3.4.2",
+    "@types/md5": "^2.3.5",
+    "@types/qrcode": "^1.5.5",
+    "@types/tough-cookie": "^4.0.5",
+    "eslint": "^9.12.0",
+    "globals": "^15.11.0",
+    "koishi-plugin-puppeteer": "^3.9.0",
+    "typescript-eslint": "^7.18.0"
   },
   "koishi": {
     "service": {

package/readme.md

@@ -172,6 +172,7 @@
 - ver 1.3.4 新增消息推送失败是否自动重发的选项，修复了一些潜在的bug
 - ver 1.3.5 动态监测循环时间新增20分钟选项
 - ver 1.3.6-alpha.0 修复bug：无限重复的报错提示
+- ver 1.3.6-beta.0 取消出错自动重启插件功能
 
 ## 交流群