@rife/logger 0.0.5-beta.8 → 0.0.6-beta.1

package/dist/env.d.ts

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

package/dist/env.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    isDev: function() {
+        return isDev;
+    },
+    isProd: function() {
+        return isProd;
+    }
+});
+const isProd = ()=>process.env.NODE_ENV === 'production';
+const isDev = ()=>!isProd();
+
+//# sourceMappingURL=env.js.map

package/dist/env.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/env.ts"],"sourcesContent":["export const isProd = () => process.env.NODE_ENV === 'production';\n\nexport const isDev = () => !isProd();\n"],"names":["isDev","isProd","process","env","NODE_ENV"],"mappings":";;;;;;;;;;;IAEaA,KAAK;eAALA;;IAFAC,MAAM;eAANA;;;AAAN,MAAMA,SAAS,IAAMC,QAAQC,GAAG,CAACC,QAAQ,KAAK;AAE9C,MAAMJ,QAAQ,IAAM,CAACC"}

package/dist/index.d.ts

@@ -1,54 +1 @@
-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;
-};
+export * from './trace';

package/dist/index.js

@@ -1,131 +1,8 @@
 "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}`;
+Object.defineProperty(exports, "__esModule", {
+    value: true
 });
-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;
+const _export_star = require("@swc/helpers/_/_export_star");
+_export_star._(require("./trace"), exports);
+
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["export * from './trace';\n"],"names":[],"mappings":";;;;;uBAAc"}

package/dist/pino.d.ts

@@ -0,0 +1,8 @@
+export declare namespace ILogger {
+    interface Options {
+    }
+}
+export declare function createLogger(options?: ILogger.Options): {
+    logger: import("pino").Logger<never, boolean>;
+    express: () => (req: any, res: any, next: any) => void;
+};

package/dist/pino.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "createLogger", {
+    enumerable: true,
+    get: function() {
+        return createLogger;
+    }
+});
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _pino = /*#__PURE__*/ _interop_require_default._(require("pino"));
+const _env = require("./env");
+const _trace = require("./trace");
+function getPinoConfig() {
+    const targets = [];
+    if ((0, _env.isDev)()) {
+        targets.push({
+            level: 'debug',
+            target: 'pino-pretty',
+            options: {}
+        });
+    }
+    targets.push({
+        level: 'debug',
+        target: './rotate',
+        options: {
+            path: './.logs/'
+        }
+    });
+    const config = {
+        transport: {
+            targets
+        },
+        mixin (data) {
+            // {"level":30,"time":1726065716643,"pid":21968,"hostname":"Win-LH"}
+            // 基础字段不能重复 删除掉
+            delete data.level;
+            delete data.time;
+            delete data.pid;
+            delete data.hostname;
+            if (!data?.traceId) {
+                return {
+                    traceId: (0, _trace.getTraceId)()
+                };
+            }
+            return {};
+        }
+    };
+    return config;
+}
+const startTime = Symbol('startTime');
+function createLogger(options) {
+    const logger = (0, _pino.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.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.runInTrace)({
+                traceId
+            }, next);
+        };
+    };
+    return {
+        logger,
+        express
+    };
+}
+
+//# sourceMappingURL=pino.js.map

