koishi-plugin-bilibili-notify 0.1.1 → 0.1.3

package/lib/authority.d.ts

@@ -0,0 +1,5 @@
+import { Context } from "koishi";
+declare class Authority {
+    constructor(ctx: Context);
+}
+export default Authority;

package/lib/authority.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class Authority {
+    constructor(ctx) {
+        // 授予权限
+        ctx.permissions.provide('qqguild.admin', async (name, session) => {
+            return session.event.user.id === '12814193631283946447';
+        });
+    }
+}
+exports.default = Authority;

package/lib/biliAPI.d.ts

@@ -24,6 +24,6 @@ declare class BiliAPI extends Service {
     createNewClient(): void;
     getCookies(): Promise<string>;
     loadCookiesFromDatabase(): Promise<void>;
-    checkIfTokenNeedRefresh(refreshToken: string, csrf: string): Promise<void>;
+    checkIfTokenNeedRefresh(refreshToken: string, csrf: string, times?: number): Promise<void>;
 }
 export default BiliAPI;

package/lib/biliAPI.js

@@ -35,42 +35,87 @@ class BiliAPI extends koishi_1.Service {
         this.logger.info('BiliAPI已被注册到Context中');
     }
     async getTimeNow() {
-        const { data } = await this.client.get(GET_TIME_NOW);
-        return data;
+        try {
+            const { data } = await this.client.get(GET_TIME_NOW);
+            return data;
+        }
+        catch (e) {
+            throw new Error('网络异常，本次请求失败！');
+        }
     }
     async getUserSpaceDynamic(mid) {
-        const { data } = await this.client.get(`${GET_USER_SPACE_DYNAMIC_LIST}?host_mid=${mid}`);
-        return data;
+        try {
+            const { data } = await this.client.get(`${GET_USER_SPACE_DYNAMIC_LIST}?host_mid=${mid}`);
+            return data;
+        }
+        catch (e) {
+            throw new Error('网络异常，本次请求失败！');
+        }
     }
     // Check if Token need refresh
     async getCookieInfo(refreshToken) {
-        const { data } = await this.client.get(`${GET_COOKIES_INFO}?csrf=${refreshToken}`);
-        return data;
+        try {
+            const { data } = await this.client.get(`${GET_COOKIES_INFO}?csrf=${refreshToken}`);
+            return data;
+        }
+        catch (e) {
+            throw new Error('网络异常，本次请求失败！');
+        }
     }
     async getUserInfo(mid) {
-        const wbi = await this.ctx.wbi.getWbi({ mid });
-        const { data } = await this.client.get(`${GET_USER_INFO}?${wbi}`);
-        return data;
+        try {
+            const wbi = await this.ctx.wbi.getWbi({ mid });
+            const { data } = await this.client.get(`${GET_USER_INFO}?${wbi}`);
+            return data;
+        }
+        catch (e) {
+            throw new Error('网络异常，本次请求失败！');
+        }
     }
     async getMyselfInfo() {
-        const { data } = await this.client.get(GET_MYSELF_INFO);
-        return data;
+        try {
+            const { data } = await this.client.get(GET_MYSELF_INFO);
+            return data;
+        }
+        catch (e) {
+            throw new Error('网络异常，本次请求失败！');
+        }
     }
     async getLoginQRCode() {
-        const { data } = await this.client.get(GET_LOGIN_QRCODE);
-        return data;
+        try {
+            const { data } = await this.client.get(GET_LOGIN_QRCODE);
+            return data;
+        }
+        catch (e) {
+            throw new Error('网络异常，本次请求失败！');
+        }
     }
     async getLoginStatus(qrcodeKey) {
-        const { data } = await this.client.get(`${GET_LOGIN_STATUS}?qrcode_key=${qrcodeKey}`);
-        return data;
+        try {
+            const { data } = await this.client.get(`${GET_LOGIN_STATUS}?qrcode_key=${qrcodeKey}`);
+            return data;
+        }
+        catch (e) {
+            throw new Error('网络异常，本次请求失败！');
+        }
     }
     async getLiveRoomInfo(roomId) {
-        const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO}?room_id=${roomId}`);
-        return data;
+        try {
+            const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO}?room_id=${roomId}`);
+            return data;
+        }
+        catch (e) {
+            throw new Error('网络异常，本次请求失败！');
+        }
     }
     async getMasterInfo(mid) {
-        const { data } = await this.client.get(`${GET_MASTER_INFO}?uid=${mid}`);
-        return data;
+        try {
+            const { data } = await this.client.get(`${GET_MASTER_INFO}?uid=${mid}`);
+            return data;
+        }
+        catch (e) {
+            throw new Error('网络异常，本次请求失败！');
+        }
     }
     createNewClient() {
         this.jar = new tough_cookie_1.CookieJar();
@@ -120,8 +165,22 @@ class BiliAPI extends koishi_1.Service {
         // Check if token need refresh
         this.checkIfTokenNeedRefresh(decryptedRefreshToken, csrf);
     }
-    async checkIfTokenNeedRefresh(refreshToken, csrf) {
-        const { data } = await this.getCookieInfo(refreshToken);
+    async checkIfTokenNeedRefresh(refreshToken, csrf, times = 0) {
+        let data;
+        try {
+            const { data: cookieData } = await this.getCookieInfo(refreshToken);
+            data = cookieData;
+        }
+        catch (e) {
+            // 发送三次仍网络错误则给管理员发送错误信息
+            if (times > 3)
+                return;
+            // 等待3秒再次尝试
+            this.ctx.setTimeout(() => {
+                this.checkIfTokenNeedRefresh(refreshToken, csrf, times + 1);
+            }, 3000);
+            return;
+        }
         // 不需要刷新，直接返回
         if (!data.refresh)
             return;

package/lib/comRegister.d.ts

@@ -1,34 +1,33 @@
-import { Context, Logger, Schema, Session } from "koishi";
+import { Bot, Context, Logger, Schema, Session } from "koishi";
 declare class ComRegister {
     static inject: string[];
     logger: Logger;
     config: ComRegister.Config;
-    id: number;
-    sub: {
-        id: number;
-        uid: string;
-        room_id: string;
-        dynamic: number;
-        video: 1;
-        live: number;
-        time: Date;
-    };
+    num: number;
     subManager: {
+        id: number;
         uid: string;
         roomId: string;
+        targetId: string;
         live: boolean;
         dynamic: boolean;
         liveDispose: Function;
         dynamicDispose: Function;
     }[];
+    qqBot: Bot<Context>;
+    qqguildBot: Bot<Context>;
     constructor(ctx: Context, config: ComRegister.Config);
-    dynamicDetect(ctx: Context, session: Session, uid: string): () => Promise<"账号未登录" | "未知错误">;
-    liveDetect(ctx: Context, session: Session, roomId: string): () => Promise<void>;
+    dynamicDetect(ctx: Context, bot: Bot<Context>, guildId: string, uid: string): () => Promise<void>;
+    liveDetect(ctx: Context, bot: Bot<Context>, guildId: string, roomId: string): () => Promise<void>;
     checkIfNeedSub(comNeed: boolean, subType: string, session: Session, data?: any): Promise<boolean>;
+    getSubFromDatabase(ctx: Context): Promise<void>;
+    unsubSingle(ctx: Context, id: string, type: number): string;
 }
 declare namespace ComRegister {
     interface Config {
         pushTime: number;
+        liveLoopTime: number;
+        dynamicLoopTime: number;
     }
     const Config: Schema<Config>;
 }

package/lib/comRegister.js

@@ -16,12 +16,20 @@ class ComRegister {
     static inject = ['biliAPI', 'gimg', 'wbi', 'database'];
     logger;
     config;
-    id = 1;
-    sub;
+    num = 0;
     subManager = [];
+    // QQ群机器人
+    qqBot;
+    // QQ频道机器人
+    qqguildBot;
     constructor(ctx, config) {
         this.logger = ctx.logger('commandRegister');
         this.config = config;
+        // 拿到QQ群机器人
+        this.qqBot = ctx.bots[ctx.bots.findIndex(bot => bot.platform === 'qq')];
+        // 拿到QQ频道机器人
+        this.qqguildBot = ctx.bots[ctx.bots.findIndex(bot => bot.platform === 'qqguild')];
+        this.getSubFromDatabase(ctx);
         ctx.command('test')
             .subcommand('.cookies')
             .usage('测试指令，用于测试从数据库读取cookies')
@@ -61,10 +69,10 @@ class ComRegister {
             console.log(num && `Hello World`);
         });
         ctx.command('test')
-            .subcommand('.gimg <uid:string> <index:number>')
+            .subcommand('.gimg <uid:string> <index:number>', '生成图片', { permissions: ['qqguild.admin'] })
             .usage('测试图片生成')
             .example('test.gimg')
-            .action(async (_, uid, index) => {
+            .action(async ({ session }, uid, index) => {
             // 获取用户空间动态数据
             const { data } = await ctx.biliAPI.getUserSpaceDynamic(uid);
             const [pic] = await ctx.gimg.generateDynamicImg(data.items[index]);
@@ -77,6 +85,20 @@ class ComRegister {
             .action(() => {
             console.log(this.subManager);
         });
+        ctx.command('test')
+            .subcommand('.group')
+            .usage('查看session groupId')
+            .example('test group')
+            .action(({ session }) => {
+            console.log(session.event.channel);
+        });
+        ctx.command('test')
+            .subcommand('.session')
+            .usage('查看seesion')
+            .example('test session')
+            .action(({ session }) => {
+            console.log(session);
+        });
         ctx.command('bili', 'bili-notify插件相关指令')
             .subcommand('.login', '登录B站之后才可以进行之后的操作')
             .usage('使用二维码登录，登录B站之后才可以进行之后的操作')
@@ -84,7 +106,13 @@ class ComRegister {
             .action(async ({ session }) => {
             this.logger.info('调用bili login指令');
             // 获取二维码
-            const content = await ctx.biliAPI.getLoginQRCode();
+            let content;
+            try {
+                content = await ctx.biliAPI.getLoginQRCode();
+            }
+            catch (e) {
+                return 'bili login getLoginQRCode() 本次网络请求失败';
+            }
             // 判断是否出问题
             if (content.code !== 0)
                 return await session.send('出问题咯，请联系管理员解决！');
@@ -109,7 +137,14 @@ class ComRegister {
             let dispose;
             // 发起登录请求检查登录状态
             dispose = ctx.setInterval(async () => {
-                const loginContent = await ctx.biliAPI.getLoginStatus(content.data.qrcode_key);
+                let loginContent;
+                try {
+                    loginContent = await ctx.biliAPI.getLoginStatus(content.data.qrcode_key);
+                }
+                catch (e) {
+                    this.logger.error(e);
+                    return;
+                }
                 if (loginContent.code !== 0) {
                     dispose();
                     return await session.send('登录失败！请联系管理员解决！');
@@ -132,27 +167,47 @@ class ComRegister {
             }, 1000);
         });
         ctx.command('bili')
-            .subcommand('.unsub <uid:string>')
-            .usage('取消订阅')
-            .example('bili unsub 用户UID')
-            .action(({ session }, uid) => {
+            .subcommand('.unsub <uid:string> 取消订阅')
+            .usage('取消订阅，加-l为取消直播订阅，加-d为取消动态订阅，什么都不加则为全部取消')
+            .option('live', '-l')
+            .option('dynamic', '-d')
+            .example('bili unsub 用户UID -ld')
+            .action(async ({ session, options }, uid) => {
+            this.logger.info('调用bili.unsub指令');
+            // 若用户UID为空则直接返回
             if (!uid)
                 return '用户UID不能为空';
             // 定义是否存在
-            let exist = false;
-            this.subManager.forEach((sub, i) => {
+            let exist;
+            await Promise.all(this.subManager.map(async (sub, i) => {
                 if (sub.uid === uid) {
-                    // 执行dispose方法，销毁定时器
-                    this.subManager[i].dynamicDispose();
-                    this.subManager[i].liveDispose();
+                    // 取消单个订阅
+                    if (options.live || options.dynamic) {
+                        if (options.live)
+                            await session.send(this.unsubSingle(ctx, sub.roomId, 0)); /* 0为取消订阅Live */
+                        if (options.dynamic)
+                            await session.send(this.unsubSingle(ctx, sub.uid, 1)); /* 1为取消订阅Dynamic */
+                        // 将存在flag设置为true
+                        exist = true;
+                        return;
+                    }
+                    // 取消全部订阅 执行dispose方法，销毁定时器
+                    if (sub.dynamic)
+                        this.subManager[i].dynamicDispose();
+                    if (sub.live)
+                        this.subManager[i].liveDispose();
+                    // 从数据库中删除订阅
+                    await ctx.database.remove('bilibili', { uid: this.subManager[i].uid });
                     // 将该订阅对象从订阅管理对象中移除
                     this.subManager = this.subManager.splice(i, i);
+                    // id--
+                    this.num--;
                     // 发送成功通知
                     session.send('已取消订阅该用户');
                     // 将存在flag设置为true
                     exist = true;
                 }
-            });
+            }));
             // 未订阅该用户，无需取消订阅
             !exist && session.send('未订阅该用户，无需取消订阅');
         });
@@ -163,33 +218,39 @@ class ComRegister {
             .action(async ({ session }) => {
             let table = ``;
             this.subManager.forEach(sub => {
-                table += 'UID:' + sub.uid + '  RoomID:' + sub.roomId + '\n';
+                table += `UID:${sub.uid}  ${sub.dynamic ? '已订阅动态' : ''}  ${sub.live ? '已订阅直播' : ''}` + '\n';
             });
             !table && session.send('没有订阅任何UP');
             table && session.send(table);
         });
         ctx.command('bili')
-            .subcommand('.sub <mid:string> [groupid:string]')
+            .subcommand('.sub <mid:string> [guildId:string]')
             .option('live', '-l')
             .option('dynamic', '-d')
             .usage('订阅用户动态和直播通知，若需要订阅直播请加上-l，需要订阅动态则加上-d。若没有加任何参数，之后会向你单独询问，<>中为必选参数，[]中为可选参数，目标群号若不填，则默认为当前群聊')
             .example('bili sub 用户uid 目标QQ群号(暂不支持) -l -d')
-            .action(async ({ session, options }, mid, groupid) => {
+            .action(async ({ session, options }, mid, guildId) => {
             this.logger.info('调用bili.sub指令');
+            // 如果订阅人数超过三个则直接返回
+            if (this.num >= 3)
+                return '目前最多只能订阅三个人';
             // 检查必选参数是否有值
-            if (mid === undefined) {
+            if (!mid)
                 return '请输入用户uid';
-            }
             // 判断要订阅的用户是否已经存在于订阅管理对象中
-            this.subManager && this.subManager.forEach((sub) => {
-                // 已订阅该用户
-                if (sub.uid === mid)
-                    return session.send('已订阅该用户，请勿重复订阅');
-            });
+            if (this.subManager && this.subManager.some(sub => sub.uid === mid)) {
+                return '已订阅该用户，请勿重复订阅';
+            }
             // 定义是否需要直播通知，动态订阅，视频推送
             let liveMsg, dynamicMsg;
             // 获取用户信息
-            const content = await ctx.biliAPI.getUserInfo(mid);
+            let content;
+            try {
+                content = await ctx.biliAPI.getUserInfo(mid);
+            }
+            catch (e) {
+                return 'bili sub getUserInfo() 本次网络请求失败';
+            }
             // 判断是否有其他问题
             if (content.code !== 0) {
                 let msg;
@@ -216,99 +277,151 @@ class ComRegister {
             liveMsg = await this.checkIfNeedSub(options.live, '直播', session, data);
             // 判断是否需要订阅动态
             dynamicMsg = await this.checkIfNeedSub(options.dynamic, '动态', session);
-            // 构造订阅对象
-            this.sub = {
-                id: this.id,
+            // 判断是哪个平台
+            let platform;
+            if (!guildId) { // 没有输入群号，默认当前聊天环境
+                switch (session.event.platform) {
+                    case 'qqguild':
+                        guildId = session.event.channel.id;
+                        break;
+                    case 'qq':
+                        guildId = session.event.guild.id;
+                        break;
+                    default: return '暂不支持该平台';
+                }
+            }
+            // 定义Bot
+            let bot;
+            // 判断是哪个聊天平台
+            switch (session.event.platform) {
+                case 'qqguild': {
+                    bot = this.qqguildBot;
+                    platform = 'qqguild';
+                    break;
+                }
+                case 'qq': {
+                    bot = this.qqBot;
+                    platform = 'qq';
+                    break;
+                }
+                default: return '暂不支持该平台';
+            }
+            // 保存到数据库中
+            const sub = await ctx.database.create('bilibili', {
                 uid: mid,
                 room_id: data.live_room.roomid.toString(),
                 dynamic: dynamicMsg ? 1 : 0,
                 video: 1,
                 live: liveMsg ? 1 : 0,
+                targetId: guildId,
+                platform,
                 time: new Date()
-            };
-            // 保存到数据库中
-            await ctx.database.upsert('bilibili', [this.sub]);
-            // 让id自增
-            this.id++;
+            });
+            // 订阅数+1
+            this.num++;
             // 开始订阅
             // 保存新订阅对象
             this.subManager.push({
+                id: sub.id,
                 uid: mid,
+                targetId: guildId,
                 roomId: data.live_room.roomid.toString(),
                 live: liveMsg,
                 dynamic: dynamicMsg,
                 liveDispose: null,
                 dynamicDispose: null
             });
+            // 获取用户信息
+            let userData;
+            try {
+                const { data } = await ctx.biliAPI.getMasterInfo(sub.uid);
+                userData = data;
+            }
+            catch (e) {
+                return 'bili sub指令 getMasterInfo() 网络请求失败';
+            }
             // 需要订阅直播
-            if (liveMsg)
-                await session.execute(`bili live ${data.live_room.roomid}`);
+            if (liveMsg) {
+                await session.execute(`bili live ${data.live_room.roomid} ${guildId} -b ${platform}`);
+                // 发送订阅消息通知
+                await bot.sendMessage(sub.targetId, `订阅${userData.info.uname}直播通知`);
+            }
             // 需要订阅动态
-            if (dynamicMsg)
-                await session.execute(`bili dynamic ${mid}`);
-            // 发送订阅成功通知
+            if (dynamicMsg) {
+                await session.execute(`bili dynamic ${mid} ${guildId} -b ${platform}`);
+                // 发送订阅消息通知
+                await bot.sendMessage(sub.targetId, `订阅${userData.info.uname}动态通知`);
+            }
         });
         ctx.command('bili')
-            .subcommand('.dynamic <uid:string>')
+            .subcommand('.dynamic <uid:string> <guildId:string>')
+            .option('bot', '-b <type:string>')
             .usage('订阅用户动态推送')
             .example('bili dynamic 1')
-            .action(async ({ session }, uid) => {
+            .action(async ({ session, options }, uid, guildId) => {
             this.logger.info('调用bili.dynamic指令');
             // 如果uid为空则返回
-            if (!uid) {
-                await session.send('用户uid不能为空');
-                return;
-            }
-            // 定义订阅对象索引
-            let index;
-            // 定义要订阅的对象是否存在于订阅管理对象中
-            let exist;
+            if (!uid)
+                return '用户uid不能为空';
+            if (!guildId)
+                return '目标群组或频道不能为空';
+            if (!options.bot)
+                return '非法调用';
             // 保存到订阅管理对象
-            this.subManager.forEach((sub, i) => {
-                if (sub.uid === uid) {
-                    exist = true;
-                    index = i;
-                }
-            });
+            const index = this.subManager.findIndex(sub => sub.uid === uid);
             // 不存在则直接返回
-            if (!exist) {
+            if (index === -1) {
                 session.send('请勿直接调用该指令');
                 return;
             }
+            // 获取对应Bot
+            let bot;
+            switch (options.bot) {
+                case 'qq':
+                    bot = this.qqBot;
+                    break;
+                case 'qqguild':
+                    bot = this.qqguildBot;
+                    break;
+                default: return '非法调用';
+            }
             // 开始循环检测
-            const dispose = ctx.setInterval(this.dynamicDetect(ctx, session, uid), 60000);
+            const dispose = ctx.setInterval(this.dynamicDetect(ctx, bot, guildId, uid), 60000);
             // 将销毁函数保存到订阅管理对象
             this.subManager[index].dynamicDispose = dispose;
         });
         ctx.command('bili')
-            .subcommand('.live <roomId:string>')
+            .subcommand('.live <roomId:string> <guildId:string>')
+            .option('bot', '-b <type:string>')
             .usage('订阅主播开播通知')
             .example('bili live 732')
-            .action(async ({ session }, roomId) => {
+            .action(async ({ options }, roomId, guildId) => {
             this.logger.info('调用bili.live指令');
             // 如果room_id为空则返回
-            if (!roomId) {
-                await session.send('订阅主播房间号不能为空');
-                return;
-            }
-            // 定义订阅对象索引
-            let index;
-            // 定义要订阅的对象是否存在于订阅管理对象中
-            let exist;
+            if (!roomId)
+                return '订阅主播房间号不能为空';
+            if (!guildId)
+                return '目标群组或频道不能为空';
+            if (!options.bot)
+                return '非法调用';
             // 保存到订阅管理对象
-            this.subManager.forEach((sub, i) => {
-                if (sub.roomId === roomId) {
-                    exist = true;
-                    index = i;
-                }
-            });
+            const index = this.subManager.findIndex(sub => sub.roomId === roomId);
             // 要订阅的对象不在订阅管理对象中，直接返回
-            if (!exist) {
-                await session.send('请勿直接调用该指令');
-                return;
+            if (index === -1)
+                return '请勿直接调用该指令';
+            // 获取对应Bot
+            let bot;
+            switch (options.bot) {
+                case 'qq':
+                    bot = this.qqBot;
+                    break;
+                case 'qqguild':
+                    bot = this.qqguildBot;
+                    break;
+                default: return '非法调用';
             }
             // 开始循环检测
-            const dispose = ctx.setInterval(this.liveDetect(ctx, session, roomId), 5000);
+            const dispose = ctx.setInterval(this.liveDetect(ctx, bot, guildId, roomId), 5000);
             // 保存销毁函数
             this.subManager[index].liveDispose = dispose;
         });
@@ -320,9 +433,22 @@ class ComRegister {
             this.logger.info('调用bili.status指令');
             if (!roomId)
                 return session.send('请输入房间号!');
-            const content = await ctx.biliAPI.getLiveRoomInfo(roomId);
+            let content;
+            try {
+                content = await ctx.biliAPI.getLiveRoomInfo(roomId);
+            }
+            catch (e) {
+                return 'bili status指令 getLiveRoomInfo() 本次网络请求失败';
+            }
             const { data } = content;
-            const { data: userData } = await ctx.biliAPI.getMasterInfo(data.uid);
+            let userData;
+            try {
+                const { data: userInfo } = await ctx.biliAPI.getMasterInfo(data.uid);
+                userData = userInfo;
+            }
+            catch (e) {
+                return 'bili status指令 getMasterInfo() 网络请求失败';
+            }
             // B站出问题了
             if (content.code !== 0) {
                 if (content.msg === '未找到该房间') {
@@ -340,16 +466,12 @@ class ComRegister {
             session.send(string);
         });
     }
-    dynamicDetect(ctx, session, uid) {
+    dynamicDetect(ctx, bot, guildId, uid) {
         let firstSubscription = true;
         let timePoint;
         return async () => {
-            // 第一次的判断
+            // 第一次订阅判断
             if (firstSubscription) {
-                // 获取用户信息
-                const { data: userData } = await ctx.biliAPI.getMasterInfo(uid);
-                // 发送订阅消息通知
-                session.send(`订阅${userData.info.uname}动态通知!`);
                 // 设置第一次的时间点
                 timePoint = Date.now();
                 // 设置第一次为false
@@ -357,17 +479,26 @@ class ComRegister {
                 return;
             }
             // 获取用户空间动态数据
-            const content = await ctx.biliAPI.getUserSpaceDynamic(uid);
+            let content;
+            try {
+                content = await ctx.biliAPI.getUserSpaceDynamic(uid);
+            }
+            catch (e) {
+                return this.logger.error('dynamicDetect getUserSpaceDynamic() 网络请求失败');
+            }
             // 判断是否出现其他问题
             if (content.code !== 0) {
                 switch (content.code) {
                     case -101: { // 账号未登录
-                        return '账号未登录';
+                        bot.sendMessage(guildId, '账号未登录，请登录后重新订阅动态');
                     }
                     default: { // 未知错误
-                        return '未知错误';
+                        bot.sendMessage(guildId, '未知错误，请重新订阅动态');
                     }
                 }
+                // 取消订阅
+                this.unsubSingle(ctx, uid, 1); /* 1为取消动态订阅 */
+                return;
             }
             // 获取数据内容
             const items = content.data.items;
@@ -391,100 +522,126 @@ class ComRegister {
                     }
                     // 推送该条动态
                     const [pic] = await ctx.gimg.generateDynamicImg(items[num]);
-                    session.send(pic);
+                    await bot.sendMessage(guildId, pic);
                 }
             }
         };
     }
-    liveDetect(ctx, session, roomId) {
+    liveDetect(ctx, bot, guildId, roomId) {
         let firstSubscription = true;
         let timer = 0;
         let open = false;
         let liveTime;
         let uData;
+        // 相当于锁的作用，防止上一个循环没处理完
+        let flag = true;
         return async () => {
-            // Test code
-            /* console.log('===========================>');
-            console.log(timer);
-            console.log(open);
-            console.log('===========================>'); */
-            // 发送请求检测直播状态
-            const content = await ctx.biliAPI.getLiveRoomInfo(roomId);
-            const { data } = content;
-            // B站出问题了
-            if (content.code !== 0) {
-                if (content.msg === '未找到该房间') {
-                    session.send('未找到该房间！');
+            try {
+                // 如果flag为false则说明前面的代码还未执行完，则直接返回
+                if (!flag)
+                    return;
+                // 发送请求检测直播状态
+                let content;
+                try {
+                    content = await ctx.biliAPI.getLiveRoomInfo(roomId);
                 }
-                else {
-                    session.send('未知错误，请呼叫管理员检查问题！');
+                catch (e) {
+                    return this.logger.error('liveDetect getLiveRoomInfo 网络请求失败');
                 }
-                // dispose
-                return;
-            }
-            if (firstSubscription) {
-                firstSubscription = false;
-                // 获取主播信息
-                const { data: userData } = await ctx.biliAPI.getMasterInfo(data.uid);
-                // 主播信息不会变，请求一次即可
-                uData = userData;
-                // 发送订阅消息通知
-                session.send(`订阅${userData.info.uname}直播通知`);
-                if (data.live_status === 1) { // 当前正在直播
-                    // 改变开播状态
-                    open = true;
-                    // 推送直播信息
-                    await session.send(await ctx
-                        .gimg
-                        .generateLiveImg(data, uData, LiveType.LiveBroadcast));
-                } // 未开播，直接返回
-                return;
-            }
-            // 检查直播状态
-            switch (data.live_status) {
-                case 0:
-                case 2: { // 状态 0 和 2 说明未开播
-                    if (open) { // 之前开播，现在下播了
-                        // 更改直播状态
-                        open = false;
-                        // 下播了将定时器清零
-                        timer = 0;
-                        // 发送下播通知
-                        session.send(`${uData.info.uname}下播啦，本次直播了${ctx.gimg.getTimeDifference(liveTime)}`);
+                const { data } = content;
+                // B站出问题了
+                if (content.code !== 0) {
+                    if (content.msg === '未找到该房间') {
+                        await bot.sendMessage(guildId, '未找到该房间，请检查房间号后重新订阅');
                     }
-                    // 未进循环，还未开播，继续循环
-                    break;
+                    else {
+                        await bot.sendMessage(guildId, '未知错误，请呼叫管理员检查问题后重新订阅');
+                    }
+                    // dispose
+                    this.unsubSingle(ctx, roomId, 0); /* 0为取消Live订阅 */
+                    return;
                 }
-                case 1: {
-                    if (!open) { // 之前未开播，现在开播了
-                        // 更改直播状态
+                if (firstSubscription) {
+                    firstSubscription = false;
+                    // 获取主播信息
+                    let userData;
+                    try {
+                        const { data: userInfo } = await ctx.biliAPI.getMasterInfo(data.uid);
+                        userData = userInfo;
+                    }
+                    catch (e) {
+                        return this.logger.error('liveDetect first sub getMasterInfo() 网络请求错误');
+                    }
+                    // 主播信息不会变，请求一次即可
+                    uData = userData;
+                    // 判断直播状态
+                    if (data.live_status === 1) { // 当前正在直播
+                        // 推送直播信息
+                        await bot.sendMessage(guildId, await ctx
+                            .gimg
+                            .generateLiveImg(data, uData, LiveType.LiveBroadcast));
+                        // 改变开播状态
                         open = true;
-                        // 设置开播时间
-                        liveTime = data.live_time;
-                        // 获取主播信息
-                        const { data: userData } = await ctx.biliAPI.getMasterInfo(data.uid);
-                        // 主播信息不会变，开播时刷新一次即可
-                        uData = userData;
-                        // 发送直播通知
-                        await session.send(await ctx.gimg.generateLiveImg(data, uData, LiveType.StartBroadcasting));
+                    } // 未开播，直接返回
+                    return;
+                }
+                // 检查直播状态
+                switch (data.live_status) {
+                    case 0:
+                    case 2: { // 状态 0 和 2 说明未开播
+                        if (open) { // 之前开播，现在下播了
+                            // 更改直播状态
+                            open = false;
+                            // 下播了将定时器清零
+                            timer = 0;
+                            // 发送下播通知
+                            bot.sendMessage(guildId, `${uData.info.uname}下播啦，本次直播了${ctx.gimg.getTimeDifference(liveTime)}`);
+                        }
+                        // 未进循环，还未开播，继续循环
+                        break;
                     }
-                    else { // 还在直播
-                        if (this.config.pushTime > 0) {
-                            timer++;
-                            // 开始记录时间
-                            if (timer >= (12 * 30 * this.config.pushTime)) { // 到时间推送直播消息
-                                // 到时间重新计时
-                                timer = 0;
-                                // 发送状态信息
-                                session.send(await ctx
-                                    .gimg
-                                    .generateLiveImg(data, uData, LiveType.LiveBroadcast));
+                    case 1: {
+                        if (!open) { // 之前未开播，现在开播了
+                            // 更改直播状态
+                            open = true;
+                            // 设置开播时间
+                            liveTime = data.live_time;
+                            // 获取主播信息
+                            let userData;
+                            try {
+                                const { data: userInfo } = await ctx.biliAPI.getMasterInfo(data.uid);
+                                userData = userInfo;
                             }
+                            catch (e) {
+                                return this.logger.error('liveDetect open getMasterInfo() 网络请求错误');
+                            }
+                            // 主播信息不会变，开播时刷新一次即可
+                            uData = userData;
+                            // 发送直播通知
+                            await bot.sendMessage(guildId, await ctx.gimg.generateLiveImg(data, uData, LiveType.StartBroadcasting));
+                        }
+                        else { // 还在直播
+                            if (this.config.pushTime > 0) {
+                                timer++;
+                                // 开始记录时间
+                                if (timer >= (12 * 30 * this.config.pushTime)) { // 到时间推送直播消息
+                                    // 到时间重新计时
+                                    timer = 0;
+                                    // 发送状态信息
+                                    bot.sendMessage(guildId, await ctx
+                                        .gimg
+                                        .generateLiveImg(data, uData, LiveType.LiveBroadcast));
+                                }
+                            }
+                            // 否则继续循环
                         }
-                        // 否则继续循环
                     }
                 }
             }
+            finally {
+                // 执行完方法体不论如何都把flag设置为true
+                flag = true;
+            }
         };
     }
     async checkIfNeedSub(comNeed, subType, session, data) {
@@ -521,10 +678,118 @@ class ComRegister {
             }
         }
     }
+    async getSubFromDatabase(ctx) {
+        // 从数据库中获取数据
+        const subData = await ctx.database.get('bilibili', { id: { $gt: 0 } });
+        // 设定订阅数量
+        this.num = subData.length;
+        // 如果订阅数量超过三个则被非法修改数据库
+        // 向管理员发送重新订阅通知
+        if (this.num > 3)
+            return;
+        // 定义Bot
+        let bot;
+        // 循环遍历
+        subData.forEach(sub => {
+            // 拿到对应bot
+            switch (sub.platform) {
+                case 'qq': bot = this.qqBot;
+                case 'qqguild': bot = this.qqguildBot;
+            }
+            // 构建订阅对象
+            let subManagerItem = {
+                id: sub.id,
+                uid: sub.uid,
+                roomId: sub.room_id,
+                targetId: sub.targetId,
+                live: +sub.live === 1 ? true : false,
+                dynamic: +sub.dynamic === 1 ? true : false,
+                liveDispose: null,
+                dynamicDispose: null
+            };
+            // 判断需要订阅的服务
+            if (sub.dynamic) { // 需要订阅动态
+                // 开始循环检测
+                const dispose = ctx.setInterval(this.dynamicDetect(ctx, bot, sub.targetId, sub.uid), this.config.dynamicLoopTime * 1000);
+                // 保存销毁函数
+                subManagerItem.dynamicDispose = dispose;
+            }
+            if (sub.live) { // 需要订阅动态
+                // 开始循环检测
+                const dispose = ctx.setInterval(this.liveDetect(ctx, bot, sub.targetId, sub.room_id), this.config.liveLoopTime * 1000);
+                // 保存销毁函数
+                subManagerItem.liveDispose = dispose;
+            }
+            // 保存新订阅对象
+            this.subManager.push(subManagerItem);
+            // 发送订阅成功通知
+        });
+    }
+    unsubSingle(ctx, id /* UID或RoomId */, type /* 0取消Live订阅，1取消Dynamic订阅 */) {
+        let index;
+        switch (type) {
+            case 0: { // 取消Live订阅
+                index = this.subManager.findIndex(sub => sub.roomId === id);
+                if (index === -1)
+                    return '未订阅该用户，无需取消订阅';
+                // 取消订阅
+                this.subManager[index].live && this.subManager[index].liveDispose();
+                // 如果没有对这个UP的任何订阅，则移除
+                if (!this.subManager[index].dynamic) {
+                    // 获取要删除行的id
+                    const id = this.subManager[index].id;
+                    // 从管理对象中移除
+                    this.subManager = this.subManager.splice(index, index);
+                    // 从数据库中删除
+                    ctx.database.remove('bilibili', [id]);
+                    // num--
+                    this.num--;
+                    return '已取消订阅该用户';
+                }
+                this.subManager[index].liveDispose = null;
+                this.subManager[index].live = false;
+                // 更新数据库
+                ctx.database.upsert('bilibili', [{
+                        id: +`${this.subManager[index].id}`,
+                        live: 0
+                    }]);
+                return '已取消订阅Live';
+            }
+            case 1: { // 取消Dynamic订阅
+                index = this.subManager.findIndex(sub => sub.uid === id);
+                if (index === -1)
+                    return '未订阅该用户，无需取消订阅';
+                // 取消订阅
+                this.subManager[index].dynamic && this.subManager[index].dynamicDispose();
+                // 如果没有对这个UP的任何订阅，则移除
+                if (!this.subManager[index].live) {
+                    // 获取要删除行的id
+                    const id = this.subManager[index].id;
+                    // 从管理对象中移除
+                    this.subManager = this.subManager.splice(index, index);
+                    // 从数据库中删除
+                    ctx.database.remove('bilibili', [id]);
+                    // num--
+                    this.num--;
+                    return '已取消订阅该用户';
+                }
+                this.subManager[index].dynamicDispose = null;
+                this.subManager[index].dynamic = false;
+                // 更新数据库
+                ctx.database.upsert('bilibili', [{
+                        id: +`${this.subManager[index].id}`,
+                        dynamic: 0
+                    }]);
+                return '已取消订阅Dynamic';
+            }
+        }
+    }
 }
 (function (ComRegister) {
     ComRegister.Config = koishi_1.Schema.object({
-        pushTime: koishi_1.Schema.number().required()
+        pushTime: koishi_1.Schema.number().required(),
+        liveLoopTime: koishi_1.Schema.number().default(5),
+        dynamicLoopTime: koishi_1.Schema.number().default(60)
     });
 })(ComRegister || (ComRegister = {}));
 exports.default = ComRegister;

package/lib/database.d.ts

@@ -12,6 +12,8 @@ export interface Bilibili {
     dynamic: number;
     video: number;
     live: number;
+    targetId: string;
+    platform: string;
     time: Date;
 }
 export interface LoginBili {

package/lib/database.js

@@ -17,7 +17,9 @@ function apply(ctx) {
         dynamic: 'unsigned',
         video: 'unsigned',
         live: 'unsigned',
+        targetId: 'string',
+        platform: 'string',
         time: 'timestamp'
-    });
+    }, { autoInc: true });
 }
 exports.apply = apply;

package/lib/index.js

@@ -31,6 +31,7 @@ const koishi_1 = require("koishi");
 // import crypto
 const crypto_1 = __importDefault(require("crypto"));
 // import plugins
+const authority_1 = __importDefault(require("./authority"));
 const comRegister_1 = __importDefault(require("./comRegister"));
 const Database = __importStar(require("./database"));
 // import Service
@@ -68,6 +69,7 @@ function apply(ctx, config) {
     ctx.plugin(generateImg_1.default, { cardColorStart: config.cardColorStart, cardColorEnd: config.cardColorEnd });
     ctx.plugin(biliAPI_1.default);
     // load plugin
+    ctx.plugin(authority_1.default);
     ctx.plugin(comRegister_1.default, { pushTime: config.pushTime });
     // 当用户输入“恶魔兔，启动！”时，执行 help 指令
     ctx.middleware((session, next) => {

package/package.json

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