@onlineapps/service-wrapper 2.1.114 → 2.1.116

package/package.json

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

package/src/ServiceWrapper.js

@@ -1092,15 +1092,20 @@ class ServiceWrapper {
       };
 
       if (this.mqClient) {
-        try {
-          const mqHealth = await this.mqClient.performHealthCheck();
-          health.components.mq = mqHealth.healthy ? 'healthy' : 'unhealthy';
-          if (!mqHealth.healthy) {
-            health.mqIssues = mqHealth.issues;
+        const transport = this.mqClient._transport;
+        if (transport && typeof transport.performHealthCheck === 'function') {
+          try {
+            const mqHealth = await transport.performHealthCheck();
+            health.components.mq = mqHealth.healthy ? 'healthy' : 'unhealthy';
+            if (!mqHealth.healthy) {
+              health.mqIssues = mqHealth.issues;
+            }
+          } catch (e) {
+            health.components.mq = 'unhealthy';
+            health.mqIssues = [e.message];
           }
-        } catch (e) {
-          health.components.mq = 'unhealthy';
-          health.mqIssues = [e.message];
+        } else {
+          health.components.mq = this.mqClient.isConnected() ? 'healthy' : 'unhealthy';
         }
       }
 
@@ -1115,24 +1120,13 @@ class ServiceWrapper {
       res.json(health);
     };
 
-    // Insert health route BEFORE catch-all 404/error handlers in Express stack.
-    // Services register routes in app.js (loaded before ServiceWrapper), including
-    // 404 middleware. A plain app.get() would add AFTER the 404 handler and never match.
-    this.app.get(healthEndpoint, healthHandler);
-
-    const stack = this.app._router?.stack;
-    if (stack && stack.length > 1) {
-      const healthLayer = stack.pop();
-      // Find first catch-all middleware (no route, not a built-in parser)
-      const builtins = new Set(['query', 'expressInit', 'jsonParser', 'urlencodedParser', 'tenantContext', 'router']);
-      let insertAt = stack.length;
-      for (let i = 0; i < stack.length; i++) {
-        if (!stack[i].route && !builtins.has(stack[i].name)) {
-          insertAt = i;
-          break;
-        }
-      }
-      stack.splice(insertAt, 0, healthLayer);
+    // Health route must be registered BEFORE catch-all 404/error handlers.
+    // Services register routes (including 404) in app.js before ServiceWrapper initializes.
+    // We use _healthHandler reference that bootstrap() registered early in the stack.
+    if (this._healthRouteRegistered) {
+      this._healthImpl = healthHandler;
+    } else {
+      this.app.get(healthEndpoint, healthHandler);
     }
 
     this.logger?.info(`Health check endpoint registered at ${healthEndpoint}`);

package/src/index.js

@@ -95,6 +95,31 @@ async function bootstrap(serviceRoot, options = {}) {
   stack.pop();
   stack.unshift(lastLayer);
 
+  // Register /health route BEFORE service's 404 handler.
+  // ServiceWrapper._setupHealthChecks() will later set _healthImpl with actual MQ checks.
+  // Until then, this returns a basic healthy response (service is starting up).
+  let wrapperRef = null;
+  const healthEndpoint = config.wrapper?.health?.endpoint || '/health';
+  app.get(healthEndpoint, async (req, res) => {
+    if (wrapperRef && wrapperRef._healthImpl) {
+      return wrapperRef._healthImpl(req, res);
+    }
+    res.json({ status: 'starting', service: config.service.name, timestamp: new Date().toISOString() });
+  });
+
+  // Move health route before 404/error handlers (same stack technique as tenant context)
+  const healthLayer = stack.pop();
+  if (healthLayer) {
+    const catchAllIdx = stack.findIndex((layer, i) =>
+      i > 0 && !layer.route && !['query', 'expressInit', 'jsonParser', 'urlencodedParser'].includes(layer.name)
+    );
+    if (catchAllIdx > 0) {
+      stack.splice(catchAllIdx, 0, healthLayer);
+    } else {
+      stack.push(healthLayer);
+    }
+  }
+
   // 1. Start HTTP server
   const PORT = config.service.port;
   const server = app.listen(PORT, () => {
@@ -123,7 +148,9 @@ async function bootstrap(serviceRoot, options = {}) {
     validationProof: config.validationProof
   });
 
+  wrapper._healthRouteRegistered = true;
   await wrapper.initialize();
+  wrapperRef = wrapper;
 
   // Initialize centralized logger for use throughout the service
   if (setLogger && wrapper.logger) {