@onlineapps/conn-orch-registry 1.1.5 → 1.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/conn-orch-registry",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "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/registryClient.js

@@ -19,6 +19,8 @@ const EventEmitter = require('events');
 const QueueManager = require('./queueManager');
 const RegistryEventConsumer = require('./registryEventConsumer');
 const { v4: uuidv4 } = require('uuid');
+const fs = require('fs');
+const path = require('path');
 
 class ServiceRegistryClient extends EventEmitter {
   /**
@@ -32,7 +34,7 @@ class ServiceRegistryClient extends EventEmitter {
    * @param {string} [opts.registryQueue='registry_office'] - Queue name for registry messages
    */
   constructor({ amqpUrl, serviceName, version, specificationEndpoint = '/api/v1/specification',
-                heartbeatInterval = 10000, apiQueue = 'api_services_queuer', registryQueue = 'registry_office',
+                heartbeatInterval = 10000, apiQueue = 'api_services_queuer', registryQueue = 'registry.register',
                 redis = null, storageConfig = {} }) {
     super();
     if (!amqpUrl || !serviceName || !version) {
@@ -51,6 +53,9 @@ class ServiceRegistryClient extends EventEmitter {
     this.eventConsumer = null;
     this.redis = redis;
     this.storageConfig = storageConfig;
+
+    // Validation proof (loaded from .validation-proof.json)
+    this.validationProof = null;
   }
 
   /**
@@ -60,11 +65,17 @@ class ServiceRegistryClient extends EventEmitter {
   async init() {
     await this.queueManager.init();
 
+    // Load validation proof if exists
+    await this._loadValidationProof();
+
     // Create service-specific response queue
     this.serviceResponseQueue = `${this.serviceName}.responses`;
 
+    // Create service-specific registry event queue (for certificate delivery)
+    this.serviceRegistryQueue = `${this.serviceName}.registry`;
+
     // Ensure existence of API, registry and service response queues
-    await this.queueManager.ensureQueues([this.apiQueue, this.registryQueue, this.serviceResponseQueue]);
+    await this.queueManager.ensureQueues([this.apiQueue, this.registryQueue, this.serviceResponseQueue, this.serviceRegistryQueue]);
 
     // Start consuming service response queue for registry responses
     await this.queueManager.channel.consume(
@@ -72,6 +83,41 @@ class ServiceRegistryClient extends EventEmitter {
       msg => this._handleRegistryMessage(msg),
       { noAck: false }
     );
+
+    // CRITICAL: Also listen on registry event queue for certificate delivery
+    await this.queueManager.channel.consume(
+      this.serviceRegistryQueue,
+      msg => this._handleRegistryMessage(msg),
+      { noAck: false }
+    );
+  }
+
+  /**
+   * Loads validation proof from .validation-proof.json in service root directory.
+   * Called during initialization.
+   * @private
+   * @returns {Promise<void>}
+   */
+  async _loadValidationProof() {
+    try {
+      // Look for .validation-proof.json in process.cwd() (service root)
+      const proofPath = path.join(process.cwd(), '.validation-proof.json');
+
+      if (fs.existsSync(proofPath)) {
+        const proofData = JSON.parse(fs.readFileSync(proofPath, 'utf8'));
+
+        if (proofData.validationProof && proofData.validationData) {
+          this.validationProof = {
+            hash: proofData.validationProof,
+            data: proofData.validationData
+          };
+          console.log(`[RegistryClient] Validation proof loaded: ${this.validationProof.hash.substring(0, 16)}...`);
+        }
+      }
+    } catch (error) {
+      // Non-critical error - service can still register without proof (will trigger Tier 2 validation)
+      console.warn(`[RegistryClient] Could not load validation proof: ${error.message}`);
+    }
   }
 
   /**
@@ -99,7 +145,8 @@ class ServiceRegistryClient extends EventEmitter {
     }
 
     // Handle registration response from registry
-    if (payload.type === 'registerResponse' && payload.requestId) {
+    // Registry sends 'register.confirmed' after validation
+    if ((payload.type === 'registerResponse' || payload.type === 'register.confirmed') && payload.requestId) {
       if (this.pendingRegistrations && this.pendingRegistrations.has(payload.requestId)) {
         const { resolve } = this.pendingRegistrations.get(payload.requestId);
         this.pendingRegistrations.delete(payload.requestId);
@@ -111,7 +158,8 @@ class ServiceRegistryClient extends EventEmitter {
           serviceName: this.serviceName,
           version: this.version,
           registrationId: payload.registrationId,
-          validated: payload.validated || false
+          validated: payload.validated || payload.success, // Consider successful registration as validated
+          certificate: payload.certificate || null // Include certificate from Registry
         });
       }
     }
@@ -155,6 +203,13 @@ class ServiceRegistryClient extends EventEmitter {
       timestamp: new Date().toISOString()
     };
 
+    // Include validation proof if loaded
+    if (this.validationProof) {
+      msg.validationProof = this.validationProof.hash;
+      msg.validationData = this.validationProof.data;
+      console.log(`[RegistryClient] Including validation proof in registration: ${this.validationProof.hash.substring(0, 16)}...`);
+    }
+
     // Create promise to wait for registration response
     const timeout = serviceInfo.timeout || 30000; // 30 seconds default
     const responsePromise = new Promise((resolve, reject) => {
@@ -234,6 +289,14 @@ class ServiceRegistryClient extends EventEmitter {
     };
   }
 
+  /**
+   * Alias for deregister() - used by ServiceWrapper.shutdown()
+   * @returns {Promise<Object>} Deregistration result
+   */
+  async unregister() {
+    return this.deregister();
+  }
+
   /**
    * Sends a heartbeat message to the API queue.
    * Should be called only after successful registration.