koishi-plugin-bilibili-notify 3.0.0-alpha.20 → 3.0.0-alpha.22

package/lib/biliAPI.js

@@ -16,7 +16,7 @@ const axios_1 = __importDefault(require("axios"));
 const tough_cookie_1 = require("tough-cookie");
 const axios_cookiejar_support_1 = require("axios-cookiejar-support");
 const jsdom_1 = require("jsdom");
-const retry_1 = __importDefault(require("./utils/retry"));
+const utils_1 = require("./utils");
 const mixinKeyEncTab = [
     46, 47, 18, 2, 53, 8, 23, 32, 15, 50, 10, 31, 58, 3, 45, 35, 27, 43, 5, 49,
     33, 9, 42, 19, 29, 28, 14, 39, 12, 38, 41, 13, 37, 48, 7, 16, 24, 55, 40, 61,
@@ -570,7 +570,7 @@ class BiliAPI extends koishi_1.Service {
     }
 }
 __decorate([
-    (0, retry_1.default)({
+    (0, utils_1.Retry)({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getTheUserWhoIsLiveStreaming() 第${attempts}次失败: ${error.message}`);
@@ -578,7 +578,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getTheUserWhoIsLiveStreaming", null);
 __decorate([
-    (0, retry_1.default)({
+    (0, utils_1.Retry)({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getLiveRoomInfoStreamKey() 第${attempts}次失败: ${error.message}`);
@@ -586,7 +586,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getLiveRoomInfoStreamKey", null);
 __decorate([
-    (0, retry_1.default)({
+    (0, utils_1.Retry)({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getServerUTCTime() 第${attempts}次失败: ${error.message}`);
@@ -594,7 +594,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getServerUTCTime", null);
 __decorate([
-    (0, retry_1.default)({
+    (0, utils_1.Retry)({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getTimeNow() 第${attempts}次失败: ${error.message}`);
@@ -602,7 +602,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getTimeNow", null);
 __decorate([
-    (0, retry_1.default)({
+    (0, utils_1.Retry)({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getAllGroup() 第${attempts}次失败: ${error.message}`);
@@ -610,7 +610,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getAllGroup", null);
 __decorate([
-    (0, retry_1.default)({
+    (0, utils_1.Retry)({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`removeUserFromGroup() 第${attempts}次失败: ${error.message}`);
@@ -618,7 +618,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "removeUserFromGroup", null);
 __decorate([
-    (0, retry_1.default)({
+    (0, utils_1.Retry)({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`copyUserToGroup() 第${attempts}次失败: ${error.message}`);
@@ -626,7 +626,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "copyUserToGroup", null);
 __decorate([
-    (0, retry_1.default)({
+    (0, utils_1.Retry)({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getUserSpaceDynamic() 第${attempts}次失败: ${error.message}`);
@@ -634,7 +634,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getUserSpaceDynamic", null);
 __decorate([
-    (0, retry_1.default)({
+    (0, utils_1.Retry)({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`createGroup() 第${attempts}次失败: ${error.message}`);
@@ -642,7 +642,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "createGroup", null);
 __decorate([
-    (0, retry_1.default)({
+    (0, utils_1.Retry)({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getAllDynamic() 第${attempts}次失败: ${error.message}`);
@@ -650,7 +650,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getAllDynamic", null);
 __decorate([
-    (0, retry_1.default)({
+    (0, utils_1.Retry)({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`hasNewDynamic() 第${attempts}次失败: ${error.message}`);
@@ -658,7 +658,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "hasNewDynamic", null);
 __decorate([
-    (0, retry_1.default)({
+    (0, utils_1.Retry)({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`follow() 第${attempts}次失败: ${error.message}`);
@@ -666,7 +666,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "follow", null);
 __decorate([
-    (0, retry_1.default)({
+    (0, utils_1.Retry)({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getRelationGroupDetail() 第${attempts}次失败: ${error.message}`);
@@ -674,7 +674,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getRelationGroupDetail", null);
 __decorate([
-    (0, retry_1.default)({
+    (0, utils_1.Retry)({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getCookieInfo() 第${attempts}次失败: ${error.message}`);
@@ -682,7 +682,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getCookieInfo", null);
 __decorate([
-    (0, retry_1.default)({
+    (0, utils_1.Retry)({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getUserInfo() 第${attempts}次失败: ${error.message}`);
@@ -690,7 +690,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getUserInfo", null);
 __decorate([
-    (0, retry_1.default)({
+    (0, utils_1.Retry)({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getWbiKeys() 第${attempts}次失败: ${error.message}`);
@@ -698,7 +698,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getWbiKeys", null);
 __decorate([
-    (0, retry_1.default)({
+    (0, utils_1.Retry)({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getMyselfInfo() 第${attempts}次失败: ${error.message}`);
@@ -706,7 +706,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getMyselfInfo", null);
 __decorate([
-    (0, retry_1.default)({
+    (0, utils_1.Retry)({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getLoginQRCode() 第${attempts}次失败: ${error.message}`);
@@ -714,7 +714,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getLoginQRCode", null);
 __decorate([
-    (0, retry_1.default)({
+    (0, utils_1.Retry)({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getLoginStatus() 第${attempts}次失败: ${error.message}`);
@@ -722,7 +722,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getLoginStatus", null);
 __decorate([
-    (0, retry_1.default)({
+    (0, utils_1.Retry)({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getLiveRoomInfo() 第${attempts}次失败: ${error.message}`);
@@ -730,7 +730,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getLiveRoomInfo", null);
 __decorate([
-    (0, retry_1.default)({
+    (0, utils_1.Retry)({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getMasterInfo() 第${attempts}次失败: ${error.message}`);

package/lib/blive.d.ts

@@ -1,6 +1,6 @@
-import { Awaitable, Context, Service } from "koishi";
-import { type MsgHandler } from 'blive-message-listener';
-declare module 'koishi' {
+import { type Awaitable, type Context, Service } from "koishi";
+import { type MsgHandler } from "blive-message-listener";
+declare module "koishi" {
     interface Context {
         bl: BLive;
     }

package/lib/blive.js

@@ -4,12 +4,12 @@ const koishi_1 = require("koishi");
 const blive_message_listener_1 = require("blive-message-listener");
 class BLive extends koishi_1.Service {
     // 必要服务
-    static inject = ['ba'];
+    static inject = ["ba"];
     // 定义类属性
     listenerRecord = {};
     constructor(ctx) {
         // Extends super
-        super(ctx, 'bl');
+        super(ctx, "bl");
     }
     // 注册插件dispose逻辑
     stop() {
@@ -24,20 +24,22 @@ class BLive extends koishi_1.Service {
         // 获取自身信息
         const mySelfInfo = await this.ctx.ba.getMyselfInfo();
         // 创建实例并保存到Record中
-        this.listenerRecord[roomId] = (0, blive_message_listener_1.startListen)(parseInt(roomId), handler, {
+        this.listenerRecord[roomId] = (0, blive_message_listener_1.startListen)(Number.parseInt(roomId), handler, {
             ws: {
                 headers: {
-                    Cookie: cookiesStr
+                    Cookie: cookiesStr,
                 },
-                uid: mySelfInfo.data.mid
-            }
+                uid: mySelfInfo.data.mid,
+            },
         });
         // logger
         this.logger.info(`${roomId}直播间弹幕监听已开启`);
     }
     closeListener(roomId) {
         // 判断直播间监听器是否关闭
-        if (!this.listenerRecord || !this.listenerRecord[roomId] || !this.listenerRecord[roomId].closed) {
+        if (!this.listenerRecord ||
+            !this.listenerRecord[roomId] ||
+            !this.listenerRecord[roomId].closed) {
             // 输出logger
             this.logger.info(`${roomId}直播间弹幕监听器无需关闭`);
         }
@@ -49,7 +51,7 @@ class BLive extends koishi_1.Service {
             delete this.listenerRecord[roomId];
             // 输出logger
             this.logger.info(`${roomId}直播间弹幕监听已关闭`);
-            // 直接返回 
+            // 直接返回
             return;
         }
         // 未关闭成功

package/lib/comRegister.js

@@ -8,8 +8,12 @@ const jsx_runtime_1 = require("@satorijs/element/jsx-runtime");
 const koishi_1 = require("koishi");
 // 外部依赖：qrcode
 const qrcode_1 = __importDefault(require("qrcode"));
+// Utils
+const utils_1 = require("./utils");
 // Types
 const type_1 = require("./type");
+// TODO:WorlCloud
+// import { Segment, useDefault } from "segmentit";
 class ComRegister {
     // 必须服务
     static inject = ["ba", "gi", "database", "bl", "sm"];
@@ -213,6 +217,8 @@ class ComRegister {
     async init(config) {
         // 设置logger
         this.logger = this.ctx.logger("cr");
+        // logger
+        this.logger.info("加载订阅中...");
         // 将config设置给类属性
         this.config = config;
         // 拿到私人机器人实例
@@ -229,41 +235,43 @@ class ComRegister {
             bot, channelId, 
             // biome-ignore lint/suspicious/noExplicitAny: <explanation>
             content) => {
-                // 多次尝试发送消息
-                const attempts = 3;
-                for (let i = 0; i < attempts; i++) {
-                    try {
-                        // 发送消息
-                        await bot.sendMessage(channelId, content);
-                        // 防止消息发送速度过快被忽略
-                        await this.ctx.sleep(500);
-                        // 成功发送消息，跳出循环
-                        break;
-                    }
-                    catch (e) {
-                        if (i === attempts - 1) {
-                            // 已尝试三次
-                            this.logger.error(`发送群组ID:${channelId}消息失败！原因: ${e.message}`);
-                            console.log(e);
-                            this.sendPrivateMsg(`发送群组ID:${channelId}消息失败，请查看日志`);
-                        }
+                (0, utils_1.withRetry)(async () => await bot.sendMessage(channelId, content)).catch(async (e) => {
+                    if (e.message === "this._request is not a function") {
+                        // 2S之后重新发送消息
+                        this.ctx.setTimeout(async () => {
+                            await this.sendMsgFunc(bot, channelId, content);
+                        }, 2000);
+                        // 返回
+                        return;
                     }
-                }
+                    // 打印错误信息
+                    this.logger.error(`发送群组ID:${channelId}消息失败！原因: ${e.message}`);
+                    await this.sendPrivateMsg(`发送群组ID:${channelId}消息失败，请查看日志`);
+                });
             };
         }
         else {
             this.sendMsgFunc = async (
             // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-            bot, guild, 
+            bot, channelId, 
             // biome-ignore lint/suspicious/noExplicitAny: <explanation>
             content) => {
                 try {
                     // 发送消息
-                    await bot.sendMessage(guild, content);
+                    await bot.sendMessage(channelId, content);
                 }
                 catch (e) {
-                    this.logger.error(`发送群组ID:${guild}消息失败！原因: ${e.message}`);
-                    await this.sendPrivateMsg(`发送群组ID:${guild}消息失败，请查看日志`);
+                    if (e.message === "this._request is not a function") {
+                        // 2S之后重新发送消息
+                        this.ctx.setTimeout(async () => {
+                            await this.sendMsgFunc(bot, channelId, content);
+                        }, 2000);
+                        // 返回
+                        return;
+                    }
+                    // 打印错误信息
+                    this.logger.error(`发送群组ID:${channelId}消息失败！原因: ${e.message}`);
+                    await this.sendPrivateMsg(`发送群组ID:${channelId}消息失败，请查看日志`);
                 }
             };
         }
@@ -283,6 +291,8 @@ class ComRegister {
         this.checkIfDynamicDetectIsNeeded();
         // 在控制台中显示订阅对象
         this.updateSubNotifier();
+        // logger
+        this.logger.info("订阅加载完毕！");
     }
     // biome-ignore lint/suspicious/noExplicitAny: <explanation>
     getBot(pf) {
@@ -416,7 +426,7 @@ class ComRegister {
             }
             else {
                 for (const channel of sendArr) {
-                    // 判断是否需要推送动态消息和直播消息
+                    // 判断是否需要推送动态消息
                     if (channel.dynamic || channel.live) {
                         await this.sendMsgFunc(bot, channel.channelId, content);
                     }

package/lib/index.js

@@ -129,10 +129,7 @@ class ServerManager extends koishi_1.Service {
                 break;
         }
         // 注册插件
-        if (this.registerPlugin()) {
-            this.logger.info("插件启动成功");
-        }
-        else {
+        if (!this.registerPlugin()) {
             this.logger.error("插件启动失败");
         }
     }
@@ -157,7 +154,7 @@ class ServerManager extends koishi_1.Service {
                 hideDesc: globalConfig.hideDesc,
                 enableLargeFont: globalConfig.enableLargeFont,
                 font: globalConfig.font,
-                followerDisplay: globalConfig.followerDisplay
+                followerDisplay: globalConfig.followerDisplay,
             });
             // CR = ComRegister
             const cr = this.ctx.plugin(comRegister_1.default, {
@@ -306,17 +303,30 @@ exports.Config = koishi_1.Schema.object({
         dynamic: koishi_1.Schema.boolean().default(false).description("是否订阅用户动态"),
         live: koishi_1.Schema.boolean().default(false).description("是否订阅用户直播"),
         target: koishi_1.Schema.array(koishi_1.Schema.object({
+            platform: koishi_1.Schema.string()
+                .required()
+                .description("推送平台，例如onebot、qq、discord"),
             channelIdArr: koishi_1.Schema.array(koishi_1.Schema.object({
                 channelId: koishi_1.Schema.string().required().description("频道/群组号"),
-                dynamic: koishi_1.Schema.boolean().default(false).description("该频道/群组是否推送动态信息"),
-                live: koishi_1.Schema.boolean().default(false).description("该频道/群组是否推送直播通知"),
-                liveGuardBuy: koishi_1.Schema.boolean().default(false).description("该频道/群组是否推送上舰消息"),
-                atAll: koishi_1.Schema.boolean().default(false).description("推送开播通知时是否艾特全体成员"),
-            })).required().description("需推送的频道/群组详细设置"),
-            platform: koishi_1.Schema.string().required().description("推送平台"),
+                dynamic: koishi_1.Schema.boolean()
+                    .default(false)
+                    .description("该频道/群组是否推送动态信息"),
+                live: koishi_1.Schema.boolean()
+                    .default(false)
+                    .description("该频道/群组是否推送直播通知"),
+                liveGuardBuy: koishi_1.Schema.boolean()
+                    .default(false)
+                    .description("该频道/群组是否推送上舰消息"),
+                atAll: koishi_1.Schema.boolean()
+                    .default(false)
+                    .description("推送开播通知时是否艾特全体成员"),
+            }))
+                .role("table")
+                .required()
+                .description("需推送的频道/群组详细设置"),
         })).description("订阅用户需要发送的平台和频道/群组信息(一个平台下可以推送多个频道/群组)"),
-    }))
-        .role("table")
+    }).collapse())
+        .collapse()
         .description("输入订阅信息，自定义订阅内容； uid: 订阅用户UID，dynamic: 是否需要订阅动态，live: 是否需要订阅直播"),
     dynamic: koishi_1.Schema.object({}).description("动态推送设置"),
     dynamicUrl: koishi_1.Schema.boolean()

package/lib/utils/index.d.ts

@@ -0,0 +1,13 @@
+interface RetryOptions {
+    attempts: number;
+    onFailure?: (error: Error, attempts: number) => Promise<void> | void;
+}
+export declare function Retry(options?: RetryOptions): MethodDecorator;
+/**
+ * 高阶函数：为函数添加锁机制
+ * @param {Function} fn - 需要包装的原始函数
+ * @returns {Function} 带锁功能的函数
+ */
+export declare function withLock(fn: any): (...args: any[]) => void;
+export declare function withRetry(fn: any, maxAttempts?: number, delayMs?: number): Promise<any>;
+export {};

package/lib/utils/index.js

@@ -0,0 +1,102 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Retry = Retry;
+exports.withLock = withLock;
+exports.withRetry = withRetry;
+function Retry(options = { attempts: 3 }) {
+    return (
+    // biome-ignore lint/complexity/noBannedTypes: <explanation>
+    target, propertyKey, 
+    // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+    descriptor) => {
+        const originalMethod = descriptor.value;
+        // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+        descriptor.value = async function (...args) {
+            let lastError;
+            for (let i = 0; i < options.attempts; i++) {
+                try {
+                    return await originalMethod.apply(this, args);
+                }
+                catch (error) {
+                    lastError = error;
+                    if (options.onFailure) {
+                        await options.onFailure.call(this, lastError, i + 1);
+                    }
+                }
+            }
+            // biome-ignore lint/style/noNonNullAssertion: <explanation>
+            throw lastError;
+        };
+        return descriptor;
+    };
+}
+/**
+ * 高阶函数：为函数添加锁机制
+ * @param {Function} fn - 需要包装的原始函数
+ * @returns {Function} 带锁功能的函数
+ */
+function withLock(fn) {
+    // 判断是否是异步函数
+    const isAsync = fn.constructor.name === "AsyncFunction";
+    // 定义锁标志
+    let locked = false;
+    // 判断是否为异步函数
+    if (isAsync) {
+        // 变为Promise
+        return (...args) => {
+            // 已加锁则跳过执行
+            if (locked)
+                return;
+            // 获取锁
+            locked = true;
+            // 将异步函数转为Promise链
+            Promise.resolve(fn(...args))
+                .catch((err) => {
+                // 打印错误
+                console.error("Execution error:", err);
+                // 重新抛出错误
+                throw err;
+            })
+                .finally(() => {
+                // 确保释放锁
+                locked = false;
+            });
+        };
+    }
+    // 不是异步函数
+    return (...args) => {
+        // 已加锁则跳过执行
+        if (locked)
+            return;
+        // 获取锁
+        locked = true;
+        try {
+            // 执行函数
+            fn(...args);
+        }
+        catch (err) {
+            // 打印错误
+            console.error("Execution error:", err);
+            // 重新抛出错误
+            throw err;
+        }
+        finally {
+            // 无论成功失败都释放锁
+            locked = false;
+        }
+    };
+}
+async function withRetry(fn, maxAttempts = 3, delayMs = 1000) {
+    let attempt = 0;
+    while (attempt < maxAttempts) {
+        try {
+            return await fn();
+        }
+        catch (error) {
+            attempt++;
+            if (attempt >= maxAttempts)
+                throw error;
+            await new Promise((resolve) => setTimeout(resolve, delayMs * attempt)); // 指数退避
+        }
+    }
+}

package/package.json

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

package/readme.md

@@ -200,6 +200,8 @@
 - ver 3.0.0-alpha.18 移除：直播检测API模式已被废弃； 优化：更多提示语数据显示优化
 - ver 3.0.0-alpha.19 修复：开播提示语粉丝数单位错误； 优化：订阅配置中所有配置项改为必填项
 - ver 3.0.0-alpha.20 优化：订阅配置中开关选项默认为关闭
+- ver 3.0.0-alpha.21 优化：部分代码； 新增：更新插件后，由于机器人还未启动，已开始发送消息报错 `this._request is not a function` ，新增报错后自动重新发送消息的功能
+- ver 3.0.0-alpha.22 优化：订阅配置展示优化
 
 ## 交流群