@onlineapps/mq-client-core 1.0.74 → 1.0.76

package/package.json

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

package/src/transports/rabbitmqClient.js

@@ -766,60 +766,7 @@ class RabbitMQClient extends EventEmitter {
       this._attachConsumerChannelHandlers(this._consumerChannel);
       
       // Re-register all active consumers
-      let reRegistered = 0;
-      let failed = 0;
-      
-      if (this._activeConsumers.size > 0) {
-        console.log(`[RabbitMQClient] [mq-client-core] Re-registering ${this._activeConsumers.size} consumers...`);
-        for (const [queue, consumerInfo] of this._activeConsumers.entries()) {
-          try {
-            // Re-assert queue with correct options before consuming (may have been deleted)
-            if (consumerInfo.options.queueOptions) {
-              try {
-                await this._ensureQueueChannel();
-                if (!this._queueChannel || this._queueChannel.closed) {
-                  throw new Error('Queue channel is not available (connection may be closed)');
-                }
-                this._trackChannelOperation(this._queueChannel, `assertQueue ${queue} (re-register)`);
-                await this._queueChannel.assertQueue(queue, consumerInfo.options.queueOptions);
-              } catch (assertErr) {
-                if (assertErr.code === 404) {
-                  console.warn(`[RabbitMQClient] [mq-client-core] Queue ${queue} does not exist, skipping consumer re-registration`);
-                  this._activeConsumers.delete(queue);
-                  failed++;
-                  this.emit('consumer:re-registration:failed', { queue, error: 'Queue does not exist', code: 404 });
-                  continue;
-                }
-                // 406 error means queue exists with different args - skip this consumer
-                if (assertErr.code === 406) {
-                  console.warn(`[RabbitMQClient] [mq-client-core] Queue ${queue} exists with different args, skipping consumer re-registration`);
-                  this._activeConsumers.delete(queue);
-                  failed++;
-                  this.emit('consumer:re-registration:failed', { queue, error: 'Queue exists with different arguments', code: 406 });
-                  continue;
-                }
-                throw assertErr;
-              }
-            }
-            
-            const consumeResult = await this._consumerChannel.consume(
-              queue,
-              consumerInfo.handler,
-              { noAck: consumerInfo.options.noAck }
-            );
-            consumerInfo.consumerTag = consumeResult.consumerTag;
-            reRegistered++;
-            console.log(`[RabbitMQClient] [mq-client-core] ✓ Re-registered consumer for queue: ${queue} (consumerTag: ${consumeResult.consumerTag})`);
-          } catch (err) {
-            failed++;
-            console.error(`[RabbitMQClient] [mq-client-core] Failed to re-register consumer for queue ${queue}:`, err.message);
-            // Remove failed consumer from tracking
-            this._activeConsumers.delete(queue);
-            // Emit event for re-registration failure
-            this.emit('consumer:re-registration:failed', { queue, error: err.message, code: err.code });
-          }
-        }
-      }
+      const { reRegistered, failed } = await this._reRegisterConsumers();
       
       console.log(`[RabbitMQClient] [mq-client-core] ✓ Consumer channel recreated (re-registered: ${reRegistered}, failed: ${failed})`);
       return { reRegistered, failed };
@@ -829,6 +776,73 @@ class RabbitMQClient extends EventEmitter {
     }
   }
 
