@jaypie/express 1.0.10 → 1.0.12

package/dist/module.cjs

@@ -192,18 +192,21 @@ const expressHandler = (
 
     // Re-init the logger
     core.log.init();
+    // Very low-level, internal sub-trace details
+    const libLogger = core.log.lib({
+      lib: core.JAYPIE.LIB.EXPRESS,
+    });
 
     // Update the public logger with the request ID
     const invokeUuid = getCurrentInvokeUuid();
     if (invokeUuid) {
       core.log.tag({ invoke: invokeUuid });
       core.log.tag({ shortInvoke: invokeUuid.slice(0, 8) });
+      // TODO: in theory this is redundant
+      libLogger.tag({ invoke: invokeUuid });
+      libLogger.tag({ shortInvoke: invokeUuid.slice(0, 8) });
     }
 
-    // Very low-level, internal sub-trace details
-    const libLogger = core.log.lib({
-      lib: core.JAYPIE.LIB.EXPRESS,
-    });
     libLogger.trace("[jaypie] Express init");
 
     // Top-level, important details that run at the same level as the main logger
@@ -268,15 +271,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

@@ -190,18 +190,21 @@ const expressHandler = (
 
     // Re-init the logger
     log.init();
+    // Very low-level, internal sub-trace details
+    const libLogger = log.lib({
+      lib: JAYPIE.LIB.EXPRESS,
+    });
 
     // Update the public logger with the request ID
     const invokeUuid = getCurrentInvokeUuid();
     if (invokeUuid) {
       log.tag({ invoke: invokeUuid });
       log.tag({ shortInvoke: invokeUuid.slice(0, 8) });
+      // TODO: in theory this is redundant
+      libLogger.tag({ invoke: invokeUuid });
+      libLogger.tag({ shortInvoke: invokeUuid.slice(0, 8) });
     }
 
-    // Very low-level, internal sub-trace details
-    const libLogger = log.lib({
-      lib: JAYPIE.LIB.EXPRESS,
-    });
     libLogger.trace("[jaypie] Express init");
 
     // Top-level, important details that run at the same level as the main logger
@@ -266,15 +269,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.10",
+  "version": "1.0.12",
   "author": "Finlayson Studio",
   "type": "module",
   "exports": {

package/src/expressHandler.js

@@ -43,18 +43,21 @@ const expressHandler = (
 
     // Re-init the logger
     publicLogger.init();
+    // Very low-level, internal sub-trace details
+    const libLogger = publicLogger.lib({
+      lib: JAYPIE.LIB.EXPRESS,
+    });
 
     // Update the public logger with the request ID
     const invokeUuid = getCurrentInvokeUuid();
     if (invokeUuid) {
       publicLogger.tag({ invoke: invokeUuid });
       publicLogger.tag({ shortInvoke: invokeUuid.slice(0, 8) });
+      // TODO: in theory this is redundant
+      libLogger.tag({ invoke: invokeUuid });
+      libLogger.tag({ shortInvoke: invokeUuid.slice(0, 8) });
     }
 
-    // Very low-level, internal sub-trace details
-    const libLogger = publicLogger.lib({
-      lib: JAYPIE.LIB.EXPRESS,
-    });
     libLogger.trace("[jaypie] Express init");
 
     // Top-level, important details that run at the same level as the main logger
@@ -119,15 +122,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];
             }
           }
         };