@autofleet/rabbit 2.1.16-beta → 2.1.16

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/dist/index.js +12 -14
  2. package/package.json +2 -2
  3. package/src/index.ts +15 -18
package/dist/index.js CHANGED
@@ -208,20 +208,18 @@ class RabbitMq {
208
208
  yield c.prefetch(limit, true);
209
209
  return Promise.all([
210
210
  c.consume(queue, (msg) => __awaiter(this, void 0, void 0, function* () {
211
- if (msg) {
212
- const parsedMessage = RabbitMq.parseMsg(msg);
213
- // newTrace(traceTypes.RABBIT);
214
- const shouldConsume = yield this.shouldConsumeMessageByTimestamp(parsedMessage);
215
- logger_1.default.info('rabbit: trying to consume', { queue, shouldConsume, msg });
216
- if (!shouldConsume) {
217
- return this.ack(channel)(msg);
218
- }
219
- try {
220
- yield callback(parsedMessage, this.ack(channel, true), this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
221
- }
222
- catch (e) {
223
- yield this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl })(msg);
224
- }
211
+ const parsedMessage = RabbitMq.parseMsg(msg);
212
+ // newTrace(traceTypes.RABBIT);
213
+ const shouldConsume = yield this.shouldConsumeMessageByTimestamp(parsedMessage);
214
+ logger_1.default.info('rabbit: trying to consume', { queue, shouldConsume, msg });
215
+ if (!shouldConsume) {
216
+ return this.ack(channel)(msg);
217
+ }
218
+ try {
219
+ yield callback(parsedMessage, this.ack(channel, true), this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
220
+ }
221
+ catch (e) {
222
+ yield this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl })(msg);
225
223
  }
226
224
  })),
227
225
  ]);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@autofleet/rabbit",
3
- "version": "2.1.16-beta",
3
+ "version": "2.1.16",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
@@ -16,7 +16,7 @@
16
16
  },
17
17
  "dependencies": {
18
18
  "@autofleet/logger": "^1.2.8",
19
- "@types/amqp-connection-manager": "^2.0.10",
19
+ "@types/amqp-connection-manager": "^2.0.12",
20
20
  "@types/amqplib": "^0.5.16",
21
21
  "@types/uuid": "^8.3.3",
22
22
  "amqp-connection-manager": "^3.7.0",
package/src/index.ts CHANGED
@@ -262,26 +262,23 @@ class RabbitMq implements IAfRabbitMq {
262
262
  c.consume(
263
263
  queue,
264
264
  async (msg: any) => {
265
- if (msg) {
266
- const parsedMessage = RabbitMq.parseMsg(msg);
267
- // newTrace(traceTypes.RABBIT);
268
- const shouldConsume = await this.shouldConsumeMessageByTimestamp(parsedMessage);
269
- logger.info('rabbit: trying to consume', { queue, shouldConsume, msg });
270
- if (!shouldConsume) {
271
- return this.ack(channel)(msg);
272
- }
273
- try {
274
- await callback(
275
- parsedMessage,
276
- this.ack(channel, true),
277
- this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }),
278
- );
279
- } catch (e) {
280
- await this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl })(msg);
281
- }
265
+ const parsedMessage = RabbitMq.parseMsg(msg);
266
+ // newTrace(traceTypes.RABBIT);
267
+ const shouldConsume = await this.shouldConsumeMessageByTimestamp(parsedMessage);
268
+ logger.info('rabbit: trying to consume', { queue, shouldConsume, msg });
269
+ if (!shouldConsume) {
270
+ return this.ack(channel)(msg);
271
+ }
272
+ try {
273
+ await callback(
274
+ parsedMessage,
275
+ this.ack(channel, true),
276
+ this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }),
277
+ );
278
+ } catch (e) {
279
+ await this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl })(msg);
282
280
  }
283
281
  },
284
-
285
282
  ),
286
283
  ]);
287
284
  });