floating-live 0.15.0 → 0.15.2

package/dist/live.js

@@ -25,7 +25,9 @@ class FloatingLive extends events_1.EventEmitter {
         return super.on(eventName, listener);
     }
     emit(eventName, ...args) {
-        return super.emit(eventName, ...args);
+        const emit = super.emit(eventName, ...args);
+        super.emit("event", eventName, ...args);
+        return emit;
     }
     throw(err) {
         this.emit("error", err);

package/dist/module/hook.d.ts

@@ -1,6 +1,6 @@
 import { FloatingLive } from "../live";
 import { FloatingHookMap } from "../types/hook";
-export declare type HookFunction<T> = (ctx: T) => boolean | void | Promise<boolean | void>;
+export type HookFunction<T> = (ctx: T) => boolean | void | Promise<boolean | void>;
 export declare class ModHook {
     private list;
     protected readonly main: FloatingLive;

package/dist/module/plugin.d.ts

@@ -1,15 +1,12 @@
 import { FloatingLive } from "../live";
 import { PluginConstructor } from "../types/plugin";
 export declare class ModPlugin {
-    private current;
     /** 插件列表 */
     private list;
     protected readonly main: FloatingLive;
     constructor(main: FloatingLive);
-    /** 获取当前安装插件 */
-    get currentPlugin(): string | null;
     /** 注册插件 */
-    register(pluginFunc: PluginConstructor, options?: any): void;
+    register(pluginFunc: PluginConstructor, options?: any): Promise<void> | undefined;
     /** 移除插件 */
     unregister(name: string): void;
     /** 获取插件实例 */

package/dist/module/plugin.js

@@ -3,15 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModPlugin = void 0;
 class ModPlugin {
     constructor(main) {
-        this.current = null;
         /** 插件列表 */
         this.list = new Map();
         this.main = main;
     }
-    /** 获取当前安装插件 */
-    get currentPlugin() {
-        return this.current;
-    }
     /** 注册插件 */
     register(pluginFunc, options) {
         const name = pluginFunc.pluginName;
@@ -29,11 +24,18 @@ class ModPlugin {
             }));
             return;
         }
-        // 执行插件函数
-        const plugin = new pluginFunc(this.main, options);
-        this.list.set(name, plugin);
-        this.main.emit("plugin:add", name);
-        this.current = null;
+        return this.main.hook
+            .call("plugin.register", { name, options })
+            .then((res) => {
+            if (!res)
+                return;
+            // 执行插件函数
+            const plugin = new pluginFunc(this.main, options);
+            this.list.set(name, plugin);
+            // 调用插件的register钩子
+            plugin.register?.(this.main, options);
+            this.main.emit("plugin:add", name);
+        });
     }
     /** 移除插件 */
     unregister(name) {
@@ -46,7 +48,7 @@ class ModPlugin {
             }));
             return;
         }
-        // 获取该插件的销毁函数
+        // 调用该插件的destroy钩子
         plugin.destroy?.();
         // 从列表中移除插件
         this.list.delete(name);

package/dist/module/room.js

@@ -27,7 +27,7 @@ class ModRoom {
         // 添加监听事件
         // 直播消息
         room.on("message", (data) => {
-            this.main.hook.call("message", data).then((res) => {
+            this.main.hook.call("message", { message: data }).then((res) => {
                 res && this.main.emit("live:message", data);
             });
         });
@@ -84,7 +84,7 @@ class ModRoom {
     add(platform, id, options) {
         const opt = typeof options == "boolean" ? { open: options } : options;
         const ctx = { platform, id, options: opt || {} };
-        this.main.hook.call("add", ctx).then((res) => {
+        this.main.hook.call("room.add", ctx).then((res) => {
             if (!res)
                 return;
             const room = this.main.call(`${platform}.room.create`, id, opt);

package/dist/module/value.d.ts

@@ -9,13 +9,13 @@ export declare class ModValue {
     protected readonly main: FloatingLive;
     constructor(main: FloatingLive);
     /** 注册值 */
-    register<T>(name: string, config: ValueConfig<T>): void;
+    register<T extends keyof FloatingValueMap>(name: T, config: ValueConfig<FloatingValueMap[T]>): void;
     /** 取消注册 */
     unregister(name: string): void;
     /** 获取值 */
-    get(name: string): any;
+    get<T extends keyof FloatingValueMap>(name: T): any;
     /** 设置值 */
-    set(name: string, value: any): boolean;
+    set<T extends keyof FloatingValueMap>(name: T, value: FloatingValueMap[T]): boolean;
     /** 获取注册的所有值 */
     getSnapshot(): Record<string, any>;
     emit<T extends keyof FloatingValueMap>(name: T, value: FloatingValueMap[T]): void;

package/dist/types/events.d.ts

@@ -33,5 +33,6 @@ export interface FloatingEventMap {
     "value:remove": (name: string) => void;
     "value:change": (name: string, value: any) => void;
     [name: `change:${string}`]: (value: any) => void;
+    event: (eventName: string, ...args: any[]) => void;
     error: (err: Error) => void;
 }

package/dist/types/hook.d.ts

@@ -1,9 +1,15 @@
 import { Message } from "./message";
 export interface FloatingHookMap {
-    message: Message.All;
-    add: {
+    message: {
+        message: Message.All;
+    };
+    "room.add": {
         platform: string;
         id: string | number;
         options: Record<string, any>;
     };
+    "plugin.register": {
+        name: string;
+        options: Record<string, any>;
+    };
 }

package/dist/types/plugin.d.ts

@@ -1,13 +1,13 @@
 import { FloatingLive } from "../live";
 /** 插件模块, 加载时调用 */
-export declare type FloatingLivePlugin<C extends object = object> = () => {
+export type FloatingLivePlugin<C extends object = object> = () => {
     /** 插件名称 */
     name: string;
     register: (ctx: FloatingLive, options?: C) => void;
     destroy?: (ctx: FloatingLive) => void;
 };
 export interface IPlugin {
-    [key: string]: any;
+    register?(ctx: FloatingLive, options: any): void;
     destroy?(): void;
 }
 export interface PluginConstructor {

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "floating-live",
-  "version": "0.15.0",
+  "version": "0.15.2",
   "type": "commonjs",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "Minteea",
-  "license": "GPLv3",
+  "license": "MIT",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -34,7 +34,8 @@
     "test": "npm run clear && ts-node demo/demo.ts",
     "build-test": "npm run build && node demo/demo.js",
     "build": "npm run clear && npm run tsc",
-    "prepare": "npm run build"
+    "prepack": "npm run build",
+    "postpack": "npm run clear"
   },
   "devDependencies": {
     "rimraf": "^3.0.2",