@onlineapps/conn-orch-orchestrator 1.0.115 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/conn-orch-orchestrator",
-  "version": "1.0.115",
+  "version": "2.0.0",
   "description": "Workflow orchestration connector for OA Drive - handles message routing and workflow execution",
   "main": "src/index.js",
   "scripts": {
@@ -24,8 +24,7 @@
     "@onlineapps/conn-base-monitoring": "1.0.12",
     "@onlineapps/conn-infra-mq": "1.1.70",
     "@onlineapps/conn-orch-registry": "1.2.1",
-    "@onlineapps/conn-orch-cookbook": "2.1.2",
-    "@onlineapps/conn-orch-api-mapper": "1.0.34"
+    "@onlineapps/conn-orch-cookbook": "2.1.2"
   },
   "devDependencies": {
     "jest": "^29.5.0",

package/src/WorkflowOrchestrator.js

@@ -15,7 +15,10 @@ class WorkflowOrchestrator {
    * @param {Object} config - Configuration object
    * @param {Object} config.mqClient - MQ client for message operations
    * @param {Object} config.registryClient - Registry client for service discovery
-   * @param {Object} config.apiMapper - API mapper for cookbook to HTTP mapping
+   * @param {Object} config.invoker - Intra-service operation invoker exposing
+   *   async invokeOperation({ operation, input, envelope, workflow_id,
+   *   correlation_id, step_id }) -> { status, result } | { status, error }.
+   *   Replaces the retired apiMapper HTTP-loopback path (RFC §5.9, §5.10).
    * @param {Object} config.cookbook - Cookbook connector for validation and execution
    * @param {Object} [config.cache] - Cache connector for caching
    * @param {Object} [config.errorHandler] - Error handler connector
@@ -25,12 +28,16 @@ class WorkflowOrchestrator {
   constructor(config) {
     if (!config.mqClient) throw new Error('mqClient is required');
     if (!config.registryClient) throw new Error('registryClient is required');
-    if (!config.apiMapper) throw new Error('apiMapper is required');
+    if (!config.invoker || typeof config.invoker.invokeOperation !== 'function') {
+      throw new Error(
+        '[WorkflowOrchestrator] invoker with invokeOperation(message) is required - Expected object exposing async invokeOperation({operation, input, envelope, workflow_id, correlation_id, step_id}) returning {status, result}'
+      );
+    }
     if (!config.cookbook) throw new Error('cookbook is required');
 
     this.mqClient = config.mqClient;
     this.registryClient = config.registryClient;
-    this.apiMapper = config.apiMapper;
+    this._invoker = config.invoker;
     this.cookbook = config.cookbook;
     this.cache = config.cache;
     this.errorHandler = config.errorHandler;
@@ -552,26 +559,46 @@ class WorkflowOrchestrator {
 
     const resolvedInput = await this._resolveInputReferencesAsync(step.input, context, helperContext);
     console.log(`[WorkflowOrchestrator] [RESOLVE] Step ${stepId} input AFTER:`, JSON.stringify(resolvedInput));
-    
-    // Use API mapper to call the service with resolved input
-    const result = await this.apiMapper.callOperation(
-      step.operation || stepId,
-      resolvedInput,
-      {
-        ...context,
-        workflow_id: context?.workflow_id,
-        step_id: stepId
-      }
-    );
 
-    this.logger.info(`Task step executed`, {
-      step: stepId,
-      service: step.service,
-      operation: step.operation,
-      inputResolved: !!resolvedInput
+    // Intra-service handler dispatch via service-wrapper v3.0.0 (RFC §5.9, §5.10).
+    // Replaces the retired apiMapper.callOperation HTTP-loopback path.
+    const envelope = await this._invoker.invokeOperation({
+      operation: step.operation || stepId,
+      input: resolvedInput,
+      envelope: {
+        tenant_id: context?.tenant_id,
+        workspace_id: context?.workspace_id,
+        person_id: context?.person_id
+      },
+      workflow_id: context?.workflow_id,
+      correlation_id: context?.correlation_id,
+      step_id: stepId
     });
 
-    return result;
+    if (envelope && envelope.status >= 200 && envelope.status < 300) {
+      this.logger.info(`Task step executed`, {
+        step: stepId,
+        service: step.service,
+        operation: step.operation,
+        inputResolved: !!resolvedInput
+      });
+      return envelope.result;
+    }
+
+    // Non-2xx: surface the typed error envelope so the outer workflow handler
+    // can record retry_history / DLQ classification per existing logic.
+    const err = new Error(
+      `[WorkflowOrchestrator] Step '${stepId}' (operation '${step.operation}') failed with status ${envelope?.status}`
+    );
+    err.status = envelope?.status;
+    err.statusCode = envelope?.status;
+    err.code = envelope?.error?.code;
+    err.errorCode = envelope?.error?.code;
+    err.details = envelope?.error?.details;
+    if (envelope?.error?.message) {
+      err.message = envelope.error.message;
+    }
+    throw err;
   }
 
   /**

package/src/index.js

@@ -19,7 +19,11 @@ const WorkflowOrchestrator = require('./WorkflowOrchestrator');
  * @param {Object} config - Configuration options
  * @param {Object} config.mqClient - MQ client instance
  * @param {Object} config.registryClient - Registry client instance
- * @param {Object} config.apiMapper - API mapper instance
+ * @param {Object} config.invoker - Intra-service operation invoker.
+ *   Expected shape: `{ async invokeOperation({ operation, input, envelope,
+ *   workflow_id, correlation_id, step_id }) -> { status, result } | { status, error } }`.
+ *   Typically `{ invokeOperation: serviceWrapper.invokeOperation.bind(serviceWrapper) }`.
+ *   Replaces the retired `apiMapper` HTTP-loopback dep (RFC §5.9, §5.10).
  * @param {Object} config.cookbook - Cookbook connector instance
  * @param {Object} [config.logger] - Logger instance
  * @returns {WorkflowOrchestrator} New orchestrator instance
@@ -28,7 +32,7 @@ const WorkflowOrchestrator = require('./WorkflowOrchestrator');
  * const orchestrator = create({
  *   mqClient: new MQClient(),
  *   registryClient: new RegistryClient(),
- *   apiMapper: new ApiMapper(),
+ *   invoker: { invokeOperation: wrapper.invokeOperation.bind(wrapper) },
  *   cookbook: new CookbookConnector()
  * });
  */