@azteam/rabbitmq-async 1.0.161 → 1.0.163

package/lib/RabbitMQAsync.js

@@ -169,7 +169,7 @@ var RabbitMQAsync = /*#__PURE__*/function () {
     value: function () {
       var _send = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(queueName) {
         var msg,
-          force,
+          limit,
           prefixQueueName,
           channel,
           queueInfo,
@@ -179,7 +179,7 @@ var RabbitMQAsync = /*#__PURE__*/function () {
             switch (_context4.prev = _context4.next) {
               case 0:
                 msg = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : {};
-                force = _args4.length > 2 && _args4[2] !== undefined ? _args4[2] : true;
+                limit = _args4.length > 2 && _args4[2] !== undefined ? _args4[2] : false;
                 prefixQueueName = this.parsePrefix(queueName);
                 if (!this.connected) {
                   _context4.next = 33;
@@ -196,7 +196,7 @@ var RabbitMQAsync = /*#__PURE__*/function () {
                 });
               case 10:
                 queueInfo = _context4.sent;
-                if (!(force || queueInfo.messageCount === 0)) {
+                if (!(!limit || queueInfo.messageCount < limit)) {
                   _context4.next = 14;
                   break;
                 }
@@ -247,60 +247,86 @@ var RabbitMQAsync = /*#__PURE__*/function () {
       return send;
     }()
   }, {
-    key: "getInfo",
+    key: "sendNoRetry",
     value: function () {
-      var _getInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(queueName) {
-        var prefixQueueName, channel;
+      var _sendNoRetry = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(queueName) {
+        var msg,
+          limit,
+          _args5 = arguments;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
+              case 0:
+                msg = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : {};
+                limit = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : false;
+                this.send(queueName, msg, limit);
+              case 3:
+              case "end":
+                return _context5.stop();
+            }
+          }
+        }, _callee5, this);
+      }));
+      function sendNoRetry(_x2) {
+        return _sendNoRetry.apply(this, arguments);
+      }
+      return sendNoRetry;
+    }()
+  }, {
+    key: "getInfo",
+    value: function () {
+      var _getInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(queueName) {
+        var prefixQueueName, channel;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) {
+            switch (_context6.prev = _context6.next) {
               case 0:
                 prefixQueueName = this.parsePrefix(queueName);
                 if (!this.connected) {
-                  _context5.next = 25;
+                  _context6.next = 25;
                   break;
                 }
-                _context5.prev = 2;
-                _context5.next = 5;
+                _context6.prev = 2;
+                _context6.next = 5;
                 return this.client.createChannel();
               case 5:
-                channel = _context5.sent;
-                _context5.next = 8;
+                channel = _context6.sent;
+                _context6.next = 8;
                 return channel.assertQueue(prefixQueueName, {
                   durable: true
                 });
               case 8:
-                return _context5.abrupt("return", _context5.sent);
+                return _context6.abrupt("return", _context6.sent);
               case 11:
-                _context5.prev = 11;
-                _context5.t0 = _context5["catch"](2);
-                return _context5.abrupt("return", this.getInfo(queueName));
+                _context6.prev = 11;
+                _context6.t0 = _context6["catch"](2);
+                return _context6.abrupt("return", this.getInfo(queueName));
               case 14:
-                _context5.prev = 14;
-                _context5.prev = 15;
-                _context5.next = 18;
+                _context6.prev = 14;
+                _context6.prev = 15;
+                _context6.next = 18;
                 return channel.close();
               case 18:
-                _context5.next = 22;
+                _context6.next = 22;
                 break;
               case 20:
-                _context5.prev = 20;
-                _context5.t1 = _context5["catch"](15);
+                _context6.prev = 20;
+                _context6.t1 = _context6["catch"](15);
               case 22:
-                return _context5.finish(14);
+                return _context6.finish(14);
               case 23:
-                _context5.next = 26;
+                _context6.next = 26;
                 break;
               case 25:
-                return _context5.abrupt("return", this.getInfo(queueName));
+                return _context6.abrupt("return", this.getInfo(queueName));
               case 26:
               case "end":
-                return _context5.stop();
+                return _context6.stop();
             }
           }
-        }, _callee5, this, [[2, 11, 14, 23], [15, 20]]);
+        }, _callee6, this, [[2, 11, 14, 23], [15, 20]]);
       }));
