@onlineapps/service-wrapper 2.1.39 → 2.1.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/service-wrapper",
-  "version": "2.1.39",
+  "version": "2.1.40",
   "description": "Thin orchestration layer for microservices - delegates all infrastructure concerns to specialized connectors",
   "main": "src/index.js",
   "scripts": {
@@ -27,11 +27,11 @@
     "@onlineapps/conn-base-cache": "1.0.2",
     "@onlineapps/conn-base-monitoring": "1.0.2",
     "@onlineapps/conn-infra-error-handler": "^1.0.0",
-    "@onlineapps/conn-infra-mq": "1.1.54",
+    "@onlineapps/conn-infra-mq": "1.1.55",
     "@onlineapps/conn-orch-api-mapper": "1.0.15",
     "@onlineapps/conn-orch-cookbook": "2.0.13",
-    "@onlineapps/conn-orch-orchestrator": "1.0.67",
-    "@onlineapps/conn-orch-registry": "1.1.25",
+    "@onlineapps/conn-orch-orchestrator": "1.0.68",
+    "@onlineapps/conn-orch-registry": "1.1.26",
     "@onlineapps/conn-orch-validator": "2.0.14",
     "@onlineapps/monitoring-core": "1.0.8",
     "@onlineapps/service-common": "^1.0.4"

package/src/ServiceWrapper.js

@@ -25,6 +25,7 @@ const { ValidationOrchestrator } = require('@onlineapps/conn-orch-validator');
 
 const INFRA_QUEUE_OWNERS = {
   'workflow.init': 'Gateway (api_gateway)',
+  'workflow.control': 'Gateway (api_gateway)',
   'registry.register': 'Registry (api_services_registry)',
   'validation.requests': 'Validator (api_services_validator)',
   'workflow.completed': 'Delivery Dispatcher (api_delivery_dispatcher)',
@@ -132,6 +133,7 @@ class ServiceWrapper {
     
     try {
       await this._startWorkflowInitListener();
+      await this._startWorkflowControlListener();
       await this._startServiceWorkflowListener();
       this.logger?.info('✓ All workflow listeners started successfully');
       this._logPhase('0.9', 'Workflow Listener Startup', 'PASSED', null, Date.now() - workflowListenerStartTime);
@@ -341,6 +343,16 @@ class ServiceWrapper {
           console.warn(`[CLEANUP] Failed to cancel workflow.init consumer:`, err.message);
         }
       }
+      if (this.workflowControlConsumerTag) {
+        try {
+          if (this.mqClient?.channel) {
+            await this.mqClient.channel.cancel(this.workflowControlConsumerTag);
+            console.log(`[CLEANUP] ✓ Canceled workflow.control consumer`);
+          }
+        } catch (err) {
+          console.warn(`[CLEANUP] Failed to cancel workflow.control consumer:`, err.message);
+        }
+      }
 
       if (this.serviceWorkflowConsumerTag) {
         try {
@@ -384,6 +396,7 @@ class ServiceWrapper {
 
       // 5. Clear state variables
       this.workflowInitConsumerTag = null;
+      this.workflowControlConsumerTag = null;
       this.serviceWorkflowConsumerTag = null;
       this.isInitialized = false;
 
@@ -913,7 +926,8 @@ class ServiceWrapper {
     
     // Required infrastructure queues that must exist before business queues can be created
     const requiredInfrastructureQueues = [
-      'workflow.init',        // Gateway responsibility
+      'workflow.init',        // Gateway responsibility (workflow entrypoint)
+      'workflow.control',     // Gateway responsibility (shared control-flow steps)
       'registry.register',    // Registry responsibility
     ];
     
@@ -1167,6 +1181,39 @@ class ServiceWrapper {
     }
   }
 
+  /**
+   * Start workflow.control listener (runs ONLY after successful registration)
+   * Service must be registered and have a certificate before listening to workflow.control
+   * @private
+   */
+  async _startWorkflowControlListener() {
+    if (!this.mqClient) {
+      this.logger?.warn('Cannot start workflow.control listener: MQ client not initialized');
+      return;
+    }
+
+    const queueName = 'workflow.control';
+    this.logger?.info(`[ServiceWrapper] [CONSUMER] Starting workflow.control listener for queue: ${queueName}`);
+    this.logger?.info(`[ServiceWrapper] [CONSUMER] Service: ${this.config.service?.name || 'unnamed-service'}`);
+    this.logger?.info(`[ServiceWrapper] [CONSUMER] Timestamp: ${new Date().toISOString()}`);
+
+    try {
+      // Subscribe to workflow.control queue (for all business services)
+      const consumerTag = await this.mqClient.consume(queueName, async (message) => {
+        await this._processWorkflowMessage(message, queueName);
+      });
+      this.workflowControlConsumerTag = consumerTag;
+
+      this.logger?.info(`[ServiceWrapper] [CONSUMER] ✓ workflow.control listener started successfully for queue: ${queueName} (consumerTag: ${consumerTag})`);
+    } catch (consumeErr) {
+      this.logger?.error(`[ServiceWrapper] [CONSUMER] ✗ Failed to start workflow.control listener for queue: ${queueName}`, {
+        error: consumeErr.message,
+        stack: consumeErr.stack
+      });
+      throw consumeErr;
+    }
+  }
+
   /**
    * Start service-specific workflow listener (runs only after successful validation and registration)
    * @private