@azteam/rabbitmq-async 1.0.165 → 1.0.167

package/lib/RabbitMQAsync.js

@@ -304,118 +304,167 @@ var RabbitMQAsync = /*#__PURE__*/function () {
       return sendNoRetry;
     }()
   }, {
-    key: "getInfo",
+    key: "selfSendNoRetry",
     value: function () {
-      var _getInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(queueName) {
-        var prefixQueueName, channel;
+      var _selfSendNoRetry = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(queueName) {
+        var msg,
+          limit,
+          _args7 = arguments;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) {
             switch (_context7.prev = _context7.next) {
+              case 0:
+                msg = _args7.length > 1 && _args7[1] !== undefined ? _args7[1] : {};
+                limit = _args7.length > 2 && _args7[2] !== undefined ? _args7[2] : 0;
+                this.selfSend(queueName, _objectSpread(_objectSpread({}, msg), {}, {
+                  noRetry: true
+                }), limit);
+              case 3:
+              case "end":
+                return _context7.stop();
+            }
+          }
+        }, _callee7, this);
+      }));
+      function selfSendNoRetry(_x4) {
+        return _selfSendNoRetry.apply(this, arguments);
+      }
+      return selfSendNoRetry;
+    }()
+  }, {
+    key: "getInfo",
+    value: function () {
+      var _getInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(queueName) {
+        var prefixQueueName, channel;
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) {
+            switch (_context8.prev = _context8.next) {
               case 0:
                 prefixQueueName = this.parsePrefix(queueName);
                 if (!this.connected) {
-                  _context7.next = 25;
+                  _context8.next = 25;
                   break;
                 }
-                _context7.prev = 2;
-                _context7.next = 5;
+                _context8.prev = 2;
+                _context8.next = 5;
                 return this.client.createChannel();
               case 5:
-                channel = _context7.sent;
-                _context7.next = 8;
+                channel = _context8.sent;
+                _context8.next = 8;
                 return channel.assertQueue(prefixQueueName, {
                   durable: true
                 });
               case 8:
-                return _context7.abrupt("return", _context7.sent);
+                return _context8.abrupt("return", _context8.sent);
               case 11:
-                _context7.prev = 11;
-                _context7.t0 = _context7["catch"](2);
-                return _context7.abrupt("return", this.getInfo(queueName));
+                _context8.prev = 11;
+                _context8.t0 = _context8["catch"](2);
+                return _context8.abrupt("return", this.getInfo(queueName));
               case 14:
-                _context7.prev = 14;
-                _context7.prev = 15;
-                _context7.next = 18;
+                _context8.prev = 14;
+                _context8.prev = 15;
+                _context8.next = 18;
                 return channel.close();
               case 18:
-                _context7.next = 22;
+                _context8.next = 22;
                 break;
               case 20:
-                _context7.prev = 20;
-                _context7.t1 = _context7["catch"](15);
+                _context8.prev = 20;
+                _context8.t1 = _context8["catch"](15);
               case 22:
-                return _context7.finish(14);
+                return _context8.finish(14);
               case 23:
-                _context7.next = 26;
+                _context8.next = 26;
                 break;
               case 25:
-                return _context7.abrupt("return", this.getInfo(queueName));
+                return _context8.abrupt("return", this.getInfo(queueName));
               case 26:
               case "end":
-                return _context7.stop();
+                return _context8.stop();
             }
           }
-        }, _callee7, this, [[2, 11, 14, 23], [15, 20]]);
+        }, _callee8, this, [[2, 11, 14, 23], [15, 20]]);
       }));
-      function getInfo(_x4) {
+      function getInfo(_x5) {
         return _getInfo.apply(this, arguments);
       }
       return getInfo;
     }()