-      function getInfo(_x2) {
+      function getInfo(_x3) {
         return _getInfo.apply(this, arguments);
       }
       return getInfo;
@@ -308,57 +334,57 @@ var RabbitMQAsync = /*#__PURE__*/function () {
   }, {
     key: "consume",
     value: function () {
-      var _consume = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(queueName, cb) {
+      var _consume = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(queueName, cb) {
         var callbackError,
           prefixQueueName,
           channel,
           messageQueue,
-          _args7 = arguments;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          _args8 = arguments;
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) {
-            switch (_context7.prev = _context7.next) {
+            switch (_context8.prev = _context8.next) {
               case 0:
-                callbackError = _args7.length > 2 && _args7[2] !== undefined ? _args7[2] : null;
+                callbackError = _args8.length > 2 && _args8[2] !== undefined ? _args8[2] : null;
                 prefixQueueName = this.parsePrefix(queueName);
                 if (!this.connected) {
-                  _context7.next = 30;
+                  _context8.next = 30;
                   break;
                 }
-                _context7.prev = 3;
-                _context7.next = 6;
+                _context8.prev = 3;
+                _context8.next = 6;
                 return this.client.createChannel();
               case 6:
-                channel = _context7.sent;
-                _context7.next = 9;
+                channel = _context8.sent;
+                _context8.next = 9;
                 return channel.assertQueue(prefixQueueName, {
                   durable: true
                 });
               case 9:
-                _context7.next = 11;
+                _context8.next = 11;
                 return channel.prefetch(1);
               case 11:
                 messageQueue = this;
-                _context7.next = 14;
+                _context8.next = 14;
                 return new Promise(function (resolve, reject) {
                   channel.consume(prefixQueueName, /*#__PURE__*/function () {
-                    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(msg) {
+                    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(msg) {
                       var data, errString;
-                      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+                      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
                         while (1) {
-                          switch (_context6.prev = _context6.next) {
+                          switch (_context7.prev = _context7.next) {
                             case 0:
                               if (!msg) {
-                                _context6.next = 50;
+                                _context7.next = 55;
                                 break;
                               }
                               data = JSON.parse(msg.content.toString());
                               if (!data) {
-                                _context6.next = 47;
+                                _context7.next = 52;
                                 break;
                               }
-                              _context6.prev = 3;
+                              _context7.prev = 3;
                               if (!msg.fields.redelivered) {
-                                _context6.next = 18;
+                                _context7.next = 23;
                                 break;
                               }
                               if (!data.retry) {
@@ -366,160 +392,191 @@ var RabbitMQAsync = /*#__PURE__*/function () {
                               }
                               data.retry += 1;
                               if (!(data.retry < 5)) {
-                                _context6.next = 12;
+                                _context7.next = 17;
                                 break;
                               }
-                              _context6.next = 10;
+                              if (!(messageQueue.worker && !queueName.startsWith(messageQueue.serverIp))) {
+                                _context7.next = 13;
+                                break;
+                              }
+                              _context7.next = 11;
+                              return messageQueue.send("".concat(messageQueue.serverIp, "_").concat(queueName), data);
+                            case 11:
+                              _context7.next = 15;
+                              break;
+                            case 13:
+                              _context7.next = 15;
                               return messageQueue.send(queueName, data);
-                            case 10:
-                              _context6.next = 14;
+                            case 15:
+                              _context7.next = 19;
                               break;
-                            case 12:
-                              _context6.next = 14;
+                            case 17:
+                              _context7.next = 19;
                               return messageQueue.send(messageQueue.parsePrefix('RETRY'), {
                                 queueName: queueName,
                                 data: data,
                                 retry_time: new Date()
                               });
-                            case 14:
-                              _context6.next = 16;
+                            case 19:
+                              _context7.next = 21;
                               return channel.ack(msg);
-                            case 16:
-                              _context6.next = 40;
+                            case 21:
+                              _context7.next = 45;
                               break;
-                            case 18:
-                              _context6.prev = 18;
-                              _context6.next = 21;
+                            case 23:
+                              _context7.prev = 23;
+                              _context7.next = 26;
                               return cb(data);
-                            case 21:
-                              _context6.next = 23;
+                            case 26:
+                              _context7.next = 28;
                               return channel.ack(msg);
-                            case 23:
-                              _context6.next = 40;
+                            case 28:
+                              _context7.next = 45;
                               break;
-                            case 25:
-                              _context6.prev = 25;
-                              _context6.t0 = _context6["catch"](18);
-                              errString = _context6.t0.toString();
+                            case 30:
+                              _context7.prev = 30;
+                              _context7.t0 = _context7["catch"](23);
+                              errString = _context7.t0.toString();
                               if (!_lodash["default"].some(['IllegalOperationError: Channel closed'], function (el) {
                                 return _lodash["default"].includes(errString, el);
                               })) {
-                                _context6.next = 32;
+                                _context7.next = 37;
                                 break;
                               }
                               reject(new Error(errString));
-                              _context6.next = 40;
+                              _context7.next = 45;
                               break;
-                            case 32:
+                            case 37:
                               if (callbackError) {
-                                callbackError(prefixQueueName, _context6.t0);
+                                callbackError(prefixQueueName, _context7.t0);
                               }
                               if (!data.noRetry) {
-                                _context6.next = 38;
+                                _context7.next = 43;
                                 break;
                               }
-                              _context6.next = 36;
+                              _context7.next = 41;
                               return channel.ack(msg);
-                            case 36:
-                              _context6.next = 40;
+                            case 41:
+                              _context7.next = 45;
                               break;
-                            case 38:
-                              _context6.next = 40;
+                            case 43:
+                              _context7.next = 45;
                               return channel.nack(msg);
-                            case 40:
-                              _context6.next = 45;
-                              break;
-                            case 42:
-                              _context6.prev = 42;
-                              _context6.t1 = _context6["catch"](3);
-                              reject(_context6.t1);
                             case 45:
-                              _context6.next = 48;
+                              _context7.next = 50;
                               break;
                             case 47:
+                              _context7.prev = 47;
+                              _context7.t1 = _context7["catch"](3);
+                              reject(_context7.t1);
+                            case 50:
+                              _context7.next = 53;
+                              break;
+                            case 52:
                               channel.ack(msg);
-                            case 48:
-                              _context6.next = 51;
+                            case 53:
+                              _context7.next = 56;
                               break;
-                            case 50:
+                            case 55:
                               reject(new Error('msg null'));
-                            case 51:
+                            case 56:
                             case "end":
-                              return _context6.stop();
+                              return _context7.stop();
                           }
                         }
-                      }, _callee6, null, [[3, 42], [18, 25]]);
+                      }, _callee7, null, [[3, 47], [23, 30]]);
                     }));
-                    return function (_x5) {
+                    return function (_x6) {
                       return _ref.apply(this, arguments);
                     };
                   }());
                 });
               case 14:
-                _context7.next = 28;
+                _context8.next = 28;
                 break;
               case 16:
-                _context7.prev = 16;
-                _context7.t0 = _context7["catch"](3);
-                _context7.prev = 18;
-                _context7.next = 21;
+                _context8.prev = 16;
+                _context8.t0 = _context8["catch"](3);
+                _context8.prev = 18;
+                _context8.next = 21;
                 return channel.close();
               case 21:
-                _context7.next = 25;
+                _context8.next = 25;
                 break;
               case 23:
-                _context7.prev = 23;
-                _context7.t1 = _context7["catch"](18);
+                _context8.prev = 23;
+                _context8.t1 = _context8["catch"](18);
               case 25:
-                _context7.next = 27;
+                _context8.next = 27;
                 return (0, _util.timeout)(5000);
               case 27:
-                return _context7.abrupt("return", this.consume(queueName, cb, callbackError));
+                return _context8.abrupt("return", this.consume(queueName, cb, callbackError));
               case 28:
-                _context7.next = 33;
+                _context8.next = 33;
                 break;
               case 30:
-                _context7.next = 32;
+                _context8.next = 32;
                 return (0, _util.timeout)(5000);
               case 32:
-                return _context7.abrupt("return", this.consume(queueName, cb, callbackError));
+                return _context8.abrupt("return", this.consume(queueName, cb, callbackError));
               case 33:
-                return _context7.abrupt("return", true);
+                return _context8.abrupt("return", true);
               case 34:
               case "end":
-                return _context7.stop();
+                return _context8.stop();
             }
           }
-        }, _callee7, this, [[3, 16], [18, 23]]);
+        }, _callee8, this, [[3, 16], [18, 23]]);
       }));
