@onlineapps/service-wrapper 2.2.8 → 2.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/service-wrapper",
-  "version": "2.2.8",
+  "version": "2.2.9",
   "description": "Thin orchestration layer for microservices - delegates all infrastructure concerns to specialized connectors",
   "main": "src/index.js",
   "scripts": {

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);