@midwayjs/rabbitmq 3.4.4 → 3.4.7

package/dist/framework.js

@@ -26,10 +26,16 @@ let MidwayRabbitMQFramework = class MidwayRabbitMQFramework extends core_1.BaseF
         });
     }
     async run() {
-        // init connection
-        await this.app.connect(this.configurationOptions.url, this.configurationOptions.socketOptions);
-        await this.loadSubscriber();
-        this.logger.info('Rabbitmq server start success');
+        try {
+            // init connection
+            await this.app.connect(this.configurationOptions.url, this.configurationOptions.socketOptions);
+            await this.loadSubscriber();
+            this.logger.info('Rabbitmq server start success');
+        }
+        catch (error) {
+            this.app.close();
+            throw error;
+        }
     }
     async beforeStop() {
         await this.app.close();

package/dist/mq.js

@@ -30,31 +30,39 @@ class RabbitMQServer extends events_1.EventEmitter {
         }
     }
     async connect(url, socketOptions) {
-        try {
-            this.connection = await amqp.connect(url, socketOptions);
-            await new Promise((resolve, reject) => {
-                this.connection.on('connect', () => {
-                    this.logger.info('Message Queue connected!');
-                    resolve();
-                });
-                this.connection.on('error', err => {
-                    if (err) {
-                        if (err.err) {
-                            err = err.err;
-                        }
-                        this.logger.error('Message Queue disconnected', err);
-                    }
-                    else {
-                        this.logger.info('Message Queue disconnected!');
+        this.connection = await amqp.connect(url, socketOptions);
+        // 监听在设置创建 channel 的错误
+        this.connection.on('error', err => {
+            if (err) {
+                if (err.err) {
+                    err = err.err;
+                }
+                this.logger.error('Message Queue error', err);
+            }
+            else {
+                this.logger.info('Message Queue disconnected!');
+            }
+        });
+        await new Promise((resolve, reject) => {
+            // 监听 成功连接 的通知
+            this.connection.on('connect', () => {
+                this.logger.info('Message Queue connected!');
+                resolve();
+            });
+            // 监听 连接失败的错误 通知
+            this.connection.on('connectFailed', err => {
+                if (err) {
+                    if (err.err) {
+                        err = err.err;
                     }
-                    reject(err);
-                });
+                    this.logger.error('Message Queue disconnected', err);
+                }
+                else {
+                    this.logger.info('Message Queue disconnected!');
+                }
+                reject(err);
             });
-        }
-        catch (error) {
-            this.logger.error('Message Queue connect fail', error);
-            await this.closeConnection();
-        }
+        });
     }
     async createConsumer(listenerOptions, listenerCallback) {
         const channelWrapper = this.connection.createChannel({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/rabbitmq",
-  "version": "3.4.4",
+  "version": "3.4.7",
   "description": "Midway Framework for rabbitmq",
   "main": "dist/index",
   "typings": "index.d.ts",
@@ -25,13 +25,13 @@
   "license": "MIT",
   "devDependencies": {
     "@midwayjs/decorator": "^3.4.4",
-    "@midwayjs/mock": "^3.4.4",
+    "@midwayjs/mock": "^3.4.7",
     "@types/amqplib": "0.8.2",
-    "amqplib": "0.10.0",
+    "amqplib": "0.10.1",
     "fs-extra": "10.0.1"
   },
   "dependencies": {
-    "@midwayjs/core": "^3.4.4",
+    "@midwayjs/core": "^3.4.7",
     "@midwayjs/logger": "^2.15.0",
     "amqp-connection-manager": "4.1.3"
   },
@@ -47,5 +47,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "f6b5a3ff3d19ae2a0d33a5a14357bee2a8463767"
+  "gitHead": "3c60619a65c6776d99fbf0b30ac454d3cb6926b9"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-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.