-      function consume(_x3, _x4) {
+      function consume(_x4, _x5) {
         return _consume.apply(this, arguments);
       }
       return consume;
     }()
+  }, {
+    key: "selfReceiving",
+    value: function () {
+      var _selfReceiving = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(queueName, cb, callbackError) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) {
+            switch (_context9.prev = _context9.next) {
+              case 0:
+                this.consume("".concat(this.serverIp, "_").concat(queueName), cb, callbackError);
+              case 1:
+              case "end":
+                return _context9.stop();
+            }
+          }
+        }, _callee9, this);
+      }));
+      function selfReceiving(_x7, _x8, _x9) {
+        return _selfReceiving.apply(this, arguments);
+      }
+      return selfReceiving;
+    }()
   }, {
     key: "receiving",
     value: function () {
-      var _receiving = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(queueName, cb) {
+      var _receiving = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(queueName, cb) {
         var callbackError,
-          _args8 = arguments;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          _args10 = arguments;
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) {
-            switch (_context8.prev = _context8.next) {
+            switch (_context10.prev = _context10.next) {
               case 0:
-                callbackError = _args8.length > 2 && _args8[2] !== undefined ? _args8[2] : null;
+                callbackError = _args10.length > 2 && _args10[2] !== undefined ? _args10[2] : null;
                 this.consume(queueName, cb, callbackError);
                 if (this.worker) {
-                  this.consume("".concat(this.serverIp, "_").concat(queueName), cb, callbackError);
+                  this.selfReceiving(queueName, cb, callbackError);
                 }
               case 3:
               case "end":
-                return _context8.stop();
+                return _context10.stop();
             }
           }
-        }, _callee8, this);
+        }, _callee10, this);
       }));
