zeddemore-logger 1.0.4 → 1.0.6

package/lib/zeddemore-logger.js

@@ -4,6 +4,7 @@ const _ = require('lodash');
 const chalk = require('chalk');
 const { createLogger: createWinstonLogger, format, transports } = require('winston');
 const morgan = require('morgan');
+const sizeof = require('object-sizeof');
 const { v4: uuid } = require('uuid');
 
 const { areHeadersSent, getRequestResponseTime, parseRequest } = require('./http');
@@ -216,22 +217,25 @@ class ZeddemoreLogger {
 
     requestLoggerMiddleware = (req, res, next) => {
         const requestValues = parseRequest(req);
-        const requestId = uuid();//this.#generateUuid();
+        const requestId = this.#generateUuid();
         req[ this.requestIdAttribute ] = requestId;
         res.header(rqh.REQUEST_ID, requestId);
         const ipAddress = requestValues.ipAddress;
+        res.locals = res.locals || { };
         res.locals.user = res.locals.user || { };
         res.locals.user.logger = this.createRequestLogger(requestId, ipAddress);
         return next();
     }
 
     #userGetFn(req, res) {
-        return (res.locals ? res.locals.user : null) || (req.locals ? req.locals.user : null) || req.user || null;
+        return ((res && res.locals) ? res.locals.user : null)
+            || ((req && req.locals) ? req.locals.user : null)
+            || (req ? req.user : null);
     }
 
     userLoggerMiddleware = (req, res, next) => {
         const requestId = this.#getRequestId(req);
-        const user = res.locals.user || { };
+        const user = this.userGetFn(req, res) || { };
         if (!requestId) return next();
         const username = user.login || null;
         let ipAddress = user.ipAddress || null;
@@ -242,6 +246,7 @@ class ZeddemoreLogger {
         let userLogLevel = !_.isNil(user.logLevel) ? user.logLevel : this.defaultUserLogLevel;
         if (userLogLevel < 0) userLogLevel = this.logLevel;
         const level = this.forceLogLevel ? this.logLevel : userLogLevel;
+        res.locals = res.locals || { };
         res.locals.user = res.locals.user || user;
         res.locals.user.logger = this.createUserLogger(requestId, username, level, ipAddress);
         return next();
@@ -251,21 +256,25 @@ class ZeddemoreLogger {
         logOptions = logOptions || { };
         options = options || { };
         if (!axiosError || !axiosError.response) return;
-        const response = axiosError.response;
-        if (!response.request) return;
-        const request = response.request;
+        const _response = axiosError.response;
+        if (!_response.request) return;
+        const _request = _response.request;
         const logger = options.logger || ZeddemoreLogger.log(options);
         if (!logger) return;
-        const _method = request.method || null;
+        const _method = _request.method || null;
         const method = _method ? chalkHttpVerb(_method) : null;
-        const path = response.config.url || '';
+        const _config = _response.config || null;
+        const _headers = _response.headers || null;
+        const _data = _response.data || null;
+        const path = _config ? _config.url : '';
         const prefix = logOptions.prefix ? `[${ logOptions.prefix }]` : null;
-        const status = chalkHttpStatus(response.status);
-        const _duration = axiosError.duration || response.duration;
+        const status = chalkHttpStatus(_response.status);
+        const _duration = axiosError.duration || _response.duration;
         const duration = _duration ? convertMilliseconds(_duration) : '-';
-        const _contentLength = response.headers ? response.headers[ rsh.CONTENT_LENGTH ] : null;
+        let _contentLength = _headers ? _headers[ rsh.CONTENT_LENGTH ] : null;
+        if (!_contentLength) _contentLength = _data ? sizeof(_data) : null;
         const contentLength = _contentLength ? `- ${ convertBytes(_contentLength) }` : null;
-        const data = response.data ? JSON.stringify(response.data) : null;
+        const data = _data ? JSON.stringify(_data) : null;
         const parts = [ prefix, method, path, status, duration, contentLength, data ];
         const message = _.compact(parts).join(' ');
         logger.error(message);
@@ -275,21 +284,24 @@ class ZeddemoreLogger {
         logOptions = logOptions || { };
         options = options || { };
         if (!axiosResponse || !axiosResponse.request) return;
-        const request = axiosResponse.request;
+        const _request = axiosResponse.request;
         const axiosConfig = logOptions.axios || { };
-        const configData = logOptions.data ? JSON.stringify(axiosConfig.data) : null;
+        const configData = (logOptions.data && _.isObject(axiosConfig.data)) ? JSON.stringify(axiosConfig.data) : null;
         const logLevel = massageLogLevel(logOptions.logLevel);
         const logger = options.logger || ZeddemoreLogger.log(options);
         if (!logger) return;
-        const _method = request.method || null;
+        const _method = _request.method || null;
         const method = _method ? chalkHttpVerb(_method) : null;
-        const path = request.path || '';
+        const _headers = axiosResponse.headers || null;
+        const _data = axiosResponse.data || null;
+        const path = _request.path || '';
         const prefix = logOptions.prefix ? `[${ logOptions.prefix }]` : null;
-        const responseData = logOptions.response ? JSON.stringify(axiosResponse.data) : null;
+        const responseData = (logOptions.response && _.isObject(_data)) ? JSON.stringify(_data) : null;
         const status = chalkHttpStatus(axiosResponse.status);
         const _duration = axiosResponse.duration;
         const duration = _duration ? convertMilliseconds(_duration) : '-';
-        const _contentLength = axiosResponse.headers ? axiosResponse.headers[ rsh.CONTENT_LENGTH ] : null;
+        let _contentLength = _headers ? _headers[ rsh.CONTENT_LENGTH ] : null;
+        if (!_contentLength) _contentLength = _data ? sizeof(_data) : null;
         const contentLength = _contentLength ? `- ${ convertBytes(_contentLength) }` : null;
         const parts = [ prefix, method, path, configData, status, responseData, duration, contentLength ];
         const message = _.compact(parts).join(' ');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zeddemore-logger",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Node.js Express logger using Morgan and Winston for thread and caller info tracking",
   "repository": {
     "type": "git",
@@ -23,6 +23,7 @@
     "chalk": "^4.1.2",
     "lodash": "^4.17.21",
     "morgan": "^1.10.0",
+    "object-sizeof": "^2.6.5",
     "uuid": "^10.0.0",
     "winston": "^3.17.0"
   }