redis-smq 6.4.1 → 6.4.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 6.4.2 (2022-04-23)
+
+* Test expired locks (367660e)
+* Do not throw an exception and try to acquire again an expired lock (b7f7d36)
+* Bump up redis-smq-monitor to v6.5.6 (c31cd2e)
+* Fix NPM security vulnerabilities (3900ddf)
+* Clean up monitor-server services (954d856)
+
 ## 6.4.1 (2022-03-22)
 
 * Fix fsevents not accessible from jest-haste-map (482cb11)

package/dist/src/monitor-server/controllers/api/consumers/consumer/time-series/get-consumer-acknowledged/get-consumer-acknowledged.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetConsumerAcknowledgedHandler = void 0;
-const GetConsumerAcknowledgedHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const GetConsumerAcknowledgedHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { consumerTimeSeriesService } = app.context.services;
-        return consumerTimeSeriesService.acknowledged(ctx.state.dto);
+        return (0, services_1.consumerTimeSeriesServiceInstance)().acknowledged(ctx.state.dto);
     });
 };
 exports.GetConsumerAcknowledgedHandler = GetConsumerAcknowledgedHandler;

package/dist/src/monitor-server/controllers/api/consumers/consumer/time-series/get-consumer-dead-lettered/get-consumer-dead-lettered.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetConsumerDeadLetteredHandler = void 0;
-const GetConsumerDeadLetteredHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const GetConsumerDeadLetteredHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { consumerTimeSeriesService } = app.context.services;
-        return consumerTimeSeriesService.deadLettered(ctx.state.dto);
+        return (0, services_1.consumerTimeSeriesServiceInstance)().deadLettered(ctx.state.dto);
     });
 };
 exports.GetConsumerDeadLetteredHandler = GetConsumerDeadLetteredHandler;

package/dist/src/monitor-server/controllers/api/main/scheduled-messages/delete-scheduled-message/delete-scheduled-message.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeleteScheduledMessageHandler = void 0;
-const DeleteScheduledMessageHandler = (app) => {
+const services_1 = require("../../../../../services");
+const DeleteScheduledMessageHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { messagesService } = app.context.services;
-        return messagesService.deleteScheduledMessage(ctx.state.dto);
+        return (0, services_1.messagesServiceInstance)().deleteScheduledMessage(ctx.state.dto);
     });
 };
 exports.DeleteScheduledMessageHandler = DeleteScheduledMessageHandler;

package/dist/src/monitor-server/controllers/api/main/scheduled-messages/get-scheduled-messages/get-scheduled-messages.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetScheduledMessagesHandler = void 0;
-const GetScheduledMessagesHandler = (app) => {
+const services_1 = require("../../../../../services");
+const GetScheduledMessagesHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { messagesService } = app.context.services;
-        return messagesService.getScheduledMessages(ctx.state.dto);
+        return (0, services_1.messagesServiceInstance)().getScheduledMessages(ctx.state.dto);
     });
 };
 exports.GetScheduledMessagesHandler = GetScheduledMessagesHandler;

package/dist/src/monitor-server/controllers/api/main/scheduled-messages/purge-scheduled-messages/purge-scheduled-messages.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PurgeScheduledMessagesHandler = void 0;
-const PurgeScheduledMessagesHandler = (app) => {
+const services_1 = require("../../../../../services");
+const PurgeScheduledMessagesHandler = () => {
     return () => __awaiter(void 0, void 0, void 0, function* () {
-        const { messagesService } = app.context.services;
-        return messagesService.purgeScheduledMessages();
+        return (0, services_1.messagesServiceInstance)().purgeScheduledMessages();
     });
 };
 exports.PurgeScheduledMessagesHandler = PurgeScheduledMessagesHandler;

package/dist/src/monitor-server/controllers/api/main/time-series/get-acknowledged/get-acknowledged.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetAcknowledgedHandler = void 0;
-const GetAcknowledgedHandler = (app) => {
+const services_1 = require("../../../../../services");
+const GetAcknowledgedHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { globalTimeSeriesService } = app.context.services;
-        return globalTimeSeriesService.acknowledged(ctx.state.dto);
+        return (0, services_1.globalTimeSeriesServiceInstance)().acknowledged(ctx.state.dto);
     });
 };
 exports.GetAcknowledgedHandler = GetAcknowledgedHandler;

package/dist/src/monitor-server/controllers/api/main/time-series/get-dead-lettered/get-dead-lettered.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetDeadLetteredHandler = void 0;
-const GetDeadLetteredHandler = (app) => {
+const services_1 = require("../../../../../services");
+const GetDeadLetteredHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { globalTimeSeriesService } = app.context.services;
-        return globalTimeSeriesService.deadLettered(ctx.state.dto);
+        return (0, services_1.globalTimeSeriesServiceInstance)().deadLettered(ctx.state.dto);
     });
 };
 exports.GetDeadLetteredHandler = GetDeadLetteredHandler;

