update

Author: zhangfisher

.vscode/launch.json

@@ -1,9 +1,25 @@
 {
-    // 使用 IntelliSense 了解相关属性。 
+    // 使用 IntelliSense 了解相关属性。
     // 悬停以查看现有属性的描述。
     // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "Bun: Debug Current File",
+            "type": "node",
+            "request": "launch",
+            "runtimeExecutable": "bun",
+            "runtimeArgs": [
+                "--inspect"
+            ],
+            "program": "${file}",
+            "cwd": "${workspaceFolder}/packages/native",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "sourceMaps": true,
+            "console": "integratedTerminal"
+        },
         {
             "name": "ts-node",
             "type": "node",

bun.lock

@@ -48,4 +48,32 @@ describe("转发发布和订阅", async () => {
         otherEmitter.emit("data", 1);
         expect(events).toEqual([1]);
     });
+    test("转发订阅和发布事件迭代器", async () => {
+        const otherEmitter = new FastEvent();
+        const emitter = new FastEvent({
+            onAddBeforeListener: (type, listener, options) => {
+                if (type.startsWith("@")) {
+                    return otherEmitter.on(type.substring(1), options);
+                }
+            },
+            onBeforeExecuteListener: (message, args) => {
+                if (message.type.startsWith("@")) {
+                    message.type = message.type.substring(1);
+                    return otherEmitter.emit(message as any, args);
+                }
+            },
+        });
+        const events: any[] = [];
+        const messages = emitter.on("@data");
+        // 订阅otherEmitter的data事件
+        otherEmitter.emit("data", 1);
+        otherEmitter.emit("data", 2);
+        otherEmitter.emit("data", 3);
+        for await (const message of messages) {
+            events.push(message.payload);
+            if (events.length === 3) break;
+        }
+
+        expect(events).toEqual([1, 2, 3]);
+    });
 });

packages/native/src/__tests__/features/forward.test.ts

@@ -69,6 +69,7 @@ import { isPromise } from "./utils/isPromise";
 import { resolveValue } from "./utils/resolveValue";
 import { AfterExecuteListenerHook, FastEventHooks } from "./types/FastEventHooks";
 import { ItemOf } from "../../viewer/src/types";
