@azteam/rabbitmq-async 1.0.227 → 1.0.229
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.
- package/lib/RabbitMQAsync.js +36 -33
- package/package.json +2 -2
- package/src/RabbitMQAsync.js +2 -1
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), opt);
|
|
107
|
+
return _amqplib["default"].connect("amqp://".concat(this.host, "?heartbeat=180"), 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 =
|
|
331
|
+
_context7.next = 50;
|
|
332
332
|
break;
|
|
333
333
|
}
|
|
334
334
|
data = JSON.parse(msg.content.toString());
|
|
335
335
|
if (!data) {
|
|
336
|
-
_context7.next =
|
|
336
|
+
_context7.next = 49;
|
|
337
337
|
break;
|
|
338
338
|
}
|
|
339
339
|
_context7.prev = 3;
|
|
340
340
|
if (!msg.fields.redelivered) {
|
|
341
|
-
_context7.next =
|
|
341
|
+
_context7.next = 20;
|
|
342
342
|
break;
|
|
343
343
|
}
|
|
344
344
|
data.retry -= 1;
|
|
@@ -367,64 +367,67 @@ var RabbitMQAsync = /*#__PURE__*/function () {
|
|
|
367
367
|
_context7.next = 16;
|
|
368
368
|
return channel.ack(msg);
|
|
369
369
|
case 16:
|
|
370
|
-
_context7.next =
|
|
371
|
-
|
|
370
|
+
_context7.next = 18;
|
|
371
|
+
return channel.ack(msg);
|
|
372
372
|
case 18:
|
|
373
|
-
_context7.
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
373
|
+
_context7.next = 42;
|
|
374
|
+
break;
|
|
375
|
+
case 20:
|
|
376
|
+
_context7.prev = 20;
|
|
377
377
|
_context7.next = 23;
|
|
378
|
-
return
|
|
378
|
+
return asyncFunction(data);
|
|
379
379
|
case 23:
|
|
380
|
-
_context7.next =
|
|
381
|
-
|
|
380
|
+
_context7.next = 25;
|
|
381
|
+
return channel.ack(msg);
|
|
382
382
|
case 25:
|
|
383
|
-
_context7.
|
|
384
|
-
|
|
383
|
+
_context7.next = 42;
|
|
384
|
+
break;
|
|
385
|
+
case 27:
|
|
386
|
+
_context7.prev = 27;
|
|
387
|
+
_context7.t0 = _context7["catch"](20);
|
|
385
388
|
errString = _context7.t0.toString();
|
|
386
389
|
if (!_lodash["default"].some(['Channel closed', 'Channel closing'], function (el) {
|
|
387
390
|
return _lodash["default"].includes(errString, el);
|
|
388
391
|
})) {
|
|
389
|
-
_context7.next =
|
|
392
|
+
_context7.next = 34;
|
|
390
393
|
break;
|
|
391
394
|
}
|
|
392
395
|
reject(_context7.t0);
|
|
393
|
-
_context7.next =
|
|
396
|
+
_context7.next = 42;
|
|
394
397
|
break;
|
|
395
|
-
case
|
|
398
|
+
case 34:
|
|
396
399
|
if (callbackError && data.retry === 1) {
|
|
397
400
|
callbackError(prefixQueueName, errString);
|
|
398
401
|
}
|
|
399
402
|
if (!(data.retry <= 0)) {
|
|
400
|
-
_context7.next =
|
|
403
|
+
_context7.next = 40;
|
|
401
404
|
break;
|
|
402
405
|
}
|
|
403
|
-
_context7.next =
|
|
406
|
+
_context7.next = 38;
|
|
404
407
|
return channel.ack(msg);
|
|
405
|
-
case 36:
|
|
406
|
-
_context7.next = 40;
|
|
407
|
-
break;
|
|
408
408
|
case 38:
|
|
409
|
-
_context7.next =
|
|
410
|
-
return channel.nack(msg);
|
|
411
|
-
case 40:
|
|
412
|
-
_context7.next = 45;
|
|
409
|
+
_context7.next = 42;
|
|
413
410
|
break;
|
|
411
|
+
case 40:
|
|
412
|
+
_context7.next = 42;
|
|
413
|
+
return channel.nack(msg);
|
|
414
414
|
case 42:
|
|
415
|
-
_context7.
|
|
415
|
+
_context7.next = 47;
|
|
416
|
+
break;
|
|
417
|
+
case 44:
|
|
418
|
+
_context7.prev = 44;
|
|
416
419
|
_context7.t1 = _context7["catch"](3);
|
|
417
420
|
reject(_context7.t1);
|
|
418
|
-
case 45:
|
|
419
|
-
_context7.next = 48;
|
|
420
|
-
break;
|
|
421
421
|
case 47:
|
|
422
|
+
_context7.next = 50;
|
|
423
|
+
break;
|
|
424
|
+
case 49:
|
|
422
425
|
channel.ack(msg);
|
|
423
|
-
case
|
|
426
|
+
case 50:
|
|
424
427
|
case "end":
|
|
425
428
|
return _context7.stop();
|
|
426
429
|
}
|
|
427
|
-
}, _callee7, null, [[3,
|
|
430
|
+
}, _callee7, null, [[3, 44], [20, 27]]);
|
|
428
431
|
}));
|
|
429
432
|
return function (_x5) {
|
|
430
433
|
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.
|
|
3
|
+
"version": "1.0.229",
|
|
4
4
|
"description": "N/A",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"toda",
|
|
@@ -19,6 +19,6 @@
|
|
|
19
19
|
"@azteam/util": "1.0.64",
|
|
20
20
|
"amqplib": "0.8.0",
|
|
21
21
|
"fs-extra": "10.1.0",
|
|
22
|
-
"lodash": "4.17.
|
|
22
|
+
"lodash": "4.17.23"
|
|
23
23
|
}
|
|
24
24
|
}
|
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}`, opt);
|
|
42
|
+
this.client = await amqp.connect(`amqp://${this.host}?heartbeat=180`, opt);
|
|
43
43
|
this.channel = await this.client.createChannel();
|
|
44
44
|
this.channel.prefetch(1);
|
|
45
45
|
this.connected = true;
|
|
@@ -148,6 +148,7 @@ class RabbitMQAsync {
|
|
|
148
148
|
});
|
|
149
149
|
}
|
|
150
150
|
await channel.ack(msg);
|
|
151
|
+
await channel.ack(msg);
|
|
151
152
|
} else {
|
|
152
153
|
try {
|
|
153
154
|
await asyncFunction(data);
|