package/dist/src/monitor-server/controllers/api/main/time-series/get-published-time-series/get-published.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetPublishedHandler = void 0;
-const GetPublishedHandler = (app) => {
+const services_1 = require("../../../../../services");
+const GetPublishedHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { globalTimeSeriesService } = app.context.services;
-        return globalTimeSeriesService.published(ctx.state.dto);
+        return (0, services_1.globalTimeSeriesServiceInstance)().published(ctx.state.dto);
     });
 };
 exports.GetPublishedHandler = GetPublishedHandler;

package/dist/src/monitor-server/controllers/api/namespaces/delete-namespace/delete-namespace.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeleteNamespaceHandler = void 0;
-const DeleteNamespaceHandler = (app) => {
+const services_1 = require("../../../../services");
+const DeleteNamespaceHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { queuesService } = app.context.services;
-        return queuesService.deleteNamespace(ctx.state.dto);
+        return (0, services_1.queuesServiceInstance)().deleteNamespace(ctx.state.dto);
     });
 };
 exports.DeleteNamespaceHandler = DeleteNamespaceHandler;

package/dist/src/monitor-server/controllers/api/namespaces/get-namespace-queues/get-namespace-queues.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetNamespaceQueuesHandler = void 0;
-const GetNamespaceQueuesHandler = (app) => {
+const services_1 = require("../../../../services");
+const GetNamespaceQueuesHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { queuesService } = app.context.services;
-        return queuesService.getNamespaceQueues(ctx.state.dto);
+        return (0, services_1.queuesServiceInstance)().getNamespaceQueues(ctx.state.dto);
     });
 };
 exports.GetNamespaceQueuesHandler = GetNamespaceQueuesHandler;

package/dist/src/monitor-server/controllers/api/namespaces/get-namespaces/get-namespaces.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetNamespacesHandler = void 0;
-const GetNamespacesHandler = (app) => {
+const services_1 = require("../../../../services");
+const GetNamespacesHandler = () => {
     return () => __awaiter(void 0, void 0, void 0, function* () {
-        const { queuesService } = app.context.services;
-        return queuesService.getNamespaces();
+        return (0, services_1.queuesServiceInstance)().getNamespaces();
     });
 };
 exports.GetNamespacesHandler = GetNamespacesHandler;

package/dist/src/monitor-server/controllers/api/namespaces/queue/acknowledged-messages/delete-acknowledged-message/delete-acknowledged-message.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeleteAcknowledgedMessageHandler = void 0;
-const DeleteAcknowledgedMessageHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const DeleteAcknowledgedMessageHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { messagesService } = app.context.services;
-        return messagesService.deleteAcknowledgedMessage(ctx.state.dto);
+        return (0, services_1.messagesServiceInstance)().deleteAcknowledgedMessage(ctx.state.dto);
     });
 };
 exports.DeleteAcknowledgedMessageHandler = DeleteAcknowledgedMessageHandler;

package/dist/src/monitor-server/controllers/api/namespaces/queue/acknowledged-messages/get-acknowledged-messages/get-acknowledged-messages.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetAcknowledgedMessagesHandler = void 0;
-const GetAcknowledgedMessagesHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const GetAcknowledgedMessagesHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { messagesService } = app.context.services;
-        return messagesService.getAcknowledgedMessages(ctx.state.dto);
+        return (0, services_1.messagesServiceInstance)().getAcknowledgedMessages(ctx.state.dto);
     });
 };
 exports.GetAcknowledgedMessagesHandler = GetAcknowledgedMessagesHandler;

package/dist/src/monitor-server/controllers/api/namespaces/queue/acknowledged-messages/purge-acknowledged-messages/purge-acknowledged-messages.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PurgeAcknowledgedMessagesHandler = void 0;
-const PurgeAcknowledgedMessagesHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const PurgeAcknowledgedMessagesHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { messagesService } = app.context.services;
-        return messagesService.purgeAcknowledgedMessages(ctx.state.dto);
+        return (0, services_1.messagesServiceInstance)().purgeAcknowledgedMessages(ctx.state.dto);
     });
 };
 exports.PurgeAcknowledgedMessagesHandler = PurgeAcknowledgedMessagesHandler;

