@onlineapps/conn-orch-orchestrator 1.0.5 → 1.0.7

package/package.json

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

package/src/WorkflowOrchestrator.js

@@ -135,25 +135,38 @@ class WorkflowOrchestrator {
         result = await this._executeStep(step, enrichedContext, cookbookDef);
       }
 
-      // Update context with result (preserve delivery from enrichedContext)
+      // Update context with result - steps as ARRAY (consistent with cookbook.steps)
+      // Each step preserves its definition (id, type, service, operation, input) and adds output
+      const currentIndex = cookbookDef.steps.findIndex(s => s.id === current_step);
+      const stepDefinition = cookbookDef.steps[currentIndex];
+      
+      // Initialize steps array from cookbook if not present
+      const existingSteps = Array.isArray(enrichedContext.steps) 
+        ? [...enrichedContext.steps] 
+        : cookbookDef.steps.map(s => ({ ...s }));  // Deep copy of step definitions
+      
+      // Update the current step with output (preserve id, type, service, operation, input)
+      existingSteps[currentIndex] = {
+        ...stepDefinition,           // id, type, service, operation, input
+        output: result,              // Add output from operation
+        status: 'completed',
+        completed_at: new Date().toISOString()
+      };
+      
       const updatedContext = {
         ...enrichedContext,
-        steps: {
-          ...enrichedContext.steps,
-          [current_step]: result
-        }
+        steps: existingSteps
       };
 
-      // Find next step
-      const currentIndex = cookbookDef.steps.findIndex(s => s.id === current_step);
+      // Find next step (currentIndex already defined above)
       const nextStep = cookbookDef.steps[currentIndex + 1];
 
       if (nextStep) {
         // Route to next step
         await this._routeToNextStep(nextStep, cookbookDef, updatedContext, workflow_id);
       } else {
-        // Workflow completed - pass serviceName for monitoring
-        await this._completeWorkflow(workflow_id, updatedContext, serviceName);
+        // Workflow completed - pass serviceName and last step info for monitoring
+        await this._completeWorkflow(workflow_id, updatedContext, serviceName, current_step, currentIndex);
       }
 
       return {
@@ -329,13 +342,17 @@ class WorkflowOrchestrator {
    * @param {string} workflow_id - Workflow ID
    * @param {Object} finalContext - Final workflow context
    * @param {string} serviceName - Service name that completed the workflow
+   * @param {string} lastStepId - ID of the last completed step
+   * @param {number} lastStepIndex - Index of the last completed step
    */
-  async _completeWorkflow(workflow_id, finalContext, serviceName = 'unknown') {
+  async _completeWorkflow(workflow_id, finalContext, serviceName = 'unknown', lastStepId = null, lastStepIndex = 0) {
     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,
+        lastStepId,
+        lastStepIndex,
         hasMqClient: !!this.mqClient,
         mqClientConnected: this.mqClient?._connected
       });
@@ -349,6 +366,8 @@ class WorkflowOrchestrator {
         workflow_id,
         status: 'completed',
         service: serviceName, // Service that completed the workflow (for monitoring)
+        step_id: lastStepId, // Last step ID for monitoring
+        step_index: lastStepIndex, // Last step index 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