@midwayjs/kafka 3.5.1 → 3.6.0

package/dist/configuration.js

@@ -10,17 +10,17 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KafkaConfiguration = void 0;
-const decorator_1 = require("@midwayjs/decorator");
+const core_1 = require("@midwayjs/core");
 const framework_1 = require("./framework");
 let KafkaConfiguration = class KafkaConfiguration {
     async onReady() { }
 };
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", framework_1.MidwayKafkaFramework)
 ], KafkaConfiguration.prototype, "framework", void 0);
 KafkaConfiguration = __decorate([
-    (0, decorator_1.Configuration)({
+    (0, core_1.Configuration)({
         namespace: 'kafka',
         importConfigs: [
             {

package/dist/framework.d.ts

@@ -1,5 +1,4 @@
-import { BaseFramework } from '@midwayjs/core';
-import { MidwayFrameworkType } from '@midwayjs/decorator';
+import { BaseFramework, MidwayFrameworkType } from '@midwayjs/core';
 export declare class MidwayKafkaFramework extends BaseFramework<any, any, any> {
     configure(): any;
     applicationInitialize(): Promise<void>;

package/dist/framework.js

@@ -8,7 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidwayKafkaFramework = void 0;
 const core_1 = require("@midwayjs/core");
-const decorator_1 = require("@midwayjs/decorator");
 const kafka_1 = require("./kafka");
 let MidwayKafkaFramework = class MidwayKafkaFramework extends core_1.BaseFramework {
     configure() {
@@ -33,12 +32,12 @@ let MidwayKafkaFramework = class MidwayKafkaFramework extends core_1.BaseFramewo
         }
     }
     async loadSubscriber() {
-        const subscriberModules = (0, decorator_1.listModule)(decorator_1.MS_CONSUMER_KEY, module => {
-            const metadata = (0, decorator_1.getClassMetadata)(decorator_1.MS_CONSUMER_KEY, module);
-            return metadata.type === decorator_1.MSListenerType.KAFKA;
+        const subscriberModules = (0, core_1.listModule)(core_1.MS_CONSUMER_KEY, module => {
+            const metadata = (0, core_1.getClassMetadata)(core_1.MS_CONSUMER_KEY, module);
+            return metadata.type === core_1.MSListenerType.KAFKA;
         });
         for (const module of subscriberModules) {
-            const data = (0, decorator_1.listPropertyDataFromClass)(decorator_1.MS_CONSUMER_KEY, module);
+            const data = (0, core_1.listPropertyDataFromClass)(core_1.MS_CONSUMER_KEY, module);
             const topicTitles = [...new Set(data.map(e => e[0].topic))];
             const midwayConsumerConfigs = topicTitles.map(e => {
                 const midwayConsumerConfig = {
@@ -46,15 +45,15 @@ let MidwayKafkaFramework = class MidwayKafkaFramework extends core_1.BaseFramewo
                     subscription: {},
                     runConfig: {},
                 };
-                const comsumerParams = data
+                const consumerParams = data
                     .map(value => {
                     if (value[0].topic === midwayConsumerConfig.topic) {
                         return Object.assign(midwayConsumerConfig, value[0]);
                     }
                 })
                     .filter(e => e && true);
-                if (comsumerParams && Object.keys(comsumerParams[0]).length > 0) {
-                    return comsumerParams[0];
+                if (consumerParams && Object.keys(consumerParams[0]).length > 0) {
+                    return consumerParams[0];
                 }
                 return midwayConsumerConfig;
             });
@@ -84,6 +83,14 @@ let MidwayKafkaFramework = class MidwayKafkaFramework extends core_1.BaseFramewo
                                         },
                                     };
                                     this.app.createAnonymousContext(ctx);
+                                    if (typeof propertyKey === 'string') {
+                                        const isPassed = await this.app
+                                            .getFramework()
+                                            .runGuard(ctx, module, propertyKey);
+                                        if (!isPassed) {
+                                            throw new core_1.MidwayInvokeForbiddenError(propertyKey, module);
+                                        }
+                                    }
                                     const ins = await ctx.requestContext.getAsync(module);
                                     const fn = await this.applyMiddleware(async () => {
                                         return await ins[propertyKey].call(ins, message);
@@ -115,11 +122,11 @@ let MidwayKafkaFramework = class MidwayKafkaFramework extends core_1.BaseFramewo
         await this.app.close();
     }
     getFrameworkType() {
-        return decorator_1.MidwayFrameworkType.MS_KAFKA;
+        return core_1.MidwayFrameworkType.MS_KAFKA;
     }
 };
 MidwayKafkaFramework = __decorate([
-    (0, decorator_1.Framework)()
+    (0, core_1.Framework)()
 ], MidwayKafkaFramework);
 exports.MidwayKafkaFramework = MidwayKafkaFramework;
 //# sourceMappingURL=framework.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/kafka",
-  "version": "3.5.1",
+  "version": "3.6.0",
   "description": "Midway Framework for kafka",
   "main": "dist/index",
   "typings": "index.d.ts",
@@ -33,10 +33,9 @@
   },
   "homepage": "https://github.com/midwayjs/midway#readme",
   "devDependencies": {
-    "@midwayjs/core": "^3.5.1",
-    "@midwayjs/decorator": "^3.4.11",
+    "@midwayjs/core": "^3.6.0",
     "@midwayjs/logger": "^2.15.0",
-    "@midwayjs/mock": "^3.5.1"
+    "@midwayjs/mock": "^3.6.0"
   },
   "dependencies": {
     "kafkajs": "2.2.0"
@@ -44,5 +43,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "3b63fc768617037644602dd5ad66d3734ce01b16"
+  "gitHead": "22643b0e8519766bb7c68b975930199fc136336e"
 }