infront-logger 1.0.8 → 1.1.0

package/dist/index.es.js

@@ -63,7 +63,7 @@ function fileFormatter(options) {
   );
 }
 function consoleFormatter(options) {
-  return format$1.combine(
+  let formatters = [
     format$1.errors({ stack: true }),
     format$1.printf((info) => {
       if ((info == null ? void 0 : info.level) === "error" && info.stack) {
@@ -73,9 +73,12 @@ function consoleFormatter(options) {
       }
     }),
     // options.consoleJSON? format.json() : {transform : (info)=>info},
-    options.consoleJSON ? format$1.json() : format$1.splat(),
-    format$1.colorize({ all: true })
-  );
+    options.consoleJSON ? format$1.json() : format$1.splat()
+  ];
+  if (!options.consoleJSON) {
+    formatters.push(format$1.colorize({ all: true }));
+  }
+  return format$1.combine(...formatters);
 }
 function getFormatter(type, options) {
   switch (type) {
@@ -135,16 +138,16 @@ class Logger {
       levels: this.options.levels,
       exitOnError: false,
       // format,
-      transports: trans,
-      exceptionHandlers
+      transports: trans
+      // exceptionHandlers
     });
   }
 }
-const redact$1 = (data, ...sensitiveKeysList) => {
+const redact$2 = (data, ...sensitiveKeysList) => {
   var _a, _b;
   if (typeof data === "object" && data !== null && !((_b = (_a = data == null ? void 0 : data.constructor) == null ? void 0 : _a.name) == null ? void 0 : _b.startsWith("model"))) {
     if (Array.isArray(data)) {
-      return data.map((item) => redact$1(item, ...sensitiveKeysList));
+      return data.map((item) => redact$2(item, ...sensitiveKeysList));
     }
     const redactedData = {};
     for (const key in data) {
@@ -152,7 +155,7 @@ const redact$1 = (data, ...sensitiveKeysList) => {
         if (sensitiveKeysList.includes(key)) {
           redactedData[key] = "*****";
         } else {
-          redactedData[key] = redact$1(data[key], ...sensitiveKeysList);
+          redactedData[key] = redact$2(data[key], ...sensitiveKeysList);
         }
       }
     }
@@ -161,7 +164,7 @@ const redact$1 = (data, ...sensitiveKeysList) => {
     return data;
   }
 };
-const trim$1 = (data, length) => {
+const trim$2 = (data, length) => {
   try {
     let str = JSON.stringify(data);
     if (str.length > length) {
@@ -174,8 +177,8 @@ const trim$1 = (data, length) => {
 };
 const http = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  redact: redact$1,
-  trim: trim$1
+  redact: redact$2,
+  trim: trim$2
 }, Symbol.toStringTag, { value: "Module" }));
 function toFixedNumber(num, digits, base) {
   const pow = Math.pow(base ?? 10, digits);
@@ -184,7 +187,7 @@ function toFixedNumber(num, digits, base) {
 function bytesToMB$1(b) {
   return toFixedNumber(b / 1024 / 1024, 2, 10);
 }
-function formatBytes$1(bytes, decimals = 2) {
+function formatBytes$2(bytes, decimals = 2) {
   if (!+bytes)
     return "0 Bytes";
   const k = 1024;
@@ -196,13 +199,13 @@ function formatBytes$1(bytes, decimals = 2) {
 const format = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   bytesToMB: bytesToMB$1,
-  formatBytes: formatBytes$1,
+  formatBytes: formatBytes$2,
   toFixedNumber
 }, Symbol.toStringTag, { value: "Module" }));
 const pick = (obj, ...keys) => Object.fromEntries(
   keys.filter((key) => key in obj).map((key) => [key, obj[key]])
 );
-const omit$1 = (obj, ...keys) => {
+const omit$2 = (obj, ...keys) => {
   const result = { ...obj };
   keys.forEach(function(prop) {
     delete result[prop];
@@ -211,7 +214,7 @@ const omit$1 = (obj, ...keys) => {
 };
 const object = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  omit: omit$1,
+  omit: omit$2,
   pick
 }, Symbol.toStringTag, { value: "Module" }));
 const v8 = require("v8");
@@ -299,10 +302,10 @@ class BaseLogger {
     return this;
   }
 }
-const { redact, trim } = http;
-const { formatBytes } = format;
-const { omit } = object;
-const MAX_BODY_LENGTH = 128;
+const { redact: redact$1, trim: trim$1 } = http;
+const { formatBytes: formatBytes$1 } = format;
+const { omit: omit$1 } = object;
+const MAX_BODY_LENGTH$1 = 128;
 class HTTPLogger extends BaseLogger {
   constructor(startTime, options = {}) {
     super("http", options);
@@ -327,20 +330,20 @@ class HTTPLogger extends BaseLogger {
     let res = this.res;
     let body = this.data;
     this.ctx.request = {
-      headers: redact(req.headers, "cookie"),
+      headers: redact$1(req.headers, "cookie"),
       host: req.headers.host,
       baseUrl: req.baseUrl,
       url: req.originalUrl || req.url,
       method: req.method,
-      body: redact(req.body, "password"),
+      body: redact$1(req.body, "password"),
       params: req == null ? void 0 : req.params,
-      query: redact(req == null ? void 0 : req.query, "password"),
+      query: redact$1(req == null ? void 0 : req.query, "password"),
       clientIP: ((_a = req == null ? void 0 : req.headers["x-forwarded-for"]) == null ? void 0 : _a.split(",")[0]) ?? (req == null ? void 0 : req.socket.remoteAddress)
     };
     this.ctx.response = {
-      headers: omit(res.getHeaders(), "set-cookie", "x-powered-by"),
+      headers: omit$1(res.getHeaders(), "set-cookie", "x-powered-by"),
       statusCode: res.statusCode,
-      body: trim(body, MAX_BODY_LENGTH)
+      body: trim$1(body, MAX_BODY_LENGTH$1)
     };
     this.ctx.responseTimeMs = Date.now() - this.startTime;
     this.ctx.responseSizeBytes = this.data ? JSON.stringify(this.data).length : 0;
@@ -354,7 +357,7 @@ class HTTPLogger extends BaseLogger {
     let url = this.ctx.request.url;
     let statusCode = this.ctx.response.statusCode;
     let responseTimeMs = this.ctx.responseTimeMs + "ms";
-    let responseSize = formatBytes((_a = JSON.stringify(this.data)) == null ? void 0 : _a.length);
+    let responseSize = formatBytes$1((_a = JSON.stringify(this.data)) == null ? void 0 : _a.length);
     return `${method} ${url} ${statusCode} ${responseTimeMs} ${responseSize} ${ip} ${remoteAddress} ${msg || ""}`;
   }
   success(req, res, body) {
@@ -447,8 +450,128 @@ function plugin(options = {}) {
     });
   };
 }
+const { redact, trim } = http;
+const { formatBytes } = format;
+const { omit } = object;
+const MAX_BODY_LENGTH = 128;
+class FastifyLogger extends BaseLogger {
+  constructor(startTime, options = {}) {
+    super(options["component"] || "fastify-api", options);
+    this.startTime = startTime || Date.now();
+  }
+  getRequestSessionId(req) {
+    return req.id;
+  }
+  getResponseHeaders(res) {
+    return res.headers;
+  }
+  getRequestSocketRemoteAddress(req) {
+    var _a;
+    return (_a = req.socket) == null ? void 0 : _a.remoteAddress;
+  }
+  getRequestUserId(req) {
+    var _a;
+    return (_a = req["user"]) == null ? void 0 : _a.id;
+  }
+  getResponseStatusCode(res) {
+    return res.statusCode;
+  }
+  getRequestQuery(req) {
+    return { ...req.query };
+  }
+  getRequestParams(req) {
+    return req.params;
+  }
+  getRequestBody(req) {
+    return req.body;
+  }
+  getRequestMethod(req) {
+    return req.method;
+  }
+  getRequestUrl(req) {
+    return req.url;
+  }
+  getRequestOriginalUrl(req) {
+    return req.originalUrl;
+  }
+  getRequestBaseUrl(req) {
+    const url = new URL(req.url, "http://" + req.headers.host);
+    return url.origin;
+  }
+  getRequestHeaders(req) {
+    return req.headers;
+  }
+  request(req) {
+    this.session(this.getRequestSessionId(req));
+    this.req = req;
+    return this;
+  }
+  response(res) {
+    this.res = res;
+    return this;
+  }
+  body(data) {
+    this.data = data;
+    return this;
+  }
+  _prepare() {
+    var _a;
+    const req = this.req;
+    const res = this.res;
+    const body = this.data;
+    this.ctx.request = {
+      headers: redact(this.getRequestHeaders(req), "cookie"),
+      host: this.getRequestHeaders(req).host,
+      baseUrl: this.getRequestBaseUrl(req),
+      url: this.getRequestOriginalUrl(req) || this.getRequestUrl(req),
+      method: this.getRequestMethod(req),
+      body: redact(this.getRequestBody(req), "password"),
+      params: this.getRequestParams(req),
+      query: redact(this.getRequestQuery(req), "password"),
+      clientIP: ((_a = this.getRequestHeaders(req)["x-forwarded-for"]) == null ? void 0 : _a.split(",")[0]) ?? this.getRequestSocketRemoteAddress(req)
+    };
+    this.ctx.response = {
+      headers: omit(this.getResponseHeaders(res), "set-cookie", "x-powered-by"),
+      statusCode: this.getResponseStatusCode(res),
+      body: trim(body, MAX_BODY_LENGTH)
+    };
+    this.ctx.responseTimeMs = Date.now() - this.startTime;
+    this.ctx.responseSizeBytes = this.data ? JSON.stringify(this.data).length : 0;
+    this.ctx.user = this.getRequestUserId(req);
+  }
+  _message(msg) {
+    var _a;
+    const remoteAddress = this.getRemoteAddress(this.req);
+    const ip = this.ctx.request.clientIP;
+    const method = this.ctx.request.method;
+    const url = this.ctx.request.url;
+    const statusCode = this.ctx.response.statusCode;
+    const responseTimeMs = this.ctx.responseTimeMs + "ms";
+    const responseSize = formatBytes((_a = JSON.stringify(this.data)) == null ? void 0 : _a.length);
+    return `${method} ${url} ${statusCode} ${responseTimeMs} ${responseSize} ${ip} ${remoteAddress} ${msg || ""}`;
+  }
+  getRemoteAddress(req) {
+    var _a;
+    return ((_a = req == null ? void 0 : req.headers["x-forwarded-for"]) == null ? void 0 : _a.split(",")[0]) ?? (req == null ? void 0 : req.socket.remoteAddress);
+  }
+  success(req, res, body) {
+    if (req)
+      this.request(req);
+    if (res)
+      this.response(res);
+    if (body)
+      this.body(body);
+    this._prepare();
+    super.info(this._message());
+  }
+  error(err) {
+    this._prepare();
+    super.error(this._message(err));
+  }
+}
 export {
   BaseLogger,
+  FastifyLogger,
   HTTPLogger as HttpLogger,
   plugin as MongooseLoggerPlugin
 };

package/dist/index.umd.js

@@ -67,7 +67,7 @@
     );
   }
   function consoleFormatter(options) {
-    return format$1.combine(
+    let formatters = [
       format$1.errors({ stack: true }),
       format$1.printf((info) => {
         if ((info == null ? void 0 : info.level) === "error" && info.stack) {
@@ -77,9 +77,12 @@
         }
       }),
       // options.consoleJSON? format.json() : {transform : (info)=>info},
-      options.consoleJSON ? format$1.json() : format$1.splat(),
-      format$1.colorize({ all: true })
-    );
+      options.consoleJSON ? format$1.json() : format$1.splat()
+    ];
+    if (!options.consoleJSON) {
+      formatters.push(format$1.colorize({ all: true }));
+    }
+    return format$1.combine(...formatters);
   }
   function getFormatter(type, options) {
     switch (type) {
@@ -139,16 +142,16 @@
         levels: this.options.levels,
         exitOnError: false,
         // format,
-        transports: trans,
-        exceptionHandlers
+        transports: trans
+        // exceptionHandlers
       });
     }
   }
-  const redact$1 = (data, ...sensitiveKeysList) => {
+  const redact$2 = (data, ...sensitiveKeysList) => {
     var _a, _b;
     if (typeof data === "object" && data !== null && !((_b = (_a = data == null ? void 0 : data.constructor) == null ? void 0 : _a.name) == null ? void 0 : _b.startsWith("model"))) {
       if (Array.isArray(data)) {
-        return data.map((item) => redact$1(item, ...sensitiveKeysList));
+        return data.map((item) => redact$2(item, ...sensitiveKeysList));
       }
       const redactedData = {};
       for (const key in data) {
@@ -156,7 +159,7 @@
           if (sensitiveKeysList.includes(key)) {
             redactedData[key] = "*****";
           } else {
-            redactedData[key] = redact$1(data[key], ...sensitiveKeysList);
+            redactedData[key] = redact$2(data[key], ...sensitiveKeysList);
           }
         }
       }
@@ -165,7 +168,7 @@
       return data;
     }
   };
-  const trim$1 = (data, length) => {
+  const trim$2 = (data, length) => {
     try {
       let str = JSON.stringify(data);
       if (str.length > length) {
@@ -178,8 +181,8 @@
   };
   const http = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
-    redact: redact$1,
-    trim: trim$1
+    redact: redact$2,
+    trim: trim$2
   }, Symbol.toStringTag, { value: "Module" }));
   function toFixedNumber(num, digits, base) {
     const pow = Math.pow(base ?? 10, digits);
@@ -188,7 +191,7 @@
   function bytesToMB$1(b) {
     return toFixedNumber(b / 1024 / 1024, 2, 10);
   }
-  function formatBytes$1(bytes, decimals = 2) {
+  function formatBytes$2(bytes, decimals = 2) {
     if (!+bytes)
       return "0 Bytes";
     const k = 1024;
@@ -200,13 +203,13 @@
   const format = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
     bytesToMB: bytesToMB$1,
-    formatBytes: formatBytes$1,
+    formatBytes: formatBytes$2,
     toFixedNumber
   }, Symbol.toStringTag, { value: "Module" }));
   const pick = (obj, ...keys) => Object.fromEntries(
     keys.filter((key) => key in obj).map((key) => [key, obj[key]])
   );
-  const omit$1 = (obj, ...keys) => {
+  const omit$2 = (obj, ...keys) => {
     const result = { ...obj };
     keys.forEach(function(prop) {
       delete result[prop];
@@ -215,7 +218,7 @@
   };
   const object = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
-    omit: omit$1,
+    omit: omit$2,
     pick
   }, Symbol.toStringTag, { value: "Module" }));
   const v8 = require("v8");
@@ -303,10 +306,10 @@
       return this;
     }
   }
