@azteam/rabbitmq-async 1.0.229 → 1.0.231

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/lib/RabbitMQAsync.js +33 -36
  2. package/package.json +1 -1
  3. package/src/RabbitMQAsync.js +1 -2
package/lib/RabbitMQAsync.js CHANGED
@@ -104,7 +104,7 @@ var RabbitMQAsync = /*#__PURE__*/function () {
104
104
  };
105
105
  _context3.prev = 2;
106
106
  _context3.next = 5;
107
- return _amqplib["default"].connect("amqp://".concat(this.host, "?heartbeat=180"), opt);
107
+ return _amqplib["default"].connect("amqp://".concat(this.host), opt);
108
108
  case 5:
109
109
  this.client = _context3.sent;
110
110
  _context3.next = 8;
@@ -328,17 +328,17 @@ var RabbitMQAsync = /*#__PURE__*/function () {
328
328
  while (1) switch (_context7.prev = _context7.next) {
329
329
  case 0:
330
330
  if (!msg) {
331
- _context7.next = 50;
331
+ _context7.next = 48;
332
332
  break;
333
333
  }
334
334
  data = JSON.parse(msg.content.toString());
335
335
  if (!data) {
336
- _context7.next = 49;
336
+ _context7.next = 47;
337
337
  break;
338
338
  }
339
339
  _context7.prev = 3;
340
340
  if (!msg.fields.redelivered) {
341
- _context7.next = 20;
341
+ _context7.next = 18;
342
342
  break;
343
343
  }
344
344
  data.retry -= 1;
@@ -367,67 +367,64 @@ var RabbitMQAsync = /*#__PURE__*/function () {
367
367
  _context7.next = 16;
368
368
  return channel.ack(msg);
369
369
  case 16:
370
- _context7.next = 18;
371
- return channel.ack(msg);
372
- case 18:
373
- _context7.next = 42;
370
+ _context7.next = 40;
374
371
  break;
375
- case 20:
376
- _context7.prev = 20;
377
- _context7.next = 23;
372
+ case 18:
373
+ _context7.prev = 18;
374
+ _context7.next = 21;
378
375
  return asyncFunction(data);
379
- case 23:
380
- _context7.next = 25;
376
+ case 21:
377
+ _context7.next = 23;
381
378
  return channel.ack(msg);
382
- case 25:
383
- _context7.next = 42;
379
+ case 23:
380
+ _context7.next = 40;
384
381
  break;
385
- case 27:
386
- _context7.prev = 27;
387
- _context7.t0 = _context7["catch"](20);
382
+ case 25:
383
+ _context7.prev = 25;
384
+ _context7.t0 = _context7["catch"](18);
388
385
  errString = _context7.t0.toString();
389
386
  if (!_lodash["default"].some(['Channel closed', 'Channel closing'], function (el) {
390
387
  return _lodash["default"].includes(errString, el);
391
388
  })) {
392
- _context7.next = 34;
389
+ _context7.next = 32;
393
390
  break;
394
391
  }
395
392
  reject(_context7.t0);
396
- _context7.next = 42;
393
+ _context7.next = 40;
397
394
  break;
398
- case 34:
395
+ case 32:
399
396
  if (callbackError && data.retry === 1) {
400
397
  callbackError(prefixQueueName, errString);
401
398
  }
402
399
  if (!(data.retry <= 0)) {
403
- _context7.next = 40;
400
+ _context7.next = 38;
404
401
  break;
405
402
  }
406
- _context7.next = 38;
403
+ _context7.next = 36;
407
404
  return channel.ack(msg);
408
- case 38:
409
- _context7.next = 42;
405
+ case 36:
406
+ _context7.next = 40;
410
407
  break;
411
- case 40:
412
- _context7.next = 42;
408
+ case 38:
409
+ _context7.next = 40;
413
410
  return channel.nack(msg);
414
- case 42:
415
- _context7.next = 47;
411
+ case 40:
412
+ _context7.next = 45;
416
413
  break;
417
- case 44:
418
- _context7.prev = 44;
414
+ case 42:
415
+ _context7.prev = 42;
419
416
  _context7.t1 = _context7["catch"](3);
420
417
  reject(_context7.t1);
421
- case 47:
422
- _context7.next = 50;
418
+ case 45:
419
+ _context7.next = 48;
423
420
  break;
424
- case 49:
421
+ case 47:
425
422
  channel.ack(msg);
426
- case 50:
423
+ case 48:
427
424
  case "end":
428
425
  return _context7.stop();
429
426
  }
430
- }, _callee7, null, [[3, 44], [20, 27]]);
427
+ }, _callee7, null, [[3, 42], [18, 25]]);
431
428
  }));
432
429
  return function (_x5) {
433
430
  return _ref2.apply(this, arguments);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@azteam/rabbitmq-async",
3
- "version": "1.0.229",
3
+ "version": "1.0.231",
4
4
  "description": "N/A",
5
5
  "keywords": [
6
6
  "toda",
package/src/RabbitMQAsync.js CHANGED
@@ -39,7 +39,7 @@ class RabbitMQAsync {
39
39
  this._alert('connecting', 'MQ connecting...');
40
40
  const opt = {credentials: amqp.credentials.plain(this.username, this.password)};
41
41
  try {
42
- this.client = await amqp.connect(`amqp://${this.host}?heartbeat=180`, opt);
42
+ this.client = await amqp.connect(`amqp://${this.host}`, opt);
43
43
  this.channel = await this.client.createChannel();
44
44
  this.channel.prefetch(1);
45
45
  this.connected = true;
@@ -148,7 +148,6 @@ class RabbitMQAsync {
148
148
  });
149
149
  }
150
150
  await channel.ack(msg);
151
- await channel.ack(msg);
152
151
  } else {
153
152
  try {
154
153
  await asyncFunction(data);