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

package/lib/biliAPI.js

@@ -1,4 +1,10 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -14,6 +20,7 @@ const tough_cookie_1 = require("tough-cookie");
 const axios_cookiejar_support_1 = require("axios-cookiejar-support");
 const jsdom_1 = require("jsdom");
 const luxon_1 = require("luxon");
+const retry_1 = __importDefault(require("./utils/retry"));
 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,
@@ -108,183 +115,113 @@ class BiliAPI extends koishi_1.Service {
     }
     // BA API
     async getTheUserWhoIsLiveStreaming() {
-        try {
-            // 获取直播间信息流密钥
-            const { data: { live_users } } = await this.client.get(GET_LATEST_UPDATED_UPS);
-            // 返回data
-            return live_users;
-        }
-        catch (e) {
-            throw new Error('网络异常，本次请求失败！');
-        }
+        // 获取直播间信息流密钥
+        const { data: { live_users } } = await this.client.get(GET_LATEST_UPDATED_UPS);
+        // 返回data
+        return live_users;
     }
     async getLiveRoomInfoStreamKey(roomId) {
-        try {
-            // 获取直播间信息流密钥
-            const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO_STREAM_KEY}?id=${roomId}`);
-            // 返回data
-            return data;
-        }
-        catch (e) {
-            throw new Error('网络异常，本次请求失败！');
-        }
+        // 获取直播间信息流密钥
+        const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO_STREAM_KEY}?id=${roomId}`);
+        // 返回data
+        return data;
     }
     async getServerUTCTime() {
-        try {
-            const { data } = await this.client.get(GET_SERVER_UTC_TIME);
-            const regex = /Date\.UTC\((.*?)\)/;
-            const match = data.match(regex);
-            if (match) {
-                const timestamp = new Function(`return Date.UTC(${match[1]})`)();
-                return timestamp / 1000;
-            }
-            else {
-                throw new Error('解析服务器时间失败！');
-            }
+        const { data } = await this.client.get(GET_SERVER_UTC_TIME);
+        const regex = /Date\.UTC\((.*?)\)/;
+        const match = data.match(regex);
+        if (match) {
+            const timestamp = new Function(`return Date.UTC(${match[1]})`)();
+            return timestamp / 1000;
         }
-        catch (e) {
-            throw new Error('网络异常，本次请求失败！');
+        else {
+            throw new Error('解析服务器时间失败！');
         }
     }
     async getTimeNow() {
-        try {
-            const { data } = await this.client.get(GET_TIME_NOW);
-            return data;
-        }
-        catch (e) {
-            throw new Error('网络异常，本次请求失败！');
-        }
+        const { data } = await this.client.get(GET_TIME_NOW);
+        return data;
     }
     async getAllGroup() {
-        try {
-            const { data } = await this.client.get(GET_ALL_GROUP);
-            return data;
-        }
-        catch (e) {
-            throw new Error('网络异常，本次请求失败！');
-        }
+        const { data } = await this.client.get(GET_ALL_GROUP);
+        return data;
     }
     async removeUserFromGroup(mid) {
         // 获取csrf
         const csrf = this.getCSRF();
-        try {
-            // 将用户mid添加到groupId
-            const { data } = await this.client.post(MODIFY_GROUP_MEMBER, {
-                fids: mid,
-                tagids: 0,
-                csrf
-            }, {
-                headers: {
-                    'Content-Type': 'application/x-www-form-urlencoded',
-                }
-            });
-            return data;
-        }
-        catch (e) {
-            throw new Error('网络异常，本次请求失败！');
-        }
+        // 将用户mid添加到groupId
+        const { data } = await this.client.post(MODIFY_GROUP_MEMBER, {
+            fids: mid,
+            tagids: 0,
+            csrf
+        }, {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+            }
+        });
+        return data;
     }
     async copyUserToGroup(mid, groupId) {
         // 获取csrf
         const csrf = this.getCSRF();
-        try {
-            // 将用户mid添加到groupId
-            const { data } = await this.client.post(COPY_USER_TO_GROUP, {
-                fids: mid,
-                tagids: groupId,
-                csrf
-            }, {
-                headers: {
-                    'Content-Type': 'application/x-www-form-urlencoded',
-                }
-            });
-            return data;
-        }
-        catch (e) {
-            throw new Error('网络异常，本次请求失败！');
-        }
+        // 将用户mid添加到groupId
+        const { data } = await this.client.post(COPY_USER_TO_GROUP, {
+            fids: mid,
+            tagids: groupId,
+            csrf
+        }, {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+            }
+        });
+        return data;
     }
     async getUserSpaceDynamic(mid) {
-        try {
-            const { data } = await this.client.get(`${GET_USER_SPACE_DYNAMIC_LIST}?host_mid=${mid}`);
-            return data;
-        }
-        catch (e) {
-            throw new Error('网络异常，本次请求失败！');
-        }
+        const { data } = await this.client.get(`${GET_USER_SPACE_DYNAMIC_LIST}?host_mid=${mid}`);
+        return data;
     }
     async createGroup(tag) {
-        try {
-            const { data } = await this.client.post(CREATE_GROUP, {
-                tag,
-                csrf: this.getCSRF()
-            }, {
-                headers: {
-                    'Content-Type': 'application/x-www-form-urlencoded',
-                }
-            });
-            return data;
-        }
-        catch (e) {
-            throw new Error('网络异常，本次请求失败！');
-        }
+        const { data } = await this.client.post(CREATE_GROUP, {
+            tag,
+            csrf: this.getCSRF()
+        }, {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+            }
+        });
+        return data;
     }
     async getAllDynamic(updateBaseline) {
         let url = GET_ALL_DYNAMIC_LIST;
         updateBaseline && (url += `?update_baseline=${updateBaseline}`);
-        try {
-            const { data } = await this.client.get(url);
-            return data;
-        }
-        catch (e) {
-            throw new Error('网络异常，本次请求失败！');
-        }
+        const { data } = await this.client.get(url);
+        return data;
     }
     async hasNewDynamic(updateBaseline) {
-        try {
-            const { data } = await this.client.get(`${HAS_NEW_DYNAMIC}?update_baseline=${updateBaseline}`);
-            return data;
-        }
-        catch (e) {
-            throw new Error('网络异常，本次请求失败！');
-        }
+        const { data } = await this.client.get(`${HAS_NEW_DYNAMIC}?update_baseline=${updateBaseline}`);
+        return data;
     }
     async follow(fid) {
-        try {
-            const { data } = await this.client.post(MODIFY_RELATION, {
-                fid,
-                act: 1,
-                re_src: 11,
-                csrf: this.getCSRF()
-            }, {
-                headers: {
-                    'Content-Type': 'application/x-www-form-urlencoded',
-                }
-            });
-            return data;
-        }
-        catch (e) {
-            throw new Error('网络异常，本次请求失败！');
-        }
+        const { data } = await this.client.post(MODIFY_RELATION, {
+            fid,
+            act: 1,
+            re_src: 11,
+            csrf: this.getCSRF()
+        }, {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+            }
+        });
+        return data;
     }
     async getRelationGroupDetail(tagid) {
-        try {
-            const { data } = await this.client.get(`${GET_RELATION_GROUP_DETAIL}?tagid=${tagid}`);
-            return data;
-        }
-        catch (e) {
-            throw new Error('网络异常，本次请求失败！');
-        }
+        const { data } = await this.client.get(`${GET_RELATION_GROUP_DETAIL}?tagid=${tagid}`);
+        return data;
     }
     // Check if Token need refresh
     async getCookieInfo(refreshToken) {
-        try {
-            const { data } = await this.client.get(`${GET_COOKIES_INFO}?csrf=${refreshToken}`);
-            return data;
-        }
-        catch (e) {
-            throw new Error('网络异常，本次请求失败！');
-        }
+        const { data } = await this.client.get(`${GET_COOKIES_INFO}?csrf=${refreshToken}`);
+        return data;
     }
     async getUserInfo(mid) {
         //如果为番剧出差的UID，则不从远程接口拉取数据，直接传回一段精简过的有效数据
@@ -292,14 +229,9 @@ class BiliAPI extends koishi_1.Service {
             console.log("检测到番剧出差UID，跳过远程用户接口访问");
             return bangumiTripData;
         }
-        try {
-            const wbi = await this.getWbi({ mid });
-            const { data } = await this.client.get(`${GET_USER_INFO}?${wbi}`);
-            return data;
-        }
-        catch (e) {
-            throw new Error('网络异常，本次请求失败！');
-        }
+        const wbi = await this.getWbi({ mid });
+        const { data } = await this.client.get(`${GET_USER_INFO}?${wbi}`);
+        return data;
     }
     // 获取最新的 img_key 和 sub_key
     async getWbiKeys() {
@@ -311,49 +243,24 @@ class BiliAPI extends koishi_1.Service {
         };
     }
     async getMyselfInfo() {
-        try {
-            const { data } = await this.client.get(GET_MYSELF_INFO);
-            return data;
-        }
-        catch (e) {
-            throw new Error('网络异常，本次请求失败！');
-        }
+        const { data } = await this.client.get(GET_MYSELF_INFO);
+        return data;
     }
     async getLoginQRCode() {
-        try {
-            const { data } = await this.client.get(GET_LOGIN_QRCODE);
-            return data;
-        }
-        catch (e) {
-            throw new Error('网络异常，本次请求失败！');
-        }
+        const { data } = await this.client.get(GET_LOGIN_QRCODE);
+        return data;
     }
     async getLoginStatus(qrcodeKey) {
-        try {
-            const { data } = await this.client.get(`${GET_LOGIN_STATUS}?qrcode_key=${qrcodeKey}`);
-            return data;
-        }
-        catch (e) {
-            throw new Error('网络异常，本次请求失败！');
-        }
+        const { data } = await this.client.get(`${GET_LOGIN_STATUS}?qrcode_key=${qrcodeKey}`);
+        return data;
     }
     async getLiveRoomInfo(roomId) {
-        try {
-            const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO}?room_id=${roomId}`);
-            return data;
-        }
-        catch (e) {
-            throw new Error('网络异常，本次请求失败！');
-        }
+        const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO}?room_id=${roomId}`);
+        return data;
     }
     async getMasterInfo(mid) {
-        try {
-            const { data } = await this.client.get(`${GET_MASTER_INFO}?uid=${mid}`);
-            return data;
-        }
-        catch (e) {
-            throw new Error('网络异常，本次请求失败！');
-        }
+        const { data } = await this.client.get(`${GET_MASTER_INFO}?uid=${mid}`);
+        return data;
     }
     disposeNotifier() { if (this.loginNotifier)
         this.loginNotifier.dispose(); }
