@modernlock/common 1.0.63 → 1.0.64

package/build/events/base-consumer.d.ts

@@ -8,8 +8,11 @@ export declare abstract class Consumer {
     abstract exchangeType: ExchangeTypes;
     abstract routingKey: RoutingKeys;
     abstract queue: Queues;
-    abstract onMessage(msg: amqp.Message, data: any, channel: amqp.Channel): void;
+    abstract onMessage(msg: amqp.Message, data: any, channel?: amqp.Channel): Promise<void>;
     private channel;
+    private dlx;
+    private dlxType;
+    private dlRoutingKey;
     constructor(channel: amqp.Channel);
     listen(): Promise<void>;
     parseMessage(msg: amqp.Message): any;

package/build/events/base-consumer.js

@@ -12,21 +12,51 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Consumer = void 0;
 class Consumer {
     constructor(channel) {
+        // We define standard names for our Dead letter queu
+        this.dlx = 'dead_letter_exchange';
+        this.dlxType = 'direct';
+        this.dlRoutingKey = 'dead_letter';
         this.channel = channel;
     }
     ;
     listen() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
+                // Assert the Dead Letter Exchange
+                yield this.channel.assertExchange(this.dlx, this.dlxType);
+                // Assert the Dead Letter Queue
+                const dlQueueName = `${this.queue}.dlq`; // e.g., "update-calendar.dlq"
+                yield this.channel.assertQueue(dlQueueName, { durable: true });
+                // Bind them so failed messages go into the DLQ
+                yield this.channel.bindQueue(dlQueueName, this.dlx, this.dlRoutingKey);
                 yield this.channel.assertExchange(this.exchange, this.exchangeType);
-                const q = yield this.channel.assertQueue(this.queue, { durable: true });
+                // Assert the Main Queue with special arguments linking to DLQ
+                const q = yield this.channel.assertQueue(this.queue, {
+                    durable: true,
+                    arguments: {
+                        // If message is Nack'ed (rejected), send to this exchange:
+                        'x-dead-letter-exchange': this.dlx,
+                        // With this routing key:
+                        'x-dead-letter-routing-key': this.dlRoutingKey
+                        // Optional: Time to Live (TTL) before moving to DLQ
+                        // 'x-message-ttl': 60000 
+                    }
+                });
                 yield this.channel.bindQueue(q.queue, this.exchange, this.routingKey);
-                this.channel.consume(q.queue, (msg) => {
+                yield this.channel.prefetch(1);
+                this.channel.consume(q.queue, (msg) => __awaiter(this, void 0, void 0, function* () {
                     if (!msg)
-                        throw new Error('Message is required');
-                    const data = this.parseMessage(msg);
-                    this.onMessage(msg, data, this.channel);
-                });
+                        return;
+                    try {
+                        const data = this.parseMessage(msg);
+                        yield this.onMessage(data, msg);
+                        this.channel.ack(msg);
+                    }
+                    catch (error) {
+                        console.error(`Error processing message in ${this.queue}:`, error);
+                        this.channel.nack(msg, false, false);
+                    }
+                }));
             }
             catch (error) {
                 console.error('Failed to publish message:', error);

package/build/events/rabbitmq-wrapper.d.ts

@@ -10,5 +10,6 @@ export declare class RabbitmqWrapper {
     connect(url: string): Promise<void>;
     connectWithRetries(url: string): Promise<void>;
     private reconnect;
+    close(): Promise<void>;
 }
 export declare const rabbitmqWrapper: RabbitmqWrapper;

package/build/events/rabbitmq-wrapper.js

@@ -115,6 +115,19 @@ class RabbitmqWrapper {
             }
         });
     }
+    close() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.channel)
+                    yield this.channel.close();
+                if (this.connection)
+                    yield this.connection.close();
+            }
+            catch (err) {
+                console.error("Error closing RabbitMQ connection", err);
+            }
+        });
+    }
 }
 exports.RabbitmqWrapper = RabbitmqWrapper;
 ;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modernlock/common",
-  "version": "1.0.63",
+  "version": "1.0.64",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "files": [