@onlineapps/conn-orch-orchestrator 1.0.27 → 1.0.29

package/package.json

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

package/src/WorkflowOrchestrator.js

@@ -76,10 +76,11 @@ class WorkflowOrchestrator {
 
     try {
       // FAIL-FAST: Validate V2 format BEFORE anything else
+      // This replaces the old cookbook.validateCookbook() which only supports V1 (array steps)
       this._validateV2Format(cookbookDef);
       
-      // Validate cookbook structure
-      this.cookbook.validateCookbook(cookbookDef);
+      // NOTE: Skip cookbook.validateCookbook() - it uses V1 schema (steps as array)
+      // V2 validation is done by _validateV2Format() above
 
       // 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
@@ -89,10 +90,10 @@ class WorkflowOrchestrator {
         delivery: context?.delivery || cookbookDef?.delivery || { handler: 'none' }
       };
 
-      // Find current step (V2: step_id only)
-      const step = cookbookDef.steps.find(s => s.step_id === current_step);
+      // Find current step (V2: steps is an object keyed by step_id)
+      const step = cookbookDef.steps[current_step];
       if (!step) {
-        throw new Error(`Step not found: ${current_step}. Available steps: ${cookbookDef.steps.map(s => s.step_id).join(', ')}`);
+        throw new Error(`Step not found: ${current_step}. Available steps: ${Object.keys(cookbookDef.steps).join(', ')}`);
       }
       
       // Get step_id (V2)
@@ -131,19 +132,16 @@ class WorkflowOrchestrator {
 
       // 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 === current_step);
-      const stepDefinition = cookbookDef.steps[currentIndex];
+      const stepDefinition = cookbookDef.steps[current_step];
       
       // Initialize steps object from cookbook if not present
-      // V2: steps is an object keyed by step_id, not an array
+      // V2: steps is an object keyed by step_id
       let existingSteps = enrichedContext.steps || {};
       
       // Initialize from cookbook if empty
       if (Object.keys(existingSteps).length === 0) {
-        cookbookDef.steps.forEach(s => {
-          if (s.step_id) {
-            existingSteps[s.step_id] = { ...s };
-          }
+        Object.entries(cookbookDef.steps).forEach(([key, s]) => {
+          existingSteps[key] = { ...s };
         });
       }
       
@@ -175,6 +173,12 @@ class WorkflowOrchestrator {
         steps: existingSteps  // Object keyed by step_id
       };
 
+      // V2: Get step order from object keys (JavaScript preserves insertion order for string keys)
+      const stepKeys = Object.keys(cookbookDef.steps);
+      const currentIndex = stepKeys.indexOf(current_step);
+      const nextStepKey = stepKeys[currentIndex + 1];
+      const nextStep = nextStepKey ? cookbookDef.steps[nextStepKey] : null;
+
       // Publish workflow.progress AFTER execution (so we have step output)
       const { publishToMonitoringWorkflow } = require('@onlineapps/mq-client-core').monitoring;
       try {
@@ -201,9 +205,6 @@ class WorkflowOrchestrator {
         });
       }
 
-      // Find next step (currentIndex already defined above)
-      const nextStep = cookbookDef.steps[currentIndex + 1];
-
       if (nextStep) {
         // Route to next step
         const nextStepId = nextStep.step_id;
@@ -752,22 +753,36 @@ class WorkflowOrchestrator {
       throw new Error(`FAIL-FAST: Invalid version format '${version}'. Must be 2.x.x (e.g., 2.0.0)`);
     }
 
-    // Check steps
-    if (!cookbook.steps || !Array.isArray(cookbook.steps) || cookbook.steps.length === 0) {
+    // Check steps - V2 FORMAT: steps MUST be an OBJECT (keyed by step_id), NOT an array!
+    if (!cookbook.steps || typeof cookbook.steps !== 'object') {
+      throw new Error('FAIL-FAST: Cookbook must have steps object');
+    }
+    
+    // V1 format (array) is BANNED!
+    if (Array.isArray(cookbook.steps)) {
+      throw new Error('FAIL-FAST: V1 FORMAT BANNED! Cookbook steps must be an OBJECT (keyed by step_id), NOT an array!');
+    }
+    
+    const stepKeys = Object.keys(cookbook.steps);
+    if (stepKeys.length === 0) {
       throw new Error('FAIL-FAST: Cookbook must have at least one step');
     }
 
     // Validate each step has step_id (V2) not id (V1)
     const invalidSteps = [];
-    cookbook.steps.forEach((step, index) => {
+    stepKeys.forEach((stepKey) => {
+      const step = cookbook.steps[stepKey];
       if (step.id && !step.step_id) {
-        invalidSteps.push(`Step ${index}: has 'id' (V1) but missing 'step_id' (V2)`);
+        invalidSteps.push(`Step '${stepKey}': has 'id' (V1) but missing 'step_id' (V2)`);
       }
       if (!step.step_id) {
-        invalidSteps.push(`Step ${index}: missing required 'step_id'`);
+        invalidSteps.push(`Step '${stepKey}': missing required 'step_id'`);
+      }
+      if (step.step_id !== stepKey) {
+        invalidSteps.push(`Step '${stepKey}': step_id '${step.step_id}' does not match key '${stepKey}'`);
       }
       if (!step.type) {
-        invalidSteps.push(`Step ${index} (${step.step_id || 'unknown'}): missing required 'type'`);
+        invalidSteps.push(`Step '${stepKey}': missing required 'type'`);
       }
     });
 
@@ -777,7 +792,7 @@ class WorkflowOrchestrator {
 
     this.logger.info('[WorkflowOrchestrator] V2 format validation passed', {
       version: cookbook.version,
-      steps: cookbook.steps.map(s => s.step_id)
+      steps: Object.keys(cookbook.steps)
     });
   }
 }