-  const { redact, trim } = http;
-  const { formatBytes } = format;
-  const { omit } = object;
-  const MAX_BODY_LENGTH = 128;
+  const { redact: redact$1, trim: trim$1 } = http;
+  const { formatBytes: formatBytes$1 } = format;
+  const { omit: omit$1 } = object;
+  const MAX_BODY_LENGTH$1 = 128;
   class HTTPLogger extends BaseLogger {
     constructor(startTime, options = {}) {
       super("http", options);
@@ -331,20 +334,20 @@
       let res = this.res;
       let body = this.data;
       this.ctx.request = {
-        headers: redact(req.headers, "cookie"),
+        headers: redact$1(req.headers, "cookie"),
         host: req.headers.host,
         baseUrl: req.baseUrl,
         url: req.originalUrl || req.url,
         method: req.method,
-        body: redact(req.body, "password"),
+        body: redact$1(req.body, "password"),
         params: req == null ? void 0 : req.params,
-        query: redact(req == null ? void 0 : req.query, "password"),
+        query: redact$1(req == null ? void 0 : req.query, "password"),
         clientIP: ((_a = req == null ? void 0 : req.headers["x-forwarded-for"]) == null ? void 0 : _a.split(",")[0]) ?? (req == null ? void 0 : req.socket.remoteAddress)
       };
       this.ctx.response = {
-        headers: omit(res.getHeaders(), "set-cookie", "x-powered-by"),
+        headers: omit$1(res.getHeaders(), "set-cookie", "x-powered-by"),
         statusCode: res.statusCode,
-        body: trim(body, MAX_BODY_LENGTH)
+        body: trim$1(body, MAX_BODY_LENGTH$1)
       };
       this.ctx.responseTimeMs = Date.now() - this.startTime;
       this.ctx.responseSizeBytes = this.data ? JSON.stringify(this.data).length : 0;
@@ -358,7 +361,7 @@
       let url = this.ctx.request.url;
       let statusCode = this.ctx.response.statusCode;
       let responseTimeMs = this.ctx.responseTimeMs + "ms";
-      let responseSize = formatBytes((_a = JSON.stringify(this.data)) == null ? void 0 : _a.length);
+      let responseSize = formatBytes$1((_a = JSON.stringify(this.data)) == null ? void 0 : _a.length);
       return `${method} ${url} ${statusCode} ${responseTimeMs} ${responseSize} ${ip} ${remoteAddress} ${msg || ""}`;
     }
     success(req, res, body) {
@@ -451,7 +454,127 @@
       });
     };
   }
