floating-live 0.16.0-alpha.3 → 0.16.0-alpha.5

package/dist/app.d.ts

@@ -2,7 +2,7 @@ import { CommandOptions, CommandCallOptions, AppCommandMap, CommandFunction } fr
 import { AppError } from "./error";
 import { AppEventDetailMap, AppEventEmitOptions, AppEventListener } from "./event";
 import { AppHookMap, HookCallOptions, HookContext, HookFunction, HookUseOptions } from "./hook";
-import { PluginContext, PluginRegisterOptions } from "./plugin";
+import { PluginContext, PluginInitOptions } from "./plugin";
 import { CustomEventEmitter } from "./utils/EventEmitter";
 import { AppValueMap, ValueOptions } from "./value";
 export declare class App extends CustomEventEmitter implements PluginContext {
@@ -10,16 +10,17 @@ export declare class App extends CustomEventEmitter implements PluginContext {
     private pluginManager;
     private commandManager;
     private valueManager;
+    private abortController;
     constructor();
-    on<K extends keyof AppEventDetailMap>(type: K, listener: AppEventListener<AppEventDetailMap[K]>): void;
-    once<K extends keyof AppEventDetailMap>(type: K, listener: AppEventListener<AppEventDetailMap[K]>): void;
+    on<K extends keyof AppEventDetailMap>(type: K, listener: AppEventListener<AppEventDetailMap[K]>, signal?: AbortSignal): void;
+    once<K extends keyof AppEventDetailMap>(type: K, listener: AppEventListener<AppEventDetailMap[K]>, signal?: AbortSignal): void;
     off<K extends keyof AppEventDetailMap>(type: K, listener: AppEventListener<AppEventDetailMap[K]>): void;
     emit<K extends keyof AppEventDetailMap>(type: K, detail: AppEventDetailMap[K], options?: AppEventEmitOptions & EventInit): void;
     /** 发送错误 */
     throw(err?: Error): void;
     error(id: string, detail?: Record<string, any>): AppError;
     /** 注册插件 */
-    register(plugin: any, options?: PluginRegisterOptions): void;
+    register(plugin: any, options?: PluginInitOptions): void;
     /** 取消注册插件 */
     unregister(pluginName: string): void;
     getPlugin(pluginName: string): void;
@@ -43,4 +44,5 @@ export declare class App extends CustomEventEmitter implements PluginContext {
     destroy(): void;
     /** 拓展值 */
     define(): void;
+    get signal(): AbortSignal;
 }

package/dist/app.js

@@ -7,16 +7,17 @@ import { ValueManager } from "./value/manager";
 export class App extends CustomEventEmitter {
     constructor() {
         super();
+        this.abortController = new AbortController();
         this.hookManager = new HookManager(this);
         this.pluginManager = new PluginManager(this);
         this.commandManager = new CommandManager(this);
         this.valueManager = new ValueManager(this);
     }
-    on(type, listener) {
-        super.on(type, listener);
+    on(type, listener, signal = this.signal) {
+        super.on(type, listener, signal);
     }
-    once(type, listener) {
-        super.once(type, listener);
+    once(type, listener, signal = this.signal) {
+        super.once(type, listener, signal);
     }
     off(type, listener) {
         super.off(type, listener);
@@ -119,8 +120,13 @@ export class App extends CustomEventEmitter {
     setValue(name, value) {
         this.valueManager.set(name, value);
     }
-    destroy() { }
+    destroy() {
+        this.abortController.abort();
+    }
     //--- 其他 ---//
     /** 拓展值 */
     define() { }
+    get signal() {
+        return this.abortController.signal;
+    }
 }

package/dist/plugin/context/CommonPluginContext.d.ts

@@ -4,7 +4,7 @@ import { AppError, ErrorOptions } from "../../error";
 import { AppEventListener, AppEventEmitOptions, AppEventDetailMap } from "../../event";
 import { HookUseOptions, HookCallOptions, AppHookMap, HookFunction, HookContext } from "../../hook";
 import { AppValueMap, ValueOptions } from "../../value";
-import type { PluginContext, PluginConstructor, PluginRegisterOptions, AppPluginExposesMap } from "../types";
+import type { PluginContext, PluginConstructor, PluginInitOptions, AppPluginExposesMap } from "../types";
 export declare class CommonPluginContext implements PluginContext {
     #private;
     get safe(): boolean;
@@ -18,7 +18,7 @@ export declare class CommonPluginContext implements PluginContext {
      */
     throw(err: AppError): void;
     error(id: string, options: ErrorOptions): AppError;
-    register(plugin: PluginConstructor, options?: PluginRegisterOptions): void;
+    register(plugin: PluginConstructor, options?: PluginInitOptions): void;
     unregister(pluginName: string): void;
     getPluginExposes<K extends keyof AppPluginExposesMap>(pluginName: K): AppPluginExposesMap[K];
     whenRegister<T>(pluginName: string, callback: (exposes: any) => (() => void) | undefined): (() => void) | void;
@@ -42,4 +42,5 @@ export declare class CommonPluginContext implements PluginContext {
     getValue<K extends keyof AppValueMap>(name: K): undefined;
     setValue<K extends keyof AppValueMap>(name: K, value: AppValueMap[K]): void;
     destroy(): void;
+    get signal(): AbortSignal;
 }

package/dist/plugin/context/CommonPluginContext.js

@@ -9,7 +9,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _CommonPluginContext_app, _CommonPluginContext_registered;
+var _CommonPluginContext_app, _CommonPluginContext_abortController, _CommonPluginContext_registered;
 import { AppError } from "../../error";
 class ListMap extends Map {
     addItem(key, value) {
@@ -35,6 +35,8 @@ export class CommonPluginContext {
     constructor(app, pluginName) {
         /** 主程序，插件不可访问 */
         _CommonPluginContext_app.set(this, void 0);
+        /** AbortController，插件不可访问 */
+        _CommonPluginContext_abortController.set(this, new AbortController());
         _CommonPluginContext_registered.set(this, {
             plugins: new Set(),
             values: new Set(),
@@ -262,12 +264,15 @@ export class CommonPluginContext {
         }
     }
     destroy() {
-        const { plugins, events, values, hooks, commands } = __classPrivateFieldGet(this, _CommonPluginContext_registered, "f");
+        const { plugins, values, hooks, commands } = __classPrivateFieldGet(this, _CommonPluginContext_registered, "f");
         plugins.forEach((pluginName) => __classPrivateFieldGet(this, _CommonPluginContext_app, "f").unregister(pluginName));
-        events.forEach((listenerList, eventName) => listenerList.forEach((listener) => __classPrivateFieldGet(this, _CommonPluginContext_app, "f").off(eventName, listener)));
         hooks.forEach((hookList, name) => hookList.forEach((hookFunc) => __classPrivateFieldGet(this, _CommonPluginContext_app, "f").off(name, hookFunc)));
         commands.forEach((name) => __classPrivateFieldGet(this, _CommonPluginContext_app, "f").unregisterCommand(name));
         values.forEach((name) => __classPrivateFieldGet(this, _CommonPluginContext_app, "f").unregisterValue(name));
+        __classPrivateFieldGet(this, _CommonPluginContext_abortController, "f").abort();
+    }
+    get signal() {
+        return __classPrivateFieldGet(this, _CommonPluginContext_abortController, "f").signal;
     }
 }
-_CommonPluginContext_app = new WeakMap(), _CommonPluginContext_registered = new WeakMap();
+_CommonPluginContext_app = new WeakMap(), _CommonPluginContext_abortController = new WeakMap(), _CommonPluginContext_registered = new WeakMap();

package/dist/plugin/context/SafePluginContext.d.ts

@@ -2,7 +2,7 @@ import { App } from "../../app";
 import { AppCommandMap, CommandCallOptions, CommandFunction, CommandOptions } from "../../command";
 import { AppEventDetailMap, AppEventEmitOptions } from "../../event";
 import { AppHookMap, HookCallOptions, HookContext, HookFunction, HookUseOptions } from "../../hook";
-import { PluginConstructor, PluginRegisterOptions } from "../types";
+import { PluginConstructor, PluginInitOptions } from "../types";
 import { CommonPluginContext } from "./CommonPluginContext";
 export interface PluginPermissions {
     "plugin.register"?: boolean;
@@ -22,7 +22,7 @@ export declare class SafePluginContext extends CommonPluginContext {
         permissions: PluginPermissions;
     });
     private throwNotPermitted;
-    register(plugin: PluginConstructor, options?: PluginRegisterOptions): void;
+    register(plugin: PluginConstructor, options?: PluginInitOptions): void;
     unregister(pluginName: string): void;
     emit<K extends keyof AppEventDetailMap>(type: K, detail: AppEventDetailMap[K], options?: AppEventEmitOptions & EventInit): void;
     call<T extends keyof AppCommandMap>(name: T, ...args: Parameters<AppCommandMap[T]>): ReturnType<AppCommandMap[T]>;

package/dist/plugin/manager.js

@@ -38,8 +38,8 @@ export class PluginManager {
                 return;
             // 执行插件函数
             const plugin = new pluginConstructor(pluginCtx, registerCtx.options || {});
-            // 调用插件的register钩子
-            await plugin.register?.(pluginCtx, registerCtx.options || {});
+            // 调用插件的init钩子
+            await plugin.init?.(pluginCtx, registerCtx.options || {});
             // 调用插件的expose钩子
             const exposes = await plugin.expose?.(pluginCtx);
             this.list.set(pluginName, { plugin, context: pluginCtx, exposes });

package/dist/plugin/types.d.ts

@@ -6,7 +6,7 @@ import { AppValueMap, ValueOptions } from "../value";
 /** 插件对象 */
 export interface PluginItem {
     pluginName: string;
-    register?(ctx: PluginContext, options?: Record<string, any>): void | Promise<void>;
+    init?(ctx: PluginContext, options?: Record<string, any>): void | Promise<void>;
     destroy?(ctx: PluginContext): void | Promise<void>;
     expose?(ctx: PluginContext): any;
 }
@@ -15,8 +15,8 @@ export interface PluginConstructor {
     pluginName: string;
     new (ctx: PluginContext, options: any): PluginItem;
 }
-/** 插件注册选项 */
-export interface PluginRegisterOptions {
+/** 插件初始化选项 */
+export interface PluginInitOptions {
 }
 /** 插件上下文 */
 export interface PluginContext {
@@ -33,7 +33,7 @@ export interface PluginContext {
     /** 生成错误 */
     error(id: string, options: ErrorOptions): AppError;
     /** 注册插件 */
-    register(plugin: PluginConstructor, options?: PluginRegisterOptions): void;
+    register(plugin: PluginConstructor, options?: PluginInitOptions): void;
     /** 取消注册插件 */
     unregister(pluginName: string): void;
     /** 获取插件暴露对象 */
@@ -71,6 +71,7 @@ export interface PluginContext {
     /** 设置值 */
     setValue<K extends keyof AppValueMap>(name: K, value: AppValueMap[K]): void;
     destroy(): void;
+    get signal(): AbortSignal;
 }
 export interface AppPluginExposesMap {
     "": {};

package/dist/utils/EventEmitter.d.ts

@@ -1,6 +1,6 @@
 export declare class CustomEventEmitter extends EventTarget {
-    on(type: string, listener: (e: any) => void): void;
-    once(type: string, listener: (e: any) => void): void;
+    on(type: string, listener: (e: any) => void, signal?: AbortSignal): void;
+    once(type: string, listener: (e: any) => void, signal?: AbortSignal): void;
     off(type: string, listener: (e: any) => void): void;
     emit(type: string, detail: any, options?: EventInit): void;
 }

package/dist/utils/EventEmitter.js

@@ -10,11 +10,11 @@ function getListenerCallback(listener) {
     return newItem;
 }
 export class CustomEventEmitter extends EventTarget {
-    on(type, listener) {
-        this.addEventListener(type, getListenerCallback(listener));
+    on(type, listener, signal) {
+        this.addEventListener(type, getListenerCallback(listener), { signal });
     }
-    once(type, listener) {
-        this.addEventListener(type, getListenerCallback(listener), { once: true });
+    once(type, listener, signal) {
+        this.addEventListener(type, getListenerCallback(listener), { once: true, signal });
     }
     off(type, listener) {
         this.removeEventListener(type, getListenerCallback(listener));

package/package.json

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