floating-live 0.15.6 → 0.15.8

package/dist/live.d.ts

@@ -29,10 +29,11 @@ export declare class FloatingLive extends EventEmitter {
     throw(err: Error, options?: ErrorOptions): void;
     throw(options: ErrorOptions): void;
     getSnapshot(): {
-        room: import("./types").RoomInfo[];
+        room: import("./core").LiveRoom[];
         value: Record<string, any>;
         manifest: Record<string, Record<string, any>>;
         command: string[];
-        hook: Record<string, any>;
+        hook: Record<string, number>;
+        plugin: string[];
     };
 }

package/dist/live.js

@@ -43,7 +43,8 @@ class FloatingLive extends events_1.EventEmitter {
             value: this.value.getSnapshot(),
             manifest: this.manifest.getSnapshot(),
             command: this.command.getSnapshot(),
-            hook: this.value.getSnapshot(),
+            hook: this.hook.getSnapshot(),
+            plugin: this.plugin.getSnapshot(),
         };
     }
 }

package/dist/module/hook.d.ts

@@ -11,4 +11,5 @@ export declare class ModHook {
     unregister<T extends keyof FloatingHookMap>(name: T, func: HookFunction<FloatingHookMap[T]>): void;
     /** 调用钩子函数 */
     call<T extends keyof FloatingHookMap>(name: T, ctx: FloatingHookMap[T]): Promise<boolean>;
+    getSnapshot(): Record<string, number>;
 }

package/dist/module/hook.js

@@ -40,5 +40,12 @@ class ModHook {
         }
         return true;
     }
+    getSnapshot() {
+        const map = {};
+        this.list.forEach((fnList, name) => {
+            map[name] = fnList.length;
+        });
+        return map;
+    }
 }
 exports.ModHook = ModHook;

package/dist/module/plugin.d.ts

@@ -6,9 +6,11 @@ export declare class ModPlugin {
     protected readonly main: FloatingLive;
     constructor(main: FloatingLive);
     /** 注册插件 */
-    register(pluginFunc: PluginConstructor, options?: Record<string, any>): Promise<PluginItem | undefined>;
+    register(pluginFunc: PluginConstructor, options?: Record<string, any>): Promise<void | PluginItem | undefined>;
     /** 移除插件 */
     unregister(name: string): Promise<void>;
     /** 获取插件实例 */
     get(name: string): PluginItem | undefined;
+    has(name: string): boolean;
+    getSnapshot(): string[];
 }

package/dist/module/plugin.js

@@ -12,14 +12,17 @@ class ModPlugin {
         const name = pluginFunc.pluginName;
         if (!name) {
             this.main.throw({
-                message: "缺少插件id",
+                message: "添加插件失败",
+                reason: "缺少插件id",
                 id: "plugin:register_id_missing",
             });
         }
         if (this.list.has(name)) {
             this.main.throw({
-                message: "已存在相同id的插件",
+                message: `添加插件失败: ${name}`,
+                reason: "已存在相同id的插件",
                 id: "plugin:register_id_duplicate",
+                pluginName: name,
             });
         }
         return await this.main.hook
@@ -29,11 +32,21 @@ class ModPlugin {
                 return;
             // 执行插件函数
             const plugin = new pluginFunc(this.main, options);
-            this.list.set(name, plugin);
             // 调用插件的register钩子
             await plugin.register?.(this.main, options);
+            this.list.set(name, plugin);
             this.main.emit("plugin:add", name);
             return plugin;
+        })
+            .catch((err) => {
+            this.main.throw({
+                message: `添加插件失败: ${name}`,
+                reason: err?.message && err?.reason
+                    ? `${err.message}: ${err.reason}`
+                    : err?.message || err?.reason,
+                id: "plugin:register_fail",
+                pluginName: name,
+            });
         });
     }
     /** 移除插件 */
