@rife/logger 0.0.5-beta.4 → 0.0.5-beta.40

package/dist/env.js

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

package/dist/env.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":";;;AAAO,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC;AAArD,QAAA,MAAM,UAA+C;AAE3D,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,CAAC,IAAA,cAAM,GAAE,CAAC;AAAxB,QAAA,KAAK,SAAmB"}

package/dist/index.js

@@ -1,125 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLogger = exports.getTraceId = exports.runInTrace = exports.getNewTraceId = exports.winston = 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"));
-exports.winston = winston_1.default;
-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, json } = 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 logger = {
-        info: instance.info.bind(instance),
-        warn: instance.warn.bind(instance),
-        error: instance.error.bind(instance),
-    };
-    return { logger, instance };
-}
-exports.createLogger = createLogger;
+tslib_1.__exportStar(require("./trace"), exports);
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,kDAAwB"}

package/dist/pino.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createLogger = createLogger;
+const tslib_1 = require("tslib");
+const pino_1 = tslib_1.__importDefault(require("pino"));
+// https://github.com/pinojs/pino/blob/master/docs/api.md
+const env_1 = require("./env");
+const trace_1 = require("./trace");
+function getPinoConfig() {
+    const targets = [];
+    if ((0, env_1.isDev)()) {
+        targets.push({
+            level: 'debug',
+            target: 'pino-pretty', // must be installed separately,
+            options: {},
+        });
+    }
+    targets.push({
+        level: 'debug',
+        target: './rotate',
+        options: { path: './.logs/' },
+    });
+    const config = {
+        transport: { targets },
+        mixin(data) {
+            if (!data?.traceId) {
+                return { traceId: (0, trace_1.getTraceId)() };
+            }
+            return {};
+        },
+    };
+    return config;
+}
+const startTime = Symbol('startTime');
+function createLogger(options) {
+    const logger = (0, pino_1.default)({
+        ...getPinoConfig(),
+    });
+    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'] || (0, trace_1.genTraceId)();
+            const onComplete = () => {
+                res.removeListener('close', onComplete);
+                res.removeListener('finish', onComplete);
+                res.removeListener('error', onComplete);
+                const duration = Date.now() - response[startTime];
+                logger.info({ duration, request: mapHttpRequest(req).req, response: mapHttpResponse(res).res }, 'request');
+            };
+            res.on('close', onComplete);
+            res.on('finish', onComplete);
+            res.on('error', onComplete);
+            (0, trace_1.runInTrace)({ traceId }, next);
+        };
+    };
+    return { logger, express };
+}
+//# sourceMappingURL=pino.js.map

package/dist/pino.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pino.js","sourceRoot":"","sources":["../src/pino.ts"],"names":[],"mappings":";;AAkDA,oCA+BC;;AAjFD,wDAAwB;AACxB,yDAAyD;AAEzD,+BAA8B;AAC9B,mCAA6D;AAc7D,SAAS,aAAa;IAClB,MAAM,OAAO,GAAQ,EAAE,CAAC;IAExB,IAAI,IAAA,WAAK,GAAE,EAAE,CAAC;QACV,OAAO,CAAC,IAAI,CAAC;YACT,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,aAAa,EAAE,gCAAgC;YACvD,OAAO,EAAE,EAAE;SACd,CAAC,CAAC;IACP,CAAC;IAED,OAAO,CAAC,IAAI,CAAC;QACT,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,UAAU;QAClB,OAAO,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE;KAChC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAuB;QAC/B,SAAS,EAAE,EAAE,OAAO,EAAE;QACtB,KAAK,CAAC,IAAS;YACX,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC;gBACjB,OAAO,EAAE,OAAO,EAAE,IAAA,kBAAU,GAAE,EAAE,CAAC;YACrC,CAAC;YACD,OAAO,EAAE,CAAC;QACd,CAAC;KACJ,CAAC;IAEF,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;AAEtC,SAAgB,YAAY,CAAC,OAAyB;IAClD,MAAM,MAAM,GAAG,IAAA,cAAI,EAAC;QAChB,GAAG,aAAa,EAAE;KACrB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,GAAG,EAAE;QACjB,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,sBAAsB,CAA0C,CAAC;QAErH,OAAO,CAAC,GAAQ,EAAE,GAAQ,EAAE,IAAS,EAAE,EAAE;YACrC,MAAM,QAAQ,GAAQ,GAAG,CAAC;YAC1B,QAAQ,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACxD,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,IAAA,kBAAU,GAAE,CAAC;YAExD,MAAM,UAAU,GAAG,GAAG,EAAE;gBACpB,GAAG,CAAC,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;gBACxC,GAAG,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;gBACzC,GAAG,CAAC,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;gBACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;gBAElD,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;YAC/G,CAAC,CAAC;YAEF,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YAC5B,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YAC7B,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YAE5B,IAAA,kBAAU,EAAC,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,CAAC;QAClC,CAAC,CAAC;IACN,CAAC,CAAC;IAEF,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AAC/B,CAAC"}

