update

Author: zhangfisher

packages/native/src/event.ts

@@ -67,7 +67,8 @@ import { getWeakRef } from "./utils/getWeakRef";
 import { getPromiseResults } from "./utils/getPromiseResults";
 import { isPromise } from "./utils/isPromise";
 import { resolveValue } from "./utils/resolveValue";
-import { FastEventHooks } from "./types/FastEventHooks";
+import { AfterExecuteListenerHook, FastEventHooks } from "./types/FastEventHooks";
+import { ItemOf } from "../../viewer/src/types";
 
 /**
  * FastEvent 事件发射器类
@@ -181,21 +182,47 @@ export class FastEvent<
         }
         return this._hooks;
     }
+    private _execAfterExecuteListener(fn: Function, args: Parameters<AfterExecuteListenerHook>) {
+        Promise.allSettled(args[1]).then((r: any[]) => {
+            args[1] = getPromiseResults(r);
+            fn!.apply(this, args as any);
+        });
+    }
     /**
      * 执行Hook
      * @param hookName
      * @param args
      * @returns
      */
-    private _executeHooks(hookName: keyof FastEventHooks, args: any[]) {
-        if (!this._hooks) return;
-        const hooks = this.hooks[hookName];
-        if (Array.isArray(hooks)) {
-            Promise.allSettled(
-                hooks.map((hook) => {
-                    return (hook as any).apply(this, args);
-                }),
-            );
+    private _executeHooks<T extends keyof FastEventHooks>(
+        hookName: T,
+        args: Parameters<ItemOf<FastEventHooks[T]>>,
+        onlyAsyncHook: boolean = false,
+    ) {
+        setTimeout(() => {
+            if (!this._hooks) return;
+            const hooks = this.hooks[hookName];
+            if (Array.isArray(hooks) && hooks.length > 0) {
+                Promise.allSettled(
+                    hooks.map((hook) => {
+                        if (hookName === "AfterExecuteListener") {
+                            this._execAfterExecuteListener(hook, args as any);
+                        } else {
+                            return (hook as any).apply(this, args);
+                        }
+                    }),
+                );
+            }
+        });
+        if (!onlyAsyncHook) {
+            const hookMethod = this.options[`on${hookName}`] as Function;
+            if (isFunction(hookMethod)) {
+                if (hookName === "AfterExecuteListener") {
+                    this._execAfterExecuteListener(hookMethod, args as any);
+                } else {
+                    return hookMethod.apply(this, args);
+                }
+            }
         }
     }
     /**
@@ -302,30 +329,28 @@ export class FastEvent<
             const isRemove = item === listener;
             if (isRemove) {
                 this.listenerCount--;
-                if (isFunction(this._options.onRemoveListener)) {
-                    this._options.onRemoveListener(path.join(this._delimiter), listener);
-                }
+                this._executeHooks("RemoveListener", [path.join(this._delimiter), listener]);
             }
             return isRemove;
         });
     }
-    /**
-     * 调用onAddListener HOOK
-     * @param type
-     * @param listener
-     * @param options
-     * @returns
-     */
-    private _onAddListener(type: string, listener: any, options: any) {
-        if (isFunction(this._options.onAddListener)) {
-            const r = this._options.onAddListener(type, listener, options);
-            if (r === false) {
-                throw new CancelError();
-            } else if (isSubsctiber(r)) {
-                return r;
-            }
-        }
-    }
+    // /**
+    //  * 调用onAddListener HOOK
+    //  * @param type
+    //  * @param listener
+    //  * @param options
+    //  * @returns
+    //  */
+    // private _onAddListener(type: string, listener: any, options: any) {
+    //     if (isFunction(this._options.onAddListener)) {
+    //         const r = this._options.onAddListener(type, listener, options);
+    //         if (r === false) {
+    //             throw new CancelError();
+    //         } else if (isSubsctiber(r)) {
+    //             return r;
+    //         }
+    //     }
+    // }
     /**
      * 注册事件监听器
      * @param type - 事件类型，支持以下格式：
@@ -420,18 +445,18 @@ export class FastEvent<
             ) as FastEventIteratorOptions;
             const iterator = createAsyncEventIterator<any>(this as any, type, iteratorOpts);
             iterator.create(finalOptions);
-            this._onAddListener(type, iterator.listener, finalOptions);
+            this._executeHooks("AddListener", [type, iterator.listener, finalOptions]);
             return iterator;
         }
         // 执行回调
-        if (isFunction(this._options.onAddListener)) {
-            const r = this._options.onAddListener(type, listener, finalOptions);
-            if (r === false) {
-                throw new CancelError();
-            } else if (isSubsctiber(r)) {
-                return r;
-            }
+        // if (isFunction(this._options.onAddListener)) {
+        const r = this._executeHooks("AddListener", [type, listener, finalOptions]);
+        if (r === false) {
+            throw new CancelError();
+        } else if (isSubsctiber(r)) {
+            return r;
         }
+        // }
 
         const parts = type.split(this._delimiter);
 
@@ -622,20 +647,32 @@ export class FastEvent<
             let count = 0;
             this._traverseListeners(this.listeners, parts, (path, node) => {
                 count += node.__listeners.length;
-                node.__listeners = [];
+                try {
+                    node.__listeners.forEach((listener) => {
+                        this._executeHooks("RemoveListener", [
+                            path.join(this.options.delimiter),
+                            listener[0],
+                        ]);
+                    });
+                } finally {
+                    node.__listeners = [];
+                }
             });
             this.listenerCount -= count;
             this._removeRetainedEvents(entry);
         } else {
-            let count = 0;
-            this._traverseListeners(this.listeners, [], (path, node) => {
-                count += node.__listeners.length;
-            });
-            this.listenerCount -= count;
-            this.retainedMessages.clear();
-            this.listeners = { __listeners: [] } as unknown as FastListeners;
+            try {
+                let count = 0;
+                this._traverseListeners(this.listeners, [], (path, node) => {
+                    count += node.__listeners.length;
+                });
+                this.listenerCount -= count;
+                this.retainedMessages.clear();
+                this.listeners = { __listeners: [] } as unknown as FastListeners;
+            } finally {
+                this._executeHooks("ClearListeners", []);
+            }
         }
-        if (isFunction(this._options.onClearListeners)) this._options.onClearListeners.call(this);
     }
     /**
      * 移除保留的事件
@@ -787,11 +824,7 @@ export class FastEvent<
             // @ts-ignore
             e._emitter = `${listener.name || "anonymous"}:${message.type}`;
         }
-        if (isFunction(this._options.onListenerError)) {
-            try {
-                this._options.onListenerError.call(this, e, listener, message, args);
-            } catch {}
-        }
+        this._executeHooks("ListenerError", [e, listener, message, args]);
         if (this._options.ignoreErrors) {
             return e;
         } else {
@@ -862,7 +895,9 @@ export class FastEvent<
             }
             return result;
         } catch (e: any) {
-            return this._onListenerError(listenerFn, message, args, e);
+            const errObj = this._onListenerError(listenerFn, message, args, e);
+            if (errObj instanceof Error) listener[5] = getWeakRef(errObj);
+            return errObj;
         }
     }
     private _getListenerExecutor(args: FastEventListenerArgs): FastListenerExecutor | undefined {
@@ -1084,14 +1119,14 @@ export class FastEvent<
         this._traverseToPath(this.listeners, parts, (node) => {
             nodes.push(node);
         });
-        if (isFunction(this._options.onBeforeExecuteListener)) {
-            const r = this._options.onBeforeExecuteListener.call(this, message, args);
-            if (Array.isArray(r)) {
-                return r;
-            } else if (r === false) {
-                throw new AbortError(message.type);
-            }
+
+        const r = this._executeHooks("BeforeExecuteListener", [message, args]);
+        if (Array.isArray(r)) {
+            return r;
+        } else if (r === false) {
+            throw new AbortError(message.type);
         }
+
         // 触发时进行消息转换
         if (isFunction(this._options.transform)) {
             message.payload = this._options.transform.call(this, message as any);
@@ -1105,13 +1140,7 @@ export class FastEvent<
         if (this._options.expandEmitResults) {
             expandEmitResults(results);
         }
-        if (isFunction(this._options.onAfterExecuteListener)) {
-            Promise.allSettled(results).then((r: any[]) => {
-                const args = [message, getPromiseResults(r), nodes];
-                this._options.onAfterExecuteListener!.apply(this, args as any);
-                this._executeHooks("AfterExecuteListener", args);
-            });
-        }
+        this._executeHooks("AfterExecuteListener", [message, results, nodes] as any);
         return results;
     }
 

packages/viewer/src/demo.ts

@@ -39,7 +39,7 @@ emitter.on("user/login", userLoginHandler, { tag: "auth" });
 function onAny(_message: any) {
     return Math.abs(Math.random() * 100);
 }
-emitter.onAny(onAny);
+// emitter.onAny(onAny);
 
 // Transform 事件监听器 - 返回数组
 function dataUpdateHandler(data: any) {

packages/viewer/src/eventViewer/index.ts

@@ -13,6 +13,7 @@ import type { ItemOf } from "../types";
 import { styles } from "./styles";
 import type { EventLog } from "./types";
 import "../listenerViewer/index.js";
+import { removeItem } from "../utils/removeItem";
 
 @customElement("fastevent-viewer")
 export class FastEventViewer extends LitElement {
@@ -200,19 +201,24 @@ export class FastEventViewer extends LitElement {
     private _attach() {
         if (this.emitter) {
             const options = this.emitter.options;
-            this._oldBeforeExecuteListener = options.onBeforeExecuteListener;
-            this._oldAfterExecuteListener = options.onAfterExecuteListener;
-            options.onBeforeExecuteListener = this._onBeforeExecuteListener;
-            options.onAfterExecuteListener = this._onAfterExecuteListener;
+            // this._oldBeforeExecuteListener = options.onBeforeExecuteListener;
+            // this._oldAfterExecuteListener = options.onAfterExecuteListener;
+            // options.onBeforeExecuteListener = this._onBeforeExecuteListener;
+            // options.onAfterExecuteListener = this._onAfterExecuteListener;
+            this.emitter.hooks.BeforeExecuteListener.push(this._onBeforeExecuteListener);
+            this.emitter.hooks.AfterExecuteListener.push(this._onAfterExecuteListener);
             options.debug = true;
         }
     }
 
     private _detach() {
         if (this.emitter) {
+            removeItem(this.emitter.hooks.BeforeExecuteListener, this._onBeforeExecuteListener);
+            removeItem(this.emitter.hooks.AfterExecuteListener, this._onAfterExecuteListener);
             const options = this.emitter.options;
-            options.onBeforeExecuteListener = this._oldBeforeExecuteListener;
-            options.onAfterExecuteListener = this._oldAfterExecuteListener;
+            // this.emitter.hooks.BeforeExecuteListener;
+            // options.onBeforeExecuteListener = this._oldBeforeExecuteListener;
+            // options.onAfterExecuteListener = this._oldAfterExecuteListener;
             options.debug = false;
         }
     }

packages/viewer/src/listenerViewer/listenerCard.ts

@@ -10,6 +10,7 @@ import type {
 } from "fastevent";
 import type { FastEventListenerMeta } from "fastevent";
 import type { ItemOf } from "../types";
+import { removeItem } from "../utils";
 
 /**
  * fastevent-listener-card 组件 - 显示单个监听器的详细信息
@@ -53,12 +54,7 @@ export class FastEventListenerCard extends LitElement {
     }
     private _removeListenerHook() {
         if (this.emitter) {
-            const index = this.emitter.hooks.AfterExecuteListener.findIndex((hook) => {
-                return hook === this._onAfterExecuteListener!;
-            });
-            if (index > -1) {
-                this.emitter.hooks.AfterExecuteListener.splice(index, 1);
-            }
+            removeItem(this.emitter.hooks.AfterExecuteListener, this._onAfterExecuteListener!);
         }
     }
 
@@ -81,7 +77,7 @@ export class FastEventListenerCard extends LitElement {
         }
         console.log(`-----FastEvent Listener-----`);
         console.log(`监听器: ${fn.name || "anonymous"}`);
-        console.log(fn.toString());
+        console.log(fn);
         console.log(`执行次数: ${listener[2]}/${listener[1]}`);
         console.log(`标签: ${listener[3]}`);
         if (listener[4] !== undefined) {
@@ -92,7 +88,19 @@ export class FastEventListenerCard extends LitElement {
     private renderTag(text: string): ReturnType<typeof html> {
         return html`<span class="tag">${text}</span>`;
     }
-
+    private _renderReturns(listener: FastEventListenerMeta) {
+        if (listener.length === 6 && listener[5]) {
+            const result = listener[5] instanceof WeakRef ? listener[5].deref() : listener[5];
+            return html`
+                    <div class="listener-row">
+                        <div class="listener-cell listener-label">返回值</div>
+                        <div class="listener-cell listener-value">${
+                            result instanceof Error ? result.stack : JSON.stringify(result)
+                        }</div>
+                    </div>
+                `;
+        }
+    }
     override render() {
         if (!this.listener) {
             return html`
@@ -141,6 +149,7 @@ export class FastEventListenerCard extends LitElement {
                 `
                         : ""
                 }
+                ${this._renderReturns(this.listener)}
             </div>
         `;
     }

packages/viewer/src/styles/icons.ts

@@ -126,7 +126,7 @@ export const icons = css`
         mask-image: var(--icon-arrow);
     }
 
-    .icon.errror {
+    .icon.error {
         mask-image: var(--icon-error);
     }