redis-smq 8.0.3 → 8.2.0

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

@@ -12,93 +12,151 @@ class PublishScheduledWorker extends worker_js_1.Worker {
     constructor() {
         super(...arguments);
         this.work = (cb) => {
-            redis_smq_common_1.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'}`);
+            redis_smq_common_1.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);
+            });
         };
         this.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 } = redis_keys_js_1.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 === null || ids === void 0 ? void 0 : ids.length) || 0;
+                    this.logger.debug(`Found ${messageCount} scheduled messages ready for publishing (current timestamp: ${currentTimestamp})`);
+                    cb(null, ids || []);
+                }
+            });
         };
         this.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)
-                (0, _get_message_js_1._getMessages)(redisClient, ids, cb);
-            else
-                cb(null, []);
+            (0, _get_message_js_1._getMessages)(redisClient, ids, (err, messages) => {
+                if (err) {
+                    this.logger.error('Error fetching messages', err);
+                    cb(err);
+                }
+                else {
+                    const messageCount = (messages === null || messages === void 0 ? void 0 : messages.length) || 0;
+                    this.logger.debug(`Successfully retrieved ${messageCount} messages`);
+                    cb(null, messages || []);
+                }
+            });
         };
         this.enqueueMessages = (messages, cb) => {
-            if (messages.length) {
-                const keys = [];
-                const argv = [
-                    index_js_1.EMessageProperty.STATUS,
-                    index_js_1.EMessagePropertyStatus.PENDING,
-                    index_js_1.EMessageProperty.STATE,
-                    index_js_2.EQueueProperty.QUEUE_TYPE,
-                    index_js_2.EQueueType.PRIORITY_QUEUE,
-                    index_js_2.EQueueType.LIFO_QUEUE,
-                    index_js_2.EQueueType.FIFO_QUEUE,
-                    index_js_2.EQueueProperty.MESSAGES_COUNT,
-                    index_js_1.EMessageProperty.MESSAGE,
-                ];
-                redis_smq_common_1.async.each(messages, (msg, _, done) => {
-                    var _a;
-                    const ts = Date.now();
-                    const messagePriority = (_a = msg.producibleMessage.getPriority()) !== null && _a !== void 0 ? _a : '';
-                    const { keyMessage: keyScheduledMessage } = redis_keys_js_1.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 = [
+                index_js_1.EMessageProperty.STATUS,
+                index_js_1.EMessagePropertyStatus.PENDING,
+                index_js_1.EMessageProperty.STATE,
+                index_js_2.EQueueProperty.QUEUE_TYPE,
+                index_js_2.EQueueType.PRIORITY_QUEUE,
+                index_js_2.EQueueType.LIFO_QUEUE,
+                index_js_2.EQueueType.FIFO_QUEUE,
+                index_js_2.EQueueProperty.MESSAGES_COUNT,
+                index_js_1.EMessageProperty.MESSAGE,
+            ];
+            redis_smq_common_1.async.eachOf(messages, (msg, index, done) => {
+                var _a;
+                const messageId = msg.getId();
+                this.logger.debug(`Processing message ${messageId} (${index + 1}/${messages.length})`);
+                const ts = Date.now();
+                const messagePriority = (_a = msg.producibleMessage.getPriority()) !== null && _a !== void 0 ? _a : '';
+                const { keyMessage: keyScheduledMessage } = redis_keys_js_1.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, } = redis_keys_js_1.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 = (0, _from_message_js_1._fromMessage)(msg, null, null);
+                    newMessage.producibleMessage.resetScheduledParams();
+                    newMessageState = newMessage
                         .getMessageState()
-                        .setLastScheduledAt(ts);
-                    const { keyQueueProperties, keyQueuePending, keyQueuePriorityPending, keyQueueScheduled, keyQueueMessages, } = redis_keys_js_1.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 = (0, _from_message_js_1._fromMessage)(msg, null, null);
-                        newMessage.producibleMessage.resetScheduledParams();
-                        newMessageState = newMessage
-                            .getMessageState()
-                            .setPublishedAt(ts)
-                            .setScheduledMessageId(msg.getId());
-                        newMessageId = newMessageState.getId();
-                        newKeyMessage = redis_keys_js_1.redisKeys.getMessageKeys(newMessageId).keyMessage;
+                        .setPublishedAt(ts)
+                        .setScheduledMessageId(messageId);
+                    newMessageId = newMessageState.getId();
+                    newKeyMessage = redis_keys_js_1.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(scripts_js_1.ELuaScriptName.PUBLISH_SCHEDULED_MESSAGE, keys, argv, (err, reply) => {
+                        if (err) {
+                            this.logger.error('Error executing publish scheduled message script', err);
+                            cb(err);
                         }
-                        redisClient.runScript(scripts_js_1.ELuaScriptName.PUBLISH_SCHEDULED_MESSAGE, keys, argv, (err, reply) => {
-                            if (err)
-                                cb(err);
-                            else if (reply !== 'OK')
-                                cb(new redis_smq_common_1.PanicError(String(reply)));
-                            else
-                                cb();
-                        });
-                    }
-                });
-            }
-            else
-                cb();
+                        else if (reply !== 'OK') {
+                            this.logger.error(`Script execution returned unexpected response: ${reply}`);
+                            cb(new redis_smq_common_1.PanicError(String(reply)));
+                        }
+                        else {
+                            this.logger.info(`Successfully published ${messages.length} scheduled messages`);
+                            cb();
+                        }
+                    });
+                }
+            });
         };
     }
 }