package/dist/src/monitor-server/controllers/api/namespaces/queue/acknowledged-messages/requeue-acknowledged-message/requeue-acknowledged-message.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequeueAcknowledgedMessageHandler = void 0;
-const RequeueAcknowledgedMessageHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const RequeueAcknowledgedMessageHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { messagesService } = app.context.services;
-        yield messagesService.requeueAcknowledgedMessage(ctx.state.dto);
+        yield (0, services_1.messagesServiceInstance)().requeueAcknowledgedMessage(ctx.state.dto);
     });
 };
 exports.RequeueAcknowledgedMessageHandler = RequeueAcknowledgedMessageHandler;

package/dist/src/monitor-server/controllers/api/namespaces/queue/dead-lettered-messages/delete-dead-lettered-message/delete-dead-lettered-message.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeleteDeadLetteredMessageHandler = void 0;
-const DeleteDeadLetteredMessageHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const DeleteDeadLetteredMessageHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { messagesService } = app.context.services;
-        return messagesService.deleteDeadLetteredMessage(ctx.state.dto);
+        return (0, services_1.messagesServiceInstance)().deleteDeadLetteredMessage(ctx.state.dto);
     });
 };
 exports.DeleteDeadLetteredMessageHandler = DeleteDeadLetteredMessageHandler;

package/dist/src/monitor-server/controllers/api/namespaces/queue/dead-lettered-messages/get-dead-lettered-messages/get-dead-lettered-messages.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetDeadLetteredMessagesHandler = void 0;
-const GetDeadLetteredMessagesHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const GetDeadLetteredMessagesHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { messagesService } = app.context.services;
-        return messagesService.getDeadLetteredMessages(ctx.state.dto);
+        return (0, services_1.messagesServiceInstance)().getDeadLetteredMessages(ctx.state.dto);
     });
 };
 exports.GetDeadLetteredMessagesHandler = GetDeadLetteredMessagesHandler;

package/dist/src/monitor-server/controllers/api/namespaces/queue/dead-lettered-messages/purge-dead-lettered-messages/purge-dead-lettered-messages.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PurgeDeadLetteredMessagesHandler = void 0;
-const PurgeDeadLetteredMessagesHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const PurgeDeadLetteredMessagesHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { messagesService } = app.context.services;
-        return messagesService.purgeDeadLetteredMessages(ctx.state.dto);
+        return (0, services_1.messagesServiceInstance)().purgeDeadLetteredMessages(ctx.state.dto);
     });
 };
 exports.PurgeDeadLetteredMessagesHandler = PurgeDeadLetteredMessagesHandler;

package/dist/src/monitor-server/controllers/api/namespaces/queue/dead-lettered-messages/requeue-dead-lettered-message/requeue-dead-lettered-message.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequeueDeadLetteredMessageHandler = void 0;
-const RequeueDeadLetteredMessageHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const RequeueDeadLetteredMessageHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { messagesService } = app.context.services;
-        yield messagesService.requeueDeadLetteredMessage(ctx.state.dto);
+        yield (0, services_1.messagesServiceInstance)().requeueDeadLetteredMessage(ctx.state.dto);
     });
 };
 exports.RequeueDeadLetteredMessageHandler = RequeueDeadLetteredMessageHandler;

package/dist/src/monitor-server/controllers/api/namespaces/queue/delete-queue/delete-queue.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeleteQueueHandler = void 0;
-const DeleteQueueHandler = (app) => {
+const services_1 = require("../../../../../services");
+const DeleteQueueHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { queuesService } = app.context.services;
-        return queuesService.deleteQueue(ctx.state.dto);
+        return (0, services_1.queuesServiceInstance)().deleteQueue(ctx.state.dto);
     });
 };
 exports.DeleteQueueHandler = DeleteQueueHandler;

package/dist/src/monitor-server/controllers/api/namespaces/queue/pending-messages/delete-pending-message/delete-pending-message.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeletePendingMessageHandler = void 0;
-const DeletePendingMessageHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const DeletePendingMessageHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { messagesService } = app.context.services;
-        return messagesService.deletePendingMessage(ctx.state.dto);
+        return (0, services_1.messagesServiceInstance)().deletePendingMessage(ctx.state.dto);
     });
 };
 exports.DeletePendingMessageHandler = DeletePendingMessageHandler;

package/dist/src/monitor-server/controllers/api/namespaces/queue/pending-messages/get-pending-messages/get-pending-messages.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetPendingMessagesHandler = void 0;
-const GetPendingMessagesHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const GetPendingMessagesHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { messagesService } = app.context.services;
-        return messagesService.getPendingMessages(ctx.state.dto);
+        return (0, services_1.messagesServiceInstance)().getPendingMessages(ctx.state.dto);
     });
 };
 exports.GetPendingMessagesHandler = GetPendingMessagesHandler;

