floating-live 0.17.0-alpha.13 → 0.17.0-alpha.14

package/LICENSE

@@ -1,9 +1,9 @@
-MIT License
-
-Copyright (c) 2023 Minteea
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
+MIT License
+
+Copyright (c) 2023 Minteea
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,36 +1,36 @@
-# Floating Live
-
-一个用于处理和保存直播弹幕的 Web 小工具，开箱即用。
-
-本体无弹幕获取功能，需要配合[floating-live-plugins](https://github.com/Minteea/floating-live-plugins)中的插件使用。
-
-目前插件库支持 bilibili 和 AcFun 的直播弹幕，不同平台的弹幕会转换为同一种格式便于保存。
-
-项目仍在开发中，功能尚未完善，目前除了记录保存直播弹幕外暂时没有别的用处啦，敬请期待。
-
-注意：当前项目未进入正式版本阶段，程序结构及导出数据结构可能随时改动，**非常不建议用于正式项目中**。
-
-GUI 版本：[Minteea/floating-live-gui](https://github.com/Minteea/floating-live-gui)
-
-## 使用方法
-
-### npm 安装
-
-```
-npm install floating-live
-```
-
-```javascript
-// 导入FloatingLive本体
-import { FloatingLive } from "floating-live";
-// 导入bilibili房间生成插件
-import bilibili from "@floating-live/bilibili";
-
-// 创建一个FloatingLive实例
-const live = new FloatingLive();
-// 注册插件
-live.plugin.register(bilibili);
-
-// 添加房间并自动打开
-live.room.add("bilibili", 6, true);
-```
+# Floating Live
+
+一个用于处理和保存直播弹幕的 Web 小工具，开箱即用。
+
+本体无弹幕获取功能，需要配合[floating-live-plugins](https://github.com/Minteea/floating-live-plugins)中的插件使用。
+
+目前插件库支持 bilibili 和 AcFun 的直播弹幕，不同平台的弹幕会转换为同一种格式便于保存。
+
+项目仍在开发中，功能尚未完善，目前除了记录保存直播弹幕外暂时没有别的用处啦，敬请期待。
+
+注意：当前项目未进入正式版本阶段，程序结构及导出数据结构可能随时改动，**非常不建议用于正式项目中**。
+
+GUI 版本：[Minteea/floating-live-gui](https://github.com/Minteea/floating-live-gui)
+
+## 使用方法
+
+### npm 安装
+
+```
+npm install floating-live
+```
+
+```javascript
+// 导入FloatingLive本体
+import { FloatingLive } from "floating-live";
+// 导入bilibili房间生成插件
+import bilibili from "@floating-live/bilibili";
+
+// 创建一个FloatingLive实例
+const live = new FloatingLive();
+// 注册插件
+live.plugin.register(bilibili);
+
+// 添加房间并自动打开
+live.room.add("bilibili", 6, true);
+```

package/dist/command/manager.js

@@ -1,4 +1,9 @@
 import { appError } from "../error/index.js";
+// 错误列表
+// command:notFound 命令不存在
+// command:alreadyExists 命令已存在
+// command:aliasNotFound 命令别名指向的命令不存在
+// command:aliasTargetUncallable 命令别名不可指向其他命令别名
 export class CommandManager {
     /** 功能列表 */
     list = new Map();
@@ -31,9 +36,10 @@ export class CommandManager {
     callWithOptions(name, options, ...args) {
         const command = this.list.get(name);
         if (!command) {
-            throw appError("command:call_unexist", {
+            throw appError("command:notFound", {
                 message: `命令不存在[${name}]`,
                 target: `command/${name}`,
+                action: "command.call",
             });
         }
         else {
@@ -50,17 +56,19 @@ export class CommandManager {
     _callAliasWithOptions(name, targetName, options, ...args) {
         const tcommand = this.list.get(targetName);
         if (!tcommand) {
-            throw appError("command:alias_unexist", {
+            throw appError("command:aliasNotFound", {
                 message: `命令别名[${name}]指向的命令不存在[${targetName}]`,
                 target: `command/${name}>${targetName}`,
+                action: "command.call",
             });
         }
         else {
             const { call } = tcommand;
             if (!call) {
-                throw appError("command:alias_target_uncallable", {
+                throw appError("command:aliasTargetUncallable", {
                     message: `命令别名[${name}]不可指向其他命令别名[${targetName}]`,
                     target: `command/${name}>${targetName}>${tcommand.targetName}`,
+                    action: "command.call",
                 });
             }
             return call({ source: options.source, client: options.client }, ...args);

package/dist/error/index.d.ts

@@ -8,6 +8,8 @@ export interface AppError extends Error {
         target?: string;
         /** 错误原因 */
         reason?: string | Error | AppError;
+        /** 调用行为 */
+        action?: string;
     };
 }
 export interface AppErrorOptions {
@@ -17,8 +19,10 @@ export interface AppErrorOptions {
     target?: string;
     /** 错误原因 */
     reason?: string | Error | AppError;
+    /** 调用行为 */
+    action?: string;
     /** 错误构造函数 */
     errorConstructor?: ErrorConstructor;
     [key: string]: unknown;
 }
-export declare function appError(code: string, { message, target, reason, errorConstructor }: AppErrorOptions): AppError;
+export declare function appError(code: string, { message, target, reason, action, errorConstructor, }: AppErrorOptions): AppError;

package/dist/error/index.js

@@ -1,10 +1,14 @@
 export * from "./types.js";
-export function appError(code, { message, target, reason, errorConstructor = Error }) {
+export function appError(code, { message, target, reason, action, errorConstructor = Error, }) {
     return new errorConstructor(message, {
         cause: {
             code,
             target,
             reason,
+            action,
         },
     });
 }
+// 错误码分类
+// http:xxx http状态码
+// node:xxx nodejs错误码

package/dist/hook/manager.js

@@ -1,4 +1,7 @@
 import { appError } from "../error/index.js";
+// 错误列表
+// hook:functionAlreadyExists 钩子函数已存在
+// hook:functionNotFound 钩子函数不存在
 export class HookManager {
     list = new Map();
     pluginMap = new Map();
@@ -16,10 +19,10 @@ export class HookManager {
             this.list.set(name, hooks);
         }
         else if (hooks.includes(call)) {
-            throw appError("hook:use_duplicate", {
-                message: `钩子函数挂载失败: ${name}`,
-                reason: "重复挂载同一函数",
+            throw appError("hook:functionAlreadyExists", {
+                message: `无法重复挂载同一钩子函数: ${name}`,
                 target: `hook/${name}`,
+                action: "hook.use",
             });
         }
         hooks.push({ call, pluginName });
@@ -29,10 +32,10 @@ export class HookManager {
         let hooks = this.list.get(name);
         const index = hooks?.findIndex((item) => item.call == call) ?? -1;
         if (!hooks || index < 0)
-            throw appError("hook:unuse_unexist", {
-                message: `钩子函数卸载失败: ${name}`,
-                reason: "卸载不存在的钩子函数",
+            throw appError("hook:functionNotFound", {
+                message: `无法卸载不存在的钩子函数: ${name}`,
                 target: `hook/${name}`,
+                action: "hook.unuse",
             });
         hooks.splice(index, 1);
     }

package/dist/live/message.d.ts

@@ -1,5 +1,7 @@
 import { DanmakuMode, UserInfo, ImageInfo, GiftInfo, UserType } from "./messageInfo.js";
 import { LiveRoomStatus, LiveRoomStatsInfo, LiveRoomDetailInfo } from "./room.js";
+export interface LiveMessageExtensions {
+}
 export declare namespace LiveMessage {
     interface Base {
         /** 平台名称 */
@@ -12,10 +14,17 @@ export declare namespace LiveMessage {
         type: string;
         /** 时间戳 */
         timestamp: number;
-        /** 消息id */
+        /** 消息id
+         *
+         * 须保证不重复性，规范id格式如下：
+         *
+         * 用户相关消息：platform:roomId-type:userId-uniqueId
+         *
+         * 房间相关消息：platform:roomId-type-uniqueId
+         *  */
         id: string;
-        /** 其他属性 */
-        [attr: string]: any;
+        /** 拓展属性 */
+        extension?: LiveMessageExtensions;
     }
     /** 聊天消息 */
     interface Comment extends Base {
@@ -81,8 +90,8 @@ export declare namespace LiveMessage {
     interface Superchat extends Base {
         type: "superchat";
         info: {
-            /** 留言id */
-            id: string | number;
+            /** 留言代码，用于撤回消息 */
+            token: string | number;
             /** 用户信息 */
             user: UserInfo;
             /** 文本内容 */
@@ -129,6 +138,7 @@ export declare namespace LiveMessage {
         info: {
             /** 切断消息 */
             message: string;
+            status: LiveRoomStatus;
         };
     }
     /** 直播数据更新 */
@@ -141,57 +151,5 @@ export declare namespace LiveMessage {
         type: "live_detail";
         info: LiveRoomDetailInfo;
     }
-    /** 主播抽奖 */
-    interface Lottery extends Base {
-        type: "lottery";
-        info: {
-            title: string;
-            role: "user" | "anchor";
-            user?: UserInfo;
-            gift?: GiftInfo;
-            id: string | number;
-            award?: GiftInfo | GiftInfo[];
-            value?: number;
-            valueType?: string | number;
-            price?: number;
-            currency?: string;
-        };
-    }
-    /** 主播抽奖结果 */
-    interface LotteryResult extends Base {
-        type: "lottery_result";
-        info: {
-            title: string;
-            role: "user" | "anchor";
-            id: string | number;
-            result: {
-                user: UserInfo;
-                award: GiftInfo | GiftInfo[];
-            }[];
-        };
-    }
-    /** 发送红包 */
-    interface Redpacket extends Base {
-        type: "redpacket";
-        info: {
-            id: string | number;
-            gifts?: GiftInfo[];
-            value?: number;
-            currency?: string | number;
-        };
-    }
-    /** 红包抽奖结果 */
-    interface RedpacketResult extends Base {
-        type: "redpacket_result";
-        info: {
-            id: string | number;
-            result: {
-                user: UserInfo;
-                gift?: GiftInfo;
-                value?: number;
-                currency?: string | number;
-            }[];
-        };
-    }
-    type All = Comment | Gift | Interact | Membership | Superchat | Block | LiveStart | LiveEnd | LiveCut | LiveDetail | LiveStats | Lottery | LotteryResult;
+    type All = Comment | Gift | Interact | Membership | Superchat | Block | LiveStart | LiveEnd | LiveCut | LiveDetail | LiveStats;
 }

package/dist/live/messageInfo.d.ts

@@ -13,8 +13,8 @@ export interface UserInfo {
     type?: UserType;
     /** 粉丝vip等级 */
     membership?: boolean | number;
-    /** vip等级 */
-    vip?: boolean | number;
+    /** 平台vip等级 */
+    premium?: boolean | number;
     /** 用户等级 */
     level?: number;
 }
@@ -50,10 +50,12 @@ export interface GiftInfo {
     num: number;
     /** 礼物价值(总价，按平台货币计算) */
     value?: number;
-    /** 价值类型 */
-    valueType?: string | number;
+    /** 显示的礼物价值 */
+    displayValue?: number;
+    /** 平台货币类型 */
+    coinType?: string | number;
     /** 平台货币名称 */
-    valueName?: string;
+    coinName?: string;
     /** 礼物连击数 */
     combo?: number;
     /** 礼物连击id */

package/dist/live/platform.d.ts

@@ -2,7 +2,7 @@ export interface LivePlatformInfo {
     /** 平台名称 */
     name: string;
     /** 平台vip信息 */
-    vip?: {
+    premium?: {
         /** 平台vip对应id */
         id: string;
         /** 平台vip名称 */

package/dist/live/room.d.ts

@@ -10,8 +10,8 @@ export declare abstract class LiveRoom extends CustomEventEmitter implements Liv
     get service(): string;
     /** 平台 */
     abstract readonly platform: string;
-    /** api服务 */
-    readonly serviceName: string;
+    /** 服务分支 */
+    readonly serviceBranch: string;
     /** 房间id */
     abstract readonly id: string | number;
     /** 房间详情 */
@@ -68,7 +68,7 @@ export declare class InvalidLiveRoom implements LiveRoomData {
     });
     readonly platform: string;
     readonly id: string | number;
-    readonly serviceName: string;
+    readonly serviceBranch: string;
     pending: boolean;
     detail: LiveRoomDetailInfo;
     stats?: LiveRoomStatsInfo;
@@ -100,11 +100,11 @@ export interface LiveRoomData {
     /** 房间有效性 */
     valid: boolean;
     /** 房间待定状态 */
-    pending: boolean;
+    pending?: boolean;
     /** 平台id */
     platform: string;
-    /** API服务 */
-    serviceName: string;
+    /** 服务分支 */
+    serviceBranch: string;
     /** 房间id */
     id: number | string;
     /** API服务id */

package/dist/live/room.js

@@ -11,12 +11,12 @@ export class LiveRoom extends CustomEventEmitter {
         return false;
     }
     get service() {
-        return this.serviceName
-            ? `${this.platform}.${this.serviceName}`
+        return this.serviceBranch
+            ? `${this.platform}.${this.serviceBranch}`
             : this.platform;
     }
-    /** api服务 */
-    serviceName = "";
+    /** 服务分支 */
+    serviceBranch = "";
     /** 统计信息 */
     stats;
     /** 直播状态 */
@@ -66,11 +66,11 @@ export class LiveRoom extends CustomEventEmitter {
                 break;
             case "live_end":
             case "live_cut":
-                this.status = msg.status || LiveRoomStatus.off;
+                this.status = msg.info.status || LiveRoomStatus.off;
                 this.timestamp = msg.timestamp;
                 this.emit("message", { message: msg });
                 this.emit("status", {
-                    status: msg.status || LiveRoomStatus.off,
+                    status: msg.info.status || LiveRoomStatus.off,
                     timestamp: msg.timestamp,
                     liveId: this.liveId,
                 });
@@ -88,7 +88,7 @@ export class LiveRoom extends CustomEventEmitter {
             valid: this.valid,
             pending: this.pending,
             platform: this.platform,
-            serviceName: this.serviceName,
+            serviceBranch: this.serviceBranch,
             id: this.id,
             detail: this.detail,
             stats: this.stats,
@@ -114,21 +114,21 @@ export class InvalidLiveRoom {
         return false;
     }
     get service() {
-        return this.serviceName
-            ? `${this.platform}.${this.serviceName}`
+        return this.serviceBranch
+            ? `${this.platform}.${this.serviceBranch}`
             : this.platform;
     }
     constructor(service, id, { pending = false, error = null } = {}) {
         const [platform, ...serviceIdArr] = service.split(".");
         this.platform = platform;
         this.id = id;
-        this.serviceName = serviceIdArr.join(".");
+        this.serviceBranch = serviceIdArr.join(".");
         this.pending = pending;
         this.error = error;
     }
     platform;
     id;
-    serviceName;
+    serviceBranch;
     pending;
     detail = {};
     stats;
@@ -149,7 +149,7 @@ export class InvalidLiveRoom {
             valid: this.valid,
             pending: this.pending,
             platform: this.platform,
-            serviceName: this.serviceName,
+            serviceBranch: this.serviceBranch,
             id: this.id,
             detail: this.detail,
             stats: this.stats,

package/dist/plugin/context/SafePluginContext.js

@@ -1,5 +1,7 @@
 import { appError } from "../../error/index.js";
 import { CommonPluginContext } from "./CommonPluginContext.js";
+// 错误列表
+// plugin:noPermission 插件权限不足 
 export class SafePluginContext extends CommonPluginContext {
     get safe() {
         return true;
@@ -10,7 +12,7 @@ export class SafePluginContext extends CommonPluginContext {
         this.#permissions = options.permissions;
     }
     throwNotPermitted(permission, reason) {
-        throw appError("plugin:no_permission", {
+        throw appError("plugin:noPermission", {
             message: "插件权限不足",
             reason,
             permission,

package/dist/plugin/manager.js

@@ -1,6 +1,13 @@
 import { CommonPluginContext } from "./context/CommonPluginContext.js";
 import { bindCommand } from "../utils/index.js";
 import { appError } from "../error/index.js";
+// 错误列表
+// plugin:missingName 插件pluginName字段缺失
+// plugin:duplicateName 已存在相同名称的插件
+// plugin:unremovable 插件不可移除
+// plugin:registerFailed 插件注册失败
+// plugin:notFound 插件不存在
+// app:hookPrevented 被钩子函数阻止
 export class PluginManager {
     /** 插件列表 */
     list = new Map();
@@ -14,15 +21,17 @@ export class PluginManager {
         const pluginName = pluginConstructor.pluginName;
         const role = pluginConstructor.role || "";
         if (!pluginName) {
-            throw appError("plugin:register_id_missing", {
+            throw appError("plugin:missingName", {
                 message: "插件注册失败: 插件缺少pluginName字段",
                 target: "plugin/#unnamed",
+                action: "plugin.registerSync",
             });
         }
         if (this.list.has(pluginName)) {
-            throw appError("plugin:register_id_duplicate", {
-                message: `插件注册失败[${pluginName}]: 已存在相同id的插件`,
+            throw appError("plugin:duplicateName", {
+                message: `插件注册失败[${pluginName}]: 已存在相同名称的插件`,
                 target: `plugin/${pluginName}`,
+                action: "plugin.registerSync",
             });
         }
         const registerCtx = { pluginName, options };
@@ -30,9 +39,10 @@ export class PluginManager {
         try {
             const ctx = this.app.callHookSync("plugin.register", registerCtx);
             if (ctx.defaultPrevented)
-                throw appError("plugin:register_hook_prevented", {
+                throw appError("app:hookPrevented", {
                     message: `插件注册失败${pluginName}: 插件注册被钩子函数阻止`,
                     target: `plugin/${pluginName}`,
+                    action: "plugin.registerSync",
                 });
             // 执行插件函数
             const plugin = new pluginConstructor(pluginCtx, registerCtx.options || {});
@@ -68,10 +78,11 @@ export class PluginManager {
             return plugin;
         }
         catch (err) {
-            throw appError("plugin:register_fail", {
+            throw appError("plugin:registerFailed", {
                 message: `插件注册失败: ${pluginName}`,
                 reason: err,
                 target: `plugin/${pluginName}`,
+                action: "plugin.registerSync",
             });
         }
     }
@@ -80,15 +91,17 @@ export class PluginManager {
         const pluginName = pluginConstructor.pluginName;
         const role = pluginConstructor.role || "";
         if (!pluginName) {
-            throw appError("plugin:register_id_missing", {
+            throw appError("plugin:missingName", {
                 message: "插件注册失败: 插件缺少pluginName字段",
                 target: "plugin/#unnamed",
+                action: "plugin.register",
             });
         }
         if (this.list.has(pluginName)) {
-            throw appError("plugin:register_id_duplicate", {
-                message: `插件注册失败[${pluginName}]: 已存在相同id的插件`,
+            throw appError("plugin:duplicateName", {
+                message: `插件注册失败[${pluginName}]: 已存在相同名称的插件`,
                 target: `plugin/${pluginName}`,
+                action: "plugin.register",
             });
         }
         const registerCtx = { pluginName, options };
@@ -97,9 +110,10 @@ export class PluginManager {
             .callHook("plugin.register", registerCtx)
             .then(async (ctx) => {
             if (ctx.defaultPrevented)
-                throw appError("plugin:register_hook_prevented", {
+                throw appError("app:hookPrevented", {
                     message: `插件注册失败${pluginName}: 插件注册被钩子函数阻止`,
                     target: `plugin/${pluginName}`,
+                    action: "plugin.register",
                 });
             // 执行插件函数
             const plugin = new pluginConstructor(pluginCtx, registerCtx.options || {});
@@ -134,10 +148,11 @@ export class PluginManager {
             return plugin;
         })
             .catch((err) => {
-            throw appError("plugin:register_fail", {
+            throw appError("plugin:registerFailed", {
                 message: `插件注册失败: ${pluginName}`,
                 reason: err,
                 target: `plugin/${pluginName}`,
+                action: "plugin.register",
             });
         });
     }
@@ -146,17 +161,19 @@ export class PluginManager {
         const pluginData = this.list.get(pluginName);
         // 检测插件是否存在
         if (!pluginData) {
-            throw appError("plugin:unregister_unexist", {
+            throw appError("plugin:notFound", {
                 message: `插件移除失败[${pluginName}]: 插件不存在`,
                 target: `plugin/${pluginName}`,
+                action: "plugin.unregister",
             });
         }
         else {
             const { plugin, context, unremovable, role } = pluginData;
             if (unremovable) {
-                throw appError("plugin:unregister_unremovable", {
+                throw appError("plugin:unremovable", {
                     message: `插件移除失败[${pluginName}]: 该插件已配置为不可移除`,
                     target: `plugin/${pluginName}`,
+                    action: "plugin.unregister",
                 });
             }
             // 调用插件和上下文的destroy钩子

package/dist/plugins/platform/index.js

@@ -11,8 +11,10 @@ export class Platform extends BasePlugin {
     /** 注册直播平台信息 */
     register(name, info, signal) {
         if (this.list.has(name)) {
-            throw appError("platform:register_duplicated", {
-                message: "平台信息重复注册",
+            throw appError("platform:alreadyExists", {
+                message: "平台信息已存在",
+                target: `platform/${name}`,
+                action: "platform.register",
             });
         }
         this.list.set(name, info);
@@ -25,8 +27,10 @@ export class Platform extends BasePlugin {
     /** 解除注册直播平台信息 */
     unregister(name) {
         if (!this.list.has(name)) {
-            throw appError("platform:unregister_unexisted", {
+            throw appError("platform:notFound", {
                 message: "无法解除不存在的平台信息注册",
+                target: `platform/${name}`,
+                action: "platform.unregister",
             });
         }
         this.list.delete(name);

package/dist/plugins/room/index.js

@@ -49,9 +49,10 @@ export class Room extends BasePlugin {
     attach(room, open) {
         const key = room.key;
         if (this.map.has(key)) {
-            throw appError("room:add_exist", {
+            throw appError("room:alreadyExists", {
                 message: `房间已存在[${key}]`,
                 target: `room/${key}`,
+                action: "room.add",
             });
         }
         this.map.set(key, room);
@@ -68,9 +69,10 @@ export class Room extends BasePlugin {
     detach(key) {
         const room = this.map.get(key);
         if (!room) {
-            throw appError("room:remove_unexist", {
+            throw appError("room:notFound", {
                 message: `房间不存在[${key}]`,
                 target: `room/${key}`,
+                action: "room.remove",
             });
         }
         this.map.delete(key); // 从表中删除房间
@@ -214,15 +216,18 @@ export class Room extends BasePlugin {
             const res = await this.ctx
                 .callHook("room.create", ctx)
                 .catch((reason) => {
-                throw appError("room:create_hook_error", {
+                throw appError("app:hookError", {
                     message: `无法创建房间监听实例[${service}:${id}]: 调用钩子函数出错`,
                     target: `room/${service}:${id}`,
+                    action: "room.create",
+                    reason,
                 });
             });
             if (res.defaultPrevented) {
-                throw appError("room:create_hook_prevented", {
+                throw appError("app:hookPrevented", {
                     message: `无法创建房间监听实例[${service}:${id}]: 房间添加被钩子函数阻止`,
                     target: `room/${service}:${id}`,
+                    action: "room.create",
                 });
             }
         }
@@ -243,10 +248,11 @@ export class Room extends BasePlugin {
                 room = new InvalidLiveRoom(service, id);
             }
             else {
-                throw appError("room:create_fail", {
+                throw appError("room:createFailed", {
                     message: `创建房间监听实例失败[${service}:${id}]`,
                     reason: e,
                     target: `room/${service}:${id}`,
+                    action: "room.create",
                 });
             }
         }
@@ -260,10 +266,11 @@ export class Room extends BasePlugin {
                 room.destroy?.();
             }
             catch (e) {
-                throw appError("room:destroy_fail", {
+                throw appError("room:destroyFailed", {
                     message: `销毁房间实例失败[${key}]`,
                     reason: e,
                     target: `room/${key}`,
+                    action: "room.remove",
                 });
             }
         }
@@ -272,15 +279,17 @@ export class Room extends BasePlugin {
     async validate(key, options) {
         let invalidRoom = this.map.get(key);
         if (!invalidRoom) {
-            throw appError("room:validate_unexist", {
+            throw appError("room:notFound", {
                 message: `房间不存在[${key}]`,
                 target: `room/${key}`,
+                action: "room.validate",
             });
         }
         if (invalidRoom.valid == true) {
-            throw appError("room:validate_valid", {
+            throw appError("room:alreadyValid", {
                 message: `无法使已经有效的房间生效[${key}]`,
                 target: `room/${key}`,
+                action: "room.validate",
             });
         }
         const { service, id } = invalidRoom;
@@ -299,15 +308,17 @@ export class Room extends BasePlugin {
     invalidate(key) {
         let room = this.map.get(key);
         if (!room) {
-            throw appError("room:invalidate_unexist", {
+            throw appError("room:notFound", {
                 message: `房间不存在[${key}]`,
                 target: `room/${key}`,
+                action: "room.invalidate",
             });
         }
         if (!room.valid) {
-            throw appError("room:invalidate_invalid", {
+            throw appError("room:alreadyInvalid", {
                 message: `无法使已经无效的房间失效[${key}]`,
                 target: `room/${key}`,
+                action: "room.invalidate",
             });
         }
         // 用无效房间替换掉原房间
@@ -322,10 +333,11 @@ export class Room extends BasePlugin {
             room.destroy?.();
         }
         catch (e) {
-            throw appError("room:destroy_fail", {
+            throw appError("room:destroyFailed", {
                 message: `销毁房间实例失败[${key}]`,
                 reason: e,
                 target: `room/${key}`,
+                action: "room.invalidate",
             });
         }
     }
@@ -358,15 +370,17 @@ export class Room extends BasePlugin {
     open(key) {
         let room = this.map.get(key);
         if (!room) {
-            throw appError("room:open_unexist", {
+            throw appError("room:notFound", {
                 message: "要打开的房间不存在",
                 target: `room/${key}`,
+                action: "room.open",
             });
         }
         if (!room.valid) {
-            throw appError("room:open_invalid", {
+            throw appError("room:invalid", {
                 message: "要打开的房间无效",
                 target: `room/${key}`,
+                action: "room.open",
             });
         }
         room.open();
@@ -375,15 +389,17 @@ export class Room extends BasePlugin {
     close(key) {
         let room = this.map.get(key);
         if (!room) {
-            throw appError("room:close_unexist", {
+            throw appError("room:notFound", {
                 message: "关闭的房间不存在",
                 target: `room/${key}`,
+                action: "room.close",
             });
         }
         if (!room.valid) {
-            throw appError("room:close_invalid", {
+            throw appError("room:invalid", {
                 message: "要关闭的房间无效",
                 target: `room/${key}`,
+                action: "room.close",
             });
         }
         room.close();
@@ -393,9 +409,10 @@ export class Room extends BasePlugin {
         const arr = [...this.map];
         const index = arr.findIndex(([k]) => k == key);
         if (index == -1) {
-            throw appError("room:move_unexist", {
+            throw appError("room:notFound", {
                 message: "要移动的房间不存在",
                 target: `room/${key}`,
+                action: "room.move",
             });
         }
         const [item] = arr.splice(index, 1);
@@ -408,9 +425,10 @@ export class Room extends BasePlugin {
         const arr = [...this.map];
         const index = arr.findIndex(([k]) => k == oldKey);
         if (index == -1) {
-            throw appError("room:changekey_unexist", {
+            throw appError("room:notFound", {
                 message: "要更改key的房间不存在",
                 target: `room/${oldKey}`,
+                action: "room.changeKey",
             });
         }
         let room = arr[index][1];

package/dist/value/manager.js

@@ -1,5 +1,8 @@
 import { appError } from "../error/index.js";
 import { bindCommand } from "../utils/index.js";
+// 错误列表
+// value:notFound 值不存在
+// value:alreadyExists 值已存在
 export class ValueManager {
     list = new Map();
     app;
@@ -9,6 +12,13 @@ export class ValueManager {
     }
     /** 注册值 */
     register(name, { get, set, pluginName }) {
+        if (this.list.has(name)) {
+            throw appError("value:alreadyExists", {
+                message: "值已存在",
+                target: `value/${name}`,
+                action: "value.register",
+            });
+        }
         this.list.set(name, { get, set, pluginName });
         this.app.emit("value:register", { name, value: get() }, { source: `plugin:${pluginName}` });
         return {
@@ -19,15 +29,26 @@ export class ValueManager {
     }
     /** 注销值 */
     unregister(name) {
-        this.list.delete(name);
-        this.app.emit("value:unregister", { name });
+        const result = this.list.delete(name);
+        if (!result) {
+            throw appError("value:notFound", {
+                message: "无法注销未注册的值",
+                target: `value/${name}`,
+                action: "value.unregister",
+            });
+        }
+        else {
+            this.app.emit("value:unregister", { name });
+        }
     }
     /** 获取值 */
     get(name, options) {
         const item = this.list.get(name);
         if (!item)
-            throw appError("value:get_unexist", {
+            throw appError("value:notFound", {
                 message: "无法获取未注册的值",
+                target: `value/${name}`,
+                action: "value.get",
             });
         return item.get(options);
     }
@@ -39,7 +60,7 @@ export class ValueManager {
     set(name, value, options) {
         const valueItem = this.list.get(name);
         if (valueItem?.set) {
-            valueItem?.set(value, options);
+            valueItem.set(value, options);
             return true;
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "floating-live",
-  "version": "0.17.0-alpha.13",
+  "version": "0.17.0-alpha.14",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",