@onlineapps/conn-orch-registry 1.1.37 → 1.1.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/conn-orch-registry",
-  "version": "1.1.37",
+  "version": "1.1.39",
   "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": [
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@onlineapps/conn-base-storage": "1.0.8",
-    "@onlineapps/mq-client-core": "1.0.70",
+    "@onlineapps/mq-client-core": "1.0.75",
     "@onlineapps/runtime-config": "1.0.2",
     "amqplib": "^0.10.9",
     "axios": "^1.12.2",

package/src/queueManager.js

@@ -45,9 +45,10 @@ class QueueManager {
    */
   async init() {
     const CONNECT_TIMEOUT = 10000; // 10 seconds
+    let connectTimeout;
     const connectPromise = amqp.connect(this.amqpUrl);
     const connectTimeoutPromise = new Promise((_, reject) => {
-      setTimeout(() => {
+      connectTimeout = setTimeout(() => {
         reject(new Error(`RabbitMQ connection timeout after ${CONNECT_TIMEOUT}ms. RabbitMQ may be unavailable at ${this.amqpUrl}`));
       }, CONNECT_TIMEOUT);
     });
@@ -56,14 +57,17 @@ class QueueManager {
       this.conn = await Promise.race([connectPromise, connectTimeoutPromise]);
     } catch (error) {
       throw new Error(`[QueueManager] Failed to connect to RabbitMQ: ${error.message}`);
+    } finally {
+      if (connectTimeout) clearTimeout(connectTimeout);
     }
 
     // Use regular channel instead of ConfirmChannel to avoid RPC reply queue issues
     // ConfirmChannel uses RPC pattern which requires reply queues that may not exist
     const CHANNEL_TIMEOUT = 5000; // 5 seconds
+    let channelTimeout;
     const channelPromise = this.conn.createChannel();
     const channelTimeoutPromise = new Promise((_, reject) => {
-      setTimeout(() => {
+      channelTimeout = setTimeout(() => {
         reject(new Error(`Channel creation timeout after ${CHANNEL_TIMEOUT}ms`));
       }, CHANNEL_TIMEOUT);
     });
@@ -78,6 +82,8 @@ class QueueManager {
         // Ignore close errors
       }
       throw new Error(`[QueueManager] Failed to create channel: ${error.message}`);
+    } finally {
+      if (channelTimeout) clearTimeout(channelTimeout);
     }
   }
 
@@ -127,14 +133,19 @@ class QueueManager {
       try {
         const assertStartTime = Date.now();
         const ASSERT_TIMEOUT = 5000; // 5 seconds
+        let assertTimeout;
         const assertPromise = this.channel.assertQueue(q, queueOptions);
         const assertTimeoutPromise = new Promise((_, reject) => {
-          setTimeout(() => {
+          assertTimeout = setTimeout(() => {
             reject(new Error(`assertQueue timeout after ${ASSERT_TIMEOUT}ms`));
           }, ASSERT_TIMEOUT);
         });
         
-        await Promise.race([assertPromise, assertTimeoutPromise]);
+        try {
+          await Promise.race([assertPromise, assertTimeoutPromise]);
+        } finally {
+          if (assertTimeout) clearTimeout(assertTimeout);
+        }
         const assertEndTime = Date.now();
         console.log(`[QueueManager] [REGISTRY] [QUEUE] ✓ Queue ${q} asserted (took ${assertEndTime - assertStartTime}ms)`);
       } catch (assertErr) {

package/src/registryClient.js

@@ -126,8 +126,9 @@ class ServiceRegistryClient extends EventEmitter {
       },
       { noAck: false }
     );
+    let consumeRegistryTimeout;
     const consumeRegistryTimeoutPromise = new Promise((_, reject) => {
-      setTimeout(() => {
+      consumeRegistryTimeout = setTimeout(() => {
         reject(new Error(`consume() timeout for ${this.serviceRegistryQueue} after ${CONSUME_TIMEOUT}ms`));
       }, CONSUME_TIMEOUT);
     });
@@ -138,6 +139,8 @@ class ServiceRegistryClient extends EventEmitter {
     } catch (consumeErr) {
       console.error(`[FÁZE 0.6] Consumer Startup - FAILED: ${consumeErr.message}`);
       throw new Error(`[RegistryClient] ${this.serviceName}: Failed to start consumer on ${this.serviceRegistryQueue}: ${consumeErr.message}`);
+    } finally {
+      if (consumeRegistryTimeout) clearTimeout(consumeRegistryTimeout);
     }
   }
 
@@ -200,6 +203,13 @@ class ServiceRegistryClient extends EventEmitter {
       if (this.pendingRegistrations && this.pendingRegistrations.has(payload.requestId)) {
         console.log(`[RegistryClient] ${this.serviceName}: [REGISTRATION] Found matching pending registration, extracting resolve function...`);
         const { resolve } = this.pendingRegistrations.get(payload.requestId);
+        
+        // Clear associated timeout
+        if (this.pendingTimeouts && this.pendingTimeouts.has(payload.requestId)) {
+          clearTimeout(this.pendingTimeouts.get(payload.requestId));
+          this.pendingTimeouts.delete(payload.requestId);
+        }
+        
         this.pendingRegistrations.delete(payload.requestId);
         console.log(`[RegistryClient] ${this.serviceName}: [REGISTRATION] ✓ Resolve function extracted, pending registration removed`);
 
@@ -308,8 +318,9 @@ class ServiceRegistryClient extends EventEmitter {
       }
     })();
 
+    let verifyTimeout;
     const timeoutPromise = new Promise((_, reject) => {
-      setTimeout(() => {
+      verifyTimeout = setTimeout(() => {
         reject(new Error(`[RegistryClient] ${this.serviceName}: Timeout verifying infrastructure queue '${queueName}' after ${QUEUE_VERIFY_TIMEOUT}ms. Queue may not exist or RabbitMQ is unresponsive.`));
       }, QUEUE_VERIFY_TIMEOUT);
     });
@@ -320,6 +331,8 @@ class ServiceRegistryClient extends EventEmitter {
       // Clear verification cache on error so we can retry
       this._verifiedInfraQueues.delete(queueName);
       throw error;
+    } finally {
+      if (verifyTimeout) clearTimeout(verifyTimeout);
     }
   }
 
@@ -379,15 +392,19 @@ class ServiceRegistryClient extends EventEmitter {
     const responsePromise = new Promise((resolve, reject) => {
       // Store resolver for this registration request
       this.pendingRegistrations = this.pendingRegistrations || new Map();
-      this.pendingRegistrations.set(msgId, { resolve, reject });
+      this.pendingTimeouts = this.pendingTimeouts || new Map();
 
       // Set timeout for registration response
-      setTimeout(() => {
+      const timeoutId = setTimeout(() => {
         if (this.pendingRegistrations.has(msgId)) {
           this.pendingRegistrations.delete(msgId);
+          this.pendingTimeouts.delete(msgId);
           reject(new Error(`Registration timeout after ${timeout}ms - no response from registry`));
         }
       }, timeout);
+
+      this.pendingRegistrations.set(msgId, { resolve, reject });
+      this.pendingTimeouts.set(msgId, timeoutId);
     });
 
     // Initialize queueManager if not already initialized
@@ -671,9 +688,24 @@ class ServiceRegistryClient extends EventEmitter {
    * @returns {Promise<void>}
    */
   async close() {
+    // Clear all pending registration timeouts
+    if (this.pendingTimeouts) {
+      for (const timeoutId of this.pendingTimeouts.values()) {
+        clearTimeout(timeoutId);
+      }
+      this.pendingTimeouts.clear();
+    }
+
+    // Clear pending registrations (don't reject - client is closing)
+    if (this.pendingRegistrations) {
+      this.pendingRegistrations.clear();
+    }
+
     this.stopHeartbeat();
     if (this.eventConsumer) {
-      this.eventConsumer.clearCache();
+      if (typeof this.eventConsumer.clearCache === 'function') {
+        this.eventConsumer.clearCache();
+      }
     }
     await this.queueManager.close();
   }