koishi-plugin-bilibili-notify 1.2.2-beta.1 → 1.2.3-alpha.0

package/lib/biliAPI.d.ts

@@ -16,6 +16,7 @@ declare class BiliAPI extends Service {
     loginInfoIsLoaded: boolean;
     constructor(ctx: Context);
     protected start(): void | Promise<void>;
+    protected stop(): void | Promise<void>;
     getServerUTCTime(): Promise<number>;
     getTimeNow(): Promise<any>;
     getUserSpaceDynamic(mid: string): Promise<any>;

package/lib/biliAPI.js

@@ -38,7 +38,11 @@ class BiliAPI extends koishi_1.Service {
         this.createNewClient();
         // 从数据库加载cookies
         this.loadCookiesFromDatabase();
-        // this.logger.info('BiliAPI已被注册到Context中')
+        // logger
+        // this.logger.info('工作中')
+    }
+    stop() {
+        // this.logger.info('已停止工作')
     }
     async getServerUTCTime() {
         try {

package/lib/comRegister.d.ts

@@ -26,6 +26,8 @@ declare class ComRegister {
     satoriBot: Bot<Context>;
     chronocatBot: Bot<Context>;
     constructor(ctx: Context, config: ComRegister.Config);
+    sendErr(guildId: Array<string>, bot: Bot<Context>, content: string): Promise<void>;
+    sendErrAndRebootService(guildId: Array<string>, bot: Bot<Context>, ctx: Context, content: string): void;
     dynamicDetect(ctx: Context, bot: Bot<Context>, uid: string, guildId: Array<string>): () => Promise<void>;
     sendMsg(targets: Array<string>, bot: Bot<Context>, content: any): Promise<void>;
     liveDetect(ctx: Context, bot: Bot<Context>, roomId: string, guildId: Array<string>): () => Promise<void>;
@@ -39,6 +41,11 @@ declare class ComRegister {
 }
 declare namespace ComRegister {
     interface Config {
+        master: {
+            enable: boolean;
+            masterAccount: string;
+            masterAccountGuildId: string;
+        };
         unlockSubLimits: boolean;
         liveStartAtAll: boolean;
         pushTime: number;

package/lib/comRegister.js

@@ -14,7 +14,7 @@ var LiveType;
     LiveType[LiveType["LiveBroadcast"] = 2] = "LiveBroadcast";
 })(LiveType || (LiveType = {}));
 class ComRegister {
-    static inject = ['biliAPI', 'gimg', 'wbi', 'database'];
+    static inject = ['biliAPI', 'gimg', 'wbi', 'database', 'sm'];
     logger;
     config;
     loginTimer;
@@ -360,7 +360,7 @@ class ComRegister {
                         msg = '请求错误';
                         break;
                     case -403:
-                        msg = '访问权限不足，尝试重新登录，如果不行请联系作者';
+                        msg = '访问权限不足，请尝试重新登录';
                         break;
                     case -404:
                         msg = '用户不存在';
@@ -479,7 +479,8 @@ class ComRegister {
                 userData = data;
             }
             catch (e) {
-                return 'bili sub指令 getMasterInfo() 网络请求失败，请重试';
+                this.logger.error('bili sub指令 getMasterInfo() 网络请求失败，原因：' + e.toString());
+                return '订阅出错啦，请重试';
             }
             // 需要订阅直播
             if (liveMsg) {
@@ -625,7 +626,7 @@ class ComRegister {
                     session.send('未找到该房间');
                 }
                 else {
-                    session.send('未知错误，请呼叫管理员检查问题');
+                    session.send('未知错误');
                 }
                 return;
             }
@@ -652,6 +653,30 @@ class ComRegister {
             });
         });
     }
+    async sendErr(guildId, bot, content) {
+        if (this.config.master.enable) {
+            if (this.config.master.masterAccountGuildId) {
+                // 向机器人主人发送消息
+                await bot.sendPrivateMessage(this.config.master.masterAccount, content, this.config.master.masterAccountGuildId);
+            }
+            else {
+                // 向机器人主人发送消息
+                await bot.sendPrivateMessage(this.config.master.masterAccount, content);
+            }
+        }
+        else {
+            await this.sendMsg(guildId, bot, content);
+        }
+    }
+    sendErrAndRebootService(guildId, bot, ctx, content) {
+        this.sendErr(guildId, bot, content);
+        // 停用插件
+        ctx.sm.disposePlugin();
+        // 隔一秒启动插件
+        ctx.setTimeout(() => {
+            ctx.sm.registerPlugin();
+        }, 1000);
+    }
     dynamicDetect(ctx, bot, uid, guildId) {
         let firstSubscription = true;
         let timePoint;
@@ -731,11 +756,11 @@ class ComRegister {
                             // 如果pic存在，则直接返回pic
                             if (pic) {
                                 // pic存在，使用的是render模式
-                                await this.sendMsg(guildId, bot, pic + ' ' + dUrl);
+                                await this.sendMsg(guildId, bot, pic + dUrl);
                             }
                             else {
                                 // pic不存在，说明使用的是page模式
-                                await this.sendMsg(guildId, bot, koishi_1.h.image(buffer, 'image/png' + ' ' + dUrl));
+                                await this.sendMsg(guildId, bot, koishi_1.h.image(buffer, 'image/png' + dUrl));
                             }
                             // 如果成功，那么跳出循环
                             break;
@@ -743,7 +768,12 @@ class ComRegister {
                         catch (e) {
                             this.logger.error('dynamicDetect generateLiveImg() 推送卡片发送失败，原因：' + e.toString());
                             if (i === attempts - 1) { // 如果已经尝试了三次，那么抛出错误
-                                return this.sendMsg(guildId, bot, '插件可能出现某些未知错误，请尝试重启插件，如果仍然发生该错误，请带着日志向作者反馈');
+                                /* return this.sendMsg(
+                                    guildId,
+                                    bot,
+                                    '插件可能出现某些未知错误，请尝试重启插件，如果仍然发生该错误，请带着日志向作者反馈'
+                                ) */
+                                this.sendErrAndRebootService(guildId, bot, ctx, '插件可能出现某些未知错误，请尝试重启插件，如果仍然发生该错误，请带着日志向作者反馈');
                             }
                         }
                     }
@@ -794,14 +824,14 @@ class ComRegister {
                         if (pic)
                             return await this.sendMsg(guildId, bot, pic + (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("at", { type: "all" }), " ", liveStartMsg, " "] }));
                         // pic不存在，说明使用的是page模式
-                        await this.sendMsg(guildId, bot, koishi_1.h.image(buffer, 'image/png' + ' ' + (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("at", { type: "all" }), " ", liveStartMsg] })));
+                        await this.sendMsg(guildId, bot, koishi_1.h.image(buffer, 'image/png' + (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("at", { type: "all" }), " ", liveStartMsg] })));
                     }
                     else {
                         // pic 存在，使用的是render模式
                         if (pic)
                             return await this.sendMsg(guildId, bot, pic + liveStartMsg);
                         // pic不存在，说明使用的是page模式
-                        await this.sendMsg(guildId, bot, koishi_1.h.image(buffer, 'image/png' + ' ' + liveStartMsg));
+                        await this.sendMsg(guildId, bot, koishi_1.h.image(buffer, 'image/png' + liveStartMsg));
                     }
                     // 成功则跳出循环
                     break;
