@midwayjs/event-emitter 4.0.0-alpha.1 → 4.0.0-beta.10

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2013 - Now midwayjs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -9,4 +9,4 @@ Document: [https://midwayjs.org](https://midwayjs.org)
 
 ## License
 
-[MIT]((https://github.com/midwayjs/midway/blob/master/LICENSE))
+[MIT](https://github.com/midwayjs/midway/blob/master/LICENSE)

package/dist/configuration.d.ts

@@ -1,4 +1,5 @@
+import { IMidwayContainer } from '@midwayjs/core';
 export declare class EventEmitterConfiguration {
-    onReady(container: any): Promise<void>;
+    onReady(container: IMidwayContainer): Promise<void>;
 }
 //# sourceMappingURL=configuration.d.ts.map

package/dist/configuration.js

@@ -8,23 +8,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventEmitterConfiguration = void 0;
 const core_1 = require("@midwayjs/core");
+const service_1 = require("./service");
 let EventEmitterConfiguration = class EventEmitterConfiguration {
     async onReady(container) {
+        await container.getAsync(service_1.EventEmitterService);
     }
 };
 exports.EventEmitterConfiguration = EventEmitterConfiguration;
 exports.EventEmitterConfiguration = EventEmitterConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'eventEmitter',
-        importConfigs: [
-            {
-                default: {
-                    eventEmitter: {
-                        defaultMaxListeners: 10,
-                    },
-                },
-            },
-        ],
     })
 ], EventEmitterConfiguration);
 //# sourceMappingURL=configuration.js.map

package/dist/decorator.d.ts

@@ -1,3 +1,3 @@
-import { OnOptions, event, eventNS } from 'eventemitter2';
-export declare function OnEvent(event: event | eventNS, options?: OnOptions): MethodDecorator;
+import { OnEventOptions } from './interface';
+export declare function OnEvent(event: string, options?: OnEventOptions): MethodDecorator;
 //# sourceMappingURL=decorator.d.ts.map

package/dist/decorator.js

@@ -1,16 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OnEvent = void 0;
-const core_1 = require("@midwayjs/core");
+exports.OnEvent = OnEvent;
 const const_1 = require("./const");
+const core_1 = require("@midwayjs/core");
 function OnEvent(event, options) {
-    return (target, propertyKey) => {
+    return (target, propertyKey, descriptor) => {
         core_1.DecoratorManager.saveModule(const_1.EVENT_KEY, target.constructor);
         core_1.MetadataManager.defineMetadata(const_1.EVENT_KEY, {
             event,
-            options,
-        }, target.constructor, propertyKey);
+            options: {
+                ...options,
+                suppressErrors: options?.suppressErrors ?? true,
+            },
+        }, target, propertyKey);
+        return descriptor;
     };
 }
-exports.OnEvent = OnEvent;
 //# sourceMappingURL=decorator.js.map

package/dist/interface.d.ts

@@ -1,4 +1,20 @@
-import { ConstructorOptions } from 'eventemitter2';
+import { ConstructorOptions, OnOptions } from 'eventemitter2';
 export interface EventEmitterConfigOptions extends ConstructorOptions {
 }
+export type OnEventOptions = OnOptions & {
+    /**
+     * If "true", prepends (instead of append) the given listener to the array of listeners.
+     *
+     * @see https://github.com/EventEmitter2/EventEmitter2#emitterprependlistenerevent-listener-options
+     *
+     * @default false
+     */
+    prependListener?: boolean;
+    /**
+     * If "true", the onEvent callback will not throw an error while handling the event. Otherwise, if "false" it will throw an error.
+     *
+     * @default true
+     */
+    suppressErrors?: boolean;
+};
 //# sourceMappingURL=interface.d.ts.map

package/dist/service.d.ts

@@ -1,9 +1,12 @@
 import { EventEmitter2 as EventEmitter } from 'eventemitter2';
-export declare class EventEmitterService implements EventEmitter {
+export declare class EventEmitterService {
     private eventEmitter;
     private config;
+    private applicationContext;
     init(): Promise<void>;
     getEventEmitter(): EventEmitter;
+    emitAsync(event: string | symbol | string[], ...args: any[]): Promise<any[]>;
+    emit(event: string | symbol | string[], ...args: any[]): boolean;
 }
 export interface EventEmitterService extends EventEmitter {
 }

package/dist/service.js

@@ -14,12 +14,16 @@ const eventemitter2_1 = require("eventemitter2");
 const core_1 = require("@midwayjs/core");
 const const_1 = require("./const");
 let EventEmitterService = class EventEmitterService {
+    eventEmitter;
+    config;
+    applicationContext;
     async init() {
         this.eventEmitter = new eventemitter2_1.EventEmitter2(this.config);
         // proxy eventEmitter public methods to this
         const methods = Object.getOwnPropertyNames(eventemitter2_1.EventEmitter2.prototype);
         for (const method of methods) {
-            if (method !== 'constructor' && typeof this.eventEmitter[method] === 'function') {
+            if (method !== 'constructor' &&
+                typeof this.eventEmitter[method] === 'function') {
                 this[method] = this.eventEmitter[method].bind(this.eventEmitter);
             }
         }
@@ -27,20 +31,78 @@ let EventEmitterService = class EventEmitterService {
         for (const eventModule of events) {
             const props = core_1.MetadataManager.getPropertiesWithMetadata(const_1.EVENT_KEY, eventModule);
             for (const prop in props) {
-                const { event, options } = props[prop];
-                this.eventEmitter.on(event, options);
+                const { event, options = {} } = props[prop];
+                const { prependListener, suppressErrors = true, ...emitterOptions } = options;
+                const listener = async (...args) => {
+                    try {
+                        const instance = await this.applicationContext.getAsync(eventModule);
+                        await instance[prop](...args);
+                    }
+                    catch (err) {
+                        if (!suppressErrors) {
+                            throw err;
+                        }
+                        // 如果 suppressErrors 为 true，则忽略错误
+                    }
+                };
+                if (prependListener) {
+                    this.eventEmitter.prependListener(event, listener, emitterOptions);
+                }
+                else {
+                    this.eventEmitter.on(event, listener, emitterOptions);
+                }
             }
         }
     }
     getEventEmitter() {
         return this.eventEmitter;
     }
+    async emitAsync(event, ...args) {
+        const listeners = this.eventEmitter.listeners(event);
+        const results = [];
+        // 执行所有监听器
+        for (const listener of listeners) {
+            try {
+                const result = await listener(...args);
+                if (result !== undefined) {
+                    results.push(result);
+                }
+            }
+            catch (err) {
+                // 如果错误不应该被抑制，则抛出
+                if (!err.suppressErrors) {
+                    throw err;
+                }
+            }
+        }
+        return results;
+    }
+    emit(event, ...args) {
+        const result = this.eventEmitter.emit(event, ...args);
+        // 处理异步监听器
+        const listeners = this.eventEmitter.listeners(event);
+        Promise.all(listeners.map(async (listener) => {
+            try {
+                if (listener.constructor.name === 'AsyncFunction') {
+                    await listener(...args);
+                }
+            }
+            catch (err) {
+                // 忽略同步 emit 中的错误
+            }
+        }));
+        return result;
+    }
 };
 exports.EventEmitterService = EventEmitterService;
 __decorate([
     (0, core_1.Config)('eventEmitter'),
     __metadata("design:type", Object)
 ], EventEmitterService.prototype, "config", void 0);
+__decorate([
+    (0, core_1.ApplicationContext)(),
+    __metadata("design:type", Object)
+], EventEmitterService.prototype, "applicationContext", void 0);
 __decorate([
     (0, core_1.Init)(),
     __metadata("design:type", Function),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/event-emitter",
   "description": "midway event emitter component",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-beta.10",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -10,8 +10,8 @@
     "index.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "workspace:^",
-    "@midwayjs/mock": "workspace:^"
+    "@midwayjs/core": "^4.0.0-beta.10",
+    "@midwayjs/mock": "^4.0.0-beta.10"
   },
   "dependencies": {
     "eventemitter2": "6.4.9"
@@ -30,10 +30,11 @@
     "lint": "mwts check"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=20"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
-  }
+  },
+  "gitHead": "1b1856629913703f67304155aaf611ec936a81ac"
 }