redis-smq 8.0.3 → 8.2.0

package/dist/esm/src/lib/consumer/workers/publish-scheduled.worker.js

@@ -8,92 +8,150 @@ import { EQueueProperty, EQueueType } from '../../queue/index.js';
 import { Worker } from './worker.js';
 class PublishScheduledWorker extends Worker {
     work = (cb) => {
-        async.waterfall([this.fetchMessageIds, this.fetchMessages, this.enqueueMessages], cb);
+        this.logger.debug('Starting publish scheduled messages work cycle');
+        this.logger.debug(`Queue: ${this.queueParsedParams.queueParams.ns}:${this.queueParsedParams.queueParams.name}, GroupId: ${this.queueParsedParams.groupId || 'none'}`);
+        async.waterfall([this.fetchMessageIds, this.fetchMessages, this.enqueueMessages], (err) => {
+            if (err) {
+                this.logger.error('Error in publish scheduled messages workflow', err);
+            }
+            else {
+                this.logger.debug('Completed publish scheduled messages work cycle');
+            }
+            cb(err);
+        });
     };
     fetchMessageIds = (cb) => {
+        this.logger.debug('Fetching scheduled message IDs');
         const redisClient = this.redisClient.getInstance();
         if (redisClient instanceof Error) {
+            this.logger.error('Failed to get Redis client instance', redisClient);
             cb(redisClient);
             return void 0;
         }
         const { keyQueueScheduled } = redisKeys.getQueueKeys(this.queueParsedParams.queueParams, this.queueParsedParams.groupId);
-        redisClient.zrangebyscore(keyQueueScheduled, 0, Date.now(), 0, 9, cb);
+        this.logger.debug(`Using scheduled queue key: ${keyQueueScheduled}`);
+        const currentTimestamp = Date.now();
+        redisClient.zrangebyscore(keyQueueScheduled, 0, currentTimestamp, 0, 9, (err, ids) => {
+            if (err) {
+                this.logger.error('Error fetching scheduled message IDs', err);
+                cb(err);
+            }
+            else {
+                const messageCount = ids?.length || 0;
+                this.logger.debug(`Found ${messageCount} scheduled messages ready for publishing (current timestamp: ${currentTimestamp})`);
+                cb(null, ids || []);
+            }
+        });
     };
     fetchMessages = (ids, cb) => {
+        if (!ids.length) {
+            this.logger.debug('No message IDs to fetch, skipping message retrieval');
+            cb(null, []);
+            return void 0;
+        }
+        this.logger.debug(`Fetching ${ids.length} messages from storage`);
         const redisClient = this.redisClient.getInstance();
         if (redisClient instanceof Error) {
+            this.logger.error('Failed to get Redis client instance', redisClient);
             cb(redisClient);
             return void 0;
         }
-        if (ids.length)
-            _getMessages(redisClient, ids, cb);
-        else
-            cb(null, []);
+        _getMessages(redisClient, ids, (err, messages) => {
+            if (err) {
+                this.logger.error('Error fetching messages', err);
+                cb(err);
+            }
+            else {
+                const messageCount = messages?.length || 0;
+                this.logger.debug(`Successfully retrieved ${messageCount} messages`);
+                cb(null, messages || []);
+            }
+        });
     };
     enqueueMessages = (messages, cb) => {
-        if (messages.length) {
-            const keys = [];
-            const argv = [
-                EMessageProperty.STATUS,
-                EMessagePropertyStatus.PENDING,
-                EMessageProperty.STATE,
-                EQueueProperty.QUEUE_TYPE,
-                EQueueType.PRIORITY_QUEUE,
-                EQueueType.LIFO_QUEUE,
-                EQueueType.FIFO_QUEUE,
-                EQueueProperty.MESSAGES_COUNT,
-                EMessageProperty.MESSAGE,
-            ];
-            async.each(messages, (msg, _, done) => {
-                const ts = Date.now();
-                const messagePriority = msg.producibleMessage.getPriority() ?? '';
-                const { keyMessage: keyScheduledMessage } = redisKeys.getMessageKeys(msg.getId());
-                const nextScheduleTimestamp = msg.getNextScheduledTimestamp();
-                const scheduledMessageState = msg
+        if (!messages.length) {
+            this.logger.debug('No messages to enqueue, work cycle complete');
+            cb();
+            return void 0;
+        }
+        this.logger.debug(`Preparing to enqueue ${messages.length} messages`);
+        const keys = [];
+        const argv = [
+            EMessageProperty.STATUS,
+            EMessagePropertyStatus.PENDING,
+            EMessageProperty.STATE,
+            EQueueProperty.QUEUE_TYPE,
+            EQueueType.PRIORITY_QUEUE,
+            EQueueType.LIFO_QUEUE,
+            EQueueType.FIFO_QUEUE,
+            EQueueProperty.MESSAGES_COUNT,
+            EMessageProperty.MESSAGE,
+        ];
+        async.eachOf(messages, (msg, index, done) => {
+            const messageId = msg.getId();
+            this.logger.debug(`Processing message ${messageId} (${index + 1}/${messages.length})`);
+            const ts = Date.now();
+            const messagePriority = msg.producibleMessage.getPriority() ?? '';
+            const { keyMessage: keyScheduledMessage } = redisKeys.getMessageKeys(messageId);
+            const nextScheduleTimestamp = msg.getNextScheduledTimestamp();
+            const scheduledMessageState = msg.getMessageState();
+            const destinationQueue = msg.getDestinationQueue();
+            const consumerGroupId = msg.getConsumerGroupId();
+            this.logger.debug(`Message ${messageId} destination: ${destinationQueue.ns}:${destinationQueue.name}, consumer group: ${consumerGroupId || 'none'}`);
+            const { keyQueueProperties, keyQueuePending, keyQueuePriorityPending, keyQueueScheduled, keyQueueMessages, } = redisKeys.getQueueKeys(destinationQueue, consumerGroupId);
+            let newMessage = null;
+            let newMessageState = null;
+            let newMessageId = '';
+            let newKeyMessage = '';
+            if (nextScheduleTimestamp) {
+                this.logger.debug(`Message ${messageId} has next schedule timestamp: ${nextScheduleTimestamp}, creating new message instance`);
+                newMessage = _fromMessage(msg, null, null);
+                newMessage.producibleMessage.resetScheduledParams();
+                newMessageState = newMessage
                     .getMessageState()
-                    .setLastScheduledAt(ts);
-                const { keyQueueProperties, keyQueuePending, keyQueuePriorityPending, keyQueueScheduled, keyQueueMessages, } = redisKeys.getQueueKeys(msg.getDestinationQueue(), msg.getConsumerGroupId());
-                let newMessage = null;
-                let newMessageState = null;
-                let newMessageId = '';
-                let newKeyMessage = '';
-                const hasBeenUnacknowledged = msg.producibleMessage.getRetryDelay() > 0 &&
-                    msg.getMessageState().getAttempts() > 0;
-                if (!hasBeenUnacknowledged) {
-                    newMessage = _fromMessage(msg, null, null);
-                    newMessage.producibleMessage.resetScheduledParams();
-                    newMessageState = newMessage
-                        .getMessageState()
-                        .setPublishedAt(ts)
-                        .setScheduledMessageId(msg.getId());
-                    newMessageId = newMessageState.getId();
-                    newKeyMessage = redisKeys.getMessageKeys(newMessageId).keyMessage;
+                    .setPublishedAt(ts)
+                    .setScheduledMessageId(messageId);
+                newMessageId = newMessageState.getId();
+                newKeyMessage = redisKeys.getMessageKeys(newMessageId).keyMessage;
+                scheduledMessageState.setLastScheduledAt(ts);
+                this.logger.debug(`Created new message with ID ${newMessageId} from scheduled message ${messageId}`);
+            }
+            else {
+                this.logger.debug(`Message ${messageId} has no next schedule timestamp, updating existing message`);
+                scheduledMessageState.setPublishedAt(ts);
+            }
+            keys.push(newKeyMessage, keyQueuePending, keyQueueMessages, keyQueueProperties, keyQueuePriorityPending, keyQueueScheduled, keyScheduledMessage);
+            argv.push(newMessageId, newMessage ? JSON.stringify(newMessage) : '', newMessageState ? JSON.stringify(newMessageState) : '', messagePriority, messageId, nextScheduleTimestamp, JSON.stringify(scheduledMessageState));
+            done();
+        }, (err) => {
+            if (err) {
+                this.logger.error('Error during message processing for enqueue', err);
+                cb(err);
+            }
+            else {
+                this.logger.debug(`Executing PUBLISH_SCHEDULED_MESSAGE script for ${messages.length} messages`);
+                const redisClient = this.redisClient.getInstance();
+                if (redisClient instanceof Error) {
+                    this.logger.error('Failed to get Redis client instance', redisClient);
+                    cb(redisClient);
+                    return void 0;
                 }
-                keys.push(newKeyMessage, keyQueuePending, keyQueueMessages, keyQueueProperties, keyQueuePriorityPending, keyQueueScheduled, keyScheduledMessage);
-                argv.push(newMessageId, newMessage ? JSON.stringify(newMessage) : '', newMessageState ? JSON.stringify(newMessageState) : '', messagePriority, msg.getId(), nextScheduleTimestamp, JSON.stringify(scheduledMessageState));
-                done();
-            }, (err) => {
-                if (err)
-                    cb(err);
-                else {
-                    const redisClient = this.redisClient.getInstance();
-                    if (redisClient instanceof Error) {
-                        cb(redisClient);
-                        return void 0;
+                redisClient.runScript(ELuaScriptName.PUBLISH_SCHEDULED_MESSAGE, keys, argv, (err, reply) => {
+                    if (err) {
+                        this.logger.error('Error executing publish scheduled message script', err);
+                        cb(err);
                     }
-                    redisClient.runScript(ELuaScriptName.PUBLISH_SCHEDULED_MESSAGE, keys, argv, (err, reply) => {
-                        if (err)
-                            cb(err);
-                        else if (reply !== 'OK')
-                            cb(new PanicError(String(reply)));
-                        else
-                            cb();
-                    });
-                }
-            });
-        }
-        else
-            cb();
+                    else if (reply !== 'OK') {
+                        this.logger.error(`Script execution returned unexpected response: ${reply}`);
+                        cb(new PanicError(String(reply)));
+                    }
+                    else {
+                        this.logger.info(`Successfully published ${messages.length} scheduled messages`);
+                        cb();
+                    }
+                });
+            }
+        });
     };
 }
 export default (payload) => new PublishScheduledWorker(payload);

package/dist/esm/src/lib/consumer/workers/publish-scheduled.worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"publish-scheduled.worker.js","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/publish-scheduled.worker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"publish-scheduled.worker.js","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/publish-scheduled.worker.ts"],"names":[],"mappings":"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"}

package/dist/esm/src/lib/consumer/workers/requeue-unacknowledged.worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"requeue-unacknowledged.worker.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/requeue-unacknowledged.worker.ts"],"names":[],"mappings":"AASA,OAAO,EAAkC,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAS7E,OAAO,EAAE,oCAAoC,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,cAAM,2BAA4B,SAAQ,MAAM;IAC9C,IAAI,OAAQ,SAAS,CAAC,IAAI,CAAC,KAAG,IAAI,CA0EhC;CACH;kCAEwB,oCAAoC;AAA7D,wBAC2C"}
+{"version":3,"file":"requeue-unacknowledged.worker.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/requeue-unacknowledged.worker.ts"],"names":[],"mappings":"AASA,OAAO,EAAkC,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAS7E,OAAO,EAAE,oCAAoC,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,cAAM,2BAA4B,SAAQ,MAAM;IAC9C,IAAI,OAAQ,SAAS,CAAC,IAAI,CAAC,KAAG,IAAI,CAwIhC;CACH;kCAEwB,oCAAoC;AAA7D,wBAC2C"}

