@onlineapps/conn-orch-orchestrator 1.0.66 → 1.0.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/conn-orch-orchestrator",
-  "version": "1.0.66",
+  "version": "1.0.68",
   "description": "Workflow orchestration connector for OA Drive - handles message routing and workflow execution",
   "main": "src/index.js",
   "scripts": {
@@ -23,7 +23,7 @@
     "@onlineapps/conn-base-monitoring": "1.0.2",
     "@onlineapps/conn-infra-mq": "^1.1.0",
     "@onlineapps/conn-orch-registry": "1.1.25",
-    "@onlineapps/conn-orch-cookbook": "2.0.12",
+    "@onlineapps/conn-orch-cookbook": "2.0.13",
     "@onlineapps/conn-orch-api-mapper": "1.0.15"
   },
   "devDependencies": {

package/src/WorkflowOrchestrator.js

@@ -133,6 +133,11 @@ class WorkflowOrchestrator {
         throw new Error(`Step not found: ${current_step}`);
       }
 
+      // Fail-fast: task steps MUST have service
+      if (step.type === 'task' && !step.service) {
+        throw new Error(`[WorkflowOrchestrator] FAIL-FAST: Task step '${current_step}' missing required 'service'`);
+      }
+
       // Check if this step is for this service
       if (step.type === 'task' && step.service !== serviceName) {
         this.logger.warn(`Step ${current_step} is for ${step.service}, not ${serviceName}`);
@@ -1028,6 +1033,9 @@ class WorkflowOrchestrator {
     };
 
     if (nextStep.type === 'task') {
+      if (!nextStep.service) {
+        throw new Error(`[WorkflowOrchestrator] FAIL-FAST: Task step '${nextStepId}' missing required 'service'`);
+      }
       // Route to specific service
       if (this.router?.routeToService) {
         await this.router.routeToService(nextStep.service, message);
@@ -1035,7 +1043,7 @@ class WorkflowOrchestrator {
           step: nextStepId
         });
       } else {
-        // Fallback: publish to service's workflow queue directly
+        // Backward compatibility: publish to service's workflow queue directly if router is not available
         const serviceQueue = `${nextStep.service}.workflow`;
         await this.mqClient.publish(serviceQueue, message);
         this.logger.info(`Published to queue: ${serviceQueue}`, {
@@ -1045,14 +1053,14 @@ class WorkflowOrchestrator {
     } else {
       // Control flow steps:
       // - if pinned (step.service), route to that service queue
-      // - otherwise fall back to workflow.init (any service may execute)
+      // - otherwise route to workflow.control (any business service may execute)
       if (nextStep.service) {
         const serviceQueue = `${nextStep.service}.workflow`;
         await this.mqClient.publish(serviceQueue, message);
         this.logger.info(`Routed control flow to pinned service queue: ${serviceQueue}`, { step: nextStepId });
       } else {
-        await this.mqClient.publish('workflow.init', message);
-        this.logger.info(`Routed control flow to workflow.init`, { step: nextStepId });
+        await this.mqClient.publish('workflow.control', message);
+        this.logger.info(`Routed control flow to workflow.control`, { step: nextStepId });
       }
     }
   }

package/tests/component/orchestrator.component.test.js

@@ -85,7 +85,7 @@ describe('WorkflowOrchestrator - Component Tests @component', () => {
     );
   });
 
-  it('routes next pinned control-flow step to pinned service queue (not workflow.init)', async () => {
+  it('routes next pinned control-flow step to pinned service queue (not workflow.init/workflow.control)', async () => {
     const cookbook = {
       version: '2.1.0',
       api_input: { items: ['a'] },
@@ -115,6 +115,36 @@ describe('WorkflowOrchestrator - Component Tests @component', () => {
       })
     );
   });
+
+  it('routes next unpinned control-flow step to workflow.control', async () => {
+    const cookbook = {
+      version: '2.1.0',
+      api_input: { items: ['a'] },
+      steps: [
+        { step_id: 's1', type: 'task', service: 'svc-a', operation: 'op1', input: { x: 1 } },
+        {
+          step_id: 'loop',
+          type: 'foreach',
+          iterator: '{{api_input.items}}',
+          body: [
+            { step_id: 'inner', type: 'task', service: 'hello-service', operation: 'good-day', input: { name: '{{current}}' } }
+          ]
+        }
+      ],
+      delivery: { handler: 'none' }
+    };
+
+    const msg = { workflow_id: 'wf-3', cookbook, current_step: 's1' };
+    await orchestrator.processWorkflowMessage(msg, 'svc-a');
+
+    expect(mqClientStub.publish).toHaveBeenCalledWith(
+      'workflow.control',
+      expect.objectContaining({
+        workflow_id: 'wf-3',
+        current_step: 'loop'
+      })
+    );
+  });
 });