@autofleet/rabbit 1.5.7-2 → 1.5.7-4

package/.idea/workspace.xml

@@ -204,7 +204,7 @@
       <workItem from="1609106672294" duration="594000" />
       <workItem from="1609146731453" duration="21000" />
       <workItem from="1609193609209" duration="1486000" />
-      <workItem from="1609629219943" duration="5228000" />
+      <workItem from="1609629219943" duration="7298000" />
     </task>
     <task id="LOCAL-00001" summary="validate name before usage">
       <created>1606375684964</created>

package/dist/index.d.ts

@@ -27,7 +27,7 @@ declare class RabbitMq {
     options: AfRabbitOptions | undefined;
     constructor(options?: AfRabbitOptions);
     ack: (msg: any) => Promise<void>;
-    nack: (queue: string, options?: Options.AssertQueue | undefined) => (msg: any, retries: number) => Promise<void>;
+    nack: (queue: string, deadQueueOptions?: Options.AssertQueue | undefined) => (msg: any, retries: number) => Promise<void>;
     getConnection(): Promise<AmqpConnectionManager>;
     assertChannel(): Promise<ChannelWrapper>;
     assertExchange(exchangeName: string, options?: any): Promise<any>;

package/dist/index.js

@@ -51,19 +51,19 @@ class RabbitMq {
                 yield this.channel.ack(msg);
             }
         });
-        this.nack = (queue, options) => (msg, retries) => __awaiter(this, void 0, void 0, function* () {
-            if (options === null || options === void 0 ? void 0 : options.messageTtl) {
-                msg.content['x-message-ttl'] = options.messageTtl;
-            }
+        this.nack = (queue, deadQueueOptions) => (msg, retries) => __awaiter(this, void 0, void 0, function* () {
+            // if (options?.messageTtl) {
+            //   msg.content['x-message-ttl'] = options.messageTtl;
+            // }
             if (this.channel) {
                 if (!msg.content['x-retry-count'] || msg.content['x-retry-count'] <= retries) {
                     msg.content['x-retry-count'] = msg.content['x-retry-count'] ? msg.content['x-retry-count'] + 1 : 1;
-                    yield this.sendToQueue(queue, msg.content, options);
+                    yield this.sendToQueue(queue, msg.content);
                 }
                 else {
                     const deadQueue = `${queue}-dead`;
-                    yield this.assertQueue(deadQueue, options);
-                    yield this.sendToQueue(deadQueue, msg.content, options);
+                    yield this.assertQueue(deadQueue, deadQueueOptions);
+                    yield this.sendToQueue(deadQueue, msg.content, deadQueueOptions);
                 }
                 yield this.channel.ack(msg);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "1.5.7-2",
+  "version": "1.5.7-4",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/index.ts

@@ -82,18 +82,18 @@ class RabbitMq {
     }
   }
 
-  public nack = (queue: string, options?: Options.AssertQueue) => async (msg: any, retries: number) => {
-    if (options?.messageTtl) {
-      msg.content['x-message-ttl'] = options.messageTtl;
-    }
+  public nack = (queue: string, deadQueueOptions?: Options.AssertQueue) => async (msg: any, retries: number) => {
+    // if (options?.messageTtl) {
+    //   msg.content['x-message-ttl'] = options.messageTtl;
+    // }
     if (this.channel) {
       if (!msg.content['x-retry-count'] || msg.content['x-retry-count'] <= retries) {
         msg.content['x-retry-count'] = msg.content['x-retry-count'] ? msg.content['x-retry-count'] + 1 : 1;
-        await this.sendToQueue(queue, msg.content, options);
+        await this.sendToQueue(queue, msg.content);
       } else {
         const deadQueue = `${queue}-dead`;
-        await this.assertQueue(deadQueue, options);
-        await this.sendToQueue(deadQueue, msg.content, options);
+        await this.assertQueue(deadQueue, deadQueueOptions);
+        await this.sendToQueue(deadQueue, msg.content, deadQueueOptions);
       }
       await this.channel.ack(msg);
     }