@onlineapps/mq-client-core 1.0.67 → 1.0.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/mq-client-core",
-  "version": "1.0.67",
+  "version": "1.0.69",
   "description": "Core MQ client library for RabbitMQ - shared by infrastructure services and connectors",
   "main": "src/index.js",
   "scripts": {

package/src/BaseClient.js

@@ -188,21 +188,9 @@ class BaseClient {
 
     try {
       const consumeStartTime = Date.now();
-      await this._transport.consume(
-        queue,
-        async (msg) => {
-          try {
-            await messageHandler(msg);
-            if (consumeOptions.noAck === false) {
-              await this.ack(msg);
-            }
-          } catch (handlerErr) {
-            // On handler error, nack with requeue: true
-            await this.nack(msg, { requeue: true });
-          }
-        },
-        consumeOptions
-      );
+      // Delegate message lifecycle (ack/nack/requeue) to the transport layer.
+      // BaseClient only provides a broker-agnostic surface; transport decides how to handle handler errors.
+      await this._transport.consume(queue, async (msg) => messageHandler(msg), consumeOptions);
       const consumeEndTime = Date.now();
       console.log(`[BaseClient] [CONSUMER] ✓ consume() completed for queue: ${queue} (took ${consumeEndTime - consumeStartTime}ms)`);
     } catch (err) {

package/src/transports/rabbitmqClient.js

@@ -49,7 +49,7 @@ function createInfraLogger(service, layer) {
 class RabbitMQClient extends EventEmitter {
   /**
    * @param {Object} config
-   * @param {string} config.host         - AMQP URI or hostname (e.g., 'amqp://localhost:5672')
+   * @param {string} config.host         - AMQP URI or hostname (e.g., 'amqp://127.0.0.1:5672')
    * @param {string} [config.queue]      - Default queue name (optional; can be overridden per call)
    * @param {string} [config.exchange]   - Default exchange (default: '')
    * @param {boolean} [config.durable]   - Declare queues/exchanges as durable (default: true)
@@ -78,6 +78,7 @@ class RabbitMQClient extends EventEmitter {
     
     // Connection-level recovery
     this._reconnecting = false;
+    this._disconnecting = false;
     this._reconnectAttempts = 0;
     this._maxReconnectAttempts = this._config.maxReconnectAttempts || 10; // Max 10 attempts
     this._reconnectBaseDelay = this._config.reconnectBaseDelay || 1000; // Start with 1 second
@@ -432,11 +433,16 @@ class RabbitMQClient extends EventEmitter {
         : [{ ...rawTarget, heartbeat, clientProperties: { connection_name: connectionName } }];
 
       const connectPromise = amqp.connect(...connectArgs);
+      let connectTimeoutTimer = null;
       const timeoutPromise = new Promise((_, reject) => {
-        setTimeout(() => reject(new Error('Connection timeout after 10 seconds')), 10000);
+        connectTimeoutTimer = setTimeout(() => reject(new Error('Connection timeout after 10 seconds')), 10000);
       });
       console.log('[RabbitMQClient] Starting connection race...');
       this._connection = await Promise.race([connectPromise, timeoutPromise]);
+      if (connectTimeoutTimer) {
+        clearTimeout(connectTimeoutTimer);
+        connectTimeoutTimer = null;
+      }
       console.log('[RabbitMQClient] Connection established');
       this._reconnectAttempts = 0; // Reset reconnect attempts on successful connection
       
@@ -447,6 +453,10 @@ class RabbitMQClient extends EventEmitter {
       });
       
       this._connection.on('close', () => {
+        if (this._disconnecting) {
+          console.log('[RabbitMQClient] Connection closed during disconnect (expected)');
+          return;
+        }
         console.warn('[RabbitMQClient] Connection closed unexpectedly - close handler STARTED');
         console.log(`[RabbitMQClient] Close handler: reconnectEnabled=${this._reconnectEnabled}, reconnecting=${this._reconnecting}`);
         
@@ -1019,6 +1029,7 @@ class RabbitMQClient extends EventEmitter {
   }
 
   async disconnect() {
+    this._disconnecting = true;
     // Stop health monitoring
     this._stopHealthMonitoring();
     
@@ -1070,6 +1081,7 @@ class RabbitMQClient extends EventEmitter {
         this.emit('error', err);
       }
     }
+    this._disconnecting = false;
   }
 
   /**
@@ -1788,6 +1800,9 @@ class RabbitMQClient extends EventEmitter {
    */
   _attachPublisherChannelHandlers(channel) {
     channel.on('error', async (err) => {
+      if (this._disconnecting) {
+        return;
+      }
       const reason = `Publisher channel error: ${err.message} (code: ${err.code || 'unknown'})`;
       channel._closeReason = reason;
       
@@ -1819,6 +1834,9 @@ class RabbitMQClient extends EventEmitter {
     });
     
     channel.on('close', async () => {
+      if (this._disconnecting) {
+        return;
+      }
       const reason = channel._closeReason || 'Publisher channel closed unexpectedly';
       console.warn(`[RabbitMQClient] [mq-client-core] ${reason} - will auto-recreate on next publish`);
       this._callChannelCloseHooks('publisher', channel, null, reason);
@@ -1848,6 +1866,9 @@ class RabbitMQClient extends EventEmitter {
    */
   _attachQueueChannelHandlers(channel) {
     channel.on('error', async (err) => {
+      if (this._disconnecting) {
+        return;
+      }
       const reason = `Queue channel error: ${err.message} (code: ${err.code || 'unknown'})`;
       channel._closeReason = reason;
       console.warn(`[RabbitMQClient] [mq-client-core] ${reason}`);
@@ -1856,6 +1877,9 @@ class RabbitMQClient extends EventEmitter {
     });
     
     channel.on('close', async () => {
+      if (this._disconnecting) {
+        return;
+      }
       const reason = channel._closeReason || 'Queue channel closed unexpectedly';
       console.warn(`[RabbitMQClient] [mq-client-core] ${reason} - will auto-recreate on next operation`);
       this._callChannelCloseHooks('queue', channel, null, reason);
@@ -1888,6 +1912,9 @@ class RabbitMQClient extends EventEmitter {
    */
   _attachConsumerChannelHandlers(channel) {
     channel.on('error', async (err) => {
+      if (this._disconnecting) {
+        return;
+      }
       const reason = `Consumer channel error: ${err.message} (code: ${err.code || 'unknown'})`;
       channel._closeReason = reason;
       console.warn(`[RabbitMQClient] [mq-client-core] ${reason}`);
@@ -1897,6 +1924,9 @@ class RabbitMQClient extends EventEmitter {
     });
     
     channel.on('close', async () => {
+      if (this._disconnecting) {
+        return;
+      }
       const reason = channel._closeReason || 'Consumer channel closed unexpectedly';
       console.warn(`[RabbitMQClient] [mq-client-core] ${reason} - will auto-recreate and re-register consumers`);
       this._callChannelCloseHooks('consumer', channel, null, reason);