npm - redis-smq - Versions diffs - 8.0.0-rc.11 → 8.0.0-rc.13 - Mend

redis-smq 8.0.0-rc.11 → 8.0.0-rc.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,33 @@
+## [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)
+### Misc
+* update logo ([9bd373e](https://github.com/weyoss/redis-smq/commit/9bd373e693c57c8e18dddb5b0899c710e6de9492))
 ## [8.0.0-rc.11](https://github.com/weyoss/redis-smq/compare/v8.0.0-rc.10...v8.0.0-rc.11) (2023-12-18)

package/README.md CHANGED Viewed

@@ -1,5 +1,5 @@
 <div align="center" style="text-align: center">
-  <p><a href="https://github.com/weyoss/redis-smq"><img alt="RedisSMQ" src="./logo.png" /></a></p>
+  <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>
 </div>

package/dist/index.cjs CHANGED Viewed

@@ -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";
@@ -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,20 +843,14 @@ 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
     );
@@ -2931,20 +2925,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 +3059,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 +3067,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 +3934,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 +3960,30 @@ 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();
+    this.on("messageAcknowledged", (...args) => {
+      if (this.eventListeners.length)
+        this.eventListeners.forEach(
+          (i) => i.emit("messageAcknowledged", ...args)
+        );
+    });
+    this.on("messageUnacknowledged", (...args) => {
+      if (this.eventListeners.length)
+        this.eventListeners.forEach(
+          (i) => i.emit("messageUnacknowledged", ...args)
+        );
+    });
+    this.on("messageDeadLettered", (...args) => {
+      if (this.eventListeners.length)
+        this.eventListeners.forEach(
+          (i) => i.emit("messageDeadLettered", ...args)
+        );
+    });
+  }
   goingUp() {
     return super.goingUp().concat([
       this.setUpHeartbeat,
-      this.initConsumerEventListeners,
       this.runMessageHandlers,
       this.setUpConsumerWorkers
     ]);
@@ -4061,17 +4069,12 @@ 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();
+    this.on("messagePublished", (...args) => {
+      if (this.eventListeners.length)
+        this.eventListeners.forEach((i) => i.emit("messagePublished", ...args));
+    });
   }
   enqueue(redisClient2, queue, message, cb) {
     var _a;
@@ -4141,7 +4144,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 CHANGED Viewed

@@ -387,29 +387,21 @@ 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 IEventListenersConfigRequired = Required<IEventListenersConfig>;
+type TEventListenersConfig = (new () => IEventListener)[];
 type TTopicParams = {
     topic: string;
@@ -470,13 +462,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 +578,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;
@@ -696,10 +688,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 +703,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;
@@ -864,4 +855,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 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 };

package/dist/index.d.ts CHANGED Viewed

@@ -387,29 +387,21 @@ 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 IEventListenersConfigRequired = Required<IEventListenersConfig>;
+type TEventListenersConfig = (new () => IEventListener)[];
 type TTopicParams = {
     topic: string;
@@ -470,13 +462,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 +578,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;
@@ -696,10 +688,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 +703,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;
@@ -864,4 +855,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 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 };

package/dist/index.js CHANGED Viewed

@@ -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";
@@ -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,20 +779,14 @@ 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
     );
@@ -2888,20 +2882,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 +3022,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 +3030,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 +3923,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 +3949,30 @@ 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();
+    this.on("messageAcknowledged", (...args) => {
+      if (this.eventListeners.length)
+        this.eventListeners.forEach(
+          (i) => i.emit("messageAcknowledged", ...args)
+        );
+    });
+    this.on("messageUnacknowledged", (...args) => {
+      if (this.eventListeners.length)
+        this.eventListeners.forEach(
+          (i) => i.emit("messageUnacknowledged", ...args)
+        );
+    });
+    this.on("messageDeadLettered", (...args) => {
+      if (this.eventListeners.length)
+        this.eventListeners.forEach(
+          (i) => i.emit("messageDeadLettered", ...args)
+        );
+    });
+  }
   goingUp() {
     return super.goingUp().concat([
       this.setUpHeartbeat,
-      this.initConsumerEventListeners,
       this.runMessageHandlers,
       this.setUpConsumerWorkers
     ]);
@@ -4053,17 +4061,12 @@ 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();
+    this.on("messagePublished", (...args) => {
+      if (this.eventListeners.length)
+        this.eventListeners.forEach((i) => i.emit("messagePublished", ...args));
+    });
   }
   enqueue(redisClient2, queue, message, cb) {
     var _a;
@@ -4133,7 +4136,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/package.json CHANGED Viewed

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