floating-live 0.13.0 → 0.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "floating-live",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "type": "commonjs",
   "main": "index.js",
   "types": "index.d.ts",

package/plugin/bilibili/index.js

@@ -4,13 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 const room_1 = __importDefault(require("./room"));
 const authConfig = {
-    warn: "由于b站弹幕接口限制，在未登录账号的情况下，返回的弹幕用户名会变为星号且无法获取到uid。\n详见(github:simon300000/bilibili-live-ws#397)[https://github.com/simon300000/bilibili-live-ws/issues/397]",
+    info: "由于b站弹幕接口限制，在未登录账号的情况下，返回的弹幕用户名会变为星号且无法获取到uid。\n详见(github:simon300000/bilibili-live-ws#397)[https://github.com/simon300000/bilibili-live-ws/issues/397]",
     auth: {
         placeholder: "此处粘贴cookie",
         info: "请在登录后的b站页面中获取cookie并粘贴在输入框内，至少包含SESSDATA字段。",
     },
     qrcode: {
-        generate: () => { },
+    //  generate: () => {},
     },
     // verify: { name: "key", type: "string" },
 };
@@ -21,7 +21,7 @@ module.exports = () => {
             ctx.rooms.generator.register("bilibili", (id, open, config) => {
                 return new room_1.default(Number(id), open, config);
             });
-            ctx.auth;
+            ctx.auth.options.register("bilibili", authConfig);
         },
     };
 };

package/plugin/bilibili/parser.js

@@ -234,7 +234,7 @@ const parseFunction = {
             id: msg_id,
             timestamp: send_time || getDateTimestamp(),
             info: {
-                watch: data.num,
+                view: data.num,
             },
         };
         stats.id ?? (stats.id = (0, utils_1.generateId)(stats));
@@ -381,7 +381,7 @@ function parseInfo(data) {
             avatar: anchor_info.base_info.face,
         },
         stats: {
-            watch: watched_show.num,
+            view: watched_show.num,
             like: like_info_v3.total_likes,
         },
         liveId: room_info.live_id_str,

package/plugin/bilibili/room.js

@@ -51,7 +51,7 @@ class RoomBilibili extends LiveRoom_1.LiveRoom {
         };
         this.stats = {
             /** 观看数 */
-            watch: 0,
+            view: 0,
             /** 点赞数 */
             like: 0,
         };
