koishi-plugin-bilibili-notify 3.0.0-alpha.7 → 3.0.0-alpha.9

package/lib/biliAPI.js

@@ -551,67 +551,172 @@ class BiliAPI extends koishi_1.Service {
     }
 }
 __decorate([
-    (0, retry_1.default)()
+    (0, retry_1.default)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getTheUserWhoIsLiveStreaming() 第${attempts}次失败: ${error.message}`);
+        },
+    })
 ], BiliAPI.prototype, "getTheUserWhoIsLiveStreaming", null);
 __decorate([
-    (0, retry_1.default)()
+    (0, retry_1.default)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getLiveRoomInfoStreamKey() 第${attempts}次失败: ${error.message}`);
+        },
+    })
 ], BiliAPI.prototype, "getLiveRoomInfoStreamKey", null);
 __decorate([
-    (0, retry_1.default)()
+    (0, retry_1.default)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getServerUTCTime() 第${attempts}次失败: ${error.message}`);
+        },
+    })
 ], BiliAPI.prototype, "getServerUTCTime", null);
 __decorate([
-    (0, retry_1.default)()
+    (0, retry_1.default)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getTimeNow() 第${attempts}次失败: ${error.message}`);
+        },
+    })
 ], BiliAPI.prototype, "getTimeNow", null);
 __decorate([
-    (0, retry_1.default)()
+    (0, retry_1.default)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getAllGroup() 第${attempts}次失败: ${error.message}`);
+        },
+    })
 ], BiliAPI.prototype, "getAllGroup", null);
 __decorate([
-    (0, retry_1.default)()
+    (0, retry_1.default)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`removeUserFromGroup() 第${attempts}次失败: ${error.message}`);
+        },
+    })
 ], BiliAPI.prototype, "removeUserFromGroup", null);
 __decorate([
-    (0, retry_1.default)()
+    (0, retry_1.default)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`copyUserToGroup() 第${attempts}次失败: ${error.message}`);
+        },
+    })
 ], BiliAPI.prototype, "copyUserToGroup", null);
 __decorate([
-    (0, retry_1.default)()
+    (0, retry_1.default)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getUserSpaceDynamic() 第${attempts}次失败: ${error.message}`);
+        },
+    })
 ], BiliAPI.prototype, "getUserSpaceDynamic", null);
 __decorate([
-    (0, retry_1.default)()
+    (0, retry_1.default)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`createGroup() 第${attempts}次失败: ${error.message}`);
+        },
+    })
 ], BiliAPI.prototype, "createGroup", null);
 __decorate([
-    (0, retry_1.default)()
+    (0, retry_1.default)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getAllDynamic() 第${attempts}次失败: ${error.message}`);
+        },
+    })
 ], BiliAPI.prototype, "getAllDynamic", null);
 __decorate([
-    (0, retry_1.default)()
+    (0, retry_1.default)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`hasNewDynamic() 第${attempts}次失败: ${error.message}`);
+        },
+    })
 ], BiliAPI.prototype, "hasNewDynamic", null);
 __decorate([
-    (0, retry_1.default)()
+    (0, retry_1.default)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`follow() 第${attempts}次失败: ${error.message}`);
+        },
+    })
 ], BiliAPI.prototype, "follow", null);
 __decorate([
-    (0, retry_1.default)()
+    (0, retry_1.default)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getRelationGroupDetail() 第${attempts}次失败: ${error.message}`);
+        },
+    })
 ], BiliAPI.prototype, "getRelationGroupDetail", null);
 __decorate([
-    (0, retry_1.default)()
+    (0, retry_1.default)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getCookieInfo() 第${attempts}次失败: ${error.message}`);
+        },
+    })
 ], BiliAPI.prototype, "getCookieInfo", null);
 __decorate([
-    (0, retry_1.default)()
+    (0, retry_1.default)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getUserInfo() 第${attempts}次失败: ${error.message}`);
+        },
+    })
 ], BiliAPI.prototype, "getUserInfo", null);
 __decorate([
-    (0, retry_1.default)()
+    (0, retry_1.default)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getWbiKeys() 第${attempts}次失败: ${error.message}`);
+        },
+    })
 ], BiliAPI.prototype, "getWbiKeys", null);
 __decorate([
-    (0, retry_1.default)()
+    (0, retry_1.default)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getMyselfInfo() 第${attempts}次失败: ${error.message}`);
+        },
+    })
 ], BiliAPI.prototype, "getMyselfInfo", null);
 __decorate([
-    (0, retry_1.default)()
+    (0, retry_1.default)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getLoginQRCode() 第${attempts}次失败: ${error.message}`);
+        },
+    })
 ], BiliAPI.prototype, "getLoginQRCode", null);
 __decorate([
-    (0, retry_1.default)()
+    (0, retry_1.default)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getLoginStatus() 第${attempts}次失败: ${error.message}`);
+        },
+    })
 ], BiliAPI.prototype, "getLoginStatus", null);
 __decorate([
-    (0, retry_1.default)()
+    (0, retry_1.default)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getLiveRoomInfo() 第${attempts}次失败: ${error.message}`);
+        },
+    })
 ], BiliAPI.prototype, "getLiveRoomInfo", null);
 __decorate([
-    (0, retry_1.default)()
+    (0, retry_1.default)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getMasterInfo() 第${attempts}次失败: ${error.message}`);
+        },
+    })
 ], BiliAPI.prototype, "getMasterInfo", null);
 (function (BiliAPI) {
     BiliAPI.Config = koishi_1.Schema.object({

package/lib/comRegister.js

@@ -165,6 +165,8 @@ class ComRegister {
                             }]);
                         // 销毁定时器
                         this.loginTimer();
+                        // 订阅手动订阅中的订阅
+                        await this.loadSubFromConfig(config.sub);
                         // 订阅之前的订阅
                         await this.loadSubFromDatabase();
                         // 清除控制台通知
@@ -175,7 +177,6 @@ class ComRegister {
                         await session.execute('bili show');
                         // 开启cookies刷新检测
                         ctx.ba.enableRefreshCookiesDetect();
-                        return;
                     }
                 }
                 finally {
@@ -1392,9 +1393,14 @@ class ComRegister {
         // 定义弹幕存放数组
         const currentLiveDanmakuArr = [];
         const temporaryLiveDanmakuArr = [];
+        // 定义开播状态
+        let liveStatus = false;
         // 处理target
         // 定义channelIdArr总长度
         let channelIdArrLen = 0;
+        // 定义数据
+        let liveRoomInfo;
+        let masterInfo;
         // 找到频道/群组对应的
         const danmakuPushTargetArr = target.map(channel => {
             // 获取符合条件的target
@@ -1409,10 +1415,13 @@ class ComRegister {
         });
         // 定义定时推送函数
         const pushAtTimeFunc = async () => {
-            // 获取直播间信息
-            const liveRoomInfo = await this.useLiveRoomInfo(roomId);
-            // 获取主播信息
-            const masterInfo = await this.useMasterInfo(liveRoomInfo.uid);
+            // 判断是否信息是否获取成功
+            if (!(await useMasterAndLiveRoomInfo())) {
+                // 未获取成功，直接返回
+                return this.sendPrivateMsg('获取直播间信息失败，推送直播卡片失败！');
+            }
+            // 设置开播时间
+            liveTime = liveRoomInfo.live_time;
             // 设置直播中消息
             const liveMsg = this.config.customLive ? this.config.customLive
                 .replace('-name', masterInfo.username)
@@ -1436,10 +1445,44 @@ class ComRegister {
                 temporaryLiveDanmakuArr.length = 0;
             }
         };
-        // 获取直播间信息
-        const liveRoomInfo = await this.useLiveRoomInfo(roomId);
-        // 获取主播信息
-        const masterInfo = await this.useMasterInfo(liveRoomInfo.uid);
+        // 定义直播间信息获取函数
+        const useMasterAndLiveRoomInfo = async () => {
+            // 定义flag
+            let flag = true;
+            // 判断是否已存在值
+            if (liveRoomInfo && masterInfo && liveTime) {
+                // 所有值均已存在，不需要再获取信息
+                return flag;
+            }
+            // 获取直播间信息
+            liveRoomInfo = await this.useLiveRoomInfo(roomId).catch(() => {
+                // 设置flag为false
+                flag = false;
+                // 返回空
+                return null;
+            });
+            // 判断是否成功获取信息
+            if (!flag || !liveRoomInfo || !liveRoomInfo.uid) {
+                // 上一步未成功
+                flag = false;
+                // 返回flag
+                return flag;
+            }
+            // 获取主播信息(需要满足flag为true，liveRoomInfo.uid有值)
+            masterInfo = await this.useMasterInfo(liveRoomInfo.uid).catch(() => {
+                // 设置flag为false
+                flag = false;
+                // 返回空
+                return null;
+            });
+            // 返回信息
+            return flag;
+        };
+        // 判断是否信息是否获取成功
+        if (!(await useMasterAndLiveRoomInfo())) {
+            // 未获取成功，直接返回
+            return this.sendPrivateMsg('获取直播间信息失败，启动直播间弹幕检测失败！');
+        }
         // 构建消息处理函数
         const handler = {
             onOpen: () => {
@@ -1469,10 +1512,14 @@ class ComRegister {
                 temporaryLiveDanmakuArr.push(content);
             },
             onLiveStart: async () => {
-                // 获取直播间信息
-                const liveRoomInfo = await this.useLiveRoomInfo(roomId);
-                // 获取主播信息
-                const masterInfo = await this.useMasterInfo(liveRoomInfo.uid);
+                // 判断是否已经开播
+                if (liveStatus)
+                    return;
+                // 判断是否信息是否获取成功
+                if (!(await useMasterAndLiveRoomInfo())) {
+                    // 未获取成功，直接返回
+                    return this.sendPrivateMsg('获取直播间信息失败，推送直播开播卡片失败！');
+                }
                 // 设置开播时间
                 liveTime = liveRoomInfo.live_time;
                 // 定义开播通知语                            
@@ -1480,7 +1527,7 @@ class ComRegister {
                     .replace('-name', masterInfo.username)
                     .replace('-time', await this.ctx.gi.getTimeDifference(liveTime))
                     .replace('-link', `https://live.bilibili.com/${liveRoomInfo.short_id === 0 ? liveRoomInfo.room_id : liveRoomInfo.short_id}`) : null;
-                // 推送下播通知
+                // 推送开播通知
                 await this.sendLiveNotifyCard({
                     username: masterInfo.username,
                     userface: masterInfo.userface,
@@ -1492,12 +1539,15 @@ class ComRegister {
                     // 开始直播，开启定时器
                     pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1000 * 60 * 60);
                 }
+                // 设置开播状态为true
+                liveStatus = true;
             },
             onLiveEnd: async () => {
-                // 获取直播间消息
-                const liveRoomInfo = await this.useLiveRoomInfo(roomId);
-                // 获取主播信息
-                const masterInfo = await this.useMasterInfo(liveRoomInfo.uid);
+                // 判断是否信息是否获取成功
+                if (!(await useMasterAndLiveRoomInfo())) {
+                    // 未获取成功，直接返回
+                    return this.sendPrivateMsg('获取直播间信息失败，推送直播下播卡片失败！');
+                }
                 // 更改直播时长
                 liveRoomInfo.live_time = liveTime;
                 // 定义下播播通知语                            
@@ -1515,6 +1565,8 @@ class ComRegister {
                 pushAtTimeTimer();
                 // 将推送定时器变量置空
                 pushAtTimeTimer = null;
+                // 将直播状态设置为false
+                liveStatus = false;
             }
         };
         // 启动直播间弹幕监测
@@ -1543,6 +1595,8 @@ class ComRegister {
                 // 开始直播，开启定时器
                 pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1000 * 60 * 60);
             }
+            // 设置直播状态为true
+            liveStatus = true;
         }
     }
     subShow() {

package/lib/utils/retry.d.ts

@@ -1,2 +1,6 @@
-declare function Retry(attempts?: number, onFailure?: (error: Error, attempts: number) => Promise<void> | void): MethodDecorator;
+interface RetryOptions {
+    attempts: number;
+    onFailure?: (error: Error, attempts: number) => Promise<void> | void;
+}
+declare function Retry(options?: RetryOptions): MethodDecorator;
 export default Retry;

package/lib/utils/retry.js

@@ -1,20 +1,18 @@
 "use strict";
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/ban-types */
 Object.defineProperty(exports, "__esModule", { value: true });
-function Retry(attempts = 3, onFailure) {
+function Retry(options = { attempts: 3 }) {
     return function (target, propertyKey, descriptor) {
         const originalMethod = descriptor.value;
         descriptor.value = async function (...args) {
             let lastError;
-            for (let i = 0; i < attempts; i++) {
+            for (let i = 0; i < options.attempts; i++) {
                 try {
                     return await originalMethod.apply(this, args);
                 }
                 catch (error) {
                     lastError = error;
-                    if (onFailure) {
-                        await onFailure.call(this, lastError, i + 1);
+                    if (options.onFailure) {
+                        await options.onFailure.call(this, lastError, i + 1);
                     }
                 }
             }

package/lib/utils/withLock.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 高阶函数：为函数添加锁机制
+ * @param {Function} fn - 需要包装的原始函数
+ * @returns {Function} 带锁功能的函数
+ */
+declare function withLock(fn: any): (...args: any[]) => void;
+export default withLock;

package/lib/utils/withLock.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * 高阶函数：为函数添加锁机制
+ * @param {Function} fn - 需要包装的原始函数
+ * @returns {Function} 带锁功能的函数
+ */
+function withLock(fn) {
+    // 判断是否是异步函数
+    const isAsync = fn.constructor.name === 'AsyncFunction';
+    // 定义锁标志
+    let locked = false;
+    // 判断是否为异步函数
+    if (isAsync) {
+        // 变为Promise
+        return function (...args) {
+            // 已加锁则跳过执行
+            if (locked)
+                return;
+            // 获取锁
+            locked = true;
+            // 将异步函数转为Promise链
+            Promise.resolve(fn(...args))
+                .catch(err => {
+                // 打印错误
+                console.error("Execution error:", err);
+                // 重新抛出错误
+                throw err;
+            })
+                .finally(() => {
+                // 确保释放锁
+                locked = false;
+            });
+        };
+    }
+    // 不是异步函数
+    return function (...args) {
+        // 已加锁则跳过执行
+        if (locked)
+            return;
+        // 获取锁
+        locked = true;
+        try {
+            // 执行函数
+            fn(...args);
+        }
+        catch (err) {
+            // 打印错误
+            console.error("Execution error:", err);
+            // 重新抛出错误
+            throw err;
+        }
+        finally {
+            // 无论成功失败都释放锁
+            locked = false;
+        }
+    };
+}
+exports.default = withLock;

package/package.json

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

package/readme.md

@@ -219,6 +219,8 @@
 - ver 3.0.0-alpha.5 修复：订阅的直播开播后，未开启弹幕推送会一直报错、主播开播推送下播卡片，直播时长显示NaN； 新增：直播检测模式选项； 优化：下播卡片内容
 - ver 3.0.0-alpha.6 修复：连续发送两次直播中通知卡片； 优化：下播通知卡片
 - ver 3.0.0-alpha.7 修复：`ver 3.0.0-alpha.5` 未能解决的bug； 优化：ba代码结构
+- ver 3.0.0-alpha.8 修复：开播通知连续发送两次，登录后不会加载手动订阅中的订阅； 优化：网络请求报错
+- ver 3.0.0-alpha.9 优化：加强直播推送对获取直播信息的错误处理
 
 ## 交流群