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

package/CHANGELOG.md

@@ -1,3 +1,50 @@
+
+
+## [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)
+
+
+### Bug Fixes
+
+* **message:** revert back shutdown method to arrow function ([c4e5ceb](https://github.com/weyoss/redis-smq/commit/c4e5cebb4d9fbd91889618669765698cb80cd044))
+
+
+### Documentation
+
+* **api:** enhance class documentation with detailed descriptions and examples ([67f8a21](https://github.com/weyoss/redis-smq/commit/67f8a21c039e41301e8bfcf2c4ffc4319b02424d))
+* **api:** separate error classes from main classes ([4aa850e](https://github.com/weyoss/redis-smq/commit/4aa850ed5411906d4a38c32a673cf2021498c294))
+* **README:** update HTTP REST API reference link ([9e20a6c](https://github.com/weyoss/redis-smq/commit/9e20a6c08bf47b1a581129f922c9922c64cb7e3d))
+* update logo, improve content readability ([7c921d4](https://github.com/weyoss/redis-smq/commit/7c921d406e05961d92769f2a43c40f7fa955d5fa))
+
+
+### Codebase Refactoring
+
+* improve code structure and readability ([5b4a47c](https://github.com/weyoss/redis-smq/commit/5b4a47cdc1139507a724d1d48202f6d8c6074174))
+
 # Changelog
 
 ## [8.0.0-rc.27](https://github.com/weyoss/redis-smq/compare/v8.0.0-rc.26...v8.0.0-rc.27) (2025-01-09)

package/CONTRIBUTING.md

@@ -0,0 +1,20 @@
+# Contributions
+
+If you want to make RedisSMQ project better, your contributions are very welcome!
+
+## Pull requests
+
+It is best to open an issue in GitHub about what you want to implement / change or to suggest new features.
+
+Before submitting any pull request please make sure that your code does not stick out and consistent with the project
+coding style. You can check the status of your coding style by simply running `npm run lint`.
+
+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 the tests are successfully completed.
+
+## Bugs
+
+If you find any bugs, please do not hesitate to open an issue in GitHub including the case to reproduce the bug
+when possible.

package/README.md

@@ -1,142 +1,109 @@
-> [!IMPORTANT]
-> Currently, RedisSMQ is going under heavy development. Pre-releases at any time may introduce new commits with breaking changes.
-> The master branch always reflects the most recent changes. To view the latest release reference see [RedisSMQ v7.2.3](https://github.com/weyoss/redis-smq/tree/v7.2.3)
-
-<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>
-       <a href="https://github.com/weyoss/redis-smq/actions/workflows/tests.yml"><img src="https://github.com/weyoss/redis-smq/actions/workflows/tests.yml/badge.svg" alt="Tests" style="max-width:100%;" /></a>
-       <a href="https://github.com/weyoss/redis-smq/actions/workflows/codeql.yml" rel="nofollow"><img src="https://github.com/weyoss/redis-smq/actions/workflows/codeql.yml/badge.svg" alt="Code quality" /></a>
-       <a href="https://codecov.io/github/weyoss/redis-smq?branch=master" rel="nofollow"><img src="https://img.shields.io/codecov/c/github/weyoss/redis-smq" alt="Coverage Status" /></a>
-       <a href="https://npmjs.org/package/redis-smq" rel="nofollow"><img src="https://img.shields.io/npm/v/redis-smq.svg" alt="NPM version" /></a>
-       <a href="https://npmjs.org/package/redis-smq" rel="nofollow"><img src="https://img.shields.io/npm/dm/redis-smq.svg" alt="NPM downloads" /></a>
-    </p>
-</div>
-
-# RedisSMQ
-
-RedisSMQ is a Node.js library for queuing messages (aka jobs) and processing them asynchronously with consumers. Backed by Redis, it allows scaling up your typical applications with ease of use.
-
-## Features
-
-* [High-performance message processing](docs/performance.md).
-* Flexible Producer/Consumer model which offers [Multi-Queue Producers](docs/producing-messages.md) & [Multi-Queue Consumers](docs/consuming-messages.md).
-* RedisSMQ offers different exchange types: [Direct Exchange](docs/message-exchanges.md#direct-exchange), [Topic Exchange](docs/message-exchanges.md#topic-exchange), and [FanOut Exchange](docs/message-exchanges.md#fanout-exchange) for publishing a message to one or multiple queues.
-* Supports [Point-2-Point](docs/queue-delivery-models.md#point-2-point-delivery-model) and [Pub/Sub](docs/queue-delivery-models.md#pubsub-delivery-model) [delivery models](docs/queue-delivery-models.md).
-* Both [delivery models](docs/queue-delivery-models.md) are reliable. For cases of failure, while delivering/consuming messages, [at-least-once](docs/api/classes/ProducibleMessage.md#setretrythreshold) and [at-most-once](docs/api/classes/ProducibleMessage.md#setretrythreshold) modes may be configured.
-* [3 queuing strategies](docs/queues.md): [FIFO queues](docs/queues.md#fifo-first-in-first-out-queues), [LIFO queues](docs/queues.md#lifo-last-in-first-out-queues), and [Priority Queues](docs/queues.md#priority-queues).
-* [Message Handler Worker Threads](docs/message-handler-worker-threads.md) which allow sandboxing and running your message handler from a separate isolated thread and without affecting the performance of other message handlers from the same consumer.
-* Messages can be [set to expire](docs/api/classes/ProducibleMessage.md#setttl) when not delivered within a given amount of time or to have a [consumption timeout](docs/api/classes/ProducibleMessage.md#setconsumetimeout) while being in process.
-* Queues may be [rate Limited](docs/queue-rate-limiting.md) to control the rate at which the messages are consumed.
-* Has a builtin [scheduler](docs/scheduling-messages.md) allowing messages [to be delayed](docs/api/classes/ProducibleMessage.md#setscheduleddelay), [to be delivered for N times](docs/api/classes/ProducibleMessage.md#setscheduledrepeat) with an optional [period between deliveries](docs/api/classes/ProducibleMessage.md#setscheduledrepeatperiod), or simply [to be scheduled using CRON expressions](docs/api/classes/ProducibleMessage.md#setscheduledcron).
-* Provides [an HTTP interface](https://github.com/weyoss/redis-smq-rest-api) to interact with the message queue using a RESTful API.
-* RedisSMQ can be managed also from your [web browser](https://github.com/weyoss/redis-smq-monitor-client).
-* Either [node-redis](https://github.com/redis/node-redis) or [ioredis](https://github.com/luin/ioredis) can be used as a Redis client.
-* [Highly optimized](https://lgtm.com/projects/g/weyoss/redis-smq/context:javascript), implemented using pure callbacks, with small memory footprint and no memory leaks. See [Callback vs Promise vs Async/Await benchmarks](https://gist.github.com/weyoss/24f9ecbda175d943a48cb7ec38bde821).
-* [Both ESM & CJS modules are supported](docs/esm-cjs-modules.md).
-
-## RedisSMQ Use Case: Multi-Queue Producers & Multi-Queue Consumers
-
-![RedisSMQ Multi-Queue Producers & Multi-Queue Consumers](docs/redis-smq-multi-queue-consumers-producers.png)
-
-## What's new?
-
-:rocket: RC's are now available for RedisSMQ v8! The v8 release will bring major improvements and new features. Some of them are:
-
-- [x] Message queue codebase refactoring and optimizations.
-- [x] Message storage and handling improvements.
-- [x] Message status which allows to retrieve, at any time, the status of a message by its ID.
-- [x] [Pub/Sub Delivery Model and Consumer Groups](docs/queue-delivery-models.md#pubsub-delivery-model).
-- [x] Message handlers sandboxing and message processing performance improvement with [Message Handler Worker Threads](docs/message-handler-worker-threads.md).
-- [x] Cross-system event propagation based on [EventBus](docs/event-bus.md).
-- [x] Better error handling aiming at reporting fatal errors to the application whenever it is possible and without crashing the main process.
-- [x] [ESM Modules Support](docs/esm-cjs-modules.md).
-
-Current RedisSMQ v8 RC status:
-
-- [x] RedisSMQ Common Library
-- [x] RedisSMQ
-- [x] [RESTful API](https://github.com/weyoss/redis-smq-rest-api)
-- [ ] Web UI (WIP)
-
-If you wish to get the latest updates early feel free to try RedisSMQ v8 RC. Do not hesitate to report any bug or issue if encountered. 
-
-Otherwise, stay with [RedisSMQ v7](https://github.com/weyoss/redis-smq/tree/v7.2.3) if you are looking for a fully working release with an HTTP API and a Web UI.
-
-## Installation
+[![RedisSMQ](./logo.png)](https://github.com/weyoss/redis-smq)
 
-```shell
-npm i redis-smq@rc
-```
+A High-Performance Redis Simple Message Queue for Node.js
+
+[![Build](https://img.shields.io/github/actions/workflow/status/weyoss/redis-smq/tests.yml?style=flat-square)](https://github.com/weyoss/redis-smq/actions/workflows/tests.yml)
+[![Code Quality](https://img.shields.io/github/actions/workflow/status/weyoss/redis-smq/codeql.yml?style=flat-square&label=quality)](https://github.com/weyoss/redis-smq/actions/workflows/codeql.yml)
+[![Code Coverage](https://img.shields.io/codecov/c/github/weyoss/redis-smq?style=flat-square)](https://codecov.io/github/weyoss/redis-smq?branch=master)
+[![Latest Release](https://img.shields.io/github/v/release/weyoss/redis-smq?include_prereleases&label=release&color=green&style=flat-square)](https://github.com/weyoss/redis-smq/releases)
+![Downloads](https://img.shields.io/npm/dm/redis-smq.svg?style=flat-square)
+
+**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)
+
+**Use Cases**
 
-Considerations:
+- Managing background tasks, such as email sending or data processing.
+- Efficiently scheduling and retrying tasks.
+- Communication between multiple services in microservices architectures.
+- Handling real-time events in gaming, IoT, or analytics systems.
 
-- Minimal Node.js version is >= 18 (RedisSMQ is tested under current active LTS and maintenance LTS Node.js releases).
-- Minimal Redis server version is 4.0.0.
+**Installation**
 
-## Usage
+To get started with RedisSMQ, you can install the library using npm:
+```bash
+npm i redis-smq@rc
+```
 
-RedisSMQ provides 3 classes in order to work with the message queue: `ProducibleMessage`, `Producer`, and `Consumer`.
+Don't forget to install a Redis client. Choose either node-redis or ioredis:
 
-Producers and consumers exchange data using one or multiple queues that may be created using the [Queue Class](docs/api/classes/Queue.md).
+```shell
+npm install @redis/client
+# or
+npm install ioredis
+```
 
-A queue is responsible for holding messages which are produced by producers and are delivered to consumers.
+**Configuration**
 
-### Creating a queue
+Set up the RedisSMQ configuration during your application bootstrap:
 
 ```javascript
-const queue = new Queue();
-queue.save(
-  'my_queue',
-  EQueueType.LIFO_QUEUE,
-  EQueueDeliveryModel.POINT_TO_POINT,
-  (err) => {
-    if (err) console.error(err);
+'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,
+    },
   },
-);
-```
+};
 
-In the example above we are defining a [LIFO queue](docs/queues.md#lifo-last-in-first-out-queues) with a [POINT-2-POINT delivery model](docs/queue-delivery-models.md#point-2-point-delivery-model).
+Configuration.getSetConfig(config);
+```
 
-See [Queues](docs/queues.md) for more details.
+**Usage**
 
-### Producing a message
+Here's a basic example to create a queue, produce a message, and consume it:
 
 ```javascript
+// Creating a queue
+const queue = new Queue();
+queue.save('my_queue', EQueueType.LIFO_QUEUE, EQueueDeliveryModel.POINT_TO_POINT, (err) => {
+    if (err) console.error(err);
+});
+
+// Producing a message
 const msg = new ProducibleMessage();
 msg.setQueue('my_queue').setBody('Hello Word!');
 producer.produce(msg, (err, ids) => {
-  if (err) console.error(err);
-  else console.log(`Produced message IDs are: ${ids.join(', ')}`);
+    if (err) console.error(err);
+    else console.log(`Produced message IDs are: ${ids.join(', ')}`);
 });
-```
-
-See [Producing Messages](docs/producing-messages.md) for more details.
 
-### Consuming a message
-
-```javascript
+// Consuming a message
 const consumer = new Consumer();
 const messageHandler = (msg, cb) => {
-  console.log(msg.body);
-  cb();
+    console.log(msg.body);
+    cb(); // Acknowledging
 };
 consumer.consume('my_queue', messageHandler, (err) => {
-  if (err) console.error(err);
+    if (err) console.error(err);
 });
 ```
+**Documentation**
 
-See [Consuming Messages](docs/consuming-messages.md) for more details.
-
-## Documentation
-
-See [RedisSMQ Docs](docs/README.md) for more details.
+For more information, visit the [RedisSMQ Docs](docs/README.md).
 
-## Contributing
+**Contributing**
 
-So you are interested in contributing to this project? Please see [CONTRIBUTING.md](https://github.com/weyoss/guidelines/blob/master/CONTRIBUTIONS.md).
+Interested in contributing to this project? Please check out our [CONTRIBUTING.md](CONTRIBUTING.md).
 
-## License
+**License**
 
-[MIT](https://github.com/weyoss/redis-smq/blob/master/LICENSE)
+RedisSMQ is released under the [MIT License](https://github.com/weyoss/redis-smq/blob/master/LICENSE).

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;