@onlineapps/conn-orch-orchestrator 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/conn-orch-orchestrator",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Workflow orchestration connector for OA Drive - handles message routing and workflow execution",
   "main": "src/index.js",
   "scripts": {

package/src/WorkflowOrchestrator.js

@@ -70,6 +70,14 @@ class WorkflowOrchestrator {
       // Validate cookbook structure
       this.cookbook.validateCookbook(cookbookDef);
 
+      // Ensure delivery configuration is preserved in context (required by Delivery Dispatcher)
+      // Delivery comes from cookbook.delivery (set by Gateway) and must be passed through to workflow.completed
+      const enrichedContext = {
+        ...context,
+        // Preserve delivery from cookbook if not already in context
+        delivery: context?.delivery || cookbookDef?.delivery || { handler: 'none' }
+      };
+
       // Find current step
       const step = cookbookDef.steps.find(s => s.id === current_step);
       if (!step) {
@@ -83,29 +91,52 @@ class WorkflowOrchestrator {
         return { skipped: true, reason: 'wrong_service' };
       }
 
+      // Publish workflow.progress to monitoring.workflow using unified helper
+      const { publishToMonitoringWorkflow } = require('@onlineapps/mq-client-core').monitoring;
+      try {
+        const stepIndex = cookbookDef.steps.findIndex(s => s.id === current_step);
+        await publishToMonitoringWorkflow(this.mqClient, {
+          event_type: 'progress',
+          workflow_id: workflow_id,
+          service_name: serviceName,
+          step_index: stepIndex >= 0 ? stepIndex : 0,
+          step_id: current_step,
+          cookbook: cookbookDef,
+          context: enrichedContext,
+          status: 'in_progress',
+          timestamp: new Date().toISOString()
+        }, this.logger, { workflow_id, step_id: current_step });
+      } catch (monitoringError) {
+        // Don't fail workflow if monitoring publish fails (helper already logs)
+        this.logger.warn('Failed to publish workflow.progress to monitoring', {
+          workflow_id,
+          error: monitoringError.message
+        });
+      }
+
       // Check cache if available
       let result;
       if (this.cache && step.type === 'task') {
-        const cacheKey = this._getCacheKey(step, context);
+        const cacheKey = this._getCacheKey(step, enrichedContext);
         result = await this.cache.get(cacheKey);
 
         if (result) {
           this.logger.info('Cache hit', { step: step.id, cacheKey });
         } else {
           // Execute the step
-          result = await this._executeStep(step, context, cookbookDef);
+          result = await this._executeStep(step, enrichedContext, cookbookDef);
           await this.cache.set(cacheKey, result, { ttl: 300 });
         }
       } else {
         // Execute without cache
-        result = await this._executeStep(step, context, cookbookDef);
+        result = await this._executeStep(step, enrichedContext, cookbookDef);
       }
 
-      // Update context with result
+      // Update context with result (preserve delivery from enrichedContext)
       const updatedContext = {
-        ...context,
+        ...enrichedContext,
         steps: {
-          ...context.steps,
+          ...enrichedContext.steps,
           [current_step]: result
         }
       };
@@ -118,8 +149,8 @@ class WorkflowOrchestrator {
         // Route to next step
         await this._routeToNextStep(nextStep, cookbookDef, updatedContext, workflow_id);
       } else {
-        // Workflow completed
-        await this._completeWorkflow(workflow_id, updatedContext);
+        // Workflow completed - pass serviceName for monitoring
+        await this._completeWorkflow(workflow_id, updatedContext, serviceName);
       }
 
       return {
@@ -294,12 +325,14 @@ class WorkflowOrchestrator {
    * @async
    * @param {string} workflow_id - Workflow ID
    * @param {Object} finalContext - Final workflow context
+   * @param {string} serviceName - Service name that completed the workflow
    */
-  async _completeWorkflow(workflow_id, finalContext) {
+  async _completeWorkflow(workflow_id, finalContext, serviceName = 'unknown') {
     try {
       console.log(`[WorkflowOrchestrator] [PUBLISH] Preparing to publish workflow.completed for ${workflow_id}`);
       this.logger.info(`[WorkflowOrchestrator] [PUBLISH] Preparing to publish workflow.completed`, {
         workflow_id,
+        serviceName,
         hasMqClient: !!this.mqClient,
         mqClientConnected: this.mqClient?._connected
       });
@@ -312,6 +345,7 @@ class WorkflowOrchestrator {
       const workflowCompletedMessage = {
         workflow_id,
         status: 'completed',
+        service: serviceName, // Service that completed the workflow (for monitoring)
         delivery: delivery, // Delivery configuration from Gateway context (must be object)
         context: finalContext, // Full context for output resolution
         steps: finalContext?.steps || {}, // Steps results for output resolution

package/tests/integration/orchestrator.integration.test.js

@@ -13,8 +13,9 @@ const CookbookConnector = require('@onlineapps/conn-orch-cookbook');
 
 // Skip integration tests if external services are not available
 const SKIP_INTEGRATION = process.env.SKIP_INTEGRATION === 'true';
-const RABBITMQ_URL = process.env.RABBITMQ_URL || 'amqp://localhost:5672';
-const REGISTRY_URL = process.env.REGISTRY_URL || 'http://localhost:4000';
+const { requireEnv } = require('../../../../../tests/_helpers/test-config');
+const RABBITMQ_URL = requireEnv('RABBITMQ_URL', 'RabbitMQ connection URL');
+const REGISTRY_URL = requireEnv('REGISTRY_URL', 'Registry service URL');
 
 describe('Orchestrator - Integration Tests @integration', () => {
   if (SKIP_INTEGRATION) {