@autofleet/rabbit 3.2.19-beta.10 → 3.2.19-beta.11

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/dist/index.d.ts CHANGED
@@ -86,7 +86,7 @@ declare class RabbitMq implements IAfRabbitMq {
86
86
  setupQueue(queueName: string, options?: Options.AssertQueue): Promise<Replies.AssertQueue>;
87
87
  assertQueue(queueName: string, options?: Options.AssertQueue): Promise<any>;
88
88
  private saveConsumer;
89
- consume(queue: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any>;
89
+ consume(queue: string, callback: CallbackFunction, options?: ConsumeOptions, consumeChannelOptions?: Options.Consume): Promise<any>;
90
90
  private lockRedisIfNeeded;
91
91
  private unlockRedisIfNeeded;
92
92
  private consumeFromRabbit;
package/dist/index.js CHANGED
@@ -217,7 +217,7 @@ class RabbitMq {
217
217
  });
218
218
  });
219
219
  }
220
- async getNewChannel({ name = (0, utils_1.rand)().toString(), onClose = null, options = { confirm: false } } = {}) {
220
+ async getNewChannel({ name = (0, utils_1.rand)().toString(), onClose = null, options = {} } = {}) {
221
221
  let connection;
222
222
  try {
223
223
  connection = await this.getConnection();
@@ -343,8 +343,8 @@ class RabbitMq {
343
343
  });
344
344
  }
345
345
  }
346
- async consume(queue, callback, options) {
347
- await this.consumeFromRabbit(queue, callback, options);
346
+ async consume(queue, callback, options, consumeChannelOptions) {
347
+ await this.consumeFromRabbit(queue, callback, options, consumeChannelOptions);
348
348
  }
349
349
  async lockRedisIfNeeded(msg, options) {
350
350
  const { properties: { headers } } = msg;
@@ -360,7 +360,7 @@ class RabbitMq {
360
360
  await releaseLock();
361
361
  }
362
362
  }
363
- async consumeFromRabbit(queue, callback, options) {
363
+ async consumeFromRabbit(queue, callback, options, consumeChannelOptions) {
364
364
  const optionsWithDefaults = { ...consts_1.DEFAULT_OPTIONS, ...options };
365
365
  RabbitMq.validateName('queue', queue);
366
366
  this.saveConsumer(queue, callback, options);
@@ -436,7 +436,7 @@ class RabbitMq {
436
436
  catch (e) {
437
437
  await localNack(msg);
438
438
  }
439
- }, types_1.CONSUMER_DEFAULT_OPTIONS);
439
+ }, consumeChannelOptions || types_1.CONSUMER_DEFAULT_OPTIONS);
440
440
  if (!consumerTag) {
441
441
  logger_1.default.error(`rabbit: failed to consume from queue ${queue}`);
442
442
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@autofleet/rabbit",
3
- "version": "3.2.19-beta.10",
3
+ "version": "3.2.19-beta.11",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
package/src/index.ts CHANGED
@@ -354,7 +354,7 @@ class RabbitMq implements IAfRabbitMq {
354
354
  });
355
355
  }
356
356
 
357
- async getNewChannel({ name = rand().toString(), onClose = null, options = { confirm: false } }: newChannelOpts = {}) {
357
+ async getNewChannel({ name = rand().toString(), onClose = null, options = {} }: newChannelOpts = {}) {
358
358
  let connection!: AmqpConnectionManager;
359
359
  try {
360
360
  connection = await this.getConnection();
@@ -489,8 +489,8 @@ class RabbitMq implements IAfRabbitMq {
489
489
  }
490
490
  }
491
491
 
492
- async consume(queue: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any> {
493
- await this.consumeFromRabbit(queue, callback, options);
492
+ async consume(queue: string, callback: CallbackFunction, options?: ConsumeOptions, consumeChannelOptions?: Options.Consume): Promise<any> {
493
+ await this.consumeFromRabbit(queue, callback, options, consumeChannelOptions);
494
494
  }
495
495
 
496
496
  private async lockRedisIfNeeded(msg: any, options: any) {
@@ -513,7 +513,7 @@ class RabbitMq implements IAfRabbitMq {
513
513
  }
514
514
  }
515
515
 
516
- private async consumeFromRabbit(queue: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any> {
516
+ private async consumeFromRabbit(queue: string, callback: CallbackFunction, options?: ConsumeOptions, consumeChannelOptions?: Options.Consume): Promise<any> {
517
517
  const optionsWithDefaults = { ...DEFAULT_OPTIONS, ...options };
518
518
  RabbitMq.validateName('queue', queue);
519
519
  this.saveConsumer(queue, callback, options);
@@ -602,7 +602,7 @@ class RabbitMq implements IAfRabbitMq {
602
602
  } catch (e) {
603
603
  await localNack(msg);
604
604
  }
605
- }, CONSUMER_DEFAULT_OPTIONS,
605
+ }, consumeChannelOptions || CONSUMER_DEFAULT_OPTIONS,
606
606
  );
607
607
  if (!consumerTag) {
608
608
  logger.error(`rabbit: failed to consume from queue ${queue}`);