redis-smq 8.0.0-rc.28 → 8.0.0-rc.29

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 
 
+## [8.0.0-rc.29](https://github.com/weyoss/redis-smq/compare/v8.0.0-rc.28...v8.0.0-rc.29) (2025-02-14)
+
+
+### Bug Fixes
+
+* **deps:** regenerate package-lock.json ([dc55c81](https://github.com/weyoss/redis-smq/commit/dc55c8101e9b57d2607ee47a78db7861d17623ab))
+
+
+### Documentation
+
+* **api:** update API documentation and references ([08f85ae](https://github.com/weyoss/redis-smq/commit/08f85ae0c963497d4200fcdfdeccc4aa83d3e60b))
+* **contributing:** update guidelines and improve language ([c2feb57](https://github.com/weyoss/redis-smq/commit/c2feb57429513abb4b8973fc0bb6000377712f2c))
+* **README:** update installation and usage instructions ([cfe19e4](https://github.com/weyoss/redis-smq/commit/cfe19e4f88cf5a5059ecb8567f1cbc16524008de))
+
+
+### Codebase Refactoring
+
+* remove unnecessary factory patterns ([3ed3a7d](https://github.com/weyoss/redis-smq/commit/3ed3a7d8056fae3c253f8af5b6b5f3f0d591945f))
+* **tests:** update imports and usage of EventBus and RedisClient ([f9dca11](https://github.com/weyoss/redis-smq/commit/f9dca11015e3d02fddccc8f442facb2bf008236a))
+
+
+### Misc
+
+* **deps:** update redis-smq-common to 3.0.0-rc.17 ([324d6f1](https://github.com/weyoss/redis-smq/commit/324d6f12fc82da8762f442c110a9351cce3c3505))
+
 ## [8.0.0-rc.28](https://github.com/weyoss/redis-smq/compare/v8.0.0-rc.27...v8.0.0-rc.28) (2025-02-05)
 
 

package/CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributions
 
-If you want to make any project better, your contributions are very welcome!
+If you want to make RedisSMQ project better, your contributions are very welcome!
 
 ## Pull requests
 
@@ -12,7 +12,7 @@ coding style. You can check the status of your coding style by simply running `n
 Cover your code with new tests if needed. Only fully tested changes are accepted.
 
 Each time when you are ready to submit your changes don't forget to run `npm test` to check that your code is complying
-with eslint project rules and that all of the tests are successfully completed.
+with eslint project rules and that all the tests are successfully completed.
 
 ## Bugs
 

package/README.md

@@ -10,17 +10,17 @@ A High-Performance Redis Simple Message Queue for Node.js
 
 **Key Features**
 
-*   [High-performance message processing](docs/performance.md)
-*   [Flexible producer/consumer model with multi-queue producers and consumers](docs/consuming-messages.md)
-*   [Different exchange types (Direct, Topic, FanOut) for publishing messages to one or multiple queues](docs/message-exchanges.md)
-*   [Two delivery models (Point-2-Point and Pub/Sub)](docs/queue-delivery-models.md) with reliable delivery and configurable retry modes
-*   [Three queuing strategies (FIFO, LIFO, Priority Queues)](docs/queues.md)
-*   [Message handler worker threads for sandboxing and performance improvement](docs/message-handler-worker-threads.md)
-*   [Message expiration and consumption timeout](docs/messages.md)
-*   [Queue rate limiting for controlling message consumption rates](docs/queue-rate-limiting.md)
-*   [Built-in scheduler for delayed message delivery and repeating messages](docs/scheduling-messages.md)
-*   [RESTful API](docs/redis-smq-rest-api.md) and [Web UI](docs/redis-smq-web-ui.md) for interacting with the message queue
-*   [Support for ESM and CJS modules](docs/esm-cjs-modules.md)
+- 🚀 [High-performance message processing](docs/performance.md)
+- 🔄 [Flexible producer/consumer model with multi-queue producers and consumers](docs/consuming-messages.md)
+- 🔀 [Different exchange types (Direct, Topic, FanOut) for publishing messages to one or multiple queues](docs/message-exchanges.md)
+- 📬 [Two delivery models (Point-2-Point and Pub/Sub)](docs/queue-delivery-models.md) with reliable delivery and configurable retry modes
+- 📊 [Three queuing strategies (FIFO, LIFO, Priority Queues)](docs/queues.md)
+- 🧵 [Message handler worker threads for sandboxing and performance improvement](docs/message-handler-worker-threads.md)
+- ⏱️ [Message expiration and consumption timeout](docs/messages.md)
+- 🚦 [Queue rate limiting for controlling message consumption rates](docs/queue-rate-limiting.md)
+- 🕰️ [Built-in scheduler for delayed message delivery and repeating messages](docs/scheduling-messages.md)
+- 🌐 [RESTful API](docs/redis-smq-rest-api.md) and [Web UI](docs/redis-smq-web-ui.md) for interacting with the message queue
+- 📦 [Support for ESM and CJS modules](docs/esm-cjs-modules.md)
 
 **Use Cases**
 
@@ -29,13 +29,48 @@ A High-Performance Redis Simple Message Queue for Node.js
 - Communication between multiple services in microservices architectures.
 - Handling real-time events in gaming, IoT, or analytics systems.
 
-**Installation and Usage**
+**Installation**
 
 To get started with RedisSMQ, you can install the library using npm:
 ```bash
 npm i redis-smq@rc
 ```
-Create a queue, produce a message, and consume it using the provided classes and methods:
+
+Don't forget to install a Redis client. Choose either node-redis or ioredis:
+
+```shell
+npm install @redis/client
+# or
+npm install ioredis
+```
+
+**Configuration**
+
+Set up the RedisSMQ configuration during your application bootstrap:
+
+```javascript
+'use strict';
+const { Configuration, ERedisConfigClient } = require('redis-smq');
+
+const config = {
+  redis: {
+    // Using ioredis as the Redis client
+    client: ERedisConfigClient.IOREDIS,
+    // Add any other ioredis options here
+    options: {
+      host: '127.0.0.1',
+      port: 6379,
+    },
+  },
+};
+
+Configuration.getSetConfig(config);
+```
+
+**Usage**
+
+Here's a basic example to create a queue, produce a message, and consume it:
+
 ```javascript
 // Creating a queue
 const queue = new Queue();

package/dist/cjs/src/common/redis-client/redis-client.d.ts

@@ -0,0 +1,11 @@
+import { EventEmitter, ICallback, IRedisClient, IRedisConfig, TRedisClientEvent } from 'redis-smq-common';
+export declare class RedisClient extends EventEmitter<Pick<TRedisClientEvent, 'error'>> {
+    protected instance: IRedisClient | null;
+    protected locked: boolean;
+    protected createClient(config: IRedisConfig, cb: ICallback<IRedisClient>): void;
+    init: (cb: ICallback<void>) => void;
+    getSetInstance: (cb: ICallback<IRedisClient>) => void;
+    shutdown: (cb: ICallback<void>) => void;
+    getInstance(): IRedisClient | Error;
+}
+//# sourceMappingURL=redis-client.d.ts.map

package/dist/cjs/src/common/redis-client/{redis-client-instance.js → redis-client.js}

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedisClientInstance = void 0;
+exports.RedisClient = void 0;
 const redis_smq_common_1 = require("redis-smq-common");
 const index_js_1 = require("../../config/index.js");
 const redis_client_instance_lock_error_js_1 = require("./errors/redis-client-instance-lock.error.js");
-class RedisClientInstance extends redis_smq_common_1.EventEmitter {
+const scripts_js_1 = require("./scripts/scripts.js");
+class RedisClient extends redis_smq_common_1.EventEmitter {
     constructor() {
         super(...arguments);
         this.instance = null;
@@ -16,17 +17,15 @@ class RedisClientInstance extends redis_smq_common_1.EventEmitter {
             if (!this.locked) {
                 if (!this.instance) {
                     this.locked = true;
-                    (0, redis_smq_common_1.createRedisClient)(index_js_1.Configuration.getSetConfig().redis, (err, client) => {
+                    this.createClient(index_js_1.Configuration.getSetConfig().redis, (err, client) => {
                         this.locked = false;
                         if (err)
-                            cb(err);
-                        else if (!client)
-                            cb(new redis_smq_common_1.CallbackEmptyReplyError());
-                        else {
-                            this.instance = client;
-                            this.instance.on('error', (err) => this.emit('error', err));
-                            cb(null, this.instance);
-                        }
+                            return cb(err);
+                        if (!client)
+                            return cb(new redis_smq_common_1.CallbackEmptyReplyError());
+                        this.instance = client;
+                        this.instance.on('error', (err) => this.emit('error', err));
+                        cb(null, this.instance);
                     });
                 }
                 else
@@ -46,11 +45,24 @@ class RedisClientInstance extends redis_smq_common_1.EventEmitter {
                 cb();
         };
     }
+    createClient(config, cb) {
+        (0, redis_smq_common_1.createRedisClient)(config, (err, client) => {
+            if (err)
+                return cb(err);
+            if (!client)
+                return cb(new redis_smq_common_1.CallbackEmptyReplyError());
+            (0, scripts_js_1.loadScriptFiles)(client, (err) => {
+                if (err)
+                    return cb(err);
+                cb(null, client);
+            });
+        });
+    }
     getInstance() {
         if (!this.instance)
             return new redis_smq_common_1.PanicError(`Use first getSetInstance() to initialize the RedisClientInstance class`);
         return this.instance;
     }
 }
-exports.RedisClientInstance = RedisClientInstance;
-//# sourceMappingURL=redis-client-instance.js.map
+exports.RedisClient = RedisClient;
+//# sourceMappingURL=redis-client.js.map

package/dist/cjs/src/common/redis-client/scripts/scripts.d.ts

@@ -1,3 +1,4 @@
+import { ICallback, IRedisClient } from 'redis-smq-common';
 export declare enum ELuaScriptName {
     PUBLISH_SCHEDULED_MESSAGE = "PUBLISH_SCHEDULED_MESSAGE",
     PUBLISH_MESSAGE = "PUBLISH_MESSAGE",
@@ -14,4 +15,5 @@ export declare enum ELuaScriptName {
     CLEANUP_OFFLINE_CONSUMER = "CLEANUP_OFFLINE_CONSUMER",
     SET_QUEUE_RATE_LIMIT = "SET_QUEUE_RATE_LIMIT"
 }
+export declare function loadScriptFiles(redisClient: IRedisClient, cb: ICallback<void>): void;
 //# sourceMappingURL=scripts.d.ts.map

package/dist/cjs/src/common/redis-client/scripts/scripts.js

@@ -1,30 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ELuaScriptName = void 0;
-const fs = __importStar(require("fs"));
+exports.loadScriptFiles = exports.ELuaScriptName = void 0;
 const path_1 = require("path");
 const redis_smq_common_1 = require("redis-smq-common");
 var ELuaScriptName;
@@ -44,42 +20,25 @@ var ELuaScriptName;
     ELuaScriptName["CLEANUP_OFFLINE_CONSUMER"] = "CLEANUP_OFFLINE_CONSUMER";
     ELuaScriptName["SET_QUEUE_RATE_LIMIT"] = "SET_QUEUE_RATE_LIMIT";
 })(ELuaScriptName = exports.ELuaScriptName || (exports.ELuaScriptName = {}));
-redis_smq_common_1.RedisClientAbstract.addScript(ELuaScriptName.PUBLISH_SCHEDULED_MESSAGE, fs
-    .readFileSync((0, path_1.resolve)((0, redis_smq_common_1.getDirname)(), './lua/publish-scheduled-message.lua'))
-    .toString());
-redis_smq_common_1.RedisClientAbstract.addScript(ELuaScriptName.PUBLISH_MESSAGE, fs
-    .readFileSync((0, path_1.resolve)((0, redis_smq_common_1.getDirname)(), './lua/publish-message.lua'))
-    .toString());
-redis_smq_common_1.RedisClientAbstract.addScript(ELuaScriptName.REQUEUE_MESSAGE, fs
-    .readFileSync((0, path_1.resolve)((0, redis_smq_common_1.getDirname)(), './lua/requeue-message.lua'))
-    .toString());
-redis_smq_common_1.RedisClientAbstract.addScript(ELuaScriptName.SCHEDULE_MESSAGE, fs
-    .readFileSync((0, path_1.resolve)((0, redis_smq_common_1.getDirname)(), './lua/schedule-message.lua'))
-    .toString());
-redis_smq_common_1.RedisClientAbstract.addScript(ELuaScriptName.HAS_QUEUE_RATE_EXCEEDED, fs
-    .readFileSync((0, path_1.resolve)((0, redis_smq_common_1.getDirname)(), './lua/has-queue-rate-exceeded.lua'))
-    .toString());
-redis_smq_common_1.RedisClientAbstract.addScript(ELuaScriptName.CREATE_QUEUE, fs.readFileSync((0, path_1.resolve)((0, redis_smq_common_1.getDirname)(), './lua/create-queue.lua')).toString());
-redis_smq_common_1.RedisClientAbstract.addScript(ELuaScriptName.INIT_CONSUMER_QUEUE, fs
-    .readFileSync((0, path_1.resolve)((0, redis_smq_common_1.getDirname)(), './lua/init-consumer-queue.lua'))
-    .toString());
-redis_smq_common_1.RedisClientAbstract.addScript(ELuaScriptName.HANDLE_PROCESSING_QUEUE, fs
-    .readFileSync((0, path_1.resolve)((0, redis_smq_common_1.getDirname)(), './lua/handle-processing-queue.lua'))
-    .toString());
-redis_smq_common_1.RedisClientAbstract.addScript(ELuaScriptName.ACKNOWLEDGE_MESSAGE, fs
-    .readFileSync((0, path_1.resolve)((0, redis_smq_common_1.getDirname)(), './lua/acknowledge-message.lua'))
-    .toString());
-redis_smq_common_1.RedisClientAbstract.addScript(ELuaScriptName.DELETE_MESSAGE, fs.readFileSync((0, path_1.resolve)((0, redis_smq_common_1.getDirname)(), './lua/delete-message.lua')).toString());
-redis_smq_common_1.RedisClientAbstract.addScript(ELuaScriptName.FETCH_MESSAGE_FOR_PROCESSING, fs
-    .readFileSync((0, path_1.resolve)((0, redis_smq_common_1.getDirname)(), './lua/fetch-message-for-processing.lua'))
-    .toString());
-redis_smq_common_1.RedisClientAbstract.addScript(ELuaScriptName.DELETE_CONSUMER_GROUP, fs
-    .readFileSync((0, path_1.resolve)((0, redis_smq_common_1.getDirname)(), './lua/delete-consumer-group.lua'))
-    .toString());
-redis_smq_common_1.RedisClientAbstract.addScript(ELuaScriptName.CLEANUP_OFFLINE_CONSUMER, fs
-    .readFileSync((0, path_1.resolve)((0, redis_smq_common_1.getDirname)(), './lua/cleanup-offline-consumer.lua'))
-    .toString());
-redis_smq_common_1.RedisClientAbstract.addScript(ELuaScriptName.SET_QUEUE_RATE_LIMIT, fs
-    .readFileSync((0, path_1.resolve)((0, redis_smq_common_1.getDirname)(), './lua/set-queue-rate-limit.lua'))
-    .toString());
+const dirname = (0, redis_smq_common_1.getDirname)();
+const scriptFileMap = {
+    [ELuaScriptName.PUBLISH_SCHEDULED_MESSAGE]: (0, path_1.resolve)(dirname, './lua/publish-scheduled-message.lua'),
+    [ELuaScriptName.PUBLISH_MESSAGE]: (0, path_1.resolve)(dirname, './lua/publish-message.lua'),
+    [ELuaScriptName.REQUEUE_MESSAGE]: (0, path_1.resolve)(dirname, './lua/requeue-message.lua'),
+    [ELuaScriptName.SCHEDULE_MESSAGE]: (0, path_1.resolve)(dirname, './lua/schedule-message.lua'),
+    [ELuaScriptName.HAS_QUEUE_RATE_EXCEEDED]: (0, path_1.resolve)(dirname, './lua/has-queue-rate-exceeded.lua'),
+    [ELuaScriptName.CREATE_QUEUE]: (0, path_1.resolve)(dirname, './lua/create-queue.lua'),
+    [ELuaScriptName.INIT_CONSUMER_QUEUE]: (0, path_1.resolve)(dirname, './lua/init-consumer-queue.lua'),
+    [ELuaScriptName.HANDLE_PROCESSING_QUEUE]: (0, path_1.resolve)(dirname, './lua/handle-processing-queue.lua'),
+    [ELuaScriptName.ACKNOWLEDGE_MESSAGE]: (0, path_1.resolve)(dirname, './lua/acknowledge-message.lua'),
+    [ELuaScriptName.DELETE_MESSAGE]: (0, path_1.resolve)(dirname, './lua/delete-message.lua'),
+    [ELuaScriptName.FETCH_MESSAGE_FOR_PROCESSING]: (0, path_1.resolve)(dirname, './lua/fetch-message-for-processing.lua'),
+    [ELuaScriptName.DELETE_CONSUMER_GROUP]: (0, path_1.resolve)(dirname, './lua/delete-consumer-group.lua'),
+    [ELuaScriptName.CLEANUP_OFFLINE_CONSUMER]: (0, path_1.resolve)(dirname, './lua/cleanup-offline-consumer.lua'),
+    [ELuaScriptName.SET_QUEUE_RATE_LIMIT]: (0, path_1.resolve)(dirname, './lua/set-queue-rate-limit.lua'),
+};
+function loadScriptFiles(redisClient, cb) {
+    redisClient.loadScriptFiles(scriptFileMap, (err) => cb(err));
+}
+exports.loadScriptFiles = loadScriptFiles;
 //# sourceMappingURL=scripts.js.map

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

@@ -1,5 +1,7 @@
 import { ICallback, ILogger, Runnable, TRedisClientEvent, TUnaryFunction } from 'redis-smq-common';
 import { TConsumerEvent } from '../../../common/index.js';
+import { RedisClient } from '../../../common/redis-client/redis-client.js';
+import { EventBus } from '../../event-bus/index.js';
 import { IQueueParsedParams, TQueueExtendedParams } from '../../queue/index.js';
 import { ConsumerHeartbeat } from '../consumer-heartbeat/consumer-heartbeat.js';
 import { MessageHandlerRunner } from '../message-handler-runner/message-handler-runner.js';
@@ -7,8 +9,8 @@ import { TConsumerMessageHandler } from '../types/index.js';
 export declare class Consumer extends Runnable<TConsumerEvent> {
     protected messageHandlerRunner: MessageHandlerRunner;
     protected logger: ILogger;
-    protected redisClient: import("../../../common/redis-client/redis-client-instance.js").RedisClientInstance;
-    protected eventBus: import("../../index.js").EventBusRedisInstance | undefined;
+    protected redisClient: RedisClient;
+    protected eventBus: EventBus | null;
     protected heartbeat: ConsumerHeartbeat | null;
     constructor(enableMultiplexing?: boolean);
     protected onRedisError: TRedisClientEvent['error'];

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

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Consumer = void 0;
 const redis_smq_common_1 = require("redis-smq-common");
-const redis_client_factory_js_1 = require("../../../common/redis-client/redis-client-factory.js");
+const redis_client_js_1 = require("../../../common/redis-client/redis-client.js");
 const index_js_1 = require("../../../config/index.js");
-const event_bus_redis_factory_js_1 = require("../../event-bus/event-bus-redis-factory.js");
+const index_js_2 = require("../../event-bus/index.js");
 const _parse_queue_extended_params_js_1 = require("../../queue/_/_parse-queue-extended-params.js");
 const consumer_heartbeat_js_1 = require("../consumer-heartbeat/consumer-heartbeat.js");
 const message_handler_runner_js_1 = require("../message-handler-runner/message-handler-runner.js");
@@ -13,12 +13,14 @@ const event_bus_publisher_js_1 = require("./event-bus-publisher.js");
 class Consumer extends redis_smq_common_1.Runnable {
     constructor(enableMultiplexing) {
         super();
+        this.eventBus = null;
         this.heartbeat = null;
         this.onRedisError = (error) => {
             this.handleError(error);
         };
         this.setUpHeartbeat = (cb) => {
-            this.heartbeat = new consumer_heartbeat_js_1.ConsumerHeartbeat(this, this.logger);
+            var _a;
+            this.heartbeat = new consumer_heartbeat_js_1.ConsumerHeartbeat(this, this.redisClient, this.logger, (_a = this.eventBus) !== null && _a !== void 0 ? _a : null);
             this.heartbeat.on('consumerHeartbeat.error', (err) => this.handleError(err));
             this.heartbeat.run((err) => cb(err));
         };
@@ -55,14 +57,16 @@ class Consumer extends redis_smq_common_1.Runnable {
         };
         const config = index_js_1.Configuration.getSetConfig();
         this.logger = redis_smq_common_1.logger.getLogger(config.logger, `consumer:${this.id}:message-handler`);
-        this.redisClient = (0, redis_client_factory_js_1.RedisClientFactory)(this.id, (err) => this.handleError(err));
+        this.redisClient = new redis_client_js_1.RedisClient();
+        this.redisClient.on('error', this.onRedisError);
         if (index_js_1.Configuration.getSetConfig().eventBus.enabled) {
-            this.eventBus = (0, event_bus_redis_factory_js_1.EventBusRedisFactory)(this.id, (err) => this.handleError(err));
-            (0, event_bus_publisher_js_1.eventBusPublisher)(this, this.logger);
+            this.eventBus = new index_js_2.EventBus();
+            this.eventBus.on('error', this.onRedisError);
+            (0, event_bus_publisher_js_1.eventBusPublisher)(this, this.eventBus, this.logger);
         }
         this.messageHandlerRunner = enableMultiplexing
-            ? new multiplexed_message_handler_runner_js_1.MultiplexedMessageHandlerRunner(this, this.logger)
-            : new message_handler_runner_js_1.MessageHandlerRunner(this, this.logger);
+            ? new multiplexed_message_handler_runner_js_1.MultiplexedMessageHandlerRunner(this, this.redisClient, this.logger, this.eventBus)
+            : new message_handler_runner_js_1.MessageHandlerRunner(this, this.redisClient, this.logger, this.eventBus);
         this.messageHandlerRunner.on('consumer.messageHandlerRunner.error', (err) => this.handleError(err));
     }
     goingUp() {

package/dist/cjs/src/lib/consumer/consumer/event-bus-publisher.d.ts

@@ -1,4 +1,5 @@
 import { ILogger } from 'redis-smq-common';
+import { EventBus } from '../../event-bus/index.js';
 import { Consumer } from './consumer.js';
-export declare function eventBusPublisher(consumer: Consumer, logger: ILogger): void;
+export declare function eventBusPublisher(consumer: Consumer, eventBus: EventBus, logger: ILogger): void;
 //# sourceMappingURL=event-bus-publisher.d.ts.map

package/dist/cjs/src/lib/consumer/consumer/event-bus-publisher.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.eventBusPublisher = void 0;
-const event_bus_redis_factory_js_1 = require("../../event-bus/event-bus-redis-factory.js");
-function eventBusPublisher(consumer, logger) {
-    const eventBus = (0, event_bus_redis_factory_js_1.EventBusRedisFactory)(consumer.getId(), () => void 0);
+function eventBusPublisher(consumer, eventBus, logger) {
     const up = (...args) => {
         const instance = eventBus.getInstance();
         if (instance instanceof Error)

package/dist/cjs/src/lib/consumer/consumer-heartbeat/consumer-heartbeat.d.ts

@@ -1,5 +1,7 @@
 import { ICallback, ILogger, IRedisClient, Runnable, Timer } from 'redis-smq-common';
 import { TConsumerHeartbeatEvent } from '../../../common/index.js';
+import { RedisClient } from '../../../common/redis-client/redis-client.js';
+import { EventBus } from '../../event-bus/index.js';
 import { Consumer } from '../consumer/consumer.js';
 import { IConsumerHeartbeat } from '../types/index.js';
 export declare class ConsumerHeartbeat extends Runnable<TConsumerHeartbeatEvent> {
@@ -8,9 +10,8 @@ export declare class ConsumerHeartbeat extends Runnable<TConsumerHeartbeatEvent>
     protected keyConsumerHeartbeat: string;
     protected consumer: Consumer;
     protected logger: ILogger;
-    protected redisClient: import("../../../common/redis-client/redis-client-instance.js").RedisClientInstance;
-    protected eventBus: import("../../index.js").EventBusRedisInstance | undefined;
-    constructor(consumer: Consumer, logger: ILogger);
+    protected redisClient: RedisClient;
+    constructor(consumer: Consumer, redisClient: RedisClient, logger: ILogger, eventBus: EventBus | null);
     protected getLogger(): ILogger;
     protected getPayload(): IConsumerHeartbeat;
     protected beat(): void;

package/dist/cjs/src/lib/consumer/consumer-heartbeat/consumer-heartbeat.js

@@ -26,10 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConsumerHeartbeat = void 0;
 const os = __importStar(require("os"));
 const redis_smq_common_1 = require("redis-smq-common");
-const redis_client_factory_js_1 = require("../../../common/redis-client/redis-client-factory.js");
 const redis_keys_js_1 = require("../../../common/redis-keys/redis-keys.js");
-const index_js_1 = require("../../../config/index.js");
-const event_bus_redis_factory_js_1 = require("../../event-bus/event-bus-redis-factory.js");
 const event_bus_publisher_js_1 = require("./event-bus-publisher.js");
 const cpuUsageStatsRef = {
     cpuUsage: process.cpuUsage(),
@@ -53,14 +50,13 @@ function cpuUsage() {
             100).toFixed(1) }, cpuUsageDiff);
 }
 class ConsumerHeartbeat extends redis_smq_common_1.Runnable {
-    constructor(consumer, logger) {
+    constructor(consumer, redisClient, logger, eventBus) {
         super();
         this.consumer = consumer;
         this.logger = logger;
-        this.redisClient = (0, redis_client_factory_js_1.RedisClientFactory)(consumer.getId(), (err) => this.handleError(err));
-        if (index_js_1.Configuration.getSetConfig().eventBus.enabled) {
-            this.eventBus = (0, event_bus_redis_factory_js_1.EventBusRedisFactory)(consumer.getId(), (err) => this.handleError(err));
-            (0, event_bus_publisher_js_1.eventBusPublisher)(this, this.consumer.getId(), this.logger);
+        this.redisClient = redisClient;
+        if (eventBus) {
+            (0, event_bus_publisher_js_1.eventBusPublisher)(this, eventBus, this.logger);
         }
         const { keyConsumerHeartbeat } = redis_keys_js_1.redisKeys.getConsumerKeys(consumer.getId());
         this.keyConsumerHeartbeat = keyConsumerHeartbeat;
@@ -136,11 +132,9 @@ class ConsumerHeartbeat extends redis_smq_common_1.Runnable {
             (cb) => {
                 this.timer.reset();
                 const redisClient = this.redisClient.getInstance();
-                if (redisClient instanceof redis_smq_common_1.RedisClientAbstract) {
-                    redisClient.del(this.keyConsumerHeartbeat, () => cb());
-                }
-                else
-                    cb();
+                if (redisClient instanceof Error)
+                    return cb();
+                redisClient.del(this.keyConsumerHeartbeat, () => cb());
             },
         ].concat(super.goingDown());
     }

package/dist/cjs/src/lib/consumer/consumer-heartbeat/event-bus-publisher.d.ts

@@ -1,4 +1,5 @@
 import { ILogger } from 'redis-smq-common';
+import { EventBus } from '../../event-bus/index.js';
 import { ConsumerHeartbeat } from './consumer-heartbeat.js';
-export declare function eventBusPublisher(consumerHeartbeat: ConsumerHeartbeat, consumerId: string, logger: ILogger): void;
+export declare function eventBusPublisher(consumerHeartbeat: ConsumerHeartbeat, eventBus: EventBus, logger: ILogger): void;
 //# sourceMappingURL=event-bus-publisher.d.ts.map

package/dist/cjs/src/lib/consumer/consumer-heartbeat/event-bus-publisher.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.eventBusPublisher = void 0;
-const event_bus_redis_factory_js_1 = require("../../event-bus/event-bus-redis-factory.js");
-function eventBusPublisher(consumerHeartbeat, consumerId, logger) {
-    const eventBus = (0, event_bus_redis_factory_js_1.EventBusRedisFactory)(consumerId, () => void 0);
+function eventBusPublisher(consumerHeartbeat, eventBus, logger) {
     const onConsumerHeartbeat = (...args) => {
         const instance = eventBus.getInstance();
         if (instance instanceof Error)

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

@@ -1,9 +1,11 @@
 import { ICallback, ILogger, Runnable, WorkerCallable } from 'redis-smq-common';
 import { TConsumerConsumeMessageEvent } from '../../../../common/index.js';
-import { RedisClientInstance } from '../../../../common/redis-client/redis-client-instance.js';
+import { RedisClient } from '../../../../common/redis-client/redis-client.js';
+import { EventBus } from '../../../event-bus/index.js';
 import { IMessageTransferable } from '../../../message/index.js';
 import { MessageEnvelope } from '../../../message/message-envelope.js';
 import { IQueueParsedParams } from '../../../queue/index.js';
+import { Consumer } from '../../consumer/consumer.js';
 import { EMessageUnknowledgmentReason, TConsumerMessageHandler } from '../../types/index.js';
 export declare class ConsumeMessage extends Runnable<TConsumerConsumeMessageEvent> {
     protected logger: ILogger;
@@ -13,9 +15,9 @@ export declare class ConsumeMessage extends Runnable<TConsumerConsumeMessageEven
     protected consumerId: string;
     protected messageHandler: TConsumerMessageHandler;
     protected messageHandlerId: string;
-    protected redisClient: RedisClientInstance;
+    protected redisClient: RedisClient;
     protected consumeMessageWorker: WorkerCallable<IMessageTransferable, void> | null;
-    constructor(redisClient: RedisClientInstance, consumerId: string, queue: IQueueParsedParams, messageHandlerId: string, messageHandler: TConsumerMessageHandler, logger: ILogger);
+    constructor(redisClient: RedisClient, consumer: Consumer, queue: IQueueParsedParams, messageHandlerId: string, messageHandler: TConsumerMessageHandler, logger: ILogger, eventBus: EventBus | null);
     protected getLogger(): ILogger;
     protected acknowledgeMessage(message: MessageEnvelope): void;
     protected unacknowledgeMessage(msg: MessageEnvelope, unknowledgmentReason: EMessageUnknowledgmentReason): void;

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

@@ -16,7 +16,7 @@ const index_js_4 = require("../errors/index.js");
 const processing_queue_js_1 = require("../processing-queue/processing-queue.js");
 const event_bus_publisher_js_1 = require("./event-bus-publisher.js");
 class ConsumeMessage extends redis_smq_common_1.Runnable {
-    constructor(redisClient, consumerId, queue, messageHandlerId, messageHandler, logger) {
+    constructor(redisClient, consumer, queue, messageHandlerId, messageHandler, logger, eventBus) {
         super();
         this.consumeMessageWorker = null;
         this.validateMessageHandler = (cb) => {
@@ -36,17 +36,17 @@ class ConsumeMessage extends redis_smq_common_1.Runnable {
                 cb();
         };
         this.queue = queue;
-        this.consumerId = consumerId;
+        this.consumerId = consumer.getId();
         this.messageHandler = messageHandler;
         this.messageHandlerId = messageHandlerId;
         this.redisClient = redisClient;
-        const { keyQueueProcessing } = redis_keys_js_1.redisKeys.getQueueConsumerKeys(this.queue.queueParams, consumerId);
+        const { keyQueueProcessing } = redis_keys_js_1.redisKeys.getQueueConsumerKeys(this.queue.queueParams, this.consumerId);
         const { keyQueueAcknowledged } = redis_keys_js_1.redisKeys.getQueueKeys(this.queue.queueParams, this.queue.groupId);
         this.keyQueueAcknowledged = keyQueueAcknowledged;
         this.keyQueueProcessing = keyQueueProcessing;
         this.logger = logger;
-        if (index_js_1.Configuration.getSetConfig().eventBus.enabled) {
-            (0, event_bus_publisher_js_1.eventBusPublisher)(this, this.consumerId, logger);
+        if (eventBus) {
+            (0, event_bus_publisher_js_1.eventBusPublisher)(this, eventBus, logger);
         }
     }
     getLogger() {

package/dist/cjs/src/lib/consumer/message-handler/consume-message/event-bus-publisher.d.ts

@@ -1,4 +1,5 @@
 import { ILogger } from 'redis-smq-common';
+import { EventBus } from '../../../event-bus/index.js';
 import { ConsumeMessage } from './consume-message.js';
-export declare function eventBusPublisher(consumeMessage: ConsumeMessage, consumerId: string, logger: ILogger): void;
+export declare function eventBusPublisher(consumeMessage: ConsumeMessage, eventBus: EventBus, logger: ILogger): void;
 //# sourceMappingURL=event-bus-publisher.d.ts.map

package/dist/cjs/src/lib/consumer/message-handler/consume-message/event-bus-publisher.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.eventBusPublisher = void 0;
-const event_bus_redis_factory_js_1 = require("../../../event-bus/event-bus-redis-factory.js");
-function eventBusPublisher(consumeMessage, consumerId, logger) {
-    const eventBus = (0, event_bus_redis_factory_js_1.EventBusRedisFactory)(consumerId, () => void 0);
+function eventBusPublisher(consumeMessage, eventBus, logger) {
     const messageDeadLettered = (...args) => {
         const instance = eventBus.getInstance();
         if (instance instanceof Error)

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

@@ -1,9 +1,11 @@
 import { ICallback, ILogger, IRedisClient, Runnable, Timer } from 'redis-smq-common';
 import { TConsumerDequeueMessageEvent } from '../../../../common/index.js';
-import { RedisClientInstance } from '../../../../common/redis-client/redis-client-instance.js';
+import { RedisClient } from '../../../../common/redis-client/redis-client.js';
+import { EventBus } from '../../../event-bus/index.js';
 import { EQueueType, IQueueParsedParams, IQueueRateLimit } from '../../../queue/index.js';
+import { Consumer } from '../../consumer/consumer.js';
 export declare class DequeueMessage extends Runnable<TConsumerDequeueMessageEvent> {
-    protected redisClient: RedisClientInstance;
+    protected redisClient: RedisClient;
     protected queue: IQueueParsedParams;
     protected consumerId: string;
     protected timer: Timer;
@@ -17,12 +19,12 @@ export declare class DequeueMessage extends Runnable<TConsumerDequeueMessageEven
     protected logger: ILogger;
     protected blockUntilMessageReceived: boolean;
     protected autoCloseRedisConnection: boolean;
-    protected eventBus: import("../../../index.js").EventBusRedisInstance;
+    protected eventBus: EventBus;
     protected queueRateLimit: IQueueRateLimit | null;
     protected queueType: EQueueType | null;
     protected idleThreshold: number;
     protected idleTrigger: number;
-    constructor(redisClient: RedisClientInstance, queue: IQueueParsedParams, consumerId: string, logger: ILogger, blockUntilMessageReceived?: boolean, autoCloseRedisConnection?: boolean);
+    constructor(redisClient: RedisClient, queue: IQueueParsedParams, consumer: Consumer, logger: ILogger, eventBus: EventBus | null, blockUntilMessageReceived?: boolean, autoCloseRedisConnection?: boolean);
     protected getLogger(): ILogger;
     protected handleError(err: Error): void;
     protected goingUp(): ((cb: ICallback<void>) => void)[];