redis-smq 8.0.0-rc.20 → 8.0.0-rc.21

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 
 
+## [8.0.0-rc.21](https://github.com/weyoss/redis-smq/compare/v8.0.0-rc.20...v8.0.0-rc.21) (2024-04-29)
+
+
+### Bug Fixes
+
+* **message:** correct logic for deleting multiple messages by IDs ([fdb39d6](https://github.com/weyoss/redis-smq/commit/fdb39d66f3cea59decf8ad29b5efdf827780ba73))
+
+
+### Documentation
+
+* improve RC release status description, clean up ([98910dc](https://github.com/weyoss/redis-smq/commit/98910dcef215494ccee4de01879d0e2f8037213d))
+* update examples ([d80beb2](https://github.com/weyoss/redis-smq/commit/d80beb2af2472ac596a88531786a0ba2681e09dd))
+
+
+### Codebase Refactoring
+
+* optimize imports ([29a0efb](https://github.com/weyoss/redis-smq/commit/29a0efb9e46ce23a6fb14c44222cf987a05ee22a))
+* remove unused error classes and clean up ([15bd959](https://github.com/weyoss/redis-smq/commit/15bd9591d58b5717ee5a8e8191df7388e65a768b))
+* shorten imports ([3bfb8f1](https://github.com/weyoss/redis-smq/commit/3bfb8f1e39011e2f48039b2c534f0fe936b67759))
+
+
+### Tests
+
+* increase code coverage ([e9d84e8](https://github.com/weyoss/redis-smq/commit/e9d84e8b4a9a239246473ca770ce035ce8e66831))
+
+
+### Misc
+
+* clean up package.json ([ff9ff3d](https://github.com/weyoss/redis-smq/commit/ff9ff3d06f61c20f70bd55c34a545278713847d5))
+* update LICENSE ([cb18d44](https://github.com/weyoss/redis-smq/commit/cb18d4449f851df803a0e2cd84410257cbfcfdfd))
+
 ## [8.0.0-rc.20](https://github.com/weyoss/redis-smq/compare/v8.0.0-rc.19...v8.0.0-rc.20) (2024-03-24)
 
 

package/LICENSE

@@ -1,4 +1,6 @@
-Copyright (c) 2017-2023 Weyoss <weyoss@protonmail.com>
+MIT License
+
+Copyright (c) Weyoss <weyoss@protonmail.com>, https://github.com/weyoss
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/README.md

@@ -3,20 +3,19 @@
 > 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"><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
 
-<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>
-
 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
@@ -43,7 +42,27 @@ RedisSMQ is a Node.js library for queuing messages (aka jobs) and processing the
 
 ## What's new?
 
-:rocket: RedisSMQ v8 is coming soon!
+: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
+- [ ] HTTP API (WIP)
+- [ ] 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
 

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

@@ -12,10 +12,10 @@ const index_js_1 = require("../../../config/index.js");
 const event_bus_redis_factory_js_1 = require("../../event-bus/event-bus-redis-factory.js");
 const _parse_queue_extended_params_js_1 = require("../../queue/_/_parse-queue-extended-params.js");
 const _cleanup_offline_consumer_js_1 = require("../consumer-heartbeat/_/_cleanup-offline-consumer.js");
-const event_bus_publisher_js_1 = require("./event-bus-publisher.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");
 const multiplexed_message_handler_runner_js_1 = require("../message-handler-runner/multiplexed-message-handler-runner.js");
+const event_bus_publisher_js_1 = require("./event-bus-publisher.js");
 class Consumer extends redis_smq_common_1.Runnable {
     constructor(enableMultiplexing) {
         super();

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

@@ -28,7 +28,7 @@ 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 configuration_js_1 = require("../../../config/configuration.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 = {
@@ -58,7 +58,7 @@ class ConsumerHeartbeat extends redis_smq_common_1.Runnable {
         this.consumer = consumer;
         this.logger = logger;
         this.redisClient = (0, redis_client_factory_js_1.RedisClientFactory)(consumer.getId(), (err) => this.handleError(err));
-        if (configuration_js_1.Configuration.getSetConfig().eventBus.enabled) {
+        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);
         }

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

@@ -1,8 +1,6 @@
 export { ConsumerError } from './consumer.error.js';
 export { ConsumerMessageHandlerAlreadyExistsError } from './consumer-message-handler-already-exists.error.js';
 export { ConsumerGroupDeleteError } from './consumer-group-delete.error.js';
-export { ConsumerGroupIdNotFoundError } from './consumer-group-id-not-found.error.js';
 export { ConsumerGroupIdNotSupportedError } from './consumer-group-id-not-supported.error.js';
 export { ConsumerGroupIdRequiredError } from './consumer-group-id-required.error.js';
-export { ConsumerInvalidGroupIdError } from './consumer-invalid-group-id.error.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1,18 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConsumerInvalidGroupIdError = exports.ConsumerGroupIdRequiredError = exports.ConsumerGroupIdNotSupportedError = exports.ConsumerGroupIdNotFoundError = exports.ConsumerGroupDeleteError = exports.ConsumerMessageHandlerAlreadyExistsError = exports.ConsumerError = void 0;
+exports.ConsumerGroupIdRequiredError = exports.ConsumerGroupIdNotSupportedError = exports.ConsumerGroupDeleteError = exports.ConsumerMessageHandlerAlreadyExistsError = exports.ConsumerError = void 0;
 var consumer_error_js_1 = require("./consumer.error.js");
 Object.defineProperty(exports, "ConsumerError", { enumerable: true, get: function () { return consumer_error_js_1.ConsumerError; } });
 var consumer_message_handler_already_exists_error_js_1 = require("./consumer-message-handler-already-exists.error.js");
 Object.defineProperty(exports, "ConsumerMessageHandlerAlreadyExistsError", { enumerable: true, get: function () { return consumer_message_handler_already_exists_error_js_1.ConsumerMessageHandlerAlreadyExistsError; } });
 var consumer_group_delete_error_js_1 = require("./consumer-group-delete.error.js");
 Object.defineProperty(exports, "ConsumerGroupDeleteError", { enumerable: true, get: function () { return consumer_group_delete_error_js_1.ConsumerGroupDeleteError; } });
-var consumer_group_id_not_found_error_js_1 = require("./consumer-group-id-not-found.error.js");
-Object.defineProperty(exports, "ConsumerGroupIdNotFoundError", { enumerable: true, get: function () { return consumer_group_id_not_found_error_js_1.ConsumerGroupIdNotFoundError; } });
 var consumer_group_id_not_supported_error_js_1 = require("./consumer-group-id-not-supported.error.js");
 Object.defineProperty(exports, "ConsumerGroupIdNotSupportedError", { enumerable: true, get: function () { return consumer_group_id_not_supported_error_js_1.ConsumerGroupIdNotSupportedError; } });
 var consumer_group_id_required_error_js_1 = require("./consumer-group-id-required.error.js");
 Object.defineProperty(exports, "ConsumerGroupIdRequiredError", { enumerable: true, get: function () { return consumer_group_id_required_error_js_1.ConsumerGroupIdRequiredError; } });
-var consumer_invalid_group_id_error_js_1 = require("./consumer-invalid-group-id.error.js");
-Object.defineProperty(exports, "ConsumerInvalidGroupIdError", { enumerable: true, get: function () { return consumer_invalid_group_id_error_js_1.ConsumerInvalidGroupIdError; } });
 //# sourceMappingURL=index.js.map

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

@@ -28,13 +28,13 @@ const os = __importStar(require("os"));
 const redis_smq_common_1 = require("redis-smq-common");
 const scripts_js_1 = require("../../../../common/redis-client/scripts/scripts.js");
 const redis_keys_js_1 = require("../../../../common/redis-keys/redis-keys.js");
-const configuration_js_1 = require("../../../../config/configuration.js");
+const index_js_1 = require("../../../../config/index.js");
 const _save_consumer_group_js_1 = require("../../../consumer-groups/_/_save-consumer-group.js");
 const event_bus_redis_factory_js_1 = require("../../../event-bus/event-bus-redis-factory.js");
-const index_js_1 = require("../../../queue/index.js");
 const _has_rate_limit_exceeded_js_1 = require("../../../queue-rate-limit/_/_has-rate-limit-exceeded.js");
 const _get_queue_properties_js_1 = require("../../../queue/_/_get-queue-properties.js");
-const index_js_2 = require("../../errors/index.js");
+const index_js_2 = require("../../../queue/index.js");
+const index_js_3 = require("../../errors/index.js");
 const event_bus_publisher_js_1 = require("./event-bus-publisher.js");
 const IPAddresses = (() => {
     var _a;
@@ -118,7 +118,7 @@ class DequeueMessage extends redis_smq_common_1.Runnable {
         this.redisClient = redisClient;
         this.redisClient.on('error', (err) => this.handleError(err));
         this.eventBus = (0, event_bus_redis_factory_js_1.EventBusRedisFactory)(this.consumerId, (err) => this.handleError(err));
-        if (configuration_js_1.Configuration.getSetConfig().eventBus.enabled) {
+        if (index_js_1.Configuration.getSetConfig().eventBus.enabled) {
             (0, event_bus_publisher_js_1.eventBusPublisher)(this, consumerId, logger);
         }
         const { keyConsumerQueues } = redis_keys_js_1.redisKeys.getConsumerKeys(this.consumerId);
@@ -175,7 +175,7 @@ class DequeueMessage extends redis_smq_common_1.Runnable {
                     if (err)
                         cb(err);
                     else if (!reply)
-                        cb(new index_js_1.QueueNotFoundError());
+                        cb(new index_js_2.QueueNotFoundError());
                     else
                         cb();
                 });
@@ -197,15 +197,15 @@ class DequeueMessage extends redis_smq_common_1.Runnable {
                         this.queueRateLimit = (_a = queueProperties.rateLimit) !== null && _a !== void 0 ? _a : null;
                         const { queueParams, groupId } = this.queue;
                         if (queueProperties.deliveryModel ===
-                            index_js_1.EQueueDeliveryModel.POINT_TO_POINT) {
+                            index_js_2.EQueueDeliveryModel.POINT_TO_POINT) {
                             if (groupId)
-                                cb(new index_js_2.ConsumerGroupIdNotSupportedError());
+                                cb(new index_js_3.ConsumerGroupIdNotSupportedError());
                             else
                                 cb();
                         }
-                        else if (queueProperties.deliveryModel === index_js_1.EQueueDeliveryModel.PUB_SUB) {
+                        else if (queueProperties.deliveryModel === index_js_2.EQueueDeliveryModel.PUB_SUB) {
                             if (!groupId)
-                                cb(new index_js_2.ConsumerGroupIdRequiredError());
+                                cb(new index_js_3.ConsumerGroupIdRequiredError());
                             else {
                                 const eventBus = this.eventBus.getInstance();
                                 if (eventBus instanceof Error)
@@ -247,7 +247,7 @@ class DequeueMessage extends redis_smq_common_1.Runnable {
         return this.idleTrigger >= this.idleThreshold;
     }
     isPriorityQueuingEnabled() {
-        return this.queueType === index_js_1.EQueueType.PRIORITY_QUEUE;
+        return this.queueType === index_js_2.EQueueType.PRIORITY_QUEUE;
     }
     dequeue() {
         if (this.isRunning()) {

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

@@ -7,8 +7,8 @@ const redis_client_instance_js_1 = require("../../../../common/redis-client/redi
 const scripts_js_1 = require("../../../../common/redis-client/scripts/scripts.js");
 const redis_keys_js_1 = require("../../../../common/redis-keys/redis-keys.js");
 const index_js_1 = require("../../../../config/index.js");
-const index_js_2 = require("../../../message/index.js");
 const _from_message_js_1 = require("../../../message/_/_from-message.js");
+const index_js_2 = require("../../../message/index.js");
 const index_js_3 = require("../../types/index.js");
 const consume_message_js_1 = require("../consume-message/consume-message.js");
 const dequeue_message_js_1 = require("../dequeue-message/dequeue-message.js");

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

@@ -1,8 +1,8 @@
 import { ILogger } from 'redis-smq-common';
 import { Consumer } from '../consumer/consumer.js';
+import { IConsumerMessageHandlerArgs } from '../types/index.js';
 import { DequeueMessage } from './dequeue-message/dequeue-message.js';
 import { MessageHandler } from './message-handler/message-handler.js';
-import { IConsumerMessageHandlerArgs } from '../types/index.js';
 export declare class MultiplexedMessageHandler extends MessageHandler {
     protected dequeueNextFn: () => void;
     constructor(consumer: Consumer, handlerParams: IConsumerMessageHandlerArgs, logger: ILogger, dequeueNextFn: () => void);

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

@@ -5,8 +5,8 @@ const redis_smq_common_1 = require("redis-smq-common");
 const scripts_js_1 = require("../../../common/redis-client/scripts/scripts.js");
 const redis_keys_js_1 = require("../../../common/redis-keys/redis-keys.js");
 const index_js_1 = require("../../../config/index.js");
-const index_js_2 = require("../../message/index.js");
 const _get_message_js_1 = require("../../message/_/_get-message.js");
+const index_js_2 = require("../../message/index.js");
 const consumer_queues_js_1 = require("../consumer-queues.js");
 const index_js_3 = require("../errors/index.js");
 const index_js_4 = require("../types/index.js");

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

@@ -2,8 +2,8 @@ import { ICallback, ILogger, Runnable } from 'redis-smq-common';
 import { TConsumerMessageHandlerRunnerEvent } from '../../../common/index.js';
 import { IQueueParsedParams } from '../../queue/index.js';
 import { Consumer } from '../consumer/consumer.js';
-import { IConsumerMessageHandlerArgs, TConsumerMessageHandler } from '../types/index.js';
 import { MessageHandler } from '../message-handler/message-handler/message-handler.js';
+import { IConsumerMessageHandlerArgs, TConsumerMessageHandler } from '../types/index.js';
 export declare class MessageHandlerRunner extends Runnable<TConsumerMessageHandlerRunnerEvent> {
     protected consumer: Consumer;
     protected logger: ILogger;

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageHandlerRunner = void 0;
 const redis_smq_common_1 = require("redis-smq-common");
-const configuration_js_1 = require("../../../config/configuration.js");
-const index_js_1 = require("../errors/index.js");
+const index_js_1 = require("../../../config/index.js");
+const index_js_2 = require("../errors/index.js");
 const message_handler_js_1 = require("../message-handler/message-handler/message-handler.js");
 const event_bus_publisher_js_1 = require("./event-bus-publisher.js");
 class MessageHandlerRunner extends redis_smq_common_1.Runnable {
@@ -26,7 +26,7 @@ class MessageHandlerRunner extends redis_smq_common_1.Runnable {
         };
         this.consumer = consumer;
         this.logger = logger;
-        if (configuration_js_1.Configuration.getSetConfig().eventBus.enabled) {
+        if (index_js_1.Configuration.getSetConfig().eventBus.enabled) {
             (0, event_bus_publisher_js_1.eventBusPublisher)(this, this.consumer.getId(), logger);
         }
     }
@@ -116,7 +116,7 @@ class MessageHandlerRunner extends redis_smq_common_1.Runnable {
     addMessageHandler(queue, messageHandler, cb) {
         const handler = this.getMessageHandler(queue);
         if (handler)
-            cb(new index_js_1.ConsumerMessageHandlerAlreadyExistsError(queue));
+            cb(new index_js_2.ConsumerMessageHandlerAlreadyExistsError(queue));
         else {
             const handlerParams = {
                 queue,

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

@@ -1,8 +1,8 @@
 import { ICallback, ILogger, Timer } from 'redis-smq-common';
 import { Consumer } from '../consumer/consumer.js';
 import { MessageHandler } from '../message-handler/message-handler/message-handler.js';
-import { MessageHandlerRunner } from './message-handler-runner.js';
 import { IConsumerMessageHandlerArgs } from '../types/index.js';
+import { MessageHandlerRunner } from './message-handler-runner.js';
 export declare class MultiplexedMessageHandlerRunner extends MessageHandlerRunner {
     protected timer: Timer;
     protected index: number;

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MultiplexedMessageHandlerRunner = void 0;
 const redis_smq_common_1 = require("redis-smq-common");
-const message_handler_runner_js_1 = require("./message-handler-runner.js");
 const multiplexed_message_handler_js_1 = require("../message-handler/multiplexed-message-handler.js");
+const message_handler_runner_js_1 = require("./message-handler-runner.js");
 class MultiplexedMessageHandlerRunner extends message_handler_runner_js_1.MessageHandlerRunner {
     constructor(consumer, logger) {
         super(consumer, logger);

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

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

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

@@ -17,5 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./message-handler.js"), exports);
 __exportStar(require("./consumer-heartbeat.js"), exports);
 __exportStar(require("./consume-message.js"), exports);
-__exportStar(require("./config.js"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const redis_smq_common_1 = require("redis-smq-common");
 const scripts_js_1 = require("../../../common/redis-client/scripts/scripts.js");
 const redis_keys_js_1 = require("../../../common/redis-keys/redis-keys.js");
-const index_js_1 = require("../../message/index.js");
 const _get_message_js_1 = require("../../message/_/_get-message.js");
+const index_js_1 = require("../../message/index.js");
 const index_js_2 = require("../../queue/index.js");
 const worker_js_1 = require("./worker.js");
 class DelayUnacknowledgedWorker extends worker_js_1.Worker {

package/dist/cjs/src/lib/consumer/workers/publish-scheduled.worker.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const redis_smq_common_1 = require("redis-smq-common");
 const scripts_js_1 = require("../../../common/redis-client/scripts/scripts.js");
 const redis_keys_js_1 = require("../../../common/redis-keys/redis-keys.js");
-const index_js_1 = require("../../message/index.js");
 const _from_message_js_1 = require("../../message/_/_from-message.js");
 const _get_message_js_1 = require("../../message/_/_get-message.js");
+const index_js_1 = require("../../message/index.js");
 const index_js_2 = require("../../queue/index.js");
 const worker_js_1 = require("./worker.js");
 class PublishScheduledWorker extends worker_js_1.Worker {

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

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const redis_smq_common_1 = require("redis-smq-common");
 const scripts_js_1 = require("../../../common/redis-client/scripts/scripts.js");
 const redis_keys_js_1 = require("../../../common/redis-keys/redis-keys.js");
-const index_js_1 = require("../../message/index.js");
 const _get_message_js_1 = require("../../message/_/_get-message.js");
+const index_js_1 = require("../../message/index.js");
 const index_js_2 = require("../../queue/index.js");
 const worker_js_1 = require("./worker.js");
 class RequeueUnacknowledgedWorker extends worker_js_1.Worker {

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

@@ -1,6 +1,6 @@
 import { ICallback, ILogger, Runnable } from 'redis-smq-common';
 import { RedisClientInstance } from '../../../common/redis-client/redis-client-instance.js';
-import { IRedisSMQConfigRequired } from '../../../config/types/config.js';
+import { IRedisSMQConfigRequired } from '../../../config/index.js';
 export declare abstract class Worker extends Runnable<Record<string, never>> {
     protected redisClient: RedisClientInstance;
     protected logger: ILogger;

package/dist/cjs/src/lib/consumer-groups/_/_save-consumer-group.js

@@ -2,19 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._saveConsumerGroup = void 0;
 const redis_keys_js_1 = require("../../../common/redis-keys/redis-keys.js");
-const index_js_1 = require("../../consumer/index.js");
-function validateGroupId(groupId) {
-    const lowerCase = groupId.toLowerCase();
-    const filtered = lowerCase.replace(/(?:[a-z][a-z0-9]?)+(?:[-_]?[a-z0-9])*/, '');
-    if (filtered.length) {
-        return false;
-    }
-    return lowerCase;
-}
 function _saveConsumerGroup(redisClient, eventBus, queue, groupId, cb) {
-    const gid = validateGroupId(groupId);
-    if (!gid)
-        cb(new index_js_1.ConsumerInvalidGroupIdError());
+    const gid = redis_keys_js_1.redisKeys.validateRedisKey(groupId);
+    if (gid instanceof Error)
+        cb(gid);
     else {
         const { keyQueueConsumerGroups } = redis_keys_js_1.redisKeys.getQueueKeys(queue, gid);
         redisClient.sadd(keyQueueConsumerGroups, gid, (err, reply) => {

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

@@ -1,6 +1,6 @@
 import { ICallback } from 'redis-smq-common';
 import { RedisClientInstance } from '../../common/redis-client/redis-client-instance.js';
-import { EventBusRedisInstance } from '../event-bus/event-bus-redis-instance.js';
+import { EventBusRedisInstance } from '../event-bus/index.js';
 import { IQueueParams } from '../queue/index.js';
 export declare class ConsumerGroups {
     protected redisClient: RedisClientInstance;

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

@@ -4,7 +4,7 @@ exports.ConsumerGroups = void 0;
 const redis_smq_common_1 = require("redis-smq-common");
 const redis_client_instance_js_1 = require("../../common/redis-client/redis-client-instance.js");
 const index_js_1 = require("../../config/index.js");
-const event_bus_redis_instance_js_1 = require("../event-bus/event-bus-redis-instance.js");
+const index_js_2 = require("../event-bus/index.js");
 const _parse_queue_params_js_1 = require("../queue/_/_parse-queue-params.js");
 const _delete_consumer_group_js_1 = require("./_/_delete-consumer-group.js");
 const _get_consumer_groups_js_1 = require("./_/_get-consumer-groups.js");
@@ -15,7 +15,7 @@ class ConsumerGroups {
             redis_smq_common_1.async.waterfall([this.redisClient.shutdown, this.eventBus.shutdown], cb);
         };
         this.logger = redis_smq_common_1.logger.getLogger(index_js_1.Configuration.getSetConfig().logger, `consumer-groups`);
-        this.eventBus = new event_bus_redis_instance_js_1.EventBusRedisInstance();
+        this.eventBus = new index_js_2.EventBusRedisInstance();
         this.eventBus.on('error', (err) => this.logger.error(err));
         this.redisClient = new redis_client_instance_js_1.RedisClientInstance();
         this.redisClient.on('error', (err) => this.logger.error(err));

package/dist/cjs/src/lib/exchange/exchange-abstract.js

@@ -7,7 +7,6 @@ const index_js_1 = require("../../config/index.js");
 class ExchangeAbstract {
     constructor() {
         this.shutdown = (cb) => {
-            console.log('SSSSSSSSSSSSSSSSSSSSSSSSS');
             this.redisClient.shutdown(cb);
         };
         this.logger = redis_smq_common_1.logger.getLogger(index_js_1.Configuration.getSetConfig().logger, `exchange`);

package/dist/cjs/src/lib/exchange/exchange-direct/_/_get-exchange-direct-transferable.d.ts

@@ -1,4 +1,4 @@
-import { IQueueParams } from '../../../queue/types/queue.js';
+import { IQueueParams } from '../../../queue/index.js';
 import { TExchangeDirectTransferable } from '../../types/exchange.js';
 export declare function _getExchangeDirectTransferable(queue: string | IQueueParams): TExchangeDirectTransferable;
 //# sourceMappingURL=_get-exchange-direct-transferable.d.ts.map

package/dist/cjs/src/lib/exchange/exchange-fan-out/exchange-fan-out.js

@@ -6,8 +6,8 @@ const redis_keys_js_1 = require("../../../common/redis-keys/redis-keys.js");
 const _get_queue_properties_js_1 = require("../../queue/_/_get-queue-properties.js");
 const _parse_queue_params_js_1 = require("../../queue/_/_parse-queue-params.js");
 const index_js_1 = require("../../queue/index.js");
-const exchange_fan_out_error_js_1 = require("../errors/exchange-fan-out.error.js");
-const exchange_error_js_1 = require("../errors/exchange.error.js");
+const index_js_2 = require("../errors/index.js");
+const index_js_3 = require("../errors/index.js");
 const exchange_abstract_js_1 = require("../exchange-abstract.js");
 const _get_fan_out_exchange_queues_js_1 = require("./_/_get-fan-out-exchange-queues.js");
 const _get_queue_fan_out_exchange_js_1 = require("./_/_get-queue-fan-out-exchange.js");
@@ -58,7 +58,7 @@ class ExchangeFanOut extends exchange_abstract_js_1.ExchangeAbstract {
                                 if (err)
                                     cb(err);
                                 else if (reply.length)
-                                    cb(new exchange_error_js_1.ExchangeError(`Exchange has ${reply.length} bound queue(s). Unbind all queues before deleting the exchange.`));
+                                    cb(new index_js_3.ExchangeError(`Exchange has ${reply.length} bound queue(s). Unbind all queues before deleting the exchange.`));
                                 else {
                                     const multi = client.multi();
                                     multi.srem(keyFanOutExchanges, fanOutName);
@@ -105,7 +105,7 @@ class ExchangeFanOut extends exchange_abstract_js_1.ExchangeAbstract {
                                             cb(new redis_smq_common_1.CallbackEmptyReplyError());
                                         else if (exchangeQueueProperties.queueType !==
                                             queueProperties.queueType)
-                                            cb(new exchange_fan_out_error_js_1.ExchangeFanOutError('Binding different types of queues to the same exchange is not allowed.'));
+                                            cb(new index_js_2.ExchangeFanOutError('Binding different types of queues to the same exchange is not allowed.'));
                                         else
                                             cb(null, queueProperties);
                                     });
@@ -165,7 +165,7 @@ class ExchangeFanOut extends exchange_abstract_js_1.ExchangeAbstract {
                             else if (!properties)
                                 cb(new redis_smq_common_1.CallbackEmptyReplyError());
                             else if (properties.exchange !== fanOutName)
-                                cb(new exchange_fan_out_error_js_1.ExchangeFanOutError(`Queue ${queueParams.name}@${queueParams.ns} is not bound to [${fanOutName}] exchange.`));
+                                cb(new index_js_2.ExchangeFanOutError(`Queue ${queueParams.name}@${queueParams.ns} is not bound to [${fanOutName}] exchange.`));
                             else
                                 cb();
                         }),

package/dist/cjs/src/lib/exchange/exchange-topic/exchange-topic.d.ts

@@ -1,5 +1,5 @@
 import { ICallback } from 'redis-smq-common';
-import { IQueueParams } from '../../queue/types/queue.js';
+import { IQueueParams } from '../../queue/index.js';
 import { ExchangeAbstract } from '../exchange-abstract.js';
 import { ITopicParams } from '../types/exchange.js';
 export declare class ExchangeTopic extends ExchangeAbstract<string | ITopicParams> {

package/dist/cjs/src/lib/message/_/_delete-message.js

@@ -5,13 +5,16 @@ const redis_smq_common_1 = require("redis-smq-common");
 const scripts_js_1 = require("../../../common/redis-client/scripts/scripts.js");
 const redis_keys_js_1 = require("../../../common/redis-keys/redis-keys.js");
 const index_js_1 = require("../../queue/index.js");
-const _get_message_js_1 = require("./_get-message.js");
 const index_js_2 = require("../errors/index.js");
 const index_js_3 = require("../types/index.js");
+const _get_message_js_1 = require("./_get-message.js");
 function _deleteMessage(redisClient, messageId, cb) {
     const keys = [];
     const argv = [];
     const ids = typeof messageId === 'string' ? [messageId] : messageId;
+    const { keyScheduledMessages, keyDelayedMessages, keyRequeueMessages } = redis_keys_js_1.redisKeys.getMainKeys();
+    keys.push(keyScheduledMessages, keyDelayedMessages, keyRequeueMessages);
+    argv.push(index_js_1.EQueueProperty.QUEUE_TYPE, index_js_1.EQueueProperty.MESSAGES_COUNT, index_js_1.EQueueType.PRIORITY_QUEUE, index_js_1.EQueueType.LIFO_QUEUE, index_js_1.EQueueType.FIFO_QUEUE, index_js_3.EMessageProperty.STATUS, index_js_3.EMessagePropertyStatus.PROCESSING, index_js_3.EMessagePropertyStatus.ACKNOWLEDGED, index_js_3.EMessagePropertyStatus.PENDING, index_js_3.EMessagePropertyStatus.SCHEDULED, index_js_3.EMessagePropertyStatus.DEAD_LETTERED, index_js_3.EMessagePropertyStatus.UNACK_DELAYING, index_js_3.EMessagePropertyStatus.UNACK_REQUEUING);
     redis_smq_common_1.async.each(ids, (id, _, done) => {
         (0, _get_message_js_1._getMessage)(redisClient, id, (err, message) => {
             if (err)
@@ -20,10 +23,9 @@ function _deleteMessage(redisClient, messageId, cb) {
                 done(new redis_smq_common_1.CallbackEmptyReplyError());
             else {
                 const { keyQueueProperties, keyQueueDL, keyQueueScheduled, keyQueueAcknowledged, keyQueuePriorityPending, keyQueuePending, } = redis_keys_js_1.redisKeys.getQueueKeys(message.getDestinationQueue(), message.getConsumerGroupId());
-                const { keyScheduledMessages, keyDelayedMessages, keyRequeueMessages, } = redis_keys_js_1.redisKeys.getMainKeys();
                 const { keyMessage } = redis_keys_js_1.redisKeys.getMessageKeys(id);
-                keys.push(keyScheduledMessages, keyDelayedMessages, keyRequeueMessages, keyMessage, keyQueueProperties, keyQueuePending, keyQueueDL, keyQueueAcknowledged, keyQueueScheduled, keyQueuePriorityPending);
-                argv.push(index_js_1.EQueueProperty.QUEUE_TYPE, index_js_1.EQueueProperty.MESSAGES_COUNT, index_js_1.EQueueType.PRIORITY_QUEUE, index_js_1.EQueueType.LIFO_QUEUE, index_js_1.EQueueType.FIFO_QUEUE, index_js_3.EMessageProperty.STATUS, index_js_3.EMessagePropertyStatus.PROCESSING, index_js_3.EMessagePropertyStatus.ACKNOWLEDGED, index_js_3.EMessagePropertyStatus.PENDING, index_js_3.EMessagePropertyStatus.SCHEDULED, index_js_3.EMessagePropertyStatus.DEAD_LETTERED, index_js_3.EMessagePropertyStatus.UNACK_DELAYING, index_js_3.EMessagePropertyStatus.UNACK_REQUEUING, id);
+                keys.push(keyMessage, keyQueueProperties, keyQueuePending, keyQueueDL, keyQueueAcknowledged, keyQueueScheduled, keyQueuePriorityPending);
+                argv.push(id);
                 done();
             }
         });

package/dist/cjs/src/lib/message/_/_get-message.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports._getMessages = exports._getMessage = void 0;
 const redis_smq_common_1 = require("redis-smq-common");
 const redis_keys_js_1 = require("../../../common/redis-keys/redis-keys.js");
-const _from_message_js_1 = require("./_from-message.js");
 const index_js_1 = require("../errors/index.js");
 const index_js_2 = require("../types/index.js");
+const _from_message_js_1 = require("./_from-message.js");
 function _getMessage(redisClient, messageId, cb) {
     const { keyMessage } = redis_keys_js_1.redisKeys.getMessageKeys(messageId);
     redisClient.hgetall(keyMessage, (err, reply) => {

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

@@ -5,9 +5,9 @@ const redis_smq_common_1 = require("redis-smq-common");
 const redis_client_instance_js_1 = require("../../common/redis-client/redis-client-instance.js");
 const index_js_1 = require("../../config/index.js");
 const _delete_message_js_1 = require("./_/_delete-message.js");
-const _get_message_js_1 = require("./_/_get-message.js");
 const _get_message_state_js_1 = require("./_/_get-message-state.js");
 const _get_message_status_js_1 = require("./_/_get-message-status.js");
+const _get_message_js_1 = require("./_/_get-message.js");
 class Message {
     constructor() {
         this.shutdown = (cb) => {

package/dist/cjs/src/lib/namespace/errors/namespace-not-found.error.d.ts

@@ -1,5 +1,4 @@
 import { NamespaceError } from './namespace.error.js';
 export declare class NamespaceNotFoundError extends NamespaceError {
-    constructor(namespace: string);
 }
 //# sourceMappingURL=namespace-not-found.error.d.ts.map

package/dist/cjs/src/lib/namespace/errors/namespace-not-found.error.js

@@ -3,9 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NamespaceNotFoundError = void 0;
 const namespace_error_js_1 = require("./namespace.error.js");
 class NamespaceNotFoundError extends namespace_error_js_1.NamespaceError {
-    constructor(namespace) {
-        super(`Namespace (${namespace}) does not exist`);
-    }
 }
 exports.NamespaceNotFoundError = NamespaceNotFoundError;
 //# sourceMappingURL=namespace-not-found.error.js.map