@onlineapps/service-wrapper 2.0.26 → 2.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/service-wrapper",
-  "version": "2.0.26",
+  "version": "2.0.28",
   "description": "Thin orchestration layer for microservices - delegates all infrastructure concerns to specialized connectors",
   "main": "src/index.js",
   "scripts": {
@@ -27,7 +27,7 @@
     "@onlineapps/conn-base-cache": "^1.0.0",
     "@onlineapps/conn-base-monitoring": "^1.0.1",
     "@onlineapps/conn-infra-error-handler": "^1.0.0",
-    "@onlineapps/conn-infra-mq": "^1.1.6",
+    "@onlineapps/conn-infra-mq": "^1.1.8",
     "@onlineapps/conn-orch-api-mapper": "^1.0.0",
     "@onlineapps/conn-orch-cookbook": "^2.0.0",
     "@onlineapps/conn-orch-orchestrator": "^1.0.1",

package/src/ServiceWrapper.js

@@ -151,13 +151,10 @@ class ServiceWrapper {
         await this._initializeMonitoring();
       }
 
-      // 2. Initialize MQ connection (needed for workflow.init listener)
+      // 2. Initialize MQ connection
       if (this.config.wrapper?.mq?.enabled !== false) {
         await this._initializeMQ();
-        
-        // Start workflow.init listener immediately (independent of service registration)
-        // This allows the system to receive workflow messages even if service validation/registration fails
-        await this._startWorkflowInitListener();
+        // NOTE: workflow.init listener starts ONLY after successful registration (see _initializeRegistry)
       }
 
       // 3. Run pre-validation (Tier 1)
@@ -261,6 +258,25 @@ class ServiceWrapper {
 
     await this.mqClient.connect();
     console.log('MQ connector initialized');
+
+    // Initialize infrastructure queues using unified tool
+    // All services (infrastructure AND business) should create infrastructure queues
+    // This ensures consistent parameters across all services
+    if (this.config.wrapper?.mq?.initInfrastructureQueues !== false) {
+      try {
+        const { initInfrastructureQueues } = require('@onlineapps/conn-infra-mq').utils || {};
+        if (initInfrastructureQueues && this.mqClient._transport?.channel) {
+          await initInfrastructureQueues(this.mqClient._transport.channel, {
+            logger: this.logger || console
+          });
+          console.log('✓ Infrastructure queues initialized');
+        }
+      } catch (error) {
+        // If tool not available or fails, log warning but continue
+        // Infrastructure queues may have been created by other services
+        console.warn('⚠ Could not initialize infrastructure queues:', error.message);
+      }
+    }
   }
 
   /**
@@ -315,13 +331,16 @@ class ServiceWrapper {
         console.log(`✓ Certificate received: ${registrationResult.certificate.certificateId}`);
       }
 
-      // CRITICAL: Only start service-specific workflow listener after successful validation and registration with certificate
-      // workflow.init listener is already running (started during MQ initialization)
+      // CRITICAL: Start workflow listeners ONLY after successful validation and registration with certificate
+      // Both workflow.init and service-specific listeners start here
       if (registrationResult.success && registrationResult.certificate) {
-        console.log('✓ Certificate validated, starting service-specific workflow listener...');
+        console.log('✓ Certificate validated, starting workflow listeners...');
+        // Start workflow.init listener (for all services)
+        await this._startWorkflowInitListener();
+        // Start service-specific workflow listener
         await this._startServiceWorkflowListener();
       } else {
-        console.warn('⚠ Registration succeeded but no certificate received - service-specific workflow listener NOT started');
+        console.warn('⚠ Registration succeeded but no certificate received - workflow listeners NOT started');
       }
 
     } catch (error) {
@@ -455,8 +474,8 @@ class ServiceWrapper {
   }
 
   /**
-   * Start workflow.init listener (runs independently of service registration)
-   * This allows the system to receive workflow messages even if service validation/registration fails
+   * Start workflow.init listener (runs ONLY after successful registration)
+   * Service must be registered and have a certificate before listening to workflow.init
    * @private
    */
   async _startWorkflowInitListener() {
@@ -470,7 +489,7 @@ class ServiceWrapper {
       await this._processWorkflowMessage(message, 'workflow.init');
     });
 
-    console.log('✓ workflow.init listener started (independent of service registration)');
+    console.log('✓ workflow.init listener started (after successful registration)');
   }
 
   /**