@autofleet/rabbit 2.1.8-beta4 → 2.1.8-beta6

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<any>;
-    bindQueue(queue: string, exchange: string): Promise<any>;
+    getQueueLength(queue: string): Promise<import("amqplib").Replies.AssertQueue>;
+    bindQueue(queue: string, exchange: string): Promise<void>;
     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<void>;
+    sendToQueue(queue: string, content: any, options?: any, customHeaders?: any): Promise<boolean>;
     isConnected(): Promise<boolean>;
 }
 export default RabbitMq;

package/dist/index.js

@@ -229,7 +229,12 @@ class RabbitMq {
                         if (!shouldConsume) {
                             return this.ack(channel)(msg);
                         }
-                        callback(parsedMessage, this.ack(channel, true), this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
+                        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 });
+                        }
                     })),
                 ]);
             }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "2.1.8-beta4",
+  "version": "2.1.8-beta6",
   "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.2.1",
+    "amqp-connection-manager": "^3.7.0",
     "amqplib": "^0.6.0",
     "bluebird": "^3.7.2",
     "moment": "^2.29.1",

package/src/index.ts

@@ -259,7 +259,15 @@ class RabbitMq implements IAfRabbitMq {
             if (!shouldConsume) {
               return this.ack(channel)(msg);
             }
-            callback(parsedMessage, this.ack(channel, true), this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }));
+            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 });
+            }
           },
         ),
       ]);