@jaypie/express 1.2.18 → 1.2.20

package/dist/cjs/expressHandler.d.ts

@@ -1,7 +1,7 @@
 import type { Request, Response } from "express";
 export type JaypieHandlerSetup = (req: Request, res: Response) => Promise<void> | void;
 export type JaypieHandlerTeardown = (req: Request, res: Response) => Promise<void> | void;
-export type JaypieHandlerValidate = (req: Request, res: Response) => Promise<boolean> | boolean;
+export type JaypieHandlerValidate = (req: Request, res: Response) => Promise<boolean | void> | boolean | void;
 export type ExpressHandlerLocals = (req: Request, res: Response) => Promise<unknown> | unknown;
 export interface ExpressHandlerOptions {
     chaos?: string;

package/dist/cjs/expressStreamHandler.d.ts

@@ -2,7 +2,7 @@ import type { Request, Response } from "express";
 import type { StreamFormat } from "@jaypie/aws";
 export type JaypieStreamHandlerSetup = (req: Request, res: Response) => Promise<void> | void;
 export type JaypieStreamHandlerTeardown = (req: Request, res: Response) => Promise<void> | void;
-export type JaypieStreamHandlerValidate = (req: Request, res: Response) => Promise<boolean> | boolean;
+export type JaypieStreamHandlerValidate = (req: Request, res: Response) => Promise<boolean | void> | boolean | void;
 export type ExpressStreamHandlerLocals = (req: Request, res: Response) => Promise<unknown> | unknown;
 export interface ExpressStreamHandlerOptions {
     chaos?: string;

package/dist/cjs/index.cjs

@@ -1757,15 +1757,6 @@ function expressHandler(handlerOrOptions, optionsOrHandler) {
         });
         // Update the public logger with the request ID
         const invokeUuid = getCurrentInvokeUuid(req);
-        if (invokeUuid) {
-            logger$1.tag({ invoke: invokeUuid });
-            logger$1.tag({ shortInvoke: invokeUuid.slice(0, 8) });
-            // TODO: in theory this is redundant
-            libLogger.tag({ invoke: invokeUuid });
-            libLogger.tag({ shortInvoke: invokeUuid.slice(0, 8) });
-            log.tag({ invoke: invokeUuid });
-            log.tag({ shortInvoke: invokeUuid.slice(0, 8) });
-        }
         if (!name) {
             // If handler has a name, use it
             if (handler.name) {
@@ -1775,10 +1766,15 @@ function expressHandler(handlerOrOptions, optionsOrHandler) {
                 name = kit.JAYPIE.UNKNOWN;
             }
         }
-        logger$1.tag({ handler: name });
+        const setupTags = { handler: name };
+        if (invokeUuid) {
+            setupTags.invoke = invokeUuid;
+            setupTags.shortInvoke = invokeUuid.slice(0, 8);
+        }
+        logger$1.setup(setupTags);
         // TODO: in theory this is redundant
-        libLogger.tag({ handler: name });
-        log.tag({ handler: name });
+        libLogger.tag(setupTags);
+        log.tag(setupTags);
         libLogger.trace("[jaypie] Express init");
         // Set req.locals if it doesn't exist
         if (!extReq.locals)
@@ -1982,22 +1978,20 @@ function expressHandler(handlerOrOptions, optionsOrHandler) {
         log.info.var({
             res: summarizeResponse(res, extras),
         });
+        // Construct normalized path for reporting and metrics
+        let path = (req.baseUrl || "") + (req.url || "");
+        if (!path.startsWith("/")) {
+            path = "/" + path;
+        }
+        if (path.length > 1 && path.endsWith("/")) {
+            path = path.slice(0, -1);
+        }
+        // Replace UUIDs with :id for better aggregation
+        path = path.replace(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/gi, ":id");
+        // Add request data to session report
+        logger$1.report({ path, status: String(res.statusCode) });
         // Submit metric if Datadog is configured
         if (datadog.hasDatadogEnv()) {
-            // Construct path from baseUrl and url
-            let path = (req.baseUrl || "") + (req.url || "");
-            // Ensure path starts with /
-            if (!path.startsWith("/")) {
-                path = "/" + path;
-            }
-            // Remove trailing slash unless it's the root path
-            if (path.length > 1 && path.endsWith("/")) {
-                path = path.slice(0, -1);
-            }
-            // Replace UUIDs with :id for better aggregation
-            // Matches standard UUID v4 format (8-4-4-4-12 hex characters)
-            path = path.replace(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/gi, ":id");
-            // Determine metric name based on environment variables
             let metricPrefix = "project";
             if (process.env.PROJECT_SPONSOR) {
                 metricPrefix = process.env.PROJECT_SPONSOR;
@@ -2015,7 +2009,8 @@ function expressHandler(handlerOrOptions, optionsOrHandler) {
                 },
             });
         }
-        // Clean up the public logger
+        // End log session and clean up
+        logger$1.teardown();
         logger$1.untag("handler");
         //
         //
@@ -2134,14 +2129,6 @@ function expressStreamHandler(handlerOrOptions, optionsOrHandler) {
         });
         // Update the public logger with the request ID
         const invokeUuid = getCurrentInvokeUuid(req);
-        if (invokeUuid) {
-            logger.tag({ invoke: invokeUuid });
-            logger.tag({ shortInvoke: invokeUuid.slice(0, 8) });
-            libLogger.tag({ invoke: invokeUuid });
-            libLogger.tag({ shortInvoke: invokeUuid.slice(0, 8) });
-            log.tag({ invoke: invokeUuid });
-            log.tag({ shortInvoke: invokeUuid.slice(0, 8) });
-        }
         if (!name) {
             if (handler.name) {
                 name = handler.name;
@@ -2150,9 +2137,15 @@ function expressStreamHandler(handlerOrOptions, optionsOrHandler) {
                 name = kit.JAYPIE.UNKNOWN;
             }
         }
-        logger.tag({ handler: name });
-        libLogger.tag({ handler: name });
-        log.tag({ handler: name });
+        const setupTags = { handler: name };
+        if (invokeUuid) {
+            setupTags.invoke = invokeUuid;
+            setupTags.shortInvoke = invokeUuid.slice(0, 8);
+        }
+        logger.setup(setupTags);
+        // TODO: in theory this is redundant
+        libLogger.tag(setupTags);
+        log.tag(setupTags);
         libLogger.trace("[jaypie] Express stream init");
         // Set req.locals if it doesn't exist
         if (!extReq.locals)
@@ -2267,16 +2260,19 @@ function expressStreamHandler(handlerOrOptions, optionsOrHandler) {
             log.info.var({
                 res: { statusCode: res.statusCode, streaming: true },
             });
+            // Construct normalized path for reporting and metrics
+            let path = (req.baseUrl || "") + (req.url || "");
+            if (!path.startsWith("/")) {
+                path = "/" + path;
+            }
+            if (path.length > 1 && path.endsWith("/")) {
+                path = path.slice(0, -1);
+            }
+            path = path.replace(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/gi, ":id");
+            // Add request data to session report
+            logger.report({ path, status: String(res.statusCode) });
             // Submit metric if Datadog is configured
             if (datadog.hasDatadogEnv()) {
-                let path = (req.baseUrl || "") + (req.url || "");
-                if (!path.startsWith("/")) {
-                    path = "/" + path;
-                }
-                if (path.length > 1 && path.endsWith("/")) {
-                    path = path.slice(0, -1);
-                }
-                path = path.replace(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/gi, ":id");
                 let metricPrefix = "project";
                 if (process.env.PROJECT_SPONSOR) {
                     metricPrefix = process.env.PROJECT_SPONSOR;
@@ -2294,7 +2290,8 @@ function expressStreamHandler(handlerOrOptions, optionsOrHandler) {
                     },
                 });
             }
-            // Clean up the public logger
+            // End log session and clean up
+            logger.teardown();
             logger.untag("handler");
         }
     };