@@ -42,8 +55,10 @@ class ModPlugin {
         // 检测插件是否存在
         if (!plugin) {
             this.main.throw({
-                message: "插件不存在",
+                message: `移除插件失败: ${name}`,
+                reason: "插件不存在",
                 id: "plugin:unregister_unexist",
+                pluginName: name,
             });
         }
         else {
@@ -59,5 +74,11 @@ class ModPlugin {
     get(name) {
         return this.list.get(name);
     }
+    has(name) {
+        return this.list.has(name);
+    }
+    getSnapshot() {
+        return [...this.list.keys()];
+    }
 }
 exports.ModPlugin = ModPlugin;

package/dist/module/room.d.ts

@@ -14,6 +14,7 @@ export declare class ModRoom {
     remove(roomKey: string): void;
     /** 获取房间 */
     get(roomKey: string): LiveRoom | undefined;
+    has(roomKey: string): boolean;
     /** 获取房间信息 */
     info(roomKey: string): RoomInfo | undefined;
     /** 更新房间信息 */
@@ -27,5 +28,5 @@ export declare class ModRoom {
     /** 更改某个房间的顺序 */
     move(roomKey: string, position: number): void;
     /** 获取快照 */
-    getSnapshot(): RoomInfo[];
+    getSnapshot(): LiveRoom[];
 }

package/dist/module/room.js

@@ -113,6 +113,9 @@ class ModRoom {
     get(roomKey) {
         return this.list.get(roomKey);
     }
+    has(roomKey) {
+        return this.list.has(roomKey);
+    }
     /** 获取房间信息 */
     info(roomKey) {
         let room = this.list.get(roomKey);
@@ -146,10 +149,11 @@ class ModRoom {
         const [item] = arr.splice(index, 1);
         arr.splice(position, 0, item);
         this.list = new Map(arr);
+        this.main.emit("room:move", roomKey, position);
     }
     /** 获取快照 */
     getSnapshot() {
-        return [...this.list].map(([key, room]) => room.info);
+        return [...this.list.values()];
     }
 }
 exports.ModRoom = ModRoom;

package/dist/module/value.d.ts

@@ -16,10 +16,11 @@ export declare class ModValue {
     get<T extends keyof FloatingValueMap>(name: T): any;
     /** 设置值 */
     set<T extends keyof FloatingValueMap>(name: T, value: FloatingValueMap[T]): boolean;
-    /** 获取注册的所有值 */
-    getSnapshot(): Record<string, any>;
+    has(name: string): boolean;
     emit<T extends keyof FloatingValueMap>(name: T, value: FloatingValueMap[T]): void;
     watch<T extends keyof FloatingValueMap>(name: T, listener: (value: FloatingValueMap[T]) => void): void;
     unwatch<T extends keyof FloatingValueMap>(name: T, listener: (value: FloatingValueMap[T]) => void): void;
+    /** 获取注册的所有值 */
+    getSnapshot(): Record<string, any>;
 }
 export {};

package/dist/module/value.js

@@ -5,16 +5,21 @@ class ModValue {
     constructor(main) {
         this.list = new Map();
         this.main = main;
+        const { command } = main;
+        command.register("get", this.get.bind(this));
+        command.register("set", this.set.bind(this));
     }
     /** 注册值 */
     register(name, config) {
         this.list.set(name, config);
         this.main.emit("value:add", name);
+        this.main.emit("value:change", name, config.get());
     }
     /** 取消注册 */
     unregister(name) {
         this.list.delete(name);
         this.main.emit("value:remove", name);
+        this.main.emit("value:change", name, undefined);
     }
     /** 获取值 */
     get(name) {
@@ -31,13 +36,8 @@ class ModValue {
             return false;
         }
     }
-    /** 获取注册的所有值 */
-    getSnapshot() {
-        const map = {};
-        this.list.forEach((config, name) => {
-            map[name] = config.get();
-        });
-        return map;
+    has(name) {
+        return this.list.has(name);
     }
     emit(name, value) {
         this.main.emit(`change:${name}`, value);
@@ -49,5 +49,13 @@ class ModValue {
     unwatch(name, listener) {
         this.main.off(`change:${name}`, listener);
     }
+    /** 获取注册的所有值 */
+    getSnapshot() {
+        const map = {};
+        this.list.forEach((config, name) => {
+            map[name] = config.get();
+        });
+        return map;
+    }
 }
 exports.ModValue = ModValue;

package/dist/types/command.d.ts

@@ -1,11 +1,23 @@
 import { LiveRoom } from "../core";
 import { RoomInfo } from "./room";
+import { FloatingValueMap } from "./value";
 export interface FloatingCommandMap {
+    /** 添加房间 */
     add: (platform: string, id: number, options?: boolean | Record<string, any>) => void;
+    /** 移除房间 */
     remove: (key: string) => void;
+    /** 打开房间 */
     open: (key: string) => void;
+    /** 关闭房间 */
     close: (key: string) => void;
+    /** 更新房间信息 */
     update: (key: string) => void;
+    /** 创建房间 */
     [name: `${string}.room.create`]: (id: string | number, options?: Record<string, any>) => Promise<LiveRoom> | LiveRoom;
+    /** 获取房间信息 */
     [name: `${string}.room.info`]: (id: string | number) => Promise<RoomInfo>;
+    /** 获取值 */
+    get: <N extends keyof FloatingValueMap>(name: N) => FloatingValueMap[N];
+    /** 设置值 */
+    set: <N extends keyof FloatingValueMap>(name: N, value: FloatingValueMap[N]) => boolean;
 }

package/dist/types/error.d.ts

@@ -1,6 +1,8 @@
 export interface ErrorOptions {
     /** 错误消息 */
     message?: string;
+    /** 错误原因 */
+    reason?: string;
     /** 错误id */
     id?: string;
     /** 错误名称 */

package/dist/types/events.d.ts

@@ -23,12 +23,15 @@ export interface FloatingEventMap {
     "room:close": (key: string, info: RoomInfo) => void;
     "room:add": (key: string, info: RoomInfo) => void;
     "room:remove": (key: string) => void;
+    "room:move": (key: string, position: number) => void;
     "plugin:add": (name: string) => void;
     "plugin:remove": (name: string) => void;
     "command:add": (name: string) => void;
     "command:remove": (name: string) => void;
     "manifest:add": (name: string, id: string, value: any) => void;
     "manifest:remove": (name: string, id: string) => void;
+    "hook:add": (name: string) => void;
+    "hook:remove": (name: string) => void;
     "value:add": (name: string) => void;
     "value:remove": (name: string) => void;
     "value:change": (name: string, value: any) => void;

package/esm/live.js

@@ -40,7 +40,8 @@ export class FloatingLive extends EventEmitter {
             value: this.value.getSnapshot(),
             manifest: this.manifest.getSnapshot(),
             command: this.command.getSnapshot(),
-            hook: this.value.getSnapshot(),
+            hook: this.hook.getSnapshot(),
+            plugin: this.plugin.getSnapshot(),
         };
     }
 }

package/esm/module/hook.js

@@ -37,4 +37,11 @@ export class ModHook {
         }
         return true;
     }
+    getSnapshot() {
+        const map = {};
+        this.list.forEach((fnList, name) => {
+            map[name] = fnList.length;
+        });
+        return map;
+    }
 }

package/esm/module/plugin.js

@@ -9,14 +9,17 @@ export class ModPlugin {
         const name = pluginFunc.pluginName;
         if (!name) {
             this.main.throw({
-                message: "缺少插件id",
+                message: "添加插件失败",
+                reason: "缺少插件id",
                 id: "plugin:register_id_missing",
             });
         }
         if (this.list.has(name)) {
             this.main.throw({
-                message: "已存在相同id的插件",
+                message: `添加插件失败: ${name}`,
+                reason: "已存在相同id的插件",
                 id: "plugin:register_id_duplicate",
+                pluginName: name,
             });
         }
         return await this.main.hook
@@ -26,11 +29,21 @@ export class ModPlugin {
                 return;
             // 执行插件函数
             const plugin = new pluginFunc(this.main, options);
-            this.list.set(name, plugin);
             // 调用插件的register钩子
             await plugin.register?.(this.main, options);
+            this.list.set(name, plugin);
             this.main.emit("plugin:add", name);
             return plugin;
+        })
+            .catch((err) => {
+            this.main.throw({
+                message: `添加插件失败: ${name}`,
+                reason: err?.message && err?.reason
+                    ? `${err.message}: ${err.reason}`
+                    : err?.message || err?.reason,
+                id: "plugin:register_fail",
+                pluginName: name,
+            });
         });
     }
     /** 移除插件 */
@@ -39,8 +52,10 @@ export class ModPlugin {
         // 检测插件是否存在
         if (!plugin) {
             this.main.throw({
-                message: "插件不存在",
+                message: `移除插件失败: ${name}`,
+                reason: "插件不存在",
                 id: "plugin:unregister_unexist",
+                pluginName: name,
             });
         }
         else {
@@ -56,4 +71,10 @@ export class ModPlugin {
     get(name) {
         return this.list.get(name);
     }
+    has(name) {
+        return this.list.has(name);
+    }
+    getSnapshot() {
+        return [...this.list.keys()];
+    }
 }

package/esm/module/room.js

@@ -110,6 +110,9 @@ export class ModRoom {
     get(roomKey) {
         return this.list.get(roomKey);
     }
+    has(roomKey) {
+        return this.list.has(roomKey);
+    }
     /** 获取房间信息 */
     info(roomKey) {
         let room = this.list.get(roomKey);
@@ -143,9 +146,10 @@ export class ModRoom {
         const [item] = arr.splice(index, 1);
         arr.splice(position, 0, item);
         this.list = new Map(arr);
+        this.main.emit("room:move", roomKey, position);
     }
     /** 获取快照 */
     getSnapshot() {
-        return [...this.list].map(([key, room]) => room.info);
+        return [...this.list.values()];
     }
 }

package/esm/module/value.js

@@ -2,16 +2,21 @@ export class ModValue {
     constructor(main) {
         this.list = new Map();
         this.main = main;
+        const { command } = main;
+        command.register("get", this.get.bind(this));
+        command.register("set", this.set.bind(this));
     }
     /** 注册值 */
     register(name, config) {
         this.list.set(name, config);
         this.main.emit("value:add", name);
+        this.main.emit("value:change", name, config.get());
     }
     /** 取消注册 */
     unregister(name) {
         this.list.delete(name);
         this.main.emit("value:remove", name);
+        this.main.emit("value:change", name, undefined);
     }
     /** 获取值 */
     get(name) {
@@ -28,13 +33,8 @@ export class ModValue {
             return false;
         }
     }
-    /** 获取注册的所有值 */
-    getSnapshot() {
-        const map = {};
-        this.list.forEach((config, name) => {
-            map[name] = config.get();
-        });
-        return map;
+    has(name) {
+        return this.list.has(name);
     }
     emit(name, value) {
         this.main.emit(`change:${name}`, value);
@@ -46,4 +46,12 @@ export class ModValue {
     unwatch(name, listener) {
         this.main.off(`change:${name}`, listener);
     }
+    /** 获取注册的所有值 */
+    getSnapshot() {
+        const map = {};
+        this.list.forEach((config, name) => {
+            map[name] = config.get();
+        });
+        return map;
+    }
 }

package/package.json

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