floating-live 0.8.7 → 0.9.0

package/src/{controller → module}/Room.js

@@ -1,15 +1,11 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const getRoomInfo_1 = __importDefault(require("../utils/getRoomInfo"));
+exports.RoomController = void 0;
 /** 直播间监听实例控制器 */
-class Room {
-    constructor(controller) {
+class RoomController {
+    constructor(main) {
         this.roomMap = new Map();
-        this.controller = controller;
-        this.main = controller.main;
+        this.main = main;
     }
     generate(r, open) {
         let platform;
@@ -25,7 +21,8 @@ class Room {
         }
     }
     /** 添加房间监听对象 */
-    add(key, room, open) {
+    add(room, open) {
+        let key = room.key;
         if (this.roomMap.has(key)) {
             this.main.emit("room_exist", key);
             return;
@@ -34,7 +31,10 @@ class Room {
         // 添加监听事件
         // 直播消息
         room.on("msg", (data) => {
-            this.controller.message.send(data);
+            this.main.helper.messageHandler.getList().forEach((handler) => {
+                handler(data);
+            });
+            this.main.emit("live_message", data);
         });
         // 直播消息源数据
         room.on("origin", (data) => {
@@ -50,24 +50,32 @@ class Room {
         });
         // 获取房间信息
         room.on("info", () => {
-            this.main.emit("room_info", key, (0, getRoomInfo_1.default)(room));
+            this.main.emit("room_info", key, room.info);
         });
         // 直播信息更改
         room.on("change", (data) => {
             this.main.emit("room_change", key, data);
         });
+        // 直播状态更改
+        room.on("status", (status, timestamp) => {
+            this.main.emit("room_status", key, status, timestamp);
+        });
+        // 统计数据更新
+        room.on("stats", (data) => {
+            this.main.emit("room_stats", key, data);
+        });
         // 房间被打开
         room.on("open", () => {
-            this.main.emit("room_open", key, (0, getRoomInfo_1.default)(room));
+            this.main.emit("room_open", key, room.info);
         });
         // 房间被关闭
         room.on("close", () => {
-            this.main.emit("room_close", key, (0, getRoomInfo_1.default)(room));
+            this.main.emit("room_close", key, room.info);
         });
         if (open) {
             room.open();
         }
-        this.main.emit("room_add", key, (0, getRoomInfo_1.default)(room));
+        this.main.emit("room_add", key, room.info);
     }
     /** 移除房间 */
     remove(roomKey) {
@@ -87,7 +95,7 @@ class Room {
     /** 获取房间信息 */
     info(roomKey) {
         let room = this.roomMap.get(roomKey);
-        return room ? (0, getRoomInfo_1.default)(room) : undefined;
+        return room ? room.info : undefined;
     }
     /** 更新房间信息 */
     update(roomKey) {
@@ -107,4 +115,4 @@ class Room {
         room?.opening && room.close();
     }
 }
-exports.default = Room;
+exports.RoomController = RoomController;

package/src/types/message/AttributeInfo.d.ts

@@ -8,10 +8,10 @@ export interface UserInfo {
     avatar?: string;
     /** 粉丝勋章 */
     medal?: MedalInfo | null;
-    /** 房管等级(1为主播, 2为管理员) */
-    admin?: number;
+    /** 身份 */
+    identity?: "anchor" | "admin" | null;
     /** 粉丝vip等级 */
-    privilege?: boolean | number;
+    membership?: boolean | number;
     /** vip等级 */
     vip?: boolean | number;
     /** 用户等级 */
@@ -26,7 +26,7 @@ export interface MedalInfo {
     /** 粉丝牌等级 */
     level?: number;
     /** 粉丝vip等级 */
-    privilege?: number;
+    membership?: number;
 }
 /** 图像信息 */
 export interface ImageInfo {

package/src/types/message/MessageData.d.ts

@@ -1,6 +1,6 @@
-import { MessageInfo, MsgInfoBlock, MsgInfoGift, MsgInfoImage, MsgInfoInteract, MsgInfoPrivilege, MsgInfoSuperchat, MsgInfoText } from "./MessageInfo";
-import { LiveStats } from "../room/LiveInfo";
-export interface MessageData {
+import { RoomBaseInfo, RoomStatsInfo, RoomStatus } from "../../lib/LiveRoom";
+import { UserInfo, GiftInfo, ImageInfo } from "./AttributeInfo";
+export interface MessageInterface {
     /** 平台名称 */
     platform: string;
     /** 房间号 */
@@ -8,73 +8,155 @@ export interface MessageData {
     /** 信息类型 */
     type: string;
     /** 数据信息 */
-    info: MessageInfo;
-    /** 本地时间戳 */
-    local_timestamp?: number;
+    info: {
+        [attr: string]: any;
+    };
+    /** 记录时间 */
+    record_time: number;
     /** 其他属性 */
     [attr: string]: any;
 }
-export interface MessageText extends MessageData {
-    type: "text";
-    info: MsgInfoText;
-}
-/** 图片聊天消息 */
-export interface MessageImage extends MessageData {
-    type: "image";
-    info: MsgInfoImage;
-}
+export declare type MessageExt<T extends MessageInterface, E extends {
+    [attr: string]: any;
+} = {
+    [attr: string]: any;
+}> = T & {
+    info: E;
+};
+/** 文本聊天消息 */
+export declare type MessageChat = MessageInterface & {
+    type: "chat";
+    info: {
+        /** 用户信息 */
+        user: UserInfo;
+        /** 日期时间戳 */
+        timestamp: number;
+        /** 文本内容 */
+        content: string;
+        /** 文字颜色 */
+        color?: number | string;
+        /** 弹幕模式 */
+        mode?: number | string;
+        /** 文字大小 */
+        size?: number | string;
+        /** 图片信息 */
+        image?: ImageInfo;
+        /** 表情信息 */
+        emoticon?: ImageInfo;
+    };
+};
 /** 礼物消息 */
-export interface MessageGift extends MessageData {
+export declare type MessageGift = MessageInterface & {
     type: "gift";
-    info: MsgInfoGift;
-}
+    info: {
+        /** 用户信息 */
+        user: UserInfo;
+        /** 日期时间戳 */
+        timestamp: number;
+        /** 礼物信息 */
+        gift: GiftInfo;
+    };
+};
 /** 互动消息(进入直播间、点赞、关注、分享、加入粉丝团) */
-export interface MessageInteract extends MessageData {
+export declare type MessageInteract = MessageInterface & {
     type: "entry" | "like" | "follow" | "share" | "join";
-    info: MsgInfoInteract;
-}
+    info: {
+        /** 用户信息 */
+        user: UserInfo;
+        /** 日期时间戳 */
+        timestamp: number;
+        /** 信息标签 */
+        tag?: string | boolean;
+    };
+};
 /** 粉丝vip开通消息 */
-export interface MessagePrivilege extends MessageData {
-    type: "privilege";
-    info: MsgInfoPrivilege;
-}
+export declare type MessageMembership = MessageInterface & {
+    type: "membership";
+    info: {
+        /** 用户信息 */
+        user: UserInfo;
+        /** 日期时间戳 */
+        timestamp: number;
+        /** 礼物信息 */
+        gift: GiftInfo;
+        /** 开通vip名称 */
+        name: string;
+        /** 开通vip等级 */
+        level?: number;
+        /** 持续时间(天数) */
+        duration: number;
+    };
+};
 /** 粉丝vip开通消息 */
-export interface MessageSuperchat extends MessageData {
+export declare type MessageSuperchat = MessageInterface & {
     type: "superchat";
-    info: MsgInfoSuperchat;
-}
+    info: {
+        /** 留言id */
+        id?: string;
+        /** 用户信息 */
+        user: UserInfo;
+        /** 日期时间戳 */
+        timestamp: number;
+        /** 文本内容 */
+        content: string;
+        /** 文字颜色 */
+        color?: number | string;
+        /** 礼物信息 */
+        gift: GiftInfo;
+        /** (SC)持续时间 */
+        duration: number;
+    };
+};
 /** 禁言消息 */
-export interface MessageBlock extends MessageData {
+export declare type MessageBlock = MessageInterface & {
     type: "block";
-    info: MsgInfoBlock;
-}
+    info: {
+        /** 用户信息 */
+        user: UserInfo;
+        /** 日期时间戳 */
+        timestamp?: number;
+        /** 操作者 */
+        operator: UserInfo | {
+            identity: null | "admin" | "anchor";
+        };
+    };
+};
 /** 直播开播消息 */
-export interface MessageLiveStart extends MessageData {
+export declare type MessageLiveStart = MessageInterface & {
     type: "live_start";
     info: {
         /** 开播时间 */
-        start_time: number;
+        timestamp: number;
     };
-}
+};
 /** 直播切断消息 */
-export interface MessageLiveCut extends MessageData {
+export declare type MessageLiveCut = MessageInterface & {
     type: "live_cut";
     info: {
         /** 切断消息 */
         message: string;
     };
-}
+};
 /** 直播数据更新 */
-export interface MessageLiveStats extends MessageData {
+export declare type MessageLiveStats = MessageInterface & {
     type: "live_stats";
-    info: LiveStats;
-}
+    info: RoomStatsInfo;
+};
+/** 直播信息更新 */
+export declare type MessageLiveChange = MessageInterface & {
+    type: "live_change";
+    info: RoomBaseInfo;
+};
 /** 直播结束 */
-export interface MessageLiveEnd extends MessageData {
+export declare type MessageLiveEnd = MessageInterface & {
     type: "live_end";
     info: {
         /** 直播状态 */
-        status: "live" | "off" | "round" | "banned";
+        status: RoomStatus;
     };
-}
-export declare type MessageType = MessageText | MessageImage | MessageGift | MessageInteract | MessagePrivilege | MessageSuperchat | MessageBlock | MessageLiveStart | MessageLiveCut | MessageLiveStats | MessageLiveEnd;
+};
+declare type AllMessageType = MessageChat | MessageGift | MessageInteract | MessageMembership | MessageSuperchat | MessageBlock | MessageLiveStart | MessageLiveEnd | MessageLiveCut | MessageLiveChange | MessageLiveStats;
+export declare type MessageData<T extends AllMessageType["type"] = AllMessageType["type"]> = AllMessageType & {
+    type: T;
+};
+export {};

package/src/types/plugin/Plugin.d.ts

@@ -1,3 +1,5 @@
-import FloatingLive from "../..";
+import { FloatingLive } from "../..";
 /** 插件模块, 加载时调用 */
-export declare type FloatingLivePlugin<T = void> = (ctx: FloatingLive) => T;
+export declare type FloatingLivePlugin<T extends FloatingLive = FloatingLive> = (ctx: T) => {
+    [key: string]: any;
+} | void;

package/src/types/room/PlatformInfo.d.ts

@@ -13,7 +13,7 @@ export interface PlatformInfo {
         level?: string[];
     };
     /** 粉丝vip信息 */
-    privilege: {
+    membership: {
         /** 粉丝vip对应id */
         id: string;
         /** 粉丝vip名称 */

package/plugin/chat/ChatCommand.d.ts

@@ -1,9 +0,0 @@
-import { MessageData } from "../../src/types/message/MessageData";
-import ChatProcessor from "./chatProcessor";
-declare class ChatCommand {
-    chatProcessor: ChatProcessor;
-    filterList: any[];
-    constructor(chatProcessor: ChatProcessor, filterList: any[]);
-    process(msg: MessageData): void;
-}
-export default ChatCommand;

package/plugin/chat/ChatCommand.js

@@ -1,39 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class ChatCommand {
-    constructor(chatProcessor, filterList) {
-        this.chatProcessor = chatProcessor;
-        this.filterList = filterList;
-    }
-    process(msg) {
-        if (msg.type == "text" && !msg.block) {
-            let text = msg.info.text;
-            let filterList = this.filterList;
-            for (let g = 0; g < filterList.length; g++) {
-                let rule = filterList[g];
-                if (rule.pattern.test(text)) {
-                    let command = {
-                        platform: msg.platform,
-                        type: "command",
-                        command: rule.command,
-                        timestamp: msg.local_timestamp,
-                        info: {
-                            type: "text",
-                            user: msg.info.user,
-                        },
-                        data: {},
-                    };
-                    if (rule.callback) {
-                        rule.callback(msg, command, rule.pattern);
-                    }
-                    msg.command = {
-                        command: command.command,
-                        data: command.data
-                    };
-                    this.chatProcessor.emit("command", command);
-                }
-            }
-        }
-    }
-}
-exports.default = ChatCommand;

package/plugin/chat/ChatFilter.d.ts

@@ -1,9 +0,0 @@
-import { MessageData } from "../../src/types/message/MessageData";
-import ChatProcessor from "./ChatProcessor";
-declare class ChatFilter {
-    chatProcessor: ChatProcessor;
-    filterList: any[];
-    constructor(chatProcessor: ChatProcessor, filterList: any[]);
-    process(msg: MessageData): void;
-}
-export default ChatFilter;

package/plugin/chat/ChatFilter.js

@@ -1,44 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class ChatFilter {
-    constructor(chatProcessor, filterList) {
-        this.chatProcessor = chatProcessor;
-        this.filterList = filterList;
-    }
-    process(msg) {
-        if (msg.type == "text" && msg.info.text) {
-            let text = msg.info.text;
-            let filterList = this.filterList;
-            fgroup: for (let g = 0; g < filterList.length; g++) {
-                let group = filterList[g];
-                if (group.open) {
-                    for (let i = 0; i < group.keyword.length; i++) {
-                        if (text.includes(group.keyword[i])) {
-                            let keyword = group.keyword[i];
-                            msg.block = {
-                                type: group.type,
-                                name: group.name,
-                                keyword: keyword,
-                                mode: group.mode,
-                            };
-                            switch (group.mode) {
-                                case "hide": {
-                                    msg.block.reason = group.reason;
-                                    break;
-                                }
-                                case "replace": {
-                                    msg.block.reason = group.reason;
-                                    msg.block.replace = group.replace;
-                                    break;
-                                }
-                            }
-                            this.chatProcessor.emit("filter", msg);
-                            break fgroup;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-exports.default = ChatFilter;

package/plugin/chat/chatProcessor.d.ts

@@ -1,12 +0,0 @@
-/// <reference types="node" />
-import ChatFilter from "./ChatFilter";
-import ChatCommand from "./ChatCommand";
-import { EventEmitter } from "events";
-import { MessageData } from "../../src/types/message/MessageData";
-declare class ChatProcessor extends EventEmitter {
-    filter: ChatFilter;
-    command: ChatCommand;
-    constructor();
-    process(msg: MessageData): void;
-}
-export default ChatProcessor;

package/plugin/chat/chatProcessor.js

@@ -1,24 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const ChatFilter_1 = __importDefault(require("./ChatFilter"));
-const ChatCommand_1 = __importDefault(require("./ChatCommand"));
-const events_1 = require("events");
-let commandList = [];
-let filterList = [];
-class ChatProcessor extends events_1.EventEmitter {
-    constructor() {
-        super();
-        this.filter = new ChatFilter_1.default(this, filterList);
-        this.command = new ChatCommand_1.default(this, commandList);
-    }
-    process(msg) {
-        if (this.filter)
-            this.filter.process(msg);
-        if (this.command)
-            this.command.process(msg);
-    }
-}
-exports.default = ChatProcessor;

package/src/controller/Message.d.ts

@@ -1,9 +0,0 @@
-import Controller from ".";
-import FloatingLive from "..";
-import { MessageType } from "../types/message/MessageData";
-export default class Message {
-    readonly controller: Controller;
-    readonly main: FloatingLive;
-    constructor(controller: Controller);
-    send(msg: MessageType): void;
-}

package/src/controller/Message.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class Message {
-    constructor(controller) {
-        this.controller = controller;
-        this.main = controller.main;
-    }
-    send(msg) {
-        this.main.helper.messageHandler.getList().forEach((handler) => {
-            handler(msg);
-        });
-        this.main.emit("live_message", msg);
-    }
-}
-exports.default = Message;

package/src/controller/index.d.ts

@@ -1,39 +0,0 @@
-import FloatingLive from "..";
-import LiveRoom from "../types/room/LiveRoom";
-import Message from "./Message";
-import Room from "./Room";
-export default class Controller {
-    readonly main: FloatingLive;
-    /** room 控制模块 */
-    readonly room: Room;
-    /** message 控制模块 */
-    readonly message: Message;
-    /** 开始时间戳 */
-    timestamp: number;
-    /** 开始状态 */
-    started: boolean;
-    constructor(main: FloatingLive);
-    /** 开始 */
-    start(): void;
-    /** 结束 */
-    end(): void;
-    /** 添加房间 */
-    addRoom({ platform, id }: {
-        platform: string;
-        id: string | number;
-    }, open?: boolean): void;
-    /** 移除房间 */
-    removeRoom(roomKey: string): void;
-    /** 添加房间实例 */
-    addLiveRoom(key: string, room: LiveRoom): void;
-    /** 打开房间 */
-    openRoom(roomKey: string): void;
-    /** 关闭房间 */
-    closeRoom(roomKey: string): void;
-    /** 打开所有房间 */
-    openAllRooms(): void;
-    /** 关闭所有房间 */
-    closeAllRooms(): void;
-    /** 更新房间信息 */
-    updateRoomInfo(roomKey: string): void;
-}

package/src/controller/index.js

@@ -1,74 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const Message_1 = __importDefault(require("./Message"));
-const Room_1 = __importDefault(require("./Room"));
-class Controller {
-    constructor(main) {
-        /** 开始时间戳 */
-        this.timestamp = 0;
-        /** 开始状态 */
-        this.started = false;
-        this.main = main;
-        this.room = new Room_1.default(this);
-        this.message = new Message_1.default(this);
-        this.main.on("room_open", () => {
-            this.start();
-        });
-    }
-    /** 开始 */
-    start() {
-        this.started = true;
-        this.timestamp = new Date().valueOf();
-        this.main.emit("start", this.timestamp);
-    }
-    /** 结束 */
-    end() {
-        this.closeAllRooms();
-        this.started = false;
-        this.main.emit("end", this.timestamp);
-        this.timestamp = 0;
-    }
-    /** 添加房间 */
-    addRoom({ platform, id }, open) {
-        let generated = this.room.generate({ platform, id }, open);
-        if (generated) {
-            this.room.add(generated.key, generated.room);
-        }
-    }
-    /** 移除房间 */
-    removeRoom(roomKey) {
-        this.room.remove(roomKey);
-    }
-    /** 添加房间实例 */
-    addLiveRoom(key, room) {
-        this.room.add(key, room);
-    }
-    /** 打开房间 */
-    openRoom(roomKey) {
-        this.room.open(roomKey);
-    }
-    /** 关闭房间 */
-    closeRoom(roomKey) {
-        this.room.close(roomKey);
-    }
-    /** 打开所有房间 */
-    openAllRooms() {
-        this.room.keyList.forEach((key) => {
-            this.room.open(key);
-        });
-    }
-    /** 关闭所有房间 */
-    closeAllRooms() {
-        this.room.keyList.forEach((key) => {
-            this.room.close(key);
-        });
-    }
-    /** 更新房间信息 */
-    updateRoomInfo(roomKey) {
-        this.room.update(roomKey);
-    }
-}
-exports.default = Controller;