-      function receiving(_x6, _x7) {
+      function receiving(_x10, _x11) {
         return _receiving.apply(this, arguments);
       }
       return receiving;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/rabbitmq-async",
-    "version": "1.0.161",
+    "version": "1.0.163",
     "description": "",
     "main": "./lib/index.js",
     "module": "./src/index.js",

package/src/RabbitMQAsync.js

@@ -72,7 +72,7 @@ class RabbitMQAsync {
         return name;
     }
 
-    async send(queueName, msg = {}, force = true) {
+    async send(queueName, msg = {}, limit = false) {
         const prefixQueueName = this.parsePrefix(queueName);
 
         if (this.connected) {
@@ -83,7 +83,7 @@ class RabbitMQAsync {
                     durable: true,
                 });
 
-                if (force || queueInfo.messageCount === 0) {
+                if (!limit || queueInfo.messageCount < limit) {
                     await channel.sendToQueue(prefixQueueName, Buffer.from(JSON.stringify(msg)), {
                         persistent: true,
                     });
@@ -104,6 +104,10 @@ class RabbitMQAsync {
         }
     }
 
+    async sendNoRetry(queueName, msg = {}, limit = false) {
+        this.send(queueName, msg, limit);
+    }
+
     async getInfo(queueName) {
         const prefixQueueName = this.parsePrefix(queueName);
 
@@ -156,7 +160,11 @@ class RabbitMQAsync {
                                         data.retry += 1;
 
                                         if (data.retry < 5) {
-                                            await messageQueue.send(queueName, data);
+                                            if (messageQueue.worker && !queueName.startsWith(messageQueue.serverIp)) {
+                                                await messageQueue.send(`${messageQueue.serverIp}_${queueName}`, data);
+                                            } else {
+                                                await messageQueue.send(queueName, data);
+                                            }
                                         } else {
                                             await messageQueue.send(messageQueue.parsePrefix('RETRY'), {
                                                 queueName,
@@ -213,11 +221,15 @@ class RabbitMQAsync {
         return true;
     }
 
+    async selfReceiving(queueName, cb, callbackError) {
+        this.consume(`${this.serverIp}_${queueName}`, cb, callbackError);
+    }
+
     async receiving(queueName, cb, callbackError = null) {
         this.consume(queueName, cb, callbackError);
 
         if (this.worker) {
-            this.consume(`${this.serverIp}_${queueName}`, cb, callbackError);
+            this.selfReceiving(queueName, cb, callbackError);
         }
     }