@onlineapps/conn-orch-orchestrator 1.0.15 → 1.0.18

package/package.json

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

package/src/WorkflowOrchestrator.js

@@ -86,11 +86,14 @@ class WorkflowOrchestrator {
         delivery: context?.delivery || cookbookDef?.delivery || { handler: 'none' }
       };
 
-      // Find current step
-      const step = cookbookDef.steps.find(s => s.id === current_step);
+      // Find current step (V2: step_id, V1: id - but V1 is deprecated)
+      const step = cookbookDef.steps.find(s => (s.step_id || s.id) === current_step);
       if (!step) {
         throw new Error(`Step not found: ${current_step}`);
       }
+      
+      // Get step_id (V2) or id (V1 fallback)
+      const stepId = step.step_id || step.id;
 
       // Check if this step is for this service
       if (step.type === 'task' && step.service !== serviceName) {
@@ -112,7 +115,7 @@ class WorkflowOrchestrator {
         result = await this.cache.get(cacheKey);
 
         if (result) {
-          this.logger.info('Cache hit', { step: step.id, cacheKey });
+          this.logger.info('Cache hit', { step: stepId, cacheKey });
         } else {
           // Execute the step
           result = await this._executeStep(step, enrichedContext, cookbookDef);
@@ -123,19 +126,37 @@ class WorkflowOrchestrator {
         result = await this._executeStep(step, enrichedContext, cookbookDef);
       }
 
-      // 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);
+      // Update context with result - steps as OBJECT (V2 format, keyed by step_id)
+      // Each step preserves its definition (step_id, type, service, operation, input) and adds output
+      const currentIndex = cookbookDef.steps.findIndex(s => (s.step_id || 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
+      // Initialize steps object from cookbook if not present
+      // V2: steps is an object keyed by step_id, not an array
+      let existingSteps = enrichedContext.steps || {};
+      
+      // If steps is still an array (legacy), convert to object
+      if (Array.isArray(existingSteps)) {
+        existingSteps = {};
+        cookbookDef.steps.forEach(s => {
+          const sid = s.step_id || s.id;
+          if (sid) {
+            existingSteps[sid] = { ...s };
+          }
+        });
+      } else if (Object.keys(existingSteps).length === 0) {
+        // Initialize from cookbook
+        cookbookDef.steps.forEach(s => {
+          const sid = s.step_id || s.id;
+          if (sid) {
+            existingSteps[sid] = { ...s };
+          }
+        });
+      }
       
-      // Update the current step with output (preserve id, type, service, operation, input)
-      existingSteps[currentIndex] = {
-        ...stepDefinition,           // id, type, service, operation, input
+      // Update the current step with output (preserve step_id, type, service, operation, input)
+      existingSteps[stepId] = {
+        ...stepDefinition,           // step_id, type, service, operation, input
         output: result,              // Add output from operation
         status: 'completed',
         completed_at: new Date().toISOString()
@@ -143,7 +164,7 @@ class WorkflowOrchestrator {
       
       const updatedContext = {
         ...enrichedContext,
-        steps: existingSteps
+        steps: existingSteps  // Object keyed by step_id
       };
 
       // Publish workflow.progress AFTER execution (so we have step output)
@@ -177,10 +198,11 @@ class WorkflowOrchestrator {
 
       if (nextStep) {
         // Route to next step
-        await this._routeToNextStep(nextStep, cookbookDef, updatedContext, workflow_id);
+        const nextStepId = nextStep.step_id || nextStep.id;
+        await this._routeToNextStep(nextStep, cookbookDef, updatedContext, workflow_id, nextStepId);
       } else {
         // Workflow completed - pass serviceName, cookbook and last step info for monitoring
-        await this._completeWorkflow(workflow_id, updatedContext, cookbookDef, serviceName, current_step, currentIndex);
+        await this._completeWorkflow(workflow_id, updatedContext, cookbookDef, serviceName, stepId, currentIndex);
       }
 
       return {
@@ -266,23 +288,18 @@ class WorkflowOrchestrator {
    */
   async _executeTaskStep(step, context) {
     // Resolve variable references in step.input (e.g. ${steps[0].output.message})
-    console.log(`[WorkflowOrchestrator] [RESOLVE] Step ${step.id} input BEFORE:`, JSON.stringify(step.input));
-    console.log(`[WorkflowOrchestrator] [RESOLVE] Context keys:`, Object.keys(context || {}));
-    console.log(`[WorkflowOrchestrator] [RESOLVE] Context.input_file:`, context?.input_file);
-    console.log(`[WorkflowOrchestrator] [RESOLVE] Context.steps:`, JSON.stringify(context.steps?.map(s => ({ id: s.id, output: s.output }))));
-    
+    // Resolve variable references in step.input (e.g. ${api_input.file}, ${steps[0].output.message})
     const resolvedInput = this._resolveInputReferences(step.input, context);
-    console.log(`[WorkflowOrchestrator] [RESOLVE] Step ${step.id} input AFTER:`, JSON.stringify(resolvedInput));
     
     // Use API mapper to call the service with resolved input
     const result = await this.apiMapper.callOperation(
-      step.operation || step.id,
+      step.operation || step.step_id || step.id,
       resolvedInput,
       context
     );
 
     this.logger.info(`Task step executed`, {
-      step: step.id,
+      step: step.step_id || step.id,
       service: step.service,
       operation: step.operation,
       inputResolved: !!resolvedInput
@@ -327,16 +344,28 @@ class WorkflowOrchestrator {
   /**
    * Get value from dot/bracket notation path
    * @private
-   * @param {string} path - Path like "steps[0].output.message" or "api_input.name"
+   * @param {string} path - Path like "steps.step_id.output.message" or "api_input.name"
    * @param {Object} context - Context object
    * @returns {*} Resolved value or undefined
    */
   _getValueFromPath(path, context) {
-    // Normalize bracket notation to dot notation: steps[0] -> steps.0
-    let normalized = path.replace(/\[(\d+)\]/g, '.$1');
+    // V2: steps is an object keyed by step_id, not an array
+    // Support both formats for backward compatibility during migration:
+    // - steps.step_id.output.field (V2, preferred)
+    // - steps[0].output.field (legacy, deprecated)
+    
+    // Normalize bracket notation to dot notation: steps[0] -> steps.0 (legacy)
+    // But prefer step_id access: steps.step_id -> steps.step_id (V2)
+    let normalized = path;
+    
+    // Handle legacy array access steps[N] - convert to numeric key
+    // But only if steps is actually an array (fallback for old data)
+    if (normalized.includes('[') && normalized.includes(']')) {
+      normalized = normalized.replace(/\[(\d+)\]/g, '.$1');
+    }
     
     // Strip prefixes - we're already searching in context object
-    // Supports: ${context.X}, ${api_input.X}, ${steps[N].X}
+    // Supports: ${context.X}, ${api_input.X}, ${steps.step_id.X} (V2)
     if (normalized.startsWith('context.')) {
       normalized = normalized.substring(8); // Remove 'context.'
     }
@@ -347,6 +376,16 @@ class WorkflowOrchestrator {
     let current = context;
     for (const part of parts) {
       if (current === undefined || current === null) return undefined;
+      
+      // Special handling for steps: if accessing by numeric index and steps is object,
+      // try to find step by index in cookbook (fallback for legacy)
+      if (part === 'steps' && parts.length > 1) {
+        current = current.steps;
+        // If steps is object (V2), next part is step_id
+        // If steps is array (legacy), next part is numeric index
+        continue;
+      }
+      
       current = current[part];
     }
     return current;
@@ -381,7 +420,7 @@ class WorkflowOrchestrator {
     const result = await executor.executeStep(step);
 
     this.logger.info(`Control flow step executed`, {
-      step: step.id,
+      step: step.step_id || step.id,
       type: step.type
     });
 
@@ -396,12 +435,13 @@ class WorkflowOrchestrator {
    * @param {Object} cookbookDef - Full cookbook definition
    * @param {Object} context - Updated context
    * @param {string} workflow_id - Workflow ID
+   * @param {string} nextStepId - Next step step_id (V2) or id (V1 fallback)
    */
-  async _routeToNextStep(nextStep, cookbookDef, context, workflow_id) {
+  async _routeToNextStep(nextStep, cookbookDef, context, workflow_id, nextStepId) {
     const message = {
       workflow_id,
       cookbook: cookbookDef,
-      current_step: nextStep.id,
+      current_step: nextStepId || (nextStep.step_id || nextStep.id),
       context
     };
 
@@ -410,21 +450,21 @@ class WorkflowOrchestrator {
       if (this.router?.routeToService) {
         await this.router.routeToService(nextStep.service, message);
         this.logger.info(`Routed to service: ${nextStep.service}`, {
-          step: nextStep.id
+          step: nextStepId || (nextStep.step_id || nextStep.id)
         });
       } else {
         // Fallback: publish to service's workflow queue directly
         const serviceQueue = `${nextStep.service}.workflow`;
         await this.mqClient.publish(serviceQueue, message);
         this.logger.info(`Published to queue: ${serviceQueue}`, {
-          step: nextStep.id
+          step: nextStepId || (nextStep.step_id || nextStep.id)
         });
       }
     } else {
       // Control flow steps handled by workflow init queue
       await this.mqClient.publish('workflow.init', message);
       this.logger.info(`Routed control flow to workflow.init`, {
-        step: nextStep.id
+        step: nextStepId || (nextStep.step_id || nextStep.id)
       });
     }
   }
@@ -495,12 +535,12 @@ class WorkflowOrchestrator {
     const crypto = require('crypto');
     const data = JSON.stringify({
       service: step.service,
-      operation: step.operation || step.id,
+      operation: step.operation || step.step_id || step.id,
       input: step.input,
       contextInput: context.api_input
     });
     const hash = crypto.createHash('sha256').update(data).digest('hex');
-    return `workflow:step:${step.service}:${step.operation || step.id}:${hash}`;
+    return `workflow:step:${step.service}:${step.operation || step.step_id || step.id}:${hash}`;
   }
 
   /**