consumer-pgmq 2.0.1 → 3.0.0

package/README.md

@@ -40,7 +40,13 @@ yarn add consumer-pgmq
 - poolSize: The number of consumers. PS: this is the number of consumers that will be created to consume the messages and 
 if you use read consume type, the pool size is the number of messages will get at the same time.
 - timeMsWaitBeforeNextPolling: The time in milliseconds to wait before the next polling
-- enabledPolling: The enabled polling. PS: if true, the consumer will poll the message, if false, the consumer will consume the message one time and stop. PS: is required to the versions more than 1.0.5
+- enabledPolling: The enabled polling. PS: if true, the consumer will poll the message, if false, the consumer will consume the message one time and stop. PS: is required to the versions more than 1.0.5.
+- queueNameDlq: The name of the dead letter queue. PS: recommended to set the same name of the queue, but suffix with '_dlq'. For example: **messages_dlq**
+- totalRetriesBeforeSendToDlq: The total retries before send to dlq. For example: if you set totalRetriesBeforeSendToDlq equal 2, the message will be sent to dlq if the handler fails 2 times, so the third time the message will be sent to dlq and remove the main queue to avoid infinite retries.
+
+## Extra points to know when use the dlq feature
+- The dead letter queue no work If you setted the consumerType option with value 'pop', because the pop get the message and remove from queue at same time, so if failed when you are processing you lose the message.
+- Recommendation no set lower value to the option 'visibilityTime' if you are using the dead letter queue feature. For example: set visibilityTime value lower than 30 seconds, because if the message wasn't delete and the message be available again the consumer application can consume the message again.
 
 ## Events
 
