redis-smq 8.1.0 → 8.2.0

package/dist/cjs/src/lib/consumer/message-handler-runner/message-handler-runner.js

@@ -2,134 +2,169 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageHandlerRunner = void 0;
 const redis_smq_common_1 = require("redis-smq-common");
-const index_js_1 = require("../errors/index.js");
+const index_js_1 = require("../../../config/index.js");
+const index_js_2 = require("../errors/index.js");
 const message_handler_js_1 = require("../message-handler/message-handler/message-handler.js");
 const event_bus_publisher_js_1 = require("./event-bus-publisher.js");
 class MessageHandlerRunner extends redis_smq_common_1.Runnable {
-    constructor(consumer, redisClient, logger, eventBus) {
+    constructor(consumer, redisClient, eventBus) {
         super();
         this.messageHandlerInstances = [];
         this.messageHandlers = [];
         this.runMessageHandlers = (cb) => {
+            const handlerCount = this.messageHandlers.length;
+            this.logger.info(`Starting ${handlerCount} message handler(s)`);
+            if (handlerCount === 0)
+                return cb();
             redis_smq_common_1.async.each(this.messageHandlers, (handlerParams, _, done) => {
                 this.runMessageHandler(handlerParams, done);
-            }, cb);
+            }, (err) => {
+                if (err) {
+                    this.logger.error(`Error starting message handlers: ${err.message}`);
+                }
+                else {
+                    this.logger.info(`All message handlers started`);
+                }
+                cb(err);
+            });
         };
         this.shutDownMessageHandlers = (cb) => {
-            redis_smq_common_1.async.each(this.messageHandlerInstances, (handler, queue, done) => {
-                this.shutdownMessageHandler(handler, () => done());
+            const handlerCount = this.messageHandlerInstances.length;
+            this.logger.info(`Shutting down ${handlerCount} message handler(s)`);
+            if (handlerCount === 0)
+                return cb();
+            redis_smq_common_1.async.each(this.messageHandlerInstances, (handler, _, done) => {
+                this.shutdownMessageHandler(handler, done);
             }, () => {
                 this.messageHandlerInstances = [];
+                this.logger.info('All message handlers have been shut down');
                 cb();
             });
         };
         this.consumer = consumer;
         this.redisClient = redisClient;
-        this.logger = logger;
+        this.logger = redis_smq_common_1.logger.getLogger(index_js_1.Configuration.getSetConfig().logger, this.constructor.name.toLowerCase());
+        this.logger.info(`Initializing MessageHandlerRunner with ID: ${this.id}`);
         this.eventBus = eventBus;
         if (this.eventBus) {
-            (0, event_bus_publisher_js_1.eventBusPublisher)(this, this.eventBus, logger);
+            this.logger.debug('Event bus provided, setting up event bus publisher');
+            (0, event_bus_publisher_js_1.eventBusPublisher)(this, this.eventBus, this.logger);
         }
+        this.logger.debug(`MessageHandlerRunner initialized for consumer ID: ${this.consumer.getId()}`);
     }
     getLogger() {
         return this.logger;
     }
     getMessageHandlerInstance(queue) {
-        const { queueParams, groupId } = queue;
         return this.messageHandlerInstances.find((i) => {
             const handlerQueue = i.getQueue();
-            return (handlerQueue.queueParams.name === queueParams.name &&
-                handlerQueue.queueParams.ns === queueParams.ns &&
-                handlerQueue.groupId === groupId);
+            return (handlerQueue.queueParams.name === queue.queueParams.name &&
+                handlerQueue.queueParams.ns === queue.queueParams.ns &&
+                handlerQueue.groupId === queue.groupId);
         });
     }
     getMessageHandler(queue) {
-        const { queueParams, groupId } = queue;
-        return this.messageHandlers.find((i) => i.queue.queueParams.name === queueParams.name &&
-            i.queue.queueParams.ns === queueParams.ns &&
-            i.queue.groupId === groupId);
+        return this.messageHandlers.find((i) => i.queue.queueParams.name === queue.queueParams.name &&
+            i.queue.queueParams.ns === queue.queueParams.ns &&
+            i.queue.groupId === queue.groupId);
     }
     createMessageHandlerInstance(handlerParams) {
-        const instance = new message_handler_js_1.MessageHandler(this.consumer, this.redisClient, this.logger, handlerParams, true, this.eventBus);
+        const instance = new message_handler_js_1.MessageHandler(this.consumer, this.redisClient, handlerParams, true, this.eventBus);
         instance.on('consumer.messageHandler.error', (err, consumerId, queue) => {
+            this.logger.error(`MessageHandler error from consumer ${consumerId} for queue ${JSON.stringify(queue)}: ${err.message}`);
             this.removeMessageHandler(queue, () => {
-                this.logger.error(err);
+                this.logger.error(`Error in MessageHandler: ${err.message}`, err);
             });
         });
         this.messageHandlerInstances.push(instance);
-        this.logger.info(`Created a new instance (ID: ${instance.getId()}) for MessageHandler (${JSON.stringify(handlerParams)}).`);
+        this.logger.info(`Created MessageHandler (ID: ${instance.getId()}) for queue: ${handlerParams.queue.queueParams.name}. Total: ${this.messageHandlerInstances.length}`);
         return instance;
     }
     runMessageHandler(handlerParams, cb) {
         const handler = this.createMessageHandlerInstance(handlerParams);
         handler.run((err) => {
-            if (err)
+            if (err) {
+                this.logger.error(`Failed to run message handler: ${err.message}`);
                 this.removeMessageHandler(handlerParams.queue, () => cb(err));
+            }
             else {
+                this.logger.debug(`Message handler started for queue: ${handlerParams.queue.queueParams.name}`);
                 cb();
             }
         });
     }
     shutdownMessageHandler(messageHandler, cb) {
         const queue = messageHandler.getQueue();
-        messageHandler.shutdown(() => {
+        messageHandler.shutdown((err) => {
+            if (err) {
+                this.logger.warn(`Error during message handler shutdown (ignored): ${err.message}`);
+            }
+            const beforeCount = this.messageHandlerInstances.length;
             this.messageHandlerInstances = this.messageHandlerInstances.filter((handler) => {
                 const iQueue = handler.getQueue();
                 return !(iQueue.queueParams.name === queue.queueParams.name &&
                     iQueue.queueParams.ns === queue.queueParams.ns &&
                     iQueue.groupId === queue.groupId);
             });
+            const afterCount = this.messageHandlerInstances.length;
+            this.logger.debug(`Removed ${beforeCount - afterCount} message handler instance(s). Remaining: ${afterCount}`);
             cb();
         });
     }
     goingUp() {
+        this.logger.info('MessageHandlerRunner going up');
         return super.goingUp().concat([this.runMessageHandlers]);
     }
     goingDown() {
+        this.logger.info('MessageHandlerRunner going down');
         return [this.shutDownMessageHandlers].concat(super.goingDown());
     }
     handleError(err) {
         if (this.isRunning()) {
+            this.logger.error(`MessageHandlerRunner error: ${err.message}`, err);
             this.emit('consumer.messageHandlerRunner.error', err, this.consumer.getId());
         }
         super.handleError(err);
     }
     removeMessageHandler(queue, cb) {
-        const { queueParams, groupId } = queue;
         const handler = this.getMessageHandler(queue);
-        if (!handler)
-            cb();
+        if (!handler) {
+            this.logger.debug(`No message handler found for queue: ${queue.queueParams.name}, nothing to remove`);
+            return cb();
+        }
+        const beforeCount = this.messageHandlers.length;
+        this.messageHandlers = this.messageHandlers.filter((h) => {
+            const q = h.queue;
+            return !(queue.queueParams.name === q.queueParams.name &&
+                queue.queueParams.ns === q.queueParams.ns &&
+                queue.groupId === q.groupId);
+        });
+        const afterCount = this.messageHandlers.length;
+        this.logger.info(`Message handler for queue (${queue.queueParams.name}) removed. Removed ${beforeCount - afterCount} configuration(s).`);
+        const handlerInstance = this.getMessageHandlerInstance(queue);
+        if (handlerInstance) {
+            this.shutdownMessageHandler(handlerInstance, cb);
+        }
         else {
-            this.messageHandlers = this.messageHandlers.filter((handler) => {
-                const handerQueue = handler.queue;
-                return !(queueParams.name === handerQueue.queueParams.name &&
-                    queueParams.ns === handerQueue.queueParams.ns &&
-                    groupId === handerQueue.groupId);
-            });
-            this.logger.info(`Message handler with parameters (${JSON.stringify(queue)}) has been removed.`);
-            const handlerInstance = this.getMessageHandlerInstance(queue);
-            if (handlerInstance)
-                this.shutdownMessageHandler(handlerInstance, cb);
-            else
-                cb();
+            cb();
         }
     }
     addMessageHandler(queue, messageHandler, cb) {
-        const handler = this.getMessageHandler(queue);
-        if (handler)
-            cb(new index_js_1.ConsumerConsumeMessageHandlerAlreadyExistsError());
+        if (this.getMessageHandler(queue)) {
+            this.logger.warn(`Message handler for queue ${queue.queueParams.name} already exists`);
+            return cb(new index_js_2.ConsumerConsumeMessageHandlerAlreadyExistsError());
+        }
+        const handlerParams = {
+            queue,
+            messageHandler,
+        };
+        this.messageHandlers.push(handlerParams);
+        this.logger.info(`Message handler registered for queue: ${queue.queueParams.name}. Total handlers: ${this.messageHandlers.length}`);
+        if (this.isRunning()) {
+            this.runMessageHandler(handlerParams, cb);
+        }
         else {
-            const handlerParams = {
-                queue,
-                messageHandler,
-            };
-            this.messageHandlers.push(handlerParams);
-            this.logger.info(`Message handler with parameters (${JSON.stringify(handlerParams)}) has been registered.`);
-            if (this.isRunning()) {
-                this.runMessageHandler(handlerParams, cb);
-            }
-            else
-                cb();
+            cb();
         }
     }
     getQueues() {

package/dist/cjs/src/lib/consumer/message-handler-runner/message-handler-runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"message-handler-runner.js","sourceRoot":"","sources":["../../../../../../src/lib/consumer/message-handler-runner/message-handler-runner.ts"],"names":[],"mappings":";;;AASA,uDAAuE;AAMvE,iDAAqF;AACrF,8FAAuF;AAKvF,qEAA6D;AAE7D,MAAa,oBAAqB,SAAQ,2BAA4C;IAQpF,YACE,QAAkB,EAClB,WAAwB,EACxB,MAAe,EACf,QAAyB;QAEzB,KAAK,EAAE,CAAC;QAVA,4BAAuB,GAAqB,EAAE,CAAC;QAC/C,oBAAe,GAAkC,EAAE,CAAC;QA6GpD,uBAAkB,GAAG,CAAC,EAAmB,EAAQ,EAAE;YAC3D,wBAAK,CAAC,IAAI,CACR,IAAI,CAAC,eAAe,EACpB,CAAC,aAAa,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;gBACzB,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;YAC9C,CAAC,EACD,EAAE,CACH,CAAC;QACJ,CAAC,CAAC;QAEQ,4BAAuB,GAAG,CAAC,EAAmB,EAAQ,EAAE;YAChE,wBAAK,CAAC,IAAI,CACR,IAAI,CAAC,uBAAuB,EAC5B,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;gBACvB,IAAI,CAAC,sBAAsB,CACzB,OAAO,EAEP,GAAG,EAAE,CAAC,IAAI,EAAE,CACb,CAAC;YACJ,CAAC,EACD,GAAG,EAAE;gBACH,IAAI,CAAC,uBAAuB,GAAG,EAAE,CAAC;gBAClC,EAAE,EAAE,CAAC;YACP,CAAC,CACF,CAAC;QACJ,CAAC,CAAC;QA5HA,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,IAAA,0CAAiB,EAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;IAEkB,SAAS;QAC1B,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAES,yBAAyB,CACjC,KAAyB;QAEzB,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;QACvC,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7C,MAAM,YAAY,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;YAClC,OAAO,CACL,YAAY,CAAC,WAAW,CAAC,IAAI,KAAK,WAAW,CAAC,IAAI;gBAClD,YAAY,CAAC,WAAW,CAAC,EAAE,KAAK,WAAW,CAAC,EAAE;gBAC9C,YAAY,CAAC,OAAO,KAAK,OAAO,CACjC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAES,iBAAiB,CACzB,KAAyB;QAEzB,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;QACvC,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAC9B,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,KAAK,WAAW,CAAC,IAAI;YAC7C,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,KAAK,WAAW,CAAC,EAAE;YACzC,CAAC,CAAC,KAAK,CAAC,OAAO,KAAK,OAAO,CAC9B,CAAC;IACJ,CAAC;IAES,4BAA4B,CACpC,aAA0C;QAE1C,MAAM,QAAQ,GAAG,IAAI,mCAAc,CACjC,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,MAAM,EACX,aAAa,EACb,IAAI,EACJ,IAAI,CAAC,QAAQ,CACd,CAAC;QACF,QAAQ,CAAC,EAAE,CAAC,+BAA+B,EAAE,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE;YAEtE,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,GAAG,EAAE;gBACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,+BAA+B,QAAQ,CAAC,KAAK,EAAE,yBAAyB,IAAI,CAAC,SAAS,CACpF,aAAa,CACd,IAAI,CACN,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAES,iBAAiB,CACzB,aAA0C,EAC1C,EAAmB;QAEnB,MAAM,OAAO,GAAG,IAAI,CAAC,4BAA4B,CAAC,aAAa,CAAC,CAAC;QACjE,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAClB,IAAI,GAAG;gBAAE,IAAI,CAAC,oBAAoB,CAAC,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;iBAClE,CAAC;gBACJ,EAAE,EAAE,CAAC;YACP,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAES,sBAAsB,CAC9B,cAA8B,EAC9B,EAAmB;QAEnB,MAAM,KAAK,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC;QAExC,cAAc,CAAC,QAAQ,CAAC,GAAG,EAAE;YAC3B,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAChE,CAAC,OAAO,EAAE,EAAE;gBACV,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;gBAClC,OAAO,CAAC,CACN,MAAM,CAAC,WAAW,CAAC,IAAI,KAAK,KAAK,CAAC,WAAW,CAAC,IAAI;oBAClD,MAAM,CAAC,WAAW,CAAC,EAAE,KAAK,KAAK,CAAC,WAAW,CAAC,EAAE;oBAC9C,MAAM,CAAC,OAAO,KAAK,KAAK,CAAC,OAAO,CACjC,CAAC;YACJ,CAAC,CACF,CAAC;YACF,EAAE,EAAE,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC;IA6BkB,OAAO;QACxB,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAC3D,CAAC;IAEkB,SAAS;QAC1B,OAAO,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;IAClE,CAAC;IAEkB,WAAW,CAAC,GAAU;QACvC,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YACrB,IAAI,CAAC,IAAI,CACP,qCAAqC,EACrC,GAAG,EACH,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CACtB,CAAC;QACJ,CAAC;QACD,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAED,oBAAoB,CAAC,KAAyB,EAAE,EAAmB;QACjE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;QACvC,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAC9C,IAAI,CAAC,OAAO;YAAE,EAAE,EAAE,CAAC;aACd,CAAC;YACJ,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC7D,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC;gBAClC,OAAO,CAAC,CACN,WAAW,CAAC,IAAI,KAAK,WAAW,CAAC,WAAW,CAAC,IAAI;oBACjD,WAAW,CAAC,EAAE,KAAK,WAAW,CAAC,WAAW,CAAC,EAAE;oBAC7C,OAAO,KAAK,WAAW,CAAC,OAAO,CAChC,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,oCAAoC,IAAI,CAAC,SAAS,CAChD,KAAK,CACN,qBAAqB,CACvB,CAAC;YACF,MAAM,eAAe,GAAG,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;YAC9D,IAAI,eAAe;gBAAE,IAAI,CAAC,sBAAsB,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;;gBACjE,EAAE,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;IAED,iBAAiB,CACf,KAAyB,EACzB,cAAuC,EACvC,EAAmB;QAEnB,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAC9C,IAAI,OAAO;YAAE,EAAE,CAAC,IAAI,0DAA+C,EAAE,CAAC,CAAC;aAClE,CAAC;YACJ,MAAM,aAAa,GAAG;gBACpB,KAAK;gBACL,cAAc;aACf,CAAC;YACF,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACzC,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,oCAAoC,IAAI,CAAC,SAAS,CAChD,aAAa,CACd,wBAAwB,CAC1B,CAAC;YACF,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;gBACrB,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;YAC5C,CAAC;;gBAAM,EAAE,EAAE,CAAC;QACd,CAAC;IACH,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;CACF;AAnND,oDAmNC"}
+{"version":3,"file":"message-handler-runner.js","sourceRoot":"","sources":["../../../../../../src/lib/consumer/message-handler-runner/message-handler-runner.ts"],"names":[],"mappings":"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"}

package/dist/cjs/src/lib/consumer/message-handler-runner/multiplexed-message-handler-runner.d.ts

@@ -1,4 +1,4 @@
-import { ICallback, ILogger, Timer } from 'redis-smq-common';
+import { ICallback, Timer } from 'redis-smq-common';
 import { RedisClient } from '../../../common/redis-client/redis-client.js';
 import { EventBus } from '../../event-bus/index.js';
 import { Consumer } from '../consumer/consumer.js';
@@ -8,10 +8,11 @@ import { MessageHandlerRunner } from './message-handler-runner.js';
 export declare class MultiplexedMessageHandlerRunner extends MessageHandlerRunner {
     protected timer: Timer;
     protected index: number;
-    protected activeMessageHandler: MessageHandler | null | undefined;
-    constructor(consumer: Consumer, redisClient: RedisClient, logger: ILogger, eventBus: EventBus | null);
+    protected activeMessageHandler: MessageHandler | null;
+    protected readonly tickIntervalMs: number;
+    constructor(consumer: Consumer, redisClient: RedisClient, eventBus: EventBus | null);
     protected nextTick(): void;
-    protected getNextMessageHandler(): MessageHandler | undefined;
+    protected getNextMessageHandler(): MessageHandler | null;
     protected execNextMessageHandler: () => void;
     protected createMessageHandlerInstance(handlerParams: IConsumerMessageHandlerArgs): MessageHandler;
     protected shutdownMessageHandler(messageHandler: MessageHandler, cb: ICallback<void>): void;

package/dist/cjs/src/lib/consumer/message-handler-runner/multiplexed-message-handler-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"multiplexed-message-handler-runner.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/consumer/message-handler-runner/multiplexed-message-handler-runner.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,8CAA8C,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,uDAAuD,CAAC;AAEvF,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,qBAAa,+BAAgC,SAAQ,oBAAoB;IACvE,SAAS,CAAC,KAAK,QAAC;IAChB,SAAS,CAAC,KAAK,SAAK;IACpB,SAAS,CAAC,oBAAoB,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,CAAQ;gBAGvE,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAO3B,SAAS,CAAC,QAAQ,IAAI,IAAI;IAO1B,SAAS,CAAC,qBAAqB,IAAI,cAAc,GAAG,SAAS;IAW7D,SAAS,CAAC,sBAAsB,QAAO,IAAI,CAOzC;cAEiB,4BAA4B,CAC7C,aAAa,EAAE,2BAA2B,GACzC,cAAc;cAkBE,sBAAsB,CACvC,cAAc,EAAE,cAAc,EAC9B,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,GAClB,IAAI;cASY,OAAO,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE;cAS5C,SAAS,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE;CAIlE"}
+{"version":3,"file":"multiplexed-message-handler-runner.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/consumer/message-handler-runner/multiplexed-message-handler-runner.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,8CAA8C,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,uDAAuD,CAAC;AAEvF,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAMnE,qBAAa,+BAAgC,SAAQ,oBAAoB;IACvE,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,KAAK,EAAE,MAAM,CAAK;IAC5B,SAAS,CAAC,oBAAoB,EAAE,cAAc,GAAG,IAAI,CAAQ;IAC7D,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAQ;gBAG/C,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAkB3B,SAAS,CAAC,QAAQ,IAAI,IAAI;IAoB1B,SAAS,CAAC,qBAAqB,IAAI,cAAc,GAAG,IAAI;IAsBxD,SAAS,CAAC,sBAAsB,QAAO,IAAI,CAwBzC;cAKiB,4BAA4B,CAC7C,aAAa,EAAE,2BAA2B,GACzC,cAAc;cAqBE,sBAAsB,CACvC,cAAc,EAAE,cAAc,EAC9B,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,GAClB,IAAI;cAiBY,OAAO,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE;cAc5C,SAAS,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE;CAMlE"}

package/dist/cjs/src/lib/consumer/message-handler-runner/multiplexed-message-handler-runner.js

@@ -2,64 +2,99 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MultiplexedMessageHandlerRunner = void 0;
 const redis_smq_common_1 = require("redis-smq-common");
-const multiplexed_message_handler_js_1 = require("../message-handler/multiplexed-message-handler.js");
+const multiplexed_message_handler_js_1 = require("../message-handler/message-handler/multiplexed-message-handler.js");
 const message_handler_runner_js_1 = require("./message-handler-runner.js");
 class MultiplexedMessageHandlerRunner extends message_handler_runner_js_1.MessageHandlerRunner {
-    constructor(consumer, redisClient, logger, eventBus) {
-        super(consumer, redisClient, logger, eventBus);
+    constructor(consumer, redisClient, eventBus) {
+        super(consumer, redisClient, eventBus);
         this.index = 0;
         this.activeMessageHandler = null;
+        this.tickIntervalMs = 1000;
         this.execNextMessageHandler = () => {
+            if (!this.isRunning()) {
+                this.logger.debug('execNextMessageHandler called while not running, ignoring');
+                return;
+            }
             this.activeMessageHandler = this.getNextMessageHandler();
-            if (this.activeMessageHandler && this.activeMessageHandler.isRunning()) {
-                this.activeMessageHandler.dequeue();
+            if (this.activeMessageHandler) {
+                if (this.activeMessageHandler.isRunning()) {
+                    this.logger.debug(`Triggering dequeue on active handler (ID: ${this.activeMessageHandler.getId()})`);
+                    this.activeMessageHandler.dequeue();
+                }
+                else {
+                    this.logger.debug(`Active handler (ID: ${this.activeMessageHandler.getId()}) is not running, scheduling next tick`);
+                    this.nextTick();
+                }
             }
             else {
+                this.logger.debug('No active handler available, scheduling next tick');
                 this.nextTick();
             }
         };
+        this.logger.info(`Initializing MultiplexedMessageHandlerRunner with ID: ${this.id}`);
         this.timer = new redis_smq_common_1.Timer();
-        this.timer.on('error', (err) => this.handleError(err));
+        this.timer.on('error', (err) => {
+            this.logger.error(`Timer error: ${err.message}`);
+            this.handleError(err);
+        });
+        this.logger.debug('Timer initialized and error handler registered');
     }
     nextTick() {
-        if (this.isRunning()) {
-            this.activeMessageHandler = null;
-            this.timer.setTimeout(() => this.execNextMessageHandler(), 1000);
+        if (!this.isRunning()) {
+            this.logger.debug('nextTick called while not running, ignoring');
+            return;
         }
+        this.activeMessageHandler = null;
+        this.timer.reset();
+        this.logger.debug(`Scheduling next message handler execution in ${this.tickIntervalMs}ms`);
+        this.timer.setTimeout(() => this.execNextMessageHandler(), this.tickIntervalMs);
     }
     getNextMessageHandler() {
-        if (this.index >= this.messageHandlerInstances.length) {
-            this.index = 0;
+        var _a, _b;
+        const count = this.messageHandlerInstances.length;
+        if (count === 0) {
+            this.logger.debug('No message handlers registered');
+            return null;
         }
-        const messageHandler = this.messageHandlerInstances[this.index];
-        if (this.messageHandlerInstances.length > 1) {
-            this.index += 1;
+        if (this.index >= count) {
+            this.index = 0;
         }
-        return messageHandler;
+        const handler = this.messageHandlerInstances[this.index];
+        this.logger.debug(`Selected message handler at index ${this.index} (ID: ${(_b = (_a = handler === null || handler === void 0 ? void 0 : handler.getId) === null || _a === void 0 ? void 0 : _a.call(handler)) !== null && _b !== void 0 ? _b : 'N/A'})`);
+        this.index = (this.index + 1) % count;
+        return handler;
     }
     createMessageHandlerInstance(handlerParams) {
-        const instance = new multiplexed_message_handler_js_1.MultiplexedMessageHandler(this.consumer, this.redisClient, this.logger, handlerParams, this.eventBus, this.execNextMessageHandler);
+        this.logger.debug(`Creating MultiplexedMessageHandler for queue: ${JSON.stringify(handlerParams.queue)}`);
+        const instance = new multiplexed_message_handler_js_1.MultiplexedMessageHandler(this.consumer, this.redisClient, handlerParams, this.eventBus, this.execNextMessageHandler);
         this.messageHandlerInstances.push(instance);
-        this.logger.info(`Created a new instance (ID: ${instance.getId()}) for MessageHandler (${JSON.stringify(handlerParams)}).`);
+        this.logger.info(`Created MultiplexedMessageHandler (ID: ${instance.getId()}) for queue: ${handlerParams.queue.queueParams.name}. Total: ${this.messageHandlerInstances.length}`);
         return instance;
     }
     shutdownMessageHandler(messageHandler, cb) {
+        const queue = messageHandler.getQueue();
+        this.logger.debug(`Shutting down handler (ID: ${messageHandler.getId()}) for queue: ${JSON.stringify(queue)}`);
         super.shutdownMessageHandler(messageHandler, () => {
             if (messageHandler === this.activeMessageHandler) {
+                this.logger.debug('Shut down active handler, scheduling next tick');
                 this.nextTick();
             }
             cb();
         });
     }
     goingUp() {
+        this.logger.info('MultiplexedMessageHandlerRunner going up');
         return super.goingUp().concat([
             (cb) => {
+                this.logger.debug('Starting message handler execution cycle');
                 this.execNextMessageHandler();
                 cb();
             },
         ]);
     }
     goingDown() {
+        this.logger.info('MultiplexedMessageHandlerRunner going down');
+        this.logger.debug('Resetting timer during shutdown');
         this.timer.reset();
         return super.goingDown();
     }

package/dist/cjs/src/lib/consumer/message-handler-runner/multiplexed-message-handler-runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"multiplexed-message-handler-runner.js","sourceRoot":"","sources":["../../../../../../src/lib/consumer/message-handler-runner/multiplexed-message-handler-runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"multiplexed-message-handler-runner.js","sourceRoot":"","sources":["../../../../../../src/lib/consumer/message-handler-runner/multiplexed-message-handler-runner.ts"],"names":[],"mappings":";;;AASA,uDAAoD;AAKpD,sHAA8G;AAE9G,2EAAmE;AAMnE,MAAa,+BAAgC,SAAQ,gDAAoB;IAMvE,YACE,QAAkB,EAClB,WAAwB,EACxB,QAAyB;QAEzB,KAAK,CAAC,QAAQ,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QAT/B,UAAK,GAAW,CAAC,CAAC;QAClB,yBAAoB,GAA0B,IAAI,CAAC;QAC1C,mBAAc,GAAW,IAAI,CAAC;QAiEvC,2BAAsB,GAAG,GAAS,EAAE;YAC5C,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;gBACtB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,2DAA2D,CAC5D,CAAC;gBACF,OAAO;YACT,CAAC;YACD,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACzD,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC9B,IAAI,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,EAAE,CAAC;oBAC1C,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,6CAA6C,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,GAAG,CAClF,CAAC;oBACF,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC;gBACtC,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,uBAAuB,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,wCAAwC,CACjG,CAAC;oBACF,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;gBACvE,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,CAAC;QACH,CAAC,CAAC;QAjFA,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,yDAAyD,IAAI,CAAC,EAAE,EAAE,CACnE,CAAC;QACF,IAAI,CAAC,KAAK,GAAG,IAAI,wBAAK,EAAE,CAAC;QACzB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YACjD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACtE,CAAC;IAMS,QAAQ;QAChB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;YACjE,OAAO;QACT,CAAC;QACD,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;QACjC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACnB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,gDAAgD,IAAI,CAAC,cAAc,IAAI,CACxE,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,UAAU,CACnB,GAAG,EAAE,CAAC,IAAI,CAAC,sBAAsB,EAAE,EACnC,IAAI,CAAC,cAAc,CACpB,CAAC;IACJ,CAAC;IAMS,qBAAqB;;QAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC;QAClD,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;YACpD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,IAAI,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC;YACxB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACjB,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzD,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,qCAAqC,IAAI,CAAC,KAAK,SAAS,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,uDAAI,mCAAI,KAAK,GAAG,CACvF,CAAC;QAEF,IAAI,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;QACtC,OAAO,OAAO,CAAC;IACjB,CAAC;IAmCkB,4BAA4B,CAC7C,aAA0C;QAE1C,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,iDAAiD,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CACvF,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,0DAAyB,CAC5C,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,WAAW,EAChB,aAAa,EACb,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,sBAAsB,CAC5B,CAAC;QACF,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,0CAA0C,QAAQ,CAAC,KAAK,EAAE,gBAAgB,aAAa,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,YAAY,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE,CAChK,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAKkB,sBAAsB,CACvC,cAA8B,EAC9B,EAAmB;QAEnB,MAAM,KAAK,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC;QACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,8BAA8B,cAAc,CAAC,KAAK,EAAE,gBAAgB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAC5F,CAAC;QACF,KAAK,CAAC,sBAAsB,CAAC,cAAc,EAAE,GAAG,EAAE;YAChD,IAAI,cAAc,KAAK,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBACjD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;gBACpE,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,CAAC;YACD,EAAE,EAAE,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC;IAKkB,OAAO;QACxB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;QAC7D,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC;YAC5B,CAAC,EAAmB,EAAE,EAAE;gBACtB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;gBAC9D,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAC9B,EAAE,EAAE,CAAC;YACP,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAKkB,SAAS;QAC1B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;QAC/D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACrD,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,KAAK,CAAC,SAAS,EAAE,CAAC;IAC3B,CAAC;CACF;AAjKD,0EAiKC"}

package/dist/cjs/src/lib/consumer/types/index.d.ts

@@ -1,4 +1,4 @@
 export * from './message-handler.js';
 export * from './consumer-heartbeat.js';
-export * from '../message-handler/processing-queue/types/index.js';
+export * from '../message-handler/message-handler/consume-message/types/index.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/cjs/src/lib/consumer/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/consumer/types/index.ts"],"names":[],"mappings":"AASA,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oDAAoD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/consumer/types/index.ts"],"names":[],"mappings":"AASA,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mEAAmE,CAAC"}

package/dist/cjs/src/lib/consumer/types/index.js

@@ -16,5 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./message-handler.js"), exports);
 __exportStar(require("./consumer-heartbeat.js"), exports);
-__exportStar(require("../message-handler/processing-queue/types/index.js"), exports);
+__exportStar(require("../message-handler/message-handler/consume-message/types/index.js"), exports);
 //# sourceMappingURL=index.js.map

package/dist/cjs/src/lib/consumer/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/lib/consumer/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AASA,uDAAqC;AACrC,0DAAwC;AACxC,qFAAmE"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/lib/consumer/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AASA,uDAAqC;AACrC,0DAAwC;AACxC,oGAAkF"}

package/dist/cjs/src/lib/consumer/workers/delay-unacknowledged.worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delay-unacknowledged.worker.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/delay-unacknowledged.worker.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,SAAS,EAEV,MAAM,kBAAkB,CAAC;AAS1B,OAAO,EAAE,oCAAoC,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,cAAM,yBAA0B,SAAQ,MAAM;IAC5C,IAAI,OAAQ,SAAS,CAAC,IAAI,CAAC,KAAG,IAAI,CA6EhC;CACH;kCAEwB,oCAAoC;AAA7D,wBACyC"}
+{"version":3,"file":"delay-unacknowledged.worker.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/delay-unacknowledged.worker.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,SAAS,EAEV,MAAM,kBAAkB,CAAC;AAS1B,OAAO,EAAE,oCAAoC,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,cAAM,yBAA0B,SAAQ,MAAM;IAC5C,IAAI,OAAQ,SAAS,CAAC,IAAI,CAAC,KAAG,IAAI,CAuJhC;CACH;kCAEwB,oCAAoC;AAA7D,wBACyC"}

package/dist/cjs/src/lib/consumer/workers/delay-unacknowledged.worker.js

@@ -11,17 +11,24 @@ class DelayUnacknowledgedWorker extends worker_js_1.Worker {
     constructor() {
         super(...arguments);
         this.work = (cb) => {
+            this.logger.debug('Starting DelayUnacknowledgedWorker work cycle');
             const { keyQueueDelayed, keyQueueScheduled, keyQueueProperties, keyQueueMessages, } = redis_keys_js_1.redisKeys.getQueueKeys(this.queueParsedParams.queueParams, this.queueParsedParams.groupId);
+            this.logger.debug(`Working with queue: ${this.queueParsedParams.queueParams.name}, group: ${this.queueParsedParams.groupId || 'none'}`);
             const redisClient = this.redisClient.getInstance();
             if (redisClient instanceof Error) {
+                this.logger.error('Failed to get Redis client instance', redisClient);
                 cb(redisClient);
                 return void 0;
             }
+            this.logger.debug(`Fetching delayed messages from ${keyQueueDelayed}`);
             redisClient.lrange(keyQueueDelayed, 0, 9, (err, reply) => {
-                if (err)
+                if (err) {
+                    this.logger.error('Error fetching delayed messages', err);
                     cb(err);
+                }
                 else {
                     const messageIds = reply !== null && reply !== void 0 ? reply : [];
+                    this.logger.debug(`Found ${messageIds.length} delayed messages to process`);
                     if (messageIds.length) {
                         const keys = [];
                         const args = [
@@ -33,45 +40,69 @@ class DelayUnacknowledgedWorker extends worker_js_1.Worker {
                             index_js_1.EMessageProperty.STATE,
                             '1',
                         ];
+                        this.logger.debug('Processing delayed messages batch');
                         redis_smq_common_1.async.each(messageIds, (messageId, _, done) => {
+                            this.logger.debug(`Processing delayed message: ${messageId}`);
                             (0, _get_message_js_1._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 redis_smq_common_1.CallbackEmptyReplyError());
+                                }
                                 else {
                                     const messageId = message.getId();
+                                    this.logger.debug(`Preparing message ${messageId} for scheduling`);
                                     const { keyMessage } = redis_keys_js_1.redisKeys.getMessageKeys(messageId);
                                     keys.push(keyQueueMessages, keyQueueProperties, keyMessage, keyQueueScheduled, keyQueueDelayed);
                                     args.push(messageId, '');
                                     const delay = message.producibleMessage.getRetryDelay();
+                                    this.logger.debug(`Message ${messageId} retry delay: ${delay}ms`);
                                     const messageState = message.getMessageState();
+                                    const previousAttempts = messageState.getAttempts();
                                     messageState.incrAttempts();
                                     messageState.setNextRetryDelay(delay);
+                                    this.logger.debug(`Message ${messageId} attempts incremented from ${previousAttempts} to ${messageState.getAttempts()}`);
                                     const timestamp = message.getNextScheduledTimestamp();
+                                    this.logger.debug(`Message ${messageId} scheduled for timestamp: ${timestamp}`);
                                     args.push(timestamp, JSON.stringify(messageState));
                                     done();
                                 }
                             });
                         }, (err) => {
-                            if (err)
+                            if (err) {
+                                this.logger.error('Error processing delayed messages batch', err);
                                 cb(err);
+                            }
                             else {
+                                this.logger.debug('Running SCHEDULE_MESSAGE script for delayed messages');
                                 redisClient.runScript(scripts_js_1.ELuaScriptName.SCHEDULE_MESSAGE, keys, args, (err, reply) => {
-                                    if (err)
+                                    if (err) {
+                                        this.logger.error('Error running SCHEDULE_MESSAGE script', err);
                                         cb(err);
-                                    else if (!reply)
+                                    }
+                                    else if (!reply) {
+                                        this.logger.error('Empty reply from SCHEDULE_MESSAGE script');
                                         cb(new redis_smq_common_1.CallbackEmptyReplyError());
-                                    else if (reply !== 'OK')
+                                    }
+                                    else if (reply !== 'OK') {
+                                        this.logger.error(`Unexpected reply from SCHEDULE_MESSAGE script: ${reply}`);
                                         cb(new redis_smq_common_1.PanicError(String(reply)));
-                                    else
+                                    }
+                                    else {
+                                        this.logger.debug('Successfully scheduled delayed messages');
                                         cb();
+                                    }
                                 });
                             }
                         });
                     }
-                    else
+                    else {
+                        this.logger.debug('No delayed messages to process');
                         cb();
+                    }
                 }
             });
         };

package/dist/cjs/src/lib/consumer/workers/delay-unacknowledged.worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"delay-unacknowledged.worker.js","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/delay-unacknowledged.worker.ts"],"names":[],"mappings":";;AASA,uDAK0B;AAC1B,gFAAiF;AACjF,4EAAqE;AACrE,qEAA8D;AAC9D,qDAGgC;AAChC,mDAAsD;AAEtD,2CAAqC;AAErC,MAAM,yBAA0B,SAAQ,kBAAM;IAA9C;;QACE,SAAI,GAAG,CAAC,EAAmB,EAAQ,EAAE;YACnC,MAAM,EACJ,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,GACjB,GAAG,yBAAS,CAAC,YAAY,CACxB,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,eAAe,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACvD,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,EAAE,CAAC;wBAC1B,MAAM,IAAI,GAAwB;4BAChC,yBAAc,CAAC,UAAU;4BACzB,yBAAc,CAAC,cAAc;4BAC7B,2BAAgB,CAAC,OAAO;4BACxB,2BAAgB,CAAC,MAAM;4BACvB,iCAAsB,CAAC,SAAS;4BAChC,2BAAgB,CAAC,KAAK;4BACtB,GAAG;yBACJ,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,EAAE,UAAU,EAAE,GAAG,yBAAS,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;oCAC3D,IAAI,CAAC,IAAI,CACP,gBAAgB,EAChB,kBAAkB,EAClB,UAAU,EACV,iBAAiB,EACjB,eAAe,CAChB,CAAC;oCACF,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;oCACzB,MAAM,KAAK,GAAG,OAAO,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC;oCACxD,MAAM,YAAY,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;oCAC/C,YAAY,CAAC,YAAY,EAAE,CAAC;oCAC5B,YAAY,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;oCACtC,MAAM,SAAS,GAAG,OAAO,CAAC,yBAAyB,EAAE,CAAC;oCACtD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;oCACnD,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,gBAAgB,EAC/B,IAAI,EACJ,IAAI,EACJ,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;oCACb,IAAI,GAAG;wCAAE,EAAE,CAAC,GAAG,CAAC,CAAC;yCACZ,IAAI,CAAC,KAAK;wCAAE,EAAE,CAAC,IAAI,0CAAuB,EAAE,CAAC,CAAC;yCAC9C,IAAI,KAAK,KAAK,IAAI;wCAAE,EAAE,CAAC,IAAI,6BAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;;wCACtD,EAAE,EAAE,CAAC;gCACZ,CAAC,CACF,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,yBAAyB,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"delay-unacknowledged.worker.js","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/delay-unacknowledged.worker.ts"],"names":[],"mappings":"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"}

package/dist/cjs/src/lib/consumer/workers/publish-scheduled.worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publish-scheduled.worker.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/publish-scheduled.worker.ts"],"names":[],"mappings":"AASA,OAAO,EAAS,SAAS,EAAc,MAAM,kBAAkB,CAAC;AAShE,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAGpE,OAAO,EAAE,oCAAoC,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,cAAM,sBAAuB,SAAQ,MAAM;IACzC,IAAI,OAAQ,SAAS,CAAC,IAAI,CAAC,KAAG,IAAI,CAKhC;IAEF,SAAS,CAAC,eAAe,OAAQ,SAAS,CAAC,MAAM,EAAE,CAAC,KAAG,IAAI,CAWzD;IAEF,SAAS,CAAC,aAAa,QAChB,MAAM,EAAE,MACT,SAAS,CAAC,eAAe,EAAE,CAAC,KAC/B,IAAI,CAQL;IAEF,SAAS,CAAC,eAAe,aACb,eAAe,EAAE,MACvB,SAAS,CAAC,IAAI,CAAC,KAClB,IAAI,CAgGL;CACH;kCAEwB,oCAAoC;AAA7D,wBACsC"}
+{"version":3,"file":"publish-scheduled.worker.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/consumer/workers/publish-scheduled.worker.ts"],"names":[],"mappings":"AASA,OAAO,EAAS,SAAS,EAAc,MAAM,kBAAkB,CAAC;AAShE,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAGpE,OAAO,EAAE,oCAAoC,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,cAAM,sBAAuB,SAAQ,MAAM;IACzC,IAAI,OAAQ,SAAS,CAAC,IAAI,CAAC,KAAG,IAAI,CAoBhC;IAEF,SAAS,CAAC,eAAe,OAAQ,SAAS,CAAC,MAAM,EAAE,CAAC,KAAG,IAAI,CAqCzD;IAEF,SAAS,CAAC,aAAa,QAChB,MAAM,EAAE,MACT,SAAS,CAAC,eAAe,EAAE,CAAC,KAC/B,IAAI,CA0BL;IAEF,SAAS,CAAC,eAAe,aACb,eAAe,EAAE,MACvB,SAAS,CAAC,IAAI,CAAC,KAClB,IAAI,CAmJL;CACH;kCAEwB,oCAAoC;AAA7D,wBACsC"}