@onlineapps/conn-infra-mq 1.1.40 → 1.1.42

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@onlineapps/conn-infra-mq",
-    "version": "1.1.40",
+    "version": "1.1.42",
     "description": "A promise-based, broker-agnostic client for sending and receiving messages via RabbitMQ",
     "main": "src/index.js",
     "repository": {

package/src/layers/QueueManager.js

@@ -365,121 +365,73 @@ class QueueManager {
         }
       }
       
-      // CRITICAL: Use the SAME pattern as ensureQueue() - checkQueue() FIRST, then assertQueue() only if 404
-      // This prevents channel closure on 406 PRECONDITION-FAILED
-      // Pattern: checkQueue() -> if 404, assertQueue() -> if 406, use existing queue (channel stays open)
+      // CRITICAL: Use assertQueue() DIRECTLY - it's idempotent and safer than checkQueue() + assertQueue()
+      // assertQueue() creates queue if it doesn't exist, or does nothing if it exists with same params
+      // If queue exists with different params (406), channel closes but that's OK - we accept the queue
       let queueCreated = false;
       
       // Track operation on channel for debugging
       if (channel && channel._lastOperation !== undefined) {
-        channel._lastOperation = `About to checkQueue ${queueName}`;
+        channel._lastOperation = `About to assertQueue ${queueName}`;
       }
       
       try {
-        console.log(`[QueueManager] DEBUG: About to checkQueue ${queueName} (same pattern as ensureQueue)`);
+        console.log(`[QueueManager] DEBUG: About to assertQueue ${queueName} directly (idempotent)`);
         console.log(`[QueueManager] DEBUG: Channel state: exists=${!!channel}, closed=${channel ? (channel.closed === true ? 'true' : channel.closed === false ? 'false' : 'undefined') : 'N/A'}`);
         
-        // CRITICAL: Use checkQueue() FIRST (same as ensureQueue() pattern)
-        // This prevents channel closure on 406 - if queue exists with different args, checkQueue() returns 406 but channel stays open
-        await channel.checkQueue(queueName);
+        // CRITICAL: Use assertQueue() DIRECTLY - it's idempotent
+        // If queue doesn't exist → creates it
+        // If queue exists with same params → does nothing (OK)
+        // If queue exists with different params → 406, channel closes (but we accept the queue)
+        await channel.assertQueue(queueName, queueOptions);
         
-        // Queue exists - use it
-        console.log(`[QueueManager] DEBUG: checkQueue succeeded - queue ${queueName} exists`);
+        // Queue created or already exists with same params
+        console.log(`[QueueManager] DEBUG: assertQueue succeeded for ${queueName}`);
         if (channel && channel._lastOperation !== undefined) {
-          channel._lastOperation = `checkQueue ${queueName} succeeded`;
+          channel._lastOperation = `assertQueue ${queueName} succeeded`;
         }
         queues[queueInfo.type] = queueName;
         queueCreated = true;
-        console.info(`[QueueManager] ✓ Business queue exists: ${queueName}`);
-      } catch (checkErr) {
-        console.log(`[QueueManager] DEBUG: checkQueue failed for ${queueName}:`, checkErr.message);
-        console.log(`[QueueManager] DEBUG: Error code: ${checkErr.code}`);
+        console.info(`[QueueManager] ✓ Created/verified business queue: ${queueName}`);
+      } catch (assertErr) {
+        console.log(`[QueueManager] DEBUG: assertQueue failed for ${queueName}:`, assertErr.message);
+        console.log(`[QueueManager] DEBUG: Error code: ${assertErr.code}`);
         
-        // Check if channel is still open
-        if (!channel || channel.closed) {
-          throw new Error('Channel closed during checkQueue - cannot verify queue');
-        }
-        
-        // If queue doesn't exist (404), create it using assertQueue
-        // CRITICAL: checkQueue() on 404 may close channel in amqplib, so we must check and recreate if needed
-        if (checkErr.code === 404) {
-          console.log(`[QueueManager] DEBUG: Queue ${queueName} doesn't exist (404), creating with assertQueue...`);
-          
-          // CRITICAL: checkQueue() on 404 may close channel - check and recreate if needed
-          if (!channel || channel.closed) {
-            console.warn(`[QueueManager] DEBUG: Channel closed after checkQueue(404) for ${queueName}, recreating...`);
-            try {
-              const newChannel = await transport._connection.createChannel();
-              newChannel._createdAt = new Date().toISOString();
-              newChannel._closeReason = null;
-              newChannel._lastOperation = `Recreated after checkQueue(404) for ${queueName}`;
-              
-              newChannel.on('error', (err) => {
-                console.error('[RabbitMQClient] Recreated queue channel error:', err.message);
-                newChannel._closeReason = `Error: ${err.message} (code: ${err.code})`;
-              });
-              newChannel.on('close', () => {
-                console.error('[RabbitMQClient] Recreated queue channel closed');
-                console.error('[RabbitMQClient] Close reason:', newChannel._closeReason || 'Unknown');
-              });
-              
-              channel = newChannel;
-              transport._queueChannel = channel;
-              console.log(`[QueueManager] DEBUG: Channel recreated after checkQueue(404) for ${queueName}`);
-            } catch (recreateErr) {
-              throw new Error(`Channel closed after checkQueue(404) for ${queueName} and failed to recreate: ${recreateErr.message}`);
-            }
-          }
-          
-          if (channel && channel._lastOperation !== undefined) {
-            channel._lastOperation = `About to assertQueue ${queueName} (queue doesn't exist)`;
-          }
+        // If 406 PRECONDITION-FAILED, queue exists with different args - accept it
+        // Channel is closed by server, but that's OK - queue exists and we can use it
+        if (assertErr.code === 406) {
+          console.warn(`[QueueManager] Queue ${queueName} exists with different arguments (406), accepting as-is:`, assertErr.message);
+          queues[queueInfo.type] = queueName;
+          queueCreated = true;
+          console.info(`[QueueManager] ✓ Business queue exists (different args, accepted): ${queueName}`);
           
+          // Channel is closed, but we need to recreate it for next queue
+          // Don't throw error - queue exists, we just need new channel
           try {
-            await channel.assertQueue(queueName, queueOptions);
-            console.log(`[QueueManager] DEBUG: assertQueue succeeded for ${queueName}`);
-            if (channel && channel._lastOperation !== undefined) {
-              channel._lastOperation = `assertQueue ${queueName} succeeded`;
-            }
-            queues[queueInfo.type] = queueName;
-            queueCreated = true;
-            console.info(`[QueueManager] ✓ Created business queue: ${queueName}`);
-          } catch (assertErr) {
-            // If channel closed during assertQueue, it's a real error
-            if (!channel || channel.closed) {
-              throw new Error(`Channel closed during assertQueue for ${queueName} - check channel management`);
-            }
+            const newChannel = await transport._connection.createChannel();
+            newChannel._createdAt = new Date().toISOString();
+            newChannel._closeReason = null;
+            newChannel._lastOperation = `Recreated after 406 for ${queueName}`;
             
-            // If 406 PRECONDITION-FAILED, queue exists with different args (race condition?)
-            if (assertErr.code === 406) {
-              console.warn(`[QueueManager] Queue ${queueName} exists with different arguments (406 from assertQueue):`, assertErr.message);
-              // Channel should still be open - try checkQueue to verify
-              if (!channel || channel.closed) {
-                throw new Error('Channel closed - cannot check existing queue');
-              }
-              try {
-                await channel.checkQueue(queueName);
-                queues[queueInfo.type] = queueName;
-                queueCreated = true;
-                console.info(`[QueueManager] ✓ Business queue exists (verified): ${queueName}`);
-              } catch (verifyErr) {
-                throw new Error(`Failed to verify existing queue ${queueName}: ${verifyErr.message}`);
-              }
-            } else {
-              // Other errors - rethrow
-              throw assertErr;
-            }
+            newChannel.on('error', (err) => {
+              console.error('[RabbitMQClient] Recreated queue channel error:', err.message);
+              newChannel._closeReason = `Error: ${err.message} (code: ${err.code})`;
+            });
+            newChannel.on('close', () => {
+              console.error('[RabbitMQClient] Recreated queue channel closed');
+              console.error('[RabbitMQClient] Close reason:', newChannel._closeReason || 'Unknown');
+            });
+            
+            channel = newChannel;
+            transport._queueChannel = channel;
+            console.log(`[QueueManager] DEBUG: Channel recreated after 406 for ${queueName}`);
+          } catch (recreateErr) {
+            // Even if channel recreation fails, queue exists - log warning but continue
+            console.warn(`[QueueManager] Failed to recreate channel after 406 for ${queueName}, but queue exists:`, recreateErr.message);
           }
-        } else if (checkErr.code === 406) {
-          // Queue exists with different args (406 from checkQueue) - use it as-is
-          // CRITICAL: checkQueue() on 406 does NOT close channel (unlike assertQueue() on 406)
-          console.warn(`[QueueManager] Queue ${queueName} exists with different arguments (406 from checkQueue), using as-is:`, checkErr.message);
-          queues[queueInfo.type] = queueName;
-          queueCreated = true;
-          console.info(`[QueueManager] ✓ Business queue exists (different args): ${queueName}`);
         } else {
-          // Other error - rethrow
-          throw checkErr;
+          // Other error - critical, cannot continue
+          throw new Error(`Failed to create business queue ${queueName}: ${assertErr.message}`);
         }
       }
       

package/src/transports/rabbitmqClient.js

@@ -114,6 +114,40 @@ class RabbitMQClient extends EventEmitter {
     }
   }
 
