floating-live 0.16.0-alpha.9 → 0.16.0-beta.2

package/dist/plugins/room/index.js

@@ -2,10 +2,12 @@ import { AppError } from "../../error";
 import { BasePlugin } from "../../plugin";
 import { bindCommand } from "../../utils";
 export class Room extends BasePlugin {
-    constructor(ctx) {
-        super(ctx);
+    constructor() {
+        super(...arguments);
         this.map = new Map();
-        this.symbolRoomEventHandlers = Symbol("room.roomEventHandlers");
+        this.symbolAbortController = Symbol("room.abortController");
+    }
+    init(ctx) {
         ctx.registerCommand("add", bindCommand(this.add, this));
         ctx.registerCommand("remove", bindCommand(this.remove, this));
         ctx.registerCommand("open", bindCommand(this.open, this));
@@ -13,21 +15,34 @@ export class Room extends BasePlugin {
         ctx.registerCommand("update", bindCommand(this.update, this));
         ctx.registerCommand("room.snapshot", bindCommand(this.getSnapshot, this));
     }
+    expose() {
+        return {
+            add: this.add.bind(this),
+            remove: this.remove.bind(this),
+            get: this.get.bind(this),
+            has: this.has.bind(this),
+            data: this.data.bind(this),
+            update: this.update.bind(this),
+            open: this.open.bind(this),
+            close: this.close.bind(this),
+            getList: this.getList.bind(this),
+        };
+    }
     /** 添加房间监听实例 */
-    attachRoom(room, open) {
+    attach(room, open) {
         let key = room.key;
         if (this.map.has(key)) {
-            this.ctx.throw(new AppError("room:add_exist", {
+            this.throw(new AppError("room:add_exist", {
                 message: "房间已存在",
             }));
             return;
         }
         this.map.set(key, room);
-        const eventHandlers = [];
-        room[this.symbolRoomEventHandlers] = eventHandlers;
+        const abortController = new AbortController();
+        room[this.symbolAbortController] =
+            abortController;
         const setHandler = (type, listener) => {
-            room.on(type, listener);
-            eventHandlers.push([type, listener]);
+            room.on(type, listener, abortController.signal);
         };
         // 添加监听事件
         // 直播消息
@@ -92,29 +107,37 @@ export class Room extends BasePlugin {
         const opt = typeof options == "boolean" ? { open: options } : options || {};
         const ctx = { platform, id, options: opt };
         const res = await this.ctx.callHook("room.add", ctx);
-        if (!res.defaultPrevented) {
-            this.ctx.throw(this.ctx.error("room:add_fail", { message: "无法添加房间" }));
+        if (res.defaultPrevented) {
+            this.throw(new this.Error("room:add_hook_prevented", {
+                message: "无法添加房间",
+                cause: "房间添加被钩子函数阻止",
+                target: `room/${platform}:${id}`,
+            }));
         }
-        const room = await this.ctx.call(`${platform}.room.create`, id, opt);
-        if (!room) {
-            this.ctx.throw(this.ctx.error("room:create_fail", { message: "无法创建房间" }));
+        let room;
+        try {
+            room = await this.ctx.call(`${platform}.room.create`, id, opt);
         }
-        else {
-            this.attachRoom(room);
+        catch (e) {
+            this.throw(new this.Error("room:create_fail", {
+                message: "无法创建房间",
+                cause: e,
+                target: `room/${platform}:${id}`,
+            }));
         }
+        this.attach(room);
     }
     /** 移除房间 */
     remove(key) {
         let room = this.map.get(key);
         if (!room) {
-            this.ctx.throw(this.ctx.error("room:remove_unexist", {
+            this.throw(new this.Error("room:remove_unexist", {
                 message: "房间不存在",
+                target: `room/${key}`,
             }));
         }
         this.map.delete(key); // 从表中删除房间
-        room[this.symbolRoomEventHandlers].forEach(([type, listener]) => {
-            room?.removeEventListener(type, listener);
-        }); // 移除房间监听实例
+        room[this.symbolAbortController]?.abort(); // 移除房间监听实例
         this.ctx.emit("room:remove", { key });
     }
     /** 获取房间 */
@@ -125,14 +148,14 @@ export class Room extends BasePlugin {
         return this.map.has(key);
     }
     /** 获取房间信息 */
-    info(key) {
+    data(key) {
         let room = this.map.get(key);
         return room ? room.toData() : undefined;
     }
     /** 更新房间信息 */
     update(key) {
         let room = this.map.get(key);
-        room && room.getInfo();
+        room && room.update();
     }
     /** 获取房间key列表 */
     get keys() {
@@ -145,19 +168,35 @@ export class Room extends BasePlugin {
     /** 打开房间连接 */
     open(key) {
         let room = this.map.get(key);
-        room?.available && !room.opened && room.open();
+        if (!room) {
+            this.throw(new this.Error("room:open_unexist", {
+                message: "打开的房间不存在",
+                target: `room/${key}`,
+            }));
+        }
+        room.open();
     }
     /** 关闭房间连接 */
     close(key) {
         let room = this.map.get(key);
-        room?.opened && room.close();
+        if (!room) {
+            this.throw(new this.Error("room:close_unexist", {
+                message: "关闭的房间不存在",
+                target: `room/${key}`,
+            }));
+        }
+        room.close();
     }
     /** 更改某个房间的顺序 */
     move(key, position) {
         const arr = [...this.map];
         const index = arr.findIndex(([k]) => k == key);
-        if (index == -1)
-            return;
+        if (index == -1) {
+            this.throw(new this.Error("room:move_unexist", {
+                message: "要移动的房间不存在",
+                target: `room/${key}`,
+            }));
+        }
         const [item] = arr.splice(index, 1);
         arr.splice(position, 0, item);
         this.map = new Map(arr);

package/dist/value/manager.d.ts

@@ -1,11 +1,11 @@
 import { App } from "../app";
-import { ValueAccessOptions, ValueOptions } from "./types";
+import { ValueAccessOptions, ValueContext, ValueOptions } from "./types";
 export declare class ValueManager {
     private list;
     protected readonly app: App;
     constructor(app: App);
     /** 注册值 */
-    register<T>(name: string, { get, set, pluginName }: ValueOptions<T>): void;
+    register<T>(name: string, { get, set, pluginName }: ValueOptions<T>): ValueContext<T>;
     /** 取消注册 */
     unregister(name: string): void;
     /** 获取值 */
@@ -20,5 +20,8 @@ export declare class ValueManager {
     watch(name: string, listener: (value: any) => void): void;
     unwatch(name: string, listener: (value: any) => void): void;
     /** 获取注册的所有值 */
-    getData(): Record<string, any>;
+    getSnapshot(): {
+        name: string;
+        value: string;
+    }[];
 }

package/dist/value/manager.js

@@ -1,15 +1,20 @@
+import { AppError } from "../error";
 import { bindCommand } from "../utils";
 export class ValueManager {
     constructor(app) {
         this.list = new Map();
         this.app = app;
-        app.registerCommand("get", bindCommand(this.get, this));
-        app.registerCommand("set", bindCommand(this.set, this));
+        app.registerCommand("value.snapshot", bindCommand(this.getSnapshot, this));
     }
     /** 注册值 */
     register(name, { get, set, pluginName }) {
         this.list.set(name, { get, set, pluginName });
         this.app.emit("value:register", { name, value: get() }, { source: `plugin:${pluginName}` });
+        return {
+            emit: (v) => {
+                this.emit(name, v);
+            },
+        };
     }
     /** 取消注册 */
     unregister(name) {
@@ -20,7 +25,9 @@ export class ValueManager {
     get(name, options) {
         const item = this.list.get(name);
         if (!item)
-            throw {};
+            throw new AppError("value:get_unexist", {
+                message: "无法获取未注册的值",
+            });
         return item.get(options);
     }
     /** 获取值(不存在则返回undefined) */
@@ -53,11 +60,10 @@ export class ValueManager {
         this.app.off(`change:${name}`, listener);
     }
     /** 获取注册的所有值 */
-    getData() {
-        const map = {};
-        this.list.forEach((config, name) => {
-            map[name] = config.get();
-        });
-        return map;
+    getSnapshot() {
+        return [...this.list].map(([name, config]) => ({
+            name,
+            value: config.get(),
+        }));
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "floating-live",
-  "version": "0.16.0-alpha.9",
+  "version": "0.16.0-beta.2",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",