@azteam/rabbitmq-async 1.0.213 → 1.0.215

package/lib/Provider.js

@@ -19,11 +19,9 @@ var Provider = /*#__PURE__*/function () {
   function Provider() {
     var _this = this;
     var configs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     _classCallCheck(this, Provider);
     this.connections = {};
     this.configs = {};
-    this.options = options;
     if (Array.isArray(configs)) {
       configs.map(function (config) {
         _this.configs[config.name] = config;
@@ -39,7 +37,7 @@ var Provider = /*#__PURE__*/function () {
       var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'main';
       if (!this.connections[name]) {
         if (this.configs[name]) {
-          this.connections[name] = new _RabbitMQAsync["default"](this.configs[name], this.options.retryKey || 'RETRY');
+          this.connections[name] = new _RabbitMQAsync["default"](this.configs[name]);
         } else {
           return this.getConnection('main');
         }

package/lib/RabbitMQAsync.js

@@ -23,7 +23,6 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 var RabbitMQAsync = /*#__PURE__*/function () {
   function RabbitMQAsync(config) {
     var _this = this;
-    var retryKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'RETRY';
     _classCallCheck(this, RabbitMQAsync);
     this.connected = false;
     this.username = config.username;
@@ -31,8 +30,8 @@ var RabbitMQAsync = /*#__PURE__*/function () {
     this.host = config.host;
     this.prefix = config.prefix;
     this.serverIp = config.server_ip;
+    this.retryKey = config.retry_key;
     this.listConsume = [];
-    this.retryKey = retryKey;
     this.client = null;
     this.channel = null;
     setInterval( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -354,7 +353,7 @@ var RabbitMQAsync = /*#__PURE__*/function () {
                           break;
                         case 11:
                           _context7.next = 13;
-                          return messageQueue.send(messageQueue.parsePrefix(this.retryKey), {
+                          return messageQueue.send(messageQueue.parsePrefix(messageQueue.retryKey), {
                             queueName: queueName,
                             data: data,
                             retry_time: new Date(),
@@ -421,7 +420,7 @@ var RabbitMQAsync = /*#__PURE__*/function () {
                         case "end":
                           return _context7.stop();
                       }
-                    }, _callee7, this, [[3, 41], [17, 24]]);
+                    }, _callee7, null, [[3, 41], [17, 24]]);
                   }));
                   return function (_x5) {
                     return _ref2.apply(this, arguments);
@@ -429,7 +428,7 @@ var RabbitMQAsync = /*#__PURE__*/function () {
                 }());
               });
             case 10:
-              _context8.next = 17;
+              _context8.next = 18;
               break;
             case 12:
               _context8.prev = 12;
@@ -437,8 +436,9 @@ var RabbitMQAsync = /*#__PURE__*/function () {
               _context8.next = 16;
               return (0, _util.timeout)(5000);
             case 16:
+              this._alert('error', _context8.t0);
               return _context8.abrupt("return", this.consume(queueName, asyncFunction, callbackError));
-            case 17:
+            case 18:
             case "end":
               return _context8.stop();
           }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/rabbitmq-async",
-    "version": "1.0.213",
+    "version": "1.0.215",
     "description": "N/A",
     "keywords": [
         "toda",

package/src/Provider.js

@@ -1,12 +1,10 @@
 import RabbitMQAsync from './RabbitMQAsync';
 
 class Provider {
-    constructor(configs = [], options = {}) {
+    constructor(configs = []) {
         this.connections = {};
         this.configs = {};
 
-        this.options = options;
-
         if (Array.isArray(configs)) {
             configs.map((config) => {
                 this.configs[config.name] = config;
@@ -20,7 +18,7 @@ class Provider {
     getConnection(name = 'main') {
         if (!this.connections[name]) {
             if (this.configs[name]) {
-                this.connections[name] = new RabbitMQAsync(this.configs[name], this.options.retryKey || 'RETRY');
+                this.connections[name] = new RabbitMQAsync(this.configs[name]);
             } else {
                 return this.getConnection('main');
             }

package/src/RabbitMQAsync.js

@@ -4,18 +4,17 @@ import _ from 'lodash';
 import {timeout} from '@azteam/util';
 
 class RabbitMQAsync {
-    constructor(config, retryKey = 'RETRY') {
+    constructor(config) {
         this.connected = false;
         this.username = config.username;
         this.password = config.password;
         this.host = config.host;
         this.prefix = config.prefix;
         this.serverIp = config.server_ip;
+        this.retryKey = config.retry_key;
 
         this.listConsume = [];
 
-        this.retryKey = retryKey;
-
         this.client = null;
         this.channel = null;
 
@@ -134,7 +133,6 @@ class RabbitMQAsync {
                         channel.consume(prefixQueueName, async function (msg) {
                             if (msg) {
                                 const data = JSON.parse(msg.content.toString());
-
                                 if (data) {
                                     try {
                                         if (msg.fields.redelivered) {
@@ -142,7 +140,7 @@ class RabbitMQAsync {
                                             if (data.retry > 0) {
                                                 await messageQueue.send(queueName, data);
                                             } else {
-                                                await messageQueue.send(messageQueue.parsePrefix(this.retryKey), {
+                                                await messageQueue.send(messageQueue.parsePrefix(messageQueue.retryKey), {
                                                     queueName,
                                                     data,
                                                     retry_time: new Date(),
@@ -183,6 +181,7 @@ class RabbitMQAsync {
             }
         } catch (err3) {
             await timeout(5000);
+            this._alert('error', err3);
             return this.consume(queueName, asyncFunction, callbackError);
         }
     }