@onlineapps/service-wrapper 2.0.17 → 2.0.19

package/README.md

@@ -239,7 +239,7 @@ describe('My Service', () => {
 If your service currently has workflow code:
 
 1. Install service-wrapper: `npm install @onlineapps/service-wrapper`
-2. Remove all `@onlineapps/connector-*` from service code
+2. Remove all direct connector imports from service code (use wrapper instead)
 3. Delete workflow processing files
 4. Wrap your Express app with ServiceWrapper
 5. Test that everything still works

package/docs/MIGRATION_FROM_OPENAPI.md

@@ -110,7 +110,7 @@ Transform your OpenAPI spec into Operations format:
 ```bash
 # Old structure
 services/my-service/
-├── connector-config/
+├── conn-config/
 │   ├── manifest.json
 │   └── openapi.json
 
@@ -121,17 +121,14 @@ services/my-service/
 │   └── operations.json
 ```
 
-Move configuration:
+Convert configuration:
 ```bash
 cd services/my-service
-mkdir -p conn-config
 
-# If you have existing config, merge it
-mv connector-config/manifest.json conn-config/config.json
+# If you have existing manifest.json, merge it into config.json
+# Move from manifest.json to config.json structure
 
 # Create operations.json (see conversion below)
-# Delete old directory
-rm -rf connector-config/
 ```
 
 ### Step 3: Convert OpenAPI to Operations
@@ -153,11 +150,12 @@ Use this mapping:
 #### Before:
 ```javascript
 const { ServiceWrapper } = require('@onlineapps/service-wrapper');
-const openApiSpec = require('./connector-config/openapi.json');
+const openApiSpec = require('./conn-config/openapi.json');
 
 const wrapper = new ServiceWrapper({
   app,
   server,
+  serviceRoot: __dirname,
   config,
   openApiSpec  // OLD
 });
@@ -171,6 +169,7 @@ const operations = require('./conn-config/operations.json');
 const wrapper = new ServiceWrapper({
   app,
   server,
+  serviceRoot: __dirname,
   config,
   operations  // NEW
 });
@@ -181,7 +180,7 @@ const wrapper = new ServiceWrapper({
 #### Before:
 ```javascript
 app.get('/specification', (req, res) => {
-  const openapi = require('./connector-config/openapi.json');
+  const openapi = require('./conn-config/openapi.json');
   res.json(openapi);
 });
 ```
@@ -197,7 +196,6 @@ app.get('/specification', (req, res) => {
 ### Step 6: Update Documentation References
 
 Update all references:
-- `connector-config/` → `conn-config/`
 - `openapi.json` → `operations.json`
 - "OpenAPI specification" → "Operations specification"
 
@@ -271,7 +269,7 @@ function convertSchema(schema) {
 }
 
 // Usage
-const openapi = require('./connector-config/openapi.json');
+const openapi = require('./conn-config/openapi.json');
 const operations = convertOpenAPIToOperations(openapi);
 fs.writeFileSync('./conn-config/operations.json', JSON.stringify(operations, null, 2));
 console.log('Converted to operations.json');

package/docs/archived-2025-09-29/SERVICE_TESTING_STANDARD.md

@@ -365,7 +365,7 @@ servers:
     description: Configured base URL
 ```
 
-## 9. Testing with conn-e2e-testing
+## 9. Testing with conn-orch-validator
 
 The connector testing framework will:
 1. Load your OpenAPI schema
@@ -386,4 +386,4 @@ Ensure your service is ready by:
 - [JSON Schema Validation](https://json-schema.org/draft/2019-09/json-schema-validation.html)
 - [swagger-cli Documentation](https://apitools.dev/swagger-cli/)
 - Service Wrapper documentation: `/shared/connector/service-wrapper/README.md`
-- Testing examples: `/shared/connector/conn-e2e-testing/examples/`
+- Testing examples: `/shared/connector/conn-orch-validator/examples/`

package/jest.config.js

@@ -7,7 +7,7 @@ module.exports = {
     '!src/**/index.js'
   ],
   testMatch: [
-    '**/test/**/*.test.js'
+    '**/tests/**/*.test.js'
   ],
   testPathIgnorePatterns: [
     '/node_modules/'
@@ -22,13 +22,13 @@ module.exports = {
   },
   moduleNameMapper: {
     // Map connector imports to mocks in unit tests
-    '@onlineapps/conn-infra-mq': '<rootDir>/test/mocks/connectors.js',
-    '@onlineapps/conn-orch-registry': '<rootDir>/test/mocks/connectors.js',
-    '@onlineapps/conn-base-logger': '<rootDir>/test/mocks/connectors.js',
-    '@onlineapps/conn-orch-orchestrator': '<rootDir>/test/mocks/connectors.js',
-    '@onlineapps/conn-orch-api-mapper': '<rootDir>/test/mocks/connectors.js',
-    '@onlineapps/conn-orch-cookbook': '<rootDir>/test/mocks/connectors.js'
+    '@onlineapps/conn-infra-mq': '<rootDir>/tests/mocks/connectors.js',
+    '@onlineapps/conn-orch-registry': '<rootDir>/tests/mocks/connectors.js',
+    '@onlineapps/conn-base-logger': '<rootDir>/tests/mocks/connectors.js',
+    '@onlineapps/conn-orch-orchestrator': '<rootDir>/tests/mocks/connectors.js',
+    '@onlineapps/conn-orch-api-mapper': '<rootDir>/tests/mocks/connectors.js',
+    '@onlineapps/conn-orch-cookbook': '<rootDir>/tests/mocks/connectors.js'
   },
-  setupFilesAfterEnv: ['<rootDir>/test/setup.js'],
+  setupFilesAfterEnv: ['<rootDir>/tests/setup.js'],
   verbose: true
 };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@onlineapps/service-wrapper",
-  "version": "2.0.17",
+  "version": "2.0.19",
   "description": "Thin orchestration layer for microservices - delegates all infrastructure concerns to specialized connectors",
   "main": "src/index.js",
   "scripts": {
     "test": "jest",
-    "test:unit": "jest test/unit",
-    "test:component": "jest test/component",
-    "test:integration": "jest test/integration",
+    "test:unit": "jest tests/unit",
+    "test:component": "jest tests/component",
+    "test:integration": "jest tests/integration",
     "test:coverage": "jest --coverage",
     "test:mocked": "node test/run-tests.js",
     "docs": "jsdoc2md --files src/**/*.js > API.md",
@@ -32,6 +32,7 @@
     "@onlineapps/conn-orch-cookbook": "^2.0.0",
     "@onlineapps/conn-orch-orchestrator": "^1.0.1",
     "@onlineapps/conn-orch-registry": "^1.1.13",
+    "@onlineapps/conn-orch-validator": "^2.0.0",
     "@onlineapps/monitoring-core": "^1.0.0"
   },
   "devDependencies": {

package/src/ServiceWrapper.js

@@ -21,6 +21,7 @@ const ApiMapperConnector = require('@onlineapps/conn-orch-api-mapper');
 const CookbookConnector = require('@onlineapps/conn-orch-cookbook');
 const CacheConnector = require('@onlineapps/conn-base-cache');
 const ErrorHandlerConnector = require('@onlineapps/conn-infra-error-handler');
+const { ValidationOrchestrator } = require('@onlineapps/conn-orch-validator');
 
 /**
  * ServiceWrapper class
@@ -34,6 +35,7 @@ class ServiceWrapper {
    * @param {Object} options.server - HTTP server instance
    * @param {Object} options.config - Service and wrapper configuration
    * @param {Object} options.operations - Operations schema
+   * @param {string} [options.serviceRoot] - Service root directory (for validation)
    * @param {Object} [options.validationProof=null] - Optional validation proof {hash, data}
    */
   constructor(options = {}) {
@@ -44,6 +46,7 @@ class ServiceWrapper {
     this.server = options.server;
     this.config = this._processConfig(options.config);
     this.operations = options.operations;
+    this.serviceRoot = options.serviceRoot;
     this.validationProof = options.validationProof || null;
 
     // Initialize connector placeholders
@@ -146,27 +149,34 @@ class ServiceWrapper {
         await this._initializeMonitoring();
       }
 
-      // 2. Initialize MQ connection
+      // 2. Run pre-validation (Tier 1)
+      // Validates service structure, config, operations, cookbook tests
+      // Skips if valid proof exists in conn-runtime/validation-proof.json
+      if (this.serviceRoot && this.config.wrapper?.validation?.enabled !== false) {
+        await this._ensureValidationProof();
+      }
+
+      // 3. Initialize MQ connection
       if (this.config.wrapper?.mq?.enabled !== false) {
         await this._initializeMQ();
       }
 
-      // 3. Initialize service registry
+      // 4. Initialize service registry
       if (this.config.wrapper?.registry?.enabled !== false) {
         await this._initializeRegistry();
       }
 
-      // 4. Initialize cache if configured
+      // 5. Initialize cache if configured
       if (this.config.wrapper?.cache?.enabled === true) {
         await this._initializeCache();
       }
 
-      // 5. Setup health checks
+      // 6. Setup health checks
       if (this.config.wrapper?.health?.enabled !== false) {
         this._setupHealthChecks();
       }
 
-      // 6. Initialize orchestrator for workflow processing
+      // 7. Initialize orchestrator for workflow processing
       // NOTE: Orchestrator is prepared but workflow listeners will be started
       // ONLY after receiving certificate from Registry (see _initializeRegistry)
       if (this.mqClient) {
@@ -460,9 +470,16 @@ class ServiceWrapper {
         message = rawMessage;
       }
 
+      // Extract and normalize flags
+      const flags = Array.isArray(message.flags) ? message.flags : [];
+      const isTest = flags.includes('test');
+      const isTier2Validation = flags.includes('tier2-validation');
+
       console.log(`Processing message from ${queueName}:`, {
         workflow_id: message.workflow_id,
-        step: message.step?.operation || message.operation
+        step: message.step?.operation || message.operation,
+        flags,
+        isTest
       });
 
       // Check if this message is for our service
@@ -473,22 +490,42 @@ class ServiceWrapper {
       }
 
       // Process based on message type
+      let result;
       if (message.operation && this.operations?.operations?.[message.operation]) {
         // Direct operation call
-        const result = await this._executeOperation(message.operation, message.input || {});
-        return result;
+        result = await this._executeOperation(message.operation, message.input || {});
       } else if (message.step?.operation && this.operations?.operations?.[message.step.operation]) {
         // Workflow step
-        const result = await this._executeOperation(message.step.operation, message.input || {});
-        return result;
+        result = await this._executeOperation(message.step.operation, message.input || {});
       } else if (this.orchestrator) {
         // Delegate to orchestrator for complex workflow processing
-        const result = await this.orchestrator.processWorkflowMessage(message, serviceName);
-        return result;
+        result = await this.orchestrator.processWorkflowMessage(message, serviceName);
       } else {
         throw new Error(`Unknown message format or operation: ${JSON.stringify(message)}`);
       }
 
+      // Send response to workflow.completed if workflow_id is present
+      if (message.workflow_id && this.mqClient) {
+        const workflowResponse = {
+          workflow_id: message.workflow_id,
+          service: serviceName,
+          operation: message.step?.operation || message.operation,
+          status: 'completed',
+          output: result,
+          flags,
+          timestamp: new Date().toISOString()
+        };
+
+        try {
+          await this.mqClient.publish('workflow.completed', workflowResponse);
+          console.log(`✓ Workflow response sent to workflow.completed: ${message.workflow_id}`);
+        } catch (error) {
+          console.error(`Failed to send workflow response:`, error);
+        }
+      }
+
+      return result;
+
     } catch (error) {
       console.error(`Error processing message from ${queueName}:`, error);
       throw error;
@@ -631,6 +668,49 @@ class ServiceWrapper {
     }
   }
 
+  /**
+   * Ensure validation proof exists and is valid
+   * Runs ValidationOrchestrator if proof missing or invalid
+   * @private
+   */
+  async _ensureValidationProof() {
+    if (!this.config.service?.name) {
+      throw new Error('Service name is required for validation');
+    }
+    if (!this.config.service?.version) {
+      throw new Error('Service version is required for validation');
+    }
+    if (!this.logger) {
+      throw new Error('Monitoring must be initialized before validation');
+    }
+
+    const { name: serviceName, version: serviceVersion } = this.config.service;
+
+    this.logger.info('[ServiceWrapper] Checking validation proof...');
+
+    const orchestrator = new ValidationOrchestrator({
+      serviceRoot: this.serviceRoot,
+      serviceName,
+      serviceVersion,
+      logger: this.logger
+    });
+
+    const result = await orchestrator.validate();
+
+    if (!result.success) {
+      throw new Error(`Validation failed: ${result.errors.join(', ')}`);
+    }
+
+    if (result.skipped) {
+      this.logger.info('[ServiceWrapper] ✓ Using existing validation proof');
+    } else {
+      this.logger.info('[ServiceWrapper] ✓ Validation completed successfully');
+    }
+
+    // Store proof for registration
+    this.validationProof = result.proof;
+  }
+
   /**
    * Get wrapper status
    */

package/{test → tests}/component/ServiceWrapper.component.test.js

@@ -9,7 +9,7 @@
 const ServiceWrapper = require('../../src/ServiceWrapper');
 const express = require('express');
 
-describe('ServiceWrapper Component Tests', () => {
+describe('ServiceWrapper Component Tests @component', () => {
   let wrapper;
   let app;
   let server;

package/{test → tests}/component/connector-integration.test.js

@@ -6,7 +6,7 @@
  * Run these after implementing each connector
  */
 
-describe('Connector Integration Tests', () => {
+describe('Connector Integration Tests @component', () => {
   describe('Orchestrator Connector', () => {
     test.skip('should integrate with real Orchestrator connector', async () => {
       // Enable this test after conn-orch-orchestrator is fully implemented

package/{test → tests}/e2e/full-flow.test.js

@@ -10,7 +10,7 @@ const MQConnector = require('@onlineapps/conn-infra-mq');
 const express = require('express');
 const http = require('http');
 
-describe('ServiceWrapper E2E Tests', () => {
+describe('ServiceWrapper E2E Tests @e2e', () => {
   let testService;
   let testServer;
   let serviceWrapper;

package/{test → tests}/monitoring-integration.test.js

@@ -2,7 +2,7 @@
  * Test monitoring integration in service-wrapper
  */
 
-describe('ServiceWrapper Monitoring Integration', () => {
+describe('ServiceWrapper Monitoring Integration @integration', () => {
   let ServiceWrapper;
   let express;
 

package/{test → tests}/unit/ServiceWrapper.test.js

@@ -20,7 +20,7 @@ jest.mock('@onlineapps/conn-orch-orchestrator', () => MockOrchestratorConnector)
 jest.mock('@onlineapps/conn-orch-api-mapper', () => MockApiMapperConnector);
 jest.mock('@onlineapps/conn-orch-cookbook', () => MockCookbookConnector);
 
-describe('ServiceWrapper Unit Tests', () => {
+describe('ServiceWrapper Unit Tests @unit', () => {
   let wrapper;
   let mockExpressApp;
   let mockOpenApiSpec;