@midwayjs/rabbitmq 3.5.3 → 3.7.0

package/dist/configuration.js

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

package/dist/framework.d.ts

@@ -1,5 +1,4 @@
-import { MidwayFrameworkType } from '@midwayjs/decorator';
-import { BaseFramework } from '@midwayjs/core';
+import { MidwayFrameworkType, BaseFramework } from '@midwayjs/core';
 import { IMidwayRabbitMQApplication, IMidwayRabbitMQConfigurationOptions, IMidwayRabbitMQContext } from './interface';
 export declare class MidwayRabbitMQFramework extends BaseFramework<IMidwayRabbitMQApplication, IMidwayRabbitMQContext, IMidwayRabbitMQConfigurationOptions> {
     app: IMidwayRabbitMQApplication;

package/dist/framework.js

@@ -7,7 +7,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidwayRabbitMQFramework = void 0;
-const decorator_1 = require("@midwayjs/decorator");
 const core_1 = require("@midwayjs/core");
 const mq_1 = require("./mq");
 let MidwayRabbitMQFramework = class MidwayRabbitMQFramework extends core_1.BaseFramework {
@@ -41,16 +40,16 @@ let MidwayRabbitMQFramework = class MidwayRabbitMQFramework extends core_1.BaseF
         await this.app.close();
     }
     getFrameworkType() {
-        return decorator_1.MidwayFrameworkType.MS_RABBITMQ;
+        return core_1.MidwayFrameworkType.MS_RABBITMQ;
     }
     async loadSubscriber() {
         // create channel
-        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.RABBITMQ;
+        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.RABBITMQ;
         });
         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);
             for (const methodBindListeners of data) {
                 // 循环绑定的方法和监听的配置信息
                 for (const listenerOptions of methodBindListeners) {
@@ -63,6 +62,12 @@ let MidwayRabbitMQFramework = class MidwayRabbitMQFramework extends core_1.BaseF
                             },
                         };
                         this.app.createAnonymousContext(ctx);
+                        const isPassed = await this.app
+                            .getFramework()
+                            .runGuard(ctx, module, listenerOptions.propertyKey);
+                        if (!isPassed) {
+                            throw new core_1.MidwayInvokeForbiddenError(listenerOptions.propertyKey, module);
+                        }
                         const ins = await ctx.requestContext.getAsync(module);
                         const fn = await this.applyMiddleware(async (ctx) => {
                             return await ins[listenerOptions.propertyKey].call(ins, data);
@@ -86,7 +91,7 @@ let MidwayRabbitMQFramework = class MidwayRabbitMQFramework extends core_1.BaseF
     }
 };
 MidwayRabbitMQFramework = __decorate([
-    (0, decorator_1.Framework)()
+    (0, core_1.Framework)()
 ], MidwayRabbitMQFramework);
 exports.MidwayRabbitMQFramework = MidwayRabbitMQFramework;
 //# sourceMappingURL=framework.js.map

package/dist/interface.d.ts

@@ -1,6 +1,5 @@
-import { IConfigurationOptions, IMidwayApplication, IMidwayContext, NextFunction as BaseNextFunction } from '@midwayjs/core';
+import { IConfigurationOptions, IMidwayApplication, IMidwayContext, NextFunction as BaseNextFunction, RabbitMQListenerOptions } from '@midwayjs/core';
 import { ConsumeMessage, Options } from 'amqplib/properties';
-import { RabbitMQListenerOptions } from '@midwayjs/decorator';
 import type { ConfirmChannel, Channel, Options as AmqpOptions } from 'amqplib';
 export interface IRabbitMQApplication {
     connect(...args: any[]): Promise<void>;

package/dist/mq.d.ts

@@ -5,7 +5,7 @@
 import * as amqp from 'amqp-connection-manager';
 import { IRabbitMQApplication } from './interface';
 import { ConsumeMessage } from 'amqplib/properties';
-import { RabbitMQListenerOptions } from '@midwayjs/decorator';
+import { RabbitMQListenerOptions } from '@midwayjs/core';
 import type { Channel } from 'amqplib';
 import { ILogger } from '@midwayjs/logger';
 import { EventEmitter } from 'events';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/rabbitmq",
-  "version": "3.5.3",
+  "version": "3.7.0",
   "description": "Midway Framework for rabbitmq",
   "main": "dist/index",
   "typings": "index.d.ts",
@@ -24,16 +24,15 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.4.11",
-    "@midwayjs/mock": "^3.5.3",
+    "@midwayjs/mock": "^3.7.0",
     "@types/amqplib": "0.8.2",
     "amqplib": "0.10.3",
     "fs-extra": "10.0.1"
   },
   "dependencies": {
-    "@midwayjs/core": "^3.5.3",
+    "@midwayjs/core": "^3.7.0",
     "@midwayjs/logger": "^2.15.0",
-    "amqp-connection-manager": "4.1.6"
+    "amqp-connection-manager": "4.1.9"
   },
   "peerDependencies": {
     "@types/amqplib": "*",
@@ -47,5 +46,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "32356484664846984f6d3d65a3a75dea015e8dcc"
+  "gitHead": "99386083ee26b386fd508b9c892091c914e77535"
 }