redis-smq 8.2.1 → 8.3.1

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.3.1](https://github.com/weyoss/redis-smq/compare/v8.3.0...v8.3.1) (2025-05-06)
+
+### ⚡ Performance Improvements
+
+- **redis-smq:** optimize and clean up LUA scripts for better Redis performance ([1f8b128](https://github.com/weyoss/redis-smq/commit/1f8b128716e2686bd7d145efaef9b0c9a28daa65))
+
+## [8.3.0](https://github.com/weyoss/redis-smq/compare/v8.2.1...v8.3.0) (2025-05-04)
+
+### 🐛 Bug Fixes
+
+- **redis-smq:** make message deletion more resilient to race conditions and inconsistent states ([3c07bae](https://github.com/weyoss/redis-smq/commit/3c07baee7df4e350d54d4c354d1f2604f8b773ae))
+
+### 📝 Documentation
+
+- **redis-smq:** update class references ([d30542e](https://github.com/weyoss/redis-smq/commit/d30542e89faa2f511ff4fa0f2640446b0c591d89))
+
+### ♻️ Code Refactoring
+
+- **redis-smq:** improve callback patterns and use new async utils ([8cff0d2](https://github.com/weyoss/redis-smq/commit/8cff0d2968561899c30156554aa89420c0fa8479))
+
 ## [8.2.1](https://github.com/weyoss/redis-smq/compare/v8.2.0...v8.2.1) (2025-04-22)
 
 ### 🐛 Bug Fixes

package/dist/cjs/src/common/event-bus/event-bus.d.ts

@@ -0,0 +1,6 @@
+import { EventBusRedisFactory } from 'redis-smq-common';
+import { TRedisSMQEvent } from '../types/index.js';
+export declare class EventBus extends EventBusRedisFactory<TRedisSMQEvent> {
+    constructor();
+}
+//# sourceMappingURL=event-bus.d.ts.map

package/dist/cjs/src/common/event-bus/event-bus.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"event-bus.d.ts","sourceRoot":"","sources":["../../../../../src/common/event-bus/event-bus.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,QAAS,SAAQ,oBAAoB,CAAC,cAAc,CAAC;;CAKjE"}

package/dist/cjs/src/common/event-bus/event-bus.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EventBus = void 0;
+const redis_smq_common_1 = require("redis-smq-common");
+const index_js_1 = require("../../config/index.js");
+class EventBus extends redis_smq_common_1.EventBusRedisFactory {
+    constructor() {
+        const config = index_js_1.Configuration.getSetConfig();
+        super(config.redis);
+    }
+}
+exports.EventBus = EventBus;
+//# sourceMappingURL=event-bus.js.map

package/dist/cjs/src/common/event-bus/event-bus.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"event-bus.js","sourceRoot":"","sources":["../../../../../src/common/event-bus/event-bus.ts"],"names":[],"mappings":";;;AASA,uDAAwD;AACxD,oDAAsD;AAGtD,MAAa,QAAS,SAAQ,uCAAoC;IAChE;QACE,MAAM,MAAM,GAAG,wBAAa,CAAC,YAAY,EAAE,CAAC;QAC5C,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC;CACF;AALD,4BAKC"}

package/dist/cjs/src/common/index.d.ts

@@ -1,2 +1,3 @@
 export * from './types/index.js';
+export * from './event-bus/event-bus.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/cjs/src/common/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/common/index.ts"],"names":[],"mappings":"AASA,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/common/index.ts"],"names":[],"mappings":"AASA,cAAc,kBAAkB,CAAC;AACjC,cAAc,0BAA0B,CAAC"}

package/dist/cjs/src/common/index.js

@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./types/index.js"), exports);
+__exportStar(require("./event-bus/event-bus.js"), exports);
 //# sourceMappingURL=index.js.map

package/dist/cjs/src/common/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/common/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AASA,mDAAiC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/common/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AASA,mDAAiC;AACjC,2DAAyC"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"redis-client.d.ts","sourceRoot":"","sources":["../../../../../src/common/redis-client/redis-client.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,YAAY,EACZ,SAAS,EACT,YAAY,EACZ,YAAY,EAEZ,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAK1B,qBAAa,WAAY,SAAQ,YAAY,CAC3C,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CACjC;IACC,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI,CAAQ;IAC/C,SAAS,CAAC,MAAM,UAAS;IAEzB,SAAS,CAAC,YAAY,CACpB,MAAM,EAAE,YAAY,EACpB,EAAE,EAAE,SAAS,CAAC,YAAY,CAAC,GAC1B,IAAI;IAWP,IAAI,OAAQ,SAAS,CAAC,IAAI,CAAC,KAAG,IAAI,CAEhC;IAEF,cAAc,OAAQ,SAAS,CAAC,YAAY,CAAC,KAAG,IAAI,CAclD;IAEF,QAAQ,OAAQ,SAAS,CAAC,IAAI,CAAC,KAAG,IAAI,CAOpC;IAEF,WAAW,IAAI,YAAY,GAAG,KAAK;CAOpC"}
+{"version":3,"file":"redis-client.d.ts","sourceRoot":"","sources":["../../../../../src/common/redis-client/redis-client.ts"],"names":[],"mappings":"AASA,OAAO,EACL,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,kBAAkB,EACnB,MAAM,kBAAkB,CAAC;AAI1B,qBAAa,WAAY,SAAQ,kBAAkB;gBACrC,GAAG,CAAC,EAAE,YAAY;cAKX,WAAW,CAC5B,MAAM,EAAE,YAAY,EACpB,EAAE,EAAE,SAAS,CAAC,YAAY,CAAC;CAO9B"}

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

@@ -3,66 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisClient = void 0;
 const redis_smq_common_1 = require("redis-smq-common");
 const index_js_1 = require("../../config/index.js");
-const redis_client_instance_lock_error_js_1 = require("./errors/redis-client-instance-lock.error.js");
 const scripts_js_1 = require("./scripts/scripts.js");
-class RedisClient extends redis_smq_common_1.EventEmitter {
-    constructor() {
-        super(...arguments);
-        this.instance = null;
-        this.locked = false;
-        this.init = (cb) => {
-            this.getSetInstance((err) => cb(err));
-        };
-        this.getSetInstance = (cb) => {
-            if (!this.locked) {
-                if (!this.instance) {
-                    this.locked = true;
-                    this.createClient(index_js_1.Configuration.getSetConfig().redis, (err, client) => {
-                        this.locked = false;
-                        if (err)
-                            return cb(err);
-                        if (!client)
-                            return cb(new redis_smq_common_1.CallbackEmptyReplyError());
-                        this.instance = client;
-                        this.instance.on('error', (err) => this.emit('error', err));
-                        cb(null, this.instance);
-                    });
-                }
-                else
-                    cb(null, this.instance);
-            }
-            else
-                cb(new redis_client_instance_lock_error_js_1.RedisClientInstanceLockError());
-        };
-        this.shutdown = (cb) => {
-            if (this.instance) {
-                this.instance.halt(() => {
-                    this.instance = null;
-                    cb();
-                });
-            }
-            else
-                cb();
-        };
+class RedisClient extends redis_smq_common_1.RedisClientFactory {
+    constructor(cfg) {
+        const config = cfg !== null && cfg !== void 0 ? cfg : index_js_1.Configuration.getSetConfig().redis;
+        super(config);
     }
-    createClient(config, cb) {
-        (0, redis_smq_common_1.createRedisClient)(config, (err, client) => {
+    setupClient(client, cb) {
+        client.loadScriptFiles(scripts_js_1.scriptFileMap, (err) => {
             if (err)
-                return cb(err);
-            if (!client)
-                return cb(new redis_smq_common_1.CallbackEmptyReplyError());
-            (0, scripts_js_1.loadScriptFiles)(client, (err) => {
-                if (err)
-                    return cb(err);
-                cb(null, client);
-            });
+                cb(err);
+            cb(null, client);
         });
     }
-    getInstance() {
-        if (!this.instance)
-            return new redis_smq_common_1.PanicError(`Use first getSetInstance() to initialize the RedisClientInstance class`);
-        return this.instance;
-    }
 }
 exports.RedisClient = RedisClient;
 //# sourceMappingURL=redis-client.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"redis-client.js","sourceRoot":"","sources":["../../../../../src/common/redis-client/redis-client.ts"],"names":[],"mappings":";;;AASA,uDAS0B;AAC1B,oDAAsD;AACtD,sGAA4F;AAC5F,qDAAuD;AAEvD,MAAa,WAAY,SAAQ,+BAEhC;IAFD;;QAGY,aAAQ,GAAwB,IAAI,CAAC;QACrC,WAAM,GAAG,KAAK,CAAC;QAgBzB,SAAI,GAAG,CAAC,EAAmB,EAAQ,EAAE;YACnC,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACxC,CAAC,CAAC;QAEF,mBAAc,GAAG,CAAC,EAA2B,EAAQ,EAAE;YACrD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACjB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACnB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;oBACnB,IAAI,CAAC,YAAY,CAAC,wBAAa,CAAC,YAAY,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;wBACpE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;wBACpB,IAAI,GAAG;4BAAE,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;wBACxB,IAAI,CAAC,MAAM;4BAAE,OAAO,EAAE,CAAC,IAAI,0CAAuB,EAAE,CAAC,CAAC;wBACtD,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC;wBACvB,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;wBAC5D,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;oBAC1B,CAAC,CAAC,CAAC;gBACL,CAAC;;oBAAM,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YACjC,CAAC;;gBAAM,EAAE,CAAC,IAAI,kEAA4B,EAAE,CAAC,CAAC;QAChD,CAAC,CAAC;QAEF,aAAQ,GAAG,CAAC,EAAmB,EAAQ,EAAE;YACvC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE;oBACtB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;oBACrB,EAAE,EAAE,CAAC;gBACP,CAAC,CAAC,CAAC;YACL,CAAC;;gBAAM,EAAE,EAAE,CAAC;QACd,CAAC,CAAC;IASJ,CAAC;IAlDW,YAAY,CACpB,MAAoB,EACpB,EAA2B;QAE3B,IAAA,oCAAiB,EAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;YACxC,IAAI,GAAG;gBAAE,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;YACxB,IAAI,CAAC,MAAM;gBAAE,OAAO,EAAE,CAAC,IAAI,0CAAuB,EAAE,CAAC,CAAC;YACtD,IAAA,4BAAe,EAAC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;gBAC9B,IAAI,GAAG;oBAAE,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;gBACxB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACnB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IA+BD,WAAW;QACT,IAAI,CAAC,IAAI,CAAC,QAAQ;YAChB,OAAO,IAAI,6BAAU,CACnB,wEAAwE,CACzE,CAAC;QACJ,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF;AAxDD,kCAwDC"}
+{"version":3,"file":"redis-client.js","sourceRoot":"","sources":["../../../../../src/common/redis-client/redis-client.ts"],"names":[],"mappings":";;;AASA,uDAK0B;AAC1B,oDAAsD;AACtD,qDAAqD;AAErD,MAAa,WAAY,SAAQ,qCAAkB;IACjD,YAAY,GAAkB;QAC5B,MAAM,MAAM,GAAG,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,wBAAa,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC;QACzD,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;IAEkB,WAAW,CAC5B,MAAoB,EACpB,EAA2B;QAE3B,MAAM,CAAC,eAAe,CAAC,0BAAa,EAAE,CAAC,GAAG,EAAE,EAAE;YAC5C,IAAI,GAAG;gBAAE,EAAE,CAAC,GAAG,CAAC,CAAC;YACjB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAfD,kCAeC"}

package/dist/cjs/src/common/redis-client/scripts/lua/acknowledge-message.lua

@@ -2,27 +2,38 @@ local keyQueueProcessing = KEYS[1]
 local keyQueueAcknowledged = KEYS[2]
 local keyMessage = KEYS[3]
 
----
-
 local EMessagePropertyStatus = ARGV[1]
 local EMessagePropertyStatusAcknowledged = ARGV[2]
 local storeMessages = ARGV[3]
 local expireStoredMessages = ARGV[4]
 local storedMessagesSize = ARGV[5]
 
-local function updateMessageStatus()
-    redis.call("HMSET", keyMessage, EMessagePropertyStatus, EMessagePropertyStatusAcknowledged)
+-- Get the message ID from the processing queue
+local messageId = redis.call("LPOP", keyQueueProcessing)
+
+-- If no message was found, return early
+if messageId == false then
+    return nil
 end
 
-local messageId = redis.call("LPOP", keyQueueProcessing)
+-- Update message status immediately
+redis.call("HSET", keyMessage, EMessagePropertyStatus, EMessagePropertyStatusAcknowledged)
+
+-- Only perform storage operations if needed
 if storeMessages == '1' then
+    -- Add to acknowledged queue
     redis.call("RPUSH", keyQueueAcknowledged, messageId)
+
+    -- Apply expiration if configured
     if expireStoredMessages ~= '0' then
         redis.call("PEXPIRE", keyQueueAcknowledged, expireStoredMessages)
     end
+
+    -- Trim the queue if size limit is set
     if storedMessagesSize ~= '0' then
-        local result = redis.call("LTRIM", keyQueueAcknowledged, storedMessagesSize, -1)
-        return result
+        -- storedMessagesSize should be negative for proper trimming (to keep newest messages)
+        redis.call("LTRIM", keyQueueAcknowledged, storedMessagesSize, -1)
     end
 end
-updateMessageStatus()
+
+return messageId

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

@@ -3,8 +3,6 @@ local keyNsQueues = KEYS[2]
 local keyQueues = KEYS[3]
 local keyQueueProperties = KEYS[4]
 
----
-
 local namespace = ARGV[1]
 local queue = ARGV[2]
 local queuePropertiesQueueType = ARGV[3]
@@ -12,12 +10,19 @@ local queueType = ARGV[4]
 local queuePropertiesQueueDeliveryModel = ARGV[5]
 local deliveryModel = ARGV[6]
 
-if redis.call("SISMEMBER", keyQueues, queue) == 0 then
-    redis.call("SADD", keyQueues, queue)
-    redis.call("SADD", keyNsQueues, queue)
-    redis.call("SADD", keyNamespaces, namespace)
-    redis.call("HSET", keyQueueProperties, queuePropertiesQueueType, queueType)
-    redis.call("HSET", keyQueueProperties, queuePropertiesQueueDeliveryModel, deliveryModel)
-    return 'OK'
+-- Check if queue already exists
+if redis.call("SISMEMBER", keyQueues, queue) == 1 then
+    return 'QUEUE_EXISTS'
 end
-return 'QUEUE_EXISTS'
+
+--
+redis.call("SADD", keyQueues, queue)
+redis.call("SADD", keyNsQueues, queue)
+redis.call("SADD", keyNamespaces, namespace)
+
+--
+redis.call("HSET", keyQueueProperties,
+           queuePropertiesQueueType, queueType,
+           queuePropertiesQueueDeliveryModel, deliveryModel)
+
+return 'OK'

package/dist/cjs/src/common/redis-client/scripts/lua/delete-consumer-group.lua

@@ -9,26 +9,37 @@ local typeLIFOQueue = ARGV[3]
 local typeFIFOQueue = ARGV[4]
 local groupId = ARGV[5]
 
+-- Get queue type once and validate it exists
 local queueType = redis.call("HGET", keyQueueProperties, queuePropertiesQueueType)
 if queueType == false then
     return 'QUEUE_NOT_FOUND'
 end
 
-local count = 0;
+-- Determine which key to check based on queue type (only once)
+local pendingKey
 if queueType == typePriorityQueue then
-    count = redis.call("ZCARD", keyQueuePendingPriority)
-elseif queueType == typeLIFOQueue or queueType == typeFIFOQueue then
-    count = redis.call("LLEN", keyQueuePending)
+    pendingKey = keyQueuePendingPriority
+else
+    pendingKey = keyQueuePending
 end
+
+-- Check if the queue is empty using the appropriate command
+local count = 0
+if queueType == typePriorityQueue then
+    count = redis.call("ZCARD", pendingKey)
+else
+    count = redis.call("LLEN", pendingKey)
+end
+
+-- Return early if the queue is not empty
 if count > 0 then
     return 'CONSUMER_GROUP_NOT_EMPTY'
 end
 
+-- Remove the consumer group
 redis.call("SREM", keyQueueConsumerGroups, groupId)
-if queueType == typePriorityQueue then
-    redis.call("DEL", keyQueuePendingPriority)
-elseif queueType == typeLIFOQueue or queueType == typeFIFOQueue then
-    redis.call("DEL", keyQueuePending)
-end
+
+-- Delete the pending queue
+redis.call("DEL", pendingKey)
 
 return 'OK'

package/dist/cjs/src/common/redis-client/scripts/lua/delete-message.lua

@@ -1,104 +1,104 @@
-local EQueuePropertyQueueType = ARGV[1]
-local EQueuePropertyMessagesCount = ARGV[2]
-local EQueuePropertyQueueTypePriorityQueue = ARGV[3]
-local EQueuePropertyQueueTypeLIFOQueue = ARGV[4]
-local EQueuePropertyQueueTypeFIFOQueue = ARGV[5]
-local EMessagePropertyStatus = ARGV[6]
-local EMessagePropertyStatusProcessing = ARGV[7]
-local EMessagePropertyStatusAcknowledged = ARGV[8]
-local EMessagePropertyStatusPending = ARGV[9]
-local EMessagePropertyStatusScheduled = ARGV[10]
-local EMessagePropertyStatusDeadLettered = ARGV[11]
-local EMessagePropertyStatusUnackDelaying = ARGV[12]
-local EMessagePropertyStatusUnackRequeuing = ARGV[13]
+local QUEUE_TYPE = ARGV[1]
+local MSG_COUNT = ARGV[2]
+local QUEUE_TYPE_PRIORITY = ARGV[3]
+local QUEUE_TYPE_LIFO = ARGV[4]
+local QUEUE_TYPE_FIFO = ARGV[5]
+local MSG_STATUS = ARGV[6]
+local MSG_STATUS_PROCESSING = ARGV[7]
+local MSG_STATUS_ACKNOWLEDGED = ARGV[8]
+local MSG_STATUS_PENDING = ARGV[9]
+local MSG_STATUS_SCHEDULED = ARGV[10]
+local MSG_STATUS_DEADLETTERED = ARGV[11]
+local MSG_STATUS_UNACK_DELAYING = ARGV[12]
+local MSG_STATUS_UNACK_REQUEUING = ARGV[13]
 
----
+local STATUS_OK = 'OK'
+local STATUS_MESSAGE_NOT_FOUND = 'MESSAGE_NOT_FOUND'
+local STATUS_MESSAGE_IN_PROCESS = 'MESSAGE_IN_PROCESS'
+local STATUS_INVALID_PARAMETERS = 'INVALID_PARAMETERS'
 
-local keyQueueScheduled = ''
-local keyQueueDelayed = ''
-local keyQueueRequeued = ''
-local keyMessage = ''
-local keyQueueProperties = ''
-local keyQueuePending = ''
-local keyQueueDL = ''
-local keyQueueAcknowledged = ''
-local keyQueuePriorityPending = ''
+-- Counters for tracking results
+local processedCount = 0
+local successCount = 0
+local notFoundCount = 0
+local inProcessCount = 0
 
----
+-- Constants for parameter counts
+local INITIAL_KEY_OFFSET = 0
+local INITIAL_ARGV_OFFSET = 13
+local PARAMS_PER_MESSAGE = 1
+local KEYS_PER_MESSAGE = 10
 
-local messageId = ''
+-- Validate parameters
+if #ARGV <= INITIAL_ARGV_OFFSET then
+    return 'INVALID_PARAMETERS'
+end
 
----
+--
+local keyIndex = INITIAL_KEY_OFFSET + 1
 
-local keyIndexOffset = 0
-local argvIndexOffset = 13
+for argvIndex = INITIAL_ARGV_OFFSET + 1, #ARGV, PARAMS_PER_MESSAGE do
+    local messageId = ARGV[argvIndex]
 
----
+    -- Setup direct key references for this message
+    local queueScheduled = KEYS[keyIndex]
+    local queueDelayed = KEYS[keyIndex + 1]
+    local queueRequeued = KEYS[keyIndex + 2]
+    local messageKey = KEYS[keyIndex + 3]
+    local queueProperties = KEYS[keyIndex + 4]
+    local queuePending = KEYS[keyIndex + 5]
+    local queueDL = KEYS[keyIndex + 6]
+    local queueAcknowledged = KEYS[keyIndex + 7]
+    local queuePriorityPending = KEYS[keyIndex + 8]
+    local queueMessages = KEYS[keyIndex + 9]
 
-local function updateQueue()
-    redis.call("HINCRBY", keyQueueProperties, EQueuePropertyMessagesCount, -1)
-end
+    -- Update keyIndex for next iteration
+    keyIndex = keyIndex + KEYS_PER_MESSAGE
 
-local function deleteMessage()
-    local messageStatus = redis.call("HGET", keyMessage, EMessagePropertyStatus)
+    --
+    processedCount = processedCount + 1
+
+    -- Check if message exists and get its status
+    local messageStatus = redis.call("HGET", messageKey, MSG_STATUS)
     if messageStatus == false then
-        return 'MESSAGE_NOT_FOUND'
-    end
-    if messageStatus == EMessagePropertyStatusProcessing then
-        return 'MESSAGE_IN_PROCESS'
-    end
-    local deleted = 0;
-    if messageStatus == EMessagePropertyStatusAcknowledged then
-        deleted = redis.call("LREM", keyQueueAcknowledged, 1, messageId)
-    elseif messageStatus == EMessagePropertyStatusDeadLettered then
-        deleted = redis.call("LREM", keyQueueDL, 1, messageId)
-    elseif messageStatus == EMessagePropertyStatusScheduled then
-        deleted = redis.call("ZREM", keyQueueScheduled, messageId)
-    elseif messageStatus == EMessagePropertyStatusUnackDelaying then
-        deleted = redis.call("LREM", keyQueueDelayed, 1, messageId)
-    elseif messageStatus == EMessagePropertyStatusUnackRequeuing then
-        deleted = redis.call("LREM", keyQueueRequeued, 1, messageId)
-    elseif messageStatus == EMessagePropertyStatusPending then
-        local queueType = redis.call("HGET", keyQueueProperties, EQueuePropertyQueueType)
-        if queueType ~= false then
-            if queueType == EQueuePropertyQueueTypePriorityQueue then
-                deleted = redis.call("ZREM", keyQueuePriorityPending, messageId)
-            end
-            if queueType == EQueuePropertyQueueTypeFIFOQueue or queueType == EQueuePropertyQueueTypeLIFOQueue then
-                deleted = redis.call("LREM", keyQueuePending, 1, messageId)
+        notFoundCount = notFoundCount + 1
+    elseif messageStatus == MSG_STATUS_PROCESSING then
+        inProcessCount = inProcessCount + 1
+    else
+        -- Remove from appropriate queue based on status
+        if messageStatus == MSG_STATUS_ACKNOWLEDGED then
+            redis.call("LREM", queueAcknowledged, 1, messageId)
+        elseif messageStatus == MSG_STATUS_DEADLETTERED then
+            redis.call("LREM", queueDL, 1, messageId)
+        elseif messageStatus == MSG_STATUS_SCHEDULED then
+            redis.call("ZREM", queueScheduled, messageId)
+        elseif messageStatus == MSG_STATUS_UNACK_DELAYING then
+            redis.call("LREM", queueDelayed, 1, messageId)
+        elseif messageStatus == MSG_STATUS_UNACK_REQUEUING then
+            redis.call("LREM", queueRequeued, 1, messageId)
+        elseif messageStatus == MSG_STATUS_PENDING then
+            local queueType = redis.call("HGET", queueProperties, QUEUE_TYPE)
+            if queueType then
+                if queueType == QUEUE_TYPE_PRIORITY then
+                    redis.call("ZREM", queuePriorityPending, messageId)
+                elseif queueType == QUEUE_TYPE_FIFO or queueType == QUEUE_TYPE_LIFO then
+                    redis.call("LREM", queuePending, 1, messageId)
+                end
             end
         end
-    end
-    if deleted == 1 then
-        redis.call("DEL", keyMessage)
-        return 'OK'
-    end
-    return 'MESSAGE_NOT_DELETED'
-end
 
-local deleteMessageStatus = 'INVALID_PARAMETERS'
+        -- Delete the message
+        redis.call("DEL", messageKey)
 
-if #ARGV > argvIndexOffset then
-    for index in pairs(ARGV) do
-        if (index > argvIndexOffset) then
-            messageId = ARGV[index]
-            keyQueueScheduled = KEYS[keyIndexOffset + 1]
-            keyQueueDelayed = KEYS[keyIndexOffset + 2]
-            keyQueueRequeued = KEYS[keyIndexOffset + 3]
-            keyMessage = KEYS[keyIndexOffset + 4]
-            keyQueueProperties = KEYS[keyIndexOffset + 5]
-            keyQueuePending = KEYS[keyIndexOffset + 6]
-            keyQueueDL = KEYS[keyIndexOffset + 7]
-            keyQueueAcknowledged = KEYS[keyIndexOffset + 8]
-            keyQueuePriorityPending = KEYS[keyIndexOffset + 9]
-            keyIndexOffset = keyIndexOffset + 9
-            deleteMessageStatus = deleteMessage()
-            if deleteMessageStatus ~= 'OK' then
-                break
-            end
-            updateQueue()
-        end
+        -- Remove the message ID from queue messages
+        redis.call("SREM", queueMessages, messageId)
+
+        -- Decrements the message count in queue properties
+        redis.call("HINCRBY", queueProperties, MSG_COUNT, -1)
+
+        successCount = successCount + 1
     end
 end
 
-return deleteMessageStatus
+-- Return an array with the results
+return {processedCount, successCount, notFoundCount, inProcessCount}

package/dist/cjs/src/common/redis-client/scripts/lua/fetch-message-for-processing.lua

@@ -5,8 +5,16 @@ local EMessagePropertyState = ARGV[2]
 local EMessagePropertyMessage = ARGV[3]
 local EMessagePropertyStatusProcessing = ARGV[4]
 
+-- Fetch only the required fields in a single operation
 local result = redis.call("HMGET", keyMessage, EMessagePropertyState, EMessagePropertyMessage)
-if result[1] ~= false and result[2] ~= false then
-    redis.call("HSET", keyMessage, EMessagePropertyStatus, EMessagePropertyStatusProcessing)
-    return result
+
+-- Early return if either field is missing
+if result[1] == false or result[2] == false then
+    return false
 end
+
+-- Update the message status to processing
+redis.call("HSET", keyMessage, EMessagePropertyStatus, EMessagePropertyStatusProcessing)
+
+-- Return the message data
+return result