micronodelib 1.0.2 → 1.0.5

package/README.md

@@ -26,7 +26,7 @@ import {Logger, httpContextMiddleware, requestLogMiddleware} from "micronodelib"
 const app: Application = express();
 
 # Enable request context
-app.use(httpContextMiddleware);
+app.use(httpContextMiddleware());
 
 # Enable http request log
 app.use(requestLogMiddleware({

package/dist/context/http-context.d.ts

@@ -1,2 +1,2 @@
 import { NextFunction, Request, Response } from "express";
-export declare const httpContextMiddleware: ((req: Request, res: Response, next: NextFunction) => void)[];
+export declare const httpContextMiddleware: () => ((req: Request, res: Response, next: NextFunction) => void)[];

package/dist/context/http-context.js

@@ -12,7 +12,10 @@ const requestIdMiddleware = (req, res, next) => {
     (0, express_http_context_1.set)("reqId", requestId);
     next();
 };
-exports.httpContextMiddleware = [
-    express_http_context_1.middleware,
-    requestIdMiddleware,
-];
+const httpContextMiddleware = function () {
+    return [
+        express_http_context_1.middleware,
+        requestIdMiddleware,
+    ];
+};
+exports.httpContextMiddleware = httpContextMiddleware;

package/dist/logging/logger.js

@@ -35,16 +35,18 @@ const util = __importStar(require("util"));
 // and used to log messages.
 const winstonLogger = winston_1.default.createLogger({
     format: (0, configuration_1.formatter)(info => {
-        return {
-            level: info.level.toUpperCase(),
-            msg: info.message,
-            message: null,
-            ts: Date.parse(info.timestamp) / 1000,
-            request_meta: {
-                request_id: (0, express_http_context_1.get)('reqId'),
-            },
-            stacktrace: info.stack
+        info.level = info.level.toUpperCase();
+        info.msg = info.message;
+        info.ts = Date.parse(info.timestamp) / 1000;
+        info.request_meta = {
+            request_id: (0, express_http_context_1.get)('reqId')
         };
+        info.stacktrace = info.stack;
+        // @ts-ignore
+        delete info.message;
+        delete info.timestamp;
+        delete info.stack;
+        return info;
     }),
     transports: configuration_1.transports,
 });

package/dist/logging/middleware.js

@@ -13,25 +13,28 @@ const requestLogMiddleware = function (opt) {
         msg: 'finish router',
         format: (0, configuration_1.formatter)(info => {
             const req = info.meta.req;
-            return {
-                level: info.level.toUpperCase(),
-                msg: info.message,
-                message: null,
-                ts: Date.parse(info.timestamp) / 1000,
-                request_meta: {
-                    status: info.meta.res.statusCode,
-                    execution_time: info.meta.responseTime,
-                    request_pattern: url_1.default.parse(req.url).pathname,
-                    request_path: url_1.default.parse(req.url).pathname,
-                    request_method: req.method,
-                    query: new URLSearchParams(req.query).toString(),
-                    url: req.url,
-                    device_id: req.headers['device-id'],
-                    request_id: req.headers['x-request-id'],
-                    client_ip: req.headers['x-forwarded-for'] || (req.connection ? req.connection.remoteAddress : null),
-                    user_agent: req.headers['user-agent']
-                }
+            info.level = info.level.toUpperCase();
+            info.msg = info.message;
+            info.ts = Date.parse(info.timestamp) / 1000;
+            info.request_meta = {
+                status: info.meta.res.statusCode,
+                execution_time: info.meta.responseTime,
+                request_pattern: url_1.default.parse(req.url).pathname,
+                request_path: url_1.default.parse(req.url).pathname,
+                request_method: req.method,
+                query: new URLSearchParams(req.query).toString(),
+                url: req.url,
+                device_id: req.headers['device-id'],
+                device_session_id: req.headers['device-session-id'],
+                request_id: req.headers['x-request-id'],
+                client_ip: req.headers['x-forwarded-for'] || (req.connection ? req.connection.remoteAddress : null),
+                user_agent: req.headers['user-agent']
             };
+            // @ts-ignore
+            delete info.message;
+            delete info.timestamp;
+            delete info.meta;
+            return info;
         }),
         transports: configuration_1.transports,
         ignoreRoute: function (req, res) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "micronodelib",
-  "version": "1.0.2",
+  "version": "1.0.5",
   "description": "Common core for NodeJs project",
   "author": "Thang Bui",
   "license": "MIT",