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

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,15 +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) {
-            console.warn(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() {
@@ -312,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(); }
@@ -644,6 +550,69 @@ class BiliAPI extends koishi_1.Service {
         // 没有问题，cookies已更新完成
     }
 }
+__decorate([
+    (0, retry_1.default)()
+], BiliAPI.prototype, "getTheUserWhoIsLiveStreaming", null);
+__decorate([
+    (0, retry_1.default)()
+], BiliAPI.prototype, "getLiveRoomInfoStreamKey", null);
+__decorate([
+    (0, retry_1.default)()
+], BiliAPI.prototype, "getServerUTCTime", null);
+__decorate([
+    (0, retry_1.default)()
+], BiliAPI.prototype, "getTimeNow", null);
+__decorate([
+    (0, retry_1.default)()
+], BiliAPI.prototype, "getAllGroup", null);
+__decorate([
+    (0, retry_1.default)()
+], BiliAPI.prototype, "removeUserFromGroup", null);
+__decorate([
+    (0, retry_1.default)()
+], BiliAPI.prototype, "copyUserToGroup", null);
+__decorate([
+    (0, retry_1.default)()
+], BiliAPI.prototype, "getUserSpaceDynamic", null);
+__decorate([
+    (0, retry_1.default)()
+], BiliAPI.prototype, "createGroup", null);
+__decorate([
+    (0, retry_1.default)()
+], BiliAPI.prototype, "getAllDynamic", null);
+__decorate([
+    (0, retry_1.default)()
+], BiliAPI.prototype, "hasNewDynamic", null);
+__decorate([
+    (0, retry_1.default)()
+], BiliAPI.prototype, "follow", null);
+__decorate([
+    (0, retry_1.default)()
+], BiliAPI.prototype, "getRelationGroupDetail", null);
+__decorate([
+    (0, retry_1.default)()
+], BiliAPI.prototype, "getCookieInfo", null);
+__decorate([
+    (0, retry_1.default)()
+], BiliAPI.prototype, "getUserInfo", null);
+__decorate([
+    (0, retry_1.default)()
+], BiliAPI.prototype, "getWbiKeys", null);
+__decorate([
+    (0, retry_1.default)()
+], BiliAPI.prototype, "getMyselfInfo", null);
+__decorate([
+    (0, retry_1.default)()
+], BiliAPI.prototype, "getLoginQRCode", null);
+__decorate([
+    (0, retry_1.default)()
+], BiliAPI.prototype, "getLoginStatus", null);
+__decorate([
+    (0, retry_1.default)()
+], BiliAPI.prototype, "getLiveRoomInfo", null);
+__decorate([
+    (0, retry_1.default)()
+], BiliAPI.prototype, "getMasterInfo", null);
 (function (BiliAPI) {
     BiliAPI.Config = koishi_1.Schema.object({
         userAgent: koishi_1.Schema.string(),

package/lib/comRegister.js

@@ -439,23 +439,23 @@ class ComRegister {
                 this.logger.error('bili sub指令 getMasterInfo() 发生了错误，错误为：' + e.message);
                 return '订阅出错啦，请重试';
             }
+            const liveDetectModeSelector = {
+                API: async () => {
+                    // 判断是否已开启直播检测
+                    if (!this.liveDispose) { // 未开启直播检测
+                        // 开启直播检测并保存销毁函数
+                        this.liveDispose = await this.liveDetectWithAPI();
+                    }
+                },
+                WS: async () => {
+                    // 连接到服务器
+                    await this.liveDetectWithListener(roomId, target);
+                }
+            };
             // 订阅直播
             if (liveMsg) {
                 // 判断直播订阅方式
-                switch (this.config.liveDetectMode) {
-                    case "API": {
-                        // 判断是否已开启直播检测
-                        if (!this.liveDispose) { // 未开启直播检测
-                            // 开启直播检测并保存销毁函数
-                            this.liveDispose = await this.liveDetectWithAPI();
-                        }
-                        break;
-                    }
-                    case "WS": {
-                        // 连接到服务器
-                        await this.liveDetectWithListener(roomId, target);
-                    }
-                }
+                await liveDetectModeSelector[this.config.liveDetectMode]();
                 // 发送订阅消息通知
                 await session.send(`订阅${userData.info.uname}直播通知`);
             }
@@ -463,6 +463,7 @@ class ComRegister {
             if (dynamicMsg) {
                 // 判断是否开启动态监测
                 if (!this.dynamicDispose) {
+                    // 开启动态监测
                     this.enableDynamicDetect();
                 }
                 // 发送订阅消息通知
@@ -1392,9 +1393,15 @@ class ComRegister {
         const currentLiveDanmakuArr = [];
         const temporaryLiveDanmakuArr = [];
         // 处理target
+        // 定义channelIdArr总长度
+        let channelIdArrLen = 0;
         // 找到频道/群组对应的
         const danmakuPushTargetArr = target.map(channel => {
+            // 获取符合条件的target
             const liveDanmakuArr = channel.channelIdArr.filter(channelId => channelId.liveDanmaku);
+            // 将当前liveDanmakuArr的长度+到channelIdArrLen中
+            channelIdArrLen += liveDanmakuArr.length;
+            // 返回符合的target
             return {
                 channelIdArr: liveDanmakuArr,
                 platform: channel.platform
@@ -1422,7 +1429,7 @@ class ComRegister {
         // 定义弹幕推送函数
         const danmakuPushFunc = () => {
             // 判断数组是否有内容
-            if (danmakuPushTargetArr.length > 0 && temporaryLiveDanmakuArr.length > 0) {
+            if (channelIdArrLen > 0 && temporaryLiveDanmakuArr.length > 0) {
                 // 发送消息
                 this.sendMsg(danmakuPushTargetArr, temporaryLiveDanmakuArr.join('\n'));
                 // 将临时消息数组清空
@@ -1735,23 +1742,24 @@ class ComRegister {
                     // 发送提示
                     this.logger.warn(`UID:${sub.uid} 用户没有开通直播间，无法订阅直播！`);
                 }
-                // 判断是否订阅直播
-                if (sub.live) {
-                    // 判断直播订阅方式
-                    switch (this.config.liveDetectMode) {
-                        case "API": {
-                            // 判断是否已开启直播检测
-                            if (!this.liveDispose) { // 未开启直播检测
-                                // 开启直播检测并保存销毁函数
-                                this.liveDispose = await this.liveDetectWithAPI();
-                            }
-                            break;
-                        }
-                        case "WS": {
-                            // 连接到服务器
-                            await this.liveDetectWithListener(data.live_room.roomid, sub.target);
+                // 
+                const liveDetectModeSelector = {
+                    API: async () => {
+                        // 判断是否已开启直播检测
+                        if (!this.liveDispose) { // 未开启直播检测
+                            // 开启直播检测并保存销毁函数
+                            this.liveDispose = await this.liveDetectWithAPI();
                         }
+                    },
+                    WS: async () => {
+                        // 连接到服务器
+                        await this.liveDetectWithListener(data.live_room.roomid, sub.target);
                     }
+                };
+                // 判断是否订阅直播
+                if (sub.live) {
+                    // 启动直播监测
+                    await liveDetectModeSelector[this.config.liveDetectMode]();
                 }
             }
             // 在B站中订阅该对象
@@ -1872,36 +1880,37 @@ class ComRegister {
                 dynamic: sub.dynamic === 1 ? true : false,
                 liveDispose: null
             };
-            // 判断是否订阅直播
-            if (sub.live) {
-                // 判断直播检测方式
-                switch (this.config.liveDetectMode) {
-                    case "API": {
-                        // 判断是否已开启直播检测
-                        if (!this.liveDispose) { // 未开启直播检测
-                            // 开启直播检测并保存销毁函数
-                            this.liveDispose = await this.liveDetectWithAPI();
-                        }
-                        break;
+            // 定义直播模式监测器
+            const liveDetectModeSelector = {
+                API: async () => {
+                    // 判断是否已开启直播检测
+                    if (!this.liveDispose) { // 未开启直播检测
+                        // 开启直播检测并保存销毁函数
+                        this.liveDispose = await this.liveDetectWithAPI();
                     }
-                    case "WS": {
-                        // 判断订阅直播数是否超过限制
-                        if (!this.config.unlockSubLimits && liveSubNum >= 3) {
-                            // 将live改为false
-                            subManagerItem.live = false;
-                            // log
-                            this.logger.warn(`UID:${sub.uid} 订阅直播数超过限制，自动取消订阅`);
-                            // 发送错误消息
-                            await this.sendPrivateMsg(`UID:${sub.uid} 订阅直播数超过限制，自动取消订阅`);
-                        }
-                        else {
-                            // 直播订阅数+1
-                            liveSubNum++;
-                            // 订阅直播，开始循环检测
-                            await this.liveDetectWithListener(sub.room_id, target);
-                        }
+                },
+                WS: async () => {
+                    // 判断订阅直播数是否超过限制
+                    if (!this.config.unlockSubLimits && liveSubNum >= 3) {
+                        // 将live改为false
+                        subManagerItem.live = false;
+                        // log
+                        this.logger.warn(`UID:${sub.uid} 订阅直播数超过限制，自动取消订阅`);
+                        // 发送错误消息
+                        await this.sendPrivateMsg(`UID:${sub.uid} 订阅直播数超过限制，自动取消订阅`);
+                    }
+                    else {
+                        // 直播订阅数+1
+                        liveSubNum++;
+                        // 订阅直播，开始循环检测
+                        await this.liveDetectWithListener(sub.room_id, target);
                     }
                 }
+            };
+            // 判断是否订阅直播
+            if (sub.live) {
+                // 启动直播监测
+                await liveDetectModeSelector[this.config.liveDetectMode]();
             }
             // 保存新订阅对象
             this.subManager.push(subManagerItem);

package/lib/utils/retry.d.ts

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

package/lib/utils/retry.js

@@ -0,0 +1,26 @@
+"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) {
+    return function (target, propertyKey, descriptor) {
+        const originalMethod = descriptor.value;
+        descriptor.value = async function (...args) {
+            let lastError;
+            for (let i = 0; i < attempts; i++) {
+                try {
+                    return await originalMethod.apply(this, args);
+                }
+                catch (error) {
+                    lastError = error;
+                    if (onFailure) {
+                        await onFailure.call(this, lastError, i + 1);
+                    }
+                }
+            }
+            throw lastError;
+        };
+        return descriptor;
+    };
+}
+exports.default = Retry;

package/package.json

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

package/readme.md

@@ -218,6 +218,7 @@
 - ver 3.0.0-alpha.4 修复：使用了手动订阅，数据库中的订阅不会加载
 - 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代码结构
 
 ## 交流群