koishi-plugin-bilibili-notify 1.2.12-alpha.1 → 1.2.12-alpha.2

package/lib/biliAPI.d.ts

@@ -3,7 +3,7 @@ import { CookieJar } from 'tough-cookie';
 import { Notifier } from "@koishijs/plugin-notifier";
 declare module 'koishi' {
     interface Context {
-        biliAPI: BiliAPI;
+        ba: BiliAPI;
     }
 }
 declare class BiliAPI extends Service {

package/lib/biliAPI.js

@@ -32,7 +32,7 @@ class BiliAPI extends koishi_1.Service {
     refreshCookieTimer;
     loginInfoIsLoaded = false;
     constructor(ctx, config) {
-        super(ctx, 'biliAPI');
+        super(ctx, 'ba');
         this.apiConfig = config;
     }
     start() {

package/lib/comRegister.js

@@ -15,7 +15,7 @@ var LiveType;
     LiveType[LiveType["LiveBroadcast"] = 2] = "LiveBroadcast";
 })(LiveType || (LiveType = {}));
 class ComRegister {
-    static inject = ['biliAPI', 'gimg', 'wbi', 'database', 'sm'];
+    static inject = ['ba', 'gi', 'wbi', 'database', 'sm'];
     logger;
     config;
     loginTimer;
@@ -37,7 +37,13 @@ class ComRegister {
     // Chronocat机器人
     chronocatBot;
     constructor(ctx, config) {
-        this.logger = ctx.logger('commandRegister');
+        this.logger = ctx.logger('cr');
+        ctx.on('ready', () => {
+            this.logger.info('工作中');
+        });
+        ctx.on('dispose', () => {
+            this.logger.info('已停止工作');
+        });
         this.config = config;
         // 拿到各类机器人
         ctx.bots.forEach(bot => {
@@ -73,8 +79,8 @@ class ComRegister {
             .usage('测试指令，用于测试从数据库读取cookies')
             .action(async () => {
                 this.logger.info('调用test cookies指令')
-                // await ctx.biliAPI.loadCookiesFromDatabase()
-                console.log(JSON.parse(ctx.biliAPI.getCookies()));
+                // await ctx.ba.loadCookiesFromDatabase()
+                console.log(JSON.parse(ctx.ba.getCookies()));
             })
 
         testCom
@@ -82,7 +88,7 @@ class ComRegister {
             .usage('测试指令，用于测试获取自己信息')
             .example('test.my')
             .action(async () => {
-                const content = await ctx.biliAPI.getMyselfInfo()
+                const content = await ctx.ba.getMyselfInfo()
                 console.log(content);
             })
 
@@ -91,7 +97,7 @@ class ComRegister {
             .usage('测试指令，用于测试获取用户信息')
             .example('test.user 用户UID')
             .action(async (_, mid) => {
-                const content = await ctx.biliAPI.getUserInfo(mid)
+                const content = await ctx.ba.getUserInfo(mid)
                 console.log(content);
             })
 
@@ -100,7 +106,7 @@ class ComRegister {
             .usage('测试时间接口')
             .example('test.time')
             .action(async ({ session }) => {
-                session.send(await ctx.biliAPI.getTimeNow())
+                session.send(await ctx.ba.getTimeNow())
             })
 
         testCom
@@ -111,9 +117,9 @@ class ComRegister {
                 // logger
                 this.logger.info('调用test gimg指令')
                 // 获取用户空间动态数据
-                const { data } = await ctx.biliAPI.getUserSpaceDynamic(uid)
+                const { data } = await ctx.ba.getUserSpaceDynamic(uid)
                 // 获取动态推送图片
-                const { pic, buffer } = await ctx.gimg.generateDynamicImg(data.items[index])
+                const { pic, buffer } = await ctx.gi.generateDynamicImg(data.items[index])
                 // 如果pic存在，则直接返回pic
                 if (pic) return pic
                 // pic不存在，说明使用的是page模式
@@ -141,7 +147,7 @@ class ComRegister {
             .usage('获取当前UTC+8 Unix时间戳')
             .example('test utc')
             .action(async ({ session }) => {
-                session.send((await ctx.biliAPI.getServerUTCTime()).toString())
+                session.send((await ctx.ba.getServerUTCTime()).toString())
             })
 
         testCom
@@ -152,7 +158,7 @@ class ComRegister {
                 // logger
                 this.logger.info('调用test gimg指令')
                 // 获取主播信息
-                const { data } = await ctx.biliAPI.getMasterInfo('686127')
+                const { data } = await ctx.ba.getMasterInfo('686127')
                 let resizedImage: Buffer
                 try {
                     resizedImage = await Jimp.read(data.info.face).then(async image => {
@@ -186,7 +192,7 @@ class ComRegister {
             // 获取二维码
             let content;
             try {
-                content = await ctx.biliAPI.getLoginQRCode();
+                content = await ctx.ba.getLoginQRCode();
             }
             catch (e) {
                 return 'bili login getLoginQRCode() 本次网络请求失败';
@@ -222,7 +228,7 @@ class ComRegister {
                     // 获取登录信息
                     let loginContent;
                     try {
-                        loginContent = await ctx.biliAPI.getLoginStatus(content.data.qrcode_key);
+                        loginContent = await ctx.ba.getLoginStatus(content.data.qrcode_key);
                     }
                     catch (e) {
                         this.logger.error(e);
@@ -237,7 +243,7 @@ class ComRegister {
                         return await session.send('二维码已失效，请重新登录');
                     }
                     if (loginContent.data.code === 0) { // 登录成功
-                        const encryptedCookies = ctx.wbi.encrypt(ctx.biliAPI.getCookies());
+                        const encryptedCookies = ctx.wbi.encrypt(ctx.ba.getCookies());
                         const encryptedRefreshToken = ctx.wbi.encrypt(loginContent.data.refresh_token);
                         await ctx.database.upsert('loginBili', [{
                                 id: 1,
@@ -249,13 +255,13 @@ class ComRegister {
                         // 订阅之前的订阅
                         await this.getSubFromDatabase(ctx);
                         // 清除控制台通知
-                        ctx.biliAPI.disposeNotifier();
+                        ctx.ba.disposeNotifier();
                         // 发送成功登录推送
                         await session.send('登录成功');
                         // bili show
                         await session.execute('bili show');
                         // 开启cookies刷新检测
-                        ctx.biliAPI.enableRefreshCookiesDetect();
+                        ctx.ba.enableRefreshCookiesDetect();
                         return;
                     }
                 }
@@ -361,7 +367,7 @@ class ComRegister {
             // 获取用户信息
             let content;
             try {
-                content = await ctx.biliAPI.getUserInfo(mid);
+                content = await ctx.ba.getUserInfo(mid);
             }
             catch (e) {
                 return 'bili sub getUserInfo() 发生了错误，错误为：' + e.message;
@@ -497,7 +503,7 @@ class ComRegister {
             // 获取用户信息
             let userData;
             try {
-                const { data } = await ctx.biliAPI.getMasterInfo(sub.uid);
+                const { data } = await ctx.ba.getMasterInfo(sub.uid);
                 userData = data;
             }
             catch (e) {
@@ -574,7 +580,7 @@ class ComRegister {
                 return session.send('请输入房间号!');
             let content;
             try {
-                content = await ctx.biliAPI.getLiveRoomInfo(roomId);
+                content = await ctx.ba.getLiveRoomInfo(roomId);
             }
             catch (e) {
                 return 'bili status指令 getLiveRoomInfo() 发生了错误，错误为：' + e.message;
@@ -582,7 +588,7 @@ class ComRegister {
             const { data } = content;
             let userData;
             try {
-                const { data: userInfo } = await ctx.biliAPI.getMasterInfo(data.uid);
+                const { data: userInfo } = await ctx.ba.getMasterInfo(data.uid);
                 userData = userInfo;
             }
             catch (e) {
@@ -598,7 +604,7 @@ class ComRegister {
                 }
                 return;
             }
-            const { pic, buffer } = await ctx.gimg.generateLiveImg(data, userData, data.live_status !== 1 ?
+            const { pic, buffer } = await ctx.gi.generateLiveImg(data, userData, data.live_status !== 1 ?
                 LiveType.NotLiveBroadcast :
                 LiveType.LiveBroadcast);
             // pic 存在，使用的是render模式
@@ -771,7 +777,7 @@ class ComRegister {
             // 第一次订阅判断
             if (firstSubscription) {
                 // 设置第一次的时间点
-                timePoint = ctx.biliAPI.getTimeOfUTC8();
+                timePoint = ctx.ba.getTimeOfUTC8();
                 // 设置第一次为false
                 firstSubscription = false;
                 return;
@@ -779,7 +785,7 @@ class ComRegister {
             // 获取用户空间动态数据
             let content;
             try {
-                content = await ctx.biliAPI.getUserSpaceDynamic(uid);
+                content = await ctx.ba.getUserSpaceDynamic(uid);
             }
             catch (e) {
                 return this.logger.error('dynamicDetect getUserSpaceDynamic() 发生了错误，错误为：' + e.message);
@@ -788,23 +794,32 @@ class ComRegister {
             if (content.code !== 0) {
                 switch (content.code) {
                     case -101: { // 账号未登录
-                        await this.sendPrivateMsg(bot, '账号未登录，请登录后重新订阅动态');
+                        // 输出日志
+                        this.logger.error('账号未登录，插件已停止工作，请登录后，输入指令 sys start 启动插件');
+                        // 发送私聊消息
+                        await this.sendPrivateMsg(bot, '账号未登录，插件已停止工作，请登录后，输入指令 sys start 启动插件');
+                        // 停止服务
+                        await ctx.sm.disposePlugin();
+                        // 结束循环
                         break;
                     }
                     case -352: { // 风控
+                        // 输出日志
+                        this.logger.error('账号被风控，插件已停止工作，请确认风控解除后，输入指令 sys start 启动插件');
                         // 发送私聊消息
                         await this.sendPrivateMsg(bot, '账号被风控，插件已停止工作，请确认风控解除后，输入指令 sys start 启动插件');
                         // 停止服务
                         await ctx.sm.disposePlugin();
                         // 结束循环
-                        return;
+                        break;
                     }
                     default: { // 未知错误
+                        // 发送私聊消息
                         await this.sendPrivateMsg(bot, '获取动态信息错误，错误码为：' + content.code + '，错误为：' + content.message); // 未知错误
                         // 取消订阅
                         this.unsubAll(ctx, bot, uid);
                         // 结束循环
-                        return;
+                        break;
                     }
                 }
             }
@@ -841,7 +856,7 @@ class ComRegister {
                         // 获取动态推送图片
                         try {
                             // 渲染图片
-                            const { pic: gimgPic, buffer: gimgBuffer } = await ctx.gimg.generateDynamicImg(items[num]);
+                            const { pic: gimgPic, buffer: gimgBuffer } = await ctx.gi.generateDynamicImg(items[num]);
                             // 赋值
                             pic = gimgPic;
                             buffer = gimgBuffer;
@@ -908,7 +923,7 @@ class ComRegister {
             for (let i = 0; i < attempts; i++) {
                 try {
                     // 获取直播通知卡片
-                    const { pic: picv, buffer: bufferv } = await ctx.gimg.generateLiveImg(data, uData, liveType);
+                    const { pic: picv, buffer: bufferv } = await ctx.gi.generateLiveImg(data, uData, liveType);
                     // 赋值
                     pic = picv;
                     buffer = bufferv;
@@ -943,7 +958,7 @@ class ComRegister {
                 for (let i = 0; i < attempts; i++) {
                     try {
                         // 发送请求获取room信息
-                        content = await ctx.biliAPI.getLiveRoomInfo(roomId);
+                        content = await ctx.ba.getLiveRoomInfo(roomId);
                         // 成功则跳出循环
                         break;
                     }
@@ -964,7 +979,7 @@ class ComRegister {
                     for (let i = 0; i < attempts; i++) {
                         try {
                             // 发送请求获取主播信息
-                            const { data: userInfo } = await ctx.biliAPI.getMasterInfo(data.uid);
+                            const { data: userInfo } = await ctx.ba.getMasterInfo(data.uid);
                             userData = userInfo;
                             // 成功则跳出循环
                             break;
@@ -1001,7 +1016,7 @@ class ComRegister {
                             // 定义下播通知消息
                             let liveEndMsg = this.config.customLiveEnd
                                 .replace('-name', uData.info.uname)
-                                .replace('-time', await ctx.gimg.getTimeDifference(liveTime));
+                                .replace('-time', await ctx.gi.getTimeDifference(liveTime));
                             // 获取头像并缩放
                             let resizedImage;
                             // Jimp无法处理Webp格式，直接跳过
@@ -1034,7 +1049,7 @@ class ComRegister {
                             for (let i = 0; i < attempts; i++) {
                                 try {
                                     // 获取主播信息
-                                    const { data: userInfo } = await ctx.biliAPI.getMasterInfo(data.uid);
+                                    const { data: userInfo } = await ctx.ba.getMasterInfo(data.uid);
                                     userData = userInfo;
                                     // 成功则跳出循环
                                     break;
@@ -1051,7 +1066,7 @@ class ComRegister {
                             // 定义开播通知语
                             let liveStartMsg = this.config.customLiveStart
                                 .replace('-name', uData.info.uname)
-                                .replace('-time', await ctx.gimg.getTimeDifference(liveTime))
+                                .replace('-time', await ctx.gi.getTimeDifference(liveTime))
                                 .replace('-link', `https://live.bilibili.com/${data.short_id === 0 ? data.room_id : data.short_id}`);
                             // 判断是否需要@全体成员
                             if (this.config.liveStartAtAll) {
@@ -1151,7 +1166,7 @@ class ComRegister {
     async checkIfLoginInfoIsLoaded(ctx) {
         return new Promise(resolve => {
             const check = () => {
-                if (!ctx.biliAPI.getLoginInfoIsLoaded()) {
+                if (!ctx.ba.getLoginInfoIsLoaded()) {
                     ctx.setTimeout(check, 500);
                 }
                 else {
@@ -1242,7 +1257,7 @@ class ComRegister {
             for (let i = 0; i < attempts; i++) {
                 try {
                     // 获取用户信息
-                    content = await ctx.biliAPI.getUserInfo(sub.uid);
+                    content = await ctx.ba.getUserInfo(sub.uid);
                     // 成功则跳出循环
                     break;
                 }
@@ -1408,7 +1423,7 @@ class ComRegister {
     async checkIfIsLogin(ctx) {
         if ((await ctx.database.get('loginBili', 1)).length !== 0) { // 数据库中有数据
             // 检查cookie中是否有值
-            if (ctx.biliAPI.getCookies() !== '[]') { // 有值说明已登录
+            if (ctx.ba.getCookies() !== '[]') { // 有值说明已登录
                 return true;
             }
         }

package/lib/generateImg.d.ts

@@ -1,7 +1,7 @@
 import { Context, Schema, Service } from "koishi";
 declare module 'koishi' {
     interface Context {
-        gimg: GenerateImg;
+        gi: GenerateImg;
     }
 }
 declare class GenerateImg extends Service {

package/lib/generateImg.js

@@ -37,10 +37,10 @@ const ADDITIONAL_TYPE_UP_RCMD = 'ADDITIONAL_TYPE_UP_RCMD'
 const ADDITIONAL_TYPE_UGC = 'ADDITIONAL_TYPE_UGC' */
 const ADDITIONAL_TYPE_RESERVE = 'ADDITIONAL_TYPE_RESERVE';
 class GenerateImg extends koishi_1.Service {
-    static inject = ['puppeteer', 'biliAPI'];
+    static inject = ['puppeteer', 'ba'];
     giConfig;
     constructor(ctx, config) {
-        super(ctx, 'gimg');
+        super(ctx, 'gi');
         this.giConfig = config;
     }
     start() {
@@ -1341,7 +1341,7 @@ class GenerateImg extends koishi_1.Service {
         // 获取Unix时间戳（以毫秒为单位）
         const unixTime = date.getTime() / 1000;
         // 获取当前Unix时间戳
-        const now = this.ctx.biliAPI.getTimeOfUTC8();
+        const now = this.ctx.ba.getTimeOfUTC8();
         // 计算时间差（以秒为单位）
         const differenceInSeconds = Math.floor(now - unixTime);
         // 获取yyyy:MM:dd HH:mm:ss

package/lib/index.d.ts

@@ -35,6 +35,7 @@ export declare const Config: Schema<Config>;
 declare class ServerManager extends Service {
     servers: ForkScope[];
     renderType: number;
+    dynamicLoopTime: number;
     restartCount: number;
     constructor(ctx: Context);
     protected start(): void | Promise<void>;

package/lib/index.js

@@ -156,6 +156,8 @@ class ServerManager extends koishi_1.Service {
     servers = [];
     // 渲染模式
     renderType;
+    // 动态循环时间
+    dynamicLoopTime;
     // 重启次数
     restartCount = 0;
     constructor(ctx) {
@@ -197,6 +199,7 @@ class ServerManager extends koishi_1.Service {
         });
     }
     start() {
+        // 加载配置
         // 根据用户设置的渲染模式设置
         switch (globalConfig.renderType) {
             case 'render':
@@ -206,6 +209,21 @@ class ServerManager extends koishi_1.Service {
                 this.renderType = 1;
                 break;
         }
+        // 转换为具体时间
+        switch (globalConfig.dynamicLoopTime) {
+            case '1分钟':
+                this.dynamicLoopTime = 60;
+                break;
+            case '2分钟':
+                this.dynamicLoopTime = 120;
+                break;
+            case '3分钟':
+                this.dynamicLoopTime = 180;
+                break;
+            case '5分钟':
+                this.dynamicLoopTime = 300;
+                break;
+        }
         // 注册插件
         this.registerPlugin();
     }
@@ -215,10 +233,10 @@ class ServerManager extends koishi_1.Service {
             return false;
         await new Promise(resolve => {
             // 注册插件
-            const biliApi = this.ctx.plugin(biliAPI_1.default, {
+            const ba = this.ctx.plugin(biliAPI_1.default, {
                 userAgent: globalConfig.userAgent
             });
-            const generateImg = this.ctx.plugin(generateImg_1.default, {
+            const gi = this.ctx.plugin(generateImg_1.default, {
                 renderType: this.renderType,
                 filter: globalConfig.filter,
                 removeBorder: globalConfig.removeBorder,
@@ -227,9 +245,24 @@ class ServerManager extends koishi_1.Service {
                 enableLargeFont: globalConfig.enableLargeFont,
                 font: globalConfig.font
             });
+            const wbi = this.ctx.plugin(wbi_1.default, { key: globalConfig.key });
+            const cr = this.ctx.plugin(comRegister_1.default, {
+                master: globalConfig.master,
+                unlockSubLimits: globalConfig.unlockSubLimits,
+                liveStartAtAll: globalConfig.liveStartAtAll,
+                pushTime: globalConfig.pushTime,
+                customLiveStart: globalConfig.customLiveStart,
+                customLiveEnd: globalConfig.customLiveEnd,
+                dynamicCheckNumber: globalConfig.dynamicCheckNumber,
+                dynamicLoopTime: this.dynamicLoopTime,
+                dynamicUrl: globalConfig.dynamicUrl,
+                filter: globalConfig.filter
+            });
             // 添加服务
-            this.servers.push(biliApi);
-            this.servers.push(generateImg);
+            this.servers.push(ba);
+            this.servers.push(gi);
+            this.servers.push(wbi);
+            this.servers.push(cr);
             // 成功
             resolve('ok');
         });
@@ -291,40 +324,10 @@ function apply(ctx, config) {
             content: '过多的订阅可能会导致IP暂时被封禁！'
         });
     }
-    // load config
-    // 转换为具体时间
-    let dynamicLoopTime;
-    switch (config.dynamicLoopTime) {
-        case '1分钟':
-            dynamicLoopTime = 60;
-            break;
-        case '2分钟':
-            dynamicLoopTime = 120;
-            break;
-        case '3分钟':
-            dynamicLoopTime = 180;
-            break;
-        case '5分钟':
-            dynamicLoopTime = 300;
-            break;
-    }
     // load database
     ctx.plugin(Database);
-    // Regist server
-    ctx.plugin(wbi_1.default, { key: config.key });
+    // Register ServerManager
     ctx.plugin(ServerManager);
-    ctx.plugin(comRegister_1.default, {
-        master: config.master,
-        unlockSubLimits: config.unlockSubLimits,
-        liveStartAtAll: config.liveStartAtAll,
-        pushTime: config.pushTime,
-        customLiveStart: config.customLiveStart,
-        customLiveEnd: config.customLiveEnd,
-        dynamicCheckNumber: config.dynamicCheckNumber,
-        dynamicLoopTime,
-        dynamicUrl: config.dynamicUrl,
-        filter: config.filter
-    });
     // 当用户输入“恶魔兔，启动！”时，执行 help 指令
     ctx.middleware((session, next) => {
         if (session.content === '恶魔兔，启动！') {

package/lib/wbi.d.ts

@@ -9,6 +9,7 @@ declare class Wbi extends Service {
     mixinKeyEncTab: number[];
     constructor(ctx: Context, config: Wbi.Config);
     protected start(): void | Promise<void>;
+    protected stop(): void | Promise<void>;
     getMixinKey: (orig: any) => string;
     encWbi(params: any, img_key: any, sub_key: any): string;
     getWbiKeys(): Promise<{

package/lib/wbi.js

@@ -19,7 +19,10 @@ class Wbi extends koishi_1.Service {
         this.wbiConfig = config;
     }
     start() {
-        // this.logger.info('wbi已被注册到Context中')
+        this.logger.info('工作中');
+    }
+    stop() {
+        this.logger.info('已停止工作');
     }
     // 对 imgKey 和 subKey 进行字符顺序打乱编码
     getMixinKey = (orig) => this.mixinKeyEncTab.map(n => orig[n]).join('').slice(0, 32);

package/package.json

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

package/readme.md

@@ -153,6 +153,7 @@
 - ver 1.2.11-alpha.1 修复报错 `app TypeError: Cannot read properties of undefined (reading 'toString')`，添加更多日志输出
 - ver 1.2.12-alpha.0 新增 `sys` 类指令，包括子命令：`start`、`stop`、`restart` 分别为插件的启动、停止和重启，需要权限等级5才能使用。现在，账号出现某些问题后，不会再清除订阅信息，而是停止插件，在排除问题后需要使用指令 `sys start` 手动启动插件。修复一个动态推送的bug
 - ver 1.2.12-alpha.1 删除直播推送时的多余空格
+- ver 1.2.12-alpha.2 尝试修复版本 `1.2.12-alpha.0 账号出现某些问题后，不会再清除订阅信息` 仍然会清除订阅信息的bug
 
 ## 交流群