package/dist/rotate.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const generator = (time, index) => {
+    if (!time) {
+        return 'server.log';
+    }
+    time = new Date(time);
+    const month = String(time.getMonth() + 1).padStart(2, '0');
+    const day = String(time.getDate()).padStart(2, '0');
+    if (index) {
+        const count = String(index).padStart(3, '0');
+        return `server.${time.getFullYear()}${month}${day}-${count}.log`;
+    }
+    return `server.${time.getFullYear()}${month}${day}.log`;
+};
+exports.default = (options) => {
+    const { createStream } = require('rotating-file-stream');
+    const { path } = options;
+    return createStream(generator, {
+        size: '50M',
+        maxSize: '500M',
+        interval: '1d',
+        path,
+    });
+};
+//# sourceMappingURL=rotate.js.map

package/dist/rotate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rotate.js","sourceRoot":"","sources":["../src/rotate.ts"],"names":[],"mappings":";;AAMA,MAAM,SAAS,GAAG,CAAC,IAAmB,EAAE,KAAc,EAAE,EAAE;IACtD,IAAI,CAAC,IAAI,EAAE,CAAC;QACR,OAAO,YAAY,CAAC;IACxB,CAAC;IACD,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;IAEtB,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC3D,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACpD,IAAI,KAAK,EAAE,CAAC;QACR,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAC7C,OAAO,UAAU,IAAI,CAAC,WAAW,EAAE,GAAG,KAAK,GAAG,GAAG,IAAI,KAAK,MAAM,CAAC;IACrE,CAAC;IACD,OAAO,UAAU,IAAI,CAAC,WAAW,EAAE,GAAG,KAAK,GAAG,GAAG,MAAM,CAAC;AAC5D,CAAC,CAAC;AAEF,kBAAe,CAAC,OAAsC,EAAE,EAAE;IACtD,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,sBAAsB,CAA0C,CAAC;IAElG,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACzB,OAAO,YAAY,CAAC,SAAS,EAAE;QAC3B,IAAI,EAAE,KAAK;QACX,OAAO,EAAE,MAAM;QACf,QAAQ,EAAE,IAAI;QACd,IAAI;KACP,CAAC,CAAC;AACP,CAAC,CAAC"}

package/dist/test.js

@@ -2,21 +2,7 @@
 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';
+const trace_1 = require("./trace");
+console.log((0, trace_1.genTraceId)());
+//# sourceMappingURL=test.js.map

package/dist/test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":";;AAAA,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,aAAa,CAAC;AACrC,uCAAuC;AACvC,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,aAAa,CAAC;AAiBrC,mCAAqC;AAErC,OAAO,CAAC,GAAG,CAAC,IAAA,kBAAU,GAAE,CAAC,CAAC"}

package/dist/trace.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runInTrace = runInTrace;
+exports.genTraceId = genTraceId;
+exports.getTraceId = getTraceId;
+const async_hooks_1 = require("async_hooks");
+const als = new async_hooks_1.AsyncLocalStorage();
+function runInTrace(data, fn) {
+    return als.run(data, fn);
+}
+function genTraceId() {
+    return crypto.randomUUID();
+}
+function getTraceId() {
+    return als.getStore()?.traceId;
+}
+//# sourceMappingURL=trace.js.map

package/dist/trace.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trace.js","sourceRoot":"","sources":["../src/trace.ts"],"names":[],"mappings":";;AAIA,gCAEC;AAED,gCAEC;AAED,gCAEC;AAdD,6CAAgD;AAEhD,MAAM,GAAG,GAAG,IAAI,+BAAiB,EAA6B,CAAC;AAE/D,SAAgB,UAAU,CAAI,IAAS,EAAE,EAAyB;IAC9D,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAC7B,CAAC;AAED,SAAgB,UAAU;IACtB,OAAO,MAAM,CAAC,UAAU,EAAE,CAAC;AAC/B,CAAC;AAED,SAAgB,UAAU;IACtB,OAAO,GAAG,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC;AACnC,CAAC"}

package/dist/winston.js

@@ -0,0 +1,118 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createLogger = createLogger;
+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 };
+}
+//# sourceMappingURL=winston.js.map

