@onlineapps/conn-orch-registry 1.1.16 → 1.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/conn-orch-registry",
-  "version": "1.1.16",
+  "version": "1.1.18",
   "license": "MIT",
   "description": "Connector-registry-client provides the core communication mechanism for microservices in this environment. It enables them to interact with a services_registry to receive and fulfill tasks by submitting heartbeats or their API descriptions.",
   "keywords": [

package/src/queueManager.js

@@ -65,7 +65,21 @@ class QueueManager {
     const queuesToCreate = baseQueues.concat(additionalQueues);
 
     for (const q of queuesToCreate) {
-      await this.channel.assertQueue(q, { durable: true });
+      // Use checkQueue first to avoid 406 PRECONDITION-FAILED closing the channel
+      // If queue doesn't exist (404), then assertQueue to create it
+      try {
+        await this.channel.checkQueue(q);
+        // Queue exists - continue
+      } catch (checkErr) {
+        // If queue doesn't exist (404), create it with default options
+        if (checkErr.code === 404) {
+          await this.channel.assertQueue(q, { durable: true });
+        } else {
+          // Other error (including 406) - queue exists with different args
+          // Log warning and continue without asserting
+          console.warn(`[QueueManager] Queue ${q} exists with different arguments, using as-is:`, checkErr.message);
+        }
+      }
     }
   }
 

package/src/registryClient.js

@@ -123,10 +123,20 @@ class ServiceRegistryClient extends EventEmitter {
     // Handle registration response from registry
     // Registry sends 'register.confirmed' after validation
     if ((payload.type === 'registerResponse' || payload.type === 'register.confirmed') && payload.requestId) {
+      console.log(`[RegistryClient] ${this.serviceName}: Received ${payload.type} message`, {
+        requestId: payload.requestId,
+        hasPendingRegistrations: !!(this.pendingRegistrations),
+        pendingCount: this.pendingRegistrations ? this.pendingRegistrations.size : 0,
+        hasMatchingRequest: !!(this.pendingRegistrations && this.pendingRegistrations.has(payload.requestId)),
+        pendingKeys: this.pendingRegistrations ? Array.from(this.pendingRegistrations.keys()) : []
+      });
+
       if (this.pendingRegistrations && this.pendingRegistrations.has(payload.requestId)) {
         const { resolve } = this.pendingRegistrations.get(payload.requestId);
         this.pendingRegistrations.delete(payload.requestId);
 
+        console.log(`[RegistryClient] ${this.serviceName}: ✓ Resolving registration promise for requestId: ${payload.requestId}`);
+
         // Resolve the registration promise with the response
         resolve({
           success: payload.success || false,
@@ -137,6 +147,8 @@ class ServiceRegistryClient extends EventEmitter {
           validated: payload.validated || payload.success, // Consider successful registration as validated
           certificate: payload.certificate || null // Include certificate from Registry
         });
+      } else {
+        console.warn(`[RegistryClient] ${this.serviceName}: ⚠️  Received ${payload.type} with requestId ${payload.requestId}, but no matching pending registration found`);
       }
     }
 
@@ -217,7 +229,15 @@ class ServiceRegistryClient extends EventEmitter {
     }
 
     // Send registration message to registry
-    await this.queueManager.channel.assertQueue(this.registryQueue, { durable: true });
+    // Use checkQueue to avoid 406 PRECONDITION-FAILED closing the channel
+    try {
+      await this.queueManager.channel.checkQueue(this.registryQueue);
+    } catch (checkErr) {
+      if (checkErr.code === 404) {
+        await this.queueManager.channel.assertQueue(this.registryQueue, { durable: true });
+      }
+      // If 406 or other error, queue exists - proceed to publish
+    }
     console.log(`[RegistryClient] ${this.serviceName}: Sending registration message to queue: ${this.registryQueue}`);
     console.log(`[RegistryClient] ${this.serviceName}: Message type: ${msg.type}, serviceName: ${msg.serviceName}, version: ${msg.version}`);
     this.queueManager.channel.sendToQueue(
@@ -257,7 +277,14 @@ class ServiceRegistryClient extends EventEmitter {
     };
 
     // Send deregistration message to registry
-    await this.queueManager.channel.assertQueue(this.registryQueue, { durable: true });
+    // Use checkQueue to avoid 406 PRECONDITION-FAILED closing the channel
+    try {
+      await this.queueManager.channel.checkQueue(this.registryQueue);
+    } catch (checkErr) {
+      if (checkErr.code === 404) {
+        await this.queueManager.channel.assertQueue(this.registryQueue, { durable: true });
+      }
+    }
     this.queueManager.channel.sendToQueue(
       this.registryQueue,
       Buffer.from(JSON.stringify(msg)),
@@ -300,7 +327,14 @@ class ServiceRegistryClient extends EventEmitter {
       specificationEndpoint: this.specificationEndpoint,
       timestamp: new Date().toISOString()
     };
-    await this.queueManager.channel.assertQueue(this.registryQueue, { durable: true });
+    // Use checkQueue to avoid 406 PRECONDITION-FAILED closing the channel
+    try {
+      await this.queueManager.channel.checkQueue(this.registryQueue);
+    } catch (checkErr) {
+      if (checkErr.code === 404) {
+        await this.queueManager.channel.assertQueue(this.registryQueue, { durable: true });
+      }
+    }
     this.queueManager.channel.sendToQueue(
       this.registryQueue,
       Buffer.from(JSON.stringify(msg)),
@@ -344,7 +378,14 @@ class ServiceRegistryClient extends EventEmitter {
       description: apiDescription,
       timestamp: new Date().toISOString()
     };
-    await this.queueManager.channel.assertQueue(this.registryQueue, { durable: true });
+    // Use checkQueue to avoid 406 PRECONDITION-FAILED closing the channel
+    try {
+      await this.queueManager.channel.checkQueue(this.registryQueue);
+    } catch (checkErr) {
+      if (checkErr.code === 404) {
+        await this.queueManager.channel.assertQueue(this.registryQueue, { durable: true });
+      }
+    }
     this.queueManager.channel.sendToQueue(
       this.registryQueue,
       Buffer.from(JSON.stringify(msg)),