+  }, {
+    key: "getSelfInfo",
+    value: function () {
+      var _getSelfInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(queueName) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) {
+            switch (_context9.prev = _context9.next) {
+              case 0:
+                return _context9.abrupt("return", this.getInfo("".concat(this.serverIp, "_").concat(queueName)));
+              case 1:
+              case "end":
+                return _context9.stop();
+            }
+          }
+        }, _callee9, this);
+      }));
+      function getSelfInfo(_x6) {
+        return _getSelfInfo.apply(this, arguments);
+      }
+      return getSelfInfo;
+    }()
   }, {
     key: "consume",
     value: function () {
-      var _consume = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(queueName, cb) {
+      var _consume = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(queueName, cb) {
         var callbackError,
           prefixQueueName,
           channel,
           messageQueue,
-          _args9 = arguments;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          _args11 = arguments;
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) {
-            switch (_context9.prev = _context9.next) {
+            switch (_context11.prev = _context11.next) {
               case 0:
-                callbackError = _args9.length > 2 && _args9[2] !== undefined ? _args9[2] : null;
+                callbackError = _args11.length > 2 && _args11[2] !== undefined ? _args11[2] : null;
                 prefixQueueName = this.parsePrefix(queueName);
                 if (!this.connected) {
-                  _context9.next = 30;
+                  _context11.next = 30;
                   break;
                 }
-                _context9.prev = 3;
-                _context9.next = 6;
+                _context11.prev = 3;
+                _context11.next = 6;
                 return this.client.createChannel();
               case 6:
-                channel = _context9.sent;
-                _context9.next = 9;
+                channel = _context11.sent;
+                _context11.next = 9;
                 return channel.assertQueue(prefixQueueName, {
                   durable: true
                 });
               case 9:
-                _context9.next = 11;
+                _context11.next = 11;
                 return channel.prefetch(1);
               case 11:
                 messageQueue = this;
-                _context9.next = 14;
+                _context11.next = 14;
                 return new Promise(function (resolve, reject) {
                   channel.consume(prefixQueueName, /*#__PURE__*/function () {
-                    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(msg) {
+                    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(msg) {
                       var data, errString;
-                      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+                      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
                         while (1) {
-                          switch (_context8.prev = _context8.next) {
+                          switch (_context10.prev = _context10.next) {
                             case 0:
                               if (!msg) {
-                                _context8.next = 55;
+                                _context10.next = 55;
                                 break;
                               }
                               data = JSON.parse(msg.content.toString());
                               if (!data) {
-                                _context8.next = 52;
+                                _context10.next = 52;
                                 break;
                               }
-                              _context8.prev = 3;
+                              _context10.prev = 3;
                               if (!msg.fields.redelivered) {
-                                _context8.next = 23;
+                                _context10.next = 23;
                                 break;
                               }
                               if (!data.retry) {
@@ -423,143 +472,143 @@ var RabbitMQAsync = /*#__PURE__*/function () {
                               }
                               data.retry += 1;
                               if (!(data.retry < 5)) {
-                                _context8.next = 17;
+                                _context10.next = 17;
                                 break;
                               }
                               if (!(messageQueue.worker && !queueName.startsWith(messageQueue.serverIp))) {
-                                _context8.next = 13;
+                                _context10.next = 13;
                                 break;
                               }
-                              _context8.next = 11;
+                              _context10.next = 11;
                               return messageQueue.send("".concat(messageQueue.serverIp, "_").concat(queueName), data);
                             case 11:
-                              _context8.next = 15;
+                              _context10.next = 15;
                               break;
                             case 13:
-                              _context8.next = 15;
+                              _context10.next = 15;
                               return messageQueue.send(queueName, data);
                             case 15:
-                              _context8.next = 19;
+                              _context10.next = 19;
                               break;
                             case 17:
-                              _context8.next = 19;
+                              _context10.next = 19;
                               return messageQueue.send(messageQueue.parsePrefix('RETRY'), {
                                 queueName: queueName,
                                 data: data,
                                 retry_time: new Date()
                               });
                             case 19:
-                              _context8.next = 21;
+                              _context10.next = 21;
                               return channel.ack(msg);
                             case 21:
-                              _context8.next = 45;
+                              _context10.next = 45;
                               break;
                             case 23:
-                              _context8.prev = 23;
-                              _context8.next = 26;
+                              _context10.prev = 23;
+                              _context10.next = 26;
                               return cb(data);
                             case 26:
-                              _context8.next = 28;
+                              _context10.next = 28;
                               return channel.ack(msg);
                             case 28:
-                              _context8.next = 45;
+                              _context10.next = 45;
                               break;
                             case 30:
-                              _context8.prev = 30;
-                              _context8.t0 = _context8["catch"](23);
-                              errString = _context8.t0.toString();
+                              _context10.prev = 30;
+                              _context10.t0 = _context10["catch"](23);
+                              errString = _context10.t0.toString();
                               if (!_lodash["default"].some(['IllegalOperationError: Channel closed'], function (el) {
                                 return _lodash["default"].includes(errString, el);
                               })) {
-                                _context8.next = 37;
+                                _context10.next = 37;
                                 break;
                               }
                               reject(new Error(errString));
-                              _context8.next = 45;
+                              _context10.next = 45;
                               break;
                             case 37:
                               if (callbackError) {
-                                callbackError(prefixQueueName, _context8.t0);
+                                callbackError(prefixQueueName, _context10.t0);
                               }
                               if (!data.noRetry) {
-                                _context8.next = 43;
+                                _context10.next = 43;
                                 break;
                               }
-                              _context8.next = 41;
+                              _context10.next = 41;
                               return channel.ack(msg);
                             case 41:
-                              _context8.next = 45;
+                              _context10.next = 45;
                               break;
                             case 43:
-                              _context8.next = 45;
+                              _context10.next = 45;
                               return channel.nack(msg);
                             case 45:
-                              _context8.next = 50;
+                              _context10.next = 50;
                               break;
                             case 47:
-                              _context8.prev = 47;
-                              _context8.t1 = _context8["catch"](3);
-                              reject(_context8.t1);
+                              _context10.prev = 47;
+                              _context10.t1 = _context10["catch"](3);
+                              reject(_context10.t1);
                             case 50:
-                              _context8.next = 53;
+                              _context10.next = 53;
                               break;
                             case 52:
                               channel.ack(msg);
                             case 53:
-                              _context8.next = 56;
+                              _context10.next = 56;
                               break;
                             case 55:
                               reject(new Error('msg null'));
                             case 56:
                             case "end":
-                              return _context8.stop();
+                              return _context10.stop();
                           }
                         }
-                      }, _callee8, null, [[3, 47], [23, 30]]);
+                      }, _callee10, null, [[3, 47], [23, 30]]);
                     }));
-                    return function (_x7) {
+                    return function (_x9) {
                       return _ref.apply(this, arguments);
                     };
                   }());
                 });
               case 14:
-                _context9.next = 28;
+                _context11.next = 28;
                 break;
               case 16:
-                _context9.prev = 16;
-                _context9.t0 = _context9["catch"](3);
-                _context9.prev = 18;
-                _context9.next = 21;
+                _context11.prev = 16;
+                _context11.t0 = _context11["catch"](3);
+                _context11.prev = 18;
+                _context11.next = 21;
                 return channel.close();
               case 21:
-                _context9.next = 25;
+                _context11.next = 25;
                 break;
               case 23:
-                _context9.prev = 23;
-                _context9.t1 = _context9["catch"](18);
+                _context11.prev = 23;
+                _context11.t1 = _context11["catch"](18);
               case 25:
-                _context9.next = 27;
+                _context11.next = 27;
                 return (0, _util.timeout)(5000);
               case 27:
-                return _context9.abrupt("return", this.consume(queueName, cb, callbackError));
+                return _context11.abrupt("return", this.consume(queueName, cb, callbackError));
               case 28:
-                _context9.next = 33;
+                _context11.next = 33;
                 break;
               case 30:
-                _context9.next = 32;
+                _context11.next = 32;
                 return (0, _util.timeout)(5000);
               case 32:
-                return _context9.abrupt("return", this.consume(queueName, cb, callbackError));
+                return _context11.abrupt("return", this.consume(queueName, cb, callbackError));
               case 33:
-                return _context9.abrupt("return", true);
+                return _context11.abrupt("return", true);
               case 34:
               case "end":
-                return _context9.stop();
+                return _context11.stop();
             }
           }
-        }, _callee9, this, [[3, 16], [18, 23]]);
+        }, _callee11, this, [[3, 16], [18, 23]]);
       }));
