@rife/logger 0.0.5-beta.13 → 0.0.5-beta.15

package/dist/env.js

@@ -0,0 +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;
+const isProd = () => process.env.NODE_ENV === 'production';
+exports.isProd = isProd;

package/dist/index.js

@@ -1,131 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLogger = exports.getTraceId = exports.runInTrace = exports.getNewTraceId = void 0;
 const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
-const async_hooks_1 = require("async_hooks");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const nanoid_1 = require("nanoid");
-const winston_1 = tslib_1.__importDefault(require("winston"));
-const safe_stable_stringify_1 = tslib_1.__importDefault(require("safe-stable-stringify"));
-require("winston-daily-rotate-file");
-const als = new async_hooks_1.AsyncLocalStorage();
-const isDev = () => process.env.NODE_ENV === 'development';
-const isProd = () => !isDev();
-// https://github.com/CyberAP/nanoid-dictionary/blob/master/src/nolookalikes.js
-exports.getNewTraceId = (0, nanoid_1.customAlphabet)('346789ABCDEFGHJKLMNPQRTUVWXYabcdefghijkmnpqrtwxyz', 5);
-function runInTrace(fn) {
-    return als.run({ traceId: (0, exports.getNewTraceId)() }, fn);
-}
-exports.runInTrace = runInTrace;
-function getTraceId() {
-    return als.getStore()?.traceId;
-}
-exports.getTraceId = getTraceId;
-const levelColor = {
-    info: chalk_1.default.green,
-    error: chalk_1.default.redBright,
-    warn: chalk_1.default.yellow,
-};
-const levelSymbolMap = {
-    info: 'INF',
-    warn: 'WRN',
-    error: 'ERR',
-};
-// 设置traceId
-// https://www.npmjs.com/package/cls-rtracer
-const tracerFormat = (options) => winston_1.default.format.printf(info => {
-    let traceId = getTraceId();
-    const color = (message, chalk) => (options.writeToFile ? message : chalk(message));
-    const levelit = (text) => {
-        switch (info.level) {
-            case 'info': {
-                return color(text, levelColor.info);
-            }
-            case 'warn': {
-                return color(text, levelColor.warn);
-            }
-            case 'error': {
-                return color(text, levelColor.error);
-            }
-        }
-        return text;
-    };
-    const levelSymbol = levelSymbolMap[info.level];
-    const level = levelSymbol ? levelit(` [${levelSymbol}]`) : '';
-    const service = info.metadata.service ? levelit(` [${info.metadata.service}]`) : '';
-    const timestamp = options.format.time ? color(info.timestamp, chalk_1.default.gray) : '';
-    const trace = traceId ? color(` [${traceId}]`, chalk_1.default.gray) : '';
-    let message = info.message || '';
-    if (typeof info?.message !== 'string') {
-        try {
-            if (isDev()) {
-                message = '\n' + (0, safe_stable_stringify_1.default)(info?.message, undefined, 4);
-            }
-            else {
-                message = (0, safe_stable_stringify_1.default)(info?.message, undefined, 0);
-            }
-        }
-        catch (e) {
-            message = 'fail to stringify json';
-        }
-    }
-    message = ' ' + message;
-    const stack = info.metadata.stack ? color('\n' + info.metadata.stack + '\n', chalk_1.default.gray) : '';
-    return `${timestamp}${trace}${level}${service}${message}${stack}`;
-});
-function createLogger(options) {
-    let transports = [];
-    let config = {
-        writeToConsole: options?.writeToConsole ?? isDev(),
-        writeToFile: options?.writeToFile ?? isProd(),
-        dirname: options?.dirname || path_1.default.join(process.cwd(), './logs/'),
-        filename: options?.filename || 'server',
-        format: {
-            time: options?.format?.time ?? true,
-        },
-    };
-    if (config.writeToFile) {
-        transports.push(new winston_1.default.transports.DailyRotateFile({
-            // https://www.npmjs.com/package/winston-daily-rotate-file
-            filename: config.filename,
-            dirname: config.dirname,
-            datePattern: 'YYYY-MM-DD',
-            maxFiles: '30d',
-            extension: '.log',
-        }));
-    }
-    if (config.writeToConsole) {
-        transports.push(new winston_1.default.transports.Console());
-    }
-    const { combine, timestamp, colorize, errors, metadata, splat } = winston_1.default.format;
-    const timeFormat = isProd() ? 'YYYY-MM-DD HH:mm:ss.SSS' : 'HH:mm:ss.SSS';
-    let format = [
-        errors({ stack: true }),
-        metadata(),
-        timestamp({ format: timeFormat }),
-        splat(),
-        tracerFormat(config),
-    ];
-    if (!config.writeToFile) {
-        format.push(colorize());
-    }
-    const instance = winston_1.default.createLogger({
-        format: combine(...format),
-        transports,
-    });
-    const setMetaData = (data) => {
-        instance.defaultMeta = {
-            ...instance.defaultMeta,
-            ...data,
-        };
-    };
-    const logger = {
-        info: instance.info.bind(instance),
-        warn: instance.warn.bind(instance),
-        error: instance.error.bind(instance),
-        setMetaData,
-    };
-    return { logger };
-}
-exports.createLogger = createLogger;
+tslib_1.__exportStar(require("./trace"), exports);

