@onlineapps/conn-infra-mq 1.1.4 → 1.1.5

package/package.json

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

package/src/transports/rabbitmqClient.js

@@ -163,19 +163,27 @@ class RabbitMQClient extends EventEmitter {
         // Use central config for infrastructure queues
         const queueOptions = this._getQueueOptions(queue, { durable });
         
-        // Try to check if queue exists first (to avoid PRECONDITION-FAILED if it exists with different args)
+        // Try to assert queue with our config
+        // If it fails with 406 (PRECONDITION-FAILED), queue exists with different args - use it as-is
         try {
-          await this._channel.checkQueue(queue);
-          // Queue exists - use it as-is (don't try to assert with different args)
-          // This prevents 406 PRECONDITION-FAILED errors
-        } catch (checkErr) {
-          // Queue doesn't exist (404) - create it with our config
-          if (checkErr.code === 404) {
-            await this._channel.assertQueue(queue, queueOptions);
+          await this._channel.assertQueue(queue, queueOptions);
+        } catch (assertErr) {
+          // If queue exists with different arguments (406), use it as-is
+          if (assertErr.code === 406) {
+            console.warn(`[RabbitMQClient] Queue ${queue} exists with different arguments, using as-is:`, assertErr.message);
+            // Try to assert with minimal options (just durable) to verify queue exists
+            try {
+              await this._channel.assertQueue(queue, { durable: durable !== false });
+            } catch (minErr) {
+              // If even minimal assert fails, queue might not exist - log and proceed
+              console.warn(`[RabbitMQClient] Could not assert queue ${queue} with minimal options:`, minErr.message);
+            }
+          } else if (assertErr.code === 404) {
+            // Queue doesn't exist - this shouldn't happen with assertQueue, but handle it
+            throw assertErr;
           } else {
-            // Other error (e.g., 406) - queue exists with different args, use it as-is
-            // Log warning but proceed to consume
-            console.warn(`[RabbitMQClient] Queue ${queue} exists with different arguments, using as-is:`, checkErr.message);
+            // Other error - rethrow
+            throw assertErr;
           }
         }
       }