package/dist/winston.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"winston.js","sourceRoot":"","sources":["../src/winston.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,9 +1,26 @@
 {
   "name": "@rife/logger",
-  "version": "0.0.5-beta.4",
+  "version": "0.0.5-beta.40",
   "description": "",
   "main": "./dist/index.js",
   "types": "./src/index.ts",
+  "exports": {
+    ".": {
+      "require": "./dist/index.js",
+      "types": "./src/index.ts"
+    },
+    "./pino": {
+      "require": "./dist/pino.js",
+      "types": "./src/pino.ts"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "pino": [
+        "./src/pino.ts"
+      ]
+    }
+  },
   "files": [
     "dist/**/*",
     "src/**/*",
@@ -11,10 +28,15 @@
   ],
   "dependencies": {
     "chalk": "4",
-    "nanoid": "^3.1.30",
-    "winston": "^3.3.3",
-    "winston-daily-rotate-file": "^4.5.5",
-    "@rife/config": "0.0.5-beta.4"
+    "pino": "^8.16.1",
+    "pino-http": "^8.5.1",
+    "pino-pretty": "^10.2.3",
+    "pino-std-serializers": "^6.2.2",
+    "rotating-file-stream": "^3.2.1",
+    "safe-stable-stringify": "^2.4.3",
+    "winston": "^3.9.0",
+    "winston-daily-rotate-file": "^4.7.1",
+    "@rife/config": "0.0.5-beta.40"
   },
   "scripts": {
     "dev": "infra dev",

package/src/env.ts

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

package/src/index.ts

@@ -1,187 +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 { 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 Rife {
-    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;
-    }
-}
-
-export function createLogger(options?: Rife.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, json } = 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 logger: Rife.Logger = {
-        info: instance.info.bind(instance),
-        warn: instance.warn.bind(instance),
-        error: instance.error.bind(instance),
-    };
-
-    return { logger, instance };
-}
+export * from './trace';

package/src/pino.ts

@@ -0,0 +1,82 @@
+import pino from 'pino';
+// https://github.com/pinojs/pino/blob/master/docs/api.md
+
+import { isDev } from './env';
+import { genTraceId, getTraceId, runInTrace } from './trace';
+
+export interface ILogger {
+    debug: pino.LogFn;
+    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: {},
+        });
+    }
+
+    targets.push({
+        level: 'debug',
+        target: './rotate',
+        options: { path: './.logs/' },
+    });
+
+    const config: pino.LoggerOptions = {
+        transport: { targets },
+        mixin(data: any) {
+            if (!data?.traceId) {
+                return { traceId: getTraceId() };
+            }
+            return {};
+        },
+    };
+
+    return config;
+}
+
+const startTime = Symbol('startTime');
+
+export function createLogger(options?: ILogger.Options) {
+    const logger = pino({
+        ...getPinoConfig(),
+    });
+
+    const express = () => {
+        const { mapHttpRequest, mapHttpResponse } = require('pino-std-serializers') as typeof import('pino-std-serializers');
+
+        return (req: any, res: any, next: any) => {
+            const response: any = res;
+            response[startTime] = response[startTime] || Date.now();
+            const traceId = req.headers['trace-id'] || genTraceId();
+
+            const onComplete = () => {
+                res.removeListener('close', onComplete);
+                res.removeListener('finish', onComplete);
+                res.removeListener('error', onComplete);
+                const duration = Date.now() - response[startTime];
+
+                logger.info({ duration, request: mapHttpRequest(req).req, response: mapHttpResponse(res).res }, 'request');
+            };
+
+            res.on('close', onComplete);
+            res.on('finish', onComplete);
+            res.on('error', onComplete);
+
+            runInTrace({ traceId }, next);
+        };
+    };
+
+    return { logger, express };
+}

package/src/rotate.ts

@@ -0,0 +1,32 @@
+import type { Options } from 'rotating-file-stream';
+
+export interface PinoRotatingFileStreamOptions extends Options {
+    path: string;
+}
+
+const generator = (time: number | Date, index?: number) => {
+    if (!time) {
+        return 'server.log';
+    }
+    time = new Date(time);
+
+    const month = String(time.getMonth() + 1).padStart(2, '0');
+    const day = String(time.getDate()).padStart(2, '0');
+    if (index) {
+        const count = String(index).padStart(3, '0');
+        return `server.${time.getFullYear()}${month}${day}-${count}.log`;
+    }
+    return `server.${time.getFullYear()}${month}${day}.log`;
+};
+
+export default (options: PinoRotatingFileStreamOptions) => {
+    const { createStream } = require('rotating-file-stream') as typeof import('rotating-file-stream');
+
+    const { path } = options;
+    return createStream(generator, {
+        size: '50M',
+        maxSize: '500M',
+        interval: '1d',
+        path,
+    });
+};

package/src/test.ts

@@ -1,25 +1,22 @@
-process.env.NODE_ENV = 'development';
-// process.env.NODE_ENV = 'production';
-
-import { createLogger } from '.';
-
-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'));
-
-// 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';
+// process.env.NODE_ENV = 'production';
+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'));
+
+import { createLogger } from './pino';
+import { genTraceId } from './trace';
+
+console.log(genTraceId());

package/src/trace.ts

@@ -0,0 +1,15 @@
+import { AsyncLocalStorage } from 'async_hooks';
+
+const als = new AsyncLocalStorage<{ traceId: string } & any>();
+
+export function runInTrace<T>(data: any, fn: (...args: any[]) => T): T {
+    return als.run(data, fn);
+}
+
+export function genTraceId() {
+    return crypto.randomUUID();
+}
+
+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/tsconfig.json

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

package/dist/index.d.ts

@@ -1,56 +0,0 @@
-import winston from 'winston';
-import 'winston-daily-rotate-file';
-export { 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 Rife {
-    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;
-            };
-        }
-    }
-    interface Logger {
-        info: winston.LeveledLogMethod;
-        warn: winston.LeveledLogMethod;
-        error: winston.LeveledLogMethod;
-    }
-}
-export declare function createLogger(options?: Rife.Logger.Options): {
-    logger: Rife.Logger;
-    instance: winston.Logger;
-};

package/dist/test.d.ts

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