@onlineapps/conn-orch-orchestrator 1.0.20 → 1.0.22

package/package.json

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

package/src/WorkflowOrchestrator.js

@@ -303,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
@@ -313,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);
@@ -488,6 +517,21 @@ class WorkflowOrchestrator {
       // Delivery Dispatcher requires: workflow_id, status, delivery (must be object, not null)
       const delivery = finalContext?.delivery || cookbookDef?.delivery || { handler: 'none' };
       
+      // Extract api_output from the last completed step
+      // steps is an object keyed by step_id in V2
+      let api_output = null;
+      if (lastStepId && finalContext?.steps?.[lastStepId]?.output) {
+        api_output = finalContext.steps[lastStepId].output;
+      } else if (finalContext?.steps) {
+        // Fallback: find any step with output
+        const stepKeys = Object.keys(finalContext.steps);
+        for (const key of stepKeys) {
+          if (finalContext.steps[key]?.output) {
+            api_output = finalContext.steps[key].output;
+          }
+        }
+      }
+      
       // Build message in format expected by Delivery Dispatcher
       const workflowCompletedMessage = {
         workflow_id,
@@ -495,10 +539,11 @@ class WorkflowOrchestrator {
         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
+        api_output: api_output, // Output from last step - for frontend/delivery
         cookbook: cookbookDef, // Full cookbook for monitoring trace
         delivery: delivery, // Delivery configuration from Gateway context (must be object)
         context: finalContext, // Full context for output resolution
-        steps: finalContext?.steps || [], // Steps results (array) for output resolution
+        steps: finalContext?.steps || {}, // Steps results (object) for output resolution
         completed_at: new Date().toISOString()
       };