package/dist/src/monitor-server/controllers/api/namespaces/queue/pending-messages/purge-pending-messages/purge-pending-messages.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PurgePendingMessagesHandler = void 0;
-const PurgePendingMessagesHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const PurgePendingMessagesHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { messagesService } = app.context.services;
-        return messagesService.purgePendingMessages(ctx.state.dto);
+        return (0, services_1.messagesServiceInstance)().purgePendingMessages(ctx.state.dto);
     });
 };
 exports.PurgePendingMessagesHandler = PurgePendingMessagesHandler;

package/dist/src/monitor-server/controllers/api/namespaces/queue/pending-messages-with-priority/delete-pending-message-with-priority/delete-pending-message-with-priority.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeletePendingMessageWithPriorityHandler = void 0;
-const DeletePendingMessageWithPriorityHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const DeletePendingMessageWithPriorityHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { messagesService } = app.context.services;
-        return messagesService.deletePendingMessageWithPriority(ctx.state.dto);
+        return (0, services_1.messagesServiceInstance)().deletePendingMessageWithPriority(ctx.state.dto);
     });
 };
 exports.DeletePendingMessageWithPriorityHandler = DeletePendingMessageWithPriorityHandler;

package/dist/src/monitor-server/controllers/api/namespaces/queue/pending-messages-with-priority/get-pending-messages-with-priority/get-pending-messages-with-priority.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetPendingMessagesWithPriorityHandler = void 0;
-const GetPendingMessagesWithPriorityHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const GetPendingMessagesWithPriorityHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { messagesService } = app.context.services;
-        return messagesService.getPendingMessagesWithPriority(ctx.state.dto);
+        return (0, services_1.messagesServiceInstance)().getPendingMessagesWithPriority(ctx.state.dto);
     });
 };
 exports.GetPendingMessagesWithPriorityHandler = GetPendingMessagesWithPriorityHandler;

package/dist/src/monitor-server/controllers/api/namespaces/queue/pending-messages-with-priority/purge-pending-messages-with-priority/purge-pending-messages-with-priority.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PurgePendingMessagesWithPriorityHandler = void 0;
-const PurgePendingMessagesWithPriorityHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const PurgePendingMessagesWithPriorityHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { messagesService } = app.context.services;
-        return messagesService.purgePendingMessagesWithPriority(ctx.state.dto);
+        return (0, services_1.messagesServiceInstance)().purgePendingMessagesWithPriority(ctx.state.dto);
     });
 };
 exports.PurgePendingMessagesWithPriorityHandler = PurgePendingMessagesWithPriorityHandler;

package/dist/src/monitor-server/controllers/api/namespaces/queue/rate-limiting/clear-rate-limit/clear-rate-limit.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClearRateLimitHandler = void 0;
-const ClearRateLimitHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const ClearRateLimitHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { queuesService } = app.context.services;
-        return queuesService.clearQueueRateLimit(ctx.state.dto);
+        return (0, services_1.queuesServiceInstance)().clearQueueRateLimit(ctx.state.dto);
     });
 };
 exports.ClearRateLimitHandler = ClearRateLimitHandler;

package/dist/src/monitor-server/controllers/api/namespaces/queue/rate-limiting/get-rate-limit/get-rate-limit.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetRateLimitHandler = void 0;
-const GetRateLimitHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const GetRateLimitHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { queuesService } = app.context.services;
-        return queuesService.getQueueRateLimit(ctx.state.dto);
+        return (0, services_1.queuesServiceInstance)().getQueueRateLimit(ctx.state.dto);
     });
 };
 exports.GetRateLimitHandler = GetRateLimitHandler;

package/dist/src/monitor-server/controllers/api/namespaces/queue/rate-limiting/set-rate-limit/set-rate-limit.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SetRateLimitHandler = void 0;
-const SetRateLimitHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const SetRateLimitHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { queuesService } = app.context.services;
-        return queuesService.setQueueRateLimit(ctx.state.dto);
+        return (0, services_1.queuesServiceInstance)().setQueueRateLimit(ctx.state.dto);
     });
 };
 exports.SetRateLimitHandler = SetRateLimitHandler;

package/dist/src/monitor-server/controllers/api/namespaces/queue/time-series/get-queue-acknowledged/get-queue-acknowledged.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetQueueAcknowledgedHandler = void 0;
-const GetQueueAcknowledgedHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const GetQueueAcknowledgedHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { queueTimeSeriesService } = app.context.services;
-        return queueTimeSeriesService.acknowledged(ctx.state.dto);
+        return (0, services_1.queueTimeSeriesServiceInstance)().acknowledged(ctx.state.dto);
     });
 };
 exports.GetQueueAcknowledgedHandler = GetQueueAcknowledgedHandler;

