redis-smq 7.1.3 → 7.2.1

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # CHANGELOG
 
+## 7.2.1 (2023-02-15)
+
+* build: update deps (e362d7c)
+* fix: use path.resolve() to fix 'no such file or directory' error (b713fbe)
+* build: bump up redis-smq-common to v1.0.6 (fc25b15)
+
+## 7.2.0 (2023-01-06)
+
+* build: fix NPM vulnerability warnings (e2ca247)
+* build: bump up redis-smq-common to v1.0.5 (cc08fe7)
+* docs(readme): update documentation (3713643)
+* refactor(message-state): improve getSetExpired() logic (bb6f262)
+* test(queue): test settings parsing compatibility with v7.1 (0656217)
+* refactor(queue): move out settings parsing logic from getSettings() (cf4ba86)
+* fix(queue): Keep compatibility with v7.1 queue settings schema (d49735e)
+* docs(queue-manager): update queue.getSettings() reference (09214a4)
+* chore: update license (6016483)
+* docs(queues): improve documentation (494a0ce)
+* docs(queue-manager): update docs (77d2e64)
+* fix(examples): use save() method to create queues (9026923)
+* test(queue-manager): test FIFO queues (b97dc4d)
+* refactor(queue-manager): clean up (7f2d693)
+* refactor(message-manager): refactor and clean up (4f55431)
+* feat(queue-manager): allow to create and use FIFO queues (853a29b)
+* docs(message-manager): update scheduled messages API reference (7fa3d23)
+
 ## 7.1.3 (2022-10-26)
 
 * test(FanOutExchangeManager): test binding queues of different types (d2e287c)

package/LICENSE

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

package/README.md

