@autofleet/rabbit 2.1.8-beta6 → 2.1.8

package/dist/index.d.ts

@@ -50,13 +50,13 @@ declare class RabbitMq implements IAfRabbitMq {
     getNewChannel(): Promise<ChannelWrapper>;
     assertChannel(): Promise<ChannelWrapper>;
     assertExchange(exchangeName: string, options?: any): Promise<any>;
-    getQueueLength(queue: string): Promise<import("amqplib").Replies.AssertQueue>;
-    bindQueue(queue: string, exchange: string): Promise<void>;
+    getQueueLength(queue: string): Promise<any>;
+    bindQueue(queue: string, exchange: string): Promise<any>;
     assertQueue(queue: string, options?: Options.AssertQueue): Promise<void>;
     consume(queue: string, callback: (msg: any, ack: Function, nack: Function) => any, options?: any): Promise<void>;
     consumeFromExchange(queue: string, exchange: string, callback: (msg: any, ack: Function, nack: Function) => any, options?: any): Promise<void>;
     publish(exchange: string, content: any, customHeaders?: any): Promise<unknown>;
-    sendToQueue(queue: string, content: any, options?: any, customHeaders?: any): Promise<boolean>;
+    sendToQueue(queue: string, content: any, options?: any, customHeaders?: any): Promise<void>;
     isConnected(): Promise<boolean>;
 }
 export default RabbitMq;

package/dist/index.js

@@ -37,7 +37,7 @@ const bluebird = __importStar(require("bluebird"));
 const moment_1 = __importDefault(require("moment"));
 const amqp_connection_manager_1 = require("amqp-connection-manager");
 const events_1 = require("events");
-// import { newTrace, traceTypes } from '@autofleet/outbreak';
+const outbreak_1 = require("@autofleet/outbreak");
 const logger_1 = __importDefault(require("./logger"));
 const rabbitError_1 = __importDefault(require("./rabbitError"));
 const redis_1 = __importDefault(require("./redis"));
@@ -123,7 +123,7 @@ class RabbitMq {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
                 if (this.creatingConnection) {
-                    this.em.once(connectionCreatedConst, resolve);
+                    this.em.on(connectionCreatedConst, resolve);
                     return;
                 }
                 if (this.connection !== null) {
@@ -163,8 +163,8 @@ class RabbitMq {
                 if (this.channel) {
                     return resolve(this.channel);
                 }
+                const connection = yield this.getConnection();
                 try {
-                    const connection = yield this.getConnection();
                     if (this.channel === null) {
                         this.channel = connection.createChannel({});
                     }
@@ -223,18 +223,13 @@ class RabbitMq {
                 return Promise.all([
                     c.consume(queue, (msg) => __awaiter(this, void 0, void 0, function* () {
                         const parsedMessage = RabbitMq.parseMsg(msg);
-                        // newTrace(traceTypes.RABBIT);
+                        outbreak_1.newTrace(outbreak_1.traceTypes.RABBIT);
                         const shouldConsume = yield this.shouldConsumeMessageByTimestamp(parsedMessage);
                         logger_1.default.info('rabbit: trying to consume', { queue, shouldConsume, msg });
                         if (!shouldConsume) {
                             return this.ack(channel)(msg);
                         }
-                        try {
-                            yield callback(parsedMessage, this.ack(channel, true), this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
-                        }
-                        catch (e) {
-                            yield this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl });
-                        }
+                        callback(parsedMessage, this.ack(channel, true), this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
                     })),
                 ]);
             }));
@@ -256,7 +251,7 @@ class RabbitMq {
                     c.bindQueue(queue, exchange, ''),
                     c.consume(queue, (msg) => __awaiter(this, void 0, void 0, function* () {
                         const parsedMessage = RabbitMq.parseMsg(msg);
-                        // newTrace(traceTypes.RABBIT);
+                        outbreak_1.newTrace(outbreak_1.traceTypes.RABBIT);
                         const shouldConsume = yield this.shouldConsumeMessageByTimestamp(parsedMessage);
                         logger_1.default.info('rabbit: trying to consume', { queue, shouldConsume, msg });
                         if (!shouldConsume) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "2.1.8-beta6",
+  "version": "2.1.8",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -19,7 +19,7 @@
     "@types/amqp-connection-manager": "^2.0.10",
     "@types/amqplib": "^0.5.16",
     "@types/uuid": "^8.3.3",
-    "amqp-connection-manager": "^3.7.0",
+    "amqp-connection-manager": "^3.2.1",
     "amqplib": "^0.6.0",
     "bluebird": "^3.7.2",
     "moment": "^2.29.1",

package/src/index.ts

@@ -5,7 +5,7 @@ import moment from 'moment';
 import { ConfirmChannel, Options } from 'amqplib';
 import { AmqpConnectionManager, ChannelWrapper, connect } from 'amqp-connection-manager';
 import { EventEmitter } from 'events';
-// import { newTrace, traceTypes } from '@autofleet/outbreak';
+import { newTrace, traceTypes } from '@autofleet/outbreak';
 import logger from './logger';
 import RabbitError from './rabbitError';
 import getRedisInstance, { RedisConfig } from './redis';
@@ -159,7 +159,7 @@ class RabbitMq implements IAfRabbitMq {
   async getConnection() {
     return new Promise<AmqpConnectionManager>(async (resolve) => {
       if (this.creatingConnection) {
-        this.em.once(connectionCreatedConst, resolve);
+        this.em.on(connectionCreatedConst, resolve);
         return;
       }
       if (this.connection !== null) {
@@ -197,8 +197,9 @@ class RabbitMq implements IAfRabbitMq {
         return resolve(this.channel);
       }
 
+      const connection: AmqpConnectionManager = await this.getConnection();
+
       try {
-        const connection: AmqpConnectionManager = await this.getConnection();
         if (this.channel === null) {
           this.channel = connection.createChannel({});
         }
@@ -253,21 +254,13 @@ class RabbitMq implements IAfRabbitMq {
           queue,
           async (msg: any) => {
             const parsedMessage = RabbitMq.parseMsg(msg);
-            // newTrace(traceTypes.RABBIT);
+            newTrace(traceTypes.RABBIT);
             const shouldConsume = await this.shouldConsumeMessageByTimestamp(parsedMessage);
             logger.info('rabbit: trying to consume', { queue, shouldConsume, msg });
             if (!shouldConsume) {
               return this.ack(channel)(msg);
             }
-            try {
-              await callback(
-                parsedMessage,
-                this.ack(channel, true),
-                this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }),
-              );
-            } catch (e) {
-              await this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl });
-            }
+            callback(parsedMessage, this.ack(channel, true), this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
           },
         ),
       ]);
@@ -292,7 +285,7 @@ class RabbitMq implements IAfRabbitMq {
           queue,
           async (msg: any) => {
             const parsedMessage = RabbitMq.parseMsg(msg);
-            // newTrace(traceTypes.RABBIT);
+            newTrace(traceTypes.RABBIT);
             const shouldConsume = await this.shouldConsumeMessageByTimestamp(parsedMessage);
             logger.info('rabbit: trying to consume', { queue, shouldConsume, msg });
             if (!shouldConsume) {