@azteam/rabbitmq-async 1.0.159 → 1.0.161

package/lib/RabbitMQAsync.js

@@ -23,6 +23,8 @@ var RabbitMQAsync = /*#__PURE__*/function () {
     this.password = config.password;
     this.host = config.host;
     this.prefix = config.prefix;
+    this.serverIp = config.server_ip;
+    this.worker = config.worker;
     this.connect();
   }
   _createClass(RabbitMQAsync, [{
@@ -304,9 +306,9 @@ var RabbitMQAsync = /*#__PURE__*/function () {
       return getInfo;
     }()
   }, {
-    key: "receiving",
+    key: "consume",
     value: function () {
-      var _receiving = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(queueName, cb) {
+      var _consume = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(queueName, cb) {
         var callbackError,
           prefixQueueName,
           channel,
@@ -472,7 +474,7 @@ var RabbitMQAsync = /*#__PURE__*/function () {
                 _context7.next = 27;
                 return (0, _util.timeout)(5000);
               case 27:
-                return _context7.abrupt("return", this.receiving(queueName, cb, callbackError));
+                return _context7.abrupt("return", this.consume(queueName, cb, callbackError));
               case 28:
                 _context7.next = 33;
                 break;
@@ -480,15 +482,44 @@ var RabbitMQAsync = /*#__PURE__*/function () {
                 _context7.next = 32;
                 return (0, _util.timeout)(5000);
               case 32:
-                return _context7.abrupt("return", this.receiving(queueName, cb, callbackError));
+                return _context7.abrupt("return", this.consume(queueName, cb, callbackError));
               case 33:
+                return _context7.abrupt("return", true);
+              case 34:
               case "end":
                 return _context7.stop();
             }
           }
         }, _callee7, this, [[3, 16], [18, 23]]);
       }));
-      function receiving(_x3, _x4) {
+      function consume(_x3, _x4) {
+        return _consume.apply(this, arguments);
+      }
+      return consume;
+    }()
+  }, {
+    key: "receiving",
+    value: function () {
+      var _receiving = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(queueName, cb) {
+        var callbackError,
+          _args8 = arguments;
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) {
+            switch (_context8.prev = _context8.next) {
+              case 0:
+                callbackError = _args8.length > 2 && _args8[2] !== undefined ? _args8[2] : null;
+                this.consume(queueName, cb, callbackError);
+                if (this.worker) {
+                  this.consume("".concat(this.serverIp, "_").concat(queueName), cb, callbackError);
+                }
+              case 3:
+              case "end":
+                return _context8.stop();
+            }
+          }
+        }, _callee8, this);
+      }));
+      function receiving(_x6, _x7) {
         return _receiving.apply(this, arguments);
       }
       return receiving;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/rabbitmq-async",
-    "version": "1.0.159",
+    "version": "1.0.161",
     "description": "",
     "main": "./lib/index.js",
     "module": "./src/index.js",
@@ -16,7 +16,7 @@
     "author": "toda <sp.azsolution.net@gmail.com>",
     "license": "MIT",
     "dependencies": {
-        "@azteam/util": "1.0.28",
+        "@azteam/util": "1.0.29",
         "amqplib": "0.8.0",
         "fs-extra": "10.1.0",
         "lodash": "4.17.21"

package/src/RabbitMQAsync.js

@@ -9,6 +9,8 @@ class RabbitMQAsync {
         this.password = config.password;
         this.host = config.host;
         this.prefix = config.prefix;
+        this.serverIp = config.server_ip;
+        this.worker = config.worker;
         this.connect();
     }
 
@@ -124,7 +126,7 @@ class RabbitMQAsync {
         }
     }
 
-    async receiving(queueName, cb, callbackError = null) {
+    async consume(queueName, cb, callbackError = null) {
         const prefixQueueName = this.parsePrefix(queueName);
 
         if (this.connected) {
@@ -201,11 +203,21 @@ class RabbitMQAsync {
                 } catch (err2) {}
 
                 await timeout(5000);
-                return this.receiving(queueName, cb, callbackError);
+                return this.consume(queueName, cb, callbackError);
             }
         } else {
             await timeout(5000);
-            return this.receiving(queueName, cb, callbackError);
+            return this.consume(queueName, cb, callbackError);
+        }
+
+        return true;
+    }
+
+    async receiving(queueName, cb, callbackError = null) {
+        this.consume(queueName, cb, callbackError);
+
+        if (this.worker) {
+            this.consume(`${this.serverIp}_${queueName}`, cb, callbackError);
         }
     }