koishi-plugin-bilibili-notify 3.2.1-alpha.1 → 3.2.1-alpha.10

package/lib/comRegister.js

@@ -1,13 +1,18 @@
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "@satorijs/element/jsx-runtime";
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const jsx_runtime_1 = require("@satorijs/element/jsx-runtime");
 // Koishi核心依赖
-import { Schema, h, } from "koishi";
-import QRCode from "qrcode";
-import { CronJob } from "cron";
+const koishi_1 = require("koishi");
+const qrcode_1 = __importDefault(require("qrcode"));
+const cron_1 = require("cron");
 // Utils
-import { withLock, withRetry } from "./utils";
+const utils_1 = require("./utils");
 // Types
-import { LiveType, PushType, } from "./type";
-import { DateTime } from "luxon";
+const type_1 = require("./type");
+const luxon_1 = require("luxon");
 class ComRegister {
     // 必须服务
     static inject = ["ba", "gi", "database", "bl", "sm"];
@@ -118,7 +123,7 @@ class ComRegister {
             if (content.code !== 0)
                 return await session.send("出问题咯，请联系管理员解决");
             // 生成二维码
-            QRCode.toBuffer(content.data.url, {
+            qrcode_1.default.toBuffer(content.data.url, {
                 errorCorrectionLevel: "H", // 错误更正水平
                 type: "png", // 输出类型
                 margin: 1, // 边距大小
@@ -129,7 +134,7 @@ class ComRegister {
             }, async (err, buffer) => {
                 if (err)
                     return await session.send("二维码生成出错，请重新尝试");
-                await session.send(h.image(buffer, "image/jpeg"));
+                await session.send(koishi_1.h.image(buffer, "image/jpeg"));
             });
             // 检查之前是否存在登录定时器
             if (this.loginTimer)
@@ -267,7 +272,7 @@ class ComRegister {
             // 获取动态内容
             const item = content.data.items[i];
             // 生成图片
-            const buffer = await withRetry(async () => {
+            const buffer = await (0, utils_1.withRetry)(async () => {
                 // 渲染图片
                 return await this.ctx.gi.generateDynamicImg(item);
             }, 1).catch(async (e) => {
@@ -292,7 +297,7 @@ class ComRegister {
                 this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e.message}`);
             });
             // 发送图片
-            buffer && (await session.send(h.image(buffer, "image/jpeg")));
+            buffer && (await session.send(koishi_1.h.image(buffer, "image/jpeg")));
         });
     }
     async init(config) {
@@ -357,7 +362,7 @@ class ComRegister {
     initManager() {
         for (const sub of this.subManager) {
             if (sub.dynamic) {
-                this.dynamicTimelineManager.set(sub.uid, Math.floor(DateTime.now().toSeconds()));
+                this.dynamicTimelineManager.set(sub.uid, Math.floor(luxon_1.DateTime.now().toSeconds()));
             }
             if (sub.live) {
                 this.liveStatusManager.set(sub.uid, {
@@ -439,7 +444,7 @@ class ComRegister {
     async sendMessageWithRetry(bot, channelId, 
     // biome-ignore lint/suspicious/noExplicitAny: <explanation>
     content) {
-        withRetry(async () => await bot.sendMessage(channelId, content), 1).catch(async (e) => {
+        (0, utils_1.withRetry)(async () => await bot.sendMessage(channelId, content), 1).catch(async (e) => {
             if (e.message === "this._request is not a function") {
                 // 2S之后重新发送消息
                 this.ctx.setTimeout(async () => {
@@ -457,7 +462,7 @@ class ComRegister {
         // 定义数组
         const pushArr = [];
         // 判断类型
-        if (type === PushType.Live || type === PushType.StartBroadcasting) {
+        if (type === type_1.PushType.Live || type === type_1.PushType.StartBroadcasting) {
             for (const target of targets) {
                 for (const channel of target.channelArr) {
                     if (channel.live) {
@@ -467,7 +472,7 @@ class ComRegister {
             }
             return pushArr;
         }
-        if (type === PushType.Dynamic) {
+        if (type === type_1.PushType.Dynamic) {
             for (const target of targets) {
                 for (const channel of target.channelArr) {
                     if (channel.dynamic) {
@@ -477,7 +482,7 @@ class ComRegister {
             }
             return pushArr;
         }
-        if (type === PushType.LiveGuardBuy) {
+        if (type === type_1.PushType.LiveGuardBuy) {
             for (const target of targets) {
                 for (const channel of target.channelArr) {
                     if (channel.liveGuardBuy) {
@@ -497,7 +502,7 @@ class ComRegister {
             // logger
             this.logger.info(`推送消息到 ${pushArr.length} 个目标频道，目标频道为：${pushArr.join(", ")}`);
             // 推送消息
-            await withRetry(async () => {
+            await (0, utils_1.withRetry)(async () => {
                 await this.ctx.broadcast(pushArr, content);
             }, 1);
             // 结束
@@ -518,28 +523,28 @@ class ComRegister {
         }
         // 模式匹配
         const pushTypePatternMatching = {
-            [PushType.Live]: async () => {
+            [type_1.PushType.Live]: async () => {
                 if (targetChannel.live) {
                     // 直接推送
                     await this.sendMessageWithRetry(bot, targetChannel.channelId, content);
                 }
             },
-            [PushType.Dynamic]: async () => {
+            [type_1.PushType.Dynamic]: async () => {
                 if (targetChannel.dynamic) {
                     await this.sendMessageWithRetry(bot, targetChannel.channelId, content);
                 }
             },
-            [PushType.StartBroadcasting]: async () => {
+            [type_1.PushType.StartBroadcasting]: async () => {
                 // 判断是否需要推送直播消息
                 if (targetChannel.live) {
                     await this.sendMessageWithRetry(bot, targetChannel.channelId, content);
                 }
                 // 判断是否需要艾特全体成员
                 if (targetChannel.atAll) {
-                    await this.sendMessageWithRetry(bot, targetChannel.channelId, _jsx("at", { type: "all" }));
+                    await this.sendMessageWithRetry(bot, targetChannel.channelId, (0, jsx_runtime_1.jsx)("at", { type: "all" }));
                 }
             },
-            [PushType.LiveGuardBuy]: async () => {
+            [type_1.PushType.LiveGuardBuy]: async () => {
                 // 判断是否需要推送直播消息
                 if (targetChannel.liveGuardBuy) {
                     await this.sendMessageWithRetry(bot, targetChannel.channelId, content);
@@ -555,7 +560,7 @@ class ComRegister {
             // 定义本次请求推送的动态
             const currentPushDyn = {};
             // 使用withRetry函数进行重试
-            const content = await withRetry(async () => {
+            const content = await (0, utils_1.withRetry)(async () => {
                 // 获取动态内容
                 return (await this.ctx.ba.getAllDynamic());
             }, 1).catch((e) => {
@@ -629,7 +634,7 @@ class ComRegister {
                         // 获取订阅对象
                         const sub = this.subManager.find((sub) => sub.uid === uid);
                         // 推送该条动态
-                        const buffer = await withRetry(async () => {
+                        const buffer = await (0, utils_1.withRetry)(async () => {
                             // 渲染图片
                             return await this.ctx.gi.generateDynamicImg(item, sub.card.enable ? sub.card : undefined);
                         }, 1).catch(async (e) => {
@@ -639,19 +644,19 @@ class ComRegister {
                             if (e.message === "出现关键词，屏蔽该动态") {
                                 // 如果需要发送才发送
                                 if (this.config.filter.notify) {
-                                    await this.broadcastToTargets(sub.target, `${name}发布了一条含有屏蔽关键字的动态`, PushType.Dynamic);
+                                    await this.broadcastToTargets(sub.target, `${name}发布了一条含有屏蔽关键字的动态`, type_1.PushType.Dynamic);
                                 }
                                 return;
                             }
                             if (e.message === "已屏蔽转发动态") {
                                 if (this.config.filter.notify) {
-                                    await this.broadcastToTargets(sub.target, `${name}转发了一条动态，已屏蔽`, PushType.Dynamic);
+                                    await this.broadcastToTargets(sub.target, `${name}转发了一条动态，已屏蔽`, type_1.PushType.Dynamic);
                                 }
                                 return;
                             }
                             if (e.message === "已屏蔽专栏动态") {
                                 if (this.config.filter.notify) {
-                                    await this.broadcastToTargets(sub.target, `${name}投稿了一条专栏，已屏蔽`, PushType.Dynamic);
+                                    await this.broadcastToTargets(sub.target, `${name}投稿了一条专栏，已屏蔽`, type_1.PushType.Dynamic);
                                 }
                                 return;
                             }
@@ -678,7 +683,7 @@ class ComRegister {
                         // logger
                         this.logger.info("推送动态中...");
                         // 发送推送卡片
-                        await this.broadcastToTargets(sub.target, _jsxs(_Fragment, { children: [h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+                        await this.broadcastToTargets(sub.target, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, "image/jpeg"), dUrl] }), type_1.PushType.Dynamic);
                         // 判断是否需要发送动态中的图片
                         if (this.config.pushImgsInDynamic) {
                             // 判断是否为图文动态
@@ -688,7 +693,7 @@ class ComRegister {
                                 // 判断pics是否存在
                                 if (pics) {
                                     for (const pic of pics) {
-                                        await this.broadcastToTargets(sub.target, _jsx("img", { src: pic.url, alt: "\u52A8\u6001\u56FE\u7247" }), PushType.Dynamic);
+                                        await this.broadcastToTargets(sub.target, (0, jsx_runtime_1.jsx)("img", { src: pic.url, alt: "\u52A8\u6001\u56FE\u7247" }), type_1.PushType.Dynamic);
                                         // 随机睡眠1-3秒
                                         await this.ctx.sleep(Math.floor(Math.random() * 2000) + 1000);
                                     }
@@ -714,7 +719,7 @@ class ComRegister {
             }
         };
         // 返回一个闭包函数
-        return withLock(handler);
+        return (0, utils_1.withLock)(handler);
     }
     debug_dynamicDetect() {
         // 定义handler
@@ -724,7 +729,7 @@ class ComRegister {
             // logger
             this.logger.info("开始获取动态信息...");
             // 使用withRetry函数进行重试
-            const content = await withRetry(async () => {
+            const content = await (0, utils_1.withRetry)(async () => {
                 // 获取动态内容
                 return (await this.ctx.ba.getAllDynamic());
             }, 1).catch((e) => {
@@ -793,7 +798,7 @@ class ComRegister {
                 const uid = item.modules.module_author.mid.toString();
                 const name = item.modules.module_author.name;
                 // logger
-                this.logger.info(`获取到动态信息，UP主：${name}，UID：${uid}，动态发布时间：${DateTime.fromSeconds(postTime).toFormat("yyyy-MM-dd HH:mm:ss")}`);
+                this.logger.info(`获取到动态信息，UP主：${name}，UID：${uid}，动态发布时间：${luxon_1.DateTime.fromSeconds(postTime).toFormat("yyyy-MM-dd HH:mm:ss")}`);
                 // 判断是否存在时间线
                 if (this.dynamicTimelineManager.has(uid)) {
                     // logger
@@ -801,7 +806,7 @@ class ComRegister {
                     // 寻找关注的UP主
                     const timeline = this.dynamicTimelineManager.get(uid);
                     // logger
-                    this.logger.info(`上次推送时间线：${DateTime.fromSeconds(timeline).toFormat("yyyy-MM-dd HH:mm:ss")}`);
+                    this.logger.info(`上次推送时间线：${luxon_1.DateTime.fromSeconds(timeline).toFormat("yyyy-MM-dd HH:mm:ss")}`);
                     // 判断动态发布时间是否大于时间线
                     if (timeline < postTime) {
                         // logger
@@ -811,7 +816,7 @@ class ComRegister {
                         // logger
                         this.logger.info("开始渲染推送卡片...");
                         // 推送该条动态
-                        const buffer = await withRetry(async () => {
+                        const buffer = await (0, utils_1.withRetry)(async () => {
                             // 渲染图片
                             return await this.ctx.gi.generateDynamicImg(item, sub.card.enable ? sub.card : undefined);
                         }, 1).catch(async (e) => {
@@ -821,19 +826,19 @@ class ComRegister {
                             if (e.message === "出现关键词，屏蔽该动态") {
                                 // 如果需要发送才发送
                                 if (this.config.filter.notify) {
-                                    await this.broadcastToTargets(sub.target, `${name}发布了一条含有屏蔽关键字的动态`, PushType.Dynamic);
+                                    await this.broadcastToTargets(sub.target, `${name}发布了一条含有屏蔽关键字的动态`, type_1.PushType.Dynamic);
                                 }
                                 return;
                             }
                             if (e.message === "已屏蔽转发动态") {
                                 if (this.config.filter.notify) {
-                                    await this.broadcastToTargets(sub.target, `${name}转发了一条动态，已屏蔽`, PushType.Dynamic);
+                                    await this.broadcastToTargets(sub.target, `${name}转发了一条动态，已屏蔽`, type_1.PushType.Dynamic);
                                 }
                                 return;
                             }
                             if (e.message === "已屏蔽专栏动态") {
                                 if (this.config.filter.notify) {
-                                    await this.broadcastToTargets(sub.target, `${name}投稿了一条专栏，已屏蔽`, PushType.Dynamic);
+                                    await this.broadcastToTargets(sub.target, `${name}投稿了一条专栏，已屏蔽`, type_1.PushType.Dynamic);
                                 }
                                 return;
                             }
@@ -867,7 +872,7 @@ class ComRegister {
                         // logger
                         this.logger.info("推送动态中...");
                         // 发送推送卡片
-                        await this.broadcastToTargets(sub.target, _jsxs(_Fragment, { children: [h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+                        await this.broadcastToTargets(sub.target, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, "image/jpeg"), dUrl] }), type_1.PushType.Dynamic);
                         // 判断是否需要发送动态中的图片
                         if (this.config.pushImgsInDynamic) {
                             // logger
@@ -879,7 +884,7 @@ class ComRegister {
                                 // 判断pics是否存在
                                 if (pics) {
                                     for (const pic of pics) {
-                                        await this.broadcastToTargets(sub.target, _jsx("img", { src: pic.url, alt: "\u52A8\u6001\u56FE\u7247" }), PushType.Dynamic);
+                                        await this.broadcastToTargets(sub.target, (0, jsx_runtime_1.jsx)("img", { src: pic.url, alt: "\u52A8\u6001\u56FE\u7247" }), type_1.PushType.Dynamic);
                                         // 随机睡眠1-3秒
                                         await this.ctx.sleep(Math.floor(Math.random() * 2000) + 1000);
                                     }
@@ -907,13 +912,13 @@ class ComRegister {
                 // 更新当前时间线
                 this.dynamicTimelineManager.set(uid, postTime);
                 // logger
-                this.logger.info(`更新时间线成功，UP主：${uid}，时间线：${DateTime.fromSeconds(postTime).toFormat("yyyy-MM-dd HH:mm:ss")}`);
+                this.logger.info(`更新时间线成功，UP主：${uid}，时间线：${luxon_1.DateTime.fromSeconds(postTime).toFormat("yyyy-MM-dd HH:mm:ss")}`);
             }
             // logger
             this.logger.info(`本次推送动态数量：${Object.keys(currentPushDyn).length}`);
         };
         // 返回一个闭包函数
-        return withLock(handler);
+        return (0, utils_1.withLock)(handler);
     }
     // 定义获取主播信息方法
     async useMasterInfo(uid, masterInfo, liveType) {
@@ -924,8 +929,8 @@ class ComRegister {
         let liveEndFollowerNum;
         let liveFollowerChange;
         // 判断直播状态
-        if (liveType === LiveType.StartBroadcasting ||
-            liveType === LiveType.FirstLiveBroadcast) {
+        if (liveType === type_1.LiveType.StartBroadcasting ||
+            liveType === type_1.LiveType.FirstLiveBroadcast) {
             // 第一次启动或刚开播
             // 将当前粉丝数赋值给liveOpenFollowerNum、liveEndFollowerNum
             liveOpenFollowerNum = data.follower_num;
@@ -933,8 +938,8 @@ class ComRegister {
             // 将粉丝数变化赋值为0
             liveFollowerChange = 0;
         }
-        if (liveType === LiveType.StopBroadcast ||
-            liveType === LiveType.LiveBroadcast) {
+        if (liveType === type_1.LiveType.StopBroadcast ||
+            liveType === type_1.LiveType.LiveBroadcast) {
             // 将上一次的liveOpenFollowerNum赋值给本次的liveOpenFollowerNum
             liveOpenFollowerNum = masterInfo.liveOpenFollowerNum;
             // 将当前粉丝数赋值给liveEndFollowerNum
@@ -954,7 +959,7 @@ class ComRegister {
     }
     async useLiveRoomInfo(roomId) {
         // 发送请求获取直播间信息
-        const data = await withRetry(async () => await this.ctx.ba.getLiveRoomInfo(roomId))
+        const data = await (0, utils_1.withRetry)(async () => await this.ctx.ba.getLiveRoomInfo(roomId))
             .then((content) => content.data)
             .catch((e) => {
             this.logger.error(`liveDetect getLiveRoomInfo 发生了错误，错误为：${e.message}`);
@@ -969,7 +974,7 @@ class ComRegister {
     }
     async sendLiveNotifyCard(liveType, followerDisplay, liveInfo, target, liveNotifyMsg) {
         // 生成图片
-        const buffer = await withRetry(async () => {
+        const buffer = await (0, utils_1.withRetry)(async () => {
             // 获取直播通知卡片
             return await this.ctx.gi.generateLiveImg(liveInfo.liveRoomInfo, liveInfo.masterInfo.username, liveInfo.masterInfo.userface, followerDisplay, liveType, liveInfo.cardStyle.enable ? liveInfo.cardStyle : undefined);
         }, 1).catch((e) => {
@@ -979,11 +984,11 @@ class ComRegister {
         if (!buffer)
             return await this.sendPrivateMsgAndStopService();
         // 推送直播信息
-        const msg = (_jsxs(_Fragment, { children: [h.image(buffer, "image/jpeg"), liveNotifyMsg || ""] }));
+        const msg = ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, "image/jpeg"), liveNotifyMsg || ""] }));
         // 只有在开播时才艾特全体成员
-        return await this.broadcastToTargets(target, msg, liveType === LiveType.StartBroadcasting
-            ? PushType.StartBroadcasting
-            : PushType.Live);
+        return await this.broadcastToTargets(target, msg, liveType === type_1.LiveType.StartBroadcasting
+            ? type_1.PushType.StartBroadcasting
+            : type_1.PushType.Live);
     }
     async liveDetectWithListener(roomId, target, cardStyle) {
         // 定义开播时间
@@ -1021,7 +1026,7 @@ class ComRegister {
         // 定义定时推送函数
         const pushAtTimeFunc = async () => {
             // 判断是否信息是否获取成功
-            if (!(await useMasterAndLiveRoomInfo(LiveType.LiveBroadcast))) {
+            if (!(await useMasterAndLiveRoomInfo(type_1.LiveType.LiveBroadcast))) {
                 // 未获取成功，直接返回
                 await this.sendPrivateMsg("获取直播间信息失败，推送直播卡片失败！");
                 // 停止服务
@@ -1052,7 +1057,7 @@ class ComRegister {
                     .replace("-link", `https://live.bilibili.com/${liveRoomInfo.short_id === 0 ? liveRoomInfo.room_id : liveRoomInfo.short_id}`)
                 : null;
             // 发送直播通知卡片
-            await this.sendLiveNotifyCard(LiveType.LiveBroadcast, watched, {
+            await this.sendLiveNotifyCard(type_1.LiveType.LiveBroadcast, watched, {
                 liveRoomInfo,
                 masterInfo,
                 cardStyle,
@@ -1095,7 +1100,7 @@ class ComRegister {
                     // connFlag设置为false
                     connFlag = false;
                     // logger
-                    this.logger.info(`${roomId}直播间连接已建立！`);
+                    this.logger.info(`[${roomId}]直播间连接已建立！`);
                 }
             },
             onClose: async () => {
@@ -1109,10 +1114,21 @@ class ComRegister {
                     // 更改connFlag
                     connFlag = true;
                     // 发送消息
-                    await this.sendPrivateMsg(`${roomId}直播间连接已中断！`);
-                    this.logger.error(`${roomId}直播间连接已中断！`);
+                    await this.sendPrivateMsg(`[${roomId}]直播间连接已中断！`);
+                    this.logger.error(`[${roomId}]直播间连接已中断！`);
                 }
             },
+            onError: async () => {
+                // 更直播状态
+                liveStatus = false;
+                // 关闭定时推送
+                pushAtTimeTimer?.();
+                // 停止服务
+                this.ctx.bl.closeListener(roomId);
+                // 发送消息
+                await this.sendPrivateMsg(`[${roomId}]直播间连接发生错误！`);
+                this.logger.error(`[${roomId}]直播间连接发生错误！`);
+            },
             onIncomeDanmu: ({ body }) => {
                 // 保存消息到数组
                 currentLiveDanmakuArr.push(body.content);
@@ -1130,7 +1146,7 @@ class ComRegister {
                 const content = `[${masterInfo.username}的直播间]「${body.user.uname}」加入了大航海（${body.gift_name}）`;
                 // 直接发送消息
                 channelArrLen > 0 &&
-                    this.broadcastToTargets(liveGuardBuyPushTargetArr, content, PushType.LiveGuardBuy);
+                    this.broadcastToTargets(liveGuardBuyPushTargetArr, content, type_1.PushType.LiveGuardBuy);
             },
             onLiveStart: async () => {
                 // 判断是否已经开播
@@ -1139,7 +1155,7 @@ class ComRegister {
                 // 设置开播状态为true
                 liveStatus = true;
                 // 判断是否信息是否获取成功
-                if (!(await useMasterAndLiveRoomInfo(LiveType.StartBroadcasting))) {
+                if (!(await useMasterAndLiveRoomInfo(type_1.LiveType.StartBroadcasting))) {
                     // 设置开播状态为false
                     liveStatus = false;
                     // 未获取成功，直接返回
@@ -1163,7 +1179,7 @@ class ComRegister {
                         .replace("-link", `https://live.bilibili.com/${liveRoomInfo.short_id === 0 ? liveRoomInfo.room_id : liveRoomInfo.short_id}`)
                     : null;
                 // 推送开播通知
-                await this.sendLiveNotifyCard(LiveType.StartBroadcasting, follower, {
+                await this.sendLiveNotifyCard(type_1.LiveType.StartBroadcasting, follower, {
                     liveRoomInfo,
                     masterInfo,
                     cardStyle,
@@ -1178,7 +1194,7 @@ class ComRegister {
                 // 将直播状态设置为false
                 liveStatus = false;
                 // 判断是否信息是否获取成功
-                if (!(await useMasterAndLiveRoomInfo(LiveType.StopBroadcast))) {
+                if (!(await useMasterAndLiveRoomInfo(type_1.LiveType.StopBroadcast))) {
                     // 未获取成功，直接返回
                     await this.sendPrivateMsg("获取直播间信息失败，推送直播下播卡片失败！");
                     // 停止服务
@@ -1211,7 +1227,7 @@ class ComRegister {
                         .replace("\\n", "\n")
                     : null;
                 // 推送通知卡片
-                await this.sendLiveNotifyCard(LiveType.StopBroadcast, followerChange, {
+                await this.sendLiveNotifyCard(type_1.LiveType.StopBroadcast, followerChange, {
                     liveRoomInfo,
                     masterInfo,
                     cardStyle,
@@ -1225,7 +1241,7 @@ class ComRegister {
         // 启动直播间弹幕监测
         await this.ctx.bl.startLiveRoomListener(roomId, handler);
         // 第一次启动获取信息并判信息是否获取成功
-        if (!(await useMasterAndLiveRoomInfo(LiveType.FirstLiveBroadcast))) {
+        if (!(await useMasterAndLiveRoomInfo(type_1.LiveType.FirstLiveBroadcast))) {
             // 未获取成功，直接返回
             return this.sendPrivateMsg("获取直播间信息失败，启动直播间弹幕检测失败！");
         }
@@ -1246,7 +1262,7 @@ class ComRegister {
                 : null;
             // 发送直播通知卡片
             if (this.config.restartPush) {
-                await this.sendLiveNotifyCard(LiveType.LiveBroadcast, watched, {
+                await this.sendLiveNotifyCard(type_1.LiveType.LiveBroadcast, watched, {
                     liveRoomInfo,
                     masterInfo,
                     cardStyle,
@@ -1296,7 +1312,7 @@ class ComRegister {
         }
         const useLiveInfo = async () => {
             // 发送请求
-            const { data } = await withRetry(async () => (await this.ctx.ba.getLiveRoomInfoByUids(uids)), 3).catch(async () => {
+            const { data } = await (0, utils_1.withRetry)(async () => (await this.ctx.ba.getLiveRoomInfoByUids(uids)), 3).catch(async () => {
                 // 返回undefined
                 return undefined;
             });
@@ -1323,7 +1339,7 @@ class ComRegister {
                 // 将直播状态改为true
                 liveStatus.live = true;
                 // 初始化主播和直播间信息
-                await useMasterAndLiveRoomInfo(LiveType.FirstLiveBroadcast, liveStatus);
+                await useMasterAndLiveRoomInfo(type_1.LiveType.FirstLiveBroadcast, liveStatus);
                 // 判断是否需要设置开播时间
                 if (!liveStatus.liveStartTimeInit) {
                     // 设置开播时间
@@ -1341,7 +1357,7 @@ class ComRegister {
                         .replace("-link", `https://live.bilibili.com/${liveStatus.liveRoomInfo.short_id === 0 ? liveStatus.liveRoomInfo.room_id : liveStatus.liveRoomInfo.short_id}`)
                     : null;
                 // 发送直播通知卡片
-                await this.sendLiveNotifyCard(LiveType.LiveBroadcast, "API", {
+                await this.sendLiveNotifyCard(type_1.LiveType.LiveBroadcast, "API", {
                     liveRoomInfo: liveStatus.liveRoomInfo,
                     masterInfo: liveStatus.masterInfo,
                     cardStyle: sub.card,
@@ -1371,7 +1387,7 @@ class ComRegister {
                         if (liveStatus.live === true) {
                             // 现在下播了，发送下播通知
                             // 判断信息是否获取成功
-                            if (!(await useMasterAndLiveRoomInfo(LiveType.StopBroadcast, liveStatus))) {
+                            if (!(await useMasterAndLiveRoomInfo(type_1.LiveType.StopBroadcast, liveStatus))) {
                                 // 未获取成功，直接返回
                                 await this.sendPrivateMsg("获取直播间信息失败，推送直播下播卡片失败！");
                                 // 停止服务
@@ -1409,7 +1425,7 @@ class ComRegister {
                                     .replace("\\n", "\n")
                                 : null;
                             // 推送通知卡片
-                            await this.sendLiveNotifyCard(LiveType.StopBroadcast, followerChange, {
+                            await this.sendLiveNotifyCard(type_1.LiveType.StopBroadcast, followerChange, {
                                 liveRoomInfo: liveStatus.liveRoomInfo,
                                 masterInfo: liveStatus.masterInfo,
                                 cardStyle: sub.card,
@@ -1425,7 +1441,7 @@ class ComRegister {
                         if (liveStatus.live === false) {
                             // 开播了
                             // 判断信息是否获取成功
-                            if (!(await useMasterAndLiveRoomInfo(LiveType.StopBroadcast, liveStatus))) {
+                            if (!(await useMasterAndLiveRoomInfo(type_1.LiveType.StopBroadcast, liveStatus))) {
                                 // 未获取成功，直接返回
                                 await this.sendPrivateMsg("获取直播间信息失败，推送直播开播卡片失败！");
                                 // 停止服务
@@ -1449,7 +1465,7 @@ class ComRegister {
                                     .replace("-link", `https://live.bilibili.com/${liveStatus.liveRoomInfo.short_id === 0 ? liveStatus.liveRoomInfo.room_id : liveStatus.liveRoomInfo.short_id}`)
                                 : null;
                             // 推送开播通知
-                            await this.sendLiveNotifyCard(LiveType.StartBroadcasting, follower, {
+                            await this.sendLiveNotifyCard(type_1.LiveType.StartBroadcasting, follower, {
                                 liveRoomInfo: liveStatus.liveRoomInfo,
                                 masterInfo: liveStatus.masterInfo,
                                 cardStyle: sub.card,
@@ -1466,7 +1482,7 @@ class ComRegister {
                                 break;
                             }
                             // 判断是否信息是否获取成功
-                            if (!(await useMasterAndLiveRoomInfo(LiveType.LiveBroadcast, liveStatus))) {
+                            if (!(await useMasterAndLiveRoomInfo(type_1.LiveType.LiveBroadcast, liveStatus))) {
                                 // 未获取成功，直接返回
                                 await this.sendPrivateMsg("获取直播间信息失败，推送直播卡片失败！");
                                 // 停止服务
@@ -1489,7 +1505,7 @@ class ComRegister {
                                     .replace("-link", `https://live.bilibili.com/${liveStatus.liveRoomInfo.short_id === 0 ? liveStatus.liveRoomInfo.room_id : liveStatus.liveRoomInfo.short_id}`)
                                 : null;
                             // 发送直播通知卡片
-                            await this.sendLiveNotifyCard(LiveType.LiveBroadcast, "API", {
+                            await this.sendLiveNotifyCard(type_1.LiveType.LiveBroadcast, "API", {
                                 liveRoomInfo: liveStatus.liveRoomInfo,
                                 masterInfo: liveStatus.masterInfo,
                                 cardStyle: sub.card,
@@ -1506,7 +1522,7 @@ class ComRegister {
             }
         };
         // 返回一个闭包函数
-        return withLock(handler);
+        return (0, utils_1.withLock)(handler);
     }
     subShow() {
         // 在控制台中显示订阅对象
@@ -1532,9 +1548,9 @@ class ComRegister {
             const subTableArray = subInfo.split("\n");
             subTableArray.splice(subTableArray.length - 1, 1);
             // 定义Table
-            table = (_jsxs(_Fragment, { children: [_jsx("p", { children: "\u5F53\u524D\u8BA2\u9605\u5BF9\u8C61\uFF1A" }), _jsx("ul", { children: subTableArray.map((str) => (
+            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) => (
                         // biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
-                        _jsx("li", { children: str }))) })] }));
+                        (0, jsx_runtime_1.jsx)("li", { children: str }))) })] }));
         }
         // 设置更新后的提示
         this.subNotifier = this.ctx.notifier.create(table);
@@ -1558,17 +1574,17 @@ class ComRegister {
             // 判断是否有数据
             if (!this.loginDBData?.dynamic_group_id) {
                 // 没有数据，没有创建分组，尝试创建分组
-                const createGroupData = await this.ctx.ba.createGroup("订阅");
+                const createGroupData = (await this.ctx.ba.createGroup("订阅"));
                 // 如果分组已创建，则获取分组id
                 if (createGroupData.code === 22106) {
                     // 分组已存在，拿到之前的分组id
-                    const allGroupData = await this.ctx.ba.getAllGroup();
+                    const allGroupData = (await this.ctx.ba.getAllGroup());
                     // 遍历所有分组
                     for (const group of allGroupData.data) {
                         // 找到订阅分组
                         if (group.name === "订阅") {
                             // 拿到分组id
-                            this.loginDBData.dynamic_group_id = group.tagid;
+                            this.loginDBData.dynamic_group_id = group.tagid.toString();
                             // 保存到数据库
                             this.ctx.database.set("loginBili", 1, {
                                 dynamic_group_id: this.loginDBData.dynamic_group_id,
@@ -1584,7 +1600,7 @@ class ComRegister {
                 }
                 // 创建成功，保存到数据库
                 this.ctx.database.set("loginBili", 1, {
-                    dynamic_group_id: this.loginDBData.dynamic_group_id,
+                    dynamic_group_id: createGroupData.data.tagid.toString(),
                 });
                 // 创建成功
                 return { code: createGroupData.code, msg: createGroupData.message };
@@ -1724,7 +1740,7 @@ class ComRegister {
             // logger
             this.logger.info(`加载订阅UID:${sub.uid}中...`);
             // 定义Data
-            const { code: userInfoCode, msg: userInfoMsg, data: userInfoData, } = await withRetry(async () => {
+            const { code: userInfoCode, msg: userInfoMsg, data: userInfoData, } = await (0, utils_1.withRetry)(async () => {
                 // 获取用户信息
                 const data = await this.ctx.ba.getUserInfo(sub.uid);
                 // 返回用户信息
@@ -1801,7 +1817,7 @@ class ComRegister {
     }
     enableDynamicDetect() {
         // 定义Job
-        this.dynamicJob = new CronJob("*/2 * * * *", this.config.dynamicDebugMode
+        this.dynamicJob = new cron_1.CronJob("*/2 * * * *", this.config.dynamicDebugMode
             ? this.debug_dynamicDetect()
             : this.dynamicDetect());
         // logger
@@ -1811,7 +1827,7 @@ class ComRegister {
     }
     async enableLiveDetect() {
         // 定义Job
-        this.liveJob = new CronJob("*/30 * * * * *", await this.liveDetectWithAPI());
+        this.liveJob = new cron_1.CronJob("*/30 * * * * *", await this.liveDetectWithAPI());
         // logger
         this.logger.info("直播监测已开启");
         // 开始直播监测
@@ -1830,54 +1846,54 @@ class ComRegister {
     }
 }
 (function (ComRegister) {
-    ComRegister.Config = Schema.object({
-        sub: Schema.array(Schema.object({
-            uid: Schema.string().description("订阅用户UID"),
-            dynamic: Schema.boolean().description("是否订阅用户动态"),
-            live: Schema.boolean().description("是否订阅用户直播"),
-            target: Schema.array(Schema.object({
-                channelArr: Schema.array(Schema.object({
-                    channelId: Schema.string().description("频道/群组号"),
-                    dynamic: Schema.boolean().description("该频道/群组是否推送动态信息"),
-                    live: Schema.boolean().description("该频道/群组是否推送直播通知"),
-                    liveGuardBuy: Schema.boolean().description("该频道/群组是否推送弹幕消息"),
-                    atAll: Schema.boolean().description("推送开播通知时是否艾特全体成员"),
-                    bot: Schema.string().description("若您有多个相同平台机器人，可在此填写当前群聊执行推送的机器人账号。不填则默认第一个"),
+    ComRegister.Config = koishi_1.Schema.object({
+        sub: koishi_1.Schema.array(koishi_1.Schema.object({
+            uid: koishi_1.Schema.string().description("订阅用户UID"),
+            dynamic: koishi_1.Schema.boolean().description("是否订阅用户动态"),
+            live: koishi_1.Schema.boolean().description("是否订阅用户直播"),
+            target: koishi_1.Schema.array(koishi_1.Schema.object({
+                channelArr: koishi_1.Schema.array(koishi_1.Schema.object({
+                    channelId: koishi_1.Schema.string().description("频道/群组号"),
+                    dynamic: koishi_1.Schema.boolean().description("该频道/群组是否推送动态信息"),
+                    live: koishi_1.Schema.boolean().description("该频道/群组是否推送直播通知"),
+                    liveGuardBuy: koishi_1.Schema.boolean().description("该频道/群组是否推送弹幕消息"),
+                    atAll: koishi_1.Schema.boolean().description("推送开播通知时是否艾特全体成员"),
+                    bot: koishi_1.Schema.string().description("若您有多个相同平台机器人，可在此填写当前群聊执行推送的机器人账号。不填则默认第一个"),
                 })).description("频道/群组信息"),
-                platform: Schema.string().description("推送平台"),
+                platform: koishi_1.Schema.string().description("推送平台"),
             })).description("订阅用户需要发送的频道/群组信息"),
-            card: Schema.object({
-                enable: Schema.boolean(),
-                cardColorStart: Schema.string(),
-                cardColorEnd: Schema.string(),
-                cardBasePlateColor: Schema.string(),
-                cardBasePlateBorder: Schema.string(),
+            card: koishi_1.Schema.object({
+                enable: koishi_1.Schema.boolean(),
+                cardColorStart: koishi_1.Schema.string(),
+                cardColorEnd: koishi_1.Schema.string(),
+                cardBasePlateColor: koishi_1.Schema.string(),
+                cardBasePlateBorder: koishi_1.Schema.string(),
             }).description("自定义推送卡片颜色，默认使用插件内置的颜色，设置后会覆盖插件内置的颜色"),
         }))
             .role("table")
             .description("手动输入订阅信息，方便自定义订阅内容，这里的订阅内容不会存入数据库。uid: 订阅用户UID，dynamic: 是否需要订阅动态，live: 是否需要订阅直播"),
-        master: Schema.object({
-            enable: Schema.boolean(),
-            platform: Schema.string(),
-            masterAccount: Schema.string(),
-            masterAccountGuildId: Schema.string(),
+        master: koishi_1.Schema.object({
+            enable: koishi_1.Schema.boolean(),
+            platform: koishi_1.Schema.string(),
+            masterAccount: koishi_1.Schema.string(),
+            masterAccountGuildId: koishi_1.Schema.string(),
         }),
-        liveDetectType: Schema.string(),
-        restartPush: Schema.boolean().required(),
-        pushTime: Schema.number().required(),
-        pushImgsInDynamic: Schema.boolean().required(),
-        liveLoopTime: Schema.number().default(10),
-        customLiveStart: Schema.string().required(),
-        customLive: Schema.string(),
-        customLiveEnd: Schema.string().required(),
-        dynamicUrl: Schema.boolean().required(),
-        filter: Schema.object({
-            enable: Schema.boolean(),
-            notify: Schema.boolean(),
-            regex: Schema.string(),
-            keywords: Schema.array(String),
+        liveDetectType: koishi_1.Schema.string(),
+        restartPush: koishi_1.Schema.boolean().required(),
+        pushTime: koishi_1.Schema.number().required(),
+        pushImgsInDynamic: koishi_1.Schema.boolean().required(),
+        liveLoopTime: koishi_1.Schema.number().default(10),
+        customLiveStart: koishi_1.Schema.string().required(),
+        customLive: koishi_1.Schema.string(),
+        customLiveEnd: koishi_1.Schema.string().required(),
+        dynamicUrl: koishi_1.Schema.boolean().required(),
+        filter: koishi_1.Schema.object({
+            enable: koishi_1.Schema.boolean(),
+            notify: koishi_1.Schema.boolean(),
+            regex: koishi_1.Schema.string(),
+            keywords: koishi_1.Schema.array(String),
         }),
-        dynamicDebugMode: Schema.boolean().required(),
+        dynamicDebugMode: koishi_1.Schema.boolean().required(),
     });
 })(ComRegister || (ComRegister = {}));
-export default ComRegister;
+exports.default = ComRegister;