@rife/logger 0.0.5-beta.20 → 0.0.5-beta.22

package/dist/env.d.ts

@@ -1,2 +1,2 @@
-export declare const isDev: () => boolean;
 export declare const isProd: () => boolean;
+export declare const isDev: () => boolean;

package/dist/env.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isProd = exports.isDev = void 0;
-const isDev = () => process.env.NODE_ENV === 'development';
-exports.isDev = isDev;
+exports.isDev = exports.isProd = void 0;
 const isProd = () => process.env.NODE_ENV === 'production';
 exports.isProd = isProd;
+const isDev = () => !(0, exports.isProd)();
+exports.isDev = isDev;

package/dist/pino.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createHttpLogger = exports.createLogger = void 0;
+exports.createLogger = void 0;
 const tslib_1 = require("tslib");
 const pino_1 = tslib_1.__importDefault(require("pino"));
-// https://github.com/pinojs/pino/blob/master/docs/api.md
-const trace_1 = require("./trace");
 const env_1 = require("./env");
 function getPinoConfig() {
     const targets = [];
@@ -15,63 +13,47 @@ function getPinoConfig() {
             options: {},
         });
     }
-    if ((0, env_1.isDev)() || (0, env_1.isProd)()) {
-        targets.push({
-            level: 'debug',
-            target: 'pino/file',
-            options: { destination: './.logs/1.log', mkdir: true },
-        });
-    }
+    targets.push({
+        level: 'debug',
+        target: 'pino/file',
+        options: { destination: './.logs/1.log', mkdir: true },
+    });
     const config = {
-        base: { pid: undefined, hostname: undefined },
+        // base: { pid: undefined, hostname: undefined },
         transport: { targets },
     };
     return config;
 }
+const startTime = Symbol('startTime');
 function createLogger(options) {
     let data = {};
     const logger = (0, pino_1.default)({
         ...getPinoConfig(),
         mixin() {
-            return { traceId: (0, trace_1.getTraceId)(), ...data };
+            return { ...data };
         },
     });
-    const setData = (value) => {
-        data = { ...data, ...value };
-    };
-    return {
-        info: logger.info.bind(logger),
-        warn: logger.warn.bind(logger),
-        error: logger.error.bind(logger),
-        setData,
+    const express = () => {
+        const { mapHttpRequest, mapHttpResponse } = require('pino-std-serializers');
+        return (req, res, next) => {
+            const response = res;
+            response[startTime] = response[startTime] || Date.now();
+            const traceId = req.headers['trace-id'];
+            const onComplete = () => {
+                res.removeListener('close', onComplete);
+                res.removeListener('finish', onComplete);
+                res.removeListener('error', onComplete);
+                const duration = Date.now() - response[startTime];
+                logger.info({ traceId, duration, request: mapHttpRequest(req).req, response: mapHttpResponse(res).res });
+            };
+            res.on('close', onComplete);
+            res.on('finish', onComplete);
+            res.on('error', onComplete);
+            next();
+        };
     };
+    const instance = logger;
+    instance.express = express;
+    return instance;
 }
 exports.createLogger = createLogger;
-function createHttpLogger() {
-    const { pinoHttp } = require('pino-http');
-    const logger = pinoHttp({
-        ...getPinoConfig(),
-        mixin() {
-            return { traceId: (0, trace_1.getTraceId)() };
-        },
-        genReqId: trace_1.getTraceId,
-        customAttributeKeys: {
-            req: 'request',
-            res: 'response',
-            responseTime: 'duration',
-        },
-        serializers: {
-            req(req) {
-                // console.log('==========req.raw.body', req.raw.body);
-                req.body = req.raw.body;
-                return req;
-            },
-            res(res) {
-                // console.log('==========req.raw.body', res.raw.);
-                return res;
-            },
-        },
-    });
-    return logger;
-}
-exports.createHttpLogger = createHttpLogger;

package/dist/test.js

@@ -17,19 +17,8 @@ process.env.NODE_ENV = 'development';
 const pino_1 = require("./pino");
 const trace_1 = require("./trace");
 const logger = (0, pino_1.createLogger)();
-logger.debug({ data: { a: 1 } });
-logger.warn({ data: { a: 2 } });
+logger.warn({ data: { a: 2 } }, '123');
 const e = new Error('123');
-logger.error(e, '123');
 (0, trace_1.runInTrace)(() => {
-    logger.info({ request: { method: 'POST', path: '/123', query: {}, body: {} }, response: 2, data: { a: 1 } }, '请求结束');
-    logger.info('123');
-    logger.info('123');
-    logger.info('123');
-    logger.info('123');
-    logger.info('123');
-    logger.info('123');
-    logger.info('123');
-    logger.info('123');
-    logger.info('123');
+    logger.error(e, '123');
 });

package/dist/trace.d.ts

@@ -1,3 +1,4 @@
 export declare const getNewTraceId: (size?: number | undefined) => string;
 export declare function runInTrace<T>(fn: (...args: any[]) => T): T;
 export declare function getTraceId(): any;
+export declare function setTraceId(): any;

package/dist/trace.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTraceId = exports.runInTrace = exports.getNewTraceId = void 0;
+exports.setTraceId = exports.getTraceId = exports.runInTrace = exports.getNewTraceId = void 0;
 const async_hooks_1 = require("async_hooks");
 const nanoid_1 = require("nanoid");
 const als = new async_hooks_1.AsyncLocalStorage();
@@ -14,3 +14,7 @@ function getTraceId() {
     return als.getStore()?.traceId;
 }
 exports.getTraceId = getTraceId;
+function setTraceId() {
+    return als.getStore()?.traceId;
+}
+exports.setTraceId = setTraceId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rife/logger",
-  "version": "0.0.5-beta.20",
+  "version": "0.0.5-beta.22",
   "description": "",
   "main": "./dist/index.js",
   "types": "./src/index.ts",
@@ -30,10 +30,11 @@
     "pino": "^8.16.1",
     "pino-http": "^8.5.1",
     "pino-pretty": "^10.2.3",
+    "pino-std-serializers": "^6.2.2",
     "safe-stable-stringify": "^2.4.3",
     "winston": "^3.9.0",
     "winston-daily-rotate-file": "^4.7.1",
-    "@rife/config": "0.0.5-beta.20"
+    "@rife/config": "0.0.5-beta.22"
   },
   "scripts": {
     "dev": "infra dev",

package/src/env.ts

@@ -1,2 +1,3 @@
-export const isDev = () => process.env.NODE_ENV === 'development';
 export const isProd = () => process.env.NODE_ENV === 'production';
+
+export const isDev = () => !isProd();

package/src/pino.ts

@@ -2,9 +2,10 @@ import pino from 'pino';
 // https://github.com/pinojs/pino/blob/master/docs/api.md
 
 import { getTraceId } from './trace';
-import { isDev, isProd } from './env';
+import { isDev } from './env';
 
 export interface ILogger {
+    debug: pino.LogFn;
     info: pino.LogFn;
     warn: pino.LogFn;
     error: pino.LogFn;
@@ -26,69 +27,59 @@ function getPinoConfig() {
         });
     }
 