package/dist/pino.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/pino.ts"],"sourcesContent":["import pino from 'pino';\r\n// https://github.com/pinojs/pino/blob/master/docs/api.md\r\n\r\nimport { isDev } from './env';\r\nimport { genTraceId, getTraceId, runInTrace } from './trace';\r\n\r\nexport namespace ILogger {\r\n    export interface Options {}\r\n}\r\n\r\nfunction getPinoConfig() {\r\n    const targets: any = [];\r\n\r\n    if (isDev()) {\r\n        targets.push({\r\n            level: 'debug',\r\n            target: 'pino-pretty', // must be installed separately,\r\n            options: {},\r\n        });\r\n    }\r\n\r\n    targets.push({\r\n        level: 'debug',\r\n        target: './rotate',\r\n        options: { path: './.logs/' },\r\n    });\r\n\r\n    const config: pino.LoggerOptions = {\r\n        transport: { targets },\r\n        mixin(data: any) {\r\n            // {\"level\":30,\"time\":1726065716643,\"pid\":21968,\"hostname\":\"Win-LH\"}\r\n            // 基础字段不能重复 删除掉\r\n            delete data.level;\r\n            delete data.time;\r\n            delete data.pid;\r\n            delete data.hostname;\r\n            if (!data?.traceId) {\r\n                return { traceId: getTraceId() };\r\n            }\r\n            return {};\r\n        },\r\n    };\r\n\r\n    return config;\r\n}\r\n\r\nconst startTime = Symbol('startTime');\r\n\r\nexport function createLogger(options?: ILogger.Options) {\r\n    const logger = pino({\r\n        ...getPinoConfig(),\r\n    });\r\n\r\n    const express = () => {\r\n        const { mapHttpRequest, mapHttpResponse } = require('pino-std-serializers') as typeof import('pino-std-serializers');\r\n\r\n        return (req: any, res: any, next: any) => {\r\n            const response: any = res;\r\n            response[startTime] = response[startTime] || Date.now();\r\n            const traceId = req.headers['trace-id'] || genTraceId();\r\n\r\n            const onComplete = () => {\r\n                res.removeListener('close', onComplete);\r\n                res.removeListener('finish', onComplete);\r\n                res.removeListener('error', onComplete);\r\n                const duration = Date.now() - response[startTime];\r\n\r\n                logger.info({ duration, request: mapHttpRequest(req).req, response: mapHttpResponse(res).res }, 'request');\r\n            };\r\n\r\n            res.on('close', onComplete);\r\n            res.on('finish', onComplete);\r\n            res.on('error', onComplete);\r\n\r\n            runInTrace({ traceId }, next);\r\n        };\r\n    };\r\n\r\n    return { logger, express };\r\n}\r\n"],"names":["createLogger","getPinoConfig","targets","isDev","push","level","target","options","path","config","transport","mixin","data","time","pid","hostname","traceId","getTraceId","startTime","Symbol","logger","pino","express","mapHttpRequest","mapHttpResponse","require","req","res","next","response","Date","now","headers","genTraceId","onComplete","removeListener","duration","info","request","on","runInTrace"],"mappings":";;;;+BAgDgBA;;;eAAAA;;;;+DAhDC;qBAGK;uBAC6B;AAMnD,SAASC;IACL,MAAMC,UAAe,EAAE;IAEvB,IAAIC,IAAAA,UAAK,KAAI;QACTD,QAAQE,IAAI,CAAC;YACTC,OAAO;YACPC,QAAQ;YACRC,SAAS,CAAC;QACd;IACJ;IAEAL,QAAQE,IAAI,CAAC;QACTC,OAAO;QACPC,QAAQ;QACRC,SAAS;YAAEC,MAAM;QAAW;IAChC;IAEA,MAAMC,SAA6B;QAC/BC,WAAW;YAAER;QAAQ;QACrBS,OAAMC,IAAS;YACX,oEAAoE;YACpE,eAAe;YACf,OAAOA,KAAKP,KAAK;YACjB,OAAOO,KAAKC,IAAI;YAChB,OAAOD,KAAKE,GAAG;YACf,OAAOF,KAAKG,QAAQ;YACpB,IAAI,CAACH,MAAMI,SAAS;gBAChB,OAAO;oBAAEA,SAASC,IAAAA,iBAAU;gBAAG;YACnC;YACA,OAAO,CAAC;QACZ;IACJ;IAEA,OAAOR;AACX;AAEA,MAAMS,YAAYC,OAAO;AAElB,SAASnB,aAAaO,OAAyB;IAClD,MAAMa,SAASC,IAAAA,aAAI,EAAC;QAChB,GAAGpB,eAAe;IACtB;IAEA,MAAMqB,UAAU;QACZ,MAAM,EAAEC,cAAc,EAAEC,eAAe,EAAE,GAAGC,QAAQ;QAEpD,OAAO,CAACC,KAAUC,KAAUC;YACxB,MAAMC,WAAgBF;YACtBE,QAAQ,CAACX,UAAU,GAAGW,QAAQ,CAACX,UAAU,IAAIY,KAAKC,GAAG;YACrD,MAAMf,UAAUU,IAAIM,OAAO,CAAC,WAAW,IAAIC,IAAAA,iBAAU;YAErD,MAAMC,aAAa;gBACfP,IAAIQ,cAAc,CAAC,SAASD;gBAC5BP,IAAIQ,cAAc,CAAC,UAAUD;gBAC7BP,IAAIQ,cAAc,CAAC,SAASD;gBAC5B,MAAME,WAAWN,KAAKC,GAAG,KAAKF,QAAQ,CAACX,UAAU;gBAEjDE,OAAOiB,IAAI,CAAC;oBAAED;oBAAUE,SAASf,eAAeG,KAAKA,GAAG;oBAAEG,UAAUL,gBAAgBG,KAAKA,GAAG;gBAAC,GAAG;YACpG;YAEAA,IAAIY,EAAE,CAAC,SAASL;YAChBP,IAAIY,EAAE,CAAC,UAAUL;YACjBP,IAAIY,EAAE,CAAC,SAASL;YAEhBM,IAAAA,iBAAU,EAAC;gBAAExB;YAAQ,GAAGY;QAC5B;IACJ;IAEA,OAAO;QAAER;QAAQE;IAAQ;AAC7B"}