@@ -643,6 +550,174 @@ class BiliAPI extends koishi_1.Service {
         // 没有问题，cookies已更新完成
     }
 }
+__decorate([
+    (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)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getLiveRoomInfoStreamKey() 第${attempts}次失败: ${error.message}`);
+        },
+    })
+], BiliAPI.prototype, "getLiveRoomInfoStreamKey", null);
+__decorate([
+    (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)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getTimeNow() 第${attempts}次失败: ${error.message}`);
+        },
+    })
+], BiliAPI.prototype, "getTimeNow", null);
+__decorate([
+    (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)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`removeUserFromGroup() 第${attempts}次失败: ${error.message}`);
+        },
+    })
+], BiliAPI.prototype, "removeUserFromGroup", null);
+__decorate([
+    (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)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getUserSpaceDynamic() 第${attempts}次失败: ${error.message}`);
+        },
+    })
+], BiliAPI.prototype, "getUserSpaceDynamic", null);
+__decorate([
+    (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)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getAllDynamic() 第${attempts}次失败: ${error.message}`);
+        },
+    })
+], BiliAPI.prototype, "getAllDynamic", null);
+__decorate([
+    (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)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`follow() 第${attempts}次失败: ${error.message}`);
+        },
+    })
+], BiliAPI.prototype, "follow", null);
+__decorate([
+    (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)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getCookieInfo() 第${attempts}次失败: ${error.message}`);
+        },
+    })
+], BiliAPI.prototype, "getCookieInfo", null);
+__decorate([
+    (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)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getWbiKeys() 第${attempts}次失败: ${error.message}`);
+        },
+    })
+], BiliAPI.prototype, "getWbiKeys", null);
+__decorate([
+    (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)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getLoginQRCode() 第${attempts}次失败: ${error.message}`);
+        },
+    })
+], BiliAPI.prototype, "getLoginQRCode", null);
+__decorate([
+    (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)({
+        attempts: 3,
+        onFailure(error, attempts) {
+            this.logger.error(`getLiveRoomInfo() 第${attempts}次失败: ${error.message}`);
+        },
+    })
+], BiliAPI.prototype, "getLiveRoomInfo", null);
+__decorate([
+    (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({
         userAgent: koishi_1.Schema.string(),

package/lib/blive.d.ts

@@ -7,11 +7,12 @@ declare module 'koishi' {
 }
 declare class BLive extends Service {
     static inject: string[];
+    private blConfig;
     private listenerRecord;
     private timerRecord;
-    constructor(ctx: Context);
+    constructor(ctx: Context, config: BLive.Config);
     protected stop(): Awaitable<void>;
-    startLiveRoomListener(roomId: string, handler: MsgHandler, pushOnceEveryTens: () => void): Promise<void>;
+    startLiveRoomListener(roomId: string, handler: MsgHandler, danmakuPushTime: () => void): Promise<void>;
     closeListener(roomId: string): void;
 }
 declare namespace BLive {

package/lib/blive.js

@@ -5,11 +5,16 @@ const blive_message_listener_1 = require("blive-message-listener");
 class BLive extends koishi_1.Service {
     // 必要服务
     static inject = ['ba'];
+    // 配置
+    blConfig;
     // 定义类属性
     listenerRecord = {};
     timerRecord = {};
-    constructor(ctx) {
+    constructor(ctx, config) {
+        // Extends super
         super(ctx, 'bl');
+        // 将config赋值给类属性
+        this.blConfig = config;
     }
     // 注册插件dispose逻辑
     stop() {
@@ -18,7 +23,7 @@ class BLive extends koishi_1.Service {
             this.closeListener(key);
         }
     }
-    async startLiveRoomListener(roomId, handler, pushOnceEveryTens) {
+    async startLiveRoomListener(roomId, handler, danmakuPushTime) {
         // 获取cookieStr
         const cookiesStr = await this.ctx.ba.getCookiesForHeader();
         // 获取自身信息
@@ -33,18 +38,20 @@ class BLive extends koishi_1.Service {
             }
         });
         // 默认30s推送一次弹幕消息到群组并将dispose函数保存到Record中
-        this.timerRecord[roomId] = this.ctx.setInterval(pushOnceEveryTens, this.config.danmakuPushTime * 1000 * 60);
+        this.timerRecord[roomId] = this.ctx.setInterval(danmakuPushTime, this.blConfig.danmakuPushTime * 1000 * 60);
+        // logger
+        this.logger.info(`${roomId}直播间弹幕监听已开启`);
     }
     closeListener(roomId) {
         // 判断直播间监听器是否关闭
         if (!this.listenerRecord || !this.listenerRecord[roomId] || !this.listenerRecord[roomId].closed) {
             // 输出logger
-            this.logger.info('直播间监听器无需关闭');
+            this.logger.info(`${roomId}直播间弹幕监听器无需关闭`);
         }
         // 判断消息发送定时器是否关闭
         if (!this.timerRecord || !this.timerRecord[roomId]) {
             // 输出logger
-            this.logger.info('消息发送定时器无需关闭');
+            this.logger.info(`${roomId}直播间消息发送定时器无需关闭`);
         }
         // 关闭直播间监听器
         this.listenerRecord[roomId].close();
@@ -57,12 +64,12 @@ class BLive extends koishi_1.Service {
             // 删除消息发送定时器
             delete this.timerRecord[roomId];
             // 输出logger
-            this.logger.info('直播间监听已关闭');
+            this.logger.info(`${roomId}直播间弹幕监听已关闭`);
             // 直接返回 
             return;
         }
         // 未关闭成功
-        this.logger.warn('直播间监听未成功关闭');
+        this.logger.warn(`${roomId}直播间弹幕监听未成功关闭`);
     }
 }
 // eslint-disable-next-line @typescript-eslint/no-namespace