package/dist/pino.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createHttpLogger = 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 = [];
+    if ((0, env_1.isDev)()) {
+        targets.push({
+            level: 'debug',
+            target: 'pino-pretty', // must be installed separately,
+            options: {},
+        });
+    }
+    if ((0, env_1.isDev)() || (0, env_1.isProd)()) {
+        targets.push({
+            level: 'debug',
+            target: 'pino/file',
+            options: { destination: './.logs/1.log', mkdir: true },
+        });
+    }
+    const config = {
+        base: { pid: undefined, hostname: undefined },
+        transport: { targets },
+    };
+    return config;
+}
+function createLogger(options) {
+    let data = {};
+    const logger = (0, pino_1.default)({
+        ...getPinoConfig(),
+        mixin() {
+            return { traceId: (0, trace_1.getTraceId)(), ...data };
+        },
+    });
+    const setData = (value) => {
+        data = { ...data, ...value };
+    };
+    return {
+        info: logger.info.bind(logger),
+        warn: logger.warn.bind(logger),
+        error: logger.error.bind(logger),
+        setData,
+    };
+}
+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

@@ -2,21 +2,34 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 process.env.NODE_ENV = 'development';
 // process.env.NODE_ENV = 'production';
-const _1 = require(".");
-const { logger } = (0, _1.createLogger)({ writeToFile: false, writeToConsole: true, format: { time: false } });
-const deep = { a: { b: { c: { g: { e: { f: 1 } } } } } };
-logger.info('1 %s', { a: 1 });
-logger.info('2 %j', deep);
-logger.info('3 \n%j', deep);
-logger.info('4 %s %s', 1, 2);
-logger.info('5 %o', deep);
-logger.info(deep);
-logger.warn('execed');
-logger.error(new Error('not found'));
-// import { format } from 'logform';
-// const jsonFormat = format.json({ space: 2 });
-// const info = jsonFormat.transform({
-//     level: 'info',
-//     message: 'my message',
-// });
-// console.log(info);
+process.env.NODE_ENV = 'development';
+// import { createLogger } from './winston';
+// const { logger } = createLogger({ writeToFile: false, writeToConsole: true, format: { time: false } });
+// const deep = { a: { b: { c: { g: { e: { f: 1 } } } } } };
+// logger.info('1 %s', { a: 1 });
+// logger.info('2 %j', deep);
+// logger.info('3 \n%j', deep);
+// logger.info('4 %s %s', 1, 2);
+// logger.info('5 %o', deep);
+// logger.info(deep);
+// logger.warn('execed');
+// logger.error(new Error('not found'));
+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 } });
+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');
+});

