redis-smq 8.0.0-rc.12 → 8.0.0-rc.14

package/CHANGELOG.md

@@ -1,5 +1,48 @@
 
 
+## [8.0.0-rc.14](https://github.com/weyoss/redis-smq/compare/v8.0.0-rc.13...v8.0.0-rc.14) (2024-01-03)
+
+
+### Documentation
+
+* add new diagrams and update existing ones ([f5182b1](https://github.com/weyoss/redis-smq/commit/f5182b10b5179365edf68e7b6bf564ccc25281ab))
+* **event-listeners:** add a link to IRedisSMQConfig interface ([a7635c5](https://github.com/weyoss/redis-smq/commit/a7635c5d811ad775123547a5696c78b030981269))
+* scale down diagrams ([c3b37e4](https://github.com/weyoss/redis-smq/commit/c3b37e445a6d15fdcc8c7a73b713a1f7d5e7c94e))
+* update exchange diagrams ([9dc05d6](https://github.com/weyoss/redis-smq/commit/9dc05d6cd835d779b9d183e83f562c7991105c92))
+
+
+### Codebase Refactoring
+
+* **event-listeners:** clean up ([d9195e4](https://github.com/weyoss/redis-smq/commit/d9195e4e85e2e4519d238f5f3ecace37ae9bbb32))
+* **exchanges:** improve typings ([97665fe](https://github.com/weyoss/redis-smq/commit/97665fed4a579af444c46e01a6b05f9adb12e888))
+* **message:** handle various errors when deleting a message ([a4505ae](https://github.com/weyoss/redis-smq/commit/a4505ae7d95bda0185da28433c6737e395400e7b))
+
+
+### Tests
+
+* **message:** handle various errors when deleting a message ([ecf301b](https://github.com/weyoss/redis-smq/commit/ecf301b06aac1bf6d0fcb1ced962a32ac6a6ca68))
+
+## [8.0.0-rc.13](https://github.com/weyoss/redis-smq/compare/v8.0.0-rc.12...v8.0.0-rc.13) (2023-12-23)
+
+
+### ⚠ BREAKING CHANGES
+
+* **event-listeners:** unify consumer/producer event listeners
+
+### Documentation
+
+* **event-listeners:** update documentation ([71100d3](https://github.com/weyoss/redis-smq/commit/71100d3aa94a61fb8ece86e439f0b120b66a6cab))
+
+
+### Codebase Refactoring
+
+* **event-listeners:** unify consumer/producer event listeners ([9e1a181](https://github.com/weyoss/redis-smq/commit/9e1a1811dd841d4329f0ee14e979d2770a7a6358))
+
+
+### Tests
+
+* **event-listeners:** unify consumer/producer event listeners ([2d14a07](https://github.com/weyoss/redis-smq/commit/2d14a077feda98933fb6c038bea5a33ad8d5f610))
+
 ## [8.0.0-rc.12](https://github.com/weyoss/redis-smq/compare/v8.0.0-rc.11...v8.0.0-rc.12) (2023-12-18)
 
 

package/README.md

@@ -1,6 +1,6 @@
 <div align="center" style="text-align: center">
   <p><a href="https://github.com/weyoss/redis-smq"><img alt="RedisSMQ" src="./logo.png?v=202312182134" /></a></p>
-  <p>A simple high-performance Redis message queue for Node.js.</p>
+  <p style='color: #d82c20'>A simple high-performance Redis message queue for Node.js.</p>
 </div>
 
 # RedisSMQ
@@ -35,7 +35,7 @@ RedisSMQ is a Node.js library for queuing messages (aka jobs) and processing the
 
 &nbsp;
 
-![RedisSMQ Overview](docs/redis-smq-overview.png)
+![RedisSMQ Multi-Queue Producers & Multi-Queue Consumers](docs/redis-smq-multi-queue-consumers-producers.png)
 
 ## What's new?
 

package/dist/index.cjs

@@ -339,14 +339,10 @@ function Messages(userConfig) {
 }
 
 // src/config/event-listeners/event-listeners.ts
-var import_lodash4 = require("lodash");
-var defaultConfig4 = {
-  consumerEventListeners: [],
-  producerEventListeners: []
-};
+var defaultConfig4 = [];
 function EventListeners(userConfig) {
-  const { eventListeners = {} } = userConfig;
-  return (0, import_lodash4.merge)({}, defaultConfig4, eventListeners);
+  const { eventListeners = [] } = userConfig;
+  return [...defaultConfig4, ...eventListeners];
 }
 
 // src/config/configuration.ts
@@ -408,11 +404,11 @@ function _destroyCommonRedisClient(cb) {
 }
 
 // types/consumer/consume-message.ts
-var EConsumeMessageDeadLetterCause = /* @__PURE__ */ ((EConsumeMessageDeadLetterCause3) => {
-  EConsumeMessageDeadLetterCause3[EConsumeMessageDeadLetterCause3["TTL_EXPIRED"] = 0] = "TTL_EXPIRED";
-  EConsumeMessageDeadLetterCause3[EConsumeMessageDeadLetterCause3["RETRY_THRESHOLD_EXCEEDED"] = 1] = "RETRY_THRESHOLD_EXCEEDED";
-  EConsumeMessageDeadLetterCause3[EConsumeMessageDeadLetterCause3["PERIODIC_MESSAGE"] = 2] = "PERIODIC_MESSAGE";
-  return EConsumeMessageDeadLetterCause3;
+var EConsumeMessageDeadLetterCause = /* @__PURE__ */ ((EConsumeMessageDeadLetterCause2) => {
+  EConsumeMessageDeadLetterCause2[EConsumeMessageDeadLetterCause2["TTL_EXPIRED"] = 0] = "TTL_EXPIRED";
+  EConsumeMessageDeadLetterCause2[EConsumeMessageDeadLetterCause2["RETRY_THRESHOLD_EXCEEDED"] = 1] = "RETRY_THRESHOLD_EXCEEDED";
+  EConsumeMessageDeadLetterCause2[EConsumeMessageDeadLetterCause2["PERIODIC_MESSAGE"] = 2] = "PERIODIC_MESSAGE";
+  return EConsumeMessageDeadLetterCause2;
 })(EConsumeMessageDeadLetterCause || {});
 var EConsumeMessageUnacknowledgedCause = /* @__PURE__ */ ((EConsumeMessageUnacknowledgedCause3) => {
   EConsumeMessageUnacknowledgedCause3[EConsumeMessageUnacknowledgedCause3["TIMEOUT"] = 0] = "TIMEOUT";
@@ -424,7 +420,7 @@ var EConsumeMessageUnacknowledgedCause = /* @__PURE__ */ ((EConsumeMessageUnackn
   return EConsumeMessageUnacknowledgedCause3;
 })(EConsumeMessageUnacknowledgedCause || {});
 
-// types/exchange/exchange.ts
+// types/exchange/common.ts
 var EExchangeType = /* @__PURE__ */ ((EExchangeType2) => {
   EExchangeType2[EExchangeType2["DIRECT"] = 0] = "DIRECT";
   EExchangeType2[EExchangeType2["FANOUT"] = 1] = "FANOUT";
@@ -788,6 +784,10 @@ var Base = class extends import_redis_smq_common11.EventEmitter {
       } else
         cb();
     };
+    this.initEventListeners = (cb) => {
+      const { eventListeners } = Configuration.getSetConfig();
+      this.registerEventListeners(eventListeners, cb);
+    };
     this.tearDownEventListeners = (cb) => {
       import_redis_smq_common11.async.each(
         this.eventListeners,
@@ -818,7 +818,7 @@ var Base = class extends import_redis_smq_common11.EventEmitter {
     this.on("error", (err) => this.handleError(err));
   }
   goingUp() {
-    return [this.setUpSharedRedisClient];
+    return [this.setUpSharedRedisClient, this.initEventListeners];
   }
   up(cb) {
     this.powerSwitch.commit();
@@ -843,24 +843,21 @@ var Base = class extends import_redis_smq_common11.EventEmitter {
       Ctors,
       (ctor, key, done) => {
         const instance = new ctor();
-        instance.init(
-          {
-            instanceId: this.id,
-            eventProvider: this
-          },
-          (err) => {
-            if (err)
-              done(err);
-            else {
-              this.eventListeners.push(instance);
-              done();
-            }
+        instance.init((err) => {
+          if (err)
+            done(err);
+          else {
+            this.eventListeners.push(instance);
+            done();
           }
-        );
+        });
       },
       cb
     );
   }
+  hasEventListeners() {
+    return !!Configuration.getSetConfig().eventListeners.length;
+  }
   handleError(err) {
     if (this.powerSwitch.isGoingUp() || this.powerSwitch.isRunning()) {
       throw err;
@@ -2931,20 +2928,20 @@ var ConsumeMessage = class {
           const consumerId = this.messageHandler.getConsumerId();
           this.messageHandler.emit(
             "messageUnacknowledged",
-            cause,
             messageId,
             queue,
             messageHandlerId,
-            consumerId
+            consumerId,
+            cause
           );
           if (reply.action === 0 /* DEAD_LETTER */) {
             this.messageHandler.emit(
               "messageDeadLettered",
-              reply.deadLetterCause,
               messageId,
               queue,
               messageHandlerId,
-              consumerId
+              consumerId,
+              reply.deadLetterCause
             );
           } else if (reply.action === 2 /* DELAY */) {
             this.messageHandler.emit(
@@ -3065,7 +3062,7 @@ var MessageHandler = class extends import_redis_smq_common27.EventEmitter {
     });
     this.on(
       "messageDeadLettered",
-      (cause, messageId) => {
+      (messageId, queue, messageHandlerId, consumerId, cause) => {
         this.logger.info(
           `Message (ID ${messageId}) dead-lettered (cause ${cause})`
         );
@@ -3073,7 +3070,7 @@ var MessageHandler = class extends import_redis_smq_common27.EventEmitter {
     );
     this.on(
       "messageUnacknowledged",
-      (cause, messageId) => {
+      (messageId, queue, messageHandlerId, consumerId, cause) => {
         this.logger.info(
           `Message (ID ${messageId}) unacknowledged (cause ${cause})`
         );
@@ -3940,12 +3937,6 @@ var Consumer = class extends Base {
       this.workerRunner.addWorker(new publish_scheduled_worker_default(redisClient2, true));
       this.workerRunner.run();
     };
-    this.initConsumerEventListeners = (cb) => {
-      this.registerEventListeners(
-        Configuration.getSetConfig().eventListeners.consumerEventListeners,
-        cb
-      );
-    };
     this.tearDownConsumerWorkers = (cb) => {
       if (this.workerRunner) {
         this.workerRunner.quit(() => {
@@ -3972,10 +3963,29 @@ var Consumer = class extends Base {
     this.messageHandlerRunner = useMultiplexing ? new MultiplexedMessageHandlerRunner(this, nsLogger) : new MessageHandlerRunner(this, nsLogger);
     this.redisKeys = redisKeys.getConsumerKeys(this.getId());
   }
+  registerSystemEventListeners() {
+    super.registerSystemEventListeners();
+    if (this.hasEventListeners()) {
+      this.on("messageAcknowledged", (...args) => {
+        this.eventListeners.forEach(
+          (i) => i.emit("messageAcknowledged", ...args)
+        );
+      });
+      this.on("messageUnacknowledged", (...args) => {
+        this.eventListeners.forEach(
+          (i) => i.emit("messageUnacknowledged", ...args)
+        );
+      });
+      this.on("messageDeadLettered", (...args) => {
+        this.eventListeners.forEach(
+          (i) => i.emit("messageDeadLettered", ...args)
+        );
+      });
+    }
+  }
   goingUp() {
     return super.goingUp().concat([
       this.setUpHeartbeat,
-      this.initConsumerEventListeners,
       this.runMessageHandlers,
       this.setUpConsumerWorkers
     ]);
@@ -4061,17 +4071,13 @@ function _scheduleMessage(mixed, message, cb) {
 
 // src/lib/producer/producer.ts
 var Producer = class extends Base {
-  constructor() {
-    super(...arguments);
-    this.initProducerEventListeners = (cb) => {
-      this.registerEventListeners(
-        Configuration.getSetConfig().eventListeners.producerEventListeners,
-        cb
-      );
-    };
-  }
-  goingUp() {
-    return super.goingUp().concat([this.initProducerEventListeners]);
+  registerSystemEventListeners() {
+    super.registerSystemEventListeners();
+    if (this.hasEventListeners()) {
+      this.on("messagePublished", (...args) => {
+        this.eventListeners.forEach((i) => i.emit("messagePublished", ...args));
+      });
+    }
   }
   enqueue(redisClient2, queue, message, cb) {
     var _a;
@@ -4141,7 +4147,7 @@ var Producer = class extends Base {
           cb(err);
         else {
           this.logger.info(`Message (ID ${messageId}) has been published.`);
-          this.emit("messagePublished", messageId, queue);
+          this.emit("messagePublished", messageId, queue, this.id);
           cb(null, messageId);
         }
       });

package/dist/index.d.cts

@@ -387,60 +387,84 @@ declare enum EConsumeMessageUnacknowledgedCause {
 
 type TRedisSMQEvent = TEvent & {
     heartbeatTick: (timestamp: number, consumerId: string, heartbeatPayload: IConsumerHeartbeat) => void;
-    messagePublished: (messageId: string, queue: IQueueParams) => void;
+    messagePublished: (messageId: string, queue: IQueueParams, producerId: string) => void;
     messageAcknowledged: (messageId: string, queue: IQueueParams, messageHandlerId: string, consumerId: string) => void;
-    messageUnacknowledged: (cause: EConsumeMessageUnacknowledgedCause, messageId: string, queue: IQueueParams, messageHandlerId: string, consumerId: string) => void;
-    messageDeadLettered: (cause: EConsumeMessageDeadLetterCause, messageId: string, queue: IQueueParams, messageHandlerId: string, consumerId: string) => void;
+    messageUnacknowledged: (messageId: string, queue: IQueueParams, messageHandlerId: string, consumerId: string, cause: EConsumeMessageUnacknowledgedCause) => void;
+    messageDeadLettered: (messageId: string, queue: IQueueParams, messageHandlerId: string, consumerId: string, cause: EConsumeMessageDeadLetterCause) => void;
     messageReceived: (messageId: string, queue: IQueueParams, consumerId: string) => void;
     messageRequeued: (messageId: string, queue: IQueueParams, messageHandlerId: string, consumerId: string) => void;
     messageDelayed: (messageId: string, queue: IQueueParams, messageHandlerId: string, consumerId: string) => void;
 };
 
-type TEventListenerInitArgs = {
-    eventProvider: EventEmitter<TRedisSMQEvent>;
-    instanceId: string;
-};
-interface IEventListener {
-    init(args: TEventListenerInitArgs, cb: ICallback<void>): void;
+interface IEventListener extends EventEmitter<TRedisSMQEvent> {
+    init(cb: ICallback<void>): void;
     quit(cb: ICallback<void>): void;
 }
 
-interface IEventListenersConfig {
-    consumerEventListeners?: (new () => IEventListener)[];
-    producerEventListeners?: (new () => IEventListener)[];
+type TEventListenersConfig = (new () => IEventListener)[];
+
+declare abstract class Exchange<TBindingParams, ExchangeType extends EExchangeType> implements IExchange<TBindingParams, ExchangeType> {
+    readonly type: ExchangeType;
+    readonly bindingParams: TBindingParams;
+    exchangeTag: string;
+    protected constructor(bindingParams: TBindingParams, type: ExchangeType);
+    protected generateExchangeTag(): string;
+    getBindingParams(): TBindingParams;
+    toJSON(): IExchangeSerialized<TBindingParams, ExchangeType>;
+    fromJSON(JSON: Partial<IExchangeSerialized<TBindingParams, ExchangeType>>): void;
+    protected abstract validateBindingParams(bindingParams: TBindingParams): TBindingParams;
+    abstract getQueues(cb: ICallback<IQueueParams[]>): void;
+}
+
+declare class ExchangeDirect extends Exchange<TExchangeDirectBindingParams, EExchangeType.DIRECT> {
+    constructor(queue: TExchangeDirectBindingParams);
+    protected validateBindingParams(queue: TExchangeDirectBindingParams): IQueueParams;
+    getQueues(cb: ICallback<IQueueParams[]>): void;
+}
+
+declare class ExchangeTopic extends Exchange<TExchangeTopicBindingParams, EExchangeType.TOPIC> {
+    constructor(topic: TExchangeTopicBindingParams);
+    protected validateBindingParams(topicParams: TExchangeTopicBindingParams): TTopicParams;
+    getQueues(cb: ICallback<IQueueParams[]>): void;
+}
+
+declare class ExchangeFanOut extends Exchange<TExchangeFanOutBindingParams, EExchangeType.FANOUT> {
+    constructor(fanOutName: TExchangeFanOutBindingParams);
+    protected validateBindingParams(bindingParams: TExchangeFanOutBindingParams): string;
+    getQueues(cb: ICallback<IQueueParams[]>): void;
+    saveExchange(cb: ICallback<void>): void;
+    deleteExchange(cb: ICallback<void>): void;
+    bindQueue(queue: IQueueParams | string, cb: ICallback<void>): void;
+    unbindQueue(queue: IQueueParams | string, cb: ICallback<void>): void;
+    static getAllExchanges(cb: ICallback<string[]>): void;
+    static getQueueExchange(queue: IQueueParams | string, cb: ICallback<ExchangeFanOut | null>): void;
 }
-type IEventListenersConfigRequired = Required<IEventListenersConfig>;
 
-type TTopicParams = {
-    topic: string;
-    ns: string;
-};
 declare enum EExchangeType {
     DIRECT = 0,
     FANOUT = 1,
     TOPIC = 2
 }
+type TTopicParams = {
+    topic: string;
+    ns: string;
+};
 type TExchangeDirectBindingParams = IQueueParams | string;
-type TExchangeFanOutBindingParams = string;
 type TExchangeTopicBindingParams = TTopicParams | string;
-interface IExchange<BindingParams, ExchangeType extends EExchangeType> extends IExchangeSerialized<BindingParams, ExchangeType> {
-    toJSON(): IExchangeSerialized<BindingParams, ExchangeType>;
-    getQueues(cb: ICallback<IQueueParams[]>): void;
-    getBindingParams(): BindingParams;
-}
+type TExchangeFanOutBindingParams = string;
+type TExchange = ExchangeDirect | ExchangeTopic | ExchangeFanOut;
+type TExchangeSerialized = ReturnType<ExchangeDirect['toJSON']> | ReturnType<ExchangeTopic['toJSON']> | ReturnType<ExchangeFanOut['toJSON']>;
+
 interface IExchangeSerialized<BindingParams, ExchangeType extends EExchangeType> {
     readonly type: ExchangeType;
     readonly bindingParams: BindingParams;
     readonly exchangeTag: string;
 }
-type TExchangeDirectSerialized = IExchangeSerialized<TExchangeDirectBindingParams, EExchangeType.DIRECT>;
-type TExchangeTopicSerialized = IExchangeSerialized<TExchangeTopicBindingParams, EExchangeType.TOPIC>;
-type TExchangeFanOutSerialized = IExchangeSerialized<TExchangeFanOutBindingParams, EExchangeType.FANOUT>;
-type TExchangeDirect = IExchange<TExchangeDirectBindingParams, EExchangeType.DIRECT>;
-type TExchangeTopic = IExchange<TExchangeTopicBindingParams, EExchangeType.TOPIC>;
-type TExchangeFanOut = IExchange<TExchangeFanOutBindingParams, EExchangeType.FANOUT>;
-type TExchange = TExchangeDirect | TExchangeTopic | TExchangeFanOut;
-type TExchangeSerialized = TExchangeDirectSerialized | TExchangeTopicSerialized | TExchangeFanOutSerialized;
+interface IExchange<BindingParams, ExchangeType extends EExchangeType> extends IExchangeSerialized<BindingParams, ExchangeType> {
+    toJSON(): IExchangeSerialized<BindingParams, ExchangeType>;
+    getQueues(cb: ICallback<IQueueParams[]>): void;
+    getBindingParams(): BindingParams;
+}
 
 interface IQueueMessages {
     countMessages(queue: string | IQueueParams, cb: ICallback<number>): void;
@@ -470,13 +494,12 @@ interface IRedisSMQConfig {
     namespace?: string;
     logger?: ILoggerConfig;
     messages?: IMessagesConfig;
-    eventListeners?: IEventListenersConfig;
+    eventListeners?: TEventListenersConfig;
 }
 interface IRedisSMQConfigRequired extends Required<IRedisSMQConfig> {
     messages: {
         store: IMessagesConfigStorageRequired;
     };
-    eventListeners: IEventListenersConfigRequired;
 }
 
 declare class ConsumerError extends RedisSMQError {
@@ -587,6 +610,7 @@ declare abstract class Base extends EventEmitter<TRedisSMQEvent> {
     constructor();
     protected setUpSharedRedisClient: (cb: ICallback<void>) => void;
     protected tearDownSharedRedisClient: (cb: ICallback<void>) => void;
+    protected initEventListeners: (cb: ICallback<void>) => void;
     protected registerSystemEventListeners(): void;
     protected goingUp(): TFunction[];
     protected up(cb?: ICallback<boolean>): void;
@@ -595,6 +619,7 @@ declare abstract class Base extends EventEmitter<TRedisSMQEvent> {
     protected getSharedRedisClient(): RedisClient;
     protected registerEventListeners(Ctors: (new () => IEventListener)[], cb: ICallback<void>): void;
     protected tearDownEventListeners: (cb: ICallback<void>) => void;
+    protected hasEventListeners(): boolean;
     handleError(err: Error): void;
     run(cb?: ICallback<boolean>): void;
     shutdown(cb?: ICallback<boolean>): void;
@@ -696,10 +721,10 @@ declare class Consumer extends Base {
     protected heartbeat: ConsumerHeartbeat | null;
     protected workerRunner: WorkerRunner | null;
     constructor(useMultiplexing?: boolean);
+    protected registerSystemEventListeners(): void;
     protected setUpHeartbeat: (cb: ICallback<void>) => void;
     protected tearDownHeartbeat: (cb: ICallback<void>) => void;
     protected setUpConsumerWorkers: (cb: ICallback<void>) => void;
-    protected initConsumerEventListeners: (cb: ICallback<void>) => void;
     protected tearDownConsumerWorkers: (cb: ICallback<void>) => void;
     protected runMessageHandlers: (cb: ICallback<void>) => void;
     protected shutdownMessageHandlers: (cb: ICallback<void>) => void;
@@ -711,8 +736,7 @@ declare class Consumer extends Base {
 }
 
 declare class Producer extends Base {
-    protected initProducerEventListeners: (cb: ICallback<void>) => void;
-    protected goingUp(): TUnaryFunction<ICallback<void>>[];
+    protected registerSystemEventListeners(): void;
     protected enqueue(redisClient: RedisClient, queue: IQueueParams, message: MessageEnvelope, cb: ICallback<void>): void;
     protected produceMessage(redisClient: RedisClient, message: MessageEnvelope, queue: IQueueParams, cb: ICallback<string>): void;
     produce(msg: ProducibleMessage, cb: ICallback<string[]>): void;
@@ -727,43 +751,6 @@ declare class Message {
     deleteMessageById(id: string, cb: ICallback<void>): void;
 }
 
-declare abstract class Exchange<TBindingParams, ExchangeType extends EExchangeType> implements IExchange<TBindingParams, ExchangeType> {
-    readonly type: ExchangeType;
-    readonly bindingParams: TBindingParams;
-    exchangeTag: string;
-    protected constructor(bindingParams: TBindingParams, type: ExchangeType);
-    protected generateExchangeTag(): string;
-    getBindingParams(): TBindingParams;
-    toJSON(): IExchangeSerialized<TBindingParams, ExchangeType>;
-    fromJSON(JSON: Partial<IExchangeSerialized<TBindingParams, ExchangeType>>): void;
-    protected abstract validateBindingParams(bindingParams: TBindingParams): TBindingParams;
-    abstract getQueues(cb: ICallback<IQueueParams[]>): void;
-}
-
-declare class ExchangeDirect extends Exchange<TExchangeDirectBindingParams, EExchangeType.DIRECT> {
-    constructor(queue: TExchangeDirectBindingParams);
-    protected validateBindingParams(queue: TExchangeDirectBindingParams): IQueueParams;
-    getQueues(cb: ICallback<IQueueParams[]>): void;
-}
-
-declare class ExchangeTopic extends Exchange<TExchangeTopicBindingParams, EExchangeType.TOPIC> {
-    constructor(topic: TExchangeTopicBindingParams);
-    protected validateBindingParams(topicParams: TExchangeTopicBindingParams): TTopicParams;
-    getQueues(cb: ICallback<IQueueParams[]>): void;
-}
-
-declare class ExchangeFanOut extends Exchange<TExchangeFanOutBindingParams, EExchangeType.FANOUT> {
-    constructor(fanOutName: TExchangeFanOutBindingParams);
-    protected validateBindingParams(bindingParams: TExchangeFanOutBindingParams): string;
-    getQueues(cb: ICallback<IQueueParams[]>): void;
-    saveExchange(cb: ICallback<void>): void;
-    deleteExchange(cb: ICallback<void>): void;
-    bindQueue(queue: IQueueParams | string, cb: ICallback<void>): void;
-    unbindQueue(queue: IQueueParams | string, cb: ICallback<void>): void;
-    static getAllExchanges(cb: ICallback<string[]>): void;
-    static getQueueExchange(queue: IQueueParams | string, cb: ICallback<ExchangeFanOut | null>): void;
-}
-
 declare class Namespace {
     getNamespaces(cb: ICallback<string[]>): void;
     getNamespaceQueues(namespace: string, cb: ICallback<IQueueParams[]>): void;
@@ -864,4 +851,4 @@ declare class Configuration {
 
 declare function disconnect(cb: ICallback<void>): void;
 
-export { Configuration, Consumer, ConsumerError, ConsumerMessageHandlerAlreadyExistsError, EConsumeMessageDeadLetterCause, EConsumeMessageUnacknowledgedCause, EExchangeType, EMessagePriority, EMessageProperty, EMessagePropertyStatus, EQueueProperty, EQueueType, ExchangeDirect, ExchangeError, ExchangeFanOut, ExchangeFanOutError, ExchangeInvalidDataError, ExchangeTopic, type IConsumableMessage, type IConsumerHeartbeat, type IConsumerHeartbeatPayload, type IConsumerMessageHandlerArgs, type IEventListener, type IEventListenersConfig, type IEventListenersConfigRequired, type IExchange, type IExchangeSerialized, type IMessageSerialized, type IMessageStateSerialized, type IMessagesConfig, type IMessagesConfigStorage, type IMessagesConfigStorageOptions, type IMessagesConfigStorageOptionsRequired, type IMessagesConfigStorageRequired, type IQueueMessages, type IQueueMessagesCount, type IQueueMessagesPage, type IQueueMessagesPageParams, type IQueueParams, type IQueueProperties, type IQueueRateLimit, type IRedisSMQConfig, type IRedisSMQConfigRequired, Message, MessageDeleteError, MessageDestinationQueueAlreadySetError, MessageDestinationQueueRequiredError, MessageError, MessageExchangeRequiredError, MessageNotFoundError, Namespace, Producer, ProducerError, ProducerInstanceNotRunningError, ProducerMessageNotPublishedError, ProducerMessageNotScheduledError, ProducibleMessage, Queue, QueueAcknowledgedMessages, QueueDeadLetteredMessages, QueueError, QueueExistsError, QueueHasRunningConsumersError, QueueMessageRequeueError, QueueMessages, QueueNamespaceNotFoundError, QueueNotEmptyError, QueueNotFoundError, QueuePendingMessages, QueueRateLimit, QueueRateLimitError, QueueScheduledMessages, type TConsumerMessageHandler, type TConsumerRedisKeys, type TEventListenerInitArgs, type TExchange, type TExchangeDirect, type TExchangeDirectBindingParams, type TExchangeDirectSerialized, type TExchangeFanOut, type TExchangeFanOutBindingParams, type TExchangeFanOutSerialized, type TExchangeSerialized, type TExchangeTopic, type TExchangeTopicBindingParams, type TExchangeTopicSerialized, type TMessageConsumeOptions, type TQueueConsumer, type TRedisSMQEvent, type TTopicParams, disconnect };
+export { Configuration, Consumer, ConsumerError, ConsumerMessageHandlerAlreadyExistsError, EConsumeMessageDeadLetterCause, EConsumeMessageUnacknowledgedCause, EExchangeType, EMessagePriority, EMessageProperty, EMessagePropertyStatus, EQueueProperty, EQueueType, ExchangeDirect, ExchangeError, ExchangeFanOut, ExchangeFanOutError, ExchangeInvalidDataError, ExchangeTopic, type IConsumableMessage, type IConsumerHeartbeat, type IConsumerHeartbeatPayload, type IConsumerMessageHandlerArgs, type IEventListener, type IExchange, type IExchangeSerialized, type IMessageSerialized, type IMessageStateSerialized, type IMessagesConfig, type IMessagesConfigStorage, type IMessagesConfigStorageOptions, type IMessagesConfigStorageOptionsRequired, type IMessagesConfigStorageRequired, type IQueueMessages, type IQueueMessagesCount, type IQueueMessagesPage, type IQueueMessagesPageParams, type IQueueParams, type IQueueProperties, type IQueueRateLimit, type IRedisSMQConfig, type IRedisSMQConfigRequired, Message, MessageDeleteError, MessageDestinationQueueAlreadySetError, MessageDestinationQueueRequiredError, MessageError, MessageExchangeRequiredError, MessageNotFoundError, Namespace, Producer, ProducerError, ProducerInstanceNotRunningError, ProducerMessageNotPublishedError, ProducerMessageNotScheduledError, ProducibleMessage, Queue, QueueAcknowledgedMessages, QueueDeadLetteredMessages, QueueError, QueueExistsError, QueueHasRunningConsumersError, QueueMessageRequeueError, QueueMessages, QueueNamespaceNotFoundError, QueueNotEmptyError, QueueNotFoundError, QueuePendingMessages, QueueRateLimit, QueueRateLimitError, QueueScheduledMessages, type TConsumerMessageHandler, type TConsumerRedisKeys, type TEventListenersConfig, type TExchange, type TExchangeDirectBindingParams, type TExchangeFanOutBindingParams, type TExchangeSerialized, type TExchangeTopicBindingParams, type TMessageConsumeOptions, type TQueueConsumer, type TRedisSMQEvent, type TTopicParams, disconnect };

package/dist/index.d.ts

@@ -387,60 +387,84 @@ declare enum EConsumeMessageUnacknowledgedCause {
 
 type TRedisSMQEvent = TEvent & {
     heartbeatTick: (timestamp: number, consumerId: string, heartbeatPayload: IConsumerHeartbeat) => void;
-    messagePublished: (messageId: string, queue: IQueueParams) => void;
+    messagePublished: (messageId: string, queue: IQueueParams, producerId: string) => void;
     messageAcknowledged: (messageId: string, queue: IQueueParams, messageHandlerId: string, consumerId: string) => void;
-    messageUnacknowledged: (cause: EConsumeMessageUnacknowledgedCause, messageId: string, queue: IQueueParams, messageHandlerId: string, consumerId: string) => void;
-    messageDeadLettered: (cause: EConsumeMessageDeadLetterCause, messageId: string, queue: IQueueParams, messageHandlerId: string, consumerId: string) => void;
+    messageUnacknowledged: (messageId: string, queue: IQueueParams, messageHandlerId: string, consumerId: string, cause: EConsumeMessageUnacknowledgedCause) => void;
+    messageDeadLettered: (messageId: string, queue: IQueueParams, messageHandlerId: string, consumerId: string, cause: EConsumeMessageDeadLetterCause) => void;
     messageReceived: (messageId: string, queue: IQueueParams, consumerId: string) => void;
     messageRequeued: (messageId: string, queue: IQueueParams, messageHandlerId: string, consumerId: string) => void;
     messageDelayed: (messageId: string, queue: IQueueParams, messageHandlerId: string, consumerId: string) => void;
 };
 
-type TEventListenerInitArgs = {
-    eventProvider: EventEmitter<TRedisSMQEvent>;
-    instanceId: string;
-};
-interface IEventListener {
-    init(args: TEventListenerInitArgs, cb: ICallback<void>): void;
+interface IEventListener extends EventEmitter<TRedisSMQEvent> {
+    init(cb: ICallback<void>): void;
     quit(cb: ICallback<void>): void;
 }
 
-interface IEventListenersConfig {
-    consumerEventListeners?: (new () => IEventListener)[];
-    producerEventListeners?: (new () => IEventListener)[];
+type TEventListenersConfig = (new () => IEventListener)[];
+
+declare abstract class Exchange<TBindingParams, ExchangeType extends EExchangeType> implements IExchange<TBindingParams, ExchangeType> {
+    readonly type: ExchangeType;
+    readonly bindingParams: TBindingParams;
+    exchangeTag: string;
+    protected constructor(bindingParams: TBindingParams, type: ExchangeType);
+    protected generateExchangeTag(): string;
+    getBindingParams(): TBindingParams;
+    toJSON(): IExchangeSerialized<TBindingParams, ExchangeType>;
+    fromJSON(JSON: Partial<IExchangeSerialized<TBindingParams, ExchangeType>>): void;
+    protected abstract validateBindingParams(bindingParams: TBindingParams): TBindingParams;
+    abstract getQueues(cb: ICallback<IQueueParams[]>): void;
+}
+
+declare class ExchangeDirect extends Exchange<TExchangeDirectBindingParams, EExchangeType.DIRECT> {
+    constructor(queue: TExchangeDirectBindingParams);
+    protected validateBindingParams(queue: TExchangeDirectBindingParams): IQueueParams;
+    getQueues(cb: ICallback<IQueueParams[]>): void;
+}
+
+declare class ExchangeTopic extends Exchange<TExchangeTopicBindingParams, EExchangeType.TOPIC> {
+    constructor(topic: TExchangeTopicBindingParams);
+    protected validateBindingParams(topicParams: TExchangeTopicBindingParams): TTopicParams;
+    getQueues(cb: ICallback<IQueueParams[]>): void;
+}
+
+declare class ExchangeFanOut extends Exchange<TExchangeFanOutBindingParams, EExchangeType.FANOUT> {
+    constructor(fanOutName: TExchangeFanOutBindingParams);
+    protected validateBindingParams(bindingParams: TExchangeFanOutBindingParams): string;
+    getQueues(cb: ICallback<IQueueParams[]>): void;
+    saveExchange(cb: ICallback<void>): void;
+    deleteExchange(cb: ICallback<void>): void;
+    bindQueue(queue: IQueueParams | string, cb: ICallback<void>): void;
+    unbindQueue(queue: IQueueParams | string, cb: ICallback<void>): void;
+    static getAllExchanges(cb: ICallback<string[]>): void;
+    static getQueueExchange(queue: IQueueParams | string, cb: ICallback<ExchangeFanOut | null>): void;
 }
-type IEventListenersConfigRequired = Required<IEventListenersConfig>;
 
-type TTopicParams = {
-    topic: string;
-    ns: string;
-};
 declare enum EExchangeType {
     DIRECT = 0,
     FANOUT = 1,
     TOPIC = 2
 }
+type TTopicParams = {
+    topic: string;
+    ns: string;
+};
 type TExchangeDirectBindingParams = IQueueParams | string;
-type TExchangeFanOutBindingParams = string;
 type TExchangeTopicBindingParams = TTopicParams | string;
-interface IExchange<BindingParams, ExchangeType extends EExchangeType> extends IExchangeSerialized<BindingParams, ExchangeType> {
-    toJSON(): IExchangeSerialized<BindingParams, ExchangeType>;
-    getQueues(cb: ICallback<IQueueParams[]>): void;
-    getBindingParams(): BindingParams;
-}
+type TExchangeFanOutBindingParams = string;
+type TExchange = ExchangeDirect | ExchangeTopic | ExchangeFanOut;
+type TExchangeSerialized = ReturnType<ExchangeDirect['toJSON']> | ReturnType<ExchangeTopic['toJSON']> | ReturnType<ExchangeFanOut['toJSON']>;
+
 interface IExchangeSerialized<BindingParams, ExchangeType extends EExchangeType> {
     readonly type: ExchangeType;
     readonly bindingParams: BindingParams;
     readonly exchangeTag: string;
 }
-type TExchangeDirectSerialized = IExchangeSerialized<TExchangeDirectBindingParams, EExchangeType.DIRECT>;
-type TExchangeTopicSerialized = IExchangeSerialized<TExchangeTopicBindingParams, EExchangeType.TOPIC>;
-type TExchangeFanOutSerialized = IExchangeSerialized<TExchangeFanOutBindingParams, EExchangeType.FANOUT>;
-type TExchangeDirect = IExchange<TExchangeDirectBindingParams, EExchangeType.DIRECT>;
-type TExchangeTopic = IExchange<TExchangeTopicBindingParams, EExchangeType.TOPIC>;
-type TExchangeFanOut = IExchange<TExchangeFanOutBindingParams, EExchangeType.FANOUT>;
-type TExchange = TExchangeDirect | TExchangeTopic | TExchangeFanOut;
-type TExchangeSerialized = TExchangeDirectSerialized | TExchangeTopicSerialized | TExchangeFanOutSerialized;
+interface IExchange<BindingParams, ExchangeType extends EExchangeType> extends IExchangeSerialized<BindingParams, ExchangeType> {
+    toJSON(): IExchangeSerialized<BindingParams, ExchangeType>;
+    getQueues(cb: ICallback<IQueueParams[]>): void;
+    getBindingParams(): BindingParams;
+}
 
 interface IQueueMessages {
     countMessages(queue: string | IQueueParams, cb: ICallback<number>): void;
@@ -470,13 +494,12 @@ interface IRedisSMQConfig {
     namespace?: string;
     logger?: ILoggerConfig;
     messages?: IMessagesConfig;
-    eventListeners?: IEventListenersConfig;
+    eventListeners?: TEventListenersConfig;
 }
 interface IRedisSMQConfigRequired extends Required<IRedisSMQConfig> {
     messages: {
         store: IMessagesConfigStorageRequired;
     };
-    eventListeners: IEventListenersConfigRequired;
 }
 
 declare class ConsumerError extends RedisSMQError {
@@ -587,6 +610,7 @@ declare abstract class Base extends EventEmitter<TRedisSMQEvent> {
     constructor();
     protected setUpSharedRedisClient: (cb: ICallback<void>) => void;
     protected tearDownSharedRedisClient: (cb: ICallback<void>) => void;
+    protected initEventListeners: (cb: ICallback<void>) => void;
     protected registerSystemEventListeners(): void;
     protected goingUp(): TFunction[];
     protected up(cb?: ICallback<boolean>): void;
@@ -595,6 +619,7 @@ declare abstract class Base extends EventEmitter<TRedisSMQEvent> {
     protected getSharedRedisClient(): RedisClient;
     protected registerEventListeners(Ctors: (new () => IEventListener)[], cb: ICallback<void>): void;
     protected tearDownEventListeners: (cb: ICallback<void>) => void;
+    protected hasEventListeners(): boolean;
     handleError(err: Error): void;
     run(cb?: ICallback<boolean>): void;
     shutdown(cb?: ICallback<boolean>): void;
@@ -696,10 +721,10 @@ declare class Consumer extends Base {
     protected heartbeat: ConsumerHeartbeat | null;
     protected workerRunner: WorkerRunner | null;
     constructor(useMultiplexing?: boolean);
+    protected registerSystemEventListeners(): void;
     protected setUpHeartbeat: (cb: ICallback<void>) => void;
     protected tearDownHeartbeat: (cb: ICallback<void>) => void;
     protected setUpConsumerWorkers: (cb: ICallback<void>) => void;
-    protected initConsumerEventListeners: (cb: ICallback<void>) => void;
     protected tearDownConsumerWorkers: (cb: ICallback<void>) => void;
     protected runMessageHandlers: (cb: ICallback<void>) => void;
     protected shutdownMessageHandlers: (cb: ICallback<void>) => void;
@@ -711,8 +736,7 @@ declare class Consumer extends Base {
 }
 
 declare class Producer extends Base {
-    protected initProducerEventListeners: (cb: ICallback<void>) => void;
-    protected goingUp(): TUnaryFunction<ICallback<void>>[];
+    protected registerSystemEventListeners(): void;
     protected enqueue(redisClient: RedisClient, queue: IQueueParams, message: MessageEnvelope, cb: ICallback<void>): void;
     protected produceMessage(redisClient: RedisClient, message: MessageEnvelope, queue: IQueueParams, cb: ICallback<string>): void;
     produce(msg: ProducibleMessage, cb: ICallback<string[]>): void;
@@ -727,43 +751,6 @@ declare class Message {
     deleteMessageById(id: string, cb: ICallback<void>): void;
 }
 
-declare abstract class Exchange<TBindingParams, ExchangeType extends EExchangeType> implements IExchange<TBindingParams, ExchangeType> {
-    readonly type: ExchangeType;
-    readonly bindingParams: TBindingParams;
-    exchangeTag: string;
-    protected constructor(bindingParams: TBindingParams, type: ExchangeType);
-    protected generateExchangeTag(): string;
-    getBindingParams(): TBindingParams;
-    toJSON(): IExchangeSerialized<TBindingParams, ExchangeType>;
-    fromJSON(JSON: Partial<IExchangeSerialized<TBindingParams, ExchangeType>>): void;
-    protected abstract validateBindingParams(bindingParams: TBindingParams): TBindingParams;
-    abstract getQueues(cb: ICallback<IQueueParams[]>): void;
-}
-
-declare class ExchangeDirect extends Exchange<TExchangeDirectBindingParams, EExchangeType.DIRECT> {
-    constructor(queue: TExchangeDirectBindingParams);
-    protected validateBindingParams(queue: TExchangeDirectBindingParams): IQueueParams;
-    getQueues(cb: ICallback<IQueueParams[]>): void;
-}
-
-declare class ExchangeTopic extends Exchange<TExchangeTopicBindingParams, EExchangeType.TOPIC> {
-    constructor(topic: TExchangeTopicBindingParams);
-    protected validateBindingParams(topicParams: TExchangeTopicBindingParams): TTopicParams;
-    getQueues(cb: ICallback<IQueueParams[]>): void;
-}
-
-declare class ExchangeFanOut extends Exchange<TExchangeFanOutBindingParams, EExchangeType.FANOUT> {
-    constructor(fanOutName: TExchangeFanOutBindingParams);
-    protected validateBindingParams(bindingParams: TExchangeFanOutBindingParams): string;
-    getQueues(cb: ICallback<IQueueParams[]>): void;
-    saveExchange(cb: ICallback<void>): void;
-    deleteExchange(cb: ICallback<void>): void;
-    bindQueue(queue: IQueueParams | string, cb: ICallback<void>): void;
-    unbindQueue(queue: IQueueParams | string, cb: ICallback<void>): void;
-    static getAllExchanges(cb: ICallback<string[]>): void;
-    static getQueueExchange(queue: IQueueParams | string, cb: ICallback<ExchangeFanOut | null>): void;
-}
-
 declare class Namespace {
     getNamespaces(cb: ICallback<string[]>): void;
     getNamespaceQueues(namespace: string, cb: ICallback<IQueueParams[]>): void;
@@ -864,4 +851,4 @@ declare class Configuration {
 
 declare function disconnect(cb: ICallback<void>): void;
 
-export { Configuration, Consumer, ConsumerError, ConsumerMessageHandlerAlreadyExistsError, EConsumeMessageDeadLetterCause, EConsumeMessageUnacknowledgedCause, EExchangeType, EMessagePriority, EMessageProperty, EMessagePropertyStatus, EQueueProperty, EQueueType, ExchangeDirect, ExchangeError, ExchangeFanOut, ExchangeFanOutError, ExchangeInvalidDataError, ExchangeTopic, type IConsumableMessage, type IConsumerHeartbeat, type IConsumerHeartbeatPayload, type IConsumerMessageHandlerArgs, type IEventListener, type IEventListenersConfig, type IEventListenersConfigRequired, type IExchange, type IExchangeSerialized, type IMessageSerialized, type IMessageStateSerialized, type IMessagesConfig, type IMessagesConfigStorage, type IMessagesConfigStorageOptions, type IMessagesConfigStorageOptionsRequired, type IMessagesConfigStorageRequired, type IQueueMessages, type IQueueMessagesCount, type IQueueMessagesPage, type IQueueMessagesPageParams, type IQueueParams, type IQueueProperties, type IQueueRateLimit, type IRedisSMQConfig, type IRedisSMQConfigRequired, Message, MessageDeleteError, MessageDestinationQueueAlreadySetError, MessageDestinationQueueRequiredError, MessageError, MessageExchangeRequiredError, MessageNotFoundError, Namespace, Producer, ProducerError, ProducerInstanceNotRunningError, ProducerMessageNotPublishedError, ProducerMessageNotScheduledError, ProducibleMessage, Queue, QueueAcknowledgedMessages, QueueDeadLetteredMessages, QueueError, QueueExistsError, QueueHasRunningConsumersError, QueueMessageRequeueError, QueueMessages, QueueNamespaceNotFoundError, QueueNotEmptyError, QueueNotFoundError, QueuePendingMessages, QueueRateLimit, QueueRateLimitError, QueueScheduledMessages, type TConsumerMessageHandler, type TConsumerRedisKeys, type TEventListenerInitArgs, type TExchange, type TExchangeDirect, type TExchangeDirectBindingParams, type TExchangeDirectSerialized, type TExchangeFanOut, type TExchangeFanOutBindingParams, type TExchangeFanOutSerialized, type TExchangeSerialized, type TExchangeTopic, type TExchangeTopicBindingParams, type TExchangeTopicSerialized, type TMessageConsumeOptions, type TQueueConsumer, type TRedisSMQEvent, type TTopicParams, disconnect };
+export { Configuration, Consumer, ConsumerError, ConsumerMessageHandlerAlreadyExistsError, EConsumeMessageDeadLetterCause, EConsumeMessageUnacknowledgedCause, EExchangeType, EMessagePriority, EMessageProperty, EMessagePropertyStatus, EQueueProperty, EQueueType, ExchangeDirect, ExchangeError, ExchangeFanOut, ExchangeFanOutError, ExchangeInvalidDataError, ExchangeTopic, type IConsumableMessage, type IConsumerHeartbeat, type IConsumerHeartbeatPayload, type IConsumerMessageHandlerArgs, type IEventListener, type IExchange, type IExchangeSerialized, type IMessageSerialized, type IMessageStateSerialized, type IMessagesConfig, type IMessagesConfigStorage, type IMessagesConfigStorageOptions, type IMessagesConfigStorageOptionsRequired, type IMessagesConfigStorageRequired, type IQueueMessages, type IQueueMessagesCount, type IQueueMessagesPage, type IQueueMessagesPageParams, type IQueueParams, type IQueueProperties, type IQueueRateLimit, type IRedisSMQConfig, type IRedisSMQConfigRequired, Message, MessageDeleteError, MessageDestinationQueueAlreadySetError, MessageDestinationQueueRequiredError, MessageError, MessageExchangeRequiredError, MessageNotFoundError, Namespace, Producer, ProducerError, ProducerInstanceNotRunningError, ProducerMessageNotPublishedError, ProducerMessageNotScheduledError, ProducibleMessage, Queue, QueueAcknowledgedMessages, QueueDeadLetteredMessages, QueueError, QueueExistsError, QueueHasRunningConsumersError, QueueMessageRequeueError, QueueMessages, QueueNamespaceNotFoundError, QueueNotEmptyError, QueueNotFoundError, QueuePendingMessages, QueueRateLimit, QueueRateLimitError, QueueScheduledMessages, type TConsumerMessageHandler, type TConsumerRedisKeys, type TEventListenersConfig, type TExchange, type TExchangeDirectBindingParams, type TExchangeFanOutBindingParams, type TExchangeSerialized, type TExchangeTopicBindingParams, type TMessageConsumeOptions, type TQueueConsumer, type TRedisSMQEvent, type TTopicParams, disconnect };

package/dist/index.js

@@ -262,14 +262,10 @@ function Messages(userConfig) {
 }
 
 // src/config/event-listeners/event-listeners.ts
-import { merge as merge4 } from "lodash";
-var defaultConfig4 = {
-  consumerEventListeners: [],
-  producerEventListeners: []
-};
+var defaultConfig4 = [];
 function EventListeners(userConfig) {
-  const { eventListeners = {} } = userConfig;
-  return merge4({}, defaultConfig4, eventListeners);
+  const { eventListeners = [] } = userConfig;
+  return [...defaultConfig4, ...eventListeners];
 }
 
 // src/config/configuration.ts
@@ -331,11 +327,11 @@ function _destroyCommonRedisClient(cb) {
 }
 
 // types/consumer/consume-message.ts
-var EConsumeMessageDeadLetterCause = /* @__PURE__ */ ((EConsumeMessageDeadLetterCause3) => {
-  EConsumeMessageDeadLetterCause3[EConsumeMessageDeadLetterCause3["TTL_EXPIRED"] = 0] = "TTL_EXPIRED";
-  EConsumeMessageDeadLetterCause3[EConsumeMessageDeadLetterCause3["RETRY_THRESHOLD_EXCEEDED"] = 1] = "RETRY_THRESHOLD_EXCEEDED";
-  EConsumeMessageDeadLetterCause3[EConsumeMessageDeadLetterCause3["PERIODIC_MESSAGE"] = 2] = "PERIODIC_MESSAGE";
-  return EConsumeMessageDeadLetterCause3;
+var EConsumeMessageDeadLetterCause = /* @__PURE__ */ ((EConsumeMessageDeadLetterCause2) => {
+  EConsumeMessageDeadLetterCause2[EConsumeMessageDeadLetterCause2["TTL_EXPIRED"] = 0] = "TTL_EXPIRED";
+  EConsumeMessageDeadLetterCause2[EConsumeMessageDeadLetterCause2["RETRY_THRESHOLD_EXCEEDED"] = 1] = "RETRY_THRESHOLD_EXCEEDED";
+  EConsumeMessageDeadLetterCause2[EConsumeMessageDeadLetterCause2["PERIODIC_MESSAGE"] = 2] = "PERIODIC_MESSAGE";
+  return EConsumeMessageDeadLetterCause2;
 })(EConsumeMessageDeadLetterCause || {});
 var EConsumeMessageUnacknowledgedCause = /* @__PURE__ */ ((EConsumeMessageUnacknowledgedCause3) => {
   EConsumeMessageUnacknowledgedCause3[EConsumeMessageUnacknowledgedCause3["TIMEOUT"] = 0] = "TIMEOUT";
@@ -347,7 +343,7 @@ var EConsumeMessageUnacknowledgedCause = /* @__PURE__ */ ((EConsumeMessageUnackn
   return EConsumeMessageUnacknowledgedCause3;
 })(EConsumeMessageUnacknowledgedCause || {});
 
-// types/exchange/exchange.ts
+// types/exchange/common.ts
 var EExchangeType = /* @__PURE__ */ ((EExchangeType2) => {
   EExchangeType2[EExchangeType2["DIRECT"] = 0] = "DIRECT";
   EExchangeType2[EExchangeType2["FANOUT"] = 1] = "FANOUT";
@@ -724,6 +720,10 @@ var Base = class extends EventEmitter2 {
       } else
         cb();
     };
+    this.initEventListeners = (cb) => {
+      const { eventListeners } = Configuration.getSetConfig();
+      this.registerEventListeners(eventListeners, cb);
+    };
     this.tearDownEventListeners = (cb) => {
       async2.each(
         this.eventListeners,
@@ -754,7 +754,7 @@ var Base = class extends EventEmitter2 {
     this.on("error", (err) => this.handleError(err));
   }
   goingUp() {
-    return [this.setUpSharedRedisClient];
+    return [this.setUpSharedRedisClient, this.initEventListeners];
   }
   up(cb) {
     this.powerSwitch.commit();
@@ -779,24 +779,21 @@ var Base = class extends EventEmitter2 {
       Ctors,
       (ctor, key, done) => {
         const instance = new ctor();
-        instance.init(
-          {
-            instanceId: this.id,
-            eventProvider: this
-          },
-          (err) => {
-            if (err)
-              done(err);
-            else {
-              this.eventListeners.push(instance);
-              done();
-            }
+        instance.init((err) => {
+          if (err)
+            done(err);
+          else {
+            this.eventListeners.push(instance);
+            done();
           }
-        );
+        });
       },
       cb
     );
   }
+  hasEventListeners() {
+    return !!Configuration.getSetConfig().eventListeners.length;
+  }
   handleError(err) {
     if (this.powerSwitch.isGoingUp() || this.powerSwitch.isRunning()) {
       throw err;
@@ -2888,20 +2885,20 @@ var ConsumeMessage = class {
           const consumerId = this.messageHandler.getConsumerId();
           this.messageHandler.emit(
             "messageUnacknowledged",
-            cause,
             messageId,
             queue,
             messageHandlerId,
-            consumerId
+            consumerId,
+            cause
           );
           if (reply.action === 0 /* DEAD_LETTER */) {
             this.messageHandler.emit(
               "messageDeadLettered",
-              reply.deadLetterCause,
               messageId,
               queue,
               messageHandlerId,
-              consumerId
+              consumerId,
+              reply.deadLetterCause
             );
           } else if (reply.action === 2 /* DELAY */) {
             this.messageHandler.emit(
@@ -3028,7 +3025,7 @@ var MessageHandler = class extends EventEmitter3 {
     });
     this.on(
       "messageDeadLettered",
-      (cause, messageId) => {
+      (messageId, queue, messageHandlerId, consumerId, cause) => {
         this.logger.info(
           `Message (ID ${messageId}) dead-lettered (cause ${cause})`
         );
@@ -3036,7 +3033,7 @@ var MessageHandler = class extends EventEmitter3 {
     );
     this.on(
       "messageUnacknowledged",
-      (cause, messageId) => {
+      (messageId, queue, messageHandlerId, consumerId, cause) => {
         this.logger.info(
           `Message (ID ${messageId}) unacknowledged (cause ${cause})`
         );
@@ -3929,12 +3926,6 @@ var Consumer = class extends Base {
       this.workerRunner.addWorker(new publish_scheduled_worker_default(redisClient2, true));
       this.workerRunner.run();
     };
-    this.initConsumerEventListeners = (cb) => {
-      this.registerEventListeners(
-        Configuration.getSetConfig().eventListeners.consumerEventListeners,
-        cb
-      );
-    };
     this.tearDownConsumerWorkers = (cb) => {
       if (this.workerRunner) {
         this.workerRunner.quit(() => {
@@ -3961,10 +3952,29 @@ var Consumer = class extends Base {
     this.messageHandlerRunner = useMultiplexing ? new MultiplexedMessageHandlerRunner(this, nsLogger) : new MessageHandlerRunner(this, nsLogger);
     this.redisKeys = redisKeys.getConsumerKeys(this.getId());
   }
+  registerSystemEventListeners() {
+    super.registerSystemEventListeners();
+    if (this.hasEventListeners()) {
+      this.on("messageAcknowledged", (...args) => {
+        this.eventListeners.forEach(
+          (i) => i.emit("messageAcknowledged", ...args)
+        );
+      });
+      this.on("messageUnacknowledged", (...args) => {
+        this.eventListeners.forEach(
+          (i) => i.emit("messageUnacknowledged", ...args)
+        );
+      });
+      this.on("messageDeadLettered", (...args) => {
+        this.eventListeners.forEach(
+          (i) => i.emit("messageDeadLettered", ...args)
+        );
+      });
+    }
+  }
   goingUp() {
     return super.goingUp().concat([
       this.setUpHeartbeat,
-      this.initConsumerEventListeners,
       this.runMessageHandlers,
       this.setUpConsumerWorkers
     ]);
@@ -4053,17 +4063,13 @@ function _scheduleMessage(mixed, message, cb) {
 
 // src/lib/producer/producer.ts
 var Producer = class extends Base {
-  constructor() {
-    super(...arguments);
-    this.initProducerEventListeners = (cb) => {
-      this.registerEventListeners(
-        Configuration.getSetConfig().eventListeners.producerEventListeners,
-        cb
-      );
-    };
-  }
-  goingUp() {
-    return super.goingUp().concat([this.initProducerEventListeners]);
+  registerSystemEventListeners() {
+    super.registerSystemEventListeners();
+    if (this.hasEventListeners()) {
+      this.on("messagePublished", (...args) => {
+        this.eventListeners.forEach((i) => i.emit("messagePublished", ...args));
+      });
+    }
   }
   enqueue(redisClient2, queue, message, cb) {
     var _a;
@@ -4133,7 +4139,7 @@ var Producer = class extends Base {
           cb(err);
         else {
           this.logger.info(`Message (ID ${messageId}) has been published.`);
-          this.emit("messagePublished", messageId, queue);
+          this.emit("messagePublished", messageId, queue, this.id);
           cb(null, messageId);
         }
       });

package/dist/lua/delete-message.lua

@@ -44,40 +44,45 @@ local function updateQueue()
 end
 
 local function deleteMessage()
-    local deleted = 0;
     local messageStatus = redis.call("HGET", keyMessage, EMessagePropertyStatus)
-    if messageStatus ~= EMessagePropertyStatusProcessing then
-        if messageStatus == EMessagePropertyStatusAcknowledged then
-            deleted = redis.call("LREM", keyQueueAcknowledged, 1, messageId)
-        elseif messageStatus == EMessagePropertyStatusDeadLettered then
-            deleted = redis.call("LREM", keyQueueDL, 1, messageId)
-        elseif messageStatus == EMessagePropertyStatusScheduled then
-            deleted = redis.call("ZREM", keyScheduledMessages, messageId)
-            redis.call("ZREM", keyQueueScheduled, messageId)
-        elseif messageStatus == EMessagePropertyStatusUnackDelaying then
-            deleted = redis.call("LREM", keyDelayedMessages, 1, messageId)
-        elseif messageStatus == EMessagePropertyStatusUnackRequeuing then
-            deleted = redis.call("LREM", keyRequeueMessages, 1, messageId)
-        elseif messageStatus == EMessagePropertyStatusPending then
-            local queueType = redis.call("HGET", keyQueueProperties, EQueuePropertyQueueType)
-            if queueType ~= false then
-                if queueType == EQueuePropertyQueueTypePriorityQueue then
-                    deleted = redis.call("ZREM", keyPriorityQueuePending, messageId)
-                end
-                if queueType == EQueuePropertyQueueTypeFIFOQueue or queueType == EQueuePropertyQueueTypeLIFOQueue then
-                    deleted = redis.call("LREM", keyQueuePending, 1, messageId)
-                end
+    if messageStatus == false then
+        return 'MESSAGE_NOT_FOUND'
+    end
+    if messageStatus == EMessagePropertyStatusProcessing then
+        return 'MESSAGE_IN_PROCESS'
+    end
+    local deleted = 0;
+    if messageStatus == EMessagePropertyStatusAcknowledged then
+        deleted = redis.call("LREM", keyQueueAcknowledged, 1, messageId)
+    elseif messageStatus == EMessagePropertyStatusDeadLettered then
+        deleted = redis.call("LREM", keyQueueDL, 1, messageId)
+    elseif messageStatus == EMessagePropertyStatusScheduled then
+        deleted = redis.call("ZREM", keyScheduledMessages, messageId)
+        redis.call("ZREM", keyQueueScheduled, messageId)
+    elseif messageStatus == EMessagePropertyStatusUnackDelaying then
+        deleted = redis.call("LREM", keyDelayedMessages, 1, messageId)
+    elseif messageStatus == EMessagePropertyStatusUnackRequeuing then
+        deleted = redis.call("LREM", keyRequeueMessages, 1, messageId)
+    elseif messageStatus == EMessagePropertyStatusPending then
+        local queueType = redis.call("HGET", keyQueueProperties, EQueuePropertyQueueType)
+        if queueType ~= false then
+            if queueType == EQueuePropertyQueueTypePriorityQueue then
+                deleted = redis.call("ZREM", keyPriorityQueuePending, messageId)
+            end
+            if queueType == EQueuePropertyQueueTypeFIFOQueue or queueType == EQueuePropertyQueueTypeLIFOQueue then
+                deleted = redis.call("LREM", keyQueuePending, 1, messageId)
             end
         end
     end
     if deleted == 1 then
         redis.call("DEL", keyMessage)
-        return true
+        return 'OK'
     end
-    return false
+    return 'MESSAGE_NOT_DELETED'
 end
 
 
+local deleteMessageStatus = 'INVALID_PARAMETERS'
 
 if #ARGV > argvIndexOffset then
     for index in pairs(ARGV) do
@@ -91,13 +96,13 @@ if #ARGV > argvIndexOffset then
             keyQueueScheduled = KEYS[keyIndexOffset + 6]
             keyPriorityQueuePending = KEYS[keyIndexOffset + 7]
             keyIndexOffset = keyIndexOffset + 7
-            local reply = deleteMessage()
-            if reply == true then
-                updateQueue()
+            deleteMessageStatus = deleteMessage()
+            if deleteMessageStatus ~= 'OK' then
+                break
             end
+            updateQueue()
         end
     end
-    return 'OK'
 end
 
-return 'INVALID_PARAMETERS'
+return deleteMessageStatus

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redis-smq",
-  "version": "8.0.0-rc.12",
+  "version": "8.0.0-rc.14",
   "description": "A simple high-performance Redis message queue for Node.js.",
   "author": "Weyoss <weyoss@protonmail.com>",
   "license": "MIT",