@onlineapps/service-wrapper 3.2.1 → 3.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/service-wrapper",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "description": "Thin orchestration layer for microservices - delegates all infrastructure concerns to specialized connectors",
   "main": "src/index.js",
   "scripts": {
@@ -32,8 +32,8 @@
     "@onlineapps/conn-infra-secrets": "1.0.0",
     "@onlineapps/conn-orch-cookbook": "2.1.3",
     "@onlineapps/conn-orch-orchestrator": "2.1.1",
-    "@onlineapps/conn-orch-registry": "1.2.1",
-    "@onlineapps/conn-orch-validator": "3.1.2",
+    "@onlineapps/conn-orch-registry": "1.2.2",
+    "@onlineapps/conn-orch-validator": "3.2.0",
     "@onlineapps/monitoring-core": "1.0.24",
     "@onlineapps/runtime-config": "1.0.2",
     "@onlineapps/service-common": "1.1.3",

package/src/ServiceWrapper.js

@@ -802,11 +802,11 @@ class ServiceWrapper {
       // Konfigurace se načítá v konstruktoru, takže tady jen logujeme
       this._logPhase('0.1', 'Configuration Load', 'PASSED', null, Date.now() - startTime);
 
-      // FÁZE 0.1b: v2 Operations-Routes alignment validator retired.
-      // v3 replaces it with _validateOperationsHandlerAlignment(), invoked
-      // from the v3 pipeline block below (after connectors are ready).
+      // FÁZE 0.1b: Operations→Handler alignment is validated by
+      // _validateOperationsHandlerAlignment(), invoked from the v3 pipeline
+      // block below (after connectors are ready).
       // See RFC api/docs/architecture/biz-service-invocation-model.md §5.9 step 5.
-      this._logPhase('0.1b', 'Operations-Routes Alignment', 'SKIPPED', null, 0);
+      this._logPhase('0.1b', 'Operations-Handler Alignment', 'DEFERRED', null, 0);
 
       // FÁZE 0.15: Runtime integration connector contract (health + readiness source of truth)
       if (this.config.wrapper?.health?.enabled !== false) {
@@ -1791,9 +1791,8 @@ class ServiceWrapper {
 
     const timeout = this.config.wrapper?.timeout || 30000;
 
-    // P1.5b: orchestrator now dispatches via service-wrapper.invokeOperation
-    // (intra-service handler dispatch, RFC §5.9, §5.10) — no more HTTP-loopback
-    // through the retired conn-orch-api-mapper.
+    // Orchestrator dispatches via service-wrapper.invokeOperation
+    // (intra-service handler dispatch, RFC §5.9, §5.10).
     this.orchestrator = OrchestratorConnector.create({
       mqClient: this.mqClient,
       registryClient: this.registryClient,
@@ -2017,8 +2016,7 @@ class ServiceWrapper {
       // Process based on message type
       let result;
       if (message.operation && this.operations?.operations?.[message.operation]) {
-        // v3 handler-registry dispatch. Replaces v2 apiMapper.callAPI /
-        // _executeOperation HTTP-loopback path.
+        // v3 handler-registry dispatch.
         // See api/docs/architecture/biz-service-invocation-model.md §5.9.
         result = await this._dispatchViaInvokeOperation(message, message.operation);
       } else if (message.step?.operation && this.operations?.operations?.[message.step.operation]) {
@@ -2121,9 +2119,8 @@ class ServiceWrapper {
 
   /**
    * Adapt an MQ workflow message into the v3 invokeOperation contract,
-   * invoke it, and unwrap the returned envelope to match the previous
-   * `_executeOperation` return contract (result object on success, throws
-   * on error) so the surrounding _processWorkflowMessage flow is unchanged.
+   * invoke it, and unwrap the returned envelope (result object on success,
+   * throws on error) so the surrounding _processWorkflowMessage flow is unchanged.
    *
    * See RFC §5.9 for envelope shape.
    * @private
@@ -2165,82 +2162,6 @@ class ServiceWrapper {
     throw err;
   }
 
-  /**
-   * Execute operation by calling HTTP endpoint (v2 HTTP-loopback path).
-   *
-   * v2 legacy — no longer invoked from the MQ dispatch path; retained for
-   * any downstream caller until P5.1 cleanup.
-   *
-   * @private
-   */
-  async _executeOperation(operationName, input) {
-    const operation = this.operations?.operations?.[operationName];
-    if (!operation) {
-      throw new Error(`Unknown operation: ${operationName}`);
-    }
-
-    const serviceUrl = this.config.service?.url;
-    if (!serviceUrl) {
-      throw new Error('[ServiceWrapper] Missing configuration - service.url is required');
-    }
-
-    const url = new URL(operation.endpoint, serviceUrl).toString();
-    const method = operation.method || 'POST';
-
-    this.logger?.debug(`Executing operation ${operationName} via ${method} ${url}`);
-
-    // Make HTTP request using fetch (Node.js 18+) or http module
-    const http = require('http');
-
-    return new Promise((resolve, reject) => {
-      const postData = JSON.stringify(input);
-
-      const target = new URL(url);
-      const targetPort = target.port
-        ? parseInt(target.port, 10)
-        : (target.protocol === 'https:' ? 443 : 80);
-
-      const options = {
-        hostname: target.hostname,
-        port: targetPort,
-        path: `${target.pathname}${target.search}`,
-        method: method,
-        headers: {
-          'Content-Type': 'application/json',
-          'Content-Length': Buffer.byteLength(postData)
-        }
-      };
-
-      const req = http.request(options, (res) => {
-        let data = '';
-
-        res.on('data', (chunk) => {
-          data += chunk;
-        });
-
-        res.on('end', () => {
-          try {
-            const result = JSON.parse(data);
-            if (res.statusCode >= 200 && res.statusCode < 300) {
-              resolve(result);
-            } else {
-              reject(new Error(`Operation failed: ${result.error || data}`));
-            }
-          } catch (error) {
-            reject(new Error(`Invalid response: ${data}`));
-          }
-        });
-      });
-
-      req.on('error', (error) => {
-        reject(error);
-      });
-
-      req.write(postData);
-      req.end();
-    });
-  }
-
   /**
    * Extract all registered Express routes from the app router stack.
    * Handles nested Router instances (e.g. app.use('/api', router)).
@@ -2347,7 +2268,7 @@ class ServiceWrapper {
   }
 
   /**
-   * v3 alignment validator — replaces _validateOperationsRouteAlignment.
+   * Alignment validator for the v3 handler-registry.
    *
    * Cross-checks that every operation declared in operations.json has a
    * registered handler in HandlerRegistry, and that no handler is registered
@@ -2434,103 +2355,6 @@ class ServiceWrapper {
     }
   }
 
-  /**
-   * Bidirectional validation: operations.json <-> Express routes.
-   * Check A: every declared operation has a matching Express route.
-   * Check B: every /api/* route has a matching operation or is in _exclude.
-   *
-   * v2 legacy — no longer invoked; scheduled for removal in P5.1.
-   *
-   * @private
-   * @throws {Error} Permanent error listing all mismatches
-   */
-  _validateOperationsRouteAlignment() {
-    const ops = this.operations?.operations || {};
-    const excludeEntries = this.operations?._exclude || [];
-    const expressRoutes = this._extractExpressRoutes();
-
-    const routeSet = new Set(
-      expressRoutes.map(r => `${r.method}:${r.path}`)
-    );
-
-    const errors = [];
-
-    // Check A: every operation endpoint+method must exist as an Express route
-    for (const [opName, opDef] of Object.entries(ops)) {
-      const method = (opDef.method || 'POST').toUpperCase();
-      const endpoint = opDef.endpoint;
-      if (!endpoint) continue;
-
-      if (!routeSet.has(`${method}:${endpoint}`)) {
-        errors.push(`Operation '${opName}' endpoint ${method} ${endpoint} not found in Express routes`);
-      }
-    }
-
-    // Build lookup: endpoint -> set of operation methods
-    const opEndpoints = new Map();
-    for (const opDef of Object.values(ops)) {
-      const method = (opDef.method || 'POST').toUpperCase();
-      const endpoint = opDef.endpoint;
-      if (!endpoint) continue;
-      if (!opEndpoints.has(endpoint)) opEndpoints.set(endpoint, new Set());
-      opEndpoints.get(endpoint).add(method);
-    }
-
-    // Build _exclude lookup
-    const excludeSet = new Set(
-      excludeEntries.map(e => `${(e.method || 'GET').toUpperCase()}:${e.endpoint}`)
-    );
-
-    // Check B: every /api/* route must have a matching operation or be in _exclude
-    for (const route of expressRoutes) {
-      if (!route.path.startsWith('/api')) continue;
-
-      const key = `${route.method}:${route.path}`;
-      if (excludeSet.has(key)) continue;
-
-      const endpointOps = opEndpoints.get(route.path);
-      if (!endpointOps) {
-        errors.push(`Route ${route.method} ${route.path} has no matching operation in operations.json`);
-        continue;
-      }
-
-      if (!endpointOps.has(route.method)) {
-        // Tolerate GET alongside a declared POST (common browser-test pattern)
-        if (route.method === 'GET' && endpointOps.size > 0) continue;
-        errors.push(`Route ${route.method} ${route.path} has no matching operation in operations.json`);
-      }
-    }
-
-    // Extension 1: specificationEndpoint must match an Express route
-    // See: docs/standards/api-versioning-contract.md
-    const specEndpoint = this.config.service?.specificationEndpoint;
-    if (specEndpoint && !routeSet.has(`GET:${specEndpoint}`)) {
-      errors.push(
-        `specificationEndpoint '${specEndpoint}' not found in Express routes — ` +
-        `config claims this path but no GET route is registered`
-      );
-    }
-
-    // Extension 3: operations.json endpoints under /api/ must be versioned
-    // See: docs/standards/api-versioning-contract.md
-    const versionPattern = /^\/api\/v\d+\//;
-    for (const [opName, opDef] of Object.entries(ops)) {
-      if (opDef.endpoint?.startsWith('/api') && !versionPattern.test(opDef.endpoint)) {
-        errors.push(
-          `Operation '${opName}' endpoint '${opDef.endpoint}' missing version — ` +
-          `expected /api/v{N}/... (see docs/standards/api-versioning-contract.md)`
-        );
-      }
-    }
-
-    if (errors.length > 0) {
-      throw new Error(
-        `[ServiceWrapper] Operations-Routes alignment failed (${errors.length} issue${errors.length > 1 ? 's' : ''}):\n` +
-        errors.map(e => `  - ${e}`).join('\n')
-      );
-    }
-  }
-
   /**
    * Delete local validation proof and trigger re-validation.
    * Called when Registry sends a revalidation request (infra version change).

package/src/index.js

@@ -18,9 +18,10 @@ const runtimeCfg = require('./config');
 const pkg = require('../package.json');
 const { createTenantContextMiddleware } = require('./createTenantContextMiddleware');
 
-// Note: WorkflowProcessor and ApiCaller functionality has been moved to connectors:
-// - WorkflowProcessor -> @onlineapps/conn-orch-orchestrator
-// - ApiCaller -> @onlineapps/conn-orch-api-mapper
+// Note: WorkflowProcessor functionality has been moved to
+// @onlineapps/conn-orch-orchestrator. The former ApiCaller /
+// @onlineapps/conn-orch-api-mapper was retired 2026-04-21 (ADR-0001);
+// per-operation dispatch happens in-process via HandlerRegistry.
 
 // Note: HTTP logging middleware is now in each service's middlewares/httpLogging.js
 // It uses lazy logger access via lib/logger.js (set after wrapper.initialize())