package/dist/trace.js

@@ -1 +1,16 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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();
+// https://github.com/CyberAP/nanoid-dictionary/blob/master/src/nolookalikes.js
+exports.getNewTraceId = (0, nanoid_1.customAlphabet)('346789ABCDEFGHJKLMNPQRTUVWXYabcdefghijkmnpqrtwxyz', 5);
+function runInTrace(fn) {
+    return als.run({ traceId: (0, exports.getNewTraceId)() }, fn);
+}
+exports.runInTrace = runInTrace;
+function getTraceId() {
+    return als.getStore()?.traceId;
+}
+exports.getTraceId = getTraceId;

package/dist/winston.js

@@ -0,0 +1,118 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createLogger = void 0;
+const tslib_1 = require("tslib");
+const path_1 = tslib_1.__importDefault(require("path"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const winston_1 = tslib_1.__importDefault(require("winston"));
+const safe_stable_stringify_1 = tslib_1.__importDefault(require("safe-stable-stringify"));
+require("winston-daily-rotate-file");
+const env_1 = require("./env");
+const trace_1 = require("./trace");
+const levelColor = {
+    info: chalk_1.default.green,
+    error: chalk_1.default.redBright,
+    warn: chalk_1.default.yellow,
+};
+const levelSymbolMap = {
+    info: 'INF',
+    warn: 'WRN',
+    error: 'ERR',
+};
+// 设置traceId
+// https://www.npmjs.com/package/cls-rtracer
+const tracerFormat = (options) => winston_1.default.format.printf(info => {
+    let traceId = (0, trace_1.getTraceId)();
+    const color = (message, chalk) => (options.writeToFile ? message : chalk(message));
+    const levelit = (text) => {
+        switch (info.level) {
+            case 'info': {
+                return color(text, levelColor.info);
+            }
+            case 'warn': {
+                return color(text, levelColor.warn);
+            }
+            case 'error': {
+                return color(text, levelColor.error);
+            }
+        }
+        return text;
+    };
+    const levelSymbol = levelSymbolMap[info.level];
+    const level = levelSymbol ? levelit(` [${levelSymbol}]`) : '';
+    const service = info.metadata.service ? levelit(` [${info.metadata.service}]`) : '';
+    const timestamp = options.format.time ? color(info.timestamp, chalk_1.default.gray) : '';
+    const trace = traceId ? color(` [${traceId}]`, chalk_1.default.gray) : '';
+    let message = info.message || '';
+    if (typeof info?.message !== 'string') {
+        try {
+            if ((0, env_1.isDev)()) {
+                message = '\n' + (0, safe_stable_stringify_1.default)(info?.message, undefined, 4);
+            }
+            else {
+                message = (0, safe_stable_stringify_1.default)(info?.message, undefined, 0);
+            }
+        }
+        catch (e) {
+            message = 'fail to stringify json';
+        }
+    }
+    message = ' ' + message;
+    const stack = info.metadata.stack ? color('\n' + info.metadata.stack + '\n', chalk_1.default.gray) : '';
+    return `${timestamp}${trace}${level}${service}${message}${stack}`;
+});
+function createLogger(options) {
+    let transports = [];
+    let config = {
+        writeToConsole: options?.writeToConsole ?? (0, env_1.isDev)(),
+        writeToFile: options?.writeToFile ?? (0, env_1.isProd)(),
+        dirname: options?.dirname || path_1.default.join(process.cwd(), './logs/'),
+        filename: options?.filename || 'server',
+        format: {
+            time: options?.format?.time ?? true,
+        },
+    };
+    if (config.writeToFile) {
+        transports.push(new winston_1.default.transports.DailyRotateFile({
+            // https://www.npmjs.com/package/winston-daily-rotate-file
+            filename: config.filename,
+            dirname: config.dirname,
+            datePattern: 'YYYY-MM-DD',
+            maxFiles: '30d',
+            extension: '.log',
+        }));
+    }
+    if (config.writeToConsole) {
+        transports.push(new winston_1.default.transports.Console());
+    }
+    const { combine, timestamp, colorize, errors, metadata, splat } = winston_1.default.format;
+    const timeFormat = (0, env_1.isProd)() ? 'YYYY-MM-DD HH:mm:ss.SSS' : 'HH:mm:ss.SSS';
+    let format = [
+        errors({ stack: true }),
+        metadata(),
+        timestamp({ format: timeFormat }),
+        splat(), // https://github.com/winstonjs/logform/blob/master/splat.js
+        tracerFormat(config),
+    ];
+    if (!config.writeToFile) {
+        format.push(colorize());
+    }
+    const instance = winston_1.default.createLogger({
+        format: combine(...format),
+        transports,
+    });
+    const setMetaData = (data) => {
+        instance.defaultMeta = {
+            ...instance.defaultMeta,
+            ...data,
+        };
+    };
+    const logger = {
+        info: instance.info.bind(instance),
+        warn: instance.warn.bind(instance),
+        error: instance.error.bind(instance),
+        setMetaData,
+    };
+    return { logger };
+}
+exports.createLogger = createLogger;

package/package.json

@@ -1,9 +1,24 @@
 {
   "name": "@rife/logger",
-  "version": "0.0.5-beta.13",
+  "version": "0.0.5-beta.15",
   "description": "",
   "main": "./dist/index.js",
   "types": "./src/index.ts",
+  "exports": {
+    ".": {
+      "require": "./dist/index.js"
+    },
+    "./pino": {
+      "require": "./dist/pino.js"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "pino": [
+        "./src/pino"
+      ]
+    }
+  },
   "files": [
     "dist/**/*",
     "src/**/*",
@@ -12,10 +27,13 @@
   "dependencies": {
     "chalk": "4",
     "nanoid": "^3.3.6",
+    "pino": "^8.16.1",
+    "pino-http": "^8.5.1",
+    "pino-pretty": "^10.2.3",
     "safe-stable-stringify": "^2.4.3",
     "winston": "^3.9.0",
     "winston-daily-rotate-file": "^4.7.1",
-    "@rife/config": "0.0.5-beta.13"
+    "@rife/config": "0.0.5-beta.15"
   },
   "scripts": {
     "dev": "infra dev",

package/src/env.ts

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

package/src/index.ts

@@ -1,194 +1 @@
-import path from 'path';
-import { AsyncLocalStorage } from 'async_hooks';
-
-import chalk from 'chalk';
-import { customAlphabet } from 'nanoid';
-import winston from 'winston';
-import JSONStringify from 'safe-stable-stringify';
-import 'winston-daily-rotate-file';
-
-export type { winston };
-
-const als = new AsyncLocalStorage<{ traceId: string } & any>();
-
-const isDev = () => process.env.NODE_ENV === 'development';
-const isProd = () => !isDev();
-
-// https://github.com/CyberAP/nanoid-dictionary/blob/master/src/nolookalikes.js
-export const getNewTraceId = customAlphabet('346789ABCDEFGHJKLMNPQRTUVWXYabcdefghijkmnpqrtwxyz', 5);
-
-export function runInTrace<T>(fn: (...args: any[]) => T): T {
-    return als.run({ traceId: getNewTraceId() }, fn);
-}
-
-export function getTraceId() {
-    return als.getStore()?.traceId;
-}
-
-const levelColor = {
-    info: chalk.green,
-    error: chalk.redBright,
-    warn: chalk.yellow,
-};
-
-const levelSymbolMap = {
-    info: 'INF',
-    warn: 'WRN',
-    error: 'ERR',
-};
-
-// 设置traceId
-// https://www.npmjs.com/package/cls-rtracer
-const tracerFormat = (options: { writeToFile: boolean; format: { time: boolean } }) =>
-    winston.format.printf(info => {
-        let traceId = getTraceId();
-        const color = (message: string, chalk: chalk.Chalk) => (options.writeToFile ? message : chalk(message));
-        const levelit = (text: string) => {
-            switch (info.level) {
-                case 'info': {
-                    return color(text, levelColor.info);
-                }
-                case 'warn': {
-                    return color(text, levelColor.warn);
-                }
-                case 'error': {
-                    return color(text, levelColor.error);
-                }
-            }
-            return text;
-        };
-        const levelSymbol = levelSymbolMap[info.level as keyof typeof levelSymbolMap];
-        const level = levelSymbol ? levelit(` [${levelSymbol}]`) : '';
-        const service = info.metadata.service ? levelit(` [${info.metadata.service}]`) : '';
-        const timestamp = options.format.time ? color(info.timestamp, chalk.gray) : '';
-        const trace = traceId ? color(` [${traceId}]`, chalk.gray) : '';
-        let message = info.message || '';
-        if (typeof info?.message !== 'string') {
-            try {
-                if (isDev()) {
-                    message = '\n' + JSONStringify(info?.message, undefined, 4);
-                } else {
-                    message = JSONStringify(info?.message, undefined, 0);
-                }
-            } catch (e) {
-                message = 'fail to stringify json';
-            }
-        }
-        message = ' ' + message;
-        const stack = info.metadata.stack ? color('\n' + info.metadata.stack + '\n', chalk.gray) : '';
-        return `${timestamp}${trace}${level}${service}${message}${stack}`;
-    });
-
-export namespace Logger {
-    export interface Options {
-        /**
-         * 输出日志到console
-         * 默认：development环境下输出，production环境下不输出
-         */
-        writeToConsole?: boolean;
-
-        /**
-         * 输出日志到文件
-         * 默认：development环境下输出，production环境下不输出
-         */
-        writeToFile?: boolean;
-
-        /**
-         * 输出日志的文件目录
-         * 默认：./logs/
-         */
-        dirname?: string;
-
-        /**
-         * 输出日志的文件名
-         * 默认：server
-         */
-        filename?: string;
-
-        /**
-         * 日志输出格式
-         */
-        format?: {
-            /**
-             * 显示时间
-             * 默认：true
-             */
-            time?: boolean;
-
-            /**
-             * 显示traceId
-             * 默认：true
-             */
-            traceId?: boolean;
-        };
-    }
-}
-
-export interface Logger {
-    info: winston.LeveledLogMethod;
-    warn: winston.LeveledLogMethod;
-    error: winston.LeveledLogMethod;
-    setMetaData: (data: any) => void;
-}
-
-export function createLogger(options?: Logger.Options) {
-    let transports: winston.transport[] = [];
-    let config = {
-        writeToConsole: options?.writeToConsole ?? isDev(),
-        writeToFile: options?.writeToFile ?? isProd(),
-        dirname: options?.dirname || path.join(process.cwd(), './logs/'),
-        filename: options?.filename || 'server',
-        format: {
-            time: options?.format?.time ?? true,
-        },
-    };
-    if (config.writeToFile) {
-        transports.push(
-            new winston.transports.DailyRotateFile({
-                // https://www.npmjs.com/package/winston-daily-rotate-file
-                filename: config.filename,
-                dirname: config.dirname,
-                datePattern: 'YYYY-MM-DD',
-                maxFiles: '30d',
-                extension: '.log',
-            }),
-        );
-    }
-
-    if (config.writeToConsole) {
-        transports.push(new winston.transports.Console());
-    }
-
-    const { combine, timestamp, colorize, errors, metadata, splat } = winston.format;
-    const timeFormat = isProd() ? 'YYYY-MM-DD HH:mm:ss.SSS' : 'HH:mm:ss.SSS';
-    let format: winston.Logform.Format[] = [
-        errors({ stack: true }),
-        metadata(),
-        timestamp({ format: timeFormat }),
-        splat(), // https://github.com/winstonjs/logform/blob/master/splat.js
-        tracerFormat(config),
-    ];
-    if (!config.writeToFile) {
-        format.push(colorize());
-    }
-    const instance = winston.createLogger({
-        format: combine(...format),
-        transports,
-    });
-
-    const setMetaData = (data: any) => {
-        instance.defaultMeta = {
-            ...instance.defaultMeta,
-            ...data,
-        };
-    };
-
-    const logger: Logger = {
-        info: instance.info.bind(instance),
-        warn: instance.warn.bind(instance),
-        error: instance.error.bind(instance),
-        setMetaData,
-    };
-
-    return { logger };
-}
+export * from './trace';

package/src/pino.ts

@@ -0,0 +1,94 @@
+import pino from 'pino';
+// https://github.com/pinojs/pino/blob/master/docs/api.md
+
+import { getTraceId } from './trace';
+import { isDev, isProd } from './env';
+
+export interface ILogger {
+    info: pino.LogFn;
+    warn: pino.LogFn;
+    error: pino.LogFn;
+    setData: (value: any) => any;
+}
+
+export namespace ILogger {
+    export interface Options {}
+}
+
+function getPinoConfig() {
+    const targets: any = [];
+
+    if (isDev()) {
+        targets.push({
+            level: 'debug',
+            target: 'pino-pretty', // must be installed separately,
+            options: {},
+        });
+    }
+
+    if (isDev() || isProd()) {
+        targets.push({
+            level: 'debug',
+            target: 'pino/file',
+            options: { destination: './.logs/1.log', mkdir: true },
+        });
+    }
+    const config: pino.LoggerOptions = {
+        base: { pid: undefined, hostname: undefined },
+        transport: { targets },
+    };
+
+    return config;
+}
+
+export function createLogger(options?: ILogger.Options): ILogger {
+    let data: any = {};
+
+    const logger = pino({
+        ...getPinoConfig(),
+        mixin() {
+            return { traceId: getTraceId(), ...data };
+        },
+    });
+
+    const setData = (value: any) => {
+        data = { ...data, ...value };
+    };
+
+    return {
+        info: logger.info.bind(logger),
+        warn: logger.warn.bind(logger),
+        error: logger.error.bind(logger),
+        setData,
+    };
+}
+
+export function createHttpLogger() {
+    const { pinoHttp } = require('pino-http') as typeof import('pino-http');
+
+    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;
+            },
+        },
+    });
+
+    return logger;
+}

package/src/test.ts

@@ -1,25 +1,40 @@
 process.env.NODE_ENV = 'development';
 // process.env.NODE_ENV = 'production';
+process.env.NODE_ENV = 'development';
+
+// import { createLogger } from './winston';
+
+// const { logger } = createLogger({ writeToFile: false, writeToConsole: true, format: { time: false } });
 
-import { createLogger } from '.';
+// const deep = { a: { b: { c: { g: { e: { f: 1 } } } } } };
+// logger.info('1 %s', { a: 1 });
+// logger.info('2 %j', deep);
+// logger.info('3 \n%j', deep);
+// logger.info('4 %s %s', 1, 2);
+// logger.info('5 %o', deep);
+// logger.info(deep);
+// logger.warn('execed');
+// logger.error(new Error('not found'));
 
-const { logger } = createLogger({ writeToFile: false, writeToConsole: true, format: { time: false } });
+import { createLogger } from './pino';
+import { runInTrace } from './trace';
 
-const deep = { a: { b: { c: { g: { e: { f: 1 } } } } } };
-logger.info('1 %s', { a: 1 });
-logger.info('2 %j', deep);
-logger.info('3 \n%j', deep);
-logger.info('4 %s %s', 1, 2);
-logger.info('5 %o', deep);
-logger.info(deep);
-logger.warn('execed');
-logger.error(new Error('not found'));
+const logger = createLogger();
+logger.debug({ data: { a: 1 } });
+logger.warn({ data: { a: 2 } });
 
-// import { format } from 'logform';
+const e = new Error('123');
+logger.error(e, '123');
 
-// const jsonFormat = format.json({ space: 2 });
-// const info = jsonFormat.transform({
-//     level: 'info',
-//     message: 'my message',
-// });
-// console.log(info);
+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');
+});

