@azteam/rabbitmq-async 1.0.168 → 1.0.169

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 +44 -54
  2. package/package.json +1 -1
  3. package/src/RabbitMQAsync.js +1 -5
package/lib/RabbitMQAsync.js CHANGED
@@ -362,114 +362,104 @@ var RabbitMQAsync = /*#__PURE__*/function () {
362
362
  switch (_context6.prev = _context6.next) {
363
363
  case 0:
364
364
  if (!msg) {
365
- _context6.next = 54;
365
+ _context6.next = 49;
366
366
  break;
367
367
  }
368
368
  data = JSON.parse(msg.content.toString());
369
369
  if (!data) {
370
- _context6.next = 51;
370
+ _context6.next = 46;
371
371
  break;
372
372
  }
373
373
  _context6.prev = 3;
374
374
  if (!msg.fields.redelivered) {
375
- _context6.next = 22;
375
+ _context6.next = 17;
376
376
  break;
377
377
  }
378
378
  data.retry -= 1;
379
379
  if (!(data.retry > 0)) {
380
- _context6.next = 16;
380
+ _context6.next = 11;
381
381
  break;
382
382
  }
383
- if (!(messageQueue.worker && !queueName.startsWith(messageQueue.serverIp))) {
384
- _context6.next = 12;
385
- break;
386
- }
387
- _context6.next = 10;
388
- return messageQueue.send("".concat(messageQueue.serverIp, "_").concat(queueName), data);
389
- case 10:
390
- _context6.next = 14;
391
- break;
392
- case 12:
393
- _context6.next = 14;
383
+ _context6.next = 9;
394
384
  return messageQueue.send(queueName, data);
395
- case 14:
396
- _context6.next = 18;
385
+ case 9:
386
+ _context6.next = 13;
397
387
  break;
398
- case 16:
399
- _context6.next = 18;
388
+ case 11:
389
+ _context6.next = 13;
400
390
  return messageQueue.send(messageQueue.parsePrefix('RETRY'), {
401
391
  queueName: queueName,
402
392
  data: data,
403
393
  retry_time: new Date()
404
394
  });
405
- case 18:
406
- _context6.next = 20;
395
+ case 13:
396
+ _context6.next = 15;
407
397
  return channel.ack(msg);
408
- case 20:
409
- _context6.next = 44;
398
+ case 15:
399
+ _context6.next = 39;
410
400
  break;
411
- case 22:
412
- _context6.prev = 22;
413
- _context6.next = 25;
401
+ case 17:
402
+ _context6.prev = 17;
403
+ _context6.next = 20;
414
404
  return cb(data);
415
- case 25:
416
- _context6.next = 27;
405
+ case 20:
406
+ _context6.next = 22;
417
407
  return channel.ack(msg);
418
- case 27:
419
- _context6.next = 44;
408
+ case 22:
409
+ _context6.next = 39;
420
410
  break;
421
- case 29:
422
- _context6.prev = 29;
423
- _context6.t0 = _context6["catch"](22);
411
+ case 24:
412
+ _context6.prev = 24;
413
+ _context6.t0 = _context6["catch"](17);
424
414
  errString = _context6.t0.toString();
425
415
  if (!_lodash["default"].some(['IllegalOperationError: Channel closed'], function (el) {
426
416
  return _lodash["default"].includes(errString, el);
427
417
  })) {
428
- _context6.next = 36;
418
+ _context6.next = 31;
429
419
  break;
430
420
  }
431
421
  reject(new Error(errString));
432
- _context6.next = 44;
422
+ _context6.next = 39;
433
423
  break;
434
- case 36:
424
+ case 31:
435
425
  if (callbackError) {
436
426
  callbackError(prefixQueueName, _context6.t0);
437
427
  }
438
428
  if (!(data.retry <= 0)) {
439
- _context6.next = 42;
429
+ _context6.next = 37;
440
430
  break;
441
431
  }
442
- _context6.next = 40;
432
+ _context6.next = 35;
443
433
  return channel.ack(msg);
444
- case 40:
445
- _context6.next = 44;
434
+ case 35:
435
+ _context6.next = 39;
446
436
  break;
447
- case 42:
448
- _context6.next = 44;
437
+ case 37:
438
+ _context6.next = 39;
449
439
  return channel.nack(msg);
450
- case 44:
451
- _context6.next = 49;
440
+ case 39:
441
+ _context6.next = 44;
452
442
  break;
453
- case 46:
454
- _context6.prev = 46;
443
+ case 41:
444
+ _context6.prev = 41;
455
445
  _context6.t1 = _context6["catch"](3);
456
446
  reject(_context6.t1);
457
- case 49:
458
- _context6.next = 52;
447
+ case 44:
448
+ _context6.next = 47;
459
449
  break;
460
- case 51:
450
+ case 46:
461
451
  channel.ack(msg);
462
- case 52:
463
- _context6.next = 55;
452
+ case 47:
453
+ _context6.next = 50;
464
454
  break;
465
- case 54:
455
+ case 49:
466
456
  reject(new Error('msg null'));
467
- case 55:
457
+ case 50:
468
458
  case "end":
469
459
  return _context6.stop();
470
460
  }
471
461
  }
472
- }, _callee6, null, [[3, 46], [22, 29]]);
462
+ }, _callee6, null, [[3, 41], [17, 24]]);
473
463
  }));
474
464
  return function (_x5) {
475
465
  return _ref.apply(this, arguments);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@azteam/rabbitmq-async",
3
- "version": "1.0.168",
3
+ "version": "1.0.169",
4
4
  "description": "",
5
5
  "keywords": [
6
6
  "toda",
package/src/RabbitMQAsync.js CHANGED
@@ -157,11 +157,7 @@ class RabbitMQAsync {
157
157
  if (msg.fields.redelivered) {
158
158
  data.retry -= 1;
159
159
  if (data.retry > 0) {
160
- if (messageQueue.worker && !queueName.startsWith(messageQueue.serverIp)) {
161
- await messageQueue.send(`${messageQueue.serverIp}_${queueName}`, data);
162
- } else {
163
- await messageQueue.send(queueName, data);
164
- }
160
+ await messageQueue.send(queueName, data);
165
161
  } else {
166
162
  await messageQueue.send(messageQueue.parsePrefix('RETRY'), {
167
163
  queueName,