@onlineapps/service-wrapper 2.2.7 → 2.2.9

package/jest.config.js

@@ -27,7 +27,8 @@ module.exports = {
     '@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'
+    '@onlineapps/conn-orch-cookbook': '<rootDir>/tests/mocks/connectors.js',
+    '@onlineapps/conn-base-state': '<rootDir>/tests/mocks/connectors.js'
   },
   setupFilesAfterEnv: ['<rootDir>/tests/setup.js'],
   verbose: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/service-wrapper",
-  "version": "2.2.7",
+  "version": "2.2.9",
   "description": "Thin orchestration layer for microservices - delegates all infrastructure concerns to specialized connectors",
   "main": "src/index.js",
   "scripts": {
@@ -25,6 +25,7 @@
   "license": "MIT",
   "dependencies": {
     "@onlineapps/conn-base-cache": "1.0.9",
+    "@onlineapps/conn-base-state": "1.0.1",
     "@onlineapps/conn-base-monitoring": "1.0.10",
     "@onlineapps/conn-infra-error-handler": "1.0.9",
     "@onlineapps/conn-infra-mq": "1.1.69",

package/src/ServiceWrapper.js

@@ -20,6 +20,7 @@ const OrchestratorConnector = require('@onlineapps/conn-orch-orchestrator');
 const ApiMapperConnector = require('@onlineapps/conn-orch-api-mapper');
 const CookbookConnector = require('@onlineapps/conn-orch-cookbook');
 const CacheConnector = require('@onlineapps/conn-base-cache');
+const StateConnector = require('@onlineapps/conn-base-state');
 const ErrorHandlerConnector = require('@onlineapps/conn-infra-error-handler');
 const { ValidationOrchestrator } = require('@onlineapps/conn-orch-validator');
 const runtimeCfg = require('./config');
@@ -415,13 +416,22 @@ class ServiceWrapper {
         }
       }
 
-      // 4. Close Redis connection (if used)
+      // 4. Close Redis connections (cache + state)
       if (this.cacheConnector) {
         try {
           await this.cacheConnector.disconnect();
-          console.log(`[CLEANUP] ✓ Closed Redis connection`);
+          console.log(`[CLEANUP] ✓ Closed Redis cache connection`);
         } catch (err) {
-          console.warn(`[CLEANUP] Failed to close Redis connection:`, err.message);
+          console.warn(`[CLEANUP] Failed to close Redis cache connection:`, err.message);
+        }
+      }
+
+      if (this.stateConnector) {
+        try {
+          await this.stateConnector.disconnect();
+          console.log(`[CLEANUP] ✓ Closed Redis state connection`);
+        } catch (err) {
+          console.warn(`[CLEANUP] Failed to close Redis state connection:`, err.message);
         }
       }
 
@@ -574,6 +584,11 @@ class ServiceWrapper {
         }
       }
 
+      // Initialize state connector if configured (critical — let it throw)
+      if (this.config.wrapper?.state?.enabled === true) {
+        await this._initializeState();
+      }
+
       // Setup health checks
       if (this.config.wrapper?.health?.enabled !== false) {
         this._setupHealthChecks();
@@ -1089,6 +1104,37 @@ class ServiceWrapper {
     this.logger?.info('Cache connector initialized');
   }
 
+  /**
+   * Initialize state connector (persistent Redis state, no TTL)
+   * @private
+   */
+  async _initializeState() {
+    const stateConfig = this.config.wrapper?.state;
+    const serviceName = stateConfig?.serviceName || this.config.service?.name;
+    if (!serviceName) {
+      throw new Error('[ServiceWrapper] state.serviceName or service.name is required when state is enabled');
+    }
+
+    const cacheUrl = this.config.wrapper?.cache?.url;
+    let host, port;
+    if (cacheUrl?.startsWith('redis://')) {
+      const parsed = new URL(cacheUrl);
+      host = parsed.hostname;
+      port = parseInt(parsed.port, 10);
+    }
+
+    this.stateConnector = new StateConnector({
+      host: stateConfig?.host || host,
+      port: stateConfig?.port || port,
+      password: stateConfig?.password,
+      db: stateConfig?.db,
+      serviceName,
+    });
+
+    await this.stateConnector.connect();
+    this.logger?.info('State connector initialized');
+  }
+
   /**
    * Setup health check endpoint
    * @private
@@ -1105,7 +1151,8 @@ class ServiceWrapper {
           http: 'healthy',
           mq: 'disabled',
           registry: this.registryClient ? 'healthy' : 'disabled',
-          cache: this.cacheConnector ? 'healthy' : 'disabled'
+          cache: this.cacheConnector ? 'healthy' : 'disabled',
+          state: this.stateConnector ? 'healthy' : 'disabled'
         }
       };
 
@@ -2061,6 +2108,11 @@ class ServiceWrapper {
         await this.cacheConnector.disconnect();
       }
 
+      // Disconnect from state
+      if (this.stateConnector) {
+        await this.stateConnector.disconnect();
+      }
+
       // Disconnect from MQ
       if (this.mqClient) {
         await this.mqClient.disconnect();

package/src/createTenantContextMiddleware.js

@@ -54,7 +54,10 @@ function createTenantContextMiddleware(options = {}) {
 
   function sendJson(res, statusCode, payload) {
     if (!res || typeof res.status !== 'function' || typeof res.json !== 'function') {
-      throw new Error('[service-wrapper][TenantContext] Invalid response object - Expected Express res with res.status().json()');
+      throw new Error(
+        '[service-wrapper][TenantContext] res.status/res.json unavailable - ' +
+        'middleware is likely running before expressInit (check bootstrap stack order)'
+      );
     }
     return res.status(statusCode).json(payload);
   }

package/src/index.js

@@ -93,7 +93,16 @@ async function bootstrap(serviceRoot, options = {}) {
   }
 
   stack.pop();
-  stack.unshift(lastLayer);
+  // Insert AFTER expressInit (which sets up res.status/res.json via setPrototypeOf).
+  // Position 0 = query, 1 = expressInit. Tenant context must run after both.
+  const expressInitIdx = stack.findIndex(l => l.name === 'expressInit');
+  if (expressInitIdx === -1) {
+    throw new Error(
+      '[service-wrapper][TenantContext] Express stack missing expressInit layer - ' +
+      'cannot guarantee tenant context runs after Express initialization'
+    );
+  }
+  stack.splice(expressInitIdx + 1, 0, lastLayer);
 
   // Register /health route BEFORE service's 404 handler.
   // ServiceWrapper._setupHealthChecks() will later set _healthImpl with actual MQ checks.
@@ -111,7 +120,7 @@ async function bootstrap(serviceRoot, options = {}) {
   const healthLayer = stack.pop();
   if (healthLayer) {
     const catchAllIdx = stack.findIndex((layer, i) =>
-      i > 0 && !layer.route && !['query', 'expressInit', 'jsonParser', 'urlencodedParser'].includes(layer.name)
+      i > 0 && !layer.route && !['query', 'expressInit', 'tenantContextMiddleware', 'jsonParser', 'urlencodedParser'].includes(layer.name)
     );
     if (catchAllIdx > 0) {
       stack.splice(catchAllIdx, 0, healthLayer);