package/dist/esm/src/lib/consumer/workers/requeue-unacknowledged.worker.js

@@ -7,18 +7,26 @@ import { EQueueProperty, EQueueType } from '../../queue/index.js';
 import { Worker } from './worker.js';
 class RequeueUnacknowledgedWorker extends Worker {
     work = (cb) => {
+        this.logger.debug('Starting requeue unacknowledged messages work cycle');
         const { keyQueueRequeued, keyQueueProperties } = redisKeys.getQueueKeys(this.queueParsedParams.queueParams, this.queueParsedParams.groupId);
+        this.logger.debug(`Queue: ${this.queueParsedParams.queueParams.ns}:${this.queueParsedParams.queueParams.name}, GroupId: ${this.queueParsedParams.groupId || 'none'}`);
+        this.logger.debug(`Using requeued queue key: ${keyQueueRequeued}`);
         const redisClient = this.redisClient.getInstance();
         if (redisClient instanceof Error) {
+            this.logger.error('Failed to get Redis client instance', redisClient);
             cb(redisClient);
             return void 0;
         }
         redisClient.lrange(keyQueueRequeued, 0, 99, (err, reply) => {
-            if (err)
+            if (err) {
+                this.logger.error('Error retrieving messages from requeued queue', err);
                 cb(err);
+            }
             else {
                 const messageIds = reply ?? [];
-                if (messageIds.length) {
+                const messageCount = messageIds.length;
+                this.logger.debug(`Found ${messageCount} messages to requeue`);
+                if (messageCount) {
                     const keys = [keyQueueRequeued, keyQueueProperties];
                     const argv = [
                         EQueueProperty.QUEUE_TYPE,
@@ -29,34 +37,60 @@ class RequeueUnacknowledgedWorker extends Worker {
                         EMessagePropertyStatus.PENDING,
                         EMessageProperty.STATE,
                     ];
-                    async.each(messageIds, (messageId, _, done) => {
+                    this.logger.debug('Processing messages for requeue operation');
+                    async.eachOf(messageIds, (messageId, index, done) => {
+                        this.logger.debug(`Processing message ${messageId} (${index + 1}/${messageCount})`);
                         _getMessage(redisClient, messageId, (err, message) => {
-                            if (err)
+                            if (err) {
+                                this.logger.error(`Error retrieving message ${messageId}`, err);
                                 done(err);
-                            else if (!message)
+                            }
+                            else if (!message) {
+                                this.logger.error(`Message ${messageId} not found`);
                                 cb(new CallbackEmptyReplyError());
+                            }
                             else {
                                 const messageId = message.getId();
                                 const messageState = message.getMessageState();
-                                const { keyQueuePriorityPending, keyQueuePending } = redisKeys.getQueueKeys(message.getDestinationQueue(), message.getConsumerGroupId());
+                                const destinationQueue = message.getDestinationQueue();
+                                const consumerGroupId = message.getConsumerGroupId();
+                                this.logger.debug(`Preparing to requeue message ${messageId} to ${destinationQueue.ns}:${destinationQueue.name}, consumer group: ${consumerGroupId || 'none'}`);
+                                const { keyQueuePriorityPending, keyQueuePending } = redisKeys.getQueueKeys(destinationQueue, consumerGroupId);
                                 const { keyMessage } = redisKeys.getMessageKeys(messageId);
                                 keys.push(keyQueuePriorityPending, keyQueuePending, keyMessage);
+                                const previousAttempts = messageState.getAttempts();
                                 messageState.incrAttempts();
+                                const newAttempts = messageState.getAttempts();
+                                this.logger.debug(`Incremented message ${messageId} attempts from ${previousAttempts} to ${newAttempts}`);
                                 const messagePriority = message.producibleMessage.getPriority() ?? '';
                                 argv.push(messageId, messagePriority, JSON.stringify(messageState));
                                 done();
                             }
                         });
                     }, (err) => {
-                        if (err)
+                        if (err) {
+                            this.logger.error('Error during message processing for requeue', err);
                             cb(err);
+                        }
                         else {
-                            redisClient.runScript(ELuaScriptName.REQUEUE_MESSAGE, keys, argv, (err) => cb(err));
+                            this.logger.debug(`Executing REQUEUE_MESSAGE script with ${messageCount} messages`);
+                            redisClient.runScript(ELuaScriptName.REQUEUE_MESSAGE, keys, argv, (err) => {
+                                if (err) {
+                                    this.logger.error('Error executing requeue script', err);
+                                    cb(err);
+                                }
+                                else {
+                                    this.logger.info(`Successfully requeued ${messageCount} messages`);
+                                    cb();
+                                }
+                            });
                         }
                     });
                 }
-                else
+                else {
+                    this.logger.debug('No messages to requeue, work cycle complete');
                     cb();
+                }
             }
         });
     };

package/dist/esm/src/lib/consumer/workers/requeue-unacknowledged.worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"requeue-unacknowledged.worker.js","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/requeue-unacknowledged.worker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"requeue-unacknowledged.worker.js","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/requeue-unacknowledged.worker.ts"],"names":[],"mappings":"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"}

package/dist/esm/src/lib/consumer/workers/watch-consumers.worker.d.ts

@@ -1,7 +1,10 @@
 import { ICallback } from 'redis-smq-common';
+import { MessageUnacknowledgement } from '../message-handler/message-handler/consume-message/message-unacknowledgement.js';
 import { IConsumerMessageHandlerWorkerPayload } from '../types/index.js';
 import { Worker } from './worker.js';
 declare class WatchConsumersWorker extends Worker {
+    protected messageUnacknowledgement: MessageUnacknowledgement;
+    constructor(args: IConsumerMessageHandlerWorkerPayload);
     work: (cb: ICallback<void>) => void;
 }
 declare const _default: (payload: IConsumerMessageHandlerWorkerPayload) => WatchConsumersWorker;

package/dist/esm/src/lib/consumer/workers/watch-consumers.worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watch-consumers.worker.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/watch-consumers.worker.ts"],"names":[],"mappings":"AASA,OAAO,EAAS,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAIpD,OAAO,EAEL,oCAAoC,EACrC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,cAAM,oBAAqB,SAAQ,MAAM;IACvC,IAAI,OAAQ,SAAS,CAAC,IAAI,CAAC,KAAG,IAAI,CAsChC;CACH;kCAEwB,oCAAoC;AAA7D,wBACoC"}
+{"version":3,"file":"watch-consumers.worker.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/watch-consumers.worker.ts"],"names":[],"mappings":"AASA,OAAO,EAAS,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,iFAAiF,CAAC;AAC3H,OAAO,EAEL,oCAAoC,EACrC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,cAAM,oBAAqB,SAAQ,MAAM;IACvC,SAAS,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;gBAEjD,IAAI,EAAE,oCAAoC;IAOtD,IAAI,OAAQ,SAAS,CAAC,IAAI,CAAC,KAAG,IAAI,CAqGhC;CACH;kCAEwB,oCAAoC;AAA7D,wBACoC"}

package/dist/esm/src/lib/consumer/workers/watch-consumers.worker.js

@@ -1,31 +1,71 @@
 import { async } from 'redis-smq-common';
+import { _getQueueConsumerIds } from '../../queue/_/_get-queue-consumer-ids.js';
 import { ConsumerHeartbeat } from '../consumer-heartbeat/consumer-heartbeat.js';
-import { consumerQueues } from '../consumer-queues.js';
-import { processingQueue } from '../message-handler/processing-queue/processing-queue.js';
-import { EMessageUnknowledgmentReason, } from '../types/index.js';
+import { MessageUnacknowledgement } from '../message-handler/message-handler/consume-message/message-unacknowledgement.js';
+import { EMessageUnacknowledgementReason, } from '../types/index.js';
 import { Worker } from './worker.js';
 class WatchConsumersWorker extends Worker {
+    messageUnacknowledgement;
+    constructor(args) {
+        super(args);
+        this.messageUnacknowledgement = new MessageUnacknowledgement(this.redisClient);
+    }
     work = (cb) => {
+        this.logger.debug('Starting watch consumers work cycle');
         const redisClient = this.redisClient.getInstance();
         if (redisClient instanceof Error) {
+            this.logger.error('Failed to get Redis client instance', redisClient);
             cb(redisClient);
             return void 0;
         }
-        consumerQueues.getQueueConsumerIds(redisClient, this.queueParsedParams.queueParams, (err, consumerIds) => {
-            if (err)
+        const queueName = this.queueParsedParams.queueParams.name;
+        const queueNamespace = this.queueParsedParams.queueParams.ns;
+        this.logger.debug(`Checking consumers for queue: ${queueNamespace}:${queueName}`);
+        _getQueueConsumerIds(redisClient, this.queueParsedParams.queueParams, (err, consumerIds) => {
+            if (err) {
+                this.logger.error(`Error retrieving consumer IDs for queue ${queueNamespace}:${queueName}`, err);
                 cb(err);
+            }
             else {
-                async.eachOf(consumerIds ?? [], (consumerId, _, done) => {
+                const consumerCount = consumerIds?.length || 0;
+                this.logger.debug(`Found ${consumerCount} consumers for queue ${queueNamespace}:${queueName}`);
+                async.eachOf(consumerIds ?? [], (consumerId, index, done) => {
+                    this.logger.debug(`Checking heartbeat for consumer ${consumerId} (${index + 1}/${consumerCount})`);
                     ConsumerHeartbeat.isConsumerAlive(redisClient, consumerId, (err, alive) => {
-                        if (err)
+                        if (err) {
+                            this.logger.error(`Error checking heartbeat for consumer ${consumerId}`, err);
                             done(err);
+                        }
                         else if (!alive) {
-                            processingQueue.unknowledgeMessage(redisClient, consumerId, [this.queueParsedParams.queueParams], this.logger, EMessageUnknowledgmentReason.OFFLINE_CONSUMER, (err) => done(err));
+                            this.logger.info(`Consumer ${consumerId} is offline, unacknowledging messages`);
+                            this.messageUnacknowledgement.unacknowledgeMessagesInProcess(consumerId, [this.queueParsedParams.queueParams], EMessageUnacknowledgementReason.OFFLINE_CONSUMER, (err, status) => {
+                                if (err) {
+                                    this.logger.error(`Failed to unacknowledge messages for offline consumer ${consumerId}`, err);
+                                    done(err);
+                                }
+                                else {
+                                    const messageCount = status
+                                        ? Object.keys(status).length
+                                        : 0;
+                                    this.logger.info(`Successfully unacknowledged ${messageCount} messages for offline consumer ${consumerId}`);
+                                    done();
+                                }
+                            });
                         }
-                        else
+                        else {
+                            this.logger.debug(`Consumer ${consumerId} is alive and active`);
                             done();
+                        }
                     });
-                }, (err) => cb(err));
+                }, (err) => {
+                    if (err) {
+                        this.logger.error('Error during consumer heartbeat check cycle', err);
+                    }
+                    else {
+                        this.logger.debug('Completed watch consumers work cycle successfully');
+                    }
+                    cb(err);
+                });
             }
         });
     };

package/dist/esm/src/lib/consumer/workers/watch-consumers.worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"watch-consumers.worker.js","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/watch-consumers.worker.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,EAAa,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,yDAAyD,CAAC;AAC1F,OAAO,EACL,4BAA4B,GAE7B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,oBAAqB,SAAQ,MAAM;IACvC,IAAI,GAAG,CAAC,EAAmB,EAAQ,EAAE;QACnC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;QACnD,IAAI,WAAW,YAAY,KAAK,EAAE,CAAC;YACjC,EAAE,CAAC,WAAW,CAAC,CAAC;YAChB,OAAO,KAAK,CAAC,CAAC;QAChB,CAAC;QACD,cAAc,CAAC,mBAAmB,CAChC,WAAW,EACX,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAClC,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE;YACnB,IAAI,GAAG;gBAAE,EAAE,CAAC,GAAG,CAAC,CAAC;iBACZ,CAAC;gBACJ,KAAK,CAAC,MAAM,CACV,WAAW,IAAI,EAAE,EACjB,CAAC,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;oBACtB,iBAAiB,CAAC,eAAe,CAC/B,WAAW,EACX,UAAU,EACV,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;wBACb,IAAI,GAAG;4BAAE,IAAI,CAAC,GAAG,CAAC,CAAC;6BACd,IAAI,CAAC,KAAK,EAAE,CAAC;4BAChB,eAAe,CAAC,kBAAkB,CAChC,WAAW,EACX,UAAU,EACV,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,EACpC,IAAI,CAAC,MAAM,EACX,4BAA4B,CAAC,gBAAgB,EAC7C,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CACnB,CAAC;wBACJ,CAAC;;4BAAM,IAAI,EAAE,CAAC;oBAChB,CAAC,CACF,CAAC;gBACJ,CAAC,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CACjB,CAAC;YACJ,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC,CAAC;CACH;AAED,eAAe,CAAC,OAA6C,EAAE,EAAE,CAC/D,IAAI,oBAAoB,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"watch-consumers.worker.js","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/watch-consumers.worker.ts"],"names":[],"mappings":"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"}

package/dist/esm/src/lib/consumer/workers/worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/worker.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAU,QAAQ,EAAS,MAAM,kBAAkB,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,8CAA8C,CAAC;AAE3E,OAAO,EAAE,oCAAoC,EAAE,MAAM,mBAAmB,CAAC;AAEzE,8BAAsB,MAAO,SAAQ,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAClE,SAAS,CAAC,WAAW,cAAC;IACtB,SAAS,CAAC,MAAM,UAAC;IACjB,OAAO,CAAC,KAAK,CAAC;IACd,SAAS,CAAC,MAAM,6DAAC;IACjB,SAAS,CAAC,iBAAiB,8CAAC;gBAEhB,EACV,MAAM,EACN,iBAAiB,GAClB,EAAE,oCAAoC;cAepB,SAAS,IAAI,OAAO;IAIvC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI;cAErB,OAAO,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE;cAU5C,SAAS,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE;IAUjE,SAAS,CAAC,MAAM,aAOd;IAEF,UAAmB,WAAW,QAAS,KAAK,UAK1C;CACH"}
+{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/worker.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAU,QAAQ,EAAS,MAAM,kBAAkB,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,8CAA8C,CAAC;AAE3E,OAAO,EAAE,oCAAoC,EAAE,MAAM,mBAAmB,CAAC;AAEzE,8BAAsB,MAAO,SAAQ,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAClE,SAAS,CAAC,WAAW,cAAC;IACtB,SAAS,CAAC,MAAM,UAAC;IACjB,OAAO,CAAC,KAAK,CAAC;IACd,SAAS,CAAC,MAAM,6DAAC;IACjB,SAAS,CAAC,iBAAiB,8CAAC;gBAEhB,EACV,MAAM,EACN,iBAAiB,GAClB,EAAE,oCAAoC;cAgBpB,SAAS,IAAI,OAAO;IAIvC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI;cAErB,OAAO,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE;cAe5C,SAAS,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE;IAejE,SAAS,CAAC,MAAM,aAad;IAEF,UAAmB,WAAW,QAAS,KAAK,UAM1C;CACH"}

package/dist/esm/src/lib/consumer/workers/worker.js

@@ -12,7 +12,8 @@ export class Worker extends Runnable {
         this.config = config;
         Configuration.getSetConfig(config);
         this.queueParsedParams = queueParsedParams;
-        this.logger = logger.getLogger(config.logger, `worker:${this.constructor.name.toLowerCase()}:${this.id}`);
+        this.logger = logger.getLogger(config.logger, this.constructor.name.toLowerCase());
+        this.logger.info(`Initializing worker: ${this.constructor.name}`);
         this.redisClient = new RedisClient();
         this.redisClient.on('error', (err) => this.handleError(err));
         this.timer = new Timer();
@@ -22,35 +23,51 @@ export class Worker extends Runnable {
         return this.logger;
     }
     goingUp() {
+        this.logger.debug('Worker going up');
         return super.goingUp().concat([
-            this.redisClient.init,
             (cb) => {
+                this.logger.debug('Initializing Redis client');
+                this.redisClient.init(cb);
+            },
+            (cb) => {
+                this.logger.debug('Setting up worker timer');
                 this.timer.setTimeout(this.onTick, 1000);
                 cb();
             },
         ]);
     }
     goingDown() {
+        this.logger.debug('Worker going down');
         return [
             (cb) => {
+                this.logger.debug('Resetting worker timer');
                 this.timer.reset();
                 cb();
             },
-            this.redisClient.shutdown,
+            (cb) => {
+                this.logger.debug('Shutting down Redis client');
+                this.redisClient.shutdown(cb);
+            },
         ].concat(super.goingDown());
     }
     onTick = () => {
         if (this.isRunning()) {
+            this.logger.debug('Worker tick triggered');
             this.work((err) => {
-                if (err)
+                if (err) {
+                    this.logger.error('Error during worker execution', err);
                     this.handleError(err);
-                else
+                }
+                else {
+                    this.logger.debug('Scheduling next worker tick');
                     this.timer.setTimeout(this.onTick, 1000);
+                }
             });
         }
     };
     handleError = (err) => {
         if (this.isRunning()) {
+            this.logger.error(`Fatal error in worker ${this.constructor.name}`, err);
             throw err;
         }
     };

package/dist/esm/src/lib/consumer/workers/worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/worker.ts"],"names":[],"mappings":"AASA,OAAO,EAAsB,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,8CAA8C,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD,MAAM,OAAgB,MAAO,SAAQ,QAA+B;IACxD,WAAW,CAAC;IACZ,MAAM,CAAC;IACT,KAAK,CAAC;IACJ,MAAM,CAAC;IACP,iBAAiB,CAAC;IAE5B,YAAY,EACV,MAAM,EACN,iBAAiB,GACoB;QACrC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACnC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAC5B,MAAM,CAAC,MAAM,EACb,UAAU,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,IAAI,CAAC,EAAE,EAAE,CAC3D,CAAC;QACF,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;QAC7D,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;IAChE,CAAC;IAEkB,SAAS;QAC1B,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAIkB,OAAO;QACxB,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC;YAC5B,IAAI,CAAC,WAAW,CAAC,IAAI;YACrB,CAAC,EAAmB,EAAE,EAAE;gBACtB,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBACzC,EAAE,EAAE,CAAC;YACP,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAEkB,SAAS;QAC1B,OAAO;YACL,CAAC,EAAmB,EAAE,EAAE;gBACtB,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;gBACnB,EAAE,EAAE,CAAC;YACP,CAAC;YACD,IAAI,CAAC,WAAW,CAAC,QAAQ;SAC1B,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;IAC9B,CAAC;IAES,MAAM,GAAG,GAAG,EAAE;QACtB,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YACrB,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;gBAChB,IAAI,GAAG;oBAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;;oBAC1B,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAChD,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;IAEiB,WAAW,GAAG,CAAC,GAAU,EAAE,EAAE;QAC9C,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YAErB,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC,CAAC;CACH"}
+{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/worker.ts"],"names":[],"mappings":"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"}

package/dist/esm/src/lib/consumer-groups/consumer-groups.d.ts

@@ -1,11 +1,11 @@
-import { ICallback } from 'redis-smq-common';
+import { ICallback, ILogger } from 'redis-smq-common';
 import { RedisClient } from '../../common/redis-client/redis-client.js';
 import { EventBus } from '../event-bus/index.js';
 import { IQueueParams } from '../queue/index.js';
 export declare class ConsumerGroups {
     protected redisClient: RedisClient;
     protected eventBus: EventBus;
-    protected logger: import("redis-smq-common").ILogger;
+    protected logger: ILogger;
     constructor();
     saveConsumerGroup(queue: string | IQueueParams, groupId: string, cb: ICallback<number>): void;
     deleteConsumerGroup(queue: string | IQueueParams, groupId: string, cb: ICallback<void>): void;

package/dist/esm/src/lib/consumer-groups/consumer-groups.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"consumer-groups.d.ts","sourceRoot":"","sources":["../../../../../src/lib/consumer-groups/consumer-groups.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,SAAS,EAIV,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AAExE,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAUjD,qBAAa,cAAc;IACzB,SAAS,CAAC,WAAW,cAAC;IACtB,SAAS,CAAC,QAAQ,WAAC;IACnB,SAAS,CAAC,MAAM,qCAAC;;IA0BjB,iBAAiB,CACf,KAAK,EAAE,MAAM,GAAG,YAAY,EAC5B,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,GACpB,IAAI;IA2BP,mBAAmB,CACjB,KAAK,EAAE,MAAM,GAAG,YAAY,EAC5B,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,GAClB,IAAI;IAgDP,iBAAiB,CACf,KAAK,EAAE,MAAM,GAAG,YAAY,EAC5B,EAAE,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,GACtB,IAAI;IAmBP,QAAQ,OAAQ,SAAS,CAAC,IAAI,CAAC,KAAG,IAAI,CAEpC;CACH"}
+{"version":3,"file":"consumer-groups.d.ts","sourceRoot":"","sources":["../../../../../src/lib/consumer-groups/consumer-groups.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,SAAS,EAET,OAAO,EAGR,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AAExE,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAUjD,qBAAa,cAAc;IACzB,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACnC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC7B,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;;IAiC1B,iBAAiB,CACf,KAAK,EAAE,MAAM,GAAG,YAAY,EAC5B,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,GACpB,IAAI;IA6EP,mBAAmB,CACjB,KAAK,EAAE,MAAM,GAAG,YAAY,EAC5B,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,GAClB,IAAI;IA6GP,iBAAiB,CACf,KAAK,EAAE,MAAM,GAAG,YAAY,EAC5B,EAAE,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,GACtB,IAAI;IAyDP,QAAQ,OAAQ,SAAS,CAAC,IAAI,CAAC,KAAG,IAAI,CAyCpC;CACH"}