@midwayjs/rabbitmq 3.0.0-alpha.9 → 3.0.0-beta.12

package/CHANGELOG.md

@@ -3,6 +3,120 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28)
+
+**Note:** Version bump only for package @midwayjs/rabbitmq
+
+
+
+
+
+# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21)
+
+**Note:** Version bump only for package @midwayjs/rabbitmq
+
+
+
+
+
+# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20)
+
+
+### Features
+
+* implement i18n for validate ([#1426](https://github.com/midwayjs/midway/issues/1426)) ([4c7ed2f](https://github.com/midwayjs/midway/commit/4c7ed2ff2e7ccf10f88f62abad230f92f5e76b97))
+
+
+
+
+
+# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09)
+
+**Note:** Version bump only for package @midwayjs/rabbitmq
+
+
+
+
+
+# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08)
+
+
+### Bug Fixes
+
+* express routing middleware takes effect at the controller level ([#1364](https://github.com/midwayjs/midway/issues/1364)) ([b9272e0](https://github.com/midwayjs/midway/commit/b9272e0971003443304b0c53815be31a0061b4bd))
+
+
+
+
+
+# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03)
+
+
+### Bug Fixes
+
+* middleware with ctx.body ([#1389](https://github.com/midwayjs/midway/issues/1389)) ([77af5c0](https://github.com/midwayjs/midway/commit/77af5c0b456f1843f4dcfd3dbfd2c0aa244c51bd))
+
+
+
+
+
+# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26)
+
+**Note:** Version bump only for package @midwayjs/rabbitmq
+
+
+
+
+
+# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25)
+
+**Note:** Version bump only for package @midwayjs/rabbitmq
+
+
+
+
+
+# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24)
+
+
+### Features
+
+* add i18n ([#1375](https://github.com/midwayjs/midway/issues/1375)) ([bffefe0](https://github.com/midwayjs/midway/commit/bffefe07afe45777d49b5a76b9ab17fc2b9d9a55))
+
+
+
+
+
+# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18)
+
+
+### Features
+
+* add component and framework config definition ([#1367](https://github.com/midwayjs/midway/issues/1367)) ([b2fe615](https://github.com/midwayjs/midway/commit/b2fe6157f99659471ff1333eca0b86bb889f61a3))
+
+
+
+
+
+# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16)
+
+**Note:** Version bump only for package @midwayjs/rabbitmq
+
+
+
+
+
+# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14)
+
+
+### Bug Fixes
+
+* ci、build and type error with rabbitmq ([#1253](https://github.com/midwayjs/midway/issues/1253)) ([80ae991](https://github.com/midwayjs/midway/commit/80ae9919e1c21c9e326b5f186f891d14d43495a5))
+
+
+
+
+
 ## [2.12.3](https://github.com/midwayjs/midway/compare/v2.12.2...v2.12.3) (2021-08-09)
 
 **Note:** Version bump only for package @midwayjs/rabbitmq

package/README.md

@@ -7,7 +7,7 @@ this is a sub package for midway.
 
 this module use [amqplib](https://github.com/squaremo/amqp.node)
 
-Document: [https://midwayjs.org/midway](https://midwayjs.org/midway)
+Document: [https://midwayjs.org](https://midwayjs.org)
 
 ## License
 

package/dist/configuration.d.ts

@@ -0,0 +1,6 @@
+import { MidwayRabbitMQFramework } from './framework';
+export declare class RabbitMQConfiguration {
+    framework: MidwayRabbitMQFramework;
+    onReady(): Promise<void>;
+}
+//# sourceMappingURL=configuration.d.ts.map

package/dist/configuration.js

@@ -0,0 +1,35 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RabbitMQConfiguration = void 0;
+const decorator_1 = require("@midwayjs/decorator");
+const framework_1 = require("./framework");
+let RabbitMQConfiguration = class RabbitMQConfiguration {
+    async onReady() { }
+};
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", framework_1.MidwayRabbitMQFramework)
+], RabbitMQConfiguration.prototype, "framework", void 0);
+RabbitMQConfiguration = __decorate([
+    (0, decorator_1.Configuration)({
+        namespace: 'rabbitMQ',
+        importConfigs: [
+            {
+                default: {
+                    rabbitMQServer: {},
+                },
+            },
+        ],
+    })
+], RabbitMQConfiguration);
+exports.RabbitMQConfiguration = RabbitMQConfiguration;
+//# sourceMappingURL=configuration.js.map

package/dist/framework.d.ts

@@ -1,8 +1,10 @@
-import { BaseFramework, MidwayFrameworkType } from '@midwayjs/core';
+import { MidwayFrameworkType } from '@midwayjs/decorator';
+import { BaseFramework } from '@midwayjs/core';
 import { IMidwayRabbitMQApplication, IMidwayRabbitMQConfigurationOptions, IMidwayRabbitMQContext } from './interface';
 export declare class MidwayRabbitMQFramework extends BaseFramework<IMidwayRabbitMQApplication, IMidwayRabbitMQContext, IMidwayRabbitMQConfigurationOptions> {
     app: IMidwayRabbitMQApplication;
     consumerHandlerList: any[];
+    configure(): any;
     applicationInitialize(options: any): Promise<void>;
     run(): Promise<void>;
     protected beforeStop(): Promise<void>;

package/dist/framework.js

@@ -1,14 +1,23 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidwayRabbitMQFramework = void 0;
-const core_1 = require("@midwayjs/core");
 const decorator_1 = require("@midwayjs/decorator");
+const core_1 = require("@midwayjs/core");
 const mq_1 = require("./mq");
-class MidwayRabbitMQFramework extends core_1.BaseFramework {
+let MidwayRabbitMQFramework = class MidwayRabbitMQFramework extends core_1.BaseFramework {
     constructor() {
         super(...arguments);
         this.consumerHandlerList = [];
     }
+    configure() {
+        return this.configService.getConfiguration('rabbitMQServer');
+    }
     async applicationInitialize(options) {
         // Create a connection manager
         this.app = new mq_1.RabbitMQServer({
@@ -26,17 +35,16 @@ class MidwayRabbitMQFramework extends core_1.BaseFramework {
         await this.app.close();
     }
     getFrameworkType() {
-        return core_1.MidwayFrameworkType.MS_RABBITMQ;
+        return decorator_1.MidwayFrameworkType.MS_RABBITMQ;
     }
     async loadSubscriber() {
         // create channel
-        const subscriberModules = core_1.listModule(decorator_1.MS_CONSUMER_KEY, module => {
-            const metadata = core_1.getClassMetadata(decorator_1.MS_CONSUMER_KEY, module);
+        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;
         });
         for (const module of subscriberModules) {
-            const providerId = core_1.getProviderId(module);
-            const data = core_1.listPropertyDataFromClass(decorator_1.MS_CONSUMER_KEY, module);
+            const data = (0, decorator_1.listPropertyDataFromClass)(decorator_1.MS_CONSUMER_KEY, module);
             for (const methodBindListeners of data) {
                 // 循环绑定的方法和监听的配置信息
                 for (const listenerOptions of methodBindListeners) {
@@ -49,8 +57,19 @@ class MidwayRabbitMQFramework extends core_1.BaseFramework {
                             },
                         };
                         this.app.createAnonymousContext(ctx);
-                        const ins = await ctx.requestContext.getAsync(providerId);
-                        await ins[listenerOptions.propertyKey].call(ins, data);
+                        const ins = await ctx.requestContext.getAsync(module);
+                        const fn = await this.applyMiddleware(async (ctx) => {
+                            return await ins[listenerOptions.propertyKey].call(ins, data);
+                        });
+                        try {
+                            const result = await fn(ctx);
+                            if (result) {
+                                return channelWrapper.ack(data);
+                            }
+                        }
+                        catch (error) {
+                            this.logger.error(error);
+                        }
                     });
                 }
             }
@@ -59,6 +78,9 @@ class MidwayRabbitMQFramework extends core_1.BaseFramework {
     getFrameworkName() {
         return 'midway:rabbitmq';
     }
-}
+};
+MidwayRabbitMQFramework = __decorate([
+    (0, decorator_1.Framework)()
+], MidwayRabbitMQFramework);
 exports.MidwayRabbitMQFramework = MidwayRabbitMQFramework;
 //# sourceMappingURL=framework.js.map

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export { MidwayRabbitMQFramework as Framework } from './framework';
 export * from './interface';
+export { RabbitMQConfiguration as Configuration } from './configuration';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -10,8 +10,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Framework = void 0;
+exports.Configuration = exports.Framework = void 0;
 var framework_1 = require("./framework");
 Object.defineProperty(exports, "Framework", { enumerable: true, get: function () { return framework_1.MidwayRabbitMQFramework; } });
 __exportStar(require("./interface"), exports);
+var configuration_1 = require("./configuration");
+Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.RabbitMQConfiguration; } });
 //# sourceMappingURL=index.js.map

package/dist/interface.d.ts

@@ -1,11 +1,10 @@
-import { IConfigurationOptions, IMidwayApplication, IMidwayContext } from '@midwayjs/core';
+import { IConfigurationOptions, IMidwayApplication, IMidwayContext, NextFunction as BaseNextFunction } from '@midwayjs/core';
 import { ConsumeMessage, Options } from 'amqplib/properties';
 import { RabbitMQListenerOptions } from '@midwayjs/decorator';
-import * as amqp from 'amqplib';
-import { Channel } from 'amqplib';
+import type { ConfirmChannel, Channel, Options as AmqpOptions } from 'amqplib';
 export interface IRabbitMQApplication {
     connect(...args: any[]): Promise<void>;
-    createChannel(): Promise<void>;
+    createChannel(): Promise<Channel | ConfirmChannel>;
     createConsumer(listenerOptions: RabbitMQListenerOptions, listenerCallback: (msg: ConsumeMessage | null, channel: Channel, channelWrapper: any) => Promise<void>): Promise<void>;
     close(): Promise<void>;
 }
@@ -23,12 +22,18 @@ export interface IMidwayRabbitMQConfigurationOptions extends IConfigurationOptio
     useConfirmChannel?: boolean;
 }
 export declare type IMidwayRabbitMQContext = IMidwayContext<{
-    channel: amqp.Channel;
+    channel: Channel;
     queueName: string;
     ack: (data: any) => void;
 }>;
 export declare type Application = IMidwayRabbitMQApplication;
 export interface Context extends IMidwayRabbitMQContext {
 }
-export declare type DefaultConfig = string | amqp.Options.Connect;
+export declare type NextFunction = BaseNextFunction;
+export declare type DefaultConfig = string | AmqpOptions.Connect;
+declare module '@midwayjs/core/dist/interface' {
+    interface MidwayConfig {
+        rabbitMQServer?: PowerPartial<IMidwayRabbitMQConfigurationOptions>;
+    }
+}
 //# sourceMappingURL=interface.d.ts.map

package/dist/mq.d.ts

@@ -6,19 +6,19 @@ import * as amqp from 'amqp-connection-manager';
 import { IRabbitMQApplication } from './interface';
 import { ConsumeMessage } from 'amqplib/properties';
 import { RabbitMQListenerOptions } from '@midwayjs/decorator';
-import { Channel } from 'amqplib';
+import type { Channel } from 'amqplib';
 import { ILogger } from '@midwayjs/logger';
 import { EventEmitter } from 'events';
 export declare class RabbitMQServer extends EventEmitter implements IRabbitMQApplication {
     protected channelManagerSet: Set<Channel>;
-    protected connection: amqp.Connection;
+    protected connection: amqp.AmqpConnectionManager;
     protected logger: ILogger;
     protected reconnectTime: any;
     constructor(options?: any);
     bindError(): void;
     createChannel(isConfirmChannel?: boolean): Promise<any>;
     connect(url: any, socketOptions: any): Promise<void>;
-    createConsumer(listenerOptions: RabbitMQListenerOptions, listenerCallback: (msg: ConsumeMessage | null, channel: Channel, channelWrapper: any) => Promise<void>): Promise<any>;
+    createConsumer(listenerOptions: RabbitMQListenerOptions, listenerCallback: (msg: ConsumeMessage | null, channel: Channel, channelWrapper: any) => Promise<void>): Promise<void>;
     protected closeConnection(): Promise<void>;
     close(): Promise<void>;
 }

package/dist/mq.js

@@ -23,10 +23,10 @@ class RabbitMQServer extends events_1.EventEmitter {
     }
     createChannel(isConfirmChannel = false) {
         if (!isConfirmChannel) {
-            return this.connection.createChannel();
+            return this.connection.connection.createChannel();
         }
         else {
-            return this.connection.createConfirmChannel();
+            return this.connection.connection.createConfirmChannel();
         }
     }
     async connect(url, socketOptions) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/rabbitmq",
-  "version": "3.0.0-alpha.9+d5acc750",
+  "version": "3.0.0-beta.12",
   "description": "Midway Framework for rabbitmq",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -23,14 +23,14 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-alpha.2",
-    "@midwayjs/mock": "^3.0.0-alpha.9+d5acc750",
+    "@midwayjs/decorator": "^3.0.0-beta.12",
+    "@midwayjs/mock": "^3.0.0-beta.12",
     "@types/amqplib": "*",
     "fs-extra": "^8.0.1"
   },
   "dependencies": {
-    "@midwayjs/core": "^3.0.0-alpha.9+d5acc750",
-    "@midwayjs/logger": "^2.11.3",
+    "@midwayjs/core": "^3.0.0-beta.12",
+    "@midwayjs/logger": "^3.0.0-beta.12",
     "amqp-connection-manager": "^3.2.2",
     "amqplib": "*"
   },
@@ -43,5 +43,8 @@
     "type": "git",
     "url": "http://github.com/midwayjs/midway.git"
   },
-  "gitHead": "d5acc7505275ea9d566edd38e5e0377141e0abc1"
+  "engines": {
+    "node": ">=12"
+  },
+  "gitHead": "1c46e53eb934248007eeb7fe3920f5ac24e272c6"
 }