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

package/lib/biliAPI.js

@@ -298,6 +298,7 @@ class BiliAPI extends koishi_1.Service {
             return data;
         }
         catch (e) {
+            console.warn(e);
             throw new Error('网络异常，本次请求失败！');
         }
     }

package/lib/blive.d.ts

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

package/lib/blive.js

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

package/lib/comRegister.d.ts

@@ -11,6 +11,7 @@ type ChannelIdArr = Array<{
     channelId: string;
     dynamic: boolean;
     live: boolean;
+    liveDanmaku: boolean;
     atAll: boolean;
 }>;
 type TargetItem = {
@@ -26,7 +27,6 @@ type SubItem = {
     platform: string;
     live: boolean;
     dynamic: boolean;
-    liveDispose: Function;
 };
 type SubManager = Array<SubItem>;
 declare class ComRegister {
@@ -38,50 +38,52 @@ declare class ComRegister {
     num: number;
     rebootCount: number;
     subNotifier: Notifier;
+    ctx: Context;
     subManager: SubManager;
     loginDBData: FlatPick<LoginBili, "dynamic_group_id">;
     privateBot: Bot<Context>;
     dynamicDispose: Function;
     sendMsgFunc: (bot: Bot<Context, any>, channelId: string, content: any) => Promise<void>;
     constructor(ctx: Context, config: ComRegister.Config);
-    init(ctx: Context, config: ComRegister.Config): Promise<void>;
+    init(config: ComRegister.Config): Promise<void>;
     splitMultiPlatformStr(str: string): Target;
-    getBot(ctx: Context, pf: string): Bot<Context, any>;
+    getBot(pf: string): Bot<Context, any>;
     sendPrivateMsg(content: string): Promise<void>;
-    sendPrivateMsgAndRebootService(ctx: Context): Promise<void>;
-    sendPrivateMsgAndStopService(ctx: Context): Promise<void>;
-    sendMsg(ctx: Context, targets: Target, content: any, live?: boolean): Promise<void>;
-    dynamicDetect(ctx: Context): () => Promise<void>;
-    debug_dynamicDetect(ctx: Context): () => Promise<void>;
-    sendLiveNotifyCard(ctx: Context, info: {
+    sendPrivateMsgAndRebootService(): Promise<void>;
+    sendPrivateMsgAndStopService(): Promise<void>;
+    sendMsg(targets: Target, content: any, live?: boolean): Promise<void>;
+    dynamicDetect(): () => Promise<void>;
+    debug_dynamicDetect(): () => Promise<void>;
+    sendLiveNotifyCard(info: {
         username: string;
         userface: string;
         target: Target;
         data: any;
     }, liveType: LiveType, liveNotifyMsg?: string): Promise<void>;
-    useMasterInfo(ctx: Context, uid: string): Promise<{
+    useMasterInfo(uid: string): Promise<{
         username: string;
         userface: string;
+        roomId: number;
     }>;
-    useLiveRoomInfo(ctx: Context, roomId: string): Promise<any>;
-    liveDetectWithAPI(ctx: Context): Promise<() => Promise<void>>;
-    liveDetectWithListener(ctx: Context, roomId: string, target: Target): void;
+    useLiveRoomInfo(roomId: string): Promise<any>;
+    liveDetectWithAPI(): Promise<() => Promise<void>>;
+    liveDetectWithListener(roomId: string, target: Target): Promise<void>;
     subShow(): string;
     checkIfNeedSub(liveSub: boolean, dynamicSub: boolean, session: Session, liveRoomData: any): Promise<Array<boolean>>;
-    updateSubNotifier(ctx: Context): void;
-    checkIfLoginInfoIsLoaded(ctx: Context): Promise<unknown>;
-    subUserInBili(ctx: Context, mid: string): Promise<{
+    updateSubNotifier(): void;
+    checkIfLoginInfoIsLoaded(): Promise<unknown>;
+    subUserInBili(mid: string): Promise<{
         flag: boolean;
         msg: string;
     }>;
-    loadSubFromConfig(ctx: Context, subs: ComRegister.Config["sub"]): Promise<void>;
-    loadSubFromDatabase(ctx: Context): Promise<void>;
-    checkIfDynamicDetectIsNeeded(ctx: Context): void;
-    enableDynamicDetect(ctx: Context): void;
-    unsubSingle(ctx: Context, id: string, type: number): string;
+    loadSubFromConfig(subs: ComRegister.Config["sub"]): Promise<void>;
+    loadSubFromDatabase(): Promise<void>;
+    checkIfDynamicDetectIsNeeded(): void;
+    enableDynamicDetect(): void;
+    unsubSingle(id: string, type: number): string;
     checkIfUserIsTheLastOneWhoSubDyn(): void;
-    unsubAll(ctx: Context, uid: string): void;
-    checkIfIsLogin(ctx: Context): Promise<boolean>;
+    unsubAll(uid: string): void;
+    checkIfIsLogin(): Promise<boolean>;
 }
 declare namespace ComRegister {
     interface Config {
@@ -94,6 +96,7 @@ declare namespace ComRegister {
                     channelId: string;
                     dynamic: boolean;
                     live: boolean;
+                    liveDanmaku: boolean;
                     atAll: boolean;
                 }>;
                 platform: string;
@@ -107,7 +110,6 @@ declare namespace ComRegister {
         };
         unlockSubLimits: boolean;
         automaticResend: boolean;
-        changeMasterInfoApi: boolean;
         restartPush: boolean;
         pushTime: number;
         liveLoopTime: number;