+  /**
+   * Recreates the publish channel if it's closed.
+   * Used when channel closes unexpectedly (e.g., due to 406 errors).
+   * @private
+   * @returns {Promise<void>}
+   * @throws {Error} If connection is not available or channel recreation fails.
+   */
+  async _recreateChannel() {
+    if (!this._connection) {
+      throw new Error('Cannot recreate channel: connection is not available');
+    }
+
+    try {
+      // Close old channel if it exists
+      if (this._channel) {
+        try {
+          await this._channel.close();
+        } catch (err) {
+          // Ignore errors when closing already-closed channel
+        }
+      }
+
+      // Create new ConfirmChannel
+      this._channel = await this._connection.createConfirmChannel();
+      this._channel.on('error', (err) => this.emit('error', err));
+      this._channel.on('close', () => {
+        this.emit('error', new Error('RabbitMQ channel closed unexpectedly'));
+      });
+    } catch (err) {
+      this._channel = null;
+      throw new Error(`Failed to recreate channel: ${err.message}`);
+    }
+  }
+
   /**
    * Disconnects: closes channel and connection.
    * @returns {Promise<void>}
@@ -158,6 +192,16 @@ class RabbitMQClient extends EventEmitter {
     if (!this._channel) {
       throw new Error('Cannot publish: channel is not initialized');
     }
+    
+    // Check if channel is closed and recreate if needed
+    if (this._channel.closed) {
+      console.warn('[RabbitMQClient] Publish channel is closed, recreating...');
+      try {
+        await this._recreateChannel();
+      } catch (recreateErr) {
+        throw new Error(`Cannot publish: channel is closed and recreation failed: ${recreateErr.message}`);
+      }
+    }
 
     const exchange = this._config.exchange || '';
     const routingKey = options.routingKey || queue;
@@ -177,19 +221,47 @@ class RabbitMQClient extends EventEmitter {
           // Business queue - should already exist, skip checkQueue() to avoid channel closure
           console.log(`[RabbitMQClient] DEBUG: Business queue ${queue}, skipping checkQueue() in publish() - queue should already exist`);
         } else {
-          // Infrastructure queue - check if it exists
+          // Infrastructure queue - use assertQueue() directly (idempotent, won't cause 406)
+          // assertQueue() will use existing queue even if args differ, avoiding channel closure
+          // Recreate queueChannel if it's closed
+          if (!this._queueChannel || this._queueChannel.closed) {
+            if (!this._connection) {
+              throw new Error('Cannot assertQueue: connection is not available');
+            }
+            console.warn('[RabbitMQClient] Queue channel is closed, recreating...');
+            try {
+              if (this._queueChannel) {
+                try {
+                  await this._queueChannel.close();
+                } catch (err) {
+                  // Ignore errors when closing already-closed channel
+                }
+              }
+              this._queueChannel = await this._connection.createChannel();
+              this._queueChannel._createdAt = new Date().toISOString();
+              this._queueChannel._closeReason = null;
+              this._queueChannel._lastOperation = null;
+              this._queueChannel.on('error', (err) => {
+                console.error('[RabbitMQClient] Queue channel error:', err.message);
+                this._queueChannel._closeReason = `Error: ${err.message} (code: ${err.code})`;
+              });
+              this._queueChannel.on('close', () => {
+                console.error('[RabbitMQClient] Queue channel closed');
+              });
+            } catch (recreateErr) {
+              console.warn(`[RabbitMQClient] Failed to recreate queue channel, proceeding anyway:`, recreateErr.message);
+            }
+          }
+          
           const queueOptions = this._getQueueOptions(queue);
           try {
-            await this._queueChannel.checkQueue(queue);
-            // Queue exists - proceed to publish
-          } catch (checkErr) {
-            // If queue doesn't exist (404), create it
-            if (checkErr.code === 404) {
+            if (this._queueChannel && !this._queueChannel.closed) {
               await this._queueChannel.assertQueue(queue, queueOptions);
-            } else {
-              // Other error (including 406) - queue exists with different args, proceed
-              console.warn(`[RabbitMQClient] Queue ${queue} exists with different arguments, using as-is`);
             }
+          } catch (assertErr) {
+            // If assertQueue fails (shouldn't happen), log and proceed anyway
+            // The queue likely exists with different args - publish will work or fail clearly
+            console.warn(`[RabbitMQClient] assertQueue failed for ${queue}, proceeding anyway:`, assertErr.message);
           }
         }
         // Publish using ConfirmChannel (for publisher confirms)