@@ -809,7 +839,12 @@ class ComRegister {
                 catch (e) {
                     this.logger.error('liveDetect generateLiveImg() 推送卡片发送失败，原因：' + e.toString());
                     if (i === attempts - 1) { // 已尝试三次
-                        return this.sendMsg(guildId, bot, '插件可能出现某些未知错误，请尝试重启插件，如果仍然发生该错误，请带着日志向作者反馈');
+                        /* return this.sendMsg(
+                            guildId,
+                            bot,
+                            '插件可能出现某些未知错误，已自动重启插件，如果仍然发生该错误，请带着日志向作者反馈'
+                        ) */
+                        this.sendErrAndRebootService(guildId, bot, ctx, '插件可能出现某些未知错误，请尝试重启插件，如果仍然发生该错误，请带着日志向作者反馈');
                     }
                 }
             }
@@ -833,7 +868,12 @@ class ComRegister {
                     catch (e) {
                         this.logger.error('liveDetect getLiveRoomInfo 网络请求失败');
                         if (i === attempts - 1) { // 已尝试三次
-                            return await this.sendMsg(guildId, bot, '你的网络可能出现了某些问题，请检查后重启插件');
+                            /* return await this.sendMsg(
+                                guildId,
+                                bot,
+                                '你的网络可能出现了某些问题，请检查后重启插件',
+                            ) */
+                            this.sendErrAndRebootService(guildId, bot, ctx, '插件可能出现某些未知错误，请尝试重启插件，如果仍然发生该错误，请带着日志向作者反馈');
                         }
                     }
                 }
