@devmoods/express-extras 0.20.1 → 0.21.0

package/dist/listen.d.ts

@@ -9,5 +9,5 @@ import type * as http from 'node:http';
 export declare function listen(server: http.Server, options: {
     port: number;
     onShutdown?: () => void | Promise<void>;
-    healthCheck?: () => Promise<void>;
+    healthCheck?: () => Promise<unknown>;
 }): void;

package/dist/listen.js

@@ -34,13 +34,18 @@ export function listen(server, options) {
                     return false;
                 }
                 try {
-                    await options?.healthCheck?.();
+                    const meta = await options?.healthCheck?.();
+                    return {
+                        meta,
+                        timestamp: new Date().toISOString(),
+                    };
                 }
                 catch (error) {
                     logger.error(error, 'health check failed');
                     throw error;
                 }
             },
+            verbatim: true,
         },
     });
     const port = options.port;

package/dist/logger.d.ts

@@ -21,14 +21,14 @@ export declare function createLogger({ name, getContext, silent, }: LoggerOption
     debug(message: string, context?: LoggerContext): void;
     info(message: string, context?: LoggerContext): void;
     warn(message: string, context?: LoggerContext): void;
-    error(error: Error | null, message?: string): void;
-    fatal(error: Error | null, message?: string): void;
+    error(error: Error | null, message?: string, context?: LoggerContext): void;
+    fatal(error: Error | null, message?: string, context?: LoggerContext): void;
 };
 export declare function getLogger(name?: string): Logger;
 export declare function getLoggers(): Map<string, {
     debug(message: string, context?: LoggerContext): void;
     info(message: string, context?: LoggerContext): void;
     warn(message: string, context?: LoggerContext): void;
-    error(error: Error | null, message?: string | undefined): void;
-    fatal(error: Error | null, message?: string | undefined): void;
+    error(error: Error | null, message?: string | undefined, context?: LoggerContext): void;
+    fatal(error: Error | null, message?: string | undefined, context?: LoggerContext): void;
 }>;

package/dist/logger.js

@@ -62,23 +62,29 @@ export function createLogger({ name, getContext, silent = () => process.env.NODE
         warn(message, context = {}) {
             return log(LEVELS.WARN, message, getFinalContext(context));
         },
-        error(error, message) {
-            const context = getFinalContext({ err: error?.stack });
+        error(error, message, context = {}) {
+            const finalContext = getFinalContext(context);
             if (_sentryClient != null) {
                 _sentryClient.captureException(error, {
-                    tags: context,
+                    tags: finalContext,
                 });
             }
-            return log(LEVELS.ERROR, message || error?.message || '', context);
+            return log(LEVELS.ERROR, message || error?.message || '', {
+                ...finalContext,
+                err: error?.stack,
+            });
         },
-        fatal(error, message) {
-            const context = getFinalContext({ err: error });
+        fatal(error, message, context = {}) {
+            const finalContext = getFinalContext(context);
             if (_sentryClient != null) {
                 _sentryClient.captureException(error, {
-                    tags: context,
+                    tags: finalContext,
                 });
             }
-            return log(LEVELS.FATAL, message || error?.message || '', context);
+            return log(LEVELS.FATAL, message || error?.message || '', {
+                ...finalContext,
+                err: error?.stack,
+            });
         },
     };
     _loggers.set(name, api);

package/dist/routes.d.ts

@@ -1,2 +1,2 @@
-import type { Application } from 'express';
-export declare function listRoutes(app: Application): string[];
+import type { RequestHandler, Express } from 'express';
+export declare function createDocsRouter(app: Express, extras?: Record<string, any>): RequestHandler;

package/dist/routes.js

@@ -1,41 +1,10 @@
-function split(value) {
-    if (typeof value === 'string') {
-        return value;
-    }
-    else if (value.fast_slash) {
-        return '';
-    }
-    else {
-        const match = value
-            .toString()
-            .replace('/?', '')
-            .replace('(?=/|$)', '$')
-            .match(/^\/\^((?:\\[.*+?^${}()|[\]\\/]|[^.*+?^${}()|[\]\\/])*)\$\//);
-        return match
-            ? match[1].replace(/\\(.)/g, '$1')
-            : '<complex:' + value.toString() + '>';
-    }
-}
-function getRoutesOfLayer(path, layer) {
-    if (layer.method) {
-        return [{ method: layer.method.toUpperCase(), path }];
-    }
-    else if (layer.route) {
-        return getRoutesOfLayer(path + split(layer.route.path), layer.route.stack[0]);
-    }
-    else if (layer.name === 'router' && layer.handle.stack) {
-        let routes = [];
-        layer.handle.stack.forEach(function (stackItem) {
-            routes = routes.concat(getRoutesOfLayer(path + split(layer.regexp), stackItem));
-        });
-        return routes;
-    }
-    return [];
-}
-export function listRoutes(app) {
-    const routes = [];
-    for (const layer of app._router.stack) {
-        routes.push(...getRoutesOfLayer('', layer));
-    }
-    return routes;
+import { parseExpressApp } from 'express-route-parser';
+import { route } from './middleware.js';
+export function createDocsRouter(app, extras = {}) {
+    return route(() => {
+        return {
+            ...extras,
+            routes: parseExpressApp(app),
+        };
+    });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devmoods/express-extras",
-  "version": "0.20.1",
+  "version": "0.21.0",
   "description": "Kubernetes-ready utilities for rapid Node.js application development",
   "type": "module",
   "main": "./dist/index.js",
@@ -75,6 +75,7 @@
     "cookie-parser": "^1.4.6",
     "dotenv": "^16.3.1",
     "express": "^4.18.2",
+    "express-route-parser": "^1.0.5",
     "helmet": "^7.0.0",
     "jsonwebtoken": "^9.0.1",
     "meow": "^12.0.1",