@jaypie/express 1.0.11 → 1.0.13

package/dist/module.cjs

@@ -196,6 +196,11 @@ const expressHandler = (
     const libLogger = core.log.lib({
       lib: core.JAYPIE.LIB.EXPRESS,
     });
+    // Top-level, important details that run at the same level as the main logger
+    const log = core.log.lib({
+      level: core.log.level,
+      lib: core.JAYPIE.LIB.EXPRESS,
+    });
 
     // Update the public logger with the request ID
     const invokeUuid = getCurrentInvokeUuid();
@@ -205,15 +210,24 @@ const expressHandler = (
       // 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) });
     }
 
-    libLogger.trace("[jaypie] Express init");
+    if (!name) {
+      // If handler has a name, use it
+      if (handler.name) {
+        name = handler.name;
+      } else {
+        name = core.JAYPIE.UNKNOWN;
+      }
+    }
+    core.log.tag({ handler: name });
+    // TODO: in theory this is redundant
+    libLogger.tag({ handler: name });
+    log.tag({ handler: name });
 
-    // Top-level, important details that run at the same level as the main logger
-    const log = core.log.lib({
-      level: core.log.level,
-      lib: core.JAYPIE.LIB.EXPRESS,
-    });
+    libLogger.trace("[jaypie] Express init");
 
     // Set req.locals if it doesn't exist
     if (!req.locals) req.locals = {};
@@ -271,15 +285,15 @@ const expressHandler = (
       // Locals
       const keys = Object.keys(locals);
       if (keys.length > 0) {
-        const localsSetup = async () => {
+        const localsSetup = async (localsReq, localsRes) => {
           for (let i = 0; i < keys.length; i += 1) {
             const key = keys[i];
             libLogger.trace(`[jaypie] Locals: ${key}`);
             if (typeof locals[key] === "function") {
               // eslint-disable-next-line no-await-in-loop
-              req.locals[key] = await locals[key](req, res);
+              localsReq.locals[key] = await locals[key](localsReq, localsRes);
             } else {
-              req.locals[key] = locals[key];
+              localsReq.locals[key] = locals[key];
             }
           }
         };

package/dist/module.esm.js

@@ -194,6 +194,11 @@ const expressHandler = (
     const libLogger = log.lib({
       lib: JAYPIE.LIB.EXPRESS,
     });
+    // Top-level, important details that run at the same level as the main logger
+    const log$1 = log.lib({
+      level: log.level,
+      lib: JAYPIE.LIB.EXPRESS,
+    });
 
     // Update the public logger with the request ID
     const invokeUuid = getCurrentInvokeUuid();
@@ -203,15 +208,24 @@ const expressHandler = (
       // TODO: in theory this is redundant
       libLogger.tag({ invoke: invokeUuid });
       libLogger.tag({ shortInvoke: invokeUuid.slice(0, 8) });
+      log$1.tag({ invoke: invokeUuid });
+      log$1.tag({ shortInvoke: invokeUuid.slice(0, 8) });
     }
 
-    libLogger.trace("[jaypie] Express init");
+    if (!name) {
+      // If handler has a name, use it
+      if (handler.name) {
+        name = handler.name;
+      } else {
+        name = JAYPIE.UNKNOWN;
+      }
+    }
+    log.tag({ handler: name });
+    // TODO: in theory this is redundant
+    libLogger.tag({ handler: name });
+    log$1.tag({ handler: name });
 
-    // Top-level, important details that run at the same level as the main logger
-    const log$1 = log.lib({
-      level: log.level,
-      lib: JAYPIE.LIB.EXPRESS,
-    });
+    libLogger.trace("[jaypie] Express init");
 
     // Set req.locals if it doesn't exist
     if (!req.locals) req.locals = {};
@@ -269,15 +283,15 @@ const expressHandler = (
       // Locals
       const keys = Object.keys(locals);
       if (keys.length > 0) {
-        const localsSetup = async () => {
+        const localsSetup = async (localsReq, localsRes) => {
           for (let i = 0; i < keys.length; i += 1) {
             const key = keys[i];
             libLogger.trace(`[jaypie] Locals: ${key}`);
             if (typeof locals[key] === "function") {
               // eslint-disable-next-line no-await-in-loop
-              req.locals[key] = await locals[key](req, res);
+              localsReq.locals[key] = await locals[key](localsReq, localsRes);
             } else {
-              req.locals[key] = locals[key];
+              localsReq.locals[key] = locals[key];
             }
           }
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jaypie/express",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "author": "Finlayson Studio",
   "type": "module",
   "exports": {
@@ -45,7 +45,7 @@
     "@jaypie/core": "^1.0.41"
   },
   "devDependencies": {
-    "@jaypie/testkit": "^1.0.19",
+    "@jaypie/testkit": "^1.0.20",
     "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "eslint": "^8.57.0",

package/src/expressHandler.js

@@ -47,6 +47,11 @@ const expressHandler = (
     const libLogger = publicLogger.lib({
       lib: JAYPIE.LIB.EXPRESS,
     });
+    // Top-level, important details that run at the same level as the main logger
+    const log = publicLogger.lib({
+      level: publicLogger.level,
+      lib: JAYPIE.LIB.EXPRESS,
+    });
 
     // Update the public logger with the request ID
     const invokeUuid = getCurrentInvokeUuid();
@@ -56,15 +61,24 @@ const expressHandler = (
       // 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) });
     }
 
-    libLogger.trace("[jaypie] Express init");
+    if (!name) {
+      // If handler has a name, use it
+      if (handler.name) {
+        name = handler.name;
+      } else {
+        name = JAYPIE.UNKNOWN;
+      }
+    }
+    publicLogger.tag({ handler: name });
+    // TODO: in theory this is redundant
+    libLogger.tag({ handler: name });
+    log.tag({ handler: name });
 
-    // Top-level, important details that run at the same level as the main logger
-    const log = publicLogger.lib({
-      level: publicLogger.level,
-      lib: JAYPIE.LIB.EXPRESS,
-    });
+    libLogger.trace("[jaypie] Express init");
 
     // Set req.locals if it doesn't exist
     if (!req.locals) req.locals = {};
@@ -122,15 +136,15 @@ const expressHandler = (
       // Locals
       const keys = Object.keys(locals);
       if (keys.length > 0) {
-        const localsSetup = async () => {
+        const localsSetup = async (localsReq, localsRes) => {
           for (let i = 0; i < keys.length; i += 1) {
             const key = keys[i];
             libLogger.trace(`[jaypie] Locals: ${key}`);
             if (typeof locals[key] === "function") {
               // eslint-disable-next-line no-await-in-loop
-              req.locals[key] = await locals[key](req, res);
+              localsReq.locals[key] = await locals[key](localsReq, localsRes);
             } else {
-              req.locals[key] = locals[key];
+              localsReq.locals[key] = locals[key];
             }
           }
         };