package/dist/src/monitor-server/controllers/api/namespaces/queue/time-series/get-queue-dead-lettered/get-queue-dead-lettered.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetQueueDeadLetteredHandler = void 0;
-const GetQueueDeadLetteredHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const GetQueueDeadLetteredHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { queueTimeSeriesService } = app.context.services;
-        return queueTimeSeriesService.deadLettered(ctx.state.dto);
+        return (0, services_1.queueTimeSeriesServiceInstance)().deadLettered(ctx.state.dto);
     });
 };
 exports.GetQueueDeadLetteredHandler = GetQueueDeadLetteredHandler;

package/dist/src/monitor-server/controllers/api/namespaces/queue/time-series/get-queue-published/get-queue-published.handler.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetQueuePublishedHandler = void 0;
-const GetQueuePublishedHandler = (app) => {
+const services_1 = require("../../../../../../services");
+const GetQueuePublishedHandler = () => {
     return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        const { queueTimeSeriesService } = app.context.services;
-        return queueTimeSeriesService.published(ctx.state.dto);
+        return (0, services_1.queueTimeSeriesServiceInstance)().published(ctx.state.dto);
     });
 };
 exports.GetQueuePublishedHandler = GetQueuePublishedHandler;

package/dist/src/monitor-server/controllers/api/queues/get-queues/get-queues.handler.js

