@midwayjs/rabbitmq 3.4.4 → 3.4.5

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.5",
   "description": "Midway Framework for rabbitmq",
   "main": "dist/index",
   "typings": "index.d.ts",
@@ -47,5 +47,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "f6b5a3ff3d19ae2a0d33a5a14357bee2a8463767"
+  "gitHead": "d276470fb4bee362e5bcdcb47f59fdacb699f0bf"
 }