package/dist/rotate.d.ts

@@ -0,0 +1,6 @@
+import type { Options } from 'rotating-file-stream';
+export interface PinoRotatingFileStreamOptions extends Options {
+    path: string;
+}
+declare const _default: (options: PinoRotatingFileStreamOptions) => import("rotating-file-stream").RotatingFileStream;
+export default _default;

package/dist/rotate.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return _default;
+    }
+});
+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`;
+};
+const _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,"sources":["../src/rotate.ts"],"sourcesContent":["import type { Options } from 'rotating-file-stream';\n\nexport interface PinoRotatingFileStreamOptions extends Options {\n    path: string;\n}\n\nconst generator = (time: number | Date, index?: number) => {\n    if (!time) {\n        return 'server.log';\n    }\n    time = new Date(time);\n\n    const month = String(time.getMonth() + 1).padStart(2, '0');\n    const day = String(time.getDate()).padStart(2, '0');\n    if (index) {\n        const count = String(index).padStart(3, '0');\n        return `server.${time.getFullYear()}${month}${day}-${count}.log`;\n    }\n    return `server.${time.getFullYear()}${month}${day}.log`;\n};\n\nexport default (options: PinoRotatingFileStreamOptions) => {\n    const { createStream } = require('rotating-file-stream') as typeof import('rotating-file-stream');\n\n    const { path } = options;\n    return createStream(generator, {\n        size: '50M',\n        maxSize: '500M',\n        interval: '1d',\n        path,\n    });\n};\n"],"names":["generator","time","index","Date","month","String","getMonth","padStart","day","getDate","count","getFullYear","options","createStream","require","path","size","maxSize","interval"],"mappings":";;;;+BAqBA;;;eAAA;;;AAfA,MAAMA,YAAY,CAACC,MAAqBC;IACpC,IAAI,CAACD,MAAM;QACP,OAAO;IACX;IACAA,OAAO,IAAIE,KAAKF;IAEhB,MAAMG,QAAQC,OAAOJ,KAAKK,QAAQ,KAAK,GAAGC,QAAQ,CAAC,GAAG;IACtD,MAAMC,MAAMH,OAAOJ,KAAKQ,OAAO,IAAIF,QAAQ,CAAC,GAAG;IAC/C,IAAIL,OAAO;QACP,MAAMQ,QAAQL,OAAOH,OAAOK,QAAQ,CAAC,GAAG;QACxC,OAAO,CAAC,OAAO,EAAEN,KAAKU,WAAW,KAAKP,QAAQI,IAAI,CAAC,EAAEE,MAAM,IAAI,CAAC;IACpE;IACA,OAAO,CAAC,OAAO,EAAET,KAAKU,WAAW,KAAKP,QAAQI,IAAI,IAAI,CAAC;AAC3D;MAEA,WAAe,CAACI;IACZ,MAAM,EAAEC,YAAY,EAAE,GAAGC,QAAQ;IAEjC,MAAM,EAAEC,IAAI,EAAE,GAAGH;IACjB,OAAOC,aAAab,WAAW;QAC3BgB,MAAM;QACNC,SAAS;QACTC,UAAU;QACVH;IACJ;AACJ"}

package/dist/test.js

@@ -1,22 +1,23 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+const _pino = require("./pino");
+const _trace = require("./trace");
 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);
+const { logger } = (0, _pino.createLogger)();
+logger.info({
+    time: 1,
+    level: 1,
+    hostname: 1,
+    pid: 1,
+    c: 2
+}, '123');
+const start = performance.now();
+logger.info({
+    duration: performance.now() - start,
+    id: (0, _trace.genTraceId)()
+});
+console.log(module);
+
+//# sourceMappingURL=test.js.map

package/dist/test.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/test.ts"],"sourcesContent":["process.env.NODE_ENV = 'development';\n// process.env.NODE_ENV = 'production';\n\nimport { createLogger } from './pino';\nimport { genTraceId } from './trace';\n\nconst { logger } = createLogger();\n\nlogger.info({ time: 1, level: 1, hostname: 1, pid: 1, c: 2 }, '123');\n\nconst start = performance.now();\nlogger.info({ duration: performance.now() - start, id: genTraceId() });\n\nconsole.log(module);\n"],"names":["process","env","NODE_ENV","logger","createLogger","info","time","level","hostname","pid","c","start","performance","now","duration","id","genTraceId","console","log","module"],"mappings":";;;;sBAG6B;uBACF;AAJ3BA,QAAQC,GAAG,CAACC,QAAQ,GAAG;AAMvB,MAAM,EAAEC,MAAM,EAAE,GAAGC,IAAAA,kBAAY;AAE/BD,OAAOE,IAAI,CAAC;IAAEC,MAAM;IAAGC,OAAO;IAAGC,UAAU;IAAGC,KAAK;IAAGC,GAAG;AAAE,GAAG;AAE9D,MAAMC,QAAQC,YAAYC,GAAG;AAC7BV,OAAOE,IAAI,CAAC;IAAES,UAAUF,YAAYC,GAAG,KAAKF;IAAOI,IAAIC,IAAAA,iBAAU;AAAG;AAEpEC,QAAQC,GAAG,CAACC"}

package/dist/trace.d.ts

@@ -0,0 +1,3 @@
+export declare function runInTrace<T>(data: any, fn: (...args: any[]) => T): T;
+export declare function genTraceId(): `${string}-${string}-${string}-${string}-${string}`;
+export declare function getTraceId(): any;

package/dist/trace.js

@@ -1 +1,35 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    genTraceId: function() {
+        return genTraceId;
+    },
+    getTraceId: function() {
+        return getTraceId;
+    },
+    runInTrace: function() {
+        return runInTrace;
+    }
+});
+const _async_hooks = require("async_hooks");
+const als = new _async_hooks.AsyncLocalStorage();
+function runInTrace(data, fn) {
+    return als.run(data, fn);
+}
+function genTraceId() {
+    // crypto 680
+    return crypto.randomUUID();
+}
+function getTraceId() {
+    return als.getStore()?.traceId;
+}
+
+//# sourceMappingURL=trace.js.map

package/dist/trace.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/trace.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'async_hooks';\n\nconst als = new AsyncLocalStorage<{ traceId: string } & any>();\n\nexport function runInTrace<T>(data: any, fn: (...args: any[]) => T): T {\n    return als.run(data, fn);\n}\n\nexport function genTraceId() {\n    // crypto 680\n    return crypto.randomUUID();\n}\n\nexport function getTraceId() {\n    return als.getStore()?.traceId;\n}\n"],"names":["genTraceId","getTraceId","runInTrace","als","AsyncLocalStorage","data","fn","run","crypto","randomUUID","getStore","traceId"],"mappings":";;;;;;;;;;;IAQgBA,UAAU;eAAVA;;IAKAC,UAAU;eAAVA;;IATAC,UAAU;eAAVA;;;6BAJkB;AAElC,MAAMC,MAAM,IAAIC,8BAAiB;AAE1B,SAASF,WAAcG,IAAS,EAAEC,EAAyB;IAC9D,OAAOH,IAAII,GAAG,CAACF,MAAMC;AACzB;AAEO,SAASN;IACZ,aAAa;IACb,OAAOQ,OAAOC,UAAU;AAC5B;AAEO,SAASR;IACZ,OAAOE,IAAIO,QAAQ,IAAIC;AAC3B"}

package/package.json

@@ -1,25 +1,50 @@
 {
   "name": "@rife/logger",
-  "version": "0.0.5-beta.8",
+  "version": "0.0.6-beta.1",
   "description": "",
   "main": "./dist/index.js",
   "types": "./src/index.ts",
+  "exports": {
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.js",
+      "types": "./src/index.ts"
+    },
+    "./pino": {
+      "require": "./dist/pino.js",
+      "import": "./dist/pino.js",
+      "types": "./src/pino.ts"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "pino": [
+        "./src/pino.ts"
+      ]
+    }
+  },
   "files": [
     "dist/**/*",
     "src/**/*",
     "tsconfig.json"
   ],
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
   "dependencies": {
-    "chalk": "4",
-    "nanoid": "^3.3.6",
-    "safe-stable-stringify": "^2.4.3",
-    "winston": "^3.9.0",
-    "winston-daily-rotate-file": "^4.7.1",
-    "@rife/config": "0.0.5-beta.8"
+    "pino": "^9.6.0",
+    "pino-http": "^10.4.0",
+    "pino-pretty": "^13.0.0",
+    "pino-std-serializers": "^7.0.0",
+    "rotating-file-stream": "^3.2.5"
+  },
+  "devDependencies": {
+    "@rife/cli": "0.0.6-beta.1"
   },
   "scripts": {
-    "dev": "infra dev",
-    "build": "infra build",
-    "prepublish": "infra build"
+    "dev": "rife dev",
+    "build": "rife build",
+    "lint": "eslint . --fix",
+    "release": "pnpm publish --registry https://registry.npmjs.org --no-git-checks"
   }
 }

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,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,80 @@
+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 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) {
+            // {"level":30,"time":1726065716643,"pid":21968,"hostname":"Win-LH"}
+            // 基础字段不能重复 删除掉
+            delete data.level;
+            delete data.time;
+            delete data.pid;
+            delete data.hostname;
+            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,14 @@
 process.env.NODE_ENV = 'development';
 // process.env.NODE_ENV = 'production';
 
-import { createLogger } from '.';
+import { createLogger } from './pino';
+import { genTraceId } from './trace';
 
-const { logger } = createLogger({ writeToFile: false, writeToConsole: true, format: { time: false } });
+const { logger } = createLogger();
 
-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'));
+logger.info({ time: 1, level: 1, hostname: 1, pid: 1, c: 2 }, '123');
 
-// import { format } from 'logform';
+const start = performance.now();
+logger.info({ duration: performance.now() - start, id: genTraceId() });
 
-// const jsonFormat = format.json({ space: 2 });
-// const info = jsonFormat.transform({
-//     level: 'info',
-//     message: 'my message',
-// });
-// console.log(info);
+console.log(module);

package/src/trace.ts

@@ -0,0 +1,16 @@
+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() {
+    // crypto 680
+    return crypto.randomUUID();
+}
+
+export function getTraceId() {
+    return als.getStore()?.traceId;
+}

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": true,
+        "baseUrl": ".",
+        "paths": {
+            "@/*": ["./src/*"]
+        }
+    },
+    "include": ["./src/**/*"]
+}