floating-live 0.15.9 → 0.15.11

package/dist/module/plugin.js

@@ -25,15 +25,16 @@ class ModPlugin {
                 pluginName: name,
             });
         }
+        const ctx = { name, options };
         return await this.main.hook
-            .call("plugin.register", { name, options })
+            .call("plugin.register", ctx)
             .then(async (res) => {
             if (!res)
                 return;
             // 执行插件函数
-            const plugin = new pluginFunc(this.main, options);
+            const plugin = new pluginFunc(this.main, ctx.options || {});
             // 调用插件的register钩子
-            await plugin.register?.(this.main, options);
+            await plugin.register?.(this.main, ctx.options || {});
             this.list.set(name, plugin);
             this.main.emit("plugin:add", name);
             return plugin;

package/dist/module/room.d.ts

@@ -3,7 +3,7 @@ import { FloatingLive } from "../live";
 import { RoomInfo } from "../types";
 /** 直播间监听实例控制器 */
 export declare class ModRoom {
-    private list;
+    private map;
     readonly main: FloatingLive;
     constructor(main: FloatingLive);
     /** 添加房间监听实例 */
@@ -11,22 +11,24 @@ export declare class ModRoom {
     /** 添加房间 */
     add(platform: string, id: number, options?: boolean | Record<string, any>): Promise<void>;
     /** 移除房间 */
-    remove(roomKey: string): void;
+    remove(key: string): void;
     /** 获取房间 */
-    get(roomKey: string): LiveRoom | undefined;
-    has(roomKey: string): boolean;
+    get(key: string): LiveRoom | undefined;
+    has(key: string): boolean;
     /** 获取房间信息 */
-    info(roomKey: string): RoomInfo | undefined;
+    info(key: string): RoomInfo | undefined;
     /** 更新房间信息 */
-    update(roomKey: string): void;
-    /** 获取roomKey列表 */
+    update(key: string): void;
+    /** 获取房间key列表 */
     get keys(): Array<string>;
+    /** 获取房间列表 */
+    getList(): Array<LiveRoom>;
     /** 打开房间连接 */
-    open(roomKey: string): void;
+    open(key: string): void;
     /** 关闭房间连接 */
-    close(roomKey: string): void;
+    close(key: string): void;
     /** 更改某个房间的顺序 */
-    move(roomKey: string, position: number): void;
+    move(key: string, position: number): void;
     /** 获取快照 */
     getSnapshot(): RoomInfo[];
 }

package/dist/module/room.js

@@ -4,7 +4,7 @@ exports.ModRoom = void 0;
 /** 直播间监听实例控制器 */
 class ModRoom {
     constructor(main) {
-        this.list = new Map();
+        this.map = new Map();
         this.main = main;
         const { command } = main;
         command.register("add", this.add.bind(this));
@@ -16,19 +16,20 @@ class ModRoom {
     /** 添加房间监听实例 */
     addRoom(room, open) {
         let key = room.key;
-        if (this.list.has(key)) {
+        if (this.map.has(key)) {
             this.main.throw({
                 message: "房间已存在",
                 id: "room:add_exist",
             });
             return;
         }
-        this.list.set(key, room);
+        this.map.set(key, room);
         // 添加监听事件
         // 直播消息
         room.on("message", (data) => {
+            const ctx = { message: data };
             this.main.hook.call("message", { message: data }).then((res) => {
-                res && this.main.emit("live:message", data);
+                res && this.main.emit("live:message", ctx.message);
             });
         });
         // 直播消息源数据
@@ -97,63 +98,67 @@ class ModRoom {
         }
     }
     /** 移除房间 */
-    remove(roomKey) {
-        let room = this.list.get(roomKey);
+    remove(key) {
+        let room = this.map.get(key);
         if (!room) {
             this.main.throw({
                 message: "房间不存在",
                 id: "room:remove_unexist",
             });
         }
-        this.list.delete(roomKey); // 从表中删除房间
+        this.map.delete(key); // 从表中删除房间
         room?.removeAllListeners(); // 移除房间监听实例
-        this.main.emit("room:remove", roomKey);
+        this.main.emit("room:remove", key);
     }
     /** 获取房间 */
-    get(roomKey) {
-        return this.list.get(roomKey);
+    get(key) {
+        return this.map.get(key);
     }
-    has(roomKey) {
-        return this.list.has(roomKey);
+    has(key) {
+        return this.map.has(key);
     }
     /** 获取房间信息 */
-    info(roomKey) {
-        let room = this.list.get(roomKey);
+    info(key) {
+        let room = this.map.get(key);
         return room ? room.info : undefined;
     }
     /** 更新房间信息 */
-    update(roomKey) {
-        let room = this.list.get(roomKey);
+    update(key) {
+        let room = this.map.get(key);
         room && room.getInfo();
     }
-    /** 获取roomKey列表 */
+    /** 获取房间key列表 */
     get keys() {
-        return [...this.list.keys()];
+        return [...this.map.keys()];
+    }
+    /** 获取房间列表 */
+    getList() {
+        return [...this.map.values()];
     }
     /** 打开房间连接 */
-    open(roomKey) {
-        let room = this.list.get(roomKey);
+    open(key) {
+        let room = this.map.get(key);
         room?.available && !room.opened && room.open();
     }
     /** 关闭房间连接 */
-    close(roomKey) {
-        let room = this.list.get(roomKey);
+    close(key) {
+        let room = this.map.get(key);
         room?.opened && room.close();
     }
     /** 更改某个房间的顺序 */
-    move(roomKey, position) {
-        const arr = [...this.list];
-        const index = arr.findIndex(([key]) => key == roomKey);
+    move(key, position) {
+        const arr = [...this.map];
+        const index = arr.findIndex(([k]) => k == key);
         if (index == -1)
             return;
         const [item] = arr.splice(index, 1);
         arr.splice(position, 0, item);
-        this.list = new Map(arr);
-        this.main.emit("room:move", roomKey, position);
+        this.map = new Map(arr);
+        this.main.emit("room:move", key, position);
     }
     /** 获取快照 */
     getSnapshot() {
-        return [...this.list.values()].map((room) => room.info);
+        return this.getList().map((room) => room.info);
     }
 }
 exports.ModRoom = ModRoom;

package/dist/module/value.js

@@ -19,7 +19,6 @@ class ModValue {
     unregister(name) {
         this.list.delete(name);
         this.main.emit("value:remove", name);
-        this.main.emit("value:change", name, undefined);
     }
     /** 获取值 */
     get(name) {

package/esm/module/plugin.js

@@ -22,15 +22,16 @@ export class ModPlugin {
                 pluginName: name,
             });
         }
+        const ctx = { name, options };
         return await this.main.hook
-            .call("plugin.register", { name, options })
+            .call("plugin.register", ctx)
             .then(async (res) => {
             if (!res)
                 return;
             // 执行插件函数
-            const plugin = new pluginFunc(this.main, options);
+            const plugin = new pluginFunc(this.main, ctx.options || {});
             // 调用插件的register钩子
-            await plugin.register?.(this.main, options);
+            await plugin.register?.(this.main, ctx.options || {});
             this.list.set(name, plugin);
             this.main.emit("plugin:add", name);
             return plugin;

package/esm/module/room.js

@@ -1,7 +1,7 @@
 /** 直播间监听实例控制器 */
 export class ModRoom {
     constructor(main) {
-        this.list = new Map();
+        this.map = new Map();
         this.main = main;
         const { command } = main;
         command.register("add", this.add.bind(this));
@@ -13,19 +13,20 @@ export class ModRoom {
     /** 添加房间监听实例 */
     addRoom(room, open) {
         let key = room.key;
-        if (this.list.has(key)) {
+        if (this.map.has(key)) {
             this.main.throw({
                 message: "房间已存在",
                 id: "room:add_exist",
             });
             return;
         }
-        this.list.set(key, room);
+        this.map.set(key, room);
         // 添加监听事件
         // 直播消息
         room.on("message", (data) => {
+            const ctx = { message: data };
             this.main.hook.call("message", { message: data }).then((res) => {
-                res && this.main.emit("live:message", data);
+                res && this.main.emit("live:message", ctx.message);
             });
         });
         // 直播消息源数据
@@ -94,62 +95,66 @@ export class ModRoom {
         }
     }
     /** 移除房间 */
-    remove(roomKey) {
-        let room = this.list.get(roomKey);
+    remove(key) {
+        let room = this.map.get(key);
         if (!room) {
             this.main.throw({
                 message: "房间不存在",
                 id: "room:remove_unexist",
             });
         }
-        this.list.delete(roomKey); // 从表中删除房间
+        this.map.delete(key); // 从表中删除房间
         room?.removeAllListeners(); // 移除房间监听实例
-        this.main.emit("room:remove", roomKey);
+        this.main.emit("room:remove", key);
     }
     /** 获取房间 */
-    get(roomKey) {
-        return this.list.get(roomKey);
+    get(key) {
+        return this.map.get(key);
     }
-    has(roomKey) {
-        return this.list.has(roomKey);
+    has(key) {
+        return this.map.has(key);
     }
     /** 获取房间信息 */
-    info(roomKey) {
-        let room = this.list.get(roomKey);
+    info(key) {
+        let room = this.map.get(key);
         return room ? room.info : undefined;
     }
     /** 更新房间信息 */
-    update(roomKey) {
-        let room = this.list.get(roomKey);
+    update(key) {
+        let room = this.map.get(key);
         room && room.getInfo();
     }
-    /** 获取roomKey列表 */
+    /** 获取房间key列表 */
     get keys() {
-        return [...this.list.keys()];
+        return [...this.map.keys()];
+    }
+    /** 获取房间列表 */
+    getList() {
+        return [...this.map.values()];
     }
     /** 打开房间连接 */
-    open(roomKey) {
-        let room = this.list.get(roomKey);
+    open(key) {
+        let room = this.map.get(key);
         room?.available && !room.opened && room.open();
     }
     /** 关闭房间连接 */
-    close(roomKey) {
-        let room = this.list.get(roomKey);
+    close(key) {
+        let room = this.map.get(key);
         room?.opened && room.close();
     }
     /** 更改某个房间的顺序 */
-    move(roomKey, position) {
-        const arr = [...this.list];
-        const index = arr.findIndex(([key]) => key == roomKey);
+    move(key, position) {
+        const arr = [...this.map];
+        const index = arr.findIndex(([k]) => k == key);
         if (index == -1)
             return;
         const [item] = arr.splice(index, 1);
         arr.splice(position, 0, item);
-        this.list = new Map(arr);
-        this.main.emit("room:move", roomKey, position);
+        this.map = new Map(arr);
+        this.main.emit("room:move", key, position);
     }
     /** 获取快照 */
     getSnapshot() {
-        return [...this.list.values()].map((room) => room.info);
+        return this.getList().map((room) => room.info);
     }
 }

package/esm/module/value.js

@@ -16,7 +16,6 @@ export class ModValue {
     unregister(name) {
         this.list.delete(name);
         this.main.emit("value:remove", name);
-        this.main.emit("value:change", name, undefined);
     }
     /** 获取值 */
     get(name) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "floating-live",
-  "version": "0.15.9",
+  "version": "0.15.11",
   "type": "commonjs",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",