@@ -855,7 +895,12 @@ class ComRegister {
                         catch (e) {
                             this.logger.error('liveDetect getMasterInfo() 本次网络请求失败');
                             if (i === attempts - 1) { // 已尝试三次
-                                return await this.sendMsg(guildId, bot, '你的网络可能出现了某些问题，请检查后重启插件');
+                                /* return await this.sendMsg(
+                                    guildId,
+                                    bot,
+                                    '你的网络可能出现了某些问题，请检查后重启插件',
+                                ) */
+                                this.sendErrAndRebootService(guildId, bot, ctx, '插件可能出现某些未知错误，请尝试重启插件，如果仍然发生该错误，请带着日志向作者反馈');
                             }
                         }
                     }
@@ -911,7 +956,12 @@ class ComRegister {
                                 catch (e) {
                                     this.logger.error('liveDetect open getMasterInfo() 网络请求错误');
                                     if (i === attempts - 1) { // 已尝试三次
-                                        return this.sendMsg(guildId, bot, '你的网络可能出现了某些问题，请检查后重启插件');
+                                        /* return this.sendMsg(
+                                            guildId,
+                                            bot,
+                                            '你的网络可能出现了某些问题，请检查后重启插件',
+                                        ) */
+                                        this.sendErrAndRebootService(guildId, bot, ctx, '插件可能出现某些未知错误，请尝试重启插件，如果仍然发生该错误，请带着日志向作者反馈');
                                     }
                                 }
                             }
@@ -1068,6 +1118,8 @@ class ComRegister {
                 // 跳过下面的步骤
                 continue;
             }
+            // 获取推送目标数组
+            const targetArr = sub.targetId.split(' ');
             // 拿到对应bot
             switch (sub.platform) {
                 case 'qq':
@@ -1096,12 +1148,12 @@ class ComRegister {
                     ctx.database.remove('bilibili', { id: sub.id });
                     // 不支持的协议
                     this.logger.info(`UID:${sub.uid} 出现不支持的协议，该条数据被篡改，自动取消订阅`);
+                    // 发送消息
+                    await this.sendErr(targetArr, bot, `UID:${sub.uid} 出现不支持的协议，该条数据被篡改，自动取消订阅`);
                     // 继续下个循环
                     continue;
                 }
             }
-            // 获取推送目标数组
-            const targetArr = sub.targetId.split(' ');
             // 判断数据库是否被篡改
             // 获取用户信息
             let content;
@@ -1116,7 +1168,12 @@ class ComRegister {
                 catch (e) {
                     this.logger.error('getSubFromDatabase() getUserInfo() 本次网络请求失败');
                     if (i === attempts - 1) { // 已尝试三次
-                        return await this.sendMsg(targetArr, bot, '你的网络可能出现了某些问题，请检查后重启插件');
+                        /* return await this.sendMsg(
+                            targetArr,
+                            bot,
+                            '你的网络可能出现了某些问题，请检查后重启插件'
+                        ) */
+                        this.sendErrAndRebootService(targetArr, bot, ctx, '你的网络可能出现了某些问题，请检查后重启插件');
                     }
                 }
             }
