redis-smq 6.2.1 → 6.2.4

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## 6.2.4 (2022-02-23)
+
+* Fix consuming-messages/test00015 error (c5c365a)
+
+## 6.2.3 (2022-02-23)
+
+* Bump up redis-smq-monitor to v6.5.3 (4e845d0)
+* Remove gracefully a message handler (a4402b7)
+* Add MessageHandlerAlreadyExistsError custom error (65882ed)
+
+## 6.2.2 (2022-02-21)
+
+* Fix a queue rate limiting bug allowing to save invalid Redis keys (1dc91aa)
+* Bump up redis-smq-monitor to v6.5.2 (e192db0)
+* Update docs (5a6469e)
+
 ## 6.2.1 (2022-02-19)
 
 * Remove unused code (475fa3d)

package/dist/src/monitor-server/services/queues.service.d.ts

@@ -7,9 +7,9 @@ import { SetRateLimitRequestDTO } from '../controllers/api/namespaces/queue/rate
 import { ClearRateLimitRequestDTO } from '../controllers/api/namespaces/queue/rate-limiting/clear-rate-limit/clear-rate-limit.request.DTO';
 import { GetRateLimitRequestDTO } from '../controllers/api/namespaces/queue/rate-limiting/get-rate-limit/get-rate-limit.request.DTO';
 declare const queueManagerAsync: {
-    clearQueueRateLimitAsync: (queue: TQueueParams) => Promise<void>;
-    setQueueRateLimitAsync: (queue: TQueueParams, rateLimit: import("../../../types").TQueueRateLimit) => Promise<void>;
-    getQueueRateLimitAsync: (queue: TQueueParams) => Promise<import("../../../types").TQueueRateLimit>;
+    clearQueueRateLimitAsync: (queue: string | TQueueParams) => Promise<void>;
+    setQueueRateLimitAsync: (queue: string | TQueueParams, rateLimit: import("../../../types").TQueueRateLimit) => Promise<void>;
+    getQueueRateLimitAsync: (queue: string | TQueueParams) => Promise<import("../../../types").TQueueRateLimit>;
     deleteQueueAsync: (queue: string | TQueueParams) => Promise<void>;
     getNamespaceQueuesAsync: (ns: string) => Promise<TQueueParams[]>;
     deleteNamespaceAsync: (ns: string) => Promise<void>;

package/dist/src/system/app/consumer/consumer-message-handler.js

@@ -5,7 +5,7 @@ const types_1 = require("../../../../types");
 const uuid_1 = require("uuid");
 const message_1 = require("../message/message");
 const events_1 = require("../../common/events");
-const consumer_error_1 = require("./consumer.error");
+const consumer_error_1 = require("./errors/consumer.error");
 const redis_keys_1 = require("../../common/redis-keys/redis-keys");
 const events_2 = require("events");
 const power_manager_1 = require("../../common/power-manager/power-manager");

package/dist/src/system/app/consumer/consumer.js

@@ -14,7 +14,6 @@ const consumer_message_rate_writer_1 = require("./consumer-message-rate-writer")
 const base_1 = require("../../common/base");
 const consumer_message_handler_1 = require("./consumer-message-handler");
 const consumer_queues_1 = require("./consumer-queues");
-const generic_error_1 = require("../../common/errors/generic.error");
 const queue_manager_1 = require("../queue-manager/queue-manager");
 const worker_pool_1 = require("../../common/worker/worker-runner/worker-pool");
 const async_1 = require("../../lib/async");
@@ -25,6 +24,7 @@ const global_dead_lettered_time_series_1 = require("./consumer-time-series/globa
 const queue_dead_lettered_time_series_1 = require("./consumer-time-series/queue-dead-lettered-time-series");
 const consumer_acknowledged_time_series_1 = require("./consumer-time-series/consumer-acknowledged-time-series");
 const consumer_dead_lettered_time_series_1 = require("./consumer-time-series/consumer-dead-lettered-time-series");
+const message_handler_already_exists_error_1 = require("./errors/message-handler-already-exists.error");
 class Consumer extends base_1.Base {
     constructor() {
         super();
@@ -194,7 +194,7 @@ class Consumer extends base_1.Base {
         };
         const r = this.addMessageHandler(handlerParams, usePriorityQueuing);
         if (!r)
-            cb(new generic_error_1.GenericError(`${usePriorityQueuing ? 'Priority ' : ''}Queue [${JSON.stringify(queueParams)}] has already a message handler`));
+            cb(new message_handler_already_exists_error_1.MessageHandlerAlreadyExistsError(queueParams, usePriorityQueuing));
         else {
             if (this.isRunning())
                 this.runMessageHandler(handlerParams, (err) => {
@@ -210,9 +210,8 @@ class Consumer extends base_1.Base {
     cancel(queue, usePriorityQueuing, cb) {
         const queueParams = queue_manager_1.queueManager.getQueueParams(queue);
         const handler = this.getMessageHandler(queueParams, usePriorityQueuing);
-        if (!handler) {
-            cb(new generic_error_1.GenericError(`Message handler for ${usePriorityQueuing ? 'priority ' : ''}queue [${JSON.stringify(queueParams)}] does not exist`));
-        }
+        if (!handler)
+            cb();
         else {
             this.removeMessageHandler(queueParams, usePriorityQueuing);
             const handlerInstance = this.getMessageHandlerInstance(queueParams, usePriorityQueuing);

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

@@ -0,0 +1,3 @@
+import { RedisSMQError } from '../../../common/errors/redis-smq.error';
+export declare class ConsumerError extends RedisSMQError {
+}

package/dist/src/system/app/consumer/{consumer.error.js → errors/consumer.error.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConsumerError = void 0;
-const redis_smq_error_1 = require("../../common/errors/redis-smq.error");
+const redis_smq_error_1 = require("../../../common/errors/redis-smq.error");
 class ConsumerError extends redis_smq_error_1.RedisSMQError {
 }
 exports.ConsumerError = ConsumerError;

package/dist/src/system/app/consumer/errors/message-handler-already-exists.error.d.ts

@@ -0,0 +1,5 @@
+import { ConsumerError } from './consumer.error';
+import { TQueueParams } from '../../../../../types';
+export declare class MessageHandlerAlreadyExistsError extends ConsumerError {
+    constructor(queue: TQueueParams, usingPriorityQueuing: boolean);
+}

package/dist/src/system/app/consumer/errors/message-handler-already-exists.error.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MessageHandlerAlreadyExistsError = void 0;
+const consumer_error_1 = require("./consumer.error");
+class MessageHandlerAlreadyExistsError extends consumer_error_1.ConsumerError {
+    constructor(queue, usingPriorityQueuing) {
+        super(`A message handler for ${usingPriorityQueuing ? 'priority ' : ''}queue [${JSON.stringify(queue)}] already exists`);
+    }
+}
+exports.MessageHandlerAlreadyExistsError = MessageHandlerAlreadyExistsError;
+//# sourceMappingURL=message-handler-already-exists.error.js.map

package/dist/src/system/app/queue-manager/queue-manager-frontend.d.ts

@@ -5,9 +5,9 @@ export declare class QueueManagerFrontend {
     private redisClient;
     private logger;
     constructor(redisClient: RedisClient);
-    clearQueueRateLimit(queue: TQueueParams, cb: ICallback<void>): void;
-    setQueueRateLimit(queue: TQueueParams, rateLimit: TQueueRateLimit, cb: ICallback<void>): void;
-    getQueueRateLimit(queue: TQueueParams, cb: ICallback<TQueueRateLimit>): void;
+    clearQueueRateLimit(queue: string | TQueueParams, cb: ICallback<void>): void;
+    setQueueRateLimit(queue: string | TQueueParams, rateLimit: TQueueRateLimit, cb: ICallback<void>): void;
+    getQueueRateLimit(queue: string | TQueueParams, cb: ICallback<TQueueRateLimit>): void;
     deleteQueue(queue: string | TQueueParams, cb: ICallback<void>): void;
     getNamespaceQueues(ns: string, cb: ICallback<TQueueParams[]>): void;
     deleteNamespace(ns: string, cb: ICallback<void>): void;

package/dist/src/system/app/queue-manager/queue-manager-frontend.js

@@ -12,13 +12,16 @@ class QueueManagerFrontend {
         this.logger = (0, logger_1.getNamespacedLogger)('QueueManager');
     }
     clearQueueRateLimit(queue, cb) {
-        queue_manager_1.queueManager.clearQueueRateLimit(this.redisClient, queue, cb);
+        const queueParams = queue_manager_1.queueManager.getQueueParams(queue);
+        queue_manager_1.queueManager.clearQueueRateLimit(this.redisClient, queueParams, cb);
     }
     setQueueRateLimit(queue, rateLimit, cb) {
-        queue_manager_1.queueManager.setQueueRateLimit(this.redisClient, queue, rateLimit, cb);
+        const queueParams = queue_manager_1.queueManager.getQueueParams(queue);
+        queue_manager_1.queueManager.setQueueRateLimit(this.redisClient, queueParams, rateLimit, cb);
     }
     getQueueRateLimit(queue, cb) {
-        queue_manager_1.queueManager.getQueueRateLimit(this.redisClient, queue, cb);
+        const queueParams = queue_manager_1.queueManager.getQueueParams(queue);
+        queue_manager_1.queueManager.getQueueRateLimit(this.redisClient, queueParams, cb);
     }
     deleteQueue(queue, cb) {
         const queueParams = queue_manager_1.queueManager.getQueueParams(queue);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redis-smq",
-  "version": "6.2.1",
+  "version": "6.2.4",
   "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.1",
+    "redis-smq-monitor": "6.5.3",
     "reflect-metadata": "0.1.13",
     "socket.io": "4.2.0",
     "stoppable": "1.1.0",

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

@@ -1,3 +0,0 @@
-import { RedisSMQError } from '../../common/errors/redis-smq.error';
-export declare class ConsumerError extends RedisSMQError {
-}