@rife/logger 0.0.5-beta.25 → 0.0.5-beta.27

package/dist/pino.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 env_1 = require("./env");
+const trace_1 = require("./trace");
 function getPinoConfig() {
     const targets = [];
     if ((0, env_1.isDev)()) {
@@ -15,23 +17,25 @@ function getPinoConfig() {
     }
     targets.push({
         level: 'debug',
-        target: 'pino/file',
-        options: { destination: './.logs/1.log', mkdir: true },
+        target: './rotate',
+        options: { path: './.logs/' },
     });
     const config = {
         // base: { pid: undefined, hostname: undefined },
         transport: { targets },
+        mixin(data) {
+            if (!data?.traceId) {
+                return { traceId: (0, trace_1.getTraceId)() };
+            }
+            return {};
+        },
     };
     return config;
 }
 const startTime = Symbol('startTime');
 function createLogger(options) {
-    let data = {};
     const logger = (0, pino_1.default)({
         ...getPinoConfig(),
-        mixin() {
-            return { ...data };
-        },
     });
     const express = () => {
         const { mapHttpRequest, mapHttpResponse } = require('pino-std-serializers');
@@ -39,17 +43,20 @@ function createLogger(options) {
             const response = res;
             response[startTime] = response[startTime] || Date.now();
             const traceId = req.headers['trace-id'];
+            if (traceId) {
+                (0, trace_1.setTraceId)(traceId);
+            }
             const onComplete = () => {
                 res.removeListener('close', onComplete);
                 res.removeListener('finish', onComplete);
                 res.removeListener('error', onComplete);
                 const duration = Date.now() - response[startTime];
-                logger.info({ traceId, duration, request: mapHttpRequest(req).req, response: mapHttpResponse(res).res });
+                logger.info({ duration, request: mapHttpRequest(req).req, response: mapHttpResponse(res).res }, 'request');
             };
             res.on('close', onComplete);
             res.on('finish', onComplete);
             res.on('error', onComplete);
-            next();
+            (0, trace_1.runInTrace)(next);
         };
     };
     const instance = logger;

package/dist/pino.js.map

@@ -1 +1 @@
-{"version":3,"file":"pino.js","sourceRoot":"","sources":["../src/pino.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAIxB,+BAA8B;AAc9B,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,WAAW;QACnB,OAAO,EAAE,EAAE,WAAW,EAAE,eAAe,EAAE,KAAK,EAAE,IAAI,EAAE;KACzD,CAAC,CAAC;IAEH,MAAM,MAAM,GAAuB;QAC/B,iDAAiD;QACjD,SAAS,EAAE,EAAE,OAAO,EAAE;KACzB,CAAC;IAEF,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;AAEtC,SAAgB,YAAY,CAAC,OAAyB;IAClD,IAAI,IAAI,GAAQ,EAAE,CAAC;IAEnB,MAAM,MAAM,GAAG,IAAA,cAAI,EAAC;QAChB,GAAG,aAAa,EAAE;QAClB,KAAK;YACD,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;QACvB,CAAC;KACJ,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,CAAC;YAExC,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,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;YAC7G,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,IAAI,EAAE,CAAC;QACX,CAAC,CAAC;IACN,CAAC,CAAC;IACF,MAAM,QAAQ,GAAG,MAAqD,CAAC;IAEvE,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC;IAE3B,OAAO,QAAQ,CAAC;AACpB,CAAC;AAvCD,oCAuCC"}
+{"version":3,"file":"pino.js","sourceRoot":"","sources":["../src/pino.ts"],"names":[],"mappings":";;;;AAAA,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,iDAAiD;QACjD,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,CAAC;YACxC,IAAI,OAAO,EAAE,CAAC;gBACV,IAAA,kBAAU,EAAC,OAAO,CAAC,CAAC;YACxB,CAAC;YACD,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,IAAI,CAAC,CAAC;QACrB,CAAC,CAAC;IACN,CAAC,CAAC;IACF,MAAM,QAAQ,GAAG,MAAqD,CAAC;IAEvE,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC;IAE3B,OAAO,QAAQ,CAAC;AACpB,CAAC;AApCD,oCAoCC"}

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

@@ -15,11 +15,11 @@ process.env.NODE_ENV = 'development';
 // 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.warn({ data: { a: 2 } }, '123');
-const e = new Error('123');
-(0, trace_1.runInTrace)(() => {
-    logger.error(e, '123');
-});
+const obj = {
+    i: 1,
+};
+setInterval(() => {
+    logger.warn(`${obj.i++}`);
+}, 1000);
 //# sourceMappingURL=test.js.map

package/dist/test.js.map

@@ -1 +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;AAErC,4CAA4C;AAE5C,0GAA0G;AAE1G,4DAA4D;AAC5D,iCAAiC;AACjC,6BAA6B;AAC7B,+BAA+B;AAC/B,gCAAgC;AAChC,6BAA6B;AAC7B,qBAAqB;AACrB,yBAAyB;AACzB,wCAAwC;AAExC,iCAAsC;AACtC,mCAAqC;AAErC,MAAM,MAAM,GAAG,IAAA,mBAAY,GAAE,CAAC;AAC9B,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;AAEvC,MAAM,CAAC,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;AAE3B,IAAA,kBAAU,EAAC,GAAG,EAAE;IACZ,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;AAC3B,CAAC,CAAC,CAAC"}
+{"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;AAErC,4CAA4C;AAE5C,0GAA0G;AAE1G,4DAA4D;AAC5D,iCAAiC;AACjC,6BAA6B;AAC7B,+BAA+B;AAC/B,gCAAgC;AAChC,6BAA6B;AAC7B,qBAAqB;AACrB,yBAAyB;AACzB,wCAAwC;AAExC,iCAAsC;AAGtC,MAAM,MAAM,GAAG,IAAA,mBAAY,GAAE,CAAC;AAE9B,MAAM,GAAG,GAAG;IACR,CAAC,EAAE,CAAC;CACP,CAAC;AACF,WAAW,CAAC,GAAG,EAAE;IACb,MAAM,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC,EAAE,IAAI,CAAC,CAAC"}

package/dist/trace.js

@@ -1,21 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setTraceId = exports.getTraceId = exports.runInTrace = exports.getNewTraceId = void 0;
+exports.setTraceId = exports.getTraceId = exports.runInTrace = 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);
+    const { v4 } = require('uuid');
+    return als.run({ traceId: v4() }, fn);
 }
 exports.runInTrace = runInTrace;
 function getTraceId() {
     return als.getStore()?.traceId;
 }
 exports.getTraceId = getTraceId;
-function setTraceId() {
-    return als.getStore()?.traceId;
+function setTraceId(traceId) {
+    return als.enterWith({ traceId });
 }
 exports.setTraceId = setTraceId;
 //# sourceMappingURL=trace.js.map

package/dist/trace.js.map

@@ -1 +1 @@
-{"version":3,"file":"trace.js","sourceRoot":"","sources":["../src/trace.ts"],"names":[],"mappings":";;;AAAA,6CAAgD;AAEhD,mCAAwC;AAExC,MAAM,GAAG,GAAG,IAAI,+BAAiB,EAA6B,CAAC;AAE/D,+EAA+E;AAClE,QAAA,aAAa,GAAG,IAAA,uBAAc,EAAC,mDAAmD,EAAE,CAAC,CAAC,CAAC;AAEpG,SAAgB,UAAU,CAAI,EAAyB;IACnD,OAAO,GAAG,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,IAAA,qBAAa,GAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AACrD,CAAC;AAFD,gCAEC;AAED,SAAgB,UAAU;IACtB,OAAO,GAAG,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC;AACnC,CAAC;AAFD,gCAEC;AAED,SAAgB,UAAU;IACtB,OAAO,GAAG,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC;AACnC,CAAC;AAFD,gCAEC"}
+{"version":3,"file":"trace.js","sourceRoot":"","sources":["../src/trace.ts"],"names":[],"mappings":";;;AAAA,6CAAgD;AAEhD,MAAM,GAAG,GAAG,IAAI,+BAAiB,EAA6B,CAAC;AAE/D,SAAgB,UAAU,CAAI,EAAyB;IACnD,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/B,OAAO,GAAG,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AAC1C,CAAC;AAHD,gCAGC;AAED,SAAgB,UAAU;IACtB,OAAO,GAAG,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC;AACnC,CAAC;AAFD,gCAEC;AAED,SAAgB,UAAU,CAAC,OAAe;IACtC,OAAO,GAAG,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;AACtC,CAAC;AAFD,gCAEC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rife/logger",
-  "version": "0.0.5-beta.25",
+  "version": "0.0.5-beta.27",
   "description": "",
   "main": "./dist/index.js",
   "types": "./src/index.ts",
@@ -9,13 +9,14 @@
       "require": "./dist/index.js"
     },
     "./pino": {
-      "require": "./dist/pino.js"
+      "require": "./dist/pino.js",
+      "types": "./src/pino.ts"
     }
   },
   "typesVersions": {
     "*": {
       "pino": [
-        "./src/pino"
+        "./src/pino.ts"
       ]
     }
   },
@@ -26,15 +27,16 @@
   ],
   "dependencies": {
     "chalk": "4",
-    "nanoid": "^3.3.6",
     "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",
+    "uuid": "^9.0.1",
     "winston": "^3.9.0",
     "winston-daily-rotate-file": "^4.7.1",
-    "@rife/config": "0.0.5-beta.25"
+    "@rife/config": "0.0.5-beta.27"
   },
   "scripts": {
     "dev": "infra dev",

package/src/pino.ts

@@ -1,8 +1,8 @@
 import pino from 'pino';
 // https://github.com/pinojs/pino/blob/master/docs/api.md
 
-import { getTraceId } from './trace';
 import { isDev } from './env';
+import { getTraceId, runInTrace, setTraceId } from './trace';
 
 export interface ILogger {
     debug: pino.LogFn;
@@ -29,13 +29,19 @@ function getPinoConfig() {
 
     targets.push({
         level: 'debug',
-        target: 'pino/file',
-        options: { destination: './.logs/1.log', mkdir: true },
+        target: './rotate',
+        options: { path: './.logs/' },
     });
 
     const config: pino.LoggerOptions = {
         // base: { pid: undefined, hostname: undefined },
         transport: { targets },
+        mixin(data: any) {
+            if (!data?.traceId) {
+                return { traceId: getTraceId() };
+            }
+            return {};
+        },
     };
 
     return config;
@@ -44,13 +50,8 @@ function getPinoConfig() {
 const startTime = Symbol('startTime');
 
 export function createLogger(options?: ILogger.Options) {
-    let data: any = {};
-
     const logger = pino({
         ...getPinoConfig(),
-        mixin() {
-            return { ...data };
-        },
     });
 
     const express = () => {
@@ -60,21 +61,23 @@ export function createLogger(options?: ILogger.Options) {
             const response: any = res;
             response[startTime] = response[startTime] || Date.now();
             const traceId = req.headers['trace-id'];
-
+            if (traceId) {
+                setTraceId(traceId);
+            }
             const onComplete = () => {
                 res.removeListener('close', onComplete);
                 res.removeListener('finish', onComplete);
                 res.removeListener('error', onComplete);
                 const duration = Date.now() - response[startTime];
 
-                logger.info({ traceId, duration, request: mapHttpRequest(req).req, response: mapHttpResponse(res).res });
+                logger.info({ duration, request: mapHttpRequest(req).req, response: mapHttpResponse(res).res }, 'request');
             };
 
             res.on('close', onComplete);
             res.on('finish', onComplete);
             res.on('error', onComplete);
 
-            next();
+            runInTrace(next);
         };
     };
     const instance = logger as typeof logger & { express: typeof 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

@@ -20,10 +20,10 @@ import { createLogger } from './pino';
 import { runInTrace } from './trace';
 
 const logger = createLogger();
-logger.warn({ data: { a: 2 } }, '123');
 
-const e = new Error('123');
-
-runInTrace(() => {
-    logger.error(e, '123');
-});
+const obj = {
+    i: 1,
+};
+setInterval(() => {
+    logger.warn(`${obj.i++}`);
+}, 1000);

package/src/trace.ts

@@ -1,20 +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);
+    const { v4 } = require('uuid');
+    return als.run({ traceId: v4() }, fn);
 }
 
 export function getTraceId() {
     return als.getStore()?.traceId;
 }
 
-export function setTraceId() {
-    return als.getStore()?.traceId;
+export function setTraceId(traceId: string) {
+    return als.enterWith({ traceId });
 }