floating-live 0.16.0-alpha.4 → 0.16.0-alpha.6

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, PluginInitOptions } from "./plugin";
+import { AppPluginExposesMap, PluginContext, PluginInitOptions } from "./plugin";
 import { CustomEventEmitter } from "./utils/EventEmitter";
 import { AppValueMap, ValueOptions } from "./value";
 export declare class App extends CustomEventEmitter implements PluginContext {
@@ -10,9 +10,10 @@ 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;
     /** 发送错误 */
@@ -23,7 +24,8 @@ export declare class App extends CustomEventEmitter implements PluginContext {
     /** 取消注册插件 */
     unregister(pluginName: string): void;
     getPlugin(pluginName: string): void;
-    whenRegister(pluginName: string, callback: (exposes: any) => (() => void) | undefined): void;
+    whenRegister<K extends keyof AppPluginExposesMap>(pluginName: K, callback: (exposes: AppPluginExposesMap[K]) => (() => void) | undefined): void;
+    whenRegister(pluginName: string, callback: () => (() => void) | undefined): void;
     getPluginExposes(pluginName: string): any;
     hasPlugin(pluginName: string): boolean;
     registerCommand<T extends keyof AppCommandMap>(name: T, func: CommandFunction<AppCommandMap[T]>, options?: CommandOptions): void;
@@ -43,4 +45,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

@@ -21,7 +21,7 @@ export declare class CommonPluginContext implements PluginContext {
     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;
+    whenRegister(pluginName: string, callback: (exposes: any) => (() => void) | undefined): void;
     hasPlugin(pluginName: string): boolean;
     registerValue<K extends keyof AppValueMap>(name: K, options: ValueOptions<AppValueMap[K]>): void;
     unregisterValue(name: string): 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/types.d.ts

@@ -39,7 +39,8 @@ export interface PluginContext {
     /** 获取插件暴露对象 */
     getPluginExposes<K extends keyof AppPluginExposesMap>(pluginName: K): AppPluginExposesMap[K];
     /** 等待plugin注册 */
-    whenRegister(pluginName: string, callback: (exposes: any) => (() => void) | void): void;
+    whenRegister<K extends keyof AppPluginExposesMap>(pluginName: K, callback: (exposes: AppPluginExposesMap[K]) => (() => void) | undefined): void;
+    whenRegister(pluginName: string, callback: () => (() => void) | void): void;
     /** 是否存在插件 */
     hasPlugin(pluginName: string): boolean;
     /** 注册指令 */
@@ -71,6 +72,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.4",
+  "version": "0.16.0-alpha.6",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",