package/dist/cjs/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/cjs/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/cjs/src/lib/consumer/workers/requeue-unacknowledged.worker.js

@@ -11,18 +11,26 @@ class RequeueUnacknowledgedWorker extends worker_js_1.Worker {
     constructor() {
         super(...arguments);
         this.work = (cb) => {
+            this.logger.debug('Starting requeue unacknowledged messages work cycle');
             const { keyQueueRequeued, keyQueueProperties } = redis_keys_js_1.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 !== null && reply !== void 0 ? reply : [];
-                    if (messageIds.length) {
+                    const messageCount = messageIds.length;
+                    this.logger.debug(`Found ${messageCount} messages to requeue`);
+                    if (messageCount) {
                         const keys = [keyQueueRequeued, keyQueueProperties];
                         const argv = [
                             index_js_2.EQueueProperty.QUEUE_TYPE,
@@ -33,35 +41,61 @@ class RequeueUnacknowledgedWorker extends worker_js_1.Worker {
                             index_js_1.EMessagePropertyStatus.PENDING,
                             index_js_1.EMessageProperty.STATE,
                         ];
-                        redis_smq_common_1.async.each(messageIds, (messageId, _, done) => {
+                        this.logger.debug('Processing messages for requeue operation');
+                        redis_smq_common_1.async.eachOf(messageIds, (messageId, index, done) => {
+                            this.logger.debug(`Processing message ${messageId} (${index + 1}/${messageCount})`);
                             (0, _get_message_js_1._getMessage)(redisClient, messageId, (err, message) => {
                                 var _a;
-                                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 redis_smq_common_1.CallbackEmptyReplyError());
+                                }
                                 else {
                                     const messageId = message.getId();
                                     const messageState = message.getMessageState();
-                                    const { keyQueuePriorityPending, keyQueuePending } = redis_keys_js_1.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 } = redis_keys_js_1.redisKeys.getQueueKeys(destinationQueue, consumerGroupId);
                                     const { keyMessage } = redis_keys_js_1.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 = (_a = message.producibleMessage.getPriority()) !== null && _a !== void 0 ? _a : '';
                                     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(scripts_js_1.ELuaScriptName.REQUEUE_MESSAGE, keys, argv, (err) => cb(err));
+                                this.logger.debug(`Executing REQUEUE_MESSAGE script with ${messageCount} messages`);
+                                redisClient.runScript(scripts_js_1.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/cjs/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":";;AASA,uDAA6E;AAC7E,gFAAiF;AACjF,4EAAqE;AACrE,qEAA8D;AAC9D,qDAGgC;AAChC,mDAAkE;AAElE,2CAAqC;AAErC,MAAM,2BAA4B,SAAQ,kBAAM;IAAhD;;QACE,SAAI,GAAG,CAAC,EAAmB,EAAQ,EAAE;YACnC,MAAM,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,GAAG,yBAAS,CAAC,YAAY,CACrE,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAClC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAC/B,CAAC;YACF,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;YACnD,IAAI,WAAW,YAAY,KAAK,EAAE,CAAC;gBACjC,EAAE,CAAC,WAAW,CAAC,CAAC;gBAChB,OAAO,KAAK,CAAC,CAAC;YAChB,CAAC;YACD,WAAW,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACzD,IAAI,GAAG;oBAAE,EAAE,CAAC,GAAG,CAAC,CAAC;qBACZ,CAAC;oBACJ,MAAM,UAAU,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAC;oBAC/B,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;wBACtB,MAAM,IAAI,GAAa,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;wBAC9D,MAAM,IAAI,GAAwB;4BAChC,yBAAc,CAAC,UAAU;4BACzB,qBAAU,CAAC,cAAc;4BACzB,qBAAU,CAAC,UAAU;4BACrB,qBAAU,CAAC,UAAU;4BACrB,2BAAgB,CAAC,MAAM;4BACvB,iCAAsB,CAAC,OAAO;4BAC9B,2BAAgB,CAAC,KAAK;yBACvB,CAAC;wBACF,wBAAK,CAAC,IAAI,CACR,UAAU,EACV,CAAC,SAAS,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;4BACrB,IAAA,6BAAW,EAAC,WAAW,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;;gCACnD,IAAI,GAAG;oCAAE,IAAI,CAAC,GAAG,CAAC,CAAC;qCACd,IAAI,CAAC,OAAO;oCAAE,EAAE,CAAC,IAAI,0CAAuB,EAAE,CAAC,CAAC;qCAChD,CAAC;oCACJ,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;oCAClC,MAAM,YAAY,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;oCAE/C,MAAM,EAAE,uBAAuB,EAAE,eAAe,EAAE,GAChD,yBAAS,CAAC,YAAY,CACpB,OAAO,CAAC,mBAAmB,EAAE,EAC7B,OAAO,CAAC,kBAAkB,EAAE,CAC7B,CAAC;oCACJ,MAAM,EAAE,UAAU,EAAE,GAAG,yBAAS,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;oCAC3D,IAAI,CAAC,IAAI,CACP,uBAAuB,EACvB,eAAe,EACf,UAAU,CACX,CAAC;oCAEF,YAAY,CAAC,YAAY,EAAE,CAAC;oCAC5B,MAAM,eAAe,GACnB,MAAA,OAAO,CAAC,iBAAiB,CAAC,WAAW,EAAE,mCAAI,EAAE,CAAC;oCAChD,IAAI,CAAC,IAAI,CACP,SAAS,EACT,eAAe,EACf,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAC7B,CAAC;oCACF,IAAI,EAAE,CAAC;gCACT,CAAC;4BACH,CAAC,CAAC,CAAC;wBACL,CAAC,EACD,CAAC,GAAG,EAAE,EAAE;4BACN,IAAI,GAAG;gCAAE,EAAE,CAAC,GAAG,CAAC,CAAC;iCACZ,CAAC;gCACJ,WAAW,CAAC,SAAS,CACnB,2BAAc,CAAC,eAAe,EAC9B,IAAI,EACJ,IAAI,EACJ,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CACjB,CAAC;4BACJ,CAAC;wBACH,CAAC,CACF,CAAC;oBACJ,CAAC;;wBAAM,EAAE,EAAE,CAAC;gBACd,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,kBAAe,CAAC,OAA6C,EAAE,EAAE,CAC/D,IAAI,2BAA2B,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"requeue-unacknowledged.worker.js","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/requeue-unacknowledged.worker.ts"],"names":[],"mappings":";;AASA,uDAA6E;AAC7E,gFAAiF;AACjF,4EAAqE;AACrE,qEAA8D;AAC9D,qDAGgC;AAChC,mDAAkE;AAElE,2CAAqC;AAErC,MAAM,2BAA4B,SAAQ,kBAAM;IAAhD;;QACE,SAAI,GAAG,CAAC,EAAmB,EAAQ,EAAE;YACnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC;YAEzE,MAAM,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,GAAG,yBAAS,CAAC,YAAY,CACrE,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAClC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAC/B,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,UAAU,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE,IAAI,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,IAAI,cAAc,IAAI,CAAC,iBAAiB,CAAC,OAAO,IAAI,MAAM,EAAE,CACnJ,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,gBAAgB,EAAE,CAAC,CAAC;YAEnE,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;YACnD,IAAI,WAAW,YAAY,KAAK,EAAE,CAAC;gBACjC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,EAAE,WAAW,CAAC,CAAC;gBACtE,EAAE,CAAC,WAAW,CAAC,CAAC;gBAChB,OAAO,KAAK,CAAC,CAAC;YAChB,CAAC;YAED,WAAW,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACzD,IAAI,GAAG,EAAE,CAAC;oBACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,EAAE,GAAG,CAAC,CAAC;oBACxE,EAAE,CAAC,GAAG,CAAC,CAAC;gBACV,CAAC;qBAAM,CAAC;oBACN,MAAM,UAAU,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAC;oBAC/B,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC;oBAEvC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,YAAY,sBAAsB,CAAC,CAAC;oBAE/D,IAAI,YAAY,EAAE,CAAC;wBACjB,MAAM,IAAI,GAAa,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;wBAC9D,MAAM,IAAI,GAAwB;4BAChC,yBAAc,CAAC,UAAU;4BACzB,qBAAU,CAAC,cAAc;4BACzB,qBAAU,CAAC,UAAU;4BACrB,qBAAU,CAAC,UAAU;4BACrB,2BAAgB,CAAC,MAAM;4BACvB,iCAAsB,CAAC,OAAO;4BAC9B,2BAAgB,CAAC,KAAK;yBACvB,CAAC;wBAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;wBAE/D,wBAAK,CAAC,MAAM,CACV,UAAU,EACV,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;4BACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,sBAAsB,SAAS,KAAK,KAAK,GAAG,CAAC,IAAI,YAAY,GAAG,CACjE,CAAC;4BAEF,IAAA,6BAAW,EAAC,WAAW,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;;gCACnD,IAAI,GAAG,EAAE,CAAC;oCACR,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,4BAA4B,SAAS,EAAE,EACvC,GAAG,CACJ,CAAC;oCACF,IAAI,CAAC,GAAG,CAAC,CAAC;gCACZ,CAAC;qCAAM,IAAI,CAAC,OAAO,EAAE,CAAC;oCACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,SAAS,YAAY,CAAC,CAAC;oCACpD,EAAE,CAAC,IAAI,0CAAuB,EAAE,CAAC,CAAC;gCACpC,CAAC;qCAAM,CAAC;oCACN,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;oCAClC,MAAM,YAAY,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;oCAC/C,MAAM,gBAAgB,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;oCACvD,MAAM,eAAe,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;oCAErD,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,gCAAgC,SAAS,OAAO,gBAAgB,CAAC,EAAE,IAAI,gBAAgB,CAAC,IAAI,qBAAqB,eAAe,IAAI,MAAM,EAAE,CAC7I,CAAC;oCAEF,MAAM,EAAE,uBAAuB,EAAE,eAAe,EAAE,GAChD,yBAAS,CAAC,YAAY,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;oCAC5D,MAAM,EAAE,UAAU,EAAE,GAAG,yBAAS,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;oCAC3D,IAAI,CAAC,IAAI,CACP,uBAAuB,EACvB,eAAe,EACf,UAAU,CACX,CAAC;oCAEF,MAAM,gBAAgB,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;oCACpD,YAAY,CAAC,YAAY,EAAE,CAAC;oCAC5B,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;oCAE/C,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,uBAAuB,SAAS,kBAAkB,gBAAgB,OAAO,WAAW,EAAE,CACvF,CAAC;oCAEF,MAAM,eAAe,GACnB,MAAA,OAAO,CAAC,iBAAiB,CAAC,WAAW,EAAE,mCAAI,EAAE,CAAC;oCAChD,IAAI,CAAC,IAAI,CACP,SAAS,EACT,eAAe,EACf,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAC7B,CAAC;oCACF,IAAI,EAAE,CAAC;gCACT,CAAC;4BACH,CAAC,CAAC,CAAC;wBACL,CAAC,EACD,CAAC,GAAG,EAAE,EAAE;4BACN,IAAI,GAAG,EAAE,CAAC;gCACR,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,6CAA6C,EAC7C,GAAG,CACJ,CAAC;gCACF,EAAE,CAAC,GAAG,CAAC,CAAC;4BACV,CAAC;iCAAM,CAAC;gCACN,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,yCAAyC,YAAY,WAAW,CACjE,CAAC;gCAEF,WAAW,CAAC,SAAS,CACnB,2BAAc,CAAC,eAAe,EAC9B,IAAI,EACJ,IAAI,EACJ,CAAC,GAAG,EAAE,EAAE;oCACN,IAAI,GAAG,EAAE,CAAC;wCACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAC;wCACzD,EAAE,CAAC,GAAG,CAAC,CAAC;oCACV,CAAC;yCAAM,CAAC;wCACN,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,yBAAyB,YAAY,WAAW,CACjD,CAAC;wCACF,EAAE,EAAE,CAAC;oCACP,CAAC;gCACH,CAAC,CACF,CAAC;4BACJ,CAAC;wBACH,CAAC,CACF,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;wBACjE,EAAE,EAAE,CAAC;oBACP,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,kBAAe,CAAC,OAA6C,EAAE,EAAE,CAC/D,IAAI,2BAA2B,CAAC,OAAO,CAAC,CAAC"}

package/dist/cjs/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/cjs/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/cjs/src/lib/consumer/workers/watch-consumers.worker.js

@@ -1,38 +1,74 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const redis_smq_common_1 = require("redis-smq-common");
+const _get_queue_consumer_ids_js_1 = require("../../queue/_/_get-queue-consumer-ids.js");
 const consumer_heartbeat_js_1 = require("../consumer-heartbeat/consumer-heartbeat.js");
-const consumer_queues_js_1 = require("../consumer-queues.js");
-const processing_queue_js_1 = require("../message-handler/processing-queue/processing-queue.js");
+const message_unacknowledgement_js_1 = require("../message-handler/message-handler/consume-message/message-unacknowledgement.js");
 const index_js_1 = require("../types/index.js");
 const worker_js_1 = require("./worker.js");
 class WatchConsumersWorker extends worker_js_1.Worker {
-    constructor() {
-        super(...arguments);
+    constructor(args) {
+        super(args);
         this.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;
             }
-            consumer_queues_js_1.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}`);
+            (0, _get_queue_consumer_ids_js_1._getQueueConsumerIds)(redisClient, this.queueParsedParams.queueParams, (err, consumerIds) => {
+                if (err) {
+                    this.logger.error(`Error retrieving consumer IDs for queue ${queueNamespace}:${queueName}`, err);
                     cb(err);
+                }
                 else {
-                    redis_smq_common_1.async.eachOf(consumerIds !== null && consumerIds !== void 0 ? consumerIds : [], (consumerId, _, done) => {
+                    const consumerCount = (consumerIds === null || consumerIds === void 0 ? void 0 : consumerIds.length) || 0;
+                    this.logger.debug(`Found ${consumerCount} consumers for queue ${queueNamespace}:${queueName}`);
+                    redis_smq_common_1.async.eachOf(consumerIds !== null && consumerIds !== void 0 ? consumerIds : [], (consumerId, index, done) => {
+                        this.logger.debug(`Checking heartbeat for consumer ${consumerId} (${index + 1}/${consumerCount})`);
                         consumer_heartbeat_js_1.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) {
-                                processing_queue_js_1.processingQueue.unknowledgeMessage(redisClient, consumerId, [this.queueParsedParams.queueParams], this.logger, index_js_1.EMessageUnknowledgmentReason.OFFLINE_CONSUMER, (err) => done(err));
+                                this.logger.info(`Consumer ${consumerId} is offline, unacknowledging messages`);
+                                this.messageUnacknowledgement.unacknowledgeMessagesInProcess(consumerId, [this.queueParsedParams.queueParams], index_js_1.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);
+                    });
                 }
             });
         };
+        this.messageUnacknowledgement = new message_unacknowledgement_js_1.MessageUnacknowledgement(this.redisClient);
     }
 }
 exports.default = (payload) => new WatchConsumersWorker(payload);

package/dist/cjs/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,uDAAoD;AACpD,uFAAgF;AAChF,8DAAuD;AACvD,iGAA0F;AAC1F,gDAG2B;AAC3B,2CAAqC;AAErC,MAAM,oBAAqB,SAAQ,kBAAM;IAAzC;;QACE,SAAI,GAAG,CAAC,EAAmB,EAAQ,EAAE;YACnC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;YACnD,IAAI,WAAW,YAAY,KAAK,EAAE,CAAC;gBACjC,EAAE,CAAC,WAAW,CAAC,CAAC;gBAChB,OAAO,KAAK,CAAC,CAAC;YAChB,CAAC;YACD,mCAAc,CAAC,mBAAmB,CAChC,WAAW,EACX,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAClC,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE;gBACnB,IAAI,GAAG;oBAAE,EAAE,CAAC,GAAG,CAAC,CAAC;qBACZ,CAAC;oBACJ,wBAAK,CAAC,MAAM,CACV,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,EAAE,EACjB,CAAC,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;wBACtB,yCAAiB,CAAC,eAAe,CAC/B,WAAW,EACX,UAAU,EACV,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;4BACb,IAAI,GAAG;gCAAE,IAAI,CAAC,GAAG,CAAC,CAAC;iCACd,IAAI,CAAC,KAAK,EAAE,CAAC;gCAChB,qCAAe,CAAC,kBAAkB,CAChC,WAAW,EACX,UAAU,EACV,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,EACpC,IAAI,CAAC,MAAM,EACX,uCAA4B,CAAC,gBAAgB,EAC7C,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CACnB,CAAC;4BACJ,CAAC;;gCAAM,IAAI,EAAE,CAAC;wBAChB,CAAC,CACF,CAAC;oBACJ,CAAC,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CACjB,CAAC;gBACJ,CAAC;YACH,CAAC,CACF,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,kBAAe,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/cjs/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/cjs/src/lib/consumer/workers/worker.js

@@ -9,23 +9,30 @@ class Worker extends redis_smq_common_1.Runnable {
         super();
         this.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);
+                    }
                 });
             }
         };
         this.handleError = (err) => {
             if (this.isRunning()) {
+                this.logger.error(`Fatal error in worker ${this.constructor.name}`, err);
                 throw err;
             }
         };
         this.config = config;
         index_js_1.Configuration.getSetConfig(config);
         this.queueParsedParams = queueParsedParams;
-        this.logger = redis_smq_common_1.logger.getLogger(config.logger, `worker:${this.constructor.name.toLowerCase()}:${this.id}`);
+        this.logger = redis_smq_common_1.logger.getLogger(config.logger, this.constructor.name.toLowerCase());
+        this.logger.info(`Initializing worker: ${this.constructor.name}`);
         this.redisClient = new redis_client_js_1.RedisClient();
         this.redisClient.on('error', (err) => this.handleError(err));
         this.timer = new redis_smq_common_1.Timer();
@@ -35,21 +42,31 @@ class Worker extends redis_smq_common_1.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());
     }
 }

package/dist/cjs/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,uDAA+E;AAC/E,kFAA2E;AAC3E,uDAAyD;AAGzD,MAAsB,MAAO,SAAQ,2BAA+B;IAOlE,YAAY,EACV,MAAM,EACN,iBAAiB,GACoB;QACrC,KAAK,EAAE,CAAC;QAwCA,WAAM,GAAG,GAAG,EAAE;YACtB,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;gBACrB,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;oBAChB,IAAI,GAAG;wBAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;;wBAC1B,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBAChD,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC;QAEiB,gBAAW,GAAG,CAAC,GAAU,EAAE,EAAE;YAC9C,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;gBAErB,MAAM,GAAG,CAAC;YACZ,CAAC;QACH,CAAC,CAAC;QArDA,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,wBAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACnC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,MAAM,GAAG,yBAAM,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,6BAAW,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,wBAAK,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;CAiBF;AAlED,wBAkEC"}
+{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/worker.ts"],"names":[],"mappings":"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"}

package/dist/cjs/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/cjs/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"}