@voiceflow/logger 2.2.0 → 2.3.0

package/build/http.logger.d.ts

@@ -1,5 +1,7 @@
+/// <reference types="node" />
 /// <reference types="node/http" />
+import type { IncomingMessage } from 'node:http';
 import { Options } from 'pino-http';
 import { LoggerOptions } from './logger-options.interface';
 export declare const createHTTPConfig: ({ format, level }: LoggerOptions) => Options;
-export declare const createHTTPLogger: (options: LoggerOptions) => import("pino-http").HttpLogger<import("http").IncomingMessage, import("http").ServerResponse, never>;
+export declare const createHTTPLogger: (options: LoggerOptions) => import("pino-http").HttpLogger<IncomingMessage, import("http").ServerResponse, never>;

package/build/http.logger.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createHTTPLogger = exports.createHTTPConfig = void 0;
-/* eslint-disable sonarjs/no-nested-template-literals */
 const colorette_1 = require("colorette");
 const pino_http_1 = __importDefault(require("pino-http"));
 const ts_pattern_1 = require("ts-pattern");
@@ -21,9 +20,12 @@ const createHTTPConfig = ({ format, level }) => (Object.assign({ customLogLevel:
             return log_level_enum_1.LogLevel.ERROR;
         return log_level_enum_1.LogLevel.INFO;
     }, wrapSerializers: true }, (0, ts_pattern_1.match)(format)
-    .with(log_format_enum_1.LogFormat.INLINE, () => (Object.assign({ customSuccessMessage: (req, res) => `${(0, utils_1.getColorizer)(res)(`(${res.statusCode})`)} ${(0, colorette_1.white)(`${req.method} ${req.url}`)} ${(0, colorette_1.gray)(`(${req.socket.remoteAddress}:${req.socket.remotePort})`)}`, customErrorMessage: (req, res) => {
+    .with(log_format_enum_1.LogFormat.INLINE, () => (Object.assign({ customSuccessMessage: (req, res) => {
         var _a;
-        return `${(0, utils_1.getColorizer)(res)(`(${res.statusCode})`)} ${(0, colorette_1.white)(`${req.method} ${req.url} -`)} ${(0, colorette_1.gray)(`(${req.socket.remoteAddress}:${req.socket.remotePort})`)} ${(_a = res.err) === null || _a === void 0 ? void 0 : _a.message}`;
+        return `${(0, utils_1.getColorizer)(res)(`(${res.statusCode})`)} ${(0, colorette_1.white)(`${req.method} ${(_a = req.originalUrl) !== null && _a !== void 0 ? _a : req.url}`)} ${(0, colorette_1.gray)(`(${req.socket.remoteAddress}:${req.socket.remotePort})`)}`;
+    }, customErrorMessage: (req, res) => {
+        var _a, _b;
+        return `${(0, utils_1.getColorizer)(res)(`(${res.statusCode})`)} ${(0, colorette_1.white)(`${req.method} ${(_a = req.originalUrl) !== null && _a !== void 0 ? _a : req.url}`)} ${(0, colorette_1.gray)(`(${req.socket.remoteAddress}:${req.socket.remotePort})`)} - ${(_b = res.err) === null || _b === void 0 ? void 0 : _b.message}`;
     } }, (0, inline_logger_1.createInlineConfig)(level))))
     .with(log_format_enum_1.LogFormat.DETAILED, () => (0, detailed_logger_1.createDetailedConfig)(level))
     .otherwise(() => (0, json_logger_1.createJSONConfig)(level))));

package/build/http.logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"http.logger.js","sourceRoot":"","sources":["../src/http.logger.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAwD;AACxD,yCAAwC;AACxC,0DAA8C;AAC9C,2CAAmC;AAEnC,uDAAyD;AACzD,mDAAqD;AACrD,+CAAiD;AACjD,uDAA8C;AAC9C,qDAA4C;AAE5C,mCAAwE;AAEjE,MAAM,gBAAgB,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,EAAiB,EAAW,EAAE,CAAC,iBAC7E,cAAc,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QAC5B,IAAI,IAAA,sBAAc,EAAC,GAAG,CAAC;YAAE,OAAO,yBAAQ,CAAC,IAAI,CAAC;QAC9C,IAAI,IAAA,uBAAe,EAAC,GAAG,CAAC;YAAE,OAAO,yBAAQ,CAAC,KAAK,CAAC;QAChD,OAAO,yBAAQ,CAAC,IAAI,CAAC;IACvB,CAAC,EACD,eAAe,EAAE,IAAI,IAElB,IAAA,kBAAK,EAAqB,MAAM,CAAC;KACjC,IAAI,CAAC,2BAAS,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,iBAC5B,oBAAoB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CACjC,GAAG,IAAA,oBAAY,EAAC,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,UAAU,GAAG,CAAC,IAAI,IAAA,iBAAK,EAAC,GAAG,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,IAAA,gBAAI,EACtF,IAAI,GAAG,CAAC,MAAM,CAAC,aAAa,IAAI,GAAG,CAAC,MAAM,CAAC,UAAU,GAAG,CACzD,EAAE,EACL,kBAAkB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;;QAC/B,OAAA,GAAG,IAAA,oBAAY,EAAC,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,UAAU,GAAG,CAAC,IAAI,IAAA,iBAAK,EAAC,GAAG,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,IAAA,gBAAI,EACxF,IAAI,GAAG,CAAC,MAAM,CAAC,aAAa,IAAI,GAAG,CAAC,MAAM,CAAC,UAAU,GAAG,CACzD,IAAI,MAAA,GAAG,CAAC,GAAG,0CAAE,OAAO,EAAE,CAAA;KAAA,IACtB,IAAA,kCAAkB,EAAC,KAAK,CAAC,EAC5B,CAAC;KACF,IAAI,CAAC,2BAAS,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAA,sCAAoB,EAAC,KAAK,CAAC,CAAC;KAC3D,SAAS,CAAC,GAAG,EAAE,CAAC,IAAA,8BAAgB,EAAC,KAAK,CAAC,CAAC,EAC3C,CAAC;AAtBU,QAAA,gBAAgB,oBAsB1B;AAEI,MAAM,gBAAgB,GAAG,CAAC,OAAsB,EAAE,EAAE,CAAC,IAAA,mBAAQ,EAAC,IAAA,wBAAgB,EAAC,OAAO,CAAC,CAAC,CAAC;AAAnF,QAAA,gBAAgB,oBAAmE"}
+{"version":3,"file":"http.logger.js","sourceRoot":"","sources":["../src/http.logger.ts"],"names":[],"mappings":";;;;;;AAGA,yCAAwC;AACxC,0DAA8C;AAC9C,2CAAmC;AAEnC,uDAAyD;AACzD,mDAAqD;AACrD,+CAAiD;AACjD,uDAA8C;AAC9C,qDAA4C;AAE5C,mCAAwE;AAEjE,MAAM,gBAAgB,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,EAAiB,EAAW,EAAE,CAAC,iBAC7E,cAAc,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QAC5B,IAAI,IAAA,sBAAc,EAAC,GAAG,CAAC;YAAE,OAAO,yBAAQ,CAAC,IAAI,CAAC;QAC9C,IAAI,IAAA,uBAAe,EAAC,GAAG,CAAC;YAAE,OAAO,yBAAQ,CAAC,KAAK,CAAC;QAChD,OAAO,yBAAQ,CAAC,IAAI,CAAC;IACvB,CAAC,EACD,eAAe,EAAE,IAAI,IAElB,IAAA,kBAAK,EAAiE,MAAM,CAAC;KAC7E,IAAI,CAAC,2BAAS,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,iBAC5B,oBAAoB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;;QACjC,OAAA,GAAG,IAAA,oBAAY,EAAC,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,UAAU,GAAG,CAAC,IAAI,IAAA,iBAAK,EAAC,GAAG,GAAG,CAAC,MAAM,IAAI,MAAA,GAAG,CAAC,WAAW,mCAAI,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,IAAA,gBAAI,EACzG,IAAI,GAAG,CAAC,MAAM,CAAC,aAAa,IAAI,GAAG,CAAC,MAAM,CAAC,UAAU,GAAG,CACzD,EAAE,CAAA;KAAA,EACL,kBAAkB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;;QAC/B,OAAA,GAAG,IAAA,oBAAY,EAAC,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,UAAU,GAAG,CAAC,IAAI,IAAA,iBAAK,EAAC,GAAG,GAAG,CAAC,MAAM,IAAI,MAAA,GAAG,CAAC,WAAW,mCAAI,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,IAAA,gBAAI,EACzG,IAAI,GAAG,CAAC,MAAM,CAAC,aAAa,IAAI,GAAG,CAAC,MAAM,CAAC,UAAU,GAAG,CACzD,MAAM,MAAA,GAAG,CAAC,GAAG,0CAAE,OAAO,EAAE,CAAA;KAAA,IACxB,IAAA,kCAAkB,EAAC,KAAK,CAAC,EAC5B,CAAC;KACF,IAAI,CAAC,2BAAS,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAA,sCAAoB,EAAC,KAAK,CAAC,CAAC;KAC3D,SAAS,CAAC,GAAG,EAAE,CAAC,IAAA,8BAAgB,EAAC,KAAK,CAAC,CAAC,EAC3C,CAAC;AAtBU,QAAA,gBAAgB,oBAsB1B;AAEI,MAAM,gBAAgB,GAAG,CAAC,OAAsB,EAAE,EAAE,CAAC,IAAA,mBAAQ,EAAC,IAAA,wBAAgB,EAAC,OAAO,CAAC,CAAC,CAAC;AAAnF,QAAA,gBAAgB,oBAAmE"}

package/build/serializers/maximal.d.ts

@@ -1,24 +1,2 @@
-import { SerializedError, SerializedRequest, SerializedResponse } from 'pino';
-export declare const MaximalSerializer: {
-    req: (req: SerializedRequest) => {
-        id: string | undefined;
-        method: string;
-        url: string;
-        query: Record<string, string>;
-        params: Record<string, string>;
-        headers: {
-            [k: string]: string;
-        };
-        remoteAddress: string;
-        remotePort: number;
-    };
-    res: (res: SerializedResponse) => {
-        statusCode: number;
-        headers: Record<string, string>;
-    };
-    err: (err: SerializedError) => {
-        type: string;
-        message: string;
-        stack: string;
-    };
-};
+import type { Serializer } from './serializer.interface';
+export declare const MaximalSerializer: Serializer;

package/build/serializers/maximal.js

@@ -1,25 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MaximalSerializer = void 0;
+const minimal_1 = require("./minimal");
 exports.MaximalSerializer = {
-    req: (req) => ({
-        id: req.id,
-        method: req.method,
-        url: req.url,
-        query: req.query,
-        params: req.params,
-        headers: Object.fromEntries(Object.entries(req.headers).filter(([key]) => key === 'authorization')),
-        remoteAddress: req.remoteAddress,
-        remotePort: req.remotePort,
-    }),
-    res: (res) => ({
-        statusCode: res.statusCode,
-        headers: res.headers,
-    }),
-    err: (err) => ({
-        type: err.type,
-        message: err.message,
-        stack: err.stack,
-    }),
+    req: (req) => (Object.assign(Object.assign({}, minimal_1.MinimalSerializer.req(req)), { headers: Object.fromEntries(Object.entries(req.headers).filter(([key]) => key === 'authorization')) })),
+    res: (res) => (Object.assign(Object.assign({}, minimal_1.MinimalSerializer.res(res)), { headers: res.headers })),
+    err: (err) => minimal_1.MinimalSerializer.err(err),
 };
 //# sourceMappingURL=maximal.js.map

package/build/serializers/maximal.js.map

@@ -1 +1 @@
-{"version":3,"file":"maximal.js","sourceRoot":"","sources":["../../src/serializers/maximal.ts"],"names":[],"mappings":";;;AAEa,QAAA,iBAAiB,GAAG;IAC/B,GAAG,EAAE,CAAC,GAAsB,EAAE,EAAE,CAAC,CAAC;QAChC,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,GAAG,EAAE,GAAG,CAAC,GAAG;QACZ,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,eAAe,CAAC,CAAC;QACnG,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,UAAU,EAAE,GAAG,CAAC,UAAU;KAC3B,CAAC;IACF,GAAG,EAAE,CAAC,GAAuB,EAAE,EAAE,CAAC,CAAC;QACjC,UAAU,EAAE,GAAG,CAAC,UAAU;QAC1B,OAAO,EAAE,GAAG,CAAC,OAAO;KACrB,CAAC;IACF,GAAG,EAAE,CAAC,GAAoB,EAAE,EAAE,CAAC,CAAC;QAC9B,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,KAAK,EAAE,GAAG,CAAC,KAAK;KACjB,CAAC;CACH,CAAC"}
+{"version":3,"file":"maximal.js","sourceRoot":"","sources":["../../src/serializers/maximal.ts"],"names":[],"mappings":";;;AAAA,uCAA8C;AAGjC,QAAA,iBAAiB,GAAe;IAC3C,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,iCACT,2BAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,KAC7B,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,eAAe,CAAC,CAAC,IACnG;IACF,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,iCACT,2BAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,KAC7B,OAAO,EAAE,GAAG,CAAC,OAAO,IACpB;IACF,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,2BAAiB,CAAC,GAAG,CAAC,GAAG,CAAC;CACzC,CAAC"}

package/build/serializers/minimal.d.ts

@@ -1,19 +1,2 @@
-import { SerializedError, SerializedRequest, SerializedResponse } from 'pino';
-export declare const MinimalSerializer: {
-    req: (req: SerializedRequest) => {
-        method: string;
-        url: string;
-        query: Record<string, string>;
-        params: Record<string, string>;
-        remoteAddress: string;
-        remotePort: number;
-    };
-    res: (res: SerializedResponse) => {
-        statusCode: number;
-    };
-    err: (err: SerializedError) => {
-        type: string;
-        message: string;
-        stack: string;
-    };
-};
+import type { Serializer } from './serializer.interface';
+export declare const MinimalSerializer: Serializer;

package/build/serializers/minimal.js

@@ -2,14 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MinimalSerializer = void 0;
 exports.MinimalSerializer = {
-    req: (req) => ({
-        method: req.method,
-        url: req.url,
-        query: req.query,
-        params: req.params,
-        remoteAddress: req.remoteAddress,
-        remotePort: req.remotePort,
-    }),
+    req: (req) => {
+        var _a;
+        return ({
+            method: req.method,
+            url: (_a = req.raw.originalUrl) !== null && _a !== void 0 ? _a : req.url,
+            query: req.query,
+            params: req.params,
+            remoteAddress: req.remoteAddress,
+            remotePort: req.remotePort,
+        });
+    },
     res: (res) => ({
         statusCode: res.statusCode,
     }),

package/build/serializers/minimal.js.map

@@ -1 +1 @@
-{"version":3,"file":"minimal.js","sourceRoot":"","sources":["../../src/serializers/minimal.ts"],"names":[],"mappings":";;;AAEa,QAAA,iBAAiB,GAAG;IAC/B,GAAG,EAAE,CAAC,GAAsB,EAAE,EAAE,CAAC,CAAC;QAChC,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,GAAG,EAAE,GAAG,CAAC,GAAG;QACZ,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,UAAU,EAAE,GAAG,CAAC,UAAU;KAC3B,CAAC;IACF,GAAG,EAAE,CAAC,GAAuB,EAAE,EAAE,CAAC,CAAC;QACjC,UAAU,EAAE,GAAG,CAAC,UAAU;KAC3B,CAAC;IACF,GAAG,EAAE,CAAC,GAAoB,EAAE,EAAE,CAAC,CAAC;QAC9B,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,KAAK,EAAE,GAAG,CAAC,KAAK;KACjB,CAAC;CACH,CAAC"}
+{"version":3,"file":"minimal.js","sourceRoot":"","sources":["../../src/serializers/minimal.ts"],"names":[],"mappings":";;;AAEa,QAAA,iBAAiB,GAAe;IAC3C,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE;;QAAC,OAAA,CAAC;YACb,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,GAAG,EAAE,MAAA,GAAG,CAAC,GAAG,CAAC,WAAW,mCAAI,GAAG,CAAC,GAAG;YACnC,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,aAAa,EAAE,GAAG,CAAC,aAAa;YAChC,UAAU,EAAE,GAAG,CAAC,UAAU;SAC3B,CAAC,CAAA;KAAA;IACF,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACb,UAAU,EAAE,GAAG,CAAC,UAAU;KAC3B,CAAC;IACF,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACb,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,KAAK,EAAE,GAAG,CAAC,KAAK;KACjB,CAAC;CACH,CAAC"}

package/build/serializers/serializer.interface.d.ts

@@ -0,0 +1,10 @@
+import { SerializedError, SerializedRequest, SerializedResponse } from 'pino';
+export declare type Serializer = {
+    req(req: SerializedRequest & {
+        raw: SerializedRequest['raw'] & {
+            originalUrl?: string;
+        };
+    }): any;
+    res(res: SerializedResponse): any;
+    err(err: SerializedError): any;
+};

package/build/serializers/serializer.interface.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=serializer.interface.js.map

package/build/serializers/serializer.interface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serializer.interface.js","sourceRoot":"","sources":["../../src/serializers/serializer.interface.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@voiceflow/logger",
   "description": "Common logger for Voiceflow backend microservices",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "author": "Frank Gu <frank@voiceflow.com>",
   "bugs": {
     "url": "https://github.com/voiceflow/logger/issues"
@@ -44,10 +44,14 @@
     "mocha": "10.0.0",
     "nyc": "^15.1.0",
     "prettier": "2.7.1",
+    "rimraf": "5.0.0",
     "ts-mocha": "10.0.0",
     "tsc-alias": "1.7.0",
     "typescript": "4.8.3"
   },
+  "engines": {
+    "node": "20"
+  },
   "files": [
     "build/"
   ],
@@ -57,11 +61,12 @@
   ],
   "license": "ISC",
   "main": "build/main.js",
+  "packageManager": "yarn@3.2.1",
   "prettier": "@voiceflow/prettier-config",
   "repository": "git@github.com:voiceflow/logger.git",
   "scripts": {
     "build": "yarn clean && tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json",
-    "clean": "rimraf build",
+    "clean": "yarn rimraf build",
     "commit": "cz",
     "eslint-output": "eslint-output",
     "lint": "eslint '**/*.{js,ts}'",
@@ -75,5 +80,9 @@
     "test:single": "NODE_ENV=test ts-mocha --paths --config ./config/test/.mocharc.yml",
     "test:unit": "NODE_ENV=test nyc --report-dir=nyc_coverage_unit ts-mocha --paths --config ./config/test/.mocharc.yml 'test/**/*.unit.ts'"
   },
-  "types": "build/main.d.ts"
+  "types": "build/main.d.ts",
+  "volta": {
+    "node": "20.10.0",
+    "yarn": "3.2.1"
+  }
 }