koishi-plugin-bilibili-notify 3.0.0-alpha.2 → 3.0.0-alpha.20

package/lib/blive.d.ts

@@ -1,4 +1,4 @@
-import { Awaitable, Context, Schema, Service } from "koishi";
+import { Awaitable, Context, Service } from "koishi";
 import { type MsgHandler } from 'blive-message-listener';
 declare module 'koishi' {
     interface Context {
@@ -7,18 +7,10 @@ declare module 'koishi' {
 }
 declare class BLive extends Service {
     static inject: string[];
-    private blConfig;
     private listenerRecord;
-    private timerRecord;
-    constructor(ctx: Context, config: BLive.Config);
+    constructor(ctx: Context);
     protected stop(): Awaitable<void>;
-    startLiveRoomListener(roomId: string, handler: MsgHandler, danmakuPushTime: () => void): Promise<void>;
+    startLiveRoomListener(roomId: string, handler: MsgHandler): Promise<void>;
     closeListener(roomId: string): void;
 }
-declare namespace BLive {
-    interface Config {
-        danmakuPushTime: number;
-    }
-    const Config: Schema<Config>;
-}
 export default BLive;

package/lib/blive.js

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

package/lib/comRegister.d.ts

@@ -1,40 +1,13 @@
-import { Bot, Context, FlatPick, Logger, Schema, Session } from "koishi";
-import { Notifier } from "@koishijs/plugin-notifier";
-import { LoginBili } from "./database";
-declare enum LiveType {
-    NotLiveBroadcast = 0,
-    StartBroadcasting = 1,
-    LiveBroadcast = 2,
-    StopBroadcast = 3
-}
-type ChannelIdArr = Array<{
-    channelId: string;
-    dynamic: boolean;
-    live: boolean;
-    liveDanmaku: boolean;
-    atAll: boolean;
-}>;
-type TargetItem = {
-    channelIdArr: ChannelIdArr;
-    platform: string;
-};
-type Target = Array<TargetItem>;
-type SubItem = {
-    id: number;
-    uid: string;
-    roomId: string;
-    target: Target;
-    platform: string;
-    live: boolean;
-    dynamic: boolean;
-};
-type SubManager = Array<SubItem>;
+import { type Bot, type Context, type FlatPick, type Logger, Schema } from "koishi";
+import type { Notifier } from "@koishijs/plugin-notifier";
+import type { LoginBili } from "./database";
+import { LiveType, type MasterInfo, type SubManager, type Target } from "./type";
 declare class ComRegister {
     static inject: string[];
     qqRelatedBotList: Array<string>;
     logger: Logger;
     config: ComRegister.Config;
-    loginTimer: Function;
+    loginTimer: () => void;
     num: number;
     rebootCount: number;
     subNotifier: Notifier;
@@ -42,12 +15,13 @@ declare class ComRegister {
     subManager: SubManager;
     loginDBData: FlatPick<LoginBili, "dynamic_group_id">;
     privateBot: Bot<Context>;
-    dynamicDispose: Function;
+    dynamicDispose: () => void;
+    liveDispose: () => void;
     sendMsgFunc: (bot: Bot<Context, any>, channelId: string, content: any) => Promise<void>;
     constructor(ctx: Context, config: ComRegister.Config);
     init(config: ComRegister.Config): Promise<void>;
-    splitMultiPlatformStr(str: string): Target;
     getBot(pf: string): Bot<Context, any>;
+    test_wordCloud(): Promise<void>;
     sendPrivateMsg(content: string): Promise<void>;
     sendPrivateMsgAndRebootService(): Promise<void>;
     sendPrivateMsgAndStopService(): Promise<void>;
@@ -59,17 +33,11 @@ declare class ComRegister {
         userface: string;
         target: Target;
         data: any;
-    }, liveType: LiveType, liveNotifyMsg?: string): Promise<void>;
-    useMasterInfo(uid: string): Promise<{
-        username: string;
-        userface: string;
-        roomId: number;
-    }>;
+    }, liveType: LiveType, followerDisplay: string, liveNotifyMsg?: string): Promise<void>;
+    useMasterInfo(uid: string, masterInfo: MasterInfo, liveType: LiveType): Promise<MasterInfo>;
     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(): void;
     checkIfLoginInfoIsLoaded(): Promise<unknown>;
     subUserInBili(mid: string): Promise<{
@@ -77,12 +45,8 @@ declare class ComRegister {
         msg: string;
     }>;
     loadSubFromConfig(subs: ComRegister.Config["sub"]): Promise<void>;
-    loadSubFromDatabase(): Promise<void>;
     checkIfDynamicDetectIsNeeded(): void;
     enableDynamicDetect(): void;
-    unsubSingle(id: string, type: number): string;
-    checkIfUserIsTheLastOneWhoSubDyn(): void;
-    unsubAll(uid: string): void;
     checkIfIsLogin(): Promise<boolean>;
 }
 declare namespace ComRegister {
@@ -96,7 +60,7 @@ declare namespace ComRegister {
                     channelId: string;
                     dynamic: boolean;
                     live: boolean;
-                    liveDanmaku: boolean;
+                    liveGuardBuy: boolean;
                     atAll: boolean;
                 }>;
                 platform: string;
@@ -108,8 +72,8 @@ declare namespace ComRegister {
             masterAccount: string;
             masterAccountGuildId: string;
         };
-        unlockSubLimits: boolean;
         automaticResend: boolean;
+        liveDetectMode: "API" | "WS";
         restartPush: boolean;
         pushTime: number;
         liveLoopTime: number;
@@ -118,7 +82,6 @@ declare namespace ComRegister {
         customLiveEnd: string;
         dynamicUrl: boolean;
         dynamicLoopTime: number;
-        dynamicCheckNumber: number;
         filter: {
             enable: boolean;
             notify: boolean;