+  const { redact, trim } = http;
+  const { formatBytes } = format;
+  const { omit } = object;
+  const MAX_BODY_LENGTH = 128;
+  class FastifyLogger extends BaseLogger {
+    constructor(startTime, options = {}) {
+      super(options["component"] || "fastify-api", options);
+      this.startTime = startTime || Date.now();
+    }
+    getRequestSessionId(req) {
+      return req.id;
+    }
+    getResponseHeaders(res) {
+      return res.headers;
+    }
+    getRequestSocketRemoteAddress(req) {
+      var _a;
+      return (_a = req.socket) == null ? void 0 : _a.remoteAddress;
+    }
+    getRequestUserId(req) {
+      var _a;
+      return (_a = req["user"]) == null ? void 0 : _a.id;
+    }
+    getResponseStatusCode(res) {
+      return res.statusCode;
+    }
+    getRequestQuery(req) {
+      return { ...req.query };
+    }
+    getRequestParams(req) {
+      return req.params;
+    }
+    getRequestBody(req) {
+      return req.body;
+    }
+    getRequestMethod(req) {
+      return req.method;
+    }
+    getRequestUrl(req) {
+      return req.url;
+    }
+    getRequestOriginalUrl(req) {
+      return req.originalUrl;
+    }
+    getRequestBaseUrl(req) {
+      const url = new URL(req.url, "http://" + req.headers.host);
+      return url.origin;
+    }
+    getRequestHeaders(req) {
+      return req.headers;
+    }
+    request(req) {
+      this.session(this.getRequestSessionId(req));
+      this.req = req;
+      return this;
+    }
+    response(res) {
+      this.res = res;
+      return this;
+    }
+    body(data) {
+      this.data = data;
+      return this;
+    }
+    _prepare() {
+      var _a;
+      const req = this.req;
+      const res = this.res;
+      const body = this.data;
+      this.ctx.request = {
+        headers: redact(this.getRequestHeaders(req), "cookie"),
+        host: this.getRequestHeaders(req).host,
+        baseUrl: this.getRequestBaseUrl(req),
+        url: this.getRequestOriginalUrl(req) || this.getRequestUrl(req),
+        method: this.getRequestMethod(req),
+        body: redact(this.getRequestBody(req), "password"),
+        params: this.getRequestParams(req),
+        query: redact(this.getRequestQuery(req), "password"),
+        clientIP: ((_a = this.getRequestHeaders(req)["x-forwarded-for"]) == null ? void 0 : _a.split(",")[0]) ?? this.getRequestSocketRemoteAddress(req)
+      };
+      this.ctx.response = {
+        headers: omit(this.getResponseHeaders(res), "set-cookie", "x-powered-by"),
+        statusCode: this.getResponseStatusCode(res),
+        body: trim(body, MAX_BODY_LENGTH)
+      };
+      this.ctx.responseTimeMs = Date.now() - this.startTime;
+      this.ctx.responseSizeBytes = this.data ? JSON.stringify(this.data).length : 0;
+      this.ctx.user = this.getRequestUserId(req);
+    }
+    _message(msg) {
+      var _a;
+      const remoteAddress = this.getRemoteAddress(this.req);
+      const ip = this.ctx.request.clientIP;
+      const method = this.ctx.request.method;
+      const url = this.ctx.request.url;
+      const statusCode = this.ctx.response.statusCode;
+      const responseTimeMs = this.ctx.responseTimeMs + "ms";
+      const responseSize = formatBytes((_a = JSON.stringify(this.data)) == null ? void 0 : _a.length);
+      return `${method} ${url} ${statusCode} ${responseTimeMs} ${responseSize} ${ip} ${remoteAddress} ${msg || ""}`;
+    }
+    getRemoteAddress(req) {
+      var _a;
+      return ((_a = req == null ? void 0 : req.headers["x-forwarded-for"]) == null ? void 0 : _a.split(",")[0]) ?? (req == null ? void 0 : req.socket.remoteAddress);
+    }
+    success(req, res, body) {
+      if (req)
+        this.request(req);
+      if (res)
+        this.response(res);
+      if (body)
+        this.body(body);
+      this._prepare();
+      super.info(this._message());
+    }
+    error(err) {
+      this._prepare();
+      super.error(this._message(err));
+    }
+  }
   exports2.BaseLogger = BaseLogger;
+  exports2.FastifyLogger = FastifyLogger;
   exports2.HttpLogger = HTTPLogger;
   exports2.MongooseLoggerPlugin = plugin;
   Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });

package/dist/main.d.ts

@@ -20,13 +20,27 @@ export class BaseLogger {
 export class HTTPLogger extends BaseLogger {
     constructor(startTime: number, options?: any);
 
-    request(req: HttpRequest): this;
+    request(req: object): this;
 
-    response(res: HttpResponse): this;
+    response(res: object): this;
 
     body(data: any): this;
 
-    success(req: HttpRequest, res: HttpResponse, body?: any): void;
+    success(req: object, res: object, body?: any): void;
+
+    error(err: any): void;
+}
+
+export class FastifyLogger extends BaseLogger {
+    constructor(startTime: number, options?: any);
+
+    request(req: object): this;
+
+    response(res: object): this;
+
+    body(data: any): this;
+
+    success(req?: object, res?: object, body?: any): void;
 
     error(err: any): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "infront-logger",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "description": "",
   "files": [
     "dist"
@@ -32,6 +32,7 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "dev": "vite",
     "build": "vite build",
+    "build:watch": "vite build --watch",
     "preview": "vite preview"
   }
 }