+  /**
+   * Internal helper to re-register all active consumers on the current consumer channel
+   * @private
+   * @returns {Promise<{reRegistered: number, failed: number}>}
+   */
+  async _reRegisterConsumers() {
+    let reRegistered = 0;
+    let failed = 0;
+
+    if (!this._consumerChannel || this._consumerChannel.closed) {
+      return { reRegistered: 0, failed: this._activeConsumers.size };
+    }
+
+    if (this._activeConsumers.size > 0) {
+      console.log(`[RabbitMQClient] [mq-client-core] Re-registering ${this._activeConsumers.size} consumers...`);
+      for (const [queue, consumerInfo] of this._activeConsumers.entries()) {
+        try {
+          // Re-assert queue with correct options before consuming (may have been deleted)
+          if (consumerInfo.options.queueOptions) {
+            try {
+              await this._ensureQueueChannel();
+              if (!this._queueChannel || this._queueChannel.closed) {
+                throw new Error('Queue channel is not available (connection may be closed)');
+              }
+              this._trackChannelOperation(this._queueChannel, `assertQueue ${queue} (re-register)`);
+              await this._queueChannel.assertQueue(queue, consumerInfo.options.queueOptions);
+            } catch (assertErr) {
+              if (assertErr.code === 404) {
+                console.warn(`[RabbitMQClient] [mq-client-core] Queue ${queue} does not exist, skipping consumer re-registration`);
+                this._activeConsumers.delete(queue);
+                failed++;
+                this.emit('consumer:re-registration:failed', { queue, error: 'Queue does not exist', code: 404 });
+                continue;
+              }
+              // 406 error means queue exists with different args - skip this consumer
+              if (assertErr.code === 406) {
+                console.warn(`[RabbitMQClient] [mq-client-core] Queue ${queue} exists with different args, skipping consumer re-registration`);
+                this._activeConsumers.delete(queue);
+                failed++;
+                this.emit('consumer:re-registration:failed', { queue, error: 'Queue exists with different arguments', code: 406 });
+                continue;
+              }
+              throw assertErr;
+            }
+          }
+          
+          const consumeResult = await this._consumerChannel.consume(
+            queue,
+            consumerInfo.handler,
+            { noAck: consumerInfo.options.noAck }
+          );
+          consumerInfo.consumerTag = consumeResult.consumerTag;
+          reRegistered++;
+          console.log(`[RabbitMQClient] [mq-client-core] ✓ Re-registered consumer for queue: ${queue} (consumerTag: ${consumeResult.consumerTag})`);
+        } catch (err) {
+          failed++;
+          console.error(`[RabbitMQClient] [mq-client-core] Failed to re-register consumer for queue ${queue}:`, err.message);
+          // Remove failed consumer from tracking
+          this._activeConsumers.delete(queue);
+          // Emit event for re-registration failure
+          this.emit('consumer:re-registration:failed', { queue, error: err.message, code: err.code });
+        }
+      }
+    }
+    return { reRegistered, failed };
+  }
+
   /**
    * Disconnects: closes channel and connection.
    * @returns {Promise<void>}
@@ -1782,33 +1796,21 @@ class RabbitMQClient extends EventEmitter {
         
         // Recreate publisher channel
         try {
-          this._channel = await this._connection.createConfirmChannel();
-          this._channel._createdAt = new Date().toISOString();
-          this._channel._closeReason = null;
-          this._channel._lastOperation = 'Recreated via _reconnectWithBackoff()';
-          this._channel._type = 'publisher';
-          this._attachPublisherChannelHandlers(this._channel);
+          await this._ensurePublisherChannel();
           channelState.publisher = true;
           console.log('[RabbitMQClient] ✓ Publisher channel recreated');
         } catch (err) {
           console.error('[RabbitMQClient] Failed to recreate publisher channel:', err.message);
-          this._channel = null;
           // Continue - partial success is better than total failure
         }
         
         // Recreate queue channel
         try {
-          this._queueChannel = await this._connection.createChannel();
-          this._queueChannel._createdAt = new Date().toISOString();
-          this._queueChannel._closeReason = null;
-          this._queueChannel._lastOperation = 'Recreated via _reconnectWithBackoff()';
-          this._queueChannel._type = 'queue';
-          this._attachQueueChannelHandlers(this._queueChannel);
+          await this._ensureQueueChannel();
           channelState.queue = true;
           console.log('[RabbitMQClient] ✓ Queue channel recreated');
         } catch (err) {
           console.error('[RabbitMQClient] Failed to recreate queue channel:', err.message);
-          this._queueChannel = null;
           // Continue - partial success is better than total failure
         }
         
@@ -1821,8 +1823,8 @@ class RabbitMQClient extends EventEmitter {
           this._consumerChannel._type = 'consumer';
           this._attachConsumerChannelHandlers(this._consumerChannel);
           
-          // Re-register all consumers
-          consumerReRegResult = await this._ensureConsumerChannel();
+          // Re-register all consumers - use internal helper to avoid the "channel already open" check
+          consumerReRegResult = await this._reRegisterConsumers();
           channelState.consumer = true;
           console.log('[RabbitMQClient] ✓ Consumer channel recreated');
         } catch (err) {