@@ -98,7 +98,7 @@ class RoomBilibili extends LiveRoom_1.LiveRoom {
             this.detail.title = room_info.title;
             this.detail.area = [room_info.parent_area_name, room_info.area_name];
             this.detail.cover = room_info.cover;
-            this.stats.watch = watched_show.num;
+            this.stats.view = watched_show.num;
             this.stats.like = like_info_v3.total_likes;
             this.anchor.id = room_info.uid;
             this.anchor.name = anchor_info.base_info.uname;

package/src/abstract/LiveRoom.d.ts

@@ -32,7 +32,7 @@ export declare abstract class LiveRoom extends EventEmitter implements RoomInfo
     /** 关闭连接 */
     abstract close(): void;
     /** 从服务器获取信息 */
-    abstract getInfo(): void;
+    abstract getInfo(): Promise<void>;
     /** 销毁事件 */
     protected onDestory?(): void;
     /** 销毁 */

package/src/abstract/Reglist.d.ts

@@ -18,6 +18,8 @@ export declare class Reglist<T> {
     get(id: string): T | undefined;
     /** 获取注册对象列表 */
     getList(): T[];
+    /** 遍历 */
+    forEach(callbackfn: (value: T, key: string) => void): void;
     /** 获取注册id列表 */
     getIdList(): string[];
     /** 获取注册id列表 */

package/src/abstract/Reglist.js

@@ -49,6 +49,10 @@ class Reglist {
     getList() {
         return [...this.list.values()];
     }
+    /** 遍历 */
+    forEach(callbackfn) {
+        this.list.forEach(callbackfn);
+    }
     /** 获取注册id列表 */
     getIdList() {
         return [...this.list.keys()];

package/src/index.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="node" />
 import { EventEmitter } from "events";
-import { Reglist } from "./abstract/Reglist";
-import { Message } from "./types";
 import { ModPlugin } from "./module/ModPlugin";
 import { ModRooms } from "./module/ModRooms";
 import { ModAuth } from "./module/ModAuth";
 import { ModMessage } from "./module/ModMessage";
+import { ModState } from "./module/ModState";
+import ModCommand from "./module/ModCommand";
 export declare class FloatingLive extends EventEmitter {
     /** 房间控制模块 */
     rooms: ModRooms;
@@ -15,16 +15,10 @@ export declare class FloatingLive extends EventEmitter {
     auth: ModAuth;
     /** 插件处理模块 */
     plugin: ModPlugin<this>;
-    helper: {
-        /** 消息处理 */
-        messageHandler: Reglist<(msg: Message.All) => void>;
-        /** 插件销毁 */
-        pluginDestory: Reglist<() => void>;
-        /** 添加插件 */
-        pluginAddHandler: Reglist<(name: string) => void>;
-        /** 移除插件 */
-        pluginRemoveHandler: Reglist<(name: string) => void>;
-    };
+    /** 命令模块 */
+    command: ModCommand;
+    /** 状态模块 */
+    state: ModState;
     /** 插件事件注册表 */
     private regEventMap;
     constructor();
@@ -32,4 +26,5 @@ export declare class FloatingLive extends EventEmitter {
     private init;
     /** 重写事件监听 */
     on(eventName: string, listener: (...args: any[]) => void): this;
+    emit(eventName: string | symbol, ...args: any[]): boolean;
 }

package/src/index.js

@@ -1,33 +1,33 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FloatingLive = void 0;
 const events_1 = require("events");
-const Reglist_1 = require("./abstract/Reglist");
 const ModPlugin_1 = require("./module/ModPlugin");
 const ModRooms_1 = require("./module/ModRooms");
 const ModAuth_1 = require("./module/ModAuth");
 const ModMessage_1 = require("./module/ModMessage");
+const ModState_1 = require("./module/ModState");
+const ModCommand_1 = __importDefault(require("./module/ModCommand"));
 class FloatingLive extends events_1.EventEmitter {
     constructor() {
         super();
         /** 插件事件注册表 */
         this.regEventMap = new Map();
-        this.helper = {
-            messageHandler: new Reglist_1.Reglist(this, "messageHandler"),
-            pluginDestory: new Reglist_1.Reglist(this, "pluginDestory"),
-            pluginAddHandler: new Reglist_1.Reglist(this, "pluginAddHandler"),
-            pluginRemoveHandler: new Reglist_1.Reglist(this, "pluginRemoveHandler"),
-        };
+        this.command = new ModCommand_1.default(this);
+        this.state = new ModState_1.ModState(this);
+        this.plugin = new ModPlugin_1.ModPlugin(this);
         this.rooms = new ModRooms_1.ModRooms(this);
         this.message = new ModMessage_1.ModMessage(this);
         this.auth = new ModAuth_1.ModAuth(this);
-        this.plugin = new ModPlugin_1.ModPlugin(this);
         this.init();
     }
     /** 初始化 */
     init() {
         // 设置在插件卸载时移除由插件注册的事件
-        this.helper.pluginRemoveHandler.register("removePluginEvent", (name) => {
+        this.on("plugin:remove", (name) => {
             this.regEventMap.get(name)?.forEach(([eventName, listener]) => {
                 this.removeListener(eventName, listener);
             });
@@ -47,5 +47,10 @@ class FloatingLive extends events_1.EventEmitter {
         }
         return this;
     }
+    emit(eventName, ...args) {
+        const result = super.emit(eventName, ...args);
+        super.emit("event", eventName, ...args);
+        return result;
+    }
 }
 exports.FloatingLive = FloatingLive;

package/src/module/ModAuth.js

@@ -6,9 +6,23 @@ class ModAuth {
     constructor(main) {
         this.options = new Reglist_1.Reglist(main, "auth.options");
         this.main = main;
+        this.main.state.register("auth", () => {
+            const options = {};
+            this.options.forEach((val, key) => {
+                options[key] = val;
+            });
+            return {
+                options: options,
+            };
+        });
+        this.main.command.batchRegister({
+            auth: (platform, auth) => {
+                this.set(platform, auth);
+            },
+        });
     }
     set(name, auth) {
-        return this.main.rooms.setAuth(name, auth);
+        this.main.rooms.setAuth(name, auth);
     }
 }
 exports.ModAuth = ModAuth;

package/src/module/ModCommand.d.ts

@@ -1,3 +1,9 @@
+import { FloatingLive } from "..";
 import { Reglist } from "../abstract/Reglist";
-export default class ModCommand extends Reglist<(e: any, ...args: any) => void> {
+export default class ModCommand extends Reglist<(e: any, ...args: any[]) => any> {
+    constructor(main: FloatingLive);
+    /** 批量注册命令 */
+    batchRegister(list: Record<string, (...args: any) => any>): void;
+    /** 执行命令 */
+    execute(name: string, ...args: any[]): any;
 }

package/src/module/ModCommand.js

@@ -2,5 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const Reglist_1 = require("../abstract/Reglist");
 class ModCommand extends Reglist_1.Reglist {
+    constructor(main) {
+        super(main, "command");
+    }
+    /** 批量注册命令 */
+    batchRegister(list) {
+        for (const key in list) {
+            this.register(key, list[key]);
+        }
+    }
+    /** 执行命令 */
+    execute(name, ...args) {
+        return this.get(name)?.(null, ...args);
+    }
 }
 exports.default = ModCommand;

package/src/module/ModMessage.js

@@ -7,6 +7,10 @@ class ModMessage {
         this.main = main;
         this.handler = new Reglist_1.Reglist(main, "message.handler");
     }
-    handle(msg) { }
+    handle(msg) {
+        this.handler.getList().forEach((handler) => {
+            handler(msg);
+        });
+    }
 }
 exports.ModMessage = ModMessage;

package/src/module/ModPlugin.d.ts

@@ -6,17 +6,15 @@ export declare class ModPlugin<T extends FloatingLive> {
     private list;
     private pluginEvent;
     private main;
-    private helper;
+    private exports;
     constructor(main: T);
     /** 获取当前安装插件 */
     get currentPlugin(): string | null;
     addPluginEvent(eventName: string, listener: (...args: any[]) => void): void;
-    /** 获取插件操作对象 */
-    get(name: string): {
-        [key: string]: any;
-    } | undefined;
+    /** 访问插件操作对象 */
+    access(name: string): object | undefined;
     /** 注册插件 */
-    register(plugin: FloatingLivePlugin<T>): void | object;
+    register(pluginFunc: FloatingLivePlugin<T>): object | undefined;
     /** 移除插件 */
     unregister(name: string): void;
 }

package/src/module/ModPlugin.js

@@ -7,8 +7,8 @@ class ModPlugin {
         /** 插件列表 */
         this.list = new Map();
         this.pluginEvent = new Map();
+        this.exports = new Map();
         this.main = main;
-        this.helper = main.helper;
     }
     /** 获取当前安装插件 */
     get currentPlugin() {
@@ -22,62 +22,41 @@ class ModPlugin {
             this.pluginEvent.get(this.currentPlugin)?.push([eventName, listener]);
         }
     }
-    /** 获取插件操作对象 */
-    get(name) {
-        return this.list.get(name);
+    /** 访问插件操作对象 */
+    access(name) {
+        return this.exports.get(name);
     }
     /** 注册插件 */
-    register(plugin) {
+    register(pluginFunc) {
         // 执行插件函数
-        let pluginObject = plugin();
-        const name = pluginObject.name;
+        const plugin = pluginFunc();
+        const name = plugin.name;
         if (this.list.has(name)) {
             this.main.emit("plugin:duplicate", name);
             return;
         }
+        this.list.set(name, plugin);
         this.current = name;
-        // 如果插件register函数无法调用，则无法注册插件
-        if (typeof pluginObject.register != "function") {
-            this.main.emit("plugin:invalid", name);
-            this.current = null;
-            return;
-        }
-        let pluginExpose = pluginObject.register(this.main);
-        this.list.set(name, pluginExpose || {});
-        // 执行钩子函数
-        this.helper.pluginAddHandler.getList().forEach((handler) => {
-            handler(name);
-        });
+        // 调用register函数，并保存获取值
+        let pluginExpose = plugin.register?.(this.main) || {};
+        this.exports.set(name, pluginExpose);
         this.main.emit("plugin:add", name);
         this.current = null;
         return pluginExpose;
     }
     /** 移除插件 */
     unregister(name) {
+        const plugin = this.list.get(name);
         // 检测插件是否存在
-        if (!this.list.has(name)) {
+        if (!plugin) {
             this.main.emit("plugin:unexist", name);
             return;
         }
         // 获取该插件的销毁函数
-        let destroyFunc = this.helper.pluginDestory
-            .getIdByPlugin(name)
-            .map((id) => this.helper.pluginDestory.get(id));
+        plugin.destroy?.();
         // 从列表中移除插件
         this.list.delete(name);
-        // 移除helper注册
-        this.helper.messageHandler.unregister(name);
-        this.helper.pluginAddHandler.unregister(name);
-        this.helper.pluginRemoveHandler.unregister(name);
-        this.helper.pluginDestory.unregister(name);
-        // 执行钩子函数
-        this.helper.pluginRemoveHandler.getList().forEach((handler) => {
-            handler(name);
-        });
-        // 执行销毁函数
-        destroyFunc.forEach((handler) => {
-            handler?.();
-        });
+        // 移除插件注册
         this.main.emit("plugin:remove", name);
     }
 }

package/src/module/ModRooms.d.ts

@@ -1,6 +1,7 @@
 import { Reglist } from "../abstract/Reglist";
 import { LiveRoom } from "../abstract/LiveRoom";
 import { FloatingLive } from "..";
+import { RoomInfo } from "../types";
 /** 直播间监听实例控制器 */
 export declare class ModRooms {
     readonly main: FloatingLive;
@@ -24,7 +25,7 @@ export declare class ModRooms {
     /** 获取房间 */
     get(roomKey: string): LiveRoom | undefined;
     /** 获取房间信息 */
-    info(roomKey: string): import("../types").RoomInfo | undefined;
+    info(roomKey: string): RoomInfo | undefined;
     /** 更新房间信息 */
     update(roomKey: string): void;
     /** 获取roomKey列表 */

package/src/module/ModRooms.js

@@ -10,6 +10,30 @@ class ModRooms {
         this.configs = new Map();
         this.main = main;
         this.generator = new Reglist_1.Reglist(this.main, "rooms.generator");
+        this.main.state.register("rooms", () => {
+            const list = [];
+            this.roomMap.forEach((room) => {
+                list.push(room.info);
+            });
+            return list;
+        });
+        this.main.command.batchRegister({
+            add: (platform, id, open) => {
+                this.add(platform, id, open);
+            },
+            remove: (key) => {
+                this.remove(key);
+            },
+            open: (key) => {
+                this.open(key);
+            },
+            close: (key) => {
+                this.close(key);
+            },
+            update: (key) => {
+                this.update(key);
+            },
+        });
     }
     /** 设置登录凭据 */
     setAuth(platform, auth) {
@@ -43,9 +67,7 @@ class ModRooms {
         // 添加监听事件
         // 直播消息
         room.on("msg", (data) => {
-            this.main.helper.messageHandler.getList().forEach((handler) => {
-                handler(data);
-            });
+            this.main.message.handle(data);
             this.main.emit("live:message", data);
         });
         // 直播消息源数据

package/src/module/ModState.d.ts

@@ -0,0 +1,6 @@
+import { FloatingLive } from "..";
+import { Reglist } from "../abstract/Reglist";
+export declare class ModState extends Reglist<() => object> {
+    constructor(main: FloatingLive);
+    generate(): Record<string, any>;
+}

package/src/module/ModState.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModState = void 0;
+const Reglist_1 = require("../abstract/Reglist");
+class ModState extends Reglist_1.Reglist {
+    constructor(main) {
+        super(main, "state");
+    }
+    generate() {
+        const state = {};
+        this.forEach((gen, key) => {
+            state[key] = gen();
+        });
+        return state;
+    }
+}
+exports.ModState = ModState;

package/src/types/room.d.ts

@@ -40,7 +40,7 @@ export declare type RoomStatsInfo = {
     /** 点赞数 */
     like?: number;
     /** 观看数 */
-    watch?: number;
+    view?: number;
     /** 在线人数 */
     online?: number;
     /** 人气值 */