@onlineapps/conn-orch-orchestrator 1.0.19 → 1.0.21

package/package.json

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

package/src/WorkflowOrchestrator.js

@@ -75,6 +75,9 @@ class WorkflowOrchestrator {
     const { workflow_id, cookbook: cookbookDef, current_step, context } = message;
 
     try {
+      // FAIL-FAST: Validate V2 format BEFORE anything else
+      this._validateV2Format(cookbookDef);
+      
       // Validate cookbook structure
       this.cookbook.validateCookbook(cookbookDef);
 
@@ -89,7 +92,7 @@ class WorkflowOrchestrator {
       // Find current step (V2: step_id only)
       const step = cookbookDef.steps.find(s => s.step_id === current_step);
       if (!step) {
-        throw new Error(`Step not found: ${current_step}`);
+        throw new Error(`Step not found: ${current_step}. Available steps: ${cookbookDef.steps.map(s => s.step_id).join(', ')}`);
       }
       
       // Get step_id (V2)
@@ -300,7 +303,9 @@ class WorkflowOrchestrator {
   
   /**
    * Resolve variable references in input object
-   * Supports ${steps[N].output.field}, ${api_input.field}, ${context.field}
+   * Supports both syntaxes:
+   * - {{steps.step_id.output.field}}, {{api_input.field}} (preferred, V2)
+   * - ${steps[N].output.field}, ${api_input.field} (legacy)
    * @private
    * @param {Object} input - Input object with potential references
    * @param {Object} context - Current context with steps, api_input, etc
@@ -310,12 +315,39 @@ class WorkflowOrchestrator {
     if (!input) return input;
     
     const resolveValue = (value) => {
-      if (typeof value === 'string' && value.includes('${')) {
-        // Replace ${...} references
-        return value.replace(/\$\{([^}]+)\}/g, (match, path) => {
-          const resolved = this._getValueFromPath(path.trim(), context);
-          return resolved !== undefined ? resolved : match;
-        });
+      if (typeof value === 'string') {
+        let result = value;
+        
+        // Replace {{...}} references (V2 preferred syntax)
+        if (result.includes('{{')) {
+          result = result.replace(/\{\{([^}]+)\}\}/g, (match, path) => {
+            const resolved = this._getValueFromPath(path.trim(), context);
+            if (resolved !== undefined) {
+              // If resolved value is an object, stringify it for embedding in strings
+              if (typeof resolved === 'object' && result !== match) {
+                return JSON.stringify(resolved);
+              }
+              return resolved;
+            }
+            return match;
+          });
+        }
+        
+        // Replace ${...} references (legacy syntax)
+        if (result.includes('${')) {
+          result = result.replace(/\$\{([^}]+)\}/g, (match, path) => {
+            const resolved = this._getValueFromPath(path.trim(), context);
+            if (resolved !== undefined) {
+              if (typeof resolved === 'object' && result !== match) {
+                return JSON.stringify(resolved);
+              }
+              return resolved;
+            }
+            return match;
+          });
+        }
+        
+        return result;
       }
       if (Array.isArray(value)) {
         return value.map(resolveValue);
@@ -568,6 +600,63 @@ class WorkflowOrchestrator {
     const mapper = new ResponseMapper();
     return mapper.mapResponse(response, mapping);
   }
+
+  /**
+   * FAIL-FAST: Validate V2 format strictly
+   * Rejects V1 format immediately with clear error message
+   * @private
+   * @param {Object} cookbook - Cookbook definition
+   * @throws {Error} If cookbook is not V2 format
+   */
+  _validateV2Format(cookbook) {
+    if (!cookbook) {
+      throw new Error('FAIL-FAST: Cookbook is required');
+    }
+
+    // Check version format
+    const version = cookbook.version;
+    if (!version) {
+      throw new Error('FAIL-FAST: Cookbook version is required');
+    }
+
+    // V1 format detection - REJECT immediately
+    if (/^1\.\d+\.\d+$/.test(version)) {
+      throw new Error(`FAIL-FAST: V1 format (${version}) is DEPRECATED and no longer supported. Use V2 format (2.x.x) with step_id instead of id.`);
+    }
+
+    // Must be V2 format
+    if (!/^2\.\d+\.\d+$/.test(version)) {
+      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) {
+      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) => {
+      if (step.id && !step.step_id) {
+        invalidSteps.push(`Step ${index}: has 'id' (V1) but missing 'step_id' (V2)`);
+      }
+      if (!step.step_id) {
+        invalidSteps.push(`Step ${index}: missing required 'step_id'`);
+      }
+      if (!step.type) {
+        invalidSteps.push(`Step ${index} (${step.step_id || 'unknown'}): missing required 'type'`);
+      }
+    });
+
+    if (invalidSteps.length > 0) {
+      throw new Error(`FAIL-FAST: Invalid V2 cookbook format:\n${invalidSteps.join('\n')}`);
+    }
+
+    this.logger.info('[WorkflowOrchestrator] V2 format validation passed', {
+      version: cookbook.version,
+      steps: cookbook.steps.map(s => s.step_id)
+    });
+  }
 }
 
 module.exports = WorkflowOrchestrator;