@onlineapps/conn-orch-orchestrator 1.0.78 → 1.0.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/conn-orch-orchestrator",
-  "version": "1.0.78",
+  "version": "1.0.80",
   "description": "Workflow orchestration connector for OA Drive - handles message routing and workflow execution",
   "main": "src/index.js",
   "scripts": {
@@ -21,11 +21,11 @@
   "author": "OA Drive Team",
   "license": "MIT",
   "dependencies": {
-    "@onlineapps/conn-base-monitoring": "1.0.7",
+    "@onlineapps/conn-base-monitoring": "1.0.8",
     "@onlineapps/conn-infra-mq": "1.1.57",
-    "@onlineapps/conn-orch-registry": "1.1.33",
-    "@onlineapps/conn-orch-cookbook": "2.0.16",
-    "@onlineapps/conn-orch-api-mapper": "1.0.25"
+    "@onlineapps/conn-orch-registry": "1.1.34",
+    "@onlineapps/conn-orch-cookbook": "2.0.17",
+    "@onlineapps/conn-orch-api-mapper": "1.0.26"
   },
   "devDependencies": {
     "jest": "^29.5.0",

package/src/WorkflowOrchestrator.js

@@ -45,28 +45,38 @@ class WorkflowOrchestrator {
       backoffMultiplier: config.retryBackoffMultiplier || 2
     };
 
-    // Create cookbook router - createRouter is an exported function, not a method
+    // Router is REQUIRED (no backward-compatibility fallbacks).
     const { createRouter } = this.cookbook;
-    if (typeof createRouter === 'function') {
-      this.router = createRouter(this.mqClient, this.registryClient, {
-        logger: this.logger
-      });
-    } else {
-      // Fallback: try calling it as method (backward compatibility)
-      this.router = this.cookbook.createRouter?.(this.mqClient, this.registryClient, {
-        logger: this.logger
-      }) || null;
+    if (typeof createRouter !== 'function') {
+      throw new Error(
+        '[WorkflowOrchestrator] Missing dependency - cookbook.createRouter is required. Fix: provide conn-orch-cookbook router factory.'
+      );
+    }
+    this.router = createRouter(this.mqClient, this.registryClient, { logger: this.logger });
+    if (!this.router || typeof this.router.routeToService !== 'function') {
+      throw new Error(
+        '[WorkflowOrchestrator] Invalid dependency - router.routeToService is required. Fix: cookbook.createRouter must return router with routeToService(serviceName, message).'
+      );
     }
   }
 
   /**
-   * Get step identifier (supports both V1 'id' and V2 'step_id')
+   * Get step identifier (V2.1 only: step_id)
    * @private
    * @param {Object} step - Step object
    * @returns {string} Step identifier
    */
   _getStepId(step) {
-    return step?.step_id || step?.id;
+    if (!step || typeof step !== 'object') {
+      throw new Error('[WorkflowOrchestrator] Invalid cookbook - Expected step object (V2.1)');
+    }
+    if (step.id && !step.step_id) {
+      throw new Error('[WorkflowOrchestrator] Deprecated cookbook format - "id" is not allowed. Fix: use "step_id" (V2.1).');
+    }
+    if (!step.step_id) {
+      throw new Error('[WorkflowOrchestrator] Invalid cookbook - Missing "step_id" on step (V2.1).');
+    }
+    return step.step_id;
   }
 
   /**
@@ -87,12 +97,15 @@ class WorkflowOrchestrator {
       if (cookbookDef.steps.length > 0 && cookbookDef.steps[0].id && !cookbookDef.steps[0].step_id) {
         throw new Error('FAIL-FAST: V1 format (array with "id") is BANNED. Use V2.1 format with "step_id".');
       }
+      // Validate all steps are V2.1 (fail-fast)
+      cookbookDef.steps.forEach((s) => this._getStepId(s));
       return cookbookDef.steps;
     }
     
-    // V2.0 format (deprecated) - steps is an object keyed by step_id
-    this.logger.warn('Using deprecated V2.0 cookbook format (steps as object). Please migrate to V2.1 (steps as array with step_id).');
-    return Object.values(cookbookDef.steps);
+    // V2.0 format (deprecated) - steps is an object keyed by step_id -> NOT ALLOWED (fail-fast)
+    throw new Error(
+      '[WorkflowOrchestrator] Deprecated cookbook format - steps must be an ARRAY (V2.1). Fix: migrate from V2.0 object steps to V2.1 array steps.'
+    );
   }
 
   /**
@@ -141,8 +154,7 @@ class WorkflowOrchestrator {
       // 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}`);
-        const serviceQueue = `${step.service}.workflow`;
-        await this.mqClient.publish(serviceQueue, message);
+        await this.router.routeToService(step.service, message);
         return { skipped: true, reason: 'wrong_service' };
       }
 
@@ -150,8 +162,7 @@ class WorkflowOrchestrator {
       // If a control-flow step has "service", only that service is allowed to execute it.
       if (step.type !== 'task' && step.service && step.service !== serviceName) {
         this.logger.warn(`Control-flow step ${current_step} is pinned to ${step.service}, not ${serviceName}`);
-        const serviceQueue = `${step.service}.workflow`;
-        await this.mqClient.publish(serviceQueue, message);
+        await this.router.routeToService(step.service, message);
         return { skipped: true, reason: 'wrong_service_control_flow' };
       }
 
@@ -427,15 +438,6 @@ class WorkflowOrchestrator {
           cookbook: finalCookbook,  // UNIFIED cookbook with full state
           failed_at: new Date().toISOString()
         });
-
-        // Compatibility: also publish to workflow.dlq for DLQ dashboards/tools that only look for "*.dlq" queues.
-        // workflow.dlq is an infrastructure queue created by Gateway.
-        await this.mqClient.publish('workflow.dlq', {
-          workflow_id,
-          current_step,
-          cookbook: finalCookbook,
-          failed_at: new Date().toISOString()
-        });
         
         // ALSO publish to monitoring.workflow so dashboard shows the DLQ entry
         try {
@@ -772,19 +774,10 @@ class WorkflowOrchestrator {
       case 'fork_join':
         return await this._executeForkJoin(step, context, cookbookDef, serviceName);
       default: {
-        // Fallback to legacy executor behavior (does NOT execute nested tasks)
-        const { CookbookExecutor } = this.cookbook;
-        if (!CookbookExecutor) {
-          throw new Error(`[WorkflowOrchestrator] CookbookExecutor missing - Cannot execute control-flow step '${stepId}'`);
-        }
-
-        const executor = new CookbookExecutor(
-          { steps: [step] },
-          { logger: this.logger, defaultTimeout: this.defaultTimeout }
+        throw new Error(
+          `[WorkflowOrchestrator] Unsupported control-flow step type - "${step.type}" in step "${stepId}". ` +
+            'Expected: steps|foreach|switch|fork_join.'
         );
-        executor.context.setInput(context.api_input || {});
-        executor.context.data.steps = context.steps || {};
-        return await executor.executeStep(step);
       }
     }
   }
@@ -1046,27 +1039,15 @@ class WorkflowOrchestrator {
         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);
-        this.logger.info(`Routed to service: ${nextStep.service}`, {
-          step: nextStepId
-        });
-      } else {
-        // 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}`, {
-          step: nextStepId
-        });
-      }
+      await this.router.routeToService(nextStep.service, message);
+      this.logger.info(`Routed to service: ${nextStep.service}`, { step: nextStepId });
     } else {
       // Control flow steps:
       // - if pinned (step.service), route to that service queue
       // - 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 });
+        await this.router.routeToService(nextStep.service, message);
+        this.logger.info(`Routed control flow to pinned service: ${nextStep.service}`, { step: nextStepId });
       } else {
         await this.mqClient.publish('workflow.control', message);
         this.logger.info(`Routed control flow to workflow.control`, { step: nextStepId });