@autofleet/rabbit 2.2.0-beta-1 → 2.2.1

package/dist/index.js

@@ -24,6 +24,7 @@ const logger_1 = __importDefault(require("./logger"));
 const rabbitError_1 = __importDefault(require("./rabbitError"));
 const redis_1 = __importDefault(require("./redis"));
 const DEFAULT_DEAD_TTL_TWO_DAYS = 60000 * 60 * 48;
+const DEFAULT_LOCK_TIMEOUT = 1000 * 5;
 const defaultOptions = {
     limit: 1,
     retries: 1,
@@ -31,7 +32,6 @@ const defaultOptions = {
 };
 const assertExchangeFanout = (c, exchangeName) => c.assertExchange(exchangeName, 'fanout');
 const connectionCreatedConst = 'connectionCreated';
-const DEFAULT_LOCK_TIMEOUT = 1000;
 class RabbitMq {
     constructor(options, redisConfig) {
         this.PUBLISH_TIMEOUT = Number(process.env.RABBITMQ_PUBLISH_TIMEOUT) || 60000;
@@ -218,7 +218,7 @@ class RabbitMq {
             if (!this.redisLock) {
                 throw new Error('Usage of consumeWithLock requires RedisInstance');
             }
-            const lockTimeout = options && options.lockTimeout ? options.lockTimeout : DEFAULT_LOCK_TIMEOUT;
+            const lockTimeout = (options === null || options === void 0 ? void 0 : options.lockTimeout) || DEFAULT_LOCK_TIMEOUT;
             logger_1.default.info(`Consuming with lock from queue ${queue} with lockTimeout: ${lockTimeout}ms`);
             return this.consumeFromRabbit(queue, (msg, ack, nack) => __awaiter(this, void 0, void 0, function* () {
                 if (!msg) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "2.2.0-beta-1",
+  "version": "2.2.1",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/index.ts

@@ -53,6 +53,7 @@ export interface AfRabbitOptions {
 }
 
 const DEFAULT_DEAD_TTL_TWO_DAYS = 60000 * 60 * 48;
+const DEFAULT_LOCK_TIMEOUT = 1000 * 5;
 
 const defaultOptions = {
   limit: 1,
@@ -64,8 +65,6 @@ const assertExchangeFanout = (c: any, exchangeName: string) => c.assertExchange(
 
 const connectionCreatedConst = 'connectionCreated';
 
-const DEFAULT_LOCK_TIMEOUT = 1000;
-
 class RabbitMq implements IAfRabbitMq {
   static parseMsg(msg: any) : any {
     let { content } = msg;
@@ -286,7 +285,7 @@ class RabbitMq implements IAfRabbitMq {
     if (!this.redisLock) {
       throw new Error('Usage of consumeWithLock requires RedisInstance');
     }
-    const lockTimeout = options && options.lockTimeout ? options.lockTimeout : DEFAULT_LOCK_TIMEOUT;
+    const lockTimeout = options?.lockTimeout || DEFAULT_LOCK_TIMEOUT;
     logger.info(`Consuming with lock from queue ${queue} with lockTimeout: ${lockTimeout}ms`);
     return this.consumeFromRabbit(queue, async (msg, ack, nack) => {
       if (!msg) {