redis-smq 8.1.0 → 8.2.1

package/dist/esm/src/lib/queue-messages/queue-messages-storage/queue-messages-storage-set.js

@@ -1,55 +1,135 @@
 import { CallbackEmptyReplyError } from 'redis-smq-common';
-import { redisKeys } from '../../../common/redis-keys/redis-keys.js';
 import { QueueMessagesStorage } from './queue-messages-storage.js';
 export class QueueMessagesStorageSet extends QueueMessagesStorage {
-    count(queue, redisKey, cb) {
-        const keys = redisKeys.getQueueKeys(queue.queueParams, queue.groupId);
+    constructor(redisClient) {
+        super(redisClient);
+        this.logger.debug(`${this.constructor.name} initialized`);
+    }
+    count(redisKey, cb) {
+        this.logger.debug(`Counting items in ${redisKey}`);
         this.redisClient.getSetInstance((err, client) => {
-            if (err)
-                cb(err);
-            else if (!client)
-                cb(new CallbackEmptyReplyError());
-            else {
-                client.scard(keys[redisKey], (err, reply) => {
-                    if (err)
-                        cb(err);
-                    else if (!reply)
-                        cb(new CallbackEmptyReplyError());
-                    else
-                        cb(null, reply);
-                });
+            if (err) {
+                this.logger.error(`Redis client error: ${err.message}`);
+                return cb(err);
             }
+            else if (!client) {
+                this.logger.error('Redis client is null');
+                return cb(new CallbackEmptyReplyError());
+            }
+            this.logger.debug(`Executing SCARD on ${redisKey}`);
+            client.scard(redisKey, (err, reply) => {
+                if (err) {
+                    this.logger.error(`SCARD failed for ${redisKey}: ${err.message}`);
+                    return cb(err);
+                }
+                this.logger.debug(`${redisKey} contains ${reply} items`);
+                cb(null, reply);
+            });
         });
     }
-    fetchItems(queue, redisKey, offset, limit, cb) {
-        const keys = redisKeys.getQueueKeys(queue.queueParams, queue.groupId);
+    fetchItems(redisKey, pageParams, cb) {
+        const { page, pageSize } = pageParams;
+        this.logger.debug(`Fetching items from ${redisKey} (page ${page}, size ${pageSize})`);
         this.redisClient.getSetInstance((err, client) => {
-            if (err)
-                cb(err);
-            else if (!client)
-                cb(new CallbackEmptyReplyError());
-            else {
-                client.sscan(keys[redisKey], offset.toString(), { COUNT: limit }, (err, reply) => {
-                    if (err)
-                        cb(err);
-                    else if (!reply)
-                        cb(new CallbackEmptyReplyError());
-                    else
-                        cb(null, reply ? reply.items : []);
-                });
+            if (err) {
+                this.logger.error(`Redis client error: ${err.message}`);
+                return cb(err);
             }
+            if (!client) {
+                this.logger.error('Redis client is null');
+                return cb(new CallbackEmptyReplyError());
+            }
+            const scanToPage = (cursor, currentPage, cb) => {
+                this.logger.debug(`SSCAN ${redisKey} with cursor ${cursor}, targeting page ${page}, currently at ${currentPage}`);
+                client.sscan(redisKey, cursor, { COUNT: pageSize }, (err, reply) => {
+                    if (err) {
+                        this.logger.error(`SSCAN failed: ${err.message}`);
+                        return cb(err);
+                    }
+                    if (!reply) {
+                        this.logger.error('SSCAN returned empty reply');
+                        return cb(new CallbackEmptyReplyError());
+                    }
+                    if (currentPage == page) {
+                        this.logger.debug(`Reached target page ${page}, items: ${reply.items.length}`);
+                        return cb(null, reply);
+                    }
+                    if (reply.cursor === '0') {
+                        this.logger.debug(`End of set reached at page ${currentPage}, target was ${page}`);
+                        return cb(null, { cursor, items: [] });
+                    }
+                    this.logger.debug(`Moving to next page, cursor: ${reply.cursor}`);
+                    currentPage = currentPage + 1;
+                    scanToPage(reply.cursor, currentPage, cb);
+                });
+            };
+            scanToPage('0', 1, (err, reply) => {
+                if (err) {
+                    this.logger.error(`Error fetching items from ${redisKey}: ${err.message}`);
+                    return cb(err);
+                }
+                const { items = [] } = reply ?? {};
+                const itemCount = items.length;
+                if (itemCount === 0) {
+                    this.logger.debug(`No items found in ${redisKey} for page ${page}`);
+                }
+                else {
+                    this.logger.debug(`Retrieved ${itemCount} items from ${redisKey}`);
+                }
+                cb(null, items);
+            });
         });
     }
-    fetchAllItems(queue, redisKey, cb) {
+    fetchAllItems(redisKey, cb) {
+        this.logger.debug(`Fetching all items from ${redisKey}`);
         this.redisClient.getSetInstance((err, client) => {
-            if (err)
-                cb(err);
-            else if (!client)
-                cb(new CallbackEmptyReplyError());
-            else {
-                const keys = redisKeys.getQueueKeys(queue.queueParams, queue.groupId);
-                client.sscanAll(keys[redisKey], { COUNT: 100 }, cb);
+            if (err) {
+                this.logger.error(`Redis client error: ${err.message}`);
+                return cb(err);
             }
+            if (!client) {
+                this.logger.error('Redis client is null');
+                return cb(new CallbackEmptyReplyError());
+            }
+            const items = new Set();
+            let scanCount = 0;
+            const fullScan = (cursor, cb) => {
+                scanCount++;
+                this.logger.debug(`SSCAN ${redisKey} iteration ${scanCount}, cursor: ${cursor}`);
+                client.sscan(redisKey, cursor, {}, (err, reply) => {
+                    if (err) {
+                        this.logger.error(`SSCAN failed: ${err.message}`);
+                        return cb(err);
+                    }
+                    if (!reply) {
+                        this.logger.error('SSCAN returned empty reply');
+                        return cb(new CallbackEmptyReplyError());
+                    }
+                    const newItems = reply.items.length;
+                    this.logger.debug(`Adding ${newItems} items from scan iteration ${scanCount}`);
+                    reply.items.forEach((i) => items.add(i));
+                    if (reply.cursor === '0') {
+                        this.logger.debug(`Scan complete after ${scanCount} iterations`);
+                        return cb();
+                    }
+                    fullScan(reply.cursor, cb);
+                });
+            };
+            this.logger.debug(`Starting SSCAN with initial cursor=0`);
+            fullScan('0', (err) => {
+                if (err) {
+                    this.logger.error(`Error fetching all items from ${redisKey}: ${err.message}`);
+                    return cb(err);
+                }
+                const itemCount = items.size;
+                if (itemCount === 0) {
+                    this.logger.debug(`${redisKey} is empty`);
+                }
+                else {
+                    this.logger.debug(`Retrieved ${itemCount} total items from ${redisKey}`);
+                }
+                cb(null, [...items.values()]);
+            });
         });
     }
 }

package/dist/esm/src/lib/queue-messages/queue-messages-storage/queue-messages-storage-set.js.map

@@ -1 +1 @@
-{"version":3,"file":"queue-messages-storage-set.js","sourceRoot":"","sources":["../../../../../../src/lib/queue-messages/queue-messages-storage/queue-messages-storage-set.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,uBAAuB,EAAa,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AAErE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAOnE,MAAM,OAAO,uBAAwB,SAAQ,oBAAoB;IAQ/D,KAAK,CACH,KAAyB,EACzB,QAAyD,EACzD,EAAqB;QAErB,MAAM,IAAI,GAAG,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QACtE,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;YAC9C,IAAI,GAAG;gBAAE,EAAE,CAAC,GAAG,CAAC,CAAC;iBACZ,IAAI,CAAC,MAAM;gBAAE,EAAE,CAAC,IAAI,uBAAuB,EAAE,CAAC,CAAC;iBAC/C,CAAC;gBACJ,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;oBAC1C,IAAI,GAAG;wBAAE,EAAE,CAAC,GAAG,CAAC,CAAC;yBACZ,IAAI,CAAC,KAAK;wBAAE,EAAE,CAAC,IAAI,uBAAuB,EAAE,CAAC,CAAC;;wBAC9C,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACvB,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAaD,UAAU,CACR,KAAyB,EACzB,QAAyD,EACzD,MAAc,EACd,KAAa,EACb,EAAuB;QAEvB,MAAM,IAAI,GAAG,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QACtE,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;YAC9C,IAAI,GAAG;gBAAE,EAAE,CAAC,GAAG,CAAC,CAAC;iBACZ,IAAI,CAAC,MAAM;gBAAE,EAAE,CAAC,IAAI,uBAAuB,EAAE,CAAC,CAAC;iBAC/C,CAAC;gBACJ,MAAM,CAAC,KAAK,CACV,IAAI,CAAC,QAAQ,CAAC,EACd,MAAM,CAAC,QAAQ,EAAE,EACjB,EAAE,KAAK,EAAE,KAAK,EAAE,EAChB,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;oBACb,IAAI,GAAG;wBAAE,EAAE,CAAC,GAAG,CAAC,CAAC;yBACZ,IAAI,CAAC,KAAK;wBAAE,EAAE,CAAC,IAAI,uBAAuB,EAAE,CAAC,CAAC;;wBAC9C,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC1C,CAAC,CACF,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IASD,aAAa,CACX,KAAyB,EACzB,QAAyD,EACzD,EAAuB;QAEvB,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;YAC9C,IAAI,GAAG;gBAAE,EAAE,CAAC,GAAG,CAAC,CAAC;iBACZ,IAAI,CAAC,MAAM;gBAAE,EAAE,CAAC,IAAI,uBAAuB,EAAE,CAAC,CAAC;iBAC/C,CAAC;gBACJ,MAAM,IAAI,GAAG,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;gBACtE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;YACtD,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"queue-messages-storage-set.js","sourceRoot":"","sources":["../../../../../../src/lib/queue-messages/queue-messages-storage/queue-messages-storage-set.ts"],"names":[],"mappings":"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"}

package/dist/esm/src/lib/queue-messages/queue-messages-storage/queue-messages-storage-sorted-set.d.ts

@@ -1,10 +1,15 @@
 import { ICallback } from 'redis-smq-common';
-import { redisKeys } from '../../../common/redis-keys/redis-keys.js';
-import { IQueueParsedParams } from '../../queue/index.js';
 import { QueueMessagesStorage } from './queue-messages-storage.js';
+import { RedisClient } from '../../../common/redis-client/redis-client.js';
 export declare class QueueMessagesStorageSortedSet extends QueueMessagesStorage {
-    count(queue: IQueueParsedParams, redisKey: keyof ReturnType<typeof redisKeys.getQueueKeys>, cb: ICallback<number>): void;
-    fetchItems(queue: IQueueParsedParams, redisKey: keyof ReturnType<typeof redisKeys.getQueueKeys>, offset: number, limit: number, cb: ICallback<string[]>): void;
-    fetchAllItems(queue: IQueueParsedParams, redisKey: keyof ReturnType<typeof redisKeys.getQueueKeys>, cb: ICallback<string[]>): void;
+    constructor(redisClient: RedisClient);
+    count(redisKey: string, cb: ICallback<number>): void;
+    fetchItems(redisKey: string, pageParams: {
+        page?: number;
+        pageSize?: number;
+        offsetStart: number;
+        offsetEnd: number;
+    }, cb: ICallback<string[]>): void;
+    fetchAllItems(redisKey: string, cb: ICallback<string[]>): void;
 }
 //# sourceMappingURL=queue-messages-storage-sorted-set.d.ts.map

package/dist/esm/src/lib/queue-messages/queue-messages-storage/queue-messages-storage-sorted-set.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queue-messages-storage-sorted-set.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/queue-messages/queue-messages-storage/queue-messages-storage-sorted-set.ts"],"names":[],"mappings":"AASA,OAAO,EAA2B,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAOnE,qBAAa,6BAA8B,SAAQ,oBAAoB;IAQrE,KAAK,CACH,KAAK,EAAE,kBAAkB,EACzB,QAAQ,EAAE,MAAM,UAAU,CAAC,OAAO,SAAS,CAAC,YAAY,CAAC,EACzD,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,GACpB,IAAI;IAoBP,UAAU,CACR,KAAK,EAAE,kBAAkB,EACzB,QAAQ,EAAE,MAAM,UAAU,CAAC,OAAO,SAAS,CAAC,YAAY,CAAC,EACzD,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,GACtB,IAAI;IA0BP,aAAa,CACX,KAAK,EAAE,kBAAkB,EACzB,QAAQ,EAAE,MAAM,UAAU,CAAC,OAAO,SAAS,CAAC,YAAY,CAAC,EACzD,EAAE,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,GACtB,IAAI;CA2CR"}
+{"version":3,"file":"queue-messages-storage-sorted-set.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/queue-messages/queue-messages-storage/queue-messages-storage-sorted-set.ts"],"names":[],"mappings":"AASA,OAAO,EAA2B,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,8CAA8C,CAAC;AAM3E,qBAAa,6BAA8B,SAAQ,oBAAoB;gBACzD,WAAW,EAAE,WAAW;IAepC,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG,IAAI;IA0CpD,UAAU,CACR,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE;QACV,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;KACnB,EACD,EAAE,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,GACtB,IAAI;IAsDP,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI;CAyE/D"}

package/dist/esm/src/lib/queue-messages/queue-messages-storage/queue-messages-storage-sorted-set.js

@@ -1,66 +1,103 @@
 import { CallbackEmptyReplyError } from 'redis-smq-common';
-import { redisKeys } from '../../../common/redis-keys/redis-keys.js';
 import { QueueMessagesStorage } from './queue-messages-storage.js';
 export class QueueMessagesStorageSortedSet extends QueueMessagesStorage {
-    count(queue, redisKey, cb) {
+    constructor(redisClient) {
+        super(redisClient);
+        this.logger.debug(`${this.constructor.name} initialized`);
+    }
+    count(redisKey, cb) {
+        this.logger.debug(`Counting items in ${redisKey}`);
         this.redisClient.getSetInstance((err, client) => {
-            if (err)
-                cb(err);
-            else if (!client)
-                cb(new CallbackEmptyReplyError());
-            else {
-                const keys = redisKeys.getQueueKeys(queue.queueParams, queue.groupId);
-                client.zcard(keys[redisKey], cb);
+            if (err) {
+                this.logger.error(`Redis client error: ${err.message}`);
+                return cb(err);
+            }
+            if (!client) {
+                this.logger.error('Redis client is null');
+                return cb(new CallbackEmptyReplyError());
             }
+            this.logger.debug(`Executing ZCARD on ${redisKey}`);
+            client.zcard(redisKey, (err, count) => {
+                if (err) {
+                    this.logger.error(`ZCARD failed for ${redisKey}: ${err.message}`);
+                    cb(err);
+                }
+                else {
+                    this.logger.debug(`${redisKey} contains ${count} items`);
+                    cb(null, count);
+                }
+            });
         });
     }
-    fetchItems(queue, redisKey, offset, limit, cb) {
+    fetchItems(redisKey, pageParams, cb) {
+        const { offsetStart, offsetEnd } = pageParams;
+        this.logger.debug(`Fetching items from ${redisKey} range [${offsetStart}:${offsetEnd}]`);
         this.redisClient.getSetInstance((err, client) => {
-            if (err)
-                cb(err);
-            else if (!client)
-                cb(new CallbackEmptyReplyError());
-            else {
-                const keys = redisKeys.getQueueKeys(queue.queueParams, queue.groupId);
-                client.zrange(keys[redisKey], offset, offset + limit - 1, (err, items) => {
-                    if (err)
-                        cb(err);
-                    else
-                        cb(null, items || []);
-                });
+            if (err) {
+                this.logger.error(`Redis client error: ${err.message}`);
+                return cb(err);
             }
+            if (!client) {
+                this.logger.error('Redis client is null');
+                return cb(new CallbackEmptyReplyError());
+            }
+            this.logger.debug(`Executing ZRANGE on ${redisKey} from ${offsetStart} to ${offsetEnd}`);
+            client.zrange(redisKey, offsetStart, offsetEnd, (err, items) => {
+                if (err) {
+                    this.logger.error(`ZRANGE failed for ${redisKey}: ${err.message}`);
+                    cb(err);
+                }
+                else {
+                    const itemCount = items ? items.length : 0;
+                    if (itemCount === 0) {
+                        this.logger.debug(`No items found in ${redisKey} range [${offsetStart}:${offsetEnd}]`);
+                    }
+                    else {
+                        this.logger.debug(`Retrieved ${itemCount} items from ${redisKey}`);
+                    }
+                    cb(null, items || []);
+                }
+            });
         });
     }
-    fetchAllItems(queue, redisKey, cb) {
+    fetchAllItems(redisKey, cb) {
+        this.logger.debug(`Fetching all items from ${redisKey} using ZSCAN`);
         this.redisClient.getSetInstance((err, client) => {
-            if (err)
-                cb(err);
-            else if (!client)
-                cb(new CallbackEmptyReplyError());
-            else {
-                const keys = redisKeys.getQueueKeys(queue.queueParams, queue.groupId);
-                const allItems = [];
-                const scanRecursive = (cursor) => {
-                    client.zscan(keys[redisKey], cursor, { COUNT: 100 }, (err, result) => {
-                        if (err) {
-                            cb(err);
-                            return;
-                        }
-                        if (!result) {
-                            cb(null, allItems);
-                            return;
-                        }
-                        allItems.push(...result.items);
-                        if (result.cursor === '0') {
-                            cb(null, allItems);
-                        }
-                        else {
-                            setImmediate(() => scanRecursive(result.cursor));
-                        }
-                    });
-                };
-                scanRecursive('0');
+            if (err) {
+                this.logger.error(`Redis client error: ${err.message}`);
+                return cb(err);
+            }
+            if (!client) {
+                this.logger.error('Redis client is null');
+                return cb(new CallbackEmptyReplyError());
             }
+            const allItems = [];
+            let scanCount = 0;
+            const scanRecursive = (cursor) => {
+                scanCount++;
+                this.logger.debug(`ZSCAN iteration ${scanCount} on ${redisKey}, cursor: ${cursor}`);
+                client.zscan(redisKey, cursor, { COUNT: 100 }, (err, result) => {
+                    if (err) {
+                        this.logger.error(`ZSCAN failed: ${err.message}`);
+                        return cb(err);
+                    }
+                    if (!result) {
+                        this.logger.error('ZSCAN returned empty result object');
+                        return cb(new CallbackEmptyReplyError());
+                    }
+                    const batchSize = result.items.length;
+                    allItems.push(...result.items);
+                    this.logger.debug(`ZSCAN batch #${scanCount} retrieved ${batchSize} items, total collected: ${allItems.length}`);
+                    if (result.cursor === '0') {
+                        this.logger.debug(`ZSCAN complete, collected ${allItems.length} items in ${scanCount} iterations`);
+                        return cb(null, allItems);
+                    }
+                    this.logger.debug(`ZSCAN continuing with cursor=${result.cursor}`);
+                    setImmediate(() => scanRecursive(result.cursor));
+                });
+            };
+            this.logger.debug(`Starting ZSCAN with initial cursor=0`);
+            scanRecursive('0');
         });
     }
 }

package/dist/esm/src/lib/queue-messages/queue-messages-storage/queue-messages-storage-sorted-set.js.map

@@ -1 +1 @@
-{"version":3,"file":"queue-messages-storage-sorted-set.js","sourceRoot":"","sources":["../../../../../../src/lib/queue-messages/queue-messages-storage/queue-messages-storage-sorted-set.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"queue-messages-storage-sorted-set.js","sourceRoot":"","sources":["../../../../../../src/lib/queue-messages/queue-messages-storage/queue-messages-storage-sorted-set.ts"],"names":[],"mappings":"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"}

package/dist/esm/src/lib/queue-messages/queue-messages-storage/queue-messages-storage.d.ts

@@ -1,12 +1,16 @@
-import { ICallback } from 'redis-smq-common';
+import { ICallback, ILogger } from 'redis-smq-common';
 import { RedisClient } from '../../../common/redis-client/redis-client.js';
-import { redisKeys } from '../../../common/redis-keys/redis-keys.js';
-import { IQueueParsedParams } from '../../queue/index.js';
 export declare abstract class QueueMessagesStorage {
     protected redisClient: RedisClient;
-    constructor(redisClient: RedisClient);
-    abstract count(queue: IQueueParsedParams, redisKey: keyof ReturnType<typeof redisKeys.getQueueKeys>, cb: ICallback<number>): void;
-    abstract fetchItems(queue: IQueueParsedParams, redisKey: keyof ReturnType<typeof redisKeys.getQueueKeys>, offset: number, limit: number, cb: ICallback<string[]>): void;
-    abstract fetchAllItems(queue: IQueueParsedParams, redisKey: keyof ReturnType<typeof redisKeys.getQueueKeys>, cb: ICallback<string[]>): void;
+    protected logger: ILogger;
+    protected constructor(redisClient: RedisClient);
+    abstract count(redisKey: string, cb: ICallback<number>): void;
+    abstract fetchItems(redisKey: string, pageParams: {
+        page: number;
+        pageSize: number;
+        offsetStart: number;
+        offsetEnd: number;
+    }, cb: ICallback<string[]>): void;
+    abstract fetchAllItems(redisKey: string, cb: ICallback<string[]>): void;
 }
 //# sourceMappingURL=queue-messages-storage.d.ts.map

package/dist/esm/src/lib/queue-messages/queue-messages-storage/queue-messages-storage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queue-messages-storage.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/queue-messages/queue-messages-storage/queue-messages-storage.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,8CAA8C,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAM1D,8BAAsB,oBAAoB;IACxC,SAAS,CAAC,WAAW,cAAC;gBAKV,WAAW,EAAE,WAAW;IAWpC,QAAQ,CAAC,KAAK,CACZ,KAAK,EAAE,kBAAkB,EACzB,QAAQ,EAAE,MAAM,UAAU,CAAC,OAAO,SAAS,CAAC,YAAY,CAAC,EACzD,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,GACpB,IAAI;IAWP,QAAQ,CAAC,UAAU,CACjB,KAAK,EAAE,kBAAkB,EACzB,QAAQ,EAAE,MAAM,UAAU,CAAC,OAAO,SAAS,CAAC,YAAY,CAAC,EACzD,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,GACtB,IAAI;IASP,QAAQ,CAAC,aAAa,CACpB,KAAK,EAAE,kBAAkB,EACzB,QAAQ,EAAE,MAAM,UAAU,CAAC,OAAO,SAAS,CAAC,YAAY,CAAC,EACzD,EAAE,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,GACtB,IAAI;CACR"}
+{"version":3,"file":"queue-messages-storage.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/queue-messages/queue-messages-storage/queue-messages-storage.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAU,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,8CAA8C,CAAC;AAO3E,8BAAsB,oBAAoB;IACxC,SAAS,CAAC,WAAW,cAAC;IACtB,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAK1B,SAAS,aAAa,WAAW,EAAE,WAAW;IAc9C,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG,IAAI;IAS7D,QAAQ,CAAC,UAAU,CACjB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE;QACV,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;KACnB,EACD,EAAE,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,GACtB,IAAI;IAQP,QAAQ,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI;CACxE"}

package/dist/esm/src/lib/queue-messages/queue-messages-storage/queue-messages-storage.js

@@ -1,7 +1,11 @@
+import { logger } from 'redis-smq-common';
+import { Configuration } from '../../../config/index.js';
 export class QueueMessagesStorage {
     redisClient;
+    logger;
     constructor(redisClient) {
         this.redisClient = redisClient;
+        this.logger = logger.getLogger(Configuration.getSetConfig().logger, this.constructor.name.toLowerCase());
     }
 }
 //# sourceMappingURL=queue-messages-storage.js.map

package/dist/esm/src/lib/queue-messages/queue-messages-storage/queue-messages-storage.js.map

@@ -1 +1 @@
-{"version":3,"file":"queue-messages-storage.js","sourceRoot":"","sources":["../../../../../../src/lib/queue-messages/queue-messages-storage/queue-messages-storage.ts"],"names":[],"mappings":"AAkBA,MAAM,OAAgB,oBAAoB;IAC9B,WAAW,CAAC;IAKtB,YAAY,WAAwB;QAClC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;CA4CF"}
+{"version":3,"file":"queue-messages-storage.js","sourceRoot":"","sources":["../../../../../../src/lib/queue-messages/queue-messages-storage/queue-messages-storage.ts"],"names":[],"mappings":"AASA,OAAO,EAAsB,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE9D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMzD,MAAM,OAAgB,oBAAoB;IAC9B,WAAW,CAAC;IACZ,MAAM,CAAU;IAK1B,YAAsB,WAAwB;QAC5C,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAC5B,aAAa,CAAC,YAAY,EAAE,CAAC,MAAM,EACnC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,CACpC,CAAC;IACJ,CAAC;CAmCF"}

package/dist/esm/src/lib/queue-messages/types/index.d.ts

@@ -21,6 +21,7 @@ export interface IQueueMessagesPage<T> {
     items: T[];
 }
 export type IQueueMessagesPageParams = {
+    pageSize: number;
     currentPage: number;
     offsetStart: number;
     offsetEnd: number;

package/dist/esm/src/lib/queue-messages/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/queue-messages/types/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE1E,MAAM,WAAW,oBAAoB;IACnC,aAAa,CAAC,KAAK,EAAE,oBAAoB,EAAE,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACxE,WAAW,CACT,KAAK,EAAE,oBAAoB,EAC3B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,SAAS,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,CAAC,GACtD,IAAI,CAAC;IACR,KAAK,CAAC,KAAK,EAAE,oBAAoB,EAAE,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CAC/D;AAED,MAAM,WAAW,gCAAgC;IAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,mBAAmB;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,GAAG,gCAAgC,CAAC;IACnD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB,CAAC,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,CAAC,EAAE,CAAC;CACZ;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,MAAM,GAAG,YAAY,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,KAAK,EAAE,MAAM,GAAG,YAAY,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/queue-messages/types/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE1E,MAAM,WAAW,oBAAoB;IACnC,aAAa,CAAC,KAAK,EAAE,oBAAoB,EAAE,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACxE,WAAW,CACT,KAAK,EAAE,oBAAoB,EAC3B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,SAAS,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,CAAC,GACtD,IAAI,CAAC;IACR,KAAK,CAAC,KAAK,EAAE,oBAAoB,EAAE,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CAC/D;AAED,MAAM,WAAW,gCAAgC;IAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,mBAAmB;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,GAAG,gCAAgC,CAAC;IACnD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB,CAAC,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,CAAC,EAAE,CAAC;CACZ;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,MAAM,GAAG,YAAY,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,KAAK,EAAE,MAAM,GAAG,YAAY,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC,CAAC"}

package/dist/esm/src/lib/queue-rate-limit/queue-rate-limit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queue-rate-limit.d.ts","sourceRoot":"","sources":["../../../../../src/lib/queue-rate-limit/queue-rate-limit.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,SAAS,EAEV,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AAKxE,OAAO,EAEL,YAAY,EACZ,eAAe,EACf,KAAK,EACN,MAAM,mBAAmB,CAAC;AAe3B,qBAAa,cAAc;IACzB,SAAS,CAAC,WAAW,cAAC;IACtB,SAAS,CAAC,MAAM,qCAAC;IACjB,SAAS,CAAC,KAAK,QAAC;;IAkBhB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY,EAAE,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI;IA+B9D,GAAG,CACD,KAAK,EAAE,MAAM,GAAG,YAAY,EAC5B,SAAS,EAAE,eAAe,EAC1B,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,GAClB,IAAI;IA8CP,WAAW,CACT,KAAK,EAAE,MAAM,GAAG,YAAY,EAC5B,SAAS,EAAE,eAAe,EAC1B,EAAE,EAAE,SAAS,CAAC,OAAO,CAAC,GACrB,IAAI;IAoBP,GAAG,CACD,KAAK,EAAE,MAAM,GAAG,YAAY,EAC5B,EAAE,EAAE,SAAS,CAAC,eAAe,GAAG,IAAI,CAAC,GACpC,IAAI;IAmCP,QAAQ,OAAQ,SAAS,CAAC,IAAI,CAAC,KAAG,IAAI,CAEpC;CACH"}
+{"version":3,"file":"queue-rate-limit.d.ts","sourceRoot":"","sources":["../../../../../src/lib/queue-rate-limit/queue-rate-limit.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,SAAS,EAEV,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AAKxE,OAAO,EAEL,YAAY,EACZ,eAAe,EACf,KAAK,EACN,MAAM,mBAAmB,CAAC;AAe3B,qBAAa,cAAc;IACzB,SAAS,CAAC,WAAW,cAAC;IACtB,SAAS,CAAC,MAAM,qCAAC;IACjB,SAAS,CAAC,KAAK,QAAC;;IAoBhB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY,EAAE,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI;IAmE9D,GAAG,CACD,KAAK,EAAE,MAAM,GAAG,YAAY,EAC5B,SAAS,EAAE,eAAe,EAC1B,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,GAClB,IAAI;IA+FP,WAAW,CACT,KAAK,EAAE,MAAM,GAAG,YAAY,EAC5B,SAAS,EAAE,eAAe,EAC1B,EAAE,EAAE,SAAS,CAAC,OAAO,CAAC,GACrB,IAAI;IAgEP,GAAG,CACD,KAAK,EAAE,MAAM,GAAG,YAAY,EAC5B,EAAE,EAAE,SAAS,CAAC,eAAe,GAAG,IAAI,CAAC,GACpC,IAAI;IAmFP,QAAQ,OAAQ,SAAS,CAAC,IAAI,CAAC,KAAG,IAAI,CAUpC;CACH"}