@rife/logger 0.0.5-beta.30 → 0.0.5-beta.32

package/dist/pino.js

@@ -21,7 +21,6 @@ function getPinoConfig() {
         options: { path: './.logs/' },
     });
     const config = {
-        // base: { pid: undefined, hostname: undefined },
         transport: { targets },
         mixin(data) {
             if (!data?.traceId) {
@@ -42,10 +41,7 @@ function createLogger(options) {
         return (req, res, next) => {
             const response = res;
             response[startTime] = response[startTime] || Date.now();
-            const traceId = req.headers['trace-id'];
-            if (traceId) {
-                (0, trace_1.setTraceId)(traceId);
-            }
+            const traceId = req.headers['trace-id'] || (0, trace_1.genTraceId)();
             const onComplete = () => {
                 res.removeListener('close', onComplete);
                 res.removeListener('finish', onComplete);
@@ -56,11 +52,9 @@ function createLogger(options) {
             res.on('close', onComplete);
             res.on('finish', onComplete);
             res.on('error', onComplete);
-            (0, trace_1.runInTrace)(next);
+            (0, trace_1.runInTrace)({ traceId }, next);
         };
     };
-    const instance = logger;
-    instance.express = express;
-    return instance;
+    return { logger, express };
 }
 //# sourceMappingURL=pino.js.map

package/dist/pino.js.map

@@ -1 +1 @@
-{"version":3,"file":"pino.js","sourceRoot":"","sources":["../src/pino.ts"],"names":[],"mappings":";;AAmDA,oCAoCC;;AAvFD,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"}
+{"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/test.js

@@ -3,23 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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'));
-const pino_1 = require("./pino");
-const logger = (0, pino_1.createLogger)();
-const obj = {
-    i: 1,
-};
-setInterval(() => {
-    logger.warn(`${obj.i++}`);
-}, 1000);
+const trace_1 = require("./trace");
+console.log((0, trace_1.genTraceId)());
 //# 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;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"}
+{"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

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

package/dist/trace.js.map

@@ -1 +1 @@
-{"version":3,"file":"trace.js","sourceRoot":"","sources":["../src/trace.ts"],"names":[],"mappings":";;AAIA,gCAGC;AAED,gCAEC;AAED,gCAEC;AAfD,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;AAED,SAAgB,UAAU;IACtB,OAAO,GAAG,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC;AACnC,CAAC;AAED,SAAgB,UAAU,CAAC,OAAe;IACtC,OAAO,GAAG,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;AACtC,CAAC"}
+{"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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rife/logger",
-  "version": "0.0.5-beta.30",
+  "version": "0.0.5-beta.32",
   "description": "",
   "main": "./dist/index.js",
   "types": "./src/index.ts",
@@ -33,10 +33,9 @@
     "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.30"
+    "@rife/config": "0.0.5-beta.32"
   },
   "scripts": {
     "dev": "infra dev",

package/src/pino.ts

@@ -2,7 +2,7 @@ import pino from 'pino';
 // https://github.com/pinojs/pino/blob/master/docs/api.md
 
 import { isDev } from './env';
-import { getTraceId, runInTrace, setTraceId } from './trace';
+import { genTraceId, getTraceId, runInTrace } from './trace';
 
 export interface ILogger {
     debug: pino.LogFn;
@@ -34,7 +34,6 @@ function getPinoConfig() {
     });
 
     const config: pino.LoggerOptions = {
-        // base: { pid: undefined, hostname: undefined },
         transport: { targets },
         mixin(data: any) {
             if (!data?.traceId) {
@@ -60,10 +59,8 @@ export function createLogger(options?: ILogger.Options) {
         return (req: any, res: any, next: any) => {
             const response: any = res;
             response[startTime] = response[startTime] || Date.now();
-            const traceId = req.headers['trace-id'];
-            if (traceId) {
-                setTraceId(traceId);
-            }
+            const traceId = req.headers['trace-id'] || genTraceId();
+
             const onComplete = () => {
                 res.removeListener('close', onComplete);
                 res.removeListener('finish', onComplete);
@@ -77,12 +74,9 @@ export function createLogger(options?: ILogger.Options) {
             res.on('finish', onComplete);
             res.on('error', onComplete);
 
-            runInTrace(next);
+            runInTrace({ traceId }, next);
         };
     };
-    const instance = logger as typeof logger & { express: typeof express };
-
-    instance.express = express;
 
-    return instance;
+    return { logger, express };
 }

package/src/test.ts

@@ -17,13 +17,6 @@ process.env.NODE_ENV = 'development';
 // logger.error(new Error('not found'));
 
 import { createLogger } from './pino';
-import { runInTrace } from './trace';
+import { genTraceId } from './trace';
 
-const logger = createLogger();
-
-const obj = {
-    i: 1,
-};
-setInterval(() => {
-    logger.warn(`${obj.i++}`);
-}, 1000);
+console.log(genTraceId());

package/src/trace.ts

@@ -2,15 +2,14 @@ import { AsyncLocalStorage } from 'async_hooks';
 
 const als = new AsyncLocalStorage<{ traceId: string } & any>();
 
-export function runInTrace<T>(fn: (...args: any[]) => T): T {
-    const { v4 } = require('uuid');
-    return als.run({ traceId: v4() }, fn);
+export function runInTrace<T>(data: any, fn: (...args: any[]) => T): T {
+    return als.run(data, fn);
 }
 
-export function getTraceId() {
-    return als.getStore()?.traceId;
+export function genTraceId() {
+    return crypto.randomUUID();
 }
 
-export function setTraceId(traceId: string) {
-    return als.enterWith({ traceId });
+export function getTraceId() {
+    return als.getStore()?.traceId;
 }