@@ -21,11 +21,11 @@ RedisSMQ is a Node.js library for queuing messages (aka jobs) and processing the
 * **[Multi-Queue Producers](#producer) & [Multi-Queue Consumers](#consumer)**: Offering flexible Producer/Consumer models, with focus on simplicity and without tons of features. This can make RedisSMQ an ideal message broker for your microservices. 
 * **[at-least-once/at-most-once Delivery](/docs/api/message.md#messageprototypesetretrythreshold)**: In case of failures, while delivering or processing a message, RedisSMQ can guaranty that the message will be not lost and redelivered again. When configured to do so, RedisSMQ can also ensure that the message is delivered at-most-once.
 * **[Different Exchange Types](/docs/message-exchanges.md)**: RedisSMQ offers 3 types of exchanges: [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. 
-* **[Message Expiration](/docs/api/message.md#messageprototypesetttl)**: A message will not be delivered if it has been in a queue for longer than a given amount of time, called TTL (time-to-live).
-* **[Message Consumption Timeout](/docs/api/message.md#messageprototypesetconsumetimeout)**: Timeout for consuming messages.
-* **[Queue Rate Limiting](/docs/queue-rate-limiting.md)**: Allowing you to control the rate at which the messages are consumed from a given queue.
+* **[FIFO queues, LIFO queues, and Reliable Priority Queues](/docs/queues.md)**: Provides different queuing strategies that you may use depending on your needs and requirements.
+* **[Message Expiration](/docs/api/message.md#messageprototypesetttl)**: Allowing a message to expire if it has not been delivered within a given amount of time.
+* **[Message Consumption Timeout](/docs/api/message.md#messageprototypesetconsumetimeout)**: Allowing to set up a timeout for consuming messages.
+* **[Queue Rate Limiting](/docs/queue-rate-limiting.md)**: Allowing to control the rate at which the messages are consumed from a given queue.
 * **[Scheduling Messages](/docs/scheduling-messages.md)**: Messages can be configured to be delayed, delivered for N times with an optional period between deliveries, and to be scheduled using CRON expressions.
-* **[Reliable Priority Queues](/docs/queues.md)**: Supports priority messaging.
 * **[Multiplexing](/docs/multiplexing.md)**: A feature which allows message handlers to use a single redis connection to dequeue and consume messages.  
 * **[HTTP API](https://github.com/weyoss/redis-smq-monitor)**: an HTTP interface is provided to interact with the MQ.
 * **[Web UI](https://github.com/weyoss/redis-smq-monitor-client)**: RedisSMQ can be managed also from your web browser.
@@ -69,11 +69,11 @@ RedisSMQ is a Node.js library for queuing messages (aka jobs) and processing the
 
 ## What's new?
 
-**2022.10.06**
+**2023.01.06**
 
-:rocket: RedisSMQ v7.1 is out! This new release extends the message queue features by introducing [Message Exchanges](/docs/message-exchanges.md). 
-Also, the [Web UI](https://github.com/weyoss/redis-smq-monitor-client) has been reworked for better user experience and 
-to fully support message exchanges and other various routine operations. 
+:rocket: RedisSMQ v7.2 is released! Before this release RedisSMQ supported both LIFO queues and Priority queues. 
+With this new release, RedisSMQ now provides FIFO queues as a third option that completes the list of supported queue types. 
+For more details see [Queues](/docs/queues.md).
 
 ## Installation
 
@@ -100,16 +100,15 @@ Producers and consumers exchange data using one or multiple queues that may be c
 
 A queue is responsible for holding messages which are produced by producers and are delivered to consumers.
 
-RedisSMQ supports 2 types of queues: [LIFO Queues and Priority Queues](/docs/queues.md).
-
 ```javascript
 const { QueueManager } = require('redis-smq');
+const { EQueueType } = require('redis-smq/dist/types');
 const config = require('./config')
 
 QueueManager.createInstance(config, (err, queueManager) => {
   if (err) console.log(err);
   // Creating a LIFO queue
-  else queueManager.queue.create('test_queue', false, (err) => console.log(err));
+  else queueManager.queue.save('test_queue', EQueueType.LIFO_QUEUE, (err) => console.log(err));
 })
 ```
 

package/dist/src/common/redis-client/lua/create-queue.lua

@@ -2,10 +2,10 @@
 --- KEYS[2] keyNsQueues (set)
 --- KEYS[3] keyQueues (set)
 --- KEYS[4] keyQueueSettings (hash)
---- KEYS[5] keyQueueSettingsPriorityQueuing
+--- KEYS[5] keyQueueSettingsQueueType
 --- ARGV[1] namespace
 --- ARGV[2] queue
---- ARGV[3] priorityQueuing
+--- ARGV[3] queueType
 if redis.call("SISMEMBER", KEYS[3], ARGV[2]) == 0 then
     redis.call("SADD", KEYS[3], ARGV[2])
     redis.call("SADD", KEYS[2], ARGV[2])

package/dist/src/common/redis-client/lua/enqueue-scheduled-message.lua

@@ -1,5 +1,5 @@
 --- KEYS[1] keyQueuesSettings (hash)
---- KEYS[2] keyQueuesSettingsPriorityQueuing
+--- KEYS[2] keyQueuesSettingsQueueType
 --- KEYS[3] keyQueuePendingWithPriority (hash)
 --- KEYS[4] keyQueuePriority (sorted set)
 --- KEYS[5] keyQueuePending (list)
@@ -9,24 +9,55 @@
 --- ARGV[2] message
 --- ARGV[3] messagePriority
 --- ARGV[4] nextScheduleTimestamp
-local priorityQueuing = redis.call("HGET", KEYS[1], KEYS[2])
-if (priorityQueuing == 'true' and not(ARGV[3] == nil or ARGV[3] == '')) or (priorityQueuing == 'false' and (ARGV[3] == nil or ARGV[3] == '')) then
-    if priorityQueuing == 'true' and not(ARGV[3] == nil or ARGV[3] == '') then
+
+local function deleteMessage()
+    redis.call("ZREM", KEYS[6], ARGV[1])
+    redis.call("HDEL", KEYS[7], ARGV[1])
+end
+
+local function publishMessage(queueType)
+    if queueType == "0" or queueType == "1" then
+        if not(ARGV[3] == nil or ARGV[3] == '') then
+            return "PRIORITY_QUEUING_NOT_ENABLED"
+        end
+        if queueType == "0" then
+            redis.call("RPUSH", KEYS[5], ARGV[2])
+        else
+            redis.call("LPUSH", KEYS[5], ARGV[2])
+        end
+        return "OK"
+    end
+    if queueType == "2" then
+        if ARGV[3] == nil or ARGV[3] == "" then
+            return "MESSAGE_PRIORITY_REQUIRED"
+        end
         redis.call("HSET", KEYS[3], ARGV[1], ARGV[2])
         redis.call("ZADD", KEYS[4], ARGV[3], ARGV[1])
-    else
-        redis.call("RPUSH", KEYS[5], ARGV[2])
+        return "OK"
     end
-    if ARGV[4] == '0' then
-        redis.call("ZREM", KEYS[6], ARGV[1])
-        redis.call("HDEL", KEYS[7], ARGV[1])
+    return "UNKNOWN_QUEUE_TYPE"
+end
+
+local function scheduleMessage()
+    if ARGV[4] == "0" then
+        deleteMessage()
     else
         redis.call("ZADD", KEYS[6], ARGV[4], ARGV[1])
         redis.call("HSET", KEYS[7], ARGV[1], ARGV[2])
     end
-    return 1
+end
+
+local queueType = redis.call("HGET", KEYS[1], KEYS[2])
+if queueType == false then
+    deleteMessage()
+    return "QUEUE_NOT_FOUND"
+end
+
+local result = publishMessage(queueType)
+if result == "OK" then
+    scheduleMessage()
 else
-    redis.call("ZREM", KEYS[6], ARGV[1])
-    redis.call("HDEL", KEYS[7], ARGV[1])
-    return 0
+    deleteMessage()
 end
+
+return result

package/dist/src/common/redis-client/lua/publish-message.lua

@@ -1,16 +1,16 @@
 --- KEYS[1] keyQueueSettings
---- KEYS[2] keyQueueSettingsPriorityQueuing
+--- KEYS[2] keyQueueSettingsQueueType
 --- KEYS[3] keyQueuePendingPriorityMessages (hash)
 --- KEYS[4] keyQueuePendingPriorityMessageIds (sorted set)
 --- KEYS[5] keyQueuePending (list)
 --- ARGV[1] message id
 --- ARGV[2] message
 --- ARGV[3] messagePriority
-local priorityQueuing = redis.call("HGET", KEYS[1], KEYS[2])
-if priorityQueuing == false then
+local queueType = redis.call("HGET", KEYS[1], KEYS[2])
+if queueType == false then
     return 'QUEUE_NOT_FOUND'
 end
-if priorityQueuing == 'true' then
+if queueType == '2' then
     if ARGV[3] == nil or ARGV[3] == '' then
         return 'MESSAGE_PRIORITY_REQUIRED'
     end
@@ -21,6 +21,12 @@ end
 if not(ARGV[3] == nil or ARGV[3] == '') then
    return 'PRIORITY_QUEUING_NOT_ENABLED'
 end
-redis.call("RPUSH", KEYS[5], ARGV[2])
+if queueType == '0' then
+    redis.call("RPUSH", KEYS[5], ARGV[2])
+elseif queueType == '1' then
+    redis.call("LPUSH", KEYS[5], ARGV[2])
+else
+    return 'UNKNOWN_QUEUE_TYPE'
+end
 return 'OK'
 

package/dist/src/common/redis-client/lua/requeue-message.lua

@@ -1,5 +1,5 @@
 --- KEYS[1] keyQueueSettings (hash)
---- KEYS[2] keyQueueSettingsPriorityQueuing 
+--- KEYS[2] keyQueueSettingsQueueType
 --- KEYS[3] keyQueuePendingWithPriority (hash)
 --- KEYS[4] keyQueuePriority (sorted set)
 --- KEYS[5] keyQueuePending (list)
@@ -10,13 +10,17 @@
 --- ARGV[4] fromMessage
 local result = redis.call("LREM", KEYS[6], 1, ARGV[4])
 if result then
-    local priorityQueuing = redis.call("HGET", KEYS[1], KEYS[2])
-    if priorityQueuing == 'true' and not(ARGV[3] == nil or ARGV[3] == '') then
+    local queueType = redis.call("HGET", KEYS[1], KEYS[2])
+    if queueType == '2' and not(ARGV[3] == nil or ARGV[3] == '') then
         redis.call("HSET", KEYS[3], ARGV[1], ARGV[2])
         redis.call("ZADD", KEYS[4], ARGV[3], ARGV[1])
         return 1
-    elseif priorityQueuing == 'false' and (ARGV[3] == nil or ARGV[3] == '') then
-        redis.call("RPUSH", KEYS[5], ARGV[2])    
+    elseif (queueType == '0' or queueType == '1') and (ARGV[3] == nil or ARGV[3] == '') then
+        if queueType == '0' then
+            redis.call("RPUSH", KEYS[5], ARGV[2])
+        else
+            redis.call("LPUSH", KEYS[5], ARGV[2])
+        end
         return 1
     end
 end

package/dist/src/common/redis-client/lua/schedule-message.lua

@@ -1,16 +1,16 @@
 --- KEYS[1] keyQueueSettings
---- KEYS[2] keyQueueSettingsPriorityQueuing
+--- KEYS[2] keyQueueSettingsQueueType
 --- KEYS[3] keyScheduledMessages (sorted set)
 --- KEYS[4] keyScheduledMessagesIndex (hash)
 --- ARGV[1] message id
 --- ARGV[2] message
 --- ARGV[3] scheduleTimestamp
 --- ARGV[4] message priority
-local priorityQueuing = redis.call("HGET", KEYS[1], KEYS[2])
-if (priorityQueuing == false) then
+local queueType = redis.call("HGET", KEYS[1], KEYS[2])
+if (queueType == false) then
     return 'QUEUE_NOT_FOUND'
 end
-if priorityQueuing == 'true' then
+if queueType == '2' then
     if ARGV[4] == nil or ARGV[4] == '' then
         return 'MESSAGE_PRIORITY_REQUIRED'
     end

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ELuaScriptName = void 0;
 const redis_smq_common_1 = require("redis-smq-common");
 const fs = require("fs");
+const path_1 = require("path");
 var ELuaScriptName;
 (function (ELuaScriptName) {
     ELuaScriptName["ENQUEUE_SCHEDULED_MESSAGE"] = "ENQUEUE_SCHEDULED_MESSAGE";
@@ -13,11 +14,17 @@ var ELuaScriptName;
     ELuaScriptName["CREATE_QUEUE"] = "CREATE_QUEUE";
     ELuaScriptName["INIT_CONSUMER_QUEUE"] = "INIT_CONSUMER_QUEUE";
 })(ELuaScriptName = exports.ELuaScriptName || (exports.ELuaScriptName = {}));
-redis_smq_common_1.RedisClient.addScript(ELuaScriptName.ENQUEUE_SCHEDULED_MESSAGE, fs.readFileSync(`${__dirname}/lua/enqueue-scheduled-message.lua`).toString());
-redis_smq_common_1.RedisClient.addScript(ELuaScriptName.PUBLISH_MESSAGE, fs.readFileSync(`${__dirname}/lua/publish-message.lua`).toString());
-redis_smq_common_1.RedisClient.addScript(ELuaScriptName.REQUEUE_MESSAGE, fs.readFileSync(`${__dirname}/lua/requeue-message.lua`).toString());
-redis_smq_common_1.RedisClient.addScript(ELuaScriptName.SCHEDULE_MESSAGE, fs.readFileSync(`${__dirname}/lua/schedule-message.lua`).toString());
-redis_smq_common_1.RedisClient.addScript(ELuaScriptName.HAS_QUEUE_RATE_EXCEEDED, fs.readFileSync(`${__dirname}/lua/has-queue-rate-exceeded.lua`).toString());
-redis_smq_common_1.RedisClient.addScript(ELuaScriptName.CREATE_QUEUE, fs.readFileSync(`${__dirname}/lua/create-queue.lua`).toString());
-redis_smq_common_1.RedisClient.addScript(ELuaScriptName.INIT_CONSUMER_QUEUE, fs.readFileSync(`${__dirname}/lua/init-consumer-queue.lua`).toString());
+redis_smq_common_1.RedisClient.addScript(ELuaScriptName.ENQUEUE_SCHEDULED_MESSAGE, fs
+    .readFileSync((0, path_1.resolve)(__dirname, './lua/enqueue-scheduled-message.lua'))
+    .toString());
+redis_smq_common_1.RedisClient.addScript(ELuaScriptName.PUBLISH_MESSAGE, fs.readFileSync((0, path_1.resolve)(__dirname, './lua/publish-message.lua')).toString());
+redis_smq_common_1.RedisClient.addScript(ELuaScriptName.REQUEUE_MESSAGE, fs.readFileSync((0, path_1.resolve)(__dirname, './lua/requeue-message.lua')).toString());
+redis_smq_common_1.RedisClient.addScript(ELuaScriptName.SCHEDULE_MESSAGE, fs.readFileSync((0, path_1.resolve)(__dirname, './lua/schedule-message.lua')).toString());
+redis_smq_common_1.RedisClient.addScript(ELuaScriptName.HAS_QUEUE_RATE_EXCEEDED, fs
+    .readFileSync((0, path_1.resolve)(__dirname, './lua/has-queue-rate-exceeded.lua'))
+    .toString());
+redis_smq_common_1.RedisClient.addScript(ELuaScriptName.CREATE_QUEUE, fs.readFileSync((0, path_1.resolve)(__dirname, './lua/create-queue.lua')).toString());
+redis_smq_common_1.RedisClient.addScript(ELuaScriptName.INIT_CONSUMER_QUEUE, fs
+    .readFileSync((0, path_1.resolve)(__dirname, './lua/init-consumer-queue.lua'))
+    .toString());
 //# sourceMappingURL=redis-client.js.map

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

@@ -1,4 +1,4 @@
-import { TQueueParams, TQueueRateLimit } from '../../../../types';
+import { EQueueType, TQueueParams, TQueueRateLimit } from '../../../../types';
 import { redisKeys } from '../../../common/redis-keys/redis-keys';
 import { RedisClient, Ticker } from 'redis-smq-common';
 import { MessageHandler } from './message-handler';
@@ -11,12 +11,13 @@ export declare class DequeueMessage {
     protected queueRateLimit: TQueueRateLimit | null;
     protected ticker: Ticker;
     protected messageHandler: MessageHandler;
-    protected priorityQueuing: boolean;
+    protected queueType: EQueueType | null;
     constructor(messageHandler: MessageHandler, redisClient: RedisClient);
     protected dequeueMessageWithPriority(cb: ICallback<string | null>): void;
     protected waitForMessage(cb: ICallback<string | null>): void;
     protected dequeueMessage(cb: ICallback<string | null>): void;
     dequeue(): void;
+    protected isPriorityQueuingEnabled(): boolean;
     run(cb: ICallback<void>): void;
     quit(cb: ICallback<void>): void;
 }

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

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DequeueMessage = void 0;
 const os = require("os");
+const types_1 = require("../../../../types");
 const redis_keys_1 = require("../../../common/redis-keys/redis-keys");
 const redis_smq_common_1 = require("redis-smq-common");
 const events_1 = require("../../../common/events/events");
 const message_1 = require("../../message/message");
 const queue_rate_limit_1 = require("../../queue-manager/queue-rate-limit");
-const redis_smq_common_2 = require("redis-smq-common");
 const queue_1 = require("../../queue-manager/queue");
 const redis_client_1 = require("../../../common/redis-client/redis-client");
 const queue_not_found_error_1 = require("../../queue-manager/errors/queue-not-found.error");
@@ -28,7 +28,7 @@ const IPAddresses = (() => {
 class DequeueMessage {
     constructor(messageHandler, redisClient) {
         this.queueRateLimit = null;
-        this.priorityQueuing = false;
+        this.queueType = null;
         this.messageHandler = messageHandler;
         this.redisClient = redisClient;
         this.queue = messageHandler.getQueue();
@@ -60,12 +60,12 @@ class DequeueMessage {
             }
         };
         const deq = () => {
-            if (this.priorityQueuing)
+            if (this.isPriorityQueuingEnabled())
                 this.dequeueMessageWithPriority(cb);
             else
                 this.dequeueMessage(cb);
         };
-        if (this.priorityQueuing || this.queueRateLimit) {
+        if (this.isPriorityQueuingEnabled() || this.queueRateLimit) {
             if (this.queueRateLimit) {
                 queue_rate_limit_1.QueueRateLimit.hasExceeded(this.redisClient, this.queue, this.queueRateLimit, (err, isExceeded) => {
                     if (err)
@@ -83,8 +83,11 @@ class DequeueMessage {
             this.waitForMessage(cb);
         }
     }
+    isPriorityQueuingEnabled() {
+        return this.queueType === types_1.EQueueType.PRIORITY_QUEUE;
+    }
     run(cb) {
-        redis_smq_common_2.async.waterfall([
+        redis_smq_common_1.async.waterfall([
             (cb) => {
                 const { keyQueues, keyQueueConsumers, keyConsumerQueues, keyQueueProcessing, keyProcessingQueues, keyQueueProcessingQueues, } = this.redisKeys;
                 const consumerInfo = {
@@ -119,9 +122,9 @@ class DequeueMessage {
                     if (err)
                         cb(err);
                     else if (!reply)
-                        cb(new redis_smq_common_2.errors.EmptyCallbackReplyError());
+                        cb(new redis_smq_common_1.errors.EmptyCallbackReplyError());
                     else {
-                        this.priorityQueuing = reply.priorityQueuing;
+                        this.queueType = reply.type;
                         this.queueRateLimit = (_a = reply.rateLimit) !== null && _a !== void 0 ? _a : null;
                         cb();
                     }

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

@@ -21,7 +21,7 @@ class MultiplexedDequeueMessage extends dequeue_message_1.DequeueMessage {
             }
         };
         const deq = () => {
-            if (this.priorityQueuing)
+            if (this.isPriorityQueuingEnabled())
                 this.dequeueMessageWithPriority(cb);
             else
                 this.dequeueMessage(cb);

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

@@ -57,8 +57,7 @@ class FanOutExchangeManager {
                         queue_1.Queue.getSettings(this.config, this.redisClient, eQueue, (err, exchangeQueueSetting) => {
                             if (err)
                                 cb(err);
-                            else if ((exchangeQueueSetting === null || exchangeQueueSetting === void 0 ? void 0 : exchangeQueueSetting.priorityQueuing) !==
-                                queueSettings.priorityQueuing)
+                            else if ((exchangeQueueSetting === null || exchangeQueueSetting === void 0 ? void 0 : exchangeQueueSetting.type) !== queueSettings.type)
                                 cb(new fan_out_exchange_queue_error_1.FanOutExchangeQueueError());
                             else
                                 cb(null, queueSettings);

package/dist/src/lib/message/message-state.js

@@ -105,17 +105,12 @@ class MessageState {
         return this.expired;
     }
     getSetExpired(ttl, createdAt) {
-        if (!this.hasExpired()) {
-            const messageTTL = ttl;
-            if (messageTTL) {
-                const curTime = new Date().getTime();
-                const expired = createdAt + messageTTL - curTime <= 0;
-                this.setExpired(expired);
-                return expired;
-            }
-            return false;
+        if (ttl) {
+            const curTime = new Date().getTime();
+            const expired = createdAt + ttl - curTime <= 0;
+            this.setExpired(expired);
         }
-        return true;
+        return this.hasExpired();
     }
     getSetNextDelay() {
         const retryDelay = this.getSetNextRetryDelay();

package/dist/src/lib/message-manager/message-manager.d.ts

@@ -1,7 +1,7 @@
-import { ScheduledMessages } from './scheduled-messages';
-import { AcknowledgedMessages } from './acknowledged-messages';
-import { DeadLetteredMessages } from './dead-lettered-messages';
-import { PendingMessages } from './pending-messages';
+import { ScheduledMessages } from './messages/scheduled-messages';
+import { AcknowledgedMessages } from './messages/acknowledged-messages';
+import { DeadLetteredMessages } from './messages/dead-lettered-messages';
+import { PendingMessages } from './messages/pending-messages';
 import { ICallback } from 'redis-smq-common/dist/types';
 import { IConfig } from '../../../types';
 export declare class MessageManager {

package/dist/src/lib/message-manager/message-manager.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageManager = void 0;
 const redis_smq_common_1 = require("redis-smq-common");
-const scheduled_messages_1 = require("./scheduled-messages");
-const acknowledged_messages_1 = require("./acknowledged-messages");
-const dead_lettered_messages_1 = require("./dead-lettered-messages");
-const pending_messages_1 = require("./pending-messages");
+const scheduled_messages_1 = require("./messages/scheduled-messages");
+const acknowledged_messages_1 = require("./messages/acknowledged-messages");
+const dead_lettered_messages_1 = require("./messages/dead-lettered-messages");
+const pending_messages_1 = require("./messages/pending-messages");
 const configuration_1 = require("../../config/configuration");
 class MessageManager {
     constructor(redisClient, acknowledgedMessages, deadLetteredMessages, pendingMessages, scheduledMessages) {

package/dist/src/lib/message-manager/message-storage/{list.d.ts → list-message-storage.d.ts}

@@ -13,7 +13,7 @@ declare type TListMessageIdParams = {
     messageId: string;
     sequenceId: number;
 };
-export declare abstract class List extends AbstractMessageStorage<TListKeyMessagesParams, TListMessageIdParams> {
+export declare abstract class ListMessageStorage extends AbstractMessageStorage<TListKeyMessagesParams, TListMessageIdParams> {
     protected getMessageById(key: TListKeyMessagesParams, id: TListMessageIdParams, cb: ICallback<Message>): void;
     protected requeueMessage(key: TListKeyMessagesParams, id: TListMessageIdParams, cb: ICallback<void>): void;
     protected deleteMessage(key: TListKeyMessagesParams, id: TListMessageIdParams, cb: ICallback<void>): void;

package/dist/src/lib/message-manager/message-storage/{list.js → list-message-storage.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.List = void 0;
+exports.ListMessageStorage = void 0;
 const abstract_message_storage_1 = require("./abstract-message-storage");
 const types_1 = require("../../../../types");
 const message_1 = require("../../message/message");
@@ -9,7 +9,7 @@ const message_not_found_error_1 = require("../errors/message-not-found.error");
 const redis_keys_1 = require("../../../common/redis-keys/redis-keys");
 const message_requeue_error_1 = require("../errors/message-requeue.error");
 const redis_client_1 = require("../../../common/redis-client/redis-client");
-class List extends abstract_message_storage_1.AbstractMessageStorage {
+class ListMessageStorage extends abstract_message_storage_1.AbstractMessageStorage {
     getMessageById(key, id, cb) {
         const { keyMessages } = key;
         const { messageId, sequenceId } = id;
@@ -43,7 +43,7 @@ class List extends abstract_message_storage_1.AbstractMessageStorage {
                 const { keyQueueSettings, keyQueuePending, keyQueuePendingPriorityMessageWeight, keyQueuePendingPriorityMessages, } = redis_keys_1.redisKeys.getQueueKeys(queue);
                 this.redisClient.runScript(redis_client_1.ELuaScriptName.REQUEUE_MESSAGE, [
                     keyQueueSettings,
-                    types_1.EQueueSettingType.PRIORITY_QUEUING,
+                    types_1.EQueueSettingType.QUEUE_TYPE,
                     keyQueuePendingPriorityMessages,
                     keyQueuePendingPriorityMessageWeight,
                     keyQueuePending,
@@ -118,5 +118,5 @@ class List extends abstract_message_storage_1.AbstractMessageStorage {
         });
     }
 }
-exports.List = List;
-//# sourceMappingURL=list.js.map
+exports.ListMessageStorage = ListMessageStorage;
+//# sourceMappingURL=list-message-storage.js.map

package/dist/src/lib/message-manager/message-storage/{sorted-set.d.ts → sorted-set-message-storage.d.ts}

@@ -9,7 +9,7 @@ declare type TSortedSetKeyMessagesParams = {
 declare type TSortedSetMessageIdParams = {
     messageId: string;
 };
-export declare abstract class SortedSet extends AbstractMessageStorage<TSortedSetKeyMessagesParams, TSortedSetMessageIdParams> {
+export declare abstract class SortedSetMessageStorage extends AbstractMessageStorage<TSortedSetKeyMessagesParams, TSortedSetMessageIdParams> {
     protected deleteMessage(key: TSortedSetKeyMessagesParams, id: TSortedSetMessageIdParams, cb: ICallback<void>): void;
     protected fetchMessages(key: TSortedSetKeyMessagesParams, skip: number, take: number, cb: ICallback<TGetMessagesReply>): void;
     protected purgeMessages(key: TSortedSetKeyMessagesParams, cb: ICallback<void>): void;

package/dist/src/lib/message-manager/message-storage/{sorted-set.js → sorted-set-message-storage.js}

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SortedSet = void 0;
+exports.SortedSetMessageStorage = void 0;
 const abstract_message_storage_1 = require("./abstract-message-storage");
 const message_1 = require("../../message/message");
 const redis_smq_common_1 = require("redis-smq-common");
 const message_not_found_error_1 = require("../errors/message-not-found.error");
-class SortedSet extends abstract_message_storage_1.AbstractMessageStorage {
+class SortedSetMessageStorage extends abstract_message_storage_1.AbstractMessageStorage {
     deleteMessage(key, id, cb) {
         const { keyMessages, keyMessagesWeight } = key;
         const { messageId } = id;
@@ -97,5 +97,5 @@ class SortedSet extends abstract_message_storage_1.AbstractMessageStorage {
         });
     }
 }
-exports.SortedSet = SortedSet;
-//# sourceMappingURL=sorted-set.js.map
+exports.SortedSetMessageStorage = SortedSetMessageStorage;
+//# sourceMappingURL=sorted-set-message-storage.js.map

package/dist/src/lib/message-manager/{acknowledged-messages.d.ts → messages/acknowledged-messages.d.ts}

@@ -1,7 +1,7 @@
-import { TGetMessagesReply, TQueueParams } from '../../../types';
-import { List } from './message-storage/list';
+import { TGetMessagesReply, TQueueParams } from '../../../../types';
+import { ListMessageStorage } from '../message-storage/list-message-storage';
 import { ICallback } from 'redis-smq-common/dist/types';
-export declare class AcknowledgedMessages extends List {
+export declare class AcknowledgedMessages extends ListMessageStorage {
     list(queue: string | TQueueParams, skip: number, take: number, cb: ICallback<TGetMessagesReply>): void;
     purge(queue: string | TQueueParams, cb: ICallback<void>): void;
     requeue(queue: string | TQueueParams, messageId: string, sequenceId: number, cb: ICallback<void>): void;

package/dist/src/lib/message-manager/{acknowledged-messages.js → messages/acknowledged-messages.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AcknowledgedMessages = void 0;
-const redis_keys_1 = require("../../common/redis-keys/redis-keys");
-const list_1 = require("./message-storage/list");
-const queue_1 = require("../queue-manager/queue");
-class AcknowledgedMessages extends list_1.List {
+const redis_keys_1 = require("../../../common/redis-keys/redis-keys");
+const list_message_storage_1 = require("../message-storage/list-message-storage");
+const queue_1 = require("../../queue-manager/queue");
+class AcknowledgedMessages extends list_message_storage_1.ListMessageStorage {
     list(queue, skip, take, cb) {
         const queueParams = queue_1.Queue.getParams(this.config, queue);
         const { keyQueueAcknowledged } = redis_keys_1.redisKeys.getQueueKeys(queueParams);

package/dist/src/lib/message-manager/{dead-lettered-messages.d.ts → messages/dead-lettered-messages.d.ts}

@@ -1,7 +1,7 @@
-import { TGetMessagesReply, TQueueParams } from '../../../types';
-import { List } from './message-storage/list';
+import { TGetMessagesReply, TQueueParams } from '../../../../types';
+import { ListMessageStorage } from '../message-storage/list-message-storage';
 import { ICallback } from 'redis-smq-common/dist/types';
-export declare class DeadLetteredMessages extends List {
+export declare class DeadLetteredMessages extends ListMessageStorage {
     purge(queue: string | TQueueParams, cb: ICallback<void>): void;
     requeue(queue: string | TQueueParams, messageId: string, sequenceId: number, cb: ICallback<void>): void;
     delete(queue: string | TQueueParams, messageId: string, sequenceId: number, cb: ICallback<void>): void;

package/dist/src/lib/message-manager/{dead-lettered-messages.js → messages/dead-lettered-messages.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeadLetteredMessages = void 0;
-const redis_keys_1 = require("../../common/redis-keys/redis-keys");
-const list_1 = require("./message-storage/list");
-const queue_1 = require("../queue-manager/queue");
-class DeadLetteredMessages extends list_1.List {
+const redis_keys_1 = require("../../../common/redis-keys/redis-keys");
+const list_message_storage_1 = require("../message-storage/list-message-storage");
+const queue_1 = require("../../queue-manager/queue");
+class DeadLetteredMessages extends list_message_storage_1.ListMessageStorage {
     purge(queue, cb) {
         const queueParams = queue_1.Queue.getParams(this.config, queue);
         const { keyQueueDL } = redis_keys_1.redisKeys.getQueueKeys(queueParams);

package/dist/src/lib/message-manager/{pending-messages.d.ts → messages/pending-messages.d.ts}

@@ -1,12 +1,12 @@
 import { RedisClient } from 'redis-smq-common';
-import { IRequiredConfig, TGetMessagesReply, TQueueParams } from '../../../types';
+import { IRequiredConfig, TGetMessagesReply, TQueueParams } from '../../../../types';
 import { PendingPriorityMessages } from './pending-priority-messages';
-import { PendingLifoMessages } from './pending-lifo-messages';
+import { PendingNonPriorityMessages } from './pending-non-priority-messages';
 import { ICallback, ICompatibleLogger } from 'redis-smq-common/dist/types';
 export declare class PendingMessages {
     protected redisClient: RedisClient;
     protected pendingPriorityMessages: PendingPriorityMessages;
-    protected pendingLifoMessages: PendingLifoMessages;
+    protected pendingNonPriorityMessages: PendingNonPriorityMessages;
     protected config: IRequiredConfig;
     constructor(config: IRequiredConfig, redisClient: RedisClient, logger: ICompatibleLogger);
     purge(queue: string | TQueueParams, cb: ICallback<void>): void;

package/dist/src/lib/message-manager/{pending-messages.js → messages/pending-messages.js}

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PendingMessages = void 0;
-const queue_1 = require("../queue-manager/queue");
+const types_1 = require("../../../../types");
+const queue_1 = require("../../queue-manager/queue");
 const pending_priority_messages_1 = require("./pending-priority-messages");
-const pending_lifo_messages_1 = require("./pending-lifo-messages");
+const pending_non_priority_messages_1 = require("./pending-non-priority-messages");
 class PendingMessages {
     constructor(config, redisClient, logger) {
         this.redisClient = redisClient;
         this.config = config;
-        this.pendingLifoMessages = new pending_lifo_messages_1.PendingLifoMessages(config, redisClient, logger);
+        this.pendingNonPriorityMessages = new pending_non_priority_messages_1.PendingNonPriorityMessages(config, redisClient, logger);
         this.pendingPriorityMessages = new pending_priority_messages_1.PendingPriorityMessages(config, redisClient, logger);
     }
     purge(queue, cb) {
@@ -16,11 +17,11 @@ class PendingMessages {
         queue_1.Queue.getSettings(this.config, this.redisClient, queueParams, (err, settings) => {
             if (err)
                 cb(err);
-            else if (settings === null || settings === void 0 ? void 0 : settings.priorityQueuing) {
+            else if ((settings === null || settings === void 0 ? void 0 : settings.type) === types_1.EQueueType.PRIORITY_QUEUE) {
                 this.pendingPriorityMessages.purge(queueParams, cb);
             }
             else {
-                this.pendingLifoMessages.purge(queueParams, cb);
+                this.pendingNonPriorityMessages.purge(queueParams, cb);
             }
         });
     }
@@ -28,11 +29,11 @@ class PendingMessages {
         queue_1.Queue.getSettings(this.config, this.redisClient, queue, (err, settings) => {
             if (err)
                 cb(err);
-            else if (settings === null || settings === void 0 ? void 0 : settings.priorityQueuing) {
+            else if ((settings === null || settings === void 0 ? void 0 : settings.type) === types_1.EQueueType.PRIORITY_QUEUE) {
                 this.pendingPriorityMessages.list(queue, skip, take, cb);
             }
             else {
-                this.pendingLifoMessages.list(queue, skip, take, cb);
+                this.pendingNonPriorityMessages.list(queue, skip, take, cb);
             }
         });
     }
@@ -40,11 +41,11 @@ class PendingMessages {
         queue_1.Queue.getSettings(this.config, this.redisClient, queue, (err, settings) => {
             if (err)
                 cb(err);
-            else if (settings === null || settings === void 0 ? void 0 : settings.priorityQueuing) {
+            else if ((settings === null || settings === void 0 ? void 0 : settings.type) === types_1.EQueueType.PRIORITY_QUEUE) {
                 this.pendingPriorityMessages.delete(queue, messageId, cb);
             }
             else {
-                this.pendingLifoMessages.delete(queue, messageId, sequenceId, cb);
+                this.pendingNonPriorityMessages.delete(queue, messageId, sequenceId, cb);
             }
         });
     }
@@ -52,10 +53,10 @@ class PendingMessages {
         queue_1.Queue.getSettings(this.config, this.redisClient, queue, (err, settings) => {
             if (err)
                 cb(err);
-            else if (settings === null || settings === void 0 ? void 0 : settings.priorityQueuing)
+            else if ((settings === null || settings === void 0 ? void 0 : settings.type) === types_1.EQueueType.PRIORITY_QUEUE)
                 this.pendingPriorityMessages.count(queue, cb);
             else
-                this.pendingLifoMessages.count(queue, cb);
+                this.pendingNonPriorityMessages.count(queue, cb);
         });
     }
 }

package/dist/src/lib/message-manager/{pending-lifo-messages.d.ts → messages/pending-non-priority-messages.d.ts}

@@ -1,7 +1,7 @@
-import { TGetMessagesReply, TQueueParams } from '../../../types';
-import { List } from './message-storage/list';
+import { TGetMessagesReply, TQueueParams } from '../../../../types';
+import { ListMessageStorage } from '../message-storage/list-message-storage';
 import { ICallback } from 'redis-smq-common/dist/types';
-export declare class PendingLifoMessages extends List {
+export declare class PendingNonPriorityMessages extends ListMessageStorage {
     purge(queue: string | TQueueParams, cb: ICallback<void>): void;
     delete(queue: string | TQueueParams, messageId: string, sequenceId: number, cb: ICallback<void>): void;
     list(queue: string | TQueueParams, skip: number, take: number, cb: ICallback<TGetMessagesReply>): void;

package/dist/src/lib/message-manager/{pending-lifo-messages.js → messages/pending-non-priority-messages.js}

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PendingLifoMessages = void 0;
-const redis_keys_1 = require("../../common/redis-keys/redis-keys");
-const message_not_found_error_1 = require("./errors/message-not-found.error");
-const list_1 = require("./message-storage/list");
-const queue_1 = require("../queue-manager/queue");
-class PendingLifoMessages extends list_1.List {
+exports.PendingNonPriorityMessages = void 0;
+const redis_keys_1 = require("../../../common/redis-keys/redis-keys");
+const message_not_found_error_1 = require("../errors/message-not-found.error");
+const list_message_storage_1 = require("../message-storage/list-message-storage");
+const queue_1 = require("../../queue-manager/queue");
+class PendingNonPriorityMessages extends list_message_storage_1.ListMessageStorage {
     purge(queue, cb) {
         const queueParams = queue_1.Queue.getParams(this.config, queue);
         const { keyQueuePending } = redis_keys_1.redisKeys.getQueueKeys(queueParams);
@@ -42,5 +42,5 @@ class PendingLifoMessages extends list_1.List {
         this.countMessages({ keyMessages: keyQueuePending }, cb);
     }
 }
-exports.PendingLifoMessages = PendingLifoMessages;
-//# sourceMappingURL=pending-lifo-messages.js.map
+exports.PendingNonPriorityMessages = PendingNonPriorityMessages;
+//# sourceMappingURL=pending-non-priority-messages.js.map

package/dist/src/lib/message-manager/{pending-priority-messages.d.ts → messages/pending-priority-messages.d.ts}

@@ -1,8 +1,8 @@
-import { TGetMessagesReply, TQueueParams } from '../../../types';
-import { SortedSet } from './message-storage/sorted-set';
+import { TGetMessagesReply, TQueueParams } from '../../../../types';
+import { SortedSetMessageStorage } from '../message-storage/sorted-set-message-storage';
 import { RedisClient } from 'redis-smq-common';
 import { ICallback } from 'redis-smq-common/dist/types';
-export declare class PendingPriorityMessages extends SortedSet {
+export declare class PendingPriorityMessages extends SortedSetMessageStorage {
     delete(queue: string | TQueueParams, messageId: string, cb: ICallback<void>): void;
     purge(queue: string | TQueueParams, cb: ICallback<void>): void;
     list(queue: string | TQueueParams, skip: number, take: number, cb: ICallback<TGetMessagesReply>): void;

package/dist/src/lib/message-manager/{pending-priority-messages.js → messages/pending-priority-messages.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PendingPriorityMessages = void 0;
-const queue_1 = require("../queue-manager/queue");
-const redis_keys_1 = require("../../common/redis-keys/redis-keys");
-const sorted_set_1 = require("./message-storage/sorted-set");
-class PendingPriorityMessages extends sorted_set_1.SortedSet {
+const queue_1 = require("../../queue-manager/queue");
+const redis_keys_1 = require("../../../common/redis-keys/redis-keys");
+const sorted_set_message_storage_1 = require("../message-storage/sorted-set-message-storage");
+class PendingPriorityMessages extends sorted_set_message_storage_1.SortedSetMessageStorage {
     delete(queue, messageId, cb) {
         const queueParams = queue_1.Queue.getParams(this.config, queue);
         const { keyQueuePendingPriorityMessageWeight, keyQueuePendingPriorityMessages, } = redis_keys_1.redisKeys.getQueueKeys(queueParams);

package/dist/src/lib/message-manager/{scheduled-messages.d.ts → messages/scheduled-messages.d.ts}

@@ -1,7 +1,7 @@
-import { TGetMessagesReply } from '../../../types';
-import { SortedSet } from './message-storage/sorted-set';
+import { TGetMessagesReply } from '../../../../types';
+import { SortedSetMessageStorage } from '../message-storage/sorted-set-message-storage';
 import { ICallback } from 'redis-smq-common/dist/types';
-export declare class ScheduledMessages extends SortedSet {
+export declare class ScheduledMessages extends SortedSetMessageStorage {
     delete(messageId: string, cb: ICallback<void>): void;
     purge(cb: ICallback<void>): void;
     list(skip: number, take: number, cb: ICallback<TGetMessagesReply>): void;

package/dist/src/lib/message-manager/{scheduled-messages.js → messages/scheduled-messages.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScheduledMessages = void 0;
-const redis_keys_1 = require("../../common/redis-keys/redis-keys");
-const sorted_set_1 = require("./message-storage/sorted-set");
-class ScheduledMessages extends sorted_set_1.SortedSet {
+const redis_keys_1 = require("../../../common/redis-keys/redis-keys");
+const sorted_set_message_storage_1 = require("../message-storage/sorted-set-message-storage");
+class ScheduledMessages extends sorted_set_message_storage_1.SortedSetMessageStorage {
     delete(messageId, cb) {
         const { keyScheduledMessages, keyScheduledMessageWeight } = redis_keys_1.redisKeys.getMainKeys();
         this.deleteMessage({

package/dist/src/lib/producer/producer.js

@@ -30,7 +30,7 @@ class Producer extends base_1.Base {
         const { keyQueueSettings, keyQueuePendingPriorityMessages, keyQueuePendingPriorityMessageWeight, keyQueuePending, } = redis_keys_1.redisKeys.getQueueKeys(queue);
         redisClient.runScript(redis_client_1.ELuaScriptName.PUBLISH_MESSAGE, [
             keyQueueSettings,
-            types_1.EQueueSettingType.PRIORITY_QUEUING,
+            types_1.EQueueSettingType.QUEUE_TYPE,
             keyQueuePendingPriorityMessages,
             keyQueuePendingPriorityMessageWeight,
             keyQueuePending,

package/dist/src/lib/producer/schedule-message.js

@@ -31,7 +31,7 @@ function scheduleMessage(mixed, message, cb) {
             const messageId = message.getRequiredId();
             mixed.runScript(redis_client_1.ELuaScriptName.SCHEDULE_MESSAGE, [
                 keyQueueSettings,
-                types_1.EQueueSettingType.PRIORITY_QUEUING,
+                types_1.EQueueSettingType.QUEUE_TYPE,
                 keyScheduledMessageWeight,
                 keyScheduledMessages,
             ], [

package/dist/src/lib/queue-manager/queue-metrics.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueueMetrics = void 0;
+const types_1 = require("../../../types");
 const redis_keys_1 = require("../../common/redis-keys/redis-keys");
 const redis_smq_common_1 = require("redis-smq-common");
 const queue_1 = require("./queue");
@@ -25,10 +26,10 @@ class QueueMetrics {
                 if (!settings)
                     cb(new redis_smq_common_1.errors.EmptyCallbackReplyError());
                 else
-                    cb(null, settings.priorityQueuing);
+                    cb(null, settings.type);
             }),
-            (priorityQueuing, cb) => {
-                if (priorityQueuing) {
+            (queueType, cb) => {
+                if (queueType === types_1.EQueueType.PRIORITY_QUEUE) {
                     this.redisClient.zcard(keyQueuePendingPriorityMessageWeight, (err, reply) => {
                         if (err)
                             cb(err);

package/dist/src/lib/queue-manager/queue.d.ts

@@ -1,4 +1,4 @@
-import { IRequiredConfig, TQueueParams, TQueueSettings } from '../../../types';
+import { EQueueType, IRequiredConfig, TQueueParams, TQueueSettings } from '../../../types';
 import { RedisClient } from 'redis-smq-common';
 import { ICallback, ICompatibleLogger } from 'redis-smq-common/dist/types';
 export declare class Queue {
@@ -10,11 +10,16 @@ export declare class Queue {
         queue: TQueueParams;
         settings: TQueueSettings;
     }>): void;
+    save(queue: string | TQueueParams, queueType: EQueueType, cb: ICallback<{
+        queue: TQueueParams;
+        settings: TQueueSettings;
+    }>): void;
     getSettings(queue: string | TQueueParams, cb: ICallback<TQueueSettings>): void;
     exists(queue: string | TQueueParams, cb: ICallback<boolean>): void;
     list(cb: ICallback<TQueueParams[]>): void;
     delete(queue: string | TQueueParams, cb: ICallback<void>): void;
     static getParams(config: IRequiredConfig, queue: string | TQueueParams): TQueueParams;
+    static parseSettings(raw: Record<string, string>): TQueueSettings;
     static getSettings(config: IRequiredConfig, redisClient: RedisClient, queue: string | TQueueParams, cb: ICallback<TQueueSettings>): void;
     static list(redisClient: RedisClient, cb: ICallback<TQueueParams[]>): void;
     static exists(config: IRequiredConfig, redisClient: RedisClient, queue: string | TQueueParams, cb: ICallback<boolean>): void;

package/dist/src/lib/queue-manager/queue.js

@@ -16,6 +16,12 @@ class Queue {
         this.logger = logger;
     }
     create(queue, priorityQueuing, cb) {
+        const queueType = priorityQueuing
+            ? types_1.EQueueType.PRIORITY_QUEUE
+            : types_1.EQueueType.LIFO_QUEUE;
+        this.save(queue, queueType, cb);
+    }
+    save(queue, queueType, cb) {
         const queueParams = Queue.getParams(this.config, queue);
         const { keyQueues, keyNsQueues, keyNamespaces, keyQueueSettings } = redis_keys_1.redisKeys.getQueueKeys(queueParams);
         const queueIndex = JSON.stringify(queueParams);
@@ -24,8 +30,8 @@ class Queue {
             keyNsQueues,
             keyQueues,
             keyQueueSettings,
-            types_1.EQueueSettingType.PRIORITY_QUEUING,
-        ], [queueParams.ns, queueIndex, JSON.stringify(priorityQueuing)], (err, reply) => {
+            types_1.EQueueSettingType.QUEUE_TYPE,
+        ], [queueParams.ns, queueIndex, queueType], (err, reply) => {
             if (err)
                 cb(err);
             else if (!reply)
@@ -72,6 +78,33 @@ class Queue {
             ns,
         };
     }
+    static parseSettings(raw) {
+        const queueSettings = {
+            priorityQueuing: false,
+            type: types_1.EQueueType.LIFO_QUEUE,
+            exchange: null,
+            rateLimit: null,
+        };
+        for (const key in raw) {
+            if (key === types_1.EQueueSettingType.PRIORITY_QUEUING && JSON.parse(raw[key])) {
+                queueSettings.type = types_1.EQueueType.PRIORITY_QUEUE;
+                queueSettings.priorityQueuing = true;
+            }
+            if (key === types_1.EQueueSettingType.QUEUE_TYPE) {
+                queueSettings.type = Number(raw[key]);
+                if (queueSettings.type === types_1.EQueueType.PRIORITY_QUEUE) {
+                    queueSettings.priorityQueuing = true;
+                }
+            }
+            if (key === types_1.EQueueSettingType.RATE_LIMIT) {
+                queueSettings.rateLimit = JSON.parse(raw[key]);
+            }
+            if (key === types_1.EQueueSettingType.EXCHANGE) {
+                queueSettings.exchange = raw[key];
+            }
+        }
+        return queueSettings;
+    }
     static getSettings(config, redisClient, queue, cb) {
         const queueParams = Queue.getParams(config, queue);
         const { keyQueueSettings } = redis_keys_1.redisKeys.getQueueKeys(queueParams);
@@ -81,22 +114,7 @@ class Queue {
             else if (!reply || !Object.keys(reply).length)
                 cb(new queue_not_found_error_1.QueueNotFoundError());
             else {
-                const queueSettings = {
-                    priorityQueuing: false,
-                    exchange: null,
-                    rateLimit: null,
-                };
-                for (const key in reply) {
-                    if (key === types_1.EQueueSettingType.PRIORITY_QUEUING) {
-                        queueSettings.priorityQueuing = JSON.parse(reply[key]);
-                    }
-                    if (key === types_1.EQueueSettingType.RATE_LIMIT) {
-                        queueSettings.rateLimit = JSON.parse(reply[key]);
-                    }
-                    if (key === types_1.EQueueSettingType.EXCHANGE) {
-                        queueSettings.exchange = reply[key];
-                    }
-                }
+                const queueSettings = Queue.parseSettings(reply);
                 cb(null, queueSettings);
             }
         });

package/dist/src/workers/schedule.worker.js

@@ -51,7 +51,7 @@ class ScheduleWorker extends redis_smq_common_1.Worker {
                     message.getRequiredMessageState().setPublishedAt(Date.now());
                     this.redisClient.runScript(redis_client_1.ELuaScriptName.ENQUEUE_SCHEDULED_MESSAGE, [
                         keyQueueSettings,
-                        types_1.EQueueSettingType.PRIORITY_QUEUING,
+                        types_1.EQueueSettingType.QUEUE_TYPE,
                         keyQueuePendingPriorityMessages,
                         keyQueuePendingPriorityMessageWeight,
                         keyQueuePending,

package/dist/types/index.d.ts

@@ -93,14 +93,21 @@ export declare type TQueueRateLimit = {
 };
 export declare type TQueueSettings = {
     priorityQueuing: boolean;
+    type: EQueueType;
     rateLimit: TQueueRateLimit | null;
     exchange: string | null;
 };
 export declare enum EQueueSettingType {
     PRIORITY_QUEUING = "PRIORITY_QUEUING",
+    QUEUE_TYPE = "QUEUE_TYPE",
     RATE_LIMIT = "RATE_LIMIT",
     EXCHANGE = "EXCHANGE"
 }
+export declare enum EQueueType {
+    LIFO_QUEUE = 0,
+    FIFO_QUEUE = 1,
+    PRIORITY_QUEUE = 2
+}
 export declare type TConsumerInfo = {
     ipAddress: string[];
     hostname: string;

package/dist/types/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EExchangeType = exports.EQueueSettingType = exports.EMessageUnacknowledgedCause = exports.EMessageDeadLetterCause = void 0;
+exports.EExchangeType = exports.EQueueType = exports.EQueueSettingType = exports.EMessageUnacknowledgedCause = exports.EMessageDeadLetterCause = void 0;
 var EMessageDeadLetterCause;
 (function (EMessageDeadLetterCause) {
     EMessageDeadLetterCause["TTL_EXPIRED"] = "ttl_expired";
@@ -18,9 +18,16 @@ var EMessageUnacknowledgedCause;
 var EQueueSettingType;
 (function (EQueueSettingType) {
     EQueueSettingType["PRIORITY_QUEUING"] = "PRIORITY_QUEUING";
+    EQueueSettingType["QUEUE_TYPE"] = "QUEUE_TYPE";
     EQueueSettingType["RATE_LIMIT"] = "RATE_LIMIT";
     EQueueSettingType["EXCHANGE"] = "EXCHANGE";
 })(EQueueSettingType = exports.EQueueSettingType || (exports.EQueueSettingType = {}));
+var EQueueType;
+(function (EQueueType) {
+    EQueueType[EQueueType["LIFO_QUEUE"] = 0] = "LIFO_QUEUE";
+    EQueueType[EQueueType["FIFO_QUEUE"] = 1] = "FIFO_QUEUE";
+    EQueueType[EQueueType["PRIORITY_QUEUE"] = 2] = "PRIORITY_QUEUE";
+})(EQueueType = exports.EQueueType || (exports.EQueueType = {}));
 var EExchangeType;
 (function (EExchangeType) {
     EExchangeType[EExchangeType["DIRECT"] = 0] = "DIRECT";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redis-smq",
-  "version": "7.1.3",
+  "version": "7.2.1",
   "description": "A simple high-performance Redis message queue for Node.js.",
   "author": "Weyoss <weyoss@protonmail.com>",
   "license": "MIT",
@@ -34,21 +34,21 @@
   "types": "dist/index.d.ts",
   "dependencies": {
     "bluebird": "3.7.2",
-    "cron-parser": "3.5.0",
+    "cron-parser": "4.7.1",
     "lodash": "4.17.21",
-    "uuid": "8.3.2"
+    "uuid": "9.0.0"
   },
   "peerDependencies": {
-    "redis-smq-common": "^1.0.4"
+    "redis-smq-common": "^1.0.6"
   },
   "devDependencies": {
-    "@types/bluebird": "3.5.36",
+    "@types/bluebird": "3.5.38",
     "@types/debug": "4.1.7",
     "@types/jest": "27.0.2",
-    "@types/lodash": "4.14.175",
+    "@types/lodash": "4.14.191",
     "@types/node": "16.10.2",
     "@types/supertest": "2.0.11",
-    "@types/uuid": "8.3.1",
+    "@types/uuid": "9.0.0",
     "@typescript-eslint/eslint-plugin": "4.32.0",
     "@typescript-eslint/parser": "4.32.0",
     "coveralls": "3.1.1",
@@ -59,7 +59,7 @@
     "jest": "27.2.4",
     "lint-staged": "11.1.2",
     "prettier": "2.4.1",
-    "redis-smq-common": "^1.0.4",
+    "redis-smq-common": "^1.0.6",
     "supertest": "6.1.6",
     "ts-jest": "27.0.5",
     "ts-node": "10.2.1",