koishi-plugin-bilibili-notify 1.3.3 → 1.3.5

package/lib/biliAPI.js

@@ -3,6 +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-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"));
 const tough_cookie_1 = require("tough-cookie");
@@ -180,8 +183,7 @@ class BiliAPI extends koishi_1.Service {
         return Math.floor(luxon_1.DateTime.now().setZone('UTC+8').toSeconds());
     }
     getCookies() {
-        let cookies;
-        cookies = JSON.stringify(this.jar.serializeSync().cookies);
+        const cookies = JSON.stringify(this.jar.serializeSync().cookies);
         return cookies;
     }
     getLoginInfoIsLoaded() {
@@ -359,6 +361,7 @@ class BiliAPI extends koishi_1.Service {
             case -111: {
                 await this.ctx.database.remove('loginBili', [1]);
                 notifyAndError('csrf 校验错误，请重新登录');
+                break;
             }
             case 86095: {
                 await this.ctx.database.remove('loginBili', [1]);
@@ -374,7 +377,7 @@ class BiliAPI extends koishi_1.Service {
                 bili_refresh_token: encryptedRefreshToken
             }]);
         // Get new csrf from cookies
-        let newCsrf = this.jar.serializeSync().cookies.find(cookie => {
+        const newCsrf = this.jar.serializeSync().cookies.find(cookie => {
             if (cookie.key === 'bili_jct')
                 return true;
         }).value;
@@ -392,6 +395,7 @@ class BiliAPI extends koishi_1.Service {
             case -111: {
                 await this.ctx.database.remove('loginBili', [1]);
                 notifyAndError('csrf 校验失败，请重新登录');
+                break;
             }
             case -400: throw new Error('请求错误');
         }

package/lib/comRegister.d.ts

@@ -26,11 +26,12 @@ declare class ComRegister {
     satoriBot: Bot<Context>;
     chronocatBot: Bot<Context>;
     larkBot: Bot<Context>;
+    sendMsgFunc: (guild: string, bot: Bot<Context>, content: any) => Promise<void>;
     constructor(ctx: Context, config: ComRegister.Config);
     getTheCorrespondingBotBasedOnTheSession(session: Session): Bot<Context, any>;
     sendPrivateMsg(bot: Bot<Context>, content: string): Promise<void>;
     sendPrivateMsgAndRebootService(ctx: Context, bot: Bot<Context>, content: string): Promise<void>;
-    sendMsg(ctx: Context, targets: Array<string>, bot: Bot<Context>, content: any): 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>;
     liveDetect(ctx: Context, bot: Bot<Context>, roomId: string, guildId: Array<string>): () => Promise<void>;
@@ -51,6 +52,7 @@ declare namespace ComRegister {
             masterAccountGuildId: string;
         };
         unlockSubLimits: boolean;
+        automaticResend: boolean;
         changeMasterInfoApi: boolean;
         liveStartAtAll: boolean;
         pushUrl: boolean;

package/lib/comRegister.js

@@ -4,6 +4,9 @@ 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-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"));
@@ -38,6 +41,8 @@ class ComRegister {
     chronocatBot;
     // Lark机器人
     larkBot;
+    // 发送消息方式
+    sendMsgFunc;
     constructor(ctx, config) {
         this.logger = ctx.logger('cr');
         /* ctx.on('ready', () => {
@@ -78,6 +83,41 @@ class ComRegister {
         });
         // 从数据库获取订阅
         this.getSubFromDatabase(ctx);
+        // 判断消息发送方式
+        if (config.automaticResend) {
+            this.sendMsgFunc = async (guild, bot, content) => {
+                // 多次尝试发送消息
+                const attempts = 3;
+                for (let i = 0; i < attempts; i++) {
+                    try {
+                        // 发送消息
+                        await bot.sendMessage(guild, content);
+                        // 防止消息发送速度过快被忽略
+                        await ctx.sleep(500);
+                        // 成功发送消息，跳出循环
+                        break;
+                    }
+                    catch (e) {
+                        if (i === attempts - 1) { // 已尝试三次
+                            this.logger.error(`发送群组ID:${guild}消息失败！原因: ` + e.message);
+                            this.sendPrivateMsg(bot, `发送群组ID:${guild}消息失败，请查看日志`);
+                        }
+                    }
+                }
+            };
+        }
+        else {
+            this.sendMsgFunc = async (guild, bot, content) => {
+                try {
+                    // 发送消息
+                    await bot.sendMessage(guild, content);
+                }
+                catch (e) {
+                    this.logger.error(`发送群组ID:${guild}消息失败！原因: ` + e.message);
+                    await this.sendPrivateMsg(bot, `发送群组ID:${guild}消息失败，请查看日志`);
+                }
+            };
+        }
         /* const testCom = ctx.command('test', { hidden: true, permissions: ['authority:5'] })
 
         testCom.subcommand('.cookies')
@@ -368,8 +408,6 @@ class ComRegister {
             if (this.subManager && this.subManager.some(sub => sub.uid === mid)) {
                 return '已订阅该用户，请勿重复订阅';
             }
-            // 定义是否需要直播通知，动态订阅，视频推送
-            let liveMsg, dynamicMsg;
             // 获取用户信息
             let content;
             try {
@@ -411,7 +449,7 @@ class ComRegister {
                     // 定义满足条件的群组数组
                     const targetArr = [];
                     // 判断群号是否符合条件
-                    for (let guild of guildId) {
+                    for (const guild of guildId) {
                         if (guildList.data.some(cv => cv.id === guild)) { // 机器人加入了该群
                             // 保存到数组
                             targetArr.push(guild);
@@ -480,15 +518,15 @@ class ComRegister {
             // 获取data
             const { data } = content;
             // 判断是否需要订阅直播
-            liveMsg = await this.checkIfNeedSub(options.live, '直播', session, data);
+            const liveMsg = await this.checkIfNeedSub(options.live, '直播', session, data);
             // 判断是否需要订阅动态
-            dynamicMsg = await this.checkIfNeedSub(options.dynamic, '动态', session);
+            const dynamicMsg = await this.checkIfNeedSub(options.dynamic, '动态', session);
             // 判断是否未订阅任何消息
             if (!liveMsg && !dynamicMsg) {
                 return '您未订阅该UP的任何消息';
             }
             // 获取直播房间号
-            let roomId = data.live_room?.roomid.toString();
+            const roomId = data.live_room?.roomid.toString();
             // 保存到数据库中
             const sub = await ctx.database.create('bilibili', {
                 uid: mid,
@@ -759,13 +797,13 @@ class ComRegister {
             await ctx.sm.disposePlugin();
         }
     }
-    async sendMsg(ctx, targets, bot, content) {
+    async sendMsg(targets, bot, content) {
         // 定义需要发送的数组
         let sendArr = [];
         // 判断是否需要推送所有机器人加入的群
         if (targets[0] === 'all') {
             // 获取所有guild
-            for (let guild of (await bot.getGuildList()).data) {
+            for (const guild of (await bot.getGuildList()).data) {
                 sendArr.push(guild.id);
             }
         }
@@ -773,25 +811,8 @@ class ComRegister {
             sendArr = targets;
         }
         // 循环给每个群组发送
-        for (let guildId of sendArr) {
-            // 多次尝试发送消息
-            let attempts = 3;
-            for (let i = 0; i < attempts; i++) {
-                try {
-                    // 发送消息
-                    await bot.sendMessage(guildId, content);
-                    // 防止消息发送速度过快被忽略
-                    await ctx.sleep(500);
-                    // 成功发送消息，跳出循环
-                    break;
-                }
-                catch (e) {
-                    if (i === attempts - 1) { // 已尝试三次
-                        this.logger.error(`发送群组ID:${guildId}消息失败！原因: ` + e.message);
-                        this.sendPrivateMsg(bot, `发送群组ID:${guildId}消息失败，请检查机器人状态`);
-                    }
-                }
-            }
+        for (const guild of sendArr) {
+            await this.sendMsgFunc(guild, bot, content);
         }
     }
     dynamicDetect(ctx, bot, uid, guildId) {
@@ -884,7 +905,7 @@ class ComRegister {
                     const upName = content.data.items[num].modules.module_author.name;
                     const dynamicId = content.data.items[num].id_str;
                     // 推送该条动态
-                    let attempts = 3;
+                    const attempts = 3;
                     for (let i = 0; i < attempts; i++) {
                         // 获取动态推送图片
                         try {
@@ -902,11 +923,11 @@ class ComRegister {
                                 return updatePoint(num);
                             if (e.message === '出现关键词，屏蔽该动态') {
                                 // 如果需要发送才发送
-                                this.config.filter.notify && await this.sendMsg(ctx, guildId, bot, `${upName}发布了一条含有屏蔽关键字的动态`);
+                                this.config.filter.notify && await this.sendMsg(guildId, bot, `${upName}发布了一条含有屏蔽关键字的动态`);
                                 return updatePoint(num);
                             }
                             if (e.message === '已屏蔽转发动态') {
-                                this.config.filter.notify && await this.sendMsg(ctx, guildId, bot, `${upName}发布了一条转发动态，已屏蔽`);
+                                this.config.filter.notify && await this.sendMsg(guildId, bot, `${upName}发布了一条转发动态，已屏蔽`);
                                 return updatePoint(num);
                             }
                             // 未知错误
@@ -923,12 +944,12 @@ class ComRegister {
                     if (pic) {
                         this.logger.info('推送动态中，使用render模式');
                         // pic存在，使用的是render模式
-                        await this.sendMsg(ctx, guildId, bot, pic + (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: dUrl }));
+                        await this.sendMsg(guildId, bot, pic + (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: dUrl }));
                     }
                     else if (buffer) {
                         this.logger.info('推送动态中，使用page模式');
                         // pic不存在，说明使用的是page模式
-                        await this.sendMsg(ctx, guildId, bot, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, 'image/png'), dUrl] }));
+                        await this.sendMsg(guildId, bot, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, 'image/png'), dUrl] }));
                     }
                     else {
                         this.logger.info(items[num].modules.module_author.name + '发布了一条动态，但是推送失败');
@@ -1034,7 +1055,7 @@ class ComRegister {
                     const upName = content.data.items[num].modules.module_author.name;
                     const dynamicId = content.data.items[num].id_str;
                     // 推送该条动态
-                    let attempts = 3;
+                    const attempts = 3;
                     this.logger.info(`UID：${uid}-尝试渲染推送图片`);
                     for (let i = 0; i < attempts; i++) {
                         // 获取动态推送图片
@@ -1053,11 +1074,11 @@ class ComRegister {
                                 return updatePoint(num);
                             if (e.message === '出现关键词，屏蔽该动态') {
                                 // 如果需要发送才发送
-                                this.config.filter.notify && await this.sendMsg(ctx, guildId, bot, `${upName}发布了一条含有屏蔽关键字的动态`);
+                                this.config.filter.notify && await this.sendMsg(guildId, bot, `${upName}发布了一条含有屏蔽关键字的动态`);
                                 return updatePoint(num);
                             }
                             if (e.message === '已屏蔽转发动态') {
-                                this.config.filter.notify && await this.sendMsg(ctx, guildId, bot, `${upName}发布了一条转发动态，已屏蔽`);
+                                this.config.filter.notify && await this.sendMsg(guildId, bot, `${upName}发布了一条转发动态，已屏蔽`);
                                 return updatePoint(num);
                             }
                             // 未知错误
@@ -1075,12 +1096,12 @@ class ComRegister {
                     if (pic) {
                         this.logger.info(`UID：${uid}-推送动态中，使用render模式`);
                         // pic存在，使用的是render模式
-                        await this.sendMsg(ctx, guildId, bot, pic + (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: dUrl }));
+                        await this.sendMsg(guildId, bot, pic + (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: dUrl }));
                     }
                     else if (buffer) {
                         this.logger.info(`UID：${uid}-推送动态中，使用page模式`);
                         // pic不存在，说明使用的是page模式
-                        await this.sendMsg(ctx, guildId, bot, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, 'image/png'), dUrl] }));
+                        await this.sendMsg(guildId, bot, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, 'image/png'), dUrl] }));
                     }
                     else {
                         this.logger.info(items[num].modules.module_author.name + '发布了一条动态，但是推送失败');
@@ -1110,7 +1131,7 @@ class ComRegister {
                 let pic;
                 let buffer;
                 // 多次尝试生成图片
-                let attempts = 3;
+                const attempts = 3;
                 for (let i = 0; i < attempts; i++) {
                     try {
                         // 获取直播通知卡片
@@ -1131,12 +1152,12 @@ class ComRegister {
                 // 推送直播信息
                 // pic 存在，使用的是render模式
                 if (pic) {
-                    let msg = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" }), liveStartMsg && liveStartMsg, liveType !== LiveType.StartBroadcasting ? `https://live.bilibili.com/${roomId}` : ''] });
-                    return await this.sendMsg(ctx, guildId, bot, pic + msg);
+                    const msg = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" }), liveStartMsg && liveStartMsg, liveType !== LiveType.StartBroadcasting ? `https://live.bilibili.com/${roomId}` : ''] });
+                    return await this.sendMsg(guildId, bot, pic + msg);
                 }
                 // pic不存在，说明使用的是page模式
-                let msg = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, 'image/png'), atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" }), liveStartMsg && liveStartMsg, liveType !== LiveType.StartBroadcasting ? `https://live.bilibili.com/${roomId}` : ''] });
-                await this.sendMsg(ctx, guildId, bot, msg);
+                const msg = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, 'image/png'), atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" }), liveStartMsg && liveStartMsg, liveType !== LiveType.StartBroadcasting ? `https://live.bilibili.com/${roomId}` : ''] });
+                await this.sendMsg(guildId, bot, msg);
             };
         }
         else {
@@ -1145,7 +1166,7 @@ class ComRegister {
                 let pic;
                 let buffer;
                 // 多次尝试生成图片
-                let attempts = 3;
+                const attempts = 3;
                 for (let i = 0; i < attempts; i++) {
                     try {
                         // 获取直播通知卡片
@@ -1166,12 +1187,12 @@ class ComRegister {
                 // 推送直播信息
                 // pic 存在，使用的是render模式
                 if (pic) {
-                    let msg = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" }), liveStartMsg && liveStartMsg] });
-                    return await this.sendMsg(ctx, guildId, bot, pic + msg);
+                    const msg = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" }), liveStartMsg && liveStartMsg] });
+                    return await this.sendMsg(guildId, bot, pic + msg);
                 }
                 // pic不存在，说明使用的是page模式
-                let msg = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, 'image/png'), atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" }), liveStartMsg && liveStartMsg] });
-                await this.sendMsg(ctx, guildId, bot, msg);
+                const msg = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, 'image/png'), atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" }), liveStartMsg && liveStartMsg] });
+                await this.sendMsg(guildId, bot, msg);
             };
         }
         // 定义获取主播信息方法
@@ -1198,7 +1219,7 @@ class ComRegister {
                 flag = false;
                 // 发送请求检测直播状态
                 let content;
-                let attempts = 3;
+                const attempts = 3;
                 for (let i = 0; i < attempts; i++) {
                     try {
                         // 发送请求获取room信息
@@ -1218,7 +1239,7 @@ class ComRegister {
                 if (firstSubscription) {
                     firstSubscription = false;
                     // 获取主播信息
-                    let attempts = 3;
+                    const attempts = 3;
                     for (let i = 0; i < attempts; i++) {
                         try {
                             // 发送请求获取主播信息
@@ -1254,7 +1275,7 @@ class ComRegister {
                             // 下播了将定时器清零
                             timer = 0;
                             // 定义下播通知消息
-                            let liveEndMsg = this.config.customLiveEnd
+                            const liveEndMsg = this.config.customLiveEnd
                                 .replace('-name', username)
                                 .replace('-time', await ctx.gi.getTimeDifference(liveTime));
                             // 获取头像并缩放
@@ -1272,7 +1293,7 @@ class ComRegister {
                                     console.log(e);
                             }
                             // 发送下播通知
-                            await this.sendMsg(ctx, guildId, bot, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [resizedImage && koishi_1.h.image(resizedImage, 'image/png'), " ", liveEndMsg] }));
+                            await this.sendMsg(guildId, bot, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [resizedImage && koishi_1.h.image(resizedImage, 'image/png'), " ", liveEndMsg] }));
                         }
                         // 未进循环，还未开播，继续循环
                         break;
@@ -1284,7 +1305,7 @@ class ComRegister {
                             // 设置开播时间
                             liveTime = data.live_time;
                             // 获取主播信息
-                            let attempts = 3;
+                            const attempts = 3;
                             for (let i = 0; i < attempts; i++) {
                                 try {
                                     // 主播信息不会变，开播时刷新一次即可
@@ -1301,7 +1322,7 @@ class ComRegister {
                                 }
                             }
                             // 定义开播通知语
-                            let liveStartMsg = this.config.customLiveStart
+                            const liveStartMsg = this.config.customLiveStart
                                 .replace('-name', username)
                                 .replace('-time', await ctx.gi.getTimeDifference(liveTime))
                                 .replace('-link', `https://live.bilibili.com/${data.short_id === 0 ? data.room_id : data.short_id}`);
@@ -1355,7 +1376,7 @@ class ComRegister {
         }
         let input; // 用户输入
         // 询问用户是否需要订阅直播
-        while (1) {
+        while (true) {
             session.send(`是否需要订阅${subType}？需要输入 y 不需要输入 n `);
             input = await session.prompt();
             if (!input) {
@@ -1392,7 +1413,7 @@ class ComRegister {
         }
         else {
             // 获取subTable
-            let subTableArray = subInfo.split('\n');
+            const subTableArray = subInfo.split('\n');
             subTableArray.splice(subTableArray.length - 1, 1);
             // 定义Table
             table = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("p", { children: "\u5F53\u524D\u8BA2\u9605\u5BF9\u8C61\uFF1A" }), (0, jsx_runtime_1.jsx)("ul", { children: subTableArray.map(str => ((0, jsx_runtime_1.jsx)("li", { children: str }))) })] });
@@ -1493,7 +1514,7 @@ class ComRegister {
             // 判断数据库是否被篡改
             // 获取用户信息
             let content;
-            let attempts = 3;
+            const attempts = 3;
             for (let i = 0; i < attempts; i++) {
                 try {
                     // 获取用户信息
@@ -1548,7 +1569,7 @@ class ComRegister {
                 return;
             }
             // 构建订阅对象
-            let subManagerItem = {
+            const subManagerItem = {
                 id: sub.id,
                 uid: sub.uid,
                 roomId: sub.room_id,
@@ -1684,6 +1705,7 @@ class ComRegister {
             masterAccountGuildId: koishi_1.Schema.string()
         }),
         unlockSubLimits: koishi_1.Schema.boolean().required(),
+        automaticResend: koishi_1.Schema.boolean().required(),
         changeMasterInfoApi: koishi_1.Schema.boolean().required(),
         liveStartAtAll: koishi_1.Schema.boolean().required(),
         pushUrl: koishi_1.Schema.boolean().required(),

package/lib/generateImg.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable @typescript-eslint/no-explicit-any */
 const koishi_1 = require("koishi");
 const path_1 = require("path");
 const url_1 = require("url");
@@ -196,7 +197,7 @@ class GenerateImg extends koishi_1.Service {
             </html>
         `;
         // 多次尝试生成图片
-        let attempts = 3;
+        const attempts = 3;
         for (let i = 0; i < attempts; i++) {
             try {
                 // 判断渲染方式
@@ -300,7 +301,7 @@ class GenerateImg extends koishi_1.Service {
                 const arrowImg = (0, url_1.pathToFileURL)((0, path_1.resolve)(__dirname, 'img/arrow.png'));
                 if (module_dynamic.major && module_dynamic.major.draw) {
                     if (module_dynamic.major.draw.items.length === 1) {
-                        let height = module_dynamic.major.draw.items[0].height;
+                        const height = module_dynamic.major.draw.items[0].height;
                         console.log(height);
                         if (height > 3000) {
                             major += `
@@ -356,6 +357,7 @@ class GenerateImg extends koishi_1.Service {
                         const forwardUserAvatarUrl = forward_module_author.face;
                         const forwardUserName = forward_module_author.name;
                         // 获取转发的动态
+                        // eslint-disable-next-line @typescript-eslint/no-unused-vars
                         const [forwardMain, _, forwardInfo] = await getDynamicMajor(dynamicMajorData.orig, true);
                         // 拼接main
                         main += `
@@ -1377,7 +1379,7 @@ class GenerateImg extends koishi_1.Service {
             </html>
         `;
         // 多次尝试生成图片
-        let attempts = 3;
+        const attempts = 3;
         for (let i = 0; i < attempts; i++) {
             try {
                 // 判断渲染方式
@@ -1468,6 +1470,7 @@ class GenerateImg extends koishi_1.Service {
         return `${year}年${month}月${day}日 ${hours}:${minutes}:${seconds}`;
     }
 }
+// eslint-disable-next-line @typescript-eslint/no-namespace
 (function (GenerateImg) {
     GenerateImg.Config = koishi_1.Schema.object({
         renderType: koishi_1.Schema.number(),

package/lib/index.d.ts

@@ -12,12 +12,13 @@ export interface Config {
     master: {};
     basicSettings: {};
     unlockSubLimits: boolean;
+    automaticResend: boolean;
     renderType: 'render' | 'page';
     userAgent: string;
     dynamic: {};
     dynamicUrl: boolean;
     dynamicCheckNumber: number;
-    dynamicLoopTime: '1分钟' | '2分钟' | '3分钟' | '5分钟';
+    dynamicLoopTime: '1分钟' | '2分钟' | '3分钟' | '5分钟' | '20分钟';
     live: {};
     changeMasterInfoApi: boolean;
     liveStartAtAll: boolean;

package/lib/index.js

@@ -28,6 +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 */
 const koishi_1 = require("koishi");
 // import plugins
 // import Authority from './authority'
@@ -71,6 +72,9 @@ exports.Config = koishi_1.Schema.object({
     unlockSubLimits: koishi_1.Schema.boolean()
         .default(false)
         .description('解锁3个订阅限制，默认只允许订阅3位UP主。订阅过多用户可能有导致IP暂时被封禁的风险'),
+    automaticResend: koishi_1.Schema.boolean()
+        .default(true)
+        .description('是否开启自动重发功能，默认开启。开启后，如果推送失败，将会自动重发，尝试三次。关闭后，推送失败将不会再重发，直到下一次推送'),
     renderType: koishi_1.Schema.union(['render', 'page'])
         .role('')
         .default('render')
@@ -89,7 +93,7 @@ exports.Config = koishi_1.Schema.object({
         .step(1)
         .default(5)
         .description('设定每次检查动态的数量。若订阅的UP主经常在短时间内连着发多条动态可以将该值提高，若订阅的UP主有置顶动态，在计算该值时应+1。默认值为5条'),
-    dynamicLoopTime: koishi_1.Schema.union(['1分钟', '2分钟', '3分钟', '5分钟'])
+    dynamicLoopTime: koishi_1.Schema.union(['1分钟', '2分钟', '3分钟', '5分钟', '20分钟'])
         .role('')
         .default('2分钟')
         .description('设定多久检测一次动态。若需动态的时效性，可以设置为1分钟。若订阅的UP主经常在短时间内连着发多条动态应该将该值提高，否则会出现动态漏推送和晚推送的问题，默认值为2分钟'),
@@ -239,6 +243,9 @@ class ServerManager extends koishi_1.Service {
             case '5分钟':
                 this.dynamicLoopTime = 300;
                 break;
+            case '20分钟':
+                this.dynamicLoopTime = 1200;
+                break;
         }
         // 注册插件
         this.registerPlugin();
@@ -266,6 +273,7 @@ class ServerManager extends koishi_1.Service {
             const cr = this.ctx.plugin(comRegister_1.default, {
                 master: globalConfig.master,
                 unlockSubLimits: globalConfig.unlockSubLimits,
+                automaticResend: globalConfig.automaticResend,
                 changeMasterInfoApi: globalConfig.changeMasterInfoApi,
                 liveStartAtAll: globalConfig.liveStartAtAll,
                 pushUrl: globalConfig.pushUrl,

package/lib/wbi.d.ts

@@ -15,8 +15,8 @@ declare class Wbi extends Service {
         sub_key: any;
     }>;
     getWbi(params: any): Promise<string>;
-    encrypt(text: string, secretKey?: string): string;
-    decrypt(text: string, secretKey?: string): string;
+    encrypt(text: string): string;
+    decrypt(text: string): string;
 }
 declare namespace Wbi {
     interface Config {

package/lib/wbi.js

@@ -3,6 +3,7 @@ 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-namespace */
 const koishi_1 = require("koishi");
 const md5_1 = __importDefault(require("md5"));
 const crypto_1 = __importDefault(require("crypto"));
@@ -64,18 +65,18 @@ class Wbi extends koishi_1.Service {
         const query = this.encWbi(params, img_key, sub_key);
         return query;
     }
-    encrypt(text, secretKey) {
+    encrypt(text) {
         const iv = crypto_1.default.randomBytes(16);
         const cipher = crypto_1.default.createCipheriv('aes-256-cbc', Buffer.from(this.wbiConfig.key), iv);
         const encrypted = Buffer.concat([cipher.update(text), cipher.final()]);
         return iv.toString('hex') + ':' + encrypted.toString('hex');
     }
-    decrypt(text, secretKey) {
-        let textParts = text.split(':');
-        let iv = Buffer.from(textParts.shift(), 'hex');
-        let encryptedText = Buffer.from(textParts.join(':'), 'hex');
-        let decipher = crypto_1.default.createDecipheriv('aes-256-cbc', Buffer.from(this.wbiConfig.key), iv);
-        let decrypted = Buffer.concat([decipher.update(encryptedText), decipher.final()]);
+    decrypt(text) {
+        const textParts = text.split(':');
+        const iv = Buffer.from(textParts.shift(), 'hex');
+        const encryptedText = Buffer.from(textParts.join(':'), 'hex');
+        const decipher = crypto_1.default.createDecipheriv('aes-256-cbc', Buffer.from(this.wbiConfig.key), iv);
+        const decrypted = Buffer.concat([decipher.update(encryptedText), decipher.final()]);
         return decrypted.toString();
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],
@@ -37,11 +37,15 @@
     "tough-cookie": "^4.1.4"
   },
   "devDependencies": {
+    "@eslint/js": "^9.6.0",
     "@types/luxon": "^3",
     "@types/md5": "^2",
     "@types/qrcode": "^1",
     "@types/tough-cookie": "^4",
-    "koishi-plugin-puppeteer": "^3.8.4"
+    "eslint": "9.x",
+    "globals": "^15.6.0",
+    "koishi-plugin-puppeteer": "^3.8.4",
+    "typescript-eslint": "^7.14.1"
   },
   "koishi": {
     "service": {

package/readme.md

@@ -6,9 +6,9 @@
 
 - koishi-plugin-bilibili-notify [![npm](https://img.shields.io/npm/v/koishi-plugin-bilibili-notify?style=flat-square)](https://www.npmjs.com/package/koishi-plugin-bilibili-notify)
   - [功能](#功能)
+  - [注意事项](#注意事项)
   - [安装](#安装)
   - [使用方法](#使用方法)
-  - [注意事项](#注意事项)
   - [更新日志](#更新日志)
   - [交流群](#交流群)
   - [感谢](#感谢)
@@ -20,6 +20,21 @@
 
 订阅B站UP主直播
 
+## 注意事项
+
+0. 动态监测，当您订阅之后，会在您设置的dynamicLoopTime(默认为2分钟)之后才会开启监测。如果您需要测试则需要等待您设置的dynamicLoopTime的时间之后再发送测试动态
+
+1. 此插件依赖于 `database` 和 `puppeteer` 服务，同时受权限控制，需要具备 `authority:3` 及以上的权限才能使用本插件提供的指令，你可以参考下方配置登录插件中的方法得到一个超级管理员账号（具有 `authority:5` 的最高权限） 
+
+   [配置登录插件](https://koishi.chat/zh-CN/manual/usage/platform.html#%E9%85%8D%E7%BD%AE%E7%99%BB%E5%BD%95%E6%8F%92%E4%BB%B6)
+
+2. 您还可以安装 `admin` 插件，给其他用户授予权限，操作方法请参考下方的权限管理
+
+   [权限管理](https://koishi.chat/zh-CN/manual/usage/customize.html)
+
+3. 指令使用方法请参考 `help bili`，子命令使用方法请加 `-h` ，例如 `bili login -h`
+4. 登录方式为二维码，输入命令 `bili login` 之后扫码登录，您的登录凭证将存储在您的本地数据库，并由您自己填写的密钥加密，所以请保管好你的密钥
+
 ## 安装
 
 1. 下载插件运行平台 [Koishi](https://koishi.chat/)
@@ -72,19 +87,6 @@
 - 使用指令 `sys`
 - 子命令：`start`、`stop`、`restart` 分别代表插件的启动，停止和重启
 
-## 注意事项
-
-1. 此插件依赖于 `database` 和 `puppeteer` 服务，同时受权限控制，需要具备 `authority:3` 及以上的权限才能使用本插件提供的指令，你可以参考下方配置登录插件中的方法得到一个超级管理员账号（具有 `authority:5` 的最高权限） 
-
-   [配置登录插件](https://koishi.chat/zh-CN/manual/usage/platform.html#%E9%85%8D%E7%BD%AE%E7%99%BB%E5%BD%95%E6%8F%92%E4%BB%B6)
-
-2. 您还可以安装 `admin` 插件，给其他用户授予权限，操作方法请参考下方的权限管理
-
-   [权限管理](https://koishi.chat/zh-CN/manual/usage/customize.html)
-
-3. 指令使用方法请参考 `help bili`，子命令使用方法请加 `-h` ，例如 `bili login -h`
-4. 登录方式为二维码，输入命令 `bili login` 之后扫码登录，您的登录凭证将存储在您的本地数据库，并由您自己填写的密钥加密，所以请保管好你的密钥
-
 ## 更新日志
 
 - ver 1.0.1 修复了一些bug，提供用户自己选择动态检测时间的选项
@@ -167,6 +169,8 @@
 - ver 1.3.1 优化过长单图的显示样式
 - ver 1.3.2 增加对飞书平台的支持
 - ver 1.3.3 新增直播推送人气信息展示
+- ver 1.3.4 新增消息推送失败是否自动重发的选项，修复了一些潜在的bug
+- ver 1.3.5 动态监测循环时间新增20分钟选项
 
 ## 交流群