@@ -89,11 +95,13 @@ async function start() {
     const consumer = new Consumer(
         {
             queueName: 'subscriptions',
-            visibilityTime: 15,
+            visibilityTime: 30,
             consumeType: "read",
-            poolSize: 4,
+            poolSize: 8,
             timeMsWaitBeforeNextPolling: 1000,
-            enabledPolling: false
+            enabledPolling: true,
+            queueNameDlq: "subscriptions_dlq",
+            totalRetriesBeforeSendToDlq: 2
         },
         async function (message: { [key: string]: any }, signal): Promise<void> {
             try {
@@ -143,33 +151,39 @@ start()
 import { config } from "dotenv"
 config()
 
-import { Consumer, PostgresQueueDriver } from "consumer-pgmq"
-import timersPromises from "node:timers/promises";
-import knex from 'knex'
+import Consumer from '../src/consumer';
+import PostgresQueueDriver from '../src/queueDriver/PostgresQueueDriver';
+
+import { Client } from 'pg'
 
 async function start() {
-    const connection = knex({
-        client: 'pg',
-        connection: {
-            host: process.env.POSTGRES_HOST,
-            database: process.env.POSTGRES_DATABASE,
-            password: process.env.POSTGRES_PASSWORD,
-            port: Number(process.env.POSTGRES_PORT),
-            user: process.env.POSTGRES_USER,
-            ssl: false
-        }
-    });
 
-    const postgresQueueDriver = new PostgresQueueDriver(connection, "schema_name_here")
+    const pgClient = new Client({
+        host: process.env.POSTGRES_HOST,
+        database: process.env.POSTGRES_DATABASE,
+        password: process.env.POSTGRES_PASSWORD,
+        port: Number(process.env.POSTGRES_PORT),
+        user: process.env.POSTGRES_USER,
+        ssl: false,
+    })
+
+    await pgClient.connect()
+
+
+    const postgresQueueDriver = new PostgresQueueDriver(
+        pgClient, "pgmq"
+    )
 
     const consumer = new Consumer(
         {
             queueName: 'subscriptions',
-            visibilityTime: 15,
+            visibilityTime: 30,
             consumeType: "read",
-            poolSize: 4,
+            poolSize: 8,
             timeMsWaitBeforeNextPolling: 1000,
-            enabledPolling: false
+            enabledPolling: true,
+            queueNameDlq: "subscriptions_dlq",
+            totalRetriesBeforeSendToDlq: 2
         },
         async function (message: { [key: string]: any }, signal): Promise<void> {
             try {

package/dist/consumer.js

@@ -8,9 +8,17 @@ const READ = "read";
 class Consumer extends events_1.EventEmitter {
     constructor(options, callback, client) {
         super();
+        this.setTimeoutId = null;
         this.options = options;
         this.callback = callback;
         this.client = client;
+        this.valideOptions();
+        this.setTimeoutId = null;
+    }
+    valideOptions() {
+        if (this.options.queueNameDlq && !this.options.totalRetriesBeforeSendToDlq) {
+            throw new Error("The option totalRetriesBeforeSendToDlq is required when queueNameDlq is set");
+        }
     }
     /**
      * Get the message
@@ -51,6 +59,9 @@ class Consumer extends events_1.EventEmitter {
      * @private
      */
     async pollMessage() {
+        if (this.setTimeoutId) {
+            clearTimeout(this.setTimeoutId);
+        }
         let promises = [];
         try {
             const { data, error } = await this.getMessage();
@@ -58,19 +69,35 @@ class Consumer extends events_1.EventEmitter {
                 throw error;
             }
             if (data.length === 0 && this.options.enabledPolling) {
-                setTimeout(() => this.pollMessage(), (this.options.timeMsWaitBeforeNextPolling || 1000) * 10);
+                this.setTimeoutId = setTimeout(() => this.pollMessage(), (this.options.timeMsWaitBeforeNextPolling || 1000) * 10);
                 return;
             }
             const controller = new AbortController();
             const signal = controller.signal;
-            for (let i = 0; i < (data.length || 1); i++) {
+            for (let i = 0; i < data.length; i++) {
+                const hasSendToDlq = data[i] &&
+                    this.options.queueNameDlq &&
+                    this.options.totalRetriesBeforeSendToDlq &&
+                    data[i].read_ct > this.options.totalRetriesBeforeSendToDlq;
+                if (hasSendToDlq) {
+                    promises.push(this.client.send(
+                    // @ts-ignore
+                    this.options.queueNameDlq, data[i].message, signal).then(async () => {
+                        await this.deleteMessage(data[i], signal);
+                        this.emit('send-to-dlq', data[i]);
+                    }));
+                    continue;
+                }
                 promises.push(this.callback(data[i].message, signal).then(async () => {
                     await this.deleteMessage(data[i], signal);
                     this.emit('finish', data[i]);
                 }));
             }
-            setTimeout(() => controller.abort(), (this.options.visibilityTime || 1) * 1000);
-            await Promise.allSettled(promises);
+            const timeoutId = setTimeout(() => controller.abort(), (this.options.visibilityTime || 1) * 1000);
+            if (promises.length > 0) {
+                await Promise.allSettled(promises);
+            }
+            clearTimeout(timeoutId);
             promises = [];
         }
         catch (err) {
@@ -85,7 +112,7 @@ class Consumer extends events_1.EventEmitter {
             if (!this.options.enabledPolling) {
                 return;
             }
-            setTimeout(() => this.pollMessage(), this.options.timeMsWaitBeforeNextPolling || 1000);
+            this.setTimeoutId = setTimeout(() => this.pollMessage(), this.options.timeMsWaitBeforeNextPolling || 1000);
         }
     }
     /**

package/dist/queueDriver/PostgresQueueDriver.js

@@ -5,6 +5,27 @@ class PostgresQueueDriver {
         this.connection = connection;
         this.schema = schema;
     }
+    /**
+     * Send the message
+     * @param queueName The name of the queue
+     * @param message The message
+     * @returns Promise<{ error: any }>
+     */
+    async send(queueName, message) {
+        try {
+            await this.connection.query(`
+            SELECT * FROM ${this.schema}.send(
+                queue_name => $1,
+                msg        => $2,
+                delay      => $3
+            );
+            `, [queueName, message, 1]);
+            return { error: null };
+        }
+        catch (error) {
+            return { error };
+        }
+    }
     /**
      * Get the message
      * @param queueName The name of the queue
@@ -14,11 +35,11 @@ class PostgresQueueDriver {
      */
     async get(queueName, visibilityTime, totalMessages) {
         try {
-            const register = await this.connection.raw(`
+            const register = await this.connection.query(`
                 SELECT * FROM ${this.schema}.read(
-                    queue_name => ?,
-                    vt         => ?,
-                    qty        => ?
+                    queue_name => $1,
+                    vt         => $2,
+                    qty        => $3
                 );
                 `, [queueName, visibilityTime, totalMessages]);
             if (!register.rows) {
@@ -37,10 +58,10 @@ class PostgresQueueDriver {
      */
     async pop(queueName) {
         try {
-            const register = await this.connection.raw(`
+            const register = await this.connection.query(`
                 SELECT * FROM ${this.schema}.pop(
-                    queue_name => ?
-                );
+                    queue_name => $1
+                )
                 `, [queueName]);
             if (!register.rows) {
                 return { data: [], error: null };
@@ -59,10 +80,10 @@ class PostgresQueueDriver {
      */
     async delete(queueName, messageID) {
         try {
-            await this.connection.raw(`
+            await this.connection.query(`
             SELECT * FROM ${this.schema}.delete(
-                queue_name => ?,
-                msg_id     => ?
+                queue_name => $1,
+                msg_id     => $2
             );
             `, [queueName, messageID]);
             return { error: null };

package/dist/queueDriver/SupabaseQueueDriver.js

@@ -4,6 +4,19 @@ class SupabaseQueueDriver {
     constructor(supabase) {
         this.supabase = supabase;
     }
+    /**
+     * Send the message
+     * @param queueName The name of the queue
+     * @param message The message
+     * @returns Promise<{ error: any }>
+     */
+    async send(queueName, message) {
+        const { error } = await this.supabase.rpc("send", {
+            queue_name: queueName,
+            message: message
+        });
+        return { error };
+    }
     /**
      * Get the message
      * @param queueName The name of the queue

package/examples/consumerPostgresDriver.ts

@@ -3,70 +3,66 @@ config()
 
 import Consumer from '../src/consumer';
 import PostgresQueueDriver from '../src/queueDriver/PostgresQueueDriver';
-import timersPromises from "node:timers/promises";
-import knex from 'knex'
+
+import { Client } from 'pg'
 
 async function start() {
-    const connection = knex({
-        client: 'pg',
-        connection: {
-            host: process.env.POSTGRES_HOST,
-            database: process.env.POSTGRES_DATABASE,
-            password: process.env.POSTGRES_PASSWORD,
-            port: Number(process.env.POSTGRES_PORT),
-            user: process.env.POSTGRES_USER,
-            ssl: false,
-        }
-    });
 
-    const postgresQueueDriver = new PostgresQueueDriver(connection, "pgmq")
+    const pgClient = new Client({
+        host: process.env.POSTGRES_HOST,
+        database: process.env.POSTGRES_DATABASE,
+        password: process.env.POSTGRES_PASSWORD,
+        port: Number(process.env.POSTGRES_PORT),
+        user: process.env.POSTGRES_USER,
+        ssl: false,
+    })
+
+    await pgClient.connect()
+
+
+    const postgresQueueDriver = new PostgresQueueDriver(
+        pgClient, "pgmq"
+    )
+
 
     const consumer = new Consumer(
         {
             queueName: 'subscriptions',
-            visibilityTime: 15,
+            visibilityTime: 30,
             consumeType: "read",
-            poolSize: 4,
+            poolSize: 8,
             timeMsWaitBeforeNextPolling: 1000,
-            enabledPolling: true
+            enabledPolling: true,
+            queueNameDlq: "subscriptions_dlq",
+            totalRetriesBeforeSendToDlq: 2
         },
         async function (message: { [key: string]: any }, signal): Promise<void> {
-            try {
-                console.log(message)
-                // const url = "https://jsonplaceholder.typicode.com/todos/1";
-                // await timersPromises.setTimeout(100, null, { signal });
-                // console.log("Fetching data...");
-                // const response = await fetch(url, { signal });
-                // const todo = await response.json();
-                // console.log("Todo:", todo);
-            } catch (error: any) {
-                if (error.name === "AbortError") {
-                    console.log("Operation aborted");
-                } else {
-                    console.error("Error:", error);
-                }
-            }
+            console.log(message)
+            throw new Error("Error in message")
+            // const url = "https://jsonplaceholder.typicode.com/todos/1";
+            // await timersPromises.setTimeout(100, null, { signal });
+            // console.log("Fetching data...");
+            // const response = await fetch(url, { signal });
+            // const todo = await response.json();
+            // console.log("Todo:", todo);
         },
         postgresQueueDriver
     );
 
-    // consumer.on('finish', (message: { [key: string]: any }) => {
-    //     console.log('Consumed message =>', message);
-    // });
-
-    consumer.on("abort-error", (err) => {
-        console.log("Abort error =>", err)
+    consumer.on("send-to-dlq", (message: { [key: string]: any }) => {
+        console.log("Send to DLQ =>", message)
     })
 
     consumer.on('error', (err: Error) => {
-        if (err.message.includes("TypeError: fetch failed")) {
-            console.log(err)
-            process.exit(1);
-        }
         console.error('Error consuming message:', err.message);
     });
 
-    consumer.start();
+    await consumer.start();
+
+    process.on("SIGINT", async () => {
+        await pgClient.end()
+        process.exit(0)
+    })
 
 }
 

package/examples/consumerSupabaseDriver.ts

@@ -21,33 +21,30 @@ const supabaseQueueDriver = new SupabaseQueueDriver(
     supabase as unknown as SupabaseClient
 )
 
-
-import timersPromises from "node:timers/promises";
-
 async function start() {
-    // for (let i = 0; i < 200; i++) {
-    //     await supabase.rpc("send", {
-    //         queue_name: "subscriptions",
-    //         message: { "message": `Message triggered at ${Date.now()}` }
-    //     });
-    // }
-    // console.log("Total messages sent: ", 200)
+    for (let i = 0; i < 50; i++) {
+        await supabase.rpc("send", {
+            queue_name: "subscriptions",
+            message: { "message": `Message triggered at ${Date.now()}` }
+        });
+    }
+    console.log("Total messages sent: ", 50)
 
     const consumer = new Consumer(
         {
             queueName: 'subscriptions',
-            visibilityTime: 15,
+            visibilityTime: 30,
             consumeType: "read",
             poolSize: 8,
             timeMsWaitBeforeNextPolling: 1000,
-            enabledPolling: false
+            enabledPolling: true,
+            queueNameDlq: "subscriptions_dlq",
+            totalRetriesBeforeSendToDlq: 2
         },
         async function (message: { [key: string]: any }, signal): Promise<void> {
             try {
-                if (message.error) {
-                    throw new Error("Error in message")
-                }
                 console.log(message)
+                throw new Error("Error in message")
             } catch (error: any) {
                 throw error
             }
@@ -59,6 +56,9 @@ async function start() {
     //     console.log('Consumed message =>', message);
     // });
 
+    consumer.on("send-to-dlq", (message: { [key: string]: any }) => {
+        console.log("Send to DLQ =>", message)
+    })
     consumer.on("abort-error", (err) => {
         console.log("Abort error =>", err)
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "consumer-pgmq",
-  "version": "2.0.1",
+  "version": "3.0.0",
   "description": "The consumer of Supabase pgmq",
   "main": "dist/index.js",
   "type": "commonjs",
@@ -22,6 +22,7 @@
   "packageManager": "pnpm@10.7.1",
   "devDependencies": {
     "@types/jest": "^30.0.0",
+    "@types/pg": "^8.15.5",
     "ts-jest": "^29.4.1",
     "ts-node-dev": "^2.0.0",
     "typescript": "^5.9.2"
@@ -30,7 +31,6 @@
     "@supabase/supabase-js": "^2.56.0",
     "dotenv": "^17.2.1",
     "jest": "^30.1.1",
-    "knex": "^3.1.0",
     "pg": "^8.16.3"
   },
   "engines": {

package/src/consumer.ts

@@ -22,6 +22,8 @@ class Consumer extends EventEmitter {
      */
     private client: QueueDriver
 
+    private setTimeoutId: NodeJS.Timeout | null = null;
+
     constructor(
         options: Options,
         callback: HandlerCallback,
@@ -31,6 +33,14 @@ class Consumer extends EventEmitter {
         this.options = options;
         this.callback = callback;
         this.client = client;
+        this.valideOptions();
+        this.setTimeoutId = null;
+    }
+
+    private valideOptions() {
+        if (this.options.queueNameDlq && !this.options.totalRetriesBeforeSendToDlq) {
+            throw new Error("The option totalRetriesBeforeSendToDlq is required when queueNameDlq is set");
+        }
     }
 
     /**
@@ -84,6 +94,9 @@ class Consumer extends EventEmitter {
      * @private
      */
     private async pollMessage() {
+        if (this.setTimeoutId) {
+            clearTimeout(this.setTimeoutId);
+        }
         let promises: Promise<any>[] = [];
 
         try {
@@ -93,18 +106,39 @@ class Consumer extends EventEmitter {
             }
 
             if (data.length === 0 && this.options.enabledPolling) {
-                setTimeout(
+                this.setTimeoutId = setTimeout(
                     () => this.pollMessage(),
                     (this.options.timeMsWaitBeforeNextPolling || 1000) * 10
                 );
                 return;
             }
 
-
             const controller = new AbortController();
             const signal = controller.signal;
 
-            for (let i = 0; i < (data.length || 1); i++) {
+            for (let i = 0; i < data.length; i++) {
+                const hasSendToDlq = data[i] &&
+                    this.options.queueNameDlq &&
+                    this.options.totalRetriesBeforeSendToDlq &&
+                    data[i].read_ct > this.options.totalRetriesBeforeSendToDlq
+                if (
+                    hasSendToDlq
+                ) {
+                    promises.push(
+                        this.client.send(
+                            // @ts-ignore
+                            this.options.queueNameDlq,
+                            data[i].message,
+                            signal
+                        ).then(async () => {
+                            await this.deleteMessage(data[i], signal);
+                            this.emit('send-to-dlq', data[i]);
+                        })
+                    )
+                    continue;
+                }
+
+
                 promises.push(
                     this.callback(data[i].message, signal).then(async () => {
                         await this.deleteMessage(data[i], signal);
@@ -113,8 +147,12 @@ class Consumer extends EventEmitter {
                 );
             }
 
-            setTimeout(() => controller.abort(), (this.options.visibilityTime || 1) * 1000);
-            await Promise.allSettled(promises);
+            const timeoutId = setTimeout(() => controller.abort(), (this.options.visibilityTime || 1) * 1000);
+            if (promises.length > 0) {
+                await Promise.allSettled(promises);
+            }
+
+            clearTimeout(timeoutId);
             promises = [];
         } catch (err: any) {
             if (err.name === "AbortError") {
@@ -126,7 +164,7 @@ class Consumer extends EventEmitter {
             if (!this.options.enabledPolling) {
                 return;
             }
-            setTimeout(() => this.pollMessage(), this.options.timeMsWaitBeforeNextPolling || 1000);
+            this.setTimeoutId = setTimeout(() => this.pollMessage(), this.options.timeMsWaitBeforeNextPolling || 1000);
         }
     }
 

package/src/queueDriver/PostgresQueueDriver.ts

@@ -1,14 +1,40 @@
-import { Knex } from "knex";
 import { Message, QueueDriver } from "../type";
+import { Client } from "pg";
 
 class PostgresQueueDriver implements QueueDriver {
 
 
     constructor(
-        private connection: Knex,
-        private schema: string = "public"
+        private connection: Client,
+        private schema: string = "public",
     ) { }
 
+    /**
+     * Send the message
+     * @param queueName The name of the queue
+     * @param message The message
+     * @returns Promise<{ error: any }>
+     */
+    async send(
+        queueName: string,
+        message: { [key: string]: any; },
+    ): Promise<{ error: any; }> {
+        try {
+            await this.connection.query(`
+            SELECT * FROM ${this.schema}.send(
+                queue_name => $1,
+                msg        => $2,
+                delay      => $3
+            );
+            `, [queueName, message, 1]
+            )
+
+            return { error: null };
+        } catch (error) {
+            return { error };
+        }
+    }
+
     /**
      * Get the message
      * @param queueName The name of the queue
@@ -18,11 +44,11 @@ class PostgresQueueDriver implements QueueDriver {
      */
     async get(queueName: string, visibilityTime: number, totalMessages: number): Promise<{ data: Message[]; error: any; }> {
         try {
-            const register = await this.connection.raw(`
+            const register = await this.connection.query(`
                 SELECT * FROM ${this.schema}.read(
-                    queue_name => ?,
-                    vt         => ?,
-                    qty        => ?
+                    queue_name => $1,
+                    vt         => $2,
+                    qty        => $3
                 );
                 `, [queueName, visibilityTime, totalMessages]
             )
@@ -45,10 +71,10 @@ class PostgresQueueDriver implements QueueDriver {
      */
     async pop(queueName: string): Promise<{ data: Message[]; error: any; }> {
         try {
-            const register = await this.connection.raw(`
+            const register = await this.connection.query(`
                 SELECT * FROM ${this.schema}.pop(
-                    queue_name => ?
-                );
+                    queue_name => $1
+                )
                 `, [queueName]
             )
 
@@ -71,12 +97,13 @@ class PostgresQueueDriver implements QueueDriver {
      */
     async delete(queueName: string, messageID: number): Promise<{ error: any; }> {
         try {
-            await this.connection.raw(`
+            await this.connection.query(`
             SELECT * FROM ${this.schema}.delete(
-                queue_name => ?,
-                msg_id     => ?
+                queue_name => $1,
+                msg_id     => $2
             );
-            `, [queueName, messageID]
+            `, [queueName, messageID],
+
             )
 
             return { error: null };

package/src/queueDriver/SupabaseQueueDriver.ts

@@ -7,6 +7,21 @@ class SupabaseQueueDriver implements QueueDriver {
         private supabase: SupabaseClient
     ) { }
 
+    /**
+     * Send the message
+     * @param queueName The name of the queue
+     * @param message The message
+     * @returns Promise<{ error: any }>
+     */
+    async send(queueName: string, message: { [key: string]: any; }): Promise<{ error: any; }> {
+        const { error } = await this.supabase.rpc("send", {
+            queue_name: queueName,
+            message: message
+        });
+
+        return { error };
+    }
+
     /**
      * Get the message
      * @param queueName The name of the queue

package/src/type.ts

@@ -30,6 +30,16 @@ interface Options {
      * The enabled polling. PS: if true, the consumer will poll the message
      */
     enabledPolling: boolean;
+
+    /**
+     * The name of the queue DLQ
+     */
+    queueNameDlq?: string;
+
+    /**
+     * The total retries before send the message to DLQ. PS: if set queueNameDlq, this option is required
+     */
+    totalRetriesBeforeSendToDlq?: number;
 }
 
 /**
@@ -65,6 +75,18 @@ interface Message {
 
 interface QueueDriver {
 
+    /**
+     * Send the message
+     * @param queueName The name of the queue
+     * @param message The message
+     * @returns Promise<{ error: any }>
+     */
+    send(
+        queueName: string,
+        message: { [key: string]: any },
+        signal: AbortSignal
+    ): Promise<{ error: any }>;
+
     /**
      * Get the message
      * @param queueName The name of the queue

package/tests/consumer.spec.ts

@@ -1,6 +1,5 @@
 import Consumer from '../src/consumer'
 import { Message, QueueDriver, Options } from '../src/type'
-import timersPromises from 'node:timers/promises'
 
 describe('Consumer', () => {
     let queueDriver: jest.Mocked<QueueDriver>
@@ -18,6 +17,7 @@ describe('Consumer', () => {
             get: jest.fn(),
             pop: jest.fn(),
             delete: jest.fn(),
+            send: jest.fn(),
         }
         jest.useFakeTimers();
     })
@@ -28,6 +28,167 @@ describe('Consumer', () => {
     })
 
 
+    it('Should throw error if set dead letter queue and no set total retries before send to dlq', async () => {
+        try {
+            queueDriver.get.mockResolvedValueOnce({ data: [message], error: null })
+            queueDriver.delete.mockResolvedValueOnce({ error: null })
+            queueDriver.get.mockResolvedValueOnce({ data: [], error: null })
+
+            const handler = jest.fn(async () => { })
+            const consumer = new Consumer(
+                {
+                    queueName: 'q',
+                    consumeType: 'read',
+                    visibilityTime: 1,
+                    poolSize: 1,
+                    timeMsWaitBeforeNextPolling: 1,
+                    enabledPolling: true,
+                    queueNameDlq: 'q_dlq',
+                },
+                handler,
+                queueDriver
+            )
+
+            const onFinish = jest.fn()
+            consumer.on('finish', onFinish)
+            await consumer.start()
+        } catch (error: any) {
+            expect(error).toBeInstanceOf(Error)
+            expect(error.message).toBe('The option totalRetriesBeforeSendToDlq is required when queueNameDlq is set')
+        }
+    })
+
+
+    it('Should send message to dlq if read count is greater than total retries before send to dlq', async () => {
+        const messageToSendDlq = { ...message }
+        messageToSendDlq.read_ct = 3
+        messageToSendDlq.msg_id = 2
+        queueDriver.get.mockResolvedValueOnce({ data: [messageToSendDlq], error: null })
+        queueDriver.delete.mockResolvedValueOnce({ error: null })
+        queueDriver.get.mockResolvedValueOnce({ data: [], error: null })
+        queueDriver.send.mockResolvedValueOnce({ error: null })
+
+        const handler = jest.fn(async () => { })
+        const consumer = new Consumer(
+            {
+                queueName: 'q',
+                consumeType: 'read',
+                visibilityTime: 1,
+                poolSize: 1,
+                timeMsWaitBeforeNextPolling: 1,
+                enabledPolling: true,
+                queueNameDlq: 'q_dlq',
+                totalRetriesBeforeSendToDlq: 2
+            },
+            handler,
+            queueDriver
+        )
+
+        const onFinish = jest.fn()
+        consumer.on('finish', onFinish)
+        await consumer.start()
+
+        expect(handler).toHaveBeenCalledTimes(0)
+        expect(onFinish).toHaveBeenCalledTimes(0)
+        expect(queueDriver.delete).toHaveBeenCalledTimes(1)
+        expect(queueDriver.send).toHaveBeenCalledTimes(1)
+        expect(queueDriver.send).toHaveBeenCalledWith(
+            'q_dlq', messageToSendDlq.message, expect.any(AbortSignal)
+        )
+    })
+
+    it('Should send 2 messages to dlq if read count is greater than total retries before send to dlq', async () => {
+        const messageToSendDlq = { ...message }
+        messageToSendDlq.read_ct = 3
+        messageToSendDlq.msg_id = 2
+        queueDriver.get.mockResolvedValueOnce({
+            data: [
+                messageToSendDlq, messageToSendDlq
+            ], error: null
+        })
+        queueDriver.delete.mockResolvedValueOnce({ error: null })
+        queueDriver.get.mockResolvedValueOnce({ data: [], error: null })
+        queueDriver.send.mockResolvedValue({ error: null })
+
+        const handler = jest.fn(async () => { })
+        const consumer = new Consumer(
+            {
+                queueName: 'q',
+                consumeType: 'read',
+                visibilityTime: 1,
+                poolSize: 2,
+                timeMsWaitBeforeNextPolling: 1,
+                enabledPolling: true,
+                queueNameDlq: 'q_dlq',
+                totalRetriesBeforeSendToDlq: 2
+            },
+            handler,
+            queueDriver
+        )
+
+        const onFinish = jest.fn()
+        consumer.on('finish', onFinish)
+        await consumer.start()
+
+        expect(handler).toHaveBeenCalledTimes(0)
+        expect(onFinish).toHaveBeenCalledTimes(0)
+        expect(queueDriver.delete).toHaveBeenCalledTimes(2)
+        expect(queueDriver.send).toHaveBeenCalledTimes(2)
+        expect(queueDriver.send).toHaveBeenCalledWith(
+            'q_dlq', messageToSendDlq.message, expect.any(AbortSignal)
+        )
+    })
+
+
+    it('Should send only 1 message to dlq if read count is greater than total retries before send to dlq', async () => {
+        const messageToSendDlq = { ...message }
+        messageToSendDlq.read_ct = 3
+        messageToSendDlq.msg_id = 2
+
+        const messageToSendDlq2 = { ...message }
+        messageToSendDlq2.read_ct = 1
+        messageToSendDlq2.msg_id = 3
+        queueDriver.get.mockResolvedValueOnce({
+            data: [
+                messageToSendDlq, messageToSendDlq2
+            ], error: null
+        })
+        queueDriver.delete.mockResolvedValue({ error: null })
+        queueDriver.get.mockResolvedValueOnce({ data: [], error: null })
+        queueDriver.send.mockResolvedValue({ error: null })
+
+        const handler = jest.fn(async () => {
+            return Promise.resolve()
+        })
+        const consumer = new Consumer(
+            {
+                queueName: 'q',
+                consumeType: 'read',
+                visibilityTime: 1,
+                poolSize: 2,
+                timeMsWaitBeforeNextPolling: 1,
+                enabledPolling: true,
+                queueNameDlq: 'q_dlq',
+                totalRetriesBeforeSendToDlq: 2
+            },
+            handler,
+            queueDriver
+        )
+
+        const onFinish = jest.fn()
+        consumer.on('finish', onFinish)
+        await consumer.start()
+
+        expect(handler).toHaveBeenCalledTimes(1)
+        expect(onFinish).toHaveBeenCalledTimes(1)
+        expect(queueDriver.delete).toHaveBeenCalledTimes(2)
+        expect(queueDriver.send).toHaveBeenCalledTimes(1)
+        expect(queueDriver.send).toHaveBeenCalledWith(
+            'q_dlq', messageToSendDlq.message, expect.any(AbortSignal)
+        )
+    })
+
+
 
     it('Should not process message if read method does not return any message second polling', async () => {
         queueDriver.get.mockResolvedValueOnce({ data: [message], error: null })
@@ -41,7 +202,8 @@ describe('Consumer', () => {
                 consumeType: 'read',
                 visibilityTime: 1,
                 poolSize: 1,
-                timeMsWaitBeforeNextPolling: 1
+                timeMsWaitBeforeNextPolling: 1,
+                enabledPolling: true
             },
             handler,
             queueDriver
@@ -69,7 +231,8 @@ describe('Consumer', () => {
                 consumeType: 'pop',
                 visibilityTime: 1,
                 poolSize: 1,
-                timeMsWaitBeforeNextPolling: 1
+                timeMsWaitBeforeNextPolling: 1,
+                enabledPolling: true
             },
             handler,
             queueDriver
@@ -95,7 +258,8 @@ describe('Consumer', () => {
                 consumeType: 'pop',
                 visibilityTime: 1,
                 poolSize: 1,
-                timeMsWaitBeforeNextPolling: 1
+                timeMsWaitBeforeNextPolling: 1,
+                enabledPolling: true
             },
             handler,
             queueDriver
@@ -121,7 +285,8 @@ describe('Consumer', () => {
                 consumeType: 'read',
                 visibilityTime: 1,
                 poolSize: 1,
-                timeMsWaitBeforeNextPolling: 1
+                timeMsWaitBeforeNextPolling: 1,
+                enabledPolling: true
             },
             handler,
             queueDriver
@@ -150,7 +315,8 @@ describe('Consumer', () => {
                 consumeType: 'read',
                 visibilityTime: 1,
                 poolSize: 1,
-                timeMsWaitBeforeNextPolling: 1
+                timeMsWaitBeforeNextPolling: 1,
+                enabledPolling: true
             },
             handler,
             queueDriver
@@ -179,7 +345,8 @@ describe('Consumer', () => {
                 consumeType: 'read',
                 visibilityTime: 1,
                 poolSize: 4,
-                timeMsWaitBeforeNextPolling: 1
+                timeMsWaitBeforeNextPolling: 1,
+                enabledPolling: true
             },
             handler,
             queueDriver