koishi-plugin-bilibili-notify 2.0.0-alpha.2 → 2.0.0-alpha.21

package/lib/biliAPI.d.ts

@@ -26,6 +26,7 @@ declare class BiliAPI extends Service {
     }): Promise<string>;
     encrypt(text: string): string;
     decrypt(text: string): string;
+    getLiveRoomInfoStreamKey(roomId: string): Promise<any>;
     getServerUTCTime(): Promise<number>;
     getTimeNow(): Promise<any>;
     getAllGroup(): Promise<any>;
@@ -36,6 +37,7 @@ declare class BiliAPI extends Service {
     getAllDynamic(updateBaseline?: string): Promise<any>;
     hasNewDynamic(updateBaseline: string): Promise<any>;
     follow(fid: string): Promise<any>;
+    getRelationGroupDetail(tagid: string): Promise<any>;
     getCookieInfo(refreshToken: string): Promise<any>;
     getUserInfo(mid: string): Promise<any>;
     getWbiKeys(): Promise<{
@@ -52,6 +54,7 @@ declare class BiliAPI extends Service {
     createNewClient(): void;
     getTimeOfUTC8(): number;
     getCookies(): string;
+    getCookiesForHeader(): Promise<string>;
     getLoginInfoIsLoaded(): boolean;
     getLoginInfoFromDB(): Promise<{
         cookies: any;

package/lib/biliAPI.js

@@ -40,6 +40,9 @@ const CREATE_GROUP = 'https://api.bilibili.com/x/relation/tag/create';
 const MODIFY_GROUP_MEMBER = 'https://api.bilibili.com/x/relation/tags/addUsers';
 const GET_ALL_GROUP = 'https://api.bilibili.com/x/relation/tags';
 const COPY_USER_TO_GROUP = 'https://api.bilibili.com/x/relation/tags/copyUsers';
+const GET_RELATION_GROUP_DETAIL = 'https://api.bilibili.com/x/relation/tag';
+// 直播
+const GET_LIVE_ROOM_INFO_STREAM_KEY = 'https://api.live.bilibili.com/xlive/web-room/v1/index/getDanmuInfo';
 class BiliAPI extends koishi_1.Service {
     static inject = ['database', 'notifier'];
     jar;
@@ -102,6 +105,17 @@ class BiliAPI extends koishi_1.Service {
         return decrypted.toString();
     }
     // BA API
+    async getLiveRoomInfoStreamKey(roomId) {
+        try {
+            // 获取直播间信息流密钥
+            const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO_STREAM_KEY}?id=${roomId}`);
+            // 返回data
+            return data;
+        }
+        catch (e) {
+            throw new Error('网络异常，本次请求失败！');
+        }
+    }
     async getServerUTCTime() {
         try {
             const { data } = await this.client.get(GET_SERVER_UTC_TIME);
@@ -240,6 +254,15 @@ class BiliAPI extends koishi_1.Service {
             throw new Error('网络异常，本次请求失败！');
         }
     }
+    async getRelationGroupDetail(tagid) {
+        try {
+            const { data } = await this.client.get(`${GET_RELATION_GROUP_DETAIL}?tagid=${tagid}`);
+            return data;
+        }
+        catch (e) {
+            throw new Error('网络异常，本次请求失败！');
+        }
+    }
     // Check if Token need refresh
     async getCookieInfo(refreshToken) {
         try {
@@ -352,6 +375,21 @@ class BiliAPI extends koishi_1.Service {
         const cookies = JSON.stringify(this.jar.serializeSync().cookies);
         return cookies;
     }
+    async getCookiesForHeader() {
+        try {
+            // 获取cookies对象
+            const cookies = this.jar.serializeSync().cookies;
+            // 将每个 cookie 对象转换为 "key=value" 形式，并用 "; " 连接起来
+            const cookieHeader = cookies
+                .map(cookie => `${cookie.key}=${cookie.value}`)
+                .join('; ');
+            return cookieHeader;
+        }
+        catch (e) {
+            console.error("无效的 JSON 格式：", e);
+            return "";
+        }
+    }
     getLoginInfoIsLoaded() {
         return this.loginInfoIsLoaded;
     }

package/lib/blive.d.ts

@@ -0,0 +1,9 @@
+import { Context, Logger } from "koishi";
+declare class BLive {
+    static inject: string[];
+    ctx: Context;
+    logger: Logger;
+    constructor(ctx: Context);
+    startLiveRoomListener(roomId: number): Promise<void>;
+}
+export default BLive;

package/lib/blive.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const blive_message_listener_1 = require("blive-message-listener");
+class BLive {
+    // 必要服务
+    static inject = ['ba'];
+    // 定义类属性
+    ctx;
+    logger;
+    constructor(ctx) {
+        // 将ctx赋值给类属性
+        this.ctx = ctx;
+        // 创建logger
+        this.logger = ctx.logger('bl');
+        // TEST
+        ctx.setTimeout(() => {
+            this.startLiveRoomListener(732);
+        }, 1000);
+    }
+    async startLiveRoomListener(roomId) {
+        // 获取cookieStr
+        const cookiesStr = await this.ctx.ba.getCookiesForHeader();
+        // 构建消息处理函数
+        const handler = {
+            onOpen: () => {
+                this.logger.info('服务器连接成功');
+            },
+            onClose: () => {
+                this.logger.info('服务器连接已断开');
+            },
+            onIncomeDanmu: (msg) => {
+                console.log(msg.id, msg.body);
+            },
+            onIncomeSuperChat: (msg) => {
+                console.log(msg.id, msg.body);
+            }
+        };
+        // 获取自身信息
+        const mySelfInfo = await this.ctx.ba.getMyselfInfo();
+        // 创建实例
+        (0, blive_message_listener_1.startListen)(roomId, handler, {
+            ws: {
+                headers: {
+                    Cookie: cookiesStr
+                },
+                uid: mySelfInfo.data.mid
+            }
+        });
+    }
+}
+exports.default = BLive;

package/lib/comRegister.d.ts

@@ -1,10 +1,22 @@
-import { Bot, Context, Logger, Schema, Session } from "koishi";
+import { Bot, Context, FlatPick, Logger, Schema, Session } from "koishi";
 import { Notifier } from "@koishijs/plugin-notifier";
+import { LoginBili } from "./database";
+type ChannelIdArr = Array<{
+    channelId: string;
+    dynamic: boolean;
+    live: boolean;
+    atAll: boolean;
+}>;
+type TargetItem = {
+    channelIdArr: ChannelIdArr;
+    platform: string;
+};
+type Target = Array<TargetItem>;
 type SubItem = {
     id: number;
     uid: string;
     roomId: string;
-    targetIdArr: Array<string>;
+    target: Target;
     platform: string;
     live: boolean;
     dynamic: boolean;
@@ -13,6 +25,7 @@ type SubItem = {
 type SubManager = Array<SubItem>;
 declare class ComRegister {
     static inject: string[];
+    qqRelatedBotList: Array<string>;
     logger: Logger;
     config: ComRegister.Config;
     loginTimer: Function;
@@ -20,44 +33,68 @@ declare class ComRegister {
     rebootCount: number;
     subNotifier: Notifier;
     subManager: SubManager;
-    bot: Bot<Context>;
+    loginDBData: FlatPick<LoginBili, "dynamic_group_id">;
+    privateBot: Bot<Context>;
     dynamicDispose: Function;
-    sendMsgFunc: (guild: string, content: any) => Promise<void>;
+    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>;
+    splitMultiPlatformStr(str: string): Target;
+    getBot(ctx: Context, pf: string): Bot<Context, any>;
     sendPrivateMsg(content: string): Promise<void>;
     sendPrivateMsgAndRebootService(ctx: Context): Promise<void>;
     sendPrivateMsgAndStopService(ctx: Context): Promise<void>;
-    sendMsg(targets: Array<string>, content: any): Promise<void>;
+    sendMsg(ctx: Context, targets: Target, content: any, live?: boolean): Promise<void>;
     dynamicDetect(ctx: Context): () => Promise<void>;
     debug_dynamicDetect(ctx: Context): () => Promise<void>;
-    liveDetect(ctx: Context, roomId: string, guildId: Array<string>): () => Promise<void>;
+    liveDetect(ctx: Context, roomId: string, target: Target): () => Promise<void>;
     subShow(): string;
-    checkIfNeedSub(liveSub: boolean, dynamicSub: boolean, session: Session, data?: any): Promise<Array<boolean>>;
+    checkIfNeedSub(liveSub: boolean, dynamicSub: boolean, session: Session, liveRoomData: any): Promise<Array<boolean>>;
     updateSubNotifier(ctx: Context): void;
     checkIfLoginInfoIsLoaded(ctx: Context): Promise<unknown>;
-    getSubFromDatabase(ctx: Context): Promise<void>;
+    subUserInBili(ctx: Context, 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;
-    checkIfUserThatIsSubDynAndUnsub(): void;
+    checkIfUserIsTheLastOneWhoSubDyn(): void;
     unsubAll(ctx: Context, uid: string): void;
     checkIfIsLogin(ctx: Context): Promise<boolean>;
 }
 declare namespace ComRegister {
     interface Config {
-        platform: string;
+        sub: Array<{
+            uid: string;
+            dynamic: boolean;
+            live: boolean;
+            target: Array<{
+                channelIdArr: Array<{
+                    channelId: string;
+                    dynamic: boolean;
+                    live: boolean;
+                    atAll: boolean;
+                }>;
+                platform: string;
+            }>;
+        }>;
         master: {
             enable: boolean;
+            platform: string;
             masterAccount: string;
             masterAccountGuildId: string;
         };
         unlockSubLimits: boolean;
         automaticResend: boolean;
         changeMasterInfoApi: boolean;
-        liveStartAtAll: boolean;
         restartPush: boolean;
-        pushUrl: boolean;
         pushTime: number;
         liveLoopTime: number;
         customLiveStart: string;
+        customLive: string;
         customLiveEnd: string;
         dynamicUrl: boolean;
         dynamicLoopTime: number;