package/src/trace.ts

@@ -0,0 +1,16 @@
+import { AsyncLocalStorage } from 'async_hooks';
+
+import { customAlphabet } from 'nanoid';
+
+const als = new AsyncLocalStorage<{ traceId: string } & any>();
+
+// https://github.com/CyberAP/nanoid-dictionary/blob/master/src/nolookalikes.js
+export const getNewTraceId = customAlphabet('346789ABCDEFGHJKLMNPQRTUVWXYabcdefghijkmnpqrtwxyz', 5);
+
+export function runInTrace<T>(fn: (...args: any[]) => T): T {
+    return als.run({ traceId: getNewTraceId() }, fn);
+}
+
+export function getTraceId() {
+    return als.getStore()?.traceId;
+}

package/src/winston.ts

@@ -0,0 +1,180 @@
+import path from 'path';
+import { AsyncLocalStorage } from 'async_hooks';
+
+import chalk from 'chalk';
+import winston from 'winston';
+import JSONStringify from 'safe-stable-stringify';
+import 'winston-daily-rotate-file';
+
+import { isDev, isProd } from './env';
+import { getTraceId } from './trace';
+
+export type { winston };
+
+const levelColor = {
+    info: chalk.green,
+    error: chalk.redBright,
+    warn: chalk.yellow,
+};
+
+const levelSymbolMap = {
+    info: 'INF',
+    warn: 'WRN',
+    error: 'ERR',
+};
+
+// 设置traceId
+// https://www.npmjs.com/package/cls-rtracer
+const tracerFormat = (options: { writeToFile: boolean; format: { time: boolean } }) =>
+    winston.format.printf(info => {
+        let traceId = getTraceId();
+        const color = (message: string, chalk: chalk.Chalk) => (options.writeToFile ? message : chalk(message));
+        const levelit = (text: string) => {
+            switch (info.level) {
+                case 'info': {
+                    return color(text, levelColor.info);
+                }
+                case 'warn': {
+                    return color(text, levelColor.warn);
+                }
+                case 'error': {
+                    return color(text, levelColor.error);
+                }
+            }
+            return text;
+        };
+        const levelSymbol = levelSymbolMap[info.level as keyof typeof levelSymbolMap];
+        const level = levelSymbol ? levelit(` [${levelSymbol}]`) : '';
+        const service = info.metadata.service ? levelit(` [${info.metadata.service}]`) : '';
+        const timestamp = options.format.time ? color(info.timestamp, chalk.gray) : '';
+        const trace = traceId ? color(` [${traceId}]`, chalk.gray) : '';
+        let message = info.message || '';
+        if (typeof info?.message !== 'string') {
+            try {
+                if (isDev()) {
+                    message = '\n' + JSONStringify(info?.message, undefined, 4);
+                } else {
+                    message = JSONStringify(info?.message, undefined, 0);
+                }
+            } catch (e) {
+                message = 'fail to stringify json';
+            }
+        }
+        message = ' ' + message;
+        const stack = info.metadata.stack ? color('\n' + info.metadata.stack + '\n', chalk.gray) : '';
+        return `${timestamp}${trace}${level}${service}${message}${stack}`;
+    });
+
+export namespace Logger {
+    export interface Options {
+        /**
+         * 输出日志到console
+         * 默认：development环境下输出，production环境下不输出
+         */
+        writeToConsole?: boolean;
+
+        /**
+         * 输出日志到文件
+         * 默认：development环境下输出，production环境下不输出
+         */
+        writeToFile?: boolean;
+
+        /**
+         * 输出日志的文件目录
+         * 默认：./logs/
+         */
+        dirname?: string;
+
+        /**
+         * 输出日志的文件名
+         * 默认：server
+         */
+        filename?: string;
+
+        /**
+         * 日志输出格式
+         */
+        format?: {
+            /**
+             * 显示时间
+             * 默认：true
+             */
+            time?: boolean;
+
+            /**
+             * 显示traceId
+             * 默认：true
+             */
+            traceId?: boolean;
+        };
+    }
+}
+
+export interface Logger {
+    info: winston.LeveledLogMethod;
+    warn: winston.LeveledLogMethod;
+    error: winston.LeveledLogMethod;
+    setMetaData: (data: any) => void;
+}
+
+export function createLogger(options?: Logger.Options) {
+    let transports: winston.transport[] = [];
+    let config = {
+        writeToConsole: options?.writeToConsole ?? isDev(),
+        writeToFile: options?.writeToFile ?? isProd(),
+        dirname: options?.dirname || path.join(process.cwd(), './logs/'),
+        filename: options?.filename || 'server',
+        format: {
+            time: options?.format?.time ?? true,
+        },
+    };
+    if (config.writeToFile) {
+        transports.push(
+            new winston.transports.DailyRotateFile({
+                // https://www.npmjs.com/package/winston-daily-rotate-file
+                filename: config.filename,
+                dirname: config.dirname,
+                datePattern: 'YYYY-MM-DD',
+                maxFiles: '30d',
+                extension: '.log',
+            }),
+        );
+    }
+
+    if (config.writeToConsole) {
+        transports.push(new winston.transports.Console());
+    }
+
+    const { combine, timestamp, colorize, errors, metadata, splat } = winston.format;
+    const timeFormat = isProd() ? 'YYYY-MM-DD HH:mm:ss.SSS' : 'HH:mm:ss.SSS';
+    let format: winston.Logform.Format[] = [
+        errors({ stack: true }),
+        metadata(),
+        timestamp({ format: timeFormat }),
+        splat(), // https://github.com/winstonjs/logform/blob/master/splat.js
+        tracerFormat(config),
+    ];
+    if (!config.writeToFile) {
+        format.push(colorize());
+    }
+    const instance = winston.createLogger({
+        format: combine(...format),
+        transports,
+    });
+
+    const setMetaData = (data: any) => {
+        instance.defaultMeta = {
+            ...instance.defaultMeta,
+            ...data,
+        };
+    };
+
+    const logger: Logger = {
+        info: instance.info.bind(instance),
+        warn: instance.warn.bind(instance),
+        error: instance.error.bind(instance),
+        setMetaData,
+    };
+
+    return { logger };
+}

