floating-live 0.17.0-alpha.6 → 0.17.0-alpha.9

package/dist/event/types.d.ts

@@ -1,3 +1,4 @@
+import { PluginInfo } from "../plugin/index.js";
 export interface AppEventEmitOptions {
     /** 事件来源 */
     source?: string;
@@ -19,11 +20,10 @@ export interface AppEventDetailMap {
     "command:unregister": {
         name: string;
     };
-    "plugin:register": {
-        pluginName: string;
-    };
+    "plugin:register": PluginInfo;
     "plugin:unregister": {
         pluginName: string;
+        role: string;
     };
     "value:register": {
         name: string;

package/dist/plugin/index.d.ts

@@ -2,7 +2,9 @@ import type { PluginItem, PluginContext } from "./types.js";
 export type * from "./types.js";
 export declare class BasePlugin implements PluginItem {
     static pluginName: string;
+    static role?: string;
     get pluginName(): string;
+    get role(): string | undefined;
     ctx: PluginContext;
     constructor(ctx: PluginContext, options?: any);
 }

package/dist/plugin/index.js

@@ -1,8 +1,12 @@
 export class BasePlugin {
     static pluginName;
+    static role;
     get pluginName() {
         return this.constructor.pluginName;
     }
+    get role() {
+        return this.constructor.role;
+    }
     ctx;
     constructor(ctx, options) {
         this.ctx = ctx;

package/dist/plugin/manager.d.ts

@@ -6,9 +6,9 @@ export declare class PluginManager {
     private whenRegisterMap;
     protected readonly app: App;
     constructor(app: App);
-    registerSync<P extends PluginItem>(pluginConstructor: PluginConstructor<P>, options?: Record<string, any>, { context, core, unremovable, accessApp, pluginType, }?: PluginRegisterOptions): P;
+    registerSync<P extends PluginItem>(pluginConstructor: PluginConstructor<P>, options?: Record<string, any>, { context, unremovable, accessApp, pluginType, }?: PluginRegisterOptions): P;
     /** 注册插件 */
-    register<P extends PluginItem>(pluginConstructor: PluginConstructor<P>, options?: Record<string, any>, { context, core, unremovable, accessApp, pluginType, }?: PluginRegisterOptions): Promise<P>;
+    register<P extends PluginItem>(pluginConstructor: PluginConstructor<P>, options?: Record<string, any>, { context, unremovable, accessApp, pluginType, }?: PluginRegisterOptions): Promise<P>;
     /** 移除插件 */
     unregister(pluginName: string): Promise<void>;
     /** 获取插件实例 */

package/dist/plugin/manager.js

@@ -10,8 +10,9 @@ export class PluginManager {
         this.app = app;
         app.registerCommand("plugin.snapshot", bindCommand(this.toSnapshot, this));
     }
-    registerSync(pluginConstructor, options = {}, { context, core, unremovable, accessApp, pluginType, } = {}) {
+    registerSync(pluginConstructor, options = {}, { context, unremovable = false, accessApp = false, pluginType = "", } = {}) {
         const pluginName = pluginConstructor.pluginName;
+        const role = pluginConstructor.role || "";
         if (!pluginName) {
             throw appError("plugin:register_id_missing", {
                 message: "插件注册失败",
@@ -45,13 +46,20 @@ export class PluginManager {
             // 将插件数据注册到列表中
             this.list.set(pluginName, {
                 plugin,
+                role,
                 context: pluginCtx,
                 exposes,
-                unremovable: core || unremovable || false,
-                accessApp: core || accessApp || false,
-                pluginType: core ? "core" : pluginType || "",
+                unremovable: unremovable || false,
+                accessApp: accessApp || false,
+                pluginType: pluginType || "",
+            });
+            this.app.emit("plugin:register", {
+                pluginName,
+                role,
+                unremovable,
+                accessApp,
+                pluginType,
             });
-            this.app.emit("plugin:register", { pluginName });
             // 如果有whenRegister的回调，调用回调函数
             const callbackMap = this.whenRegisterMap.get(pluginName);
             if (callbackMap) {
@@ -71,8 +79,9 @@ export class PluginManager {
         }
     }
     /** 注册插件 */
-    async register(pluginConstructor, options = {}, { context, core, unremovable, accessApp, pluginType, } = {}) {
+    async register(pluginConstructor, options = {}, { context, unremovable = false, accessApp = false, pluginType = "", } = {}) {
         const pluginName = pluginConstructor.pluginName;
+        const role = pluginConstructor.role || "";
         if (!pluginName) {
             throw appError("plugin:register_id_missing", {
                 message: "插件注册失败",
@@ -106,13 +115,20 @@ export class PluginManager {
             const exposes = await plugin.expose?.(pluginCtx);
             this.list.set(pluginName, {
                 plugin,
+                role,
                 context: pluginCtx,
                 exposes,
-                unremovable: core || unremovable || false,
-                accessApp: core || accessApp || false,
-                pluginType: core ? "core" : pluginType || "",
+                unremovable: unremovable,
+                accessApp: accessApp,
+                pluginType: pluginType,
+            });
+            this.app.emit("plugin:register", {
+                pluginName,
+                role,
+                unremovable,
+                accessApp,
+                pluginType,
             });
-            this.app.emit("plugin:register", { pluginName });
             // 如果有whenRegister的回调，调用回调函数
             const callbackMap = this.whenRegisterMap.get(pluginName);
             if (callbackMap) {
@@ -157,7 +173,7 @@ export class PluginManager {
             // 从列表中移除插件
             this.list.delete(pluginName);
             // 移除插件注册事件
-            this.app.emit("plugin:unregister", { pluginName });
+            this.app.emit("plugin:unregister", { pluginName, role: pluginData.role });
             // 如果有whenRegister的回调，调用whenUnregistered函数并将回调函数从列表中移除
             const callbackMap = this.whenRegisterMap.get(pluginName);
             if (callbackMap) {

package/dist/plugin/types.d.ts

@@ -24,6 +24,7 @@ export interface PluginItem {
 /** 插件构造器 */
 export interface PluginConstructor<P extends PluginItem> {
     pluginName: string;
+    role?: string;
     new (ctx: PluginContext, options: any): P;
 }
 /** 插件初始化选项 */
@@ -33,8 +34,6 @@ export interface PluginInitOptions {
 export interface PluginRegisterOptions {
     /** 提供的插件上下文 */
     context?: PluginContext;
-    /** 核心插件，不可解除注册 @deprecated */
-    core?: boolean;
     /** 不可注销 */
     unremovable?: boolean;
     /** 可访问App实例 */
@@ -44,6 +43,7 @@ export interface PluginRegisterOptions {
 }
 export interface PluginData<T> {
     plugin: PluginItem;
+    role: string;
     context: PluginContext;
     exposes?: T;
     unremovable: boolean;
@@ -52,6 +52,15 @@ export interface PluginData<T> {
     /** 插件类型 */
     pluginType: "core" | "framework" | "";
 }
+export interface PluginInfo {
+    pluginName: string;
+    role: string;
+    unremovable: boolean;
+    /** 可访问App实例 */
+    accessApp: boolean;
+    /** 插件类型 */
+    pluginType: "core" | "framework" | "";
+}
 /** 插件上下文 */
 export interface PluginContext {
     /** 安全插件上下文 */

package/dist/plugins/room/index.d.ts

@@ -8,7 +8,7 @@ export interface RoomCreateOptions {
     [option: string]: any;
 }
 interface PluginExposes {
-    add(platform: string, id: number, options?: boolean | RoomCreateOptions): void;
+    add(platform: string, id: number, options?: boolean | RoomCreateOptions): Promise<void>;
     remove(key: string): void;
     get(key: string): LiveRoom | InvalidLiveRoom | undefined;
     has(key: string): boolean;
@@ -27,7 +27,7 @@ declare module "../../index.js" {
         close: (key: string) => void;
         update: (key: string) => void;
         "room.snapshot": () => LiveRoomData[];
-        "room.validate": (key: string) => void;
+        "room.validate": (key: string, options: RoomCreateOptions) => void;
         "room.invalidate": (key: string) => void;
         [name: `${string}.room.create`]: (id: string | number, options: RoomCreateOptions) => LiveRoom | Promise<LiveRoom>;
         [name: `${string}.room.data`]: (id: string | number) => LiveRoomData | Promise<LiveRoomData>;

package/dist/plugins/room/index.js

@@ -17,6 +17,8 @@ export class Room extends BasePlugin {
         ctx.registerCommand("update", bindCommand(this.update, this));
         ctx.registerCommand("move", bindCommand(this.move, this));
         ctx.registerCommand("room.snapshot", bindCommand(this.toSnapshot, this));
+        ctx.registerCommand("room.validate", bindCommand(this.validate, this));
+        ctx.registerCommand("room.invalidate", bindCommand(this.invalidate, this));
     }
     expose() {
         return {
@@ -47,8 +49,8 @@ export class Room extends BasePlugin {
             if (open) {
                 room.open();
             }
-            this.ctx.emit("room:add", { key, room: room.toData() });
         }
+        this.ctx.emit("room:add", { key, room: room.toData() });
     }
     /** 移除房间监听实例 */
     detach(key) {

package/package.json

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