-      function consume(_x5, _x6) {
+      function consume(_x7, _x8) {
         return _consume.apply(this, arguments);
       }
       return consume;
@@ -567,20 +616,20 @@ var RabbitMQAsync = /*#__PURE__*/function () {
   }, {
     key: "selfReceiving",
     value: function () {
-      var _selfReceiving = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(queueName, cb, callbackError) {
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+      var _selfReceiving = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(queueName, cb, callbackError) {
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) {
-            switch (_context10.prev = _context10.next) {
+            switch (_context12.prev = _context12.next) {
               case 0:
                 this.consume("".concat(this.serverIp, "_").concat(queueName), cb, callbackError);
               case 1:
               case "end":
-                return _context10.stop();
+                return _context12.stop();
             }
           }
-        }, _callee10, this);
+        }, _callee12, this);
       }));
-      function selfReceiving(_x8, _x9, _x10) {
+      function selfReceiving(_x10, _x11, _x12) {
         return _selfReceiving.apply(this, arguments);
       }
       return selfReceiving;
@@ -588,26 +637,26 @@ var RabbitMQAsync = /*#__PURE__*/function () {
   }, {
     key: "receiving",
     value: function () {
-      var _receiving = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(queueName, cb) {
+      var _receiving = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(queueName, cb) {
         var callbackError,
-          _args11 = arguments;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          _args13 = arguments;
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) {
-            switch (_context11.prev = _context11.next) {
+            switch (_context13.prev = _context13.next) {
               case 0:
-                callbackError = _args11.length > 2 && _args11[2] !== undefined ? _args11[2] : null;
+                callbackError = _args13.length > 2 && _args13[2] !== undefined ? _args13[2] : null;
                 this.consume(queueName, cb, callbackError);
                 if (this.worker) {
                   this.selfReceiving(queueName, cb, callbackError);
                 }
               case 3:
               case "end":
-                return _context11.stop();
+                return _context13.stop();
             }
           }
-        }, _callee11, this);
+        }, _callee13, this);
       }));
-      function receiving(_x11, _x12) {
+      function receiving(_x13, _x14) {
         return _receiving.apply(this, arguments);
       }
       return receiving;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/rabbitmq-async",
-    "version": "1.0.165",
+    "version": "1.0.167",
     "description": "",
     "keywords": [
         "toda",

package/src/RabbitMQAsync.js

@@ -112,6 +112,10 @@ class RabbitMQAsync {
         this.send(queueName, {...msg, noRetry: true}, limit);
     }
 
+    async selfSendNoRetry(queueName, msg = {}, limit = 0) {
+        this.selfSend(queueName, {...msg, noRetry: true}, limit);
+    }
+
     async getInfo(queueName) {
         const prefixQueueName = this.parsePrefix(queueName);
 
@@ -134,6 +138,10 @@ class RabbitMQAsync {
         }
     }
 
+    async getSelfInfo(queueName) {
+        return this.getInfo(`${this.serverIp}_${queueName}`);
+    }
+
     async consume(queueName, cb, callbackError = null) {
         const prefixQueueName = this.parsePrefix(queueName);