@onlineapps/conn-orch-orchestrator 1.0.18 → 1.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/conn-orch-orchestrator",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "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);
 
@@ -86,14 +89,14 @@ class WorkflowOrchestrator {
         delivery: context?.delivery || cookbookDef?.delivery || { handler: 'none' }
       };
 
-      // 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);
+      // 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) or id (V1 fallback)
-      const stepId = step.step_id || step.id;
+      // Get step_id (V2)
+      const stepId = step.step_id;
 
       // Check if this step is for this service
       if (step.type === 'task' && step.service !== serviceName) {
@@ -128,28 +131,18 @@ 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 || s.id) === current_step);
+      const currentIndex = cookbookDef.steps.findIndex(s => s.step_id === current_step);
       const stepDefinition = cookbookDef.steps[currentIndex];
       
       // 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
+      // Initialize from cookbook if empty
+      if (Object.keys(existingSteps).length === 0) {
         cookbookDef.steps.forEach(s => {
-          const sid = s.step_id || s.id;
-          if (sid) {
-            existingSteps[sid] = { ...s };
+          if (s.step_id) {
+            existingSteps[s.step_id] = { ...s };
           }
         });
       }
@@ -198,7 +191,7 @@ class WorkflowOrchestrator {
 
       if (nextStep) {
         // Route to next step
-        const nextStepId = nextStep.step_id || nextStep.id;
+        const nextStepId = nextStep.step_id;
         await this._routeToNextStep(nextStep, cookbookDef, updatedContext, workflow_id, nextStepId);
       } else {
         // Workflow completed - pass serviceName, cookbook and last step info for monitoring
@@ -293,13 +286,13 @@ class WorkflowOrchestrator {
     
     // Use API mapper to call the service with resolved input
     const result = await this.apiMapper.callOperation(
-      step.operation || step.step_id || step.id,
+      step.operation,
       resolvedInput,
       context
     );
 
     this.logger.info(`Task step executed`, {
-      step: step.step_id || step.id,
+      step: step.step_id,
       service: step.service,
       operation: step.operation,
       inputResolved: !!resolvedInput
@@ -420,7 +413,7 @@ class WorkflowOrchestrator {
     const result = await executor.executeStep(step);
 
     this.logger.info(`Control flow step executed`, {
-      step: step.step_id || step.id,
+      step: step.step_id,
       type: step.type
     });
 
@@ -441,7 +434,7 @@ class WorkflowOrchestrator {
     const message = {
       workflow_id,
       cookbook: cookbookDef,
-      current_step: nextStepId || (nextStep.step_id || nextStep.id),
+      current_step: nextStepId,
       context
     };
 
@@ -450,21 +443,21 @@ class WorkflowOrchestrator {
       if (this.router?.routeToService) {
         await this.router.routeToService(nextStep.service, message);
         this.logger.info(`Routed to service: ${nextStep.service}`, {
-          step: nextStepId || (nextStep.step_id || nextStep.id)
+          step: nextStepId
         });
       } 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: nextStepId || (nextStep.step_id || nextStep.id)
+          step: nextStepId
         });
       }
     } 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: nextStepId || (nextStep.step_id || nextStep.id)
+        step: nextStepId
       });
     }
   }
@@ -535,12 +528,12 @@ class WorkflowOrchestrator {
     const crypto = require('crypto');
     const data = JSON.stringify({
       service: step.service,
-      operation: step.operation || step.step_id || step.id,
+      operation: step.operation,
       input: step.input,
       contextInput: context.api_input
     });
     const hash = crypto.createHash('sha256').update(data).digest('hex');
-    return `workflow:step:${step.service}:${step.operation || step.step_id || step.id}:${hash}`;
+    return `workflow:step:${step.service}:${step.operation}:${hash}`;
   }
 
   /**
@@ -578,6 +571,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;