-    if (isDev() || isProd()) {
-        targets.push({
-            level: 'debug',
-            target: 'pino/file',
-            options: { destination: './.logs/1.log', mkdir: true },
-        });
-    }
+    targets.push({
+        level: 'debug',
+        target: 'pino/file',
+        options: { destination: './.logs/1.log', mkdir: true },
+    });
+
     const config: pino.LoggerOptions = {
-        base: { pid: undefined, hostname: undefined },
+        // base: { pid: undefined, hostname: undefined },
         transport: { targets },
     };
 
     return config;
 }
 
-export function createLogger(options?: ILogger.Options): ILogger {
+const startTime = Symbol('startTime');
+
+export function createLogger(options?: ILogger.Options) {
     let data: any = {};
 
     const logger = pino({
         ...getPinoConfig(),
         mixin() {
-            return { traceId: getTraceId(), ...data };
+            return { ...data };
         },
     });
 
-    const setData = (value: any) => {
-        data = { ...data, ...value };
-    };
+    const express = () => {
+        const { mapHttpRequest, mapHttpResponse } = require('pino-std-serializers') as typeof import('pino-std-serializers');
 
-    return {
-        info: logger.info.bind(logger),
-        warn: logger.warn.bind(logger),
-        error: logger.error.bind(logger),
-        setData,
-    };
-}
+        return (req: any, res: any, next: any) => {
+            const response: any = res;
+            response[startTime] = response[startTime] || Date.now();
+            const traceId = req.headers['trace-id'];
 
-export function createHttpLogger() {
-    const { pinoHttp } = require('pino-http') as typeof import('pino-http');
+            const onComplete = () => {
+                res.removeListener('close', onComplete);
+                res.removeListener('finish', onComplete);
+                res.removeListener('error', onComplete);
+                const duration = Date.now() - response[startTime];
 
-    const logger = pinoHttp({
-        ...getPinoConfig(),
-        mixin() {
-            return { traceId: getTraceId() };
-        },
-        genReqId: getTraceId,
-        customAttributeKeys: {
-            req: 'request',
-            res: 'response',
-            responseTime: 'duration',
-        },
-        serializers: {
-            req(req) {
-                // console.log('==========req.raw.body', req.raw.body);
-                req.body = req.raw.body;
-                return req;
-            },
-            res(res) {
-                // console.log('==========req.raw.body', res.raw.);
-                return res;
-            },
-        },
-    });
+                logger.info({ traceId, duration, request: mapHttpRequest(req).req, response: mapHttpResponse(res).res });
+            };
+
+            res.on('close', onComplete);
+            res.on('finish', onComplete);
+            res.on('error', onComplete);
+
+            next();
+        };
+    };
+    const instance = logger as typeof logger & { express: typeof express };
+
+    instance.express = express;
 
-    return logger;
+    return instance;
 }

package/src/test.ts

@@ -20,21 +20,10 @@ import { createLogger } from './pino';
 import { runInTrace } from './trace';
 
 const logger = createLogger();
-logger.debug({ data: { a: 1 } });
-logger.warn({ data: { a: 2 } });
+logger.warn({ data: { a: 2 } }, '123');
 
 const e = new Error('123');
-logger.error(e, '123');
 
 runInTrace(() => {
-    logger.info({ request: { method: 'POST', path: '/123', query: {}, body: {} }, response: 2, data: { a: 1 } }, '请求结束');
-    logger.info('123');
-    logger.info('123');
-    logger.info('123');
-    logger.info('123');
-    logger.info('123');
-    logger.info('123');
-    logger.info('123');
-    logger.info('123');
-    logger.info('123');
+    logger.error(e, '123');
 });

package/src/trace.ts

@@ -14,3 +14,7 @@ export function runInTrace<T>(fn: (...args: any[]) => T): T {
 export function getTraceId() {
     return als.getStore()?.traceId;
 }
+
+export function setTraceId() {
+    return als.getStore()?.traceId;
+}

package/tsconfig.json

@@ -2,7 +2,7 @@
     "extends": "@rife/config/tsconfig.json", // 继承 packages 目录下通用配置
     "compilerOptions": {
         "outDir": "dist",
-        "declaration": true,
+        "declaration": false,
         "baseUrl": ".",
         "paths": {
             "@/*": ["./src/*"]