package/dist/index.d.ts

@@ -1,54 +0,0 @@
-import winston from 'winston';
-import 'winston-daily-rotate-file';
-export type { winston };
-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 namespace Logger {
-    interface Options {
-        /**
-         * 输出日志到console
-         * 默认：development环境下输出，production环境下不输出
-         */
-        writeToConsole?: boolean;
-        /**
-         * 输出日志到文件
-         * 默认：development环境下输出，production环境下不输出
-         */
-        writeToFile?: boolean;
-        /**
-         * 输出日志的文件目录
-         * 默认：./logs/
-         */
-        dirname?: string;
-        /**
-         * 输出日志的文件名
-         * 默认：server
-         */
-        filename?: string;
-        /**
-         * 日志输出格式
-         */
-        format?: {
-            /**
-             * 显示时间
-             * 默认：true
-             */
-            time?: boolean;
-            /**
-             * 显示traceId
-             * 默认：true
-             */
-            traceId?: boolean;
-        };
-    }
-}
-export interface Logger {
-    info: winston.LeveledLogMethod;
-    warn: winston.LeveledLogMethod;
-    error: winston.LeveledLogMethod;
-    setMetaData: (data: any) => void;
-}
-export declare function createLogger(options?: Logger.Options): {
-    logger: Logger;
-};

package/dist/test.d.ts

@@ -1 +0,0 @@
-export {};