@@ -1127,14 +1184,24 @@ class ComRegister {
                 // 从数据库删除该条数据
                 await ctx.database.remove('bilibili', { id: sub.id });
                 // 给用户发送提示
-                this.sendMsg(targetArr, bot, `UID:${sub.uid} 数据库内容被篡改，已取消对该UP主的订阅`);
+                await this.sendErr(targetArr, bot, `UID:${sub.uid} 数据库内容被篡改，已取消对该UP主的订阅`);
+                /* await this.sendMsg(
+                    targetArr,
+                    bot,
+                    `UID:${sub.uid} 数据库内容被篡改，已取消对该UP主的订阅`
+                ) */
             };
             // 判断是否有其他问题
             if (content.code !== 0) {
                 switch (content.code) {
                     case -352:
                     case -403: {
-                        this.sendMsg(targetArr, bot, '你的登录信息已过期，请重新登录Bilibili');
+                        await this.sendErr(targetArr, bot, '你的登录信息已过期，请重新登录Bilibili');
+                        /* this.sendMsg(
+                            targetArr,
+                            bot,
+                            '你的登录信息已过期，请重新登录Bilibili'
+                        ) */
                         return;
                     }
                     case -400:
@@ -1153,6 +1220,8 @@ class ComRegister {
                 await deleteSub();
                 // log
                 this.logger.info(`UID:${sub.uid} 房间号被篡改，自动取消订阅`);
+                // Send msg
+                await this.sendErr(targetArr, bot, `UID:${sub.uid} 房间号被篡改，自动取消订阅`);
                 return;
             }
             // 构建订阅对象
@@ -1261,6 +1330,11 @@ class ComRegister {
 }
 (function (ComRegister) {
     ComRegister.Config = koishi_1.Schema.object({
+        master: koishi_1.Schema.object({
+            enable: koishi_1.Schema.boolean(),
+            masterAccount: koishi_1.Schema.string(),
+            masterAccountGuildId: koishi_1.Schema.string()
+        }),
         unlockSubLimits: koishi_1.Schema.boolean().required(),
         liveStartAtAll: koishi_1.Schema.boolean().required(),
         pushTime: koishi_1.Schema.number().required(),

package/lib/generateImg.d.ts

@@ -10,6 +10,7 @@ declare class GenerateImg extends Service {
     giConfig: GenerateImg.Config;
     constructor(ctx: Context, config: GenerateImg.Config);
     protected start(): void | Promise<void>;
+    protected stop(): void | Promise<void>;
     generateLiveImg(data: any, userData: any, liveStatus: number): Promise<{
         buffer: Buffer;
         pic?: undefined;

package/lib/generateImg.js

@@ -44,7 +44,10 @@ class GenerateImg extends koishi_1.Service {
         this.giConfig = config;
     }
     start() {
-        // this.logger.info('GenerateImg已被注册到Context中');
+        // this.logger.info('工作中');
+    }
+    stop() {
+        // this.logger.info('已停止工作')
     }
     async generateLiveImg(data, userData, liveStatus /*0未开播 1刚开播 2已开播 */) {
         const [titleStatus, liveTime, cover] = await this.getLiveStatus(data.live_time, liveStatus);

package/lib/index.d.ts

@@ -1,9 +1,15 @@
-import { Context, Schema } from 'koishi';
+import { Context, ForkScope, Schema, Service } from 'koishi';
 export declare const inject: string[];
 export declare const name = "bilibili-notify";
+declare module 'koishi' {
+    interface Context {
+        sm: ServerManager;
+    }
+}
 export interface Config {
     require: {};
     key: string;
+    master: {};
     basicSettings: {};
     unlockSubLimits: boolean;
     renderType: 'render' | 'page';
@@ -25,4 +31,13 @@ export interface Config {
     filter: {};
 }
 export declare const Config: Schema<Config>;
+declare class ServerManager extends Service {
+    servers: ForkScope[];
+    renderType: number;
+    constructor(ctx: Context);
+    protected start(): void | Promise<void>;
+    registerPlugin: () => void;
+    disposePlugin: () => void;
+}
 export declare function apply(ctx: Context, config: Config): void;
+export {};

package/lib/index.js

@@ -39,6 +39,7 @@ const generateImg_1 = __importDefault(require("./generateImg"));
 const biliAPI_1 = __importDefault(require("./biliAPI"));
 exports.inject = ['puppeteer', 'database', 'notifier'];
 exports.name = 'bilibili-notify';
+let globalConfig;
 exports.Config = koishi_1.Schema.object({
     require: koishi_1.Schema.object({}).description('必填设置'),
     key: koishi_1.Schema.string()
@@ -46,6 +47,27 @@ exports.Config = koishi_1.Schema.object({
         .role('secret')
         .required()
         .description('请输入一个32位小写字母的十六进制密钥（例如：9b8db7ae562b9864efefe06289cc5530），使用此密钥将你的B站登录信息存储在数据库中，请一定保存好此密钥。如果你忘记了此密钥，必须重新登录。你可以自行生成，或到这个网站生成：https://www.sexauth.com/'),
+    master: koishi_1.Schema.intersect([
+        koishi_1.Schema.object({
+            enable: koishi_1.Schema.boolean()
+                .default(false)
+                .description('是否开启主人账号功能')
+                .experimental()
+        }).description('主人账号'),
+        koishi_1.Schema.union([
+            koishi_1.Schema.object({
+                enable: koishi_1.Schema.const(true).required(),
+                masterAccount: koishi_1.Schema.string()
+                    .role('secret')
+                    .required()
+                    .description('主人账号，在Q群使用可直接使用QQ号，若在其他平台使用，请使用inspect插件获取自身ID'),
+                masterAccountGuildId: koishi_1.Schema.string()
+                    .role('secret')
+                    .description('主人账号所在的群组ID，只有在QQ频道、Discord这样的环境才需要填写，请使用inspect插件获取群组ID'),
+            }),
+            koishi_1.Schema.object({})
+        ])
+    ]),
     basicSettings: koishi_1.Schema.object({}).description('基本设置'),
     unlockSubLimits: koishi_1.Schema.boolean()
         .default(false)
@@ -126,7 +148,47 @@ exports.Config = koishi_1.Schema.object({
         ])
     ]),
 });
+class ServerManager extends koishi_1.Service {
+    servers = [];
+    // 渲染模式
+    renderType;
+    constructor(ctx) {
+        super(ctx, 'sm');
+    }
+    start() {
+        this.registerPlugin();
+        switch (globalConfig.renderType) {
+            case 'render':
+                this.renderType = 0;
+                break;
+            case 'page':
+                this.renderType = 1;
+                break;
+        }
+    }
+    registerPlugin = () => {
+        const biliApi = this.ctx.plugin(biliAPI_1.default);
+        const generateImg = this.ctx.plugin(generateImg_1.default, {
+            renderType: this.renderType,
+            filter: globalConfig.filter,
+            removeBorder: globalConfig.removeBorder,
+            cardColorStart: globalConfig.cardColorStart,
+            cardColorEnd: globalConfig.cardColorEnd,
+            enableLargeFont: globalConfig.enableLargeFont,
+            font: globalConfig.font
+        });
+        this.servers.push(biliApi);
+        this.servers.push(generateImg);
+    };
+    disposePlugin = () => {
+        this.servers.forEach(fork => {
+            fork.dispose();
+        });
+    };
+}
 function apply(ctx, config) {
+    // 设置config
+    globalConfig = config;
     // 设置提示
     ctx.notifier.create({
         content: '请记得使用Auth插件创建超级管理员账号，没有权限将无法使用该插件提供的指令。'
@@ -155,31 +217,13 @@ function apply(ctx, config) {
             dynamicLoopTime = 300;
             break;
     }
-    // 渲染模式
-    let renderType;
-    switch (config.renderType) {
-        case 'render':
-            renderType = 0;
-            break;
-        case 'page':
-            renderType = 1;
-            break;
-    }
     // load database
     ctx.plugin(Database);
     // Regist server
     ctx.plugin(wbi_1.default, { key: config.key });
-    ctx.plugin(biliAPI_1.default);
-    ctx.plugin(generateImg_1.default, {
-        renderType,
-        filter: config.filter,
-        removeBorder: config.removeBorder,
-        cardColorStart: config.cardColorStart,
-        cardColorEnd: config.cardColorEnd,
-        enableLargeFont: config.enableLargeFont,
-        font: config.font
-    });
+    ctx.plugin(ServerManager);
     ctx.plugin(comRegister_1.default, {
+        master: config.master,
         unlockSubLimits: config.unlockSubLimits,
         liveStartAtAll: config.liveStartAtAll,
         pushTime: config.pushTime,

package/package.json

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

package/readme.md

@@ -118,6 +118,8 @@
 - ver 1.2.2-alpha.0 bug测试
 - ver 1.2.2-beta.0 修复重启koishi后，提示没有任何订阅的bug，新增对chronocat的支持(实验性)
 - ver 1.2.2-beta.1 现已支持直播开播发送链接(实验性)
+- ver 1.2.2-beta.2 修复了动态推送时图片下方出现空行的情况
+- ver 1.2.3-alpha.0 新增主人账号功能，开启后，会将插件的错误消息向主人账号发送(实验性)。修复订阅消息推送失败刷屏的bug
 
 ## 交流群
 801338523 使用问题或bug都可以在群里提出