+import { isAsyncIterable } from "./utils/isAsyncIterable";
 
 /**
  * FastEvent 事件发射器类
@@ -168,6 +169,10 @@ export class FastEvent<
     get id() {
         return this._options.id!;
     }
+    /** 获取事件发射器的唯一标识符 */
+    get title() {
+        return this._options.title || this.id || "FastEvent";
+    }
     get hooks(): FastEventHooks {
         if (!this._hooks) {
             this._hooks = {
@@ -430,7 +435,16 @@ export class FastEvent<
             ) as FastEventIteratorOptions;
             const iterator = createAsyncEventIterator<any>(this as any, type, iteratorOpts);
             iterator.create(finalOptions);
-            this._executeHooks("AddBeforeListener", [type, iterator.listener, finalOptions]);
+            const r = this._executeHooks("AddBeforeListener", [
+                type,
+                iterator.listener,
+                finalOptions,
+            ]);
+            if (r === false) {
+                throw new CancelError();
+            } else if (isAsyncIterable(r)) {
+                return r;
+            }
             return iterator;
         }
         // 执行回调
@@ -1115,9 +1129,12 @@ export class FastEvent<
 
         // 触发时进行消息转换
         if (isFunction(this._options.transform)) {
-            message.payload = this._options.transform.call(this, message as any);
-            args.rawEventType = message.type;
-            args.flags = (args.flags || 0) | FastEventListenerFlags.Transformed;
+            const transformed = this._options.transform.call(this, message as any);
+            if (transformed !== message) {
+                message.payload = transformed;
+                args.rawEventType = message.type;
+                args.flags = (args.flags || 0) | FastEventListenerFlags.Transformed;
+            }
         }
         // 执行监听器
         results.push(...this._executeListeners(nodes, message, args));

packages/native/src/event.ts

@@ -11,6 +11,7 @@ import { FastEventIteratorOptions } from "../eventIterator";
 
 export type FastEventOptions<Meta = Record<string, any>, Context = never> = {
     id: string;
+    title: string;
     debug: boolean;
     // 事件分隔符
     delimiter: string;

packages/native/src/types/FastEvents.ts

@@ -7,3 +7,4 @@ export * from "./isPathMatched";
 export * from "./isSubsctiber";
 export * from "./isClass";
 export * from "./isFastEvent";
+export * from "./isAsyncIterable";

packages/native/src/utils/index.ts

@@ -0,0 +1,20 @@
+/**
+ * 判断是否为可异步迭代对象（AsyncIterable）
+ * 即具有 Symbol.asyncIterator 方法的对象
+ *
+ * @param value - 要检查的值
+ * @returns 如果是可异步迭代对象返回 true
+ */
+export function isAsyncIterable<T = any>(value: unknown): value is AsyncIterable<T> {
+    if (value === null || typeof value !== "object") {
+        return false;
+    }
+
+    const maybeIterable = value as Partial<AsyncIterable<T>>;
+    const asyncIteratorSymbol = Symbol.asyncIterator;
+
+    return (
+        typeof (maybeIterable as any)[asyncIteratorSymbol] === "function" ||
+        typeof (maybeIterable as any)["@@asyncIterator"] === "function"
+    );
+}

packages/native/src/utils/isAsyncIterable.ts

@@ -50,7 +50,7 @@
         "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
         // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
         "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
-        // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
+        "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
         // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
         // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
         // "outDir": "./",                                   /* Specify an output folder for all emitted files. */

packages/native/tsconfig.json

@@ -1,10 +1,21 @@
 import { FastEvent } from "fastevent";
 
+function getRandomId() {
+    return Math.floor(Math.random() * 101);
+}
 /**
  * 创建 FastEvent 实例
  */
 const emitter = new FastEvent({
     debug: true,
+    title: "操作事件",
+    transform: (message) => {
+        if (message.type === "transformed") {
+            return `transformed-${getRandomId()}`;
+        } else {
+            return message;
+        }
+    },
 });
 
 // 挂载到全局，方便调试
@@ -22,7 +33,7 @@ const subscribers: any[] = [];
 export function addSimpleSubscribe() {
     subscribers.push(
         emitter.on("test/simple", () => {
-            return Math.floor(Math.random() * 101);
+            return getRandomId();
         }),
     );
 }
@@ -45,7 +56,7 @@ function userLoginHandler(data: any) {
 emitter.on("user/login", userLoginHandler, { tag: "auth" });
 
 function onAny(_message: any) {
-    return Math.abs(Math.random() * 100);
+    return `Any<${getRandomId()}>`;
 }
 // emitter.onAny(onAny);
 
@@ -201,12 +212,14 @@ export function triggerTaggedEvent() {
  * 触发带 transform 的事件
  */
 export function triggerTransformEvent() {
-    emitter.emit("data/update", {
+    emitter.emit("transformed", {
         items: [1, 2, 3, 4, 5],
         operation: "add",
     });
 }
-
+emitter.on("transformed", (message) => {
+    return message;
+});
 /**
  * 触发错误事件
  */
@@ -254,12 +267,12 @@ export function triggerBatchEvents() {
  */
 export function triggerWildcardEvents() {
     emitter.emit("user/profile", { action: "view" });
-    setTimeout(() => {
-        emitter.emit("user/settings", { action: "update" });
-    }, 100);
-    setTimeout(() => {
-        emitter.emit("user/avatar", { action: "change" });
-    }, 200);
+    // setTimeout(() => {
+    //     emitter.emit("user/settings", { action: "update" });
+    // }, 100);
+    // setTimeout(() => {
+    //     emitter.emit("user/avatar", { action: "change" });
+    // }, 200);
 }
 
 /**