@@ -10,9 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetQueuesHandler = void 0;
-const GetQueuesHandler = (app) => () => __awaiter(void 0, void 0, void 0, function* () {
-    const { queuesService } = app.context.services;
-    return queuesService.getQueues();
+const services_1 = require("../../../../services");
+const GetQueuesHandler = () => () => __awaiter(void 0, void 0, void 0, function* () {
+    return (0, services_1.queuesServiceInstance)().getQueues();
 });
 exports.GetQueuesHandler = GetQueuesHandler;
 //# sourceMappingURL=get-queues.handler.js.map

package/dist/src/monitor-server/index.js

@@ -82,7 +82,7 @@ class MonitorServer {
             app.context.config = this.config;
             app.context.logger = this.logger;
             app.context.redis = this.redisClient;
-            app.context.services = (0, services_1.Services)(app);
+            (0, services_1.initServices)(this.redisClient);
             app.use(cors({
                 origin: '*',
             }));

package/dist/src/monitor-server/services/index.d.ts

@@ -1,13 +1,12 @@
 import { MessagesService } from './messages.service';
-import { TApplication } from '../types/common';
 import { QueuesService } from './queues.service';
 import { ConsumerTimeSeriesService } from './consumer-time-series.service';
 import { QueueTimeSeriesService } from './queue-time-series.service';
 import { GlobalTimeSeriesService } from './global-time-series.service';
-export declare function Services(app: TApplication): {
-    readonly messagesService: MessagesService;
-    readonly queuesService: QueuesService;
-    readonly consumerTimeSeriesService: ConsumerTimeSeriesService;
-    readonly queueTimeSeriesService: QueueTimeSeriesService;
-    readonly globalTimeSeriesService: GlobalTimeSeriesService;
-};
+import { RedisClient } from '../../system/common/redis-client/redis-client';
+export declare function initServices(client: RedisClient): void;
+export declare function messagesServiceInstance(): MessagesService;
+export declare function queuesServiceInstance(): QueuesService;
+export declare function consumerTimeSeriesServiceInstance(): ConsumerTimeSeriesService;
+export declare function queueTimeSeriesServiceInstance(): QueueTimeSeriesService;
+export declare function globalTimeSeriesServiceInstance(): GlobalTimeSeriesService;

package/dist/src/monitor-server/services/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Services = void 0;
+exports.globalTimeSeriesServiceInstance = exports.queueTimeSeriesServiceInstance = exports.consumerTimeSeriesServiceInstance = exports.queuesServiceInstance = exports.messagesServiceInstance = exports.initServices = void 0;
 const messages_service_1 = require("./messages.service");
 const message_manager_1 = require("../../system/app/message-manager/message-manager");
 const queues_service_1 = require("./queues.service");
@@ -8,47 +8,63 @@ const consumer_time_series_service_1 = require("./consumer-time-series.service")
 const queue_time_series_service_1 = require("./queue-time-series.service");
 const global_time_series_service_1 = require("./global-time-series.service");
 const queue_manager_1 = require("../../queue-manager");
-function Services(app) {
-    const { redis } = app.context;
-    let messagesService = null;
-    let queuesService = null;
-    let consumerTimeSeriesService = null;
-    let queueTimeSeriesService = null;
-    let globalTimeSeriesService = null;
-    return {
-        get messagesService() {
-            if (!messagesService) {
-                const messageManager = new message_manager_1.MessageManager(redis);
-                messagesService = new messages_service_1.MessagesService(messageManager);
-            }
-            return messagesService;
-        },
-        get queuesService() {
-            if (!queuesService) {
-                const queueManager = new queue_manager_1.QueueManager(redis);
-                queuesService = new queues_service_1.QueuesService(queueManager);
-            }
-            return queuesService;
-        },
-        get consumerTimeSeriesService() {
-            if (!consumerTimeSeriesService) {
-                consumerTimeSeriesService = new consumer_time_series_service_1.ConsumerTimeSeriesService(redis);
-            }
-            return consumerTimeSeriesService;
-        },
-        get queueTimeSeriesService() {
-            if (!queueTimeSeriesService) {
-                queueTimeSeriesService = new queue_time_series_service_1.QueueTimeSeriesService(redis);
-            }
-            return queueTimeSeriesService;
-        },
-        get globalTimeSeriesService() {
-            if (!globalTimeSeriesService) {
-                globalTimeSeriesService = new global_time_series_service_1.GlobalTimeSeriesService(redis);
-            }
-            return globalTimeSeriesService;
-        },
-    };
+const panic_error_1 = require("../../system/common/errors/panic.error");
+let redisClient = null;
+let messagesService = null;
+let queuesService = null;
+let consumerTimeSeriesService = null;
+let queueTimeSeriesService = null;
+let globalTimeSeriesService = null;
+function getRedisClient() {
+    if (!redisClient) {
+        throw new panic_error_1.PanicError(`Redis client instance is required. Please initialize services first.`);
+    }
+    return redisClient;
 }
-exports.Services = Services;
+function initServices(client) {
+    redisClient = client;
+}
+exports.initServices = initServices;
+function messagesServiceInstance() {
+    if (!messagesService) {
+        const redisClient = getRedisClient();
+        const messageManager = new message_manager_1.MessageManager(redisClient);
+        messagesService = new messages_service_1.MessagesService(messageManager);
+    }
+    return messagesService;
+}
+exports.messagesServiceInstance = messagesServiceInstance;
+function queuesServiceInstance() {
+    if (!queuesService) {
+        const redisClient = getRedisClient();
+        const queueManager = new queue_manager_1.QueueManager(redisClient);
+        queuesService = new queues_service_1.QueuesService(queueManager);
+    }
+    return queuesService;
+}
+exports.queuesServiceInstance = queuesServiceInstance;
+function consumerTimeSeriesServiceInstance() {
+    if (!consumerTimeSeriesService) {
+        const redisClient = getRedisClient();
+        consumerTimeSeriesService = new consumer_time_series_service_1.ConsumerTimeSeriesService(redisClient);
+    }
+    return consumerTimeSeriesService;
+}
+exports.consumerTimeSeriesServiceInstance = consumerTimeSeriesServiceInstance;
+function queueTimeSeriesServiceInstance() {
+    if (!queueTimeSeriesService) {
+        const redisClient = getRedisClient();
+        queueTimeSeriesService = new queue_time_series_service_1.QueueTimeSeriesService(redisClient);
+    }
+    return queueTimeSeriesService;
+}
+exports.queueTimeSeriesServiceInstance = queueTimeSeriesServiceInstance;
+function globalTimeSeriesServiceInstance() {
+    if (!globalTimeSeriesService) {
+        const redisClient = getRedisClient();
+        globalTimeSeriesService = new global_time_series_service_1.GlobalTimeSeriesService(redisClient);
+    }
+    return globalTimeSeriesService;
+}
+exports.globalTimeSeriesServiceInstance = globalTimeSeriesServiceInstance;
 //# sourceMappingURL=index.js.map

package/dist/src/monitor-server/types/common.d.ts

@@ -2,7 +2,6 @@
 import * as Koa from 'koa';
 import { ICompatibleLogger, IConfig } from '../../../types';
 import { RedisClient } from '../../system/common/redis-client/redis-client';
-import { Services } from '../services';
 export interface IResponseBodyError {
     code: number;
     message: string;
@@ -22,7 +21,6 @@ export interface IContextState<DTO> extends Koa.DefaultState {
 export interface IContext extends Koa.DefaultContext {
     config: IConfig;
     redis: RedisClient;
-    services: ReturnType<typeof Services>;
     logger: ICompatibleLogger;
 }
 export declare type TApplication = Koa<Koa.DefaultState, IContext>;

package/dist/src/system/app/consumer/consumer.d.ts

@@ -7,12 +7,12 @@ export declare class Consumer extends Base {
     private heartbeat;
     private workerRunner;
     constructor(useMultiplexing?: boolean);
-    protected setUpHeartbeat: (cb: ICallback<void>) => void;
-    protected tearDownHeartbeat: (cb: ICallback<void>) => void;
-    protected setUpConsumerWorkers: (cb: ICallback<void>) => void;
-    protected tearDownConsumerWorkers: (cb: ICallback<void>) => void;
-    protected runMessageHandlers: (cb: ICallback<void>) => void;
-    protected shutdownMessageHandlers: (cb: ICallback<void>) => void;
+    private setUpHeartbeat;
+    private tearDownHeartbeat;
+    private setUpConsumerWorkers;
+    private tearDownConsumerWorkers;
+    private runMessageHandlers;
+    private shutdownMessageHandlers;
     protected goingUp(): TUnaryFunction<ICallback<void>>[];
     protected goingDown(): TUnaryFunction<ICallback<void>>[];
     consume(queue: TQueueParams, usePriorityQueuing: boolean, messageHandler: TConsumerMessageHandler, cb: ICallback<boolean>): void;

package/dist/src/system/common/lock-manager/lock-manager.d.ts

@@ -1,20 +1,26 @@
 /// <reference types="node" />
 import { ICallback } from '../../../../types';
 import { RedisClient } from '../redis-client/redis-client';
+declare enum ELockStatus {
+    unlocked = 0,
+    locking = 1,
+    locked = 2,
+    unlocking = 3
+}
 export declare class LockManager {
-    protected lockKey: string;
-    protected lockId: string;
-    protected isLocked: boolean;
+    protected readonly lockId: string;
+    protected readonly lockKey: string;
+    protected readonly retryOnFail: boolean;
+    protected readonly ttl: number;
+    protected readonly redisClient: RedisClient;
+    protected status: ELockStatus;
     protected timer: NodeJS.Timeout | null;
-    protected retryOnFail: boolean;
-    protected ttl: number;
-    protected redisClient: RedisClient;
-    protected isRunning: boolean;
     constructor(redisClient: RedisClient, lockKey: string, ttl: number, retryOnFail?: boolean);
-    protected lock(cb: ICallback<string>): void;
+    protected retry(cb: ICallback<boolean>): void;
+    protected lock(cb: ICallback<boolean>): void;
     protected extend(cb: ICallback<boolean>): void;
     protected release(cb: ICallback<boolean>): void;
     acquireLock(cb: ICallback<boolean>): void;
     releaseLock(cb: ICallback<void>): void;
-    quit(cb: ICallback<void>): void;
 }
+export {};

package/dist/src/system/common/lock-manager/lock-manager.js

@@ -1,29 +1,57 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LockManager = void 0;
-const lock_manager_error_1 = require("./lock-manager.error");
 const uuid_1 = require("uuid");
 const lua_scripts_1 = require("../redis-client/lua-scripts");
+const lock_manager_error_1 = require("./lock-manager.error");
+var ELockStatus;
+(function (ELockStatus) {
+    ELockStatus[ELockStatus["unlocked"] = 0] = "unlocked";
+    ELockStatus[ELockStatus["locking"] = 1] = "locking";
+    ELockStatus[ELockStatus["locked"] = 2] = "locked";
+    ELockStatus[ELockStatus["unlocking"] = 3] = "unlocking";
+})(ELockStatus || (ELockStatus = {}));
 class LockManager {
     constructor(redisClient, lockKey, ttl, retryOnFail = false) {
-        this.isLocked = false;
+        this.status = ELockStatus.unlocked;
         this.timer = null;
-        this.isRunning = true;
         this.lockKey = lockKey;
         this.ttl = ttl;
         this.retryOnFail = retryOnFail;
         this.lockId = (0, uuid_1.v4)();
         this.redisClient = redisClient;
     }
+    retry(cb) {
+        this.timer = setTimeout(() => {
+            this.lock(cb);
+        }, 1000);
+    }
     lock(cb) {
-        this.redisClient.set(this.lockKey, this.lockId, 'PX', this.ttl, 'NX', cb);
+        if (this.status === ELockStatus.locking) {
+            this.redisClient.set(this.lockKey, this.lockId, 'PX', this.ttl, 'NX', (err, reply) => {
+                if (err)
+                    cb(err);
+                else if (!reply) {
+                    if (this.retryOnFail)
+                        this.retry(cb);
+                    else
+                        cb(null, false);
+                }
+                else
+                    cb(null, true);
+            });
+        }
+        else
+            cb(null, false);
     }
     extend(cb) {
         this.redisClient.runScript(lua_scripts_1.ELuaScriptName.EXTEND_LOCK, [this.lockKey], [this.lockId, this.ttl], (err, reply) => {
             if (err)
                 cb(err);
+            else if (!!reply)
+                cb(null, true);
             else
-                cb(null, !!reply);
+                this.lock(cb);
         });
     }
     release(cb) {
@@ -35,70 +63,41 @@ class LockManager {
         });
     }
     acquireLock(cb) {
-        if (!this.isRunning) {
-            cb(new lock_manager_error_1.LockManagerError('Instance is no longer usable after calling quit(). Create a new instance.'));
-        }
-        else if (this.isLocked) {
-            this.extend((err, reply) => {
-                if (err)
-                    cb(err);
-                else if (!reply) {
-                    this.isLocked = false;
-                    cb(new lock_manager_error_1.LockManagerError(`Could not extend the acquired lock with ID ${this.lockId}`));
-                }
-                else
-                    cb(null, true);
-            });
+        const status = this.status;
+        if (status === ELockStatus.unlocking || status === ELockStatus.locking) {
+            cb(new lock_manager_error_1.LockManagerError(`Can not acquire lock while a acquireLock() or releaseLock() call is pending`));
         }
         else {
-            this.lock((err, reply) => {
-                if (err)
-                    cb(err);
-                else if (!reply) {
-                    if (this.retryOnFail) {
-                        this.timer = setTimeout(() => {
-                            this.acquireLock(cb);
-                        }, 1000);
-                    }
-                    else
-                        cb(null, false);
-                }
-                else {
-                    this.isLocked = true;
-                    cb(null, this.isLocked);
-                }
-            });
+            const done = (err, status) => {
+                this.status = status ? ELockStatus.locked : ELockStatus.unlocked;
+                cb(err, status);
+            };
+            this.status = ELockStatus.locking;
+            if (status === ELockStatus.locked)
+                this.extend(done);
+            else
+                this.lock(done);
         }
     }
     releaseLock(cb) {
-        const done = (err) => {
-            if (err)
-                cb(err);
-            else {
-                this.isLocked = false;
-                cb();
-            }
-        };
-        if (!this.isRunning) {
-            cb(new lock_manager_error_1.LockManagerError(`Instance is no longer usable after calling quit(). Create a new instance.`));
-        }
+        const status = this.status;
+        if (status === ELockStatus.unlocking)
+            cb(new lock_manager_error_1.LockManagerError('releaseLock() has been already called'));
+        else if (status === ELockStatus.unlocked)
+            cb();
         else {
+            this.status = ELockStatus.unlocking;
             if (this.timer)
                 clearTimeout(this.timer);
-            if (!this.isLocked)
-                done();
-            else
-                this.release(done);
-        }
-    }
-    quit(cb) {
-        if (!this.isRunning)
-            cb();
-        else
-            this.releaseLock((err) => {
-                this.isRunning = false;
-                cb(err);
+            this.release((err) => {
+                if (err)
+                    cb(err);
+                else {
+                    this.status = ELockStatus.unlocked;
+                    cb();
+                }
             });
+        }
     }
 }
 exports.LockManager = LockManager;

package/dist/src/system/common/worker/worker-runner/worker-runner.js

@@ -93,7 +93,7 @@ class WorkerRunner extends events_1.EventEmitter {
             this.ticker.quit();
         };
         this.releaseLock = (cb) => {
-            this.lockManager.quit(cb);
+            this.lockManager.releaseLock(cb);
         };
         this.run = () => {
             this.powerManager.goingUp();

package/dist/src/system/common/worker/worker.d.ts

@@ -3,7 +3,7 @@ import { ICallback, TWorkerParameters } from '../../../../types';
 export declare abstract class Worker<T extends TWorkerParameters = TWorkerParameters> {
     private readonly ticker;
     private readonly powerManager;
-    private managed;
+    private readonly managed;
     protected readonly redisClient: RedisClient;
     constructor(redisClient: RedisClient, params: T, managed: boolean);
     private getTicker;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redis-smq",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "A simple high-performance Redis message queue for Node.js.",
   "author": "Weyoss <weyoss@protonmail.com>",
   "license": "MIT",
@@ -49,7 +49,7 @@
     "koa-bodyparser": "4.3.0",
     "lodash": "4.17.21",
     "redis": "3.1.2",
-    "redis-smq-monitor": "6.5.5",
+    "redis-smq-monitor": "6.5.6",
     "reflect-metadata": "0.1.13",
     "socket.io": "4.2.0",
     "stoppable": "1.1.0",