@midwayjs/kafka 3.4.11 → 3.5.0

package/dist/framework.d.ts

@@ -2,7 +2,7 @@ import { BaseFramework } from '@midwayjs/core';
 import { MidwayFrameworkType } from '@midwayjs/decorator';
 export declare class MidwayKafkaFramework extends BaseFramework<any, any, any> {
     configure(): any;
-    applicationInitialize(options: any): Promise<void>;
+    applicationInitialize(): Promise<void>;
     run(): Promise<void>;
     private loadSubscriber;
     getFrameworkName(): string;

package/dist/framework.js

@@ -14,7 +14,7 @@ let MidwayKafkaFramework = class MidwayKafkaFramework extends core_1.BaseFramewo
     configure() {
         return this.configService.getConfiguration('kafka');
     }
-    async applicationInitialize(options) {
+    async applicationInitialize() {
         // Create a connection manager
         this.app = new kafka_1.KafkaConsumerServer({
             logger: this.logger,
@@ -39,33 +39,28 @@ let MidwayKafkaFramework = class MidwayKafkaFramework extends core_1.BaseFramewo
         });
         for (const module of subscriberModules) {
             const data = (0, decorator_1.listPropertyDataFromClass)(decorator_1.MS_CONSUMER_KEY, module);
-            const topics = [...new Set(data.map(e => e[0].topic))];
-            let tempTopics = [];
-            topics.forEach(e => {
-                tempTopics.push({ topic: e });
-            });
-            tempTopics = tempTopics.map(e => {
-                let subscription = {};
-                let runConfig = {};
-                data.forEach(e2 => {
-                    if (e2[0].topic === e.topic) {
-                        if (typeof e2[0].subscription !== 'undefined' &&
-                            Object.keys(e2[0].subscription).length > 0) {
-                            subscription = e2[0].subscription;
-                        }
-                        if (typeof e2[0].runConfig !== 'undefined' &&
-                            Object.keys(e2[0].runConfig).length > 0) {
-                            runConfig = e2[0].runConfig;
-                        }
+            const topicTitles = [...new Set(data.map(e => e[0].topic))];
+            const midwayConsumerConfigs = topicTitles.map(e => {
+                const midwayConsumerConfig = {
+                    topic: e,
+                    subscription: {},
+                    runConfig: {},
+                };
+                const comsumerParams = data
+                    .map(value => {
+                    if (value[0].topic === midwayConsumerConfig.topic) {
+                        return Object.assign(midwayConsumerConfig, value[0]);
                     }
-                });
-                e.subscription = subscription;
-                e.runConfig = runConfig;
-                return e;
+                })
+                    .filter(e => e && true);
+                if (comsumerParams && Object.keys(comsumerParams[0]).length > 0) {
+                    return comsumerParams[0];
+                }
+                return midwayConsumerConfig;
             });
-            tempTopics.forEach(async (e) => {
+            midwayConsumerConfigs.forEach(async (e) => {
                 await this.app.connection.subscribe(Object.assign({
-                    topics: topics,
+                    topics: topicTitles,
                 }, e.subscription));
                 await this.app.connection.run(Object.assign(e.runConfig, {
                     eachMessage: async ({ topic, partition, message }) => {
@@ -90,7 +85,7 @@ let MidwayKafkaFramework = class MidwayKafkaFramework extends core_1.BaseFramewo
                                     };
                                     this.app.createAnonymousContext(ctx);
                                     const ins = await ctx.requestContext.getAsync(module);
-                                    const fn = await this.applyMiddleware(async (ctx) => {
+                                    const fn = await this.applyMiddleware(async () => {
                                         return await ins[propertyKey].call(ins, message);
                                     });
                                     try {

package/dist/interface.d.ts

@@ -16,4 +16,12 @@ export interface Context extends IMidwayKafkaContext {
 }
 export declare type NextFunction = BaseNextFunction;
 export declare type DefaultConfig = string | Kafka;
+/**
+ * 客户端的相关配置，在midwayjs的自定义配置项
+ */
+export interface IMidwayConsumerConfig {
+    topic: string;
+    subscription: any;
+    runConfig: any;
+}
 //# sourceMappingURL=interface.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/kafka",
-  "version": "3.4.11",
+  "version": "3.5.0",
   "description": "Midway Framework for kafka",
   "main": "dist/index",
   "typings": "index.d.ts",
@@ -33,10 +33,10 @@
   },
   "homepage": "https://github.com/midwayjs/midway#readme",
   "devDependencies": {
-    "@midwayjs/core": "^3.4.11",
+    "@midwayjs/core": "^3.5.0",
     "@midwayjs/decorator": "^3.4.11",
     "@midwayjs/logger": "^2.15.0",
-    "@midwayjs/mock": "^3.4.11"
+    "@midwayjs/mock": "^3.5.0"
   },
   "dependencies": {
     "kafkajs": "2.1.0"
@@ -44,5 +44,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "942dd076d60f27d6004640fa6dd9a9724efc559d"
+  "gitHead": "4200e30d1af97a7817c36899c4ffc41a7d97c06d"
 }