@platform-x/hep-message-broker-client 1.1.20 → 1.1.22

package/dist/src/messageBroker/rabbitmq/MessageBroker.js

@@ -440,14 +440,14 @@ class MessageBroker {
      * @param consumerHandler - Method name on classInstance to process each message
      * @param consumerErrorHandler - Method name on classInstance called when all retries fail
      */
-    initializeConsumers(classInstance, consumerHandler, consumerErrorHandler) {
+    initializeConsumers(classInstance, consumerHandler, consumerErrorHandler, consumerRetryHandler) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 logger_1.Logger.info('Reached in initialize consumers', 'initializeConsumers');
                 const consumeQueues = configData === null || configData === void 0 ? void 0 : configData.etg_consume_queues;
                 for (const queueName in consumeQueues) {
                     if (Object.prototype.hasOwnProperty.call(consumeQueues, queueName)) {
-                        yield this.consumeMessage(queueName, classInstance, consumerHandler, consumerErrorHandler);
+                        yield this.consumeMessage(queueName, classInstance, consumerHandler, consumerErrorHandler, consumerRetryHandler);
                     }
                 }
             }
@@ -468,7 +468,7 @@ class MessageBroker {
      * @param consumerHandler - Method name invoked to process each message
      * @param consumerErrorHandler - Method name invoked when all retries fail
      */
-    consumeMessage(queueName, classInstance, consumerHandler, consumerErrorHandler) {
+    consumeMessage(queueName, classInstance, consumerHandler, consumerErrorHandler, consumerRetryHandler) {
         return __awaiter(this, void 0, void 0, function* () {
             logger_1.Logger.info(`Reached: Consuming messages from queue ${queueName}`, 'consumeMessage');
             yield this.checkConnectionAndChannel();
@@ -527,6 +527,13 @@ class MessageBroker {
                                 const delay = Number(retryDelay[delayIndex]);
                                 logger_1.Logger.info(`Retrying in ${delay / 1000} seconds... (attempt ${nextAttempt} of ${maxRetries} ${data.feed_type})`, 'consumeMessage');
                                 yield this.sendMessageToRetryQueue({ attempt: nextAttempt, data, retryDelayMs: delay, queueName });
+                                // retry call
+                                if (typeof classInstance[consumerRetryHandler] === 'function') {
+                                    yield classInstance[consumerRetryHandler](data);
+                                }
+                                else {
+                                    logger_1.Logger.error(`Method ${consumerRetryHandler} not found on classInstance`, 'consumeMessage');
+                                }
                                 this.channel.ack(message);
                             }
                         }

package/dist/src/messageBroker/rabbitmq/MessageBrokerClient.js

@@ -264,7 +264,7 @@ class MessageBrokerClient {
      * Funvction for initialize consumer queue
      * @param consumerQueues
      */
-    initializeConsumers(classInstance, consumerHandler, consumerErrorHandler, consumerRetryHandler) {
+    initializeConsumers(classInstance, consumerHandler, consumerErrorHandler) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 logger_1.Logger.info('Reached in initialize consumer', `initializeConsumers`);
@@ -273,7 +273,7 @@ class MessageBrokerClient {
                 for (let queueName in configData === null || configData === void 0 ? void 0 : configData.consume_queues) {
                     if (Object.prototype.hasOwnProperty.call(consume_queues, queueName)) {
                         // Call function Consume messages with retry
-                        yield this.consumeMessage(queueName, classInstance, consumerHandler, consumerErrorHandler, consumerRetryHandler);
+                        yield this.consumeMessage(queueName, classInstance, consumerHandler, consumerErrorHandler);
                     }
                 }
             }
@@ -328,7 +328,7 @@ class MessageBrokerClient {
      * Function to consume message with retry
      * @param queueName
      */
-    consumeMessage(queueName, classInstance, consumerHandler, consumerErrorHandler, consumerRetryHandler) {
+    consumeMessage(queueName, classInstance, consumerHandler, consumerErrorHandler) {
         return __awaiter(this, void 0, void 0, function* () {
             logger_1.Logger.info("Reached: Consuming messages from the queue", 'consumeMessage');
             let attempt = 0;
@@ -380,13 +380,6 @@ class MessageBrokerClient {
                                     let count = retry_delay.length === attempt ? retry_delay[retry_delay.length - 1] : retry_delay[attempt - 1];
                                     retryDelay = Number(count);
                                     yield this.sendMessageToRetryQueue(attempt, data, retryDelay, queueName);
-                                    // retry method
-                                    if (typeof classInstance[consumerRetryHandler] === 'function') {
-                                        classInstance[consumerRetryHandler](data);
-                                    }
-                                    else {
-                                        logger_1.Logger.info(`Method ${consumerRetryHandler} not found in classInstance.`, 'consumerMessage');
-                                    }
                                     logger_1.Logger.info(`Retrying in ${retryDelay / 1000} seconds...`, 'consumeMessage');
                                     yield new Promise((resolve) => setTimeout(resolve, retryDelay));
                                 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@platform-x/hep-message-broker-client",
-    "version": "1.1.20",
+    "version": "1.1.22",
     "description": "platform-x hep-message-broker service",
     "main": "./dist/src/index.js",
     "scripts": {