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

package/dist/index.d.ts

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

package/dist/index.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLogger = exports.getTraceId = exports.runInTrace = exports.getNewTraceId = exports.winston = void 0;
+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"));
-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();
@@ -115,11 +114,18 @@ function createLogger(options) {
         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, instance };
+    return { logger };
 }
 exports.createLogger = createLogger;

package/dist/trace.js

@@ -0,0 +1 @@
+"use strict";

package/package.json

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

package/src/index.ts

@@ -7,7 +7,7 @@ import winston from 'winston';
 import JSONStringify from 'safe-stable-stringify';
 import 'winston-daily-rotate-file';
 
-export { winston };
+export type { winston };
 
 const als = new AsyncLocalStorage<{ traceId: string } & any>();
 
@@ -79,60 +79,59 @@ const tracerFormat = (options: { writeToFile: boolean; format: { time: boolean }
         return `${timestamp}${trace}${level}${service}${message}${stack}`;
     });
 
-export namespace Rife {
-    export namespace Logger {
-        export interface Options {
+export namespace Logger {
+    export interface Options {
+        /**
+         * 输出日志到console
+         * 默认：development环境下输出，production环境下不输出
+         */
+        writeToConsole?: boolean;
+
+        /**
+         * 输出日志到文件
+         * 默认：development环境下输出，production环境下不输出
+         */
+        writeToFile?: boolean;
+
+        /**
+         * 输出日志的文件目录
+         * 默认：./logs/
+         */
+        dirname?: string;
+
+        /**
+         * 输出日志的文件名
+         * 默认：server
+         */
+        filename?: string;
+
+        /**
+         * 日志输出格式
+         */
+        format?: {
             /**
-             * 输出日志到console
-             * 默认：development环境下输出，production环境下不输出
+             * 显示时间
+             * 默认：true
              */
-            writeToConsole?: boolean;
+            time?: boolean;
 
             /**
-             * 输出日志到文件
-             * 默认：development环境下输出，production环境下不输出
+             * 显示traceId
+             * 默认：true
              */
-            writeToFile?: boolean;
-
-            /**
-             * 输出日志的文件目录
-             * 默认：./logs/
-             */
-            dirname?: string;
-
-            /**
-             * 输出日志的文件名
-             * 默认：server
-             */
-            filename?: string;
-
-            /**
-             * 日志输出格式
-             */
-            format?: {
-                /**
-                 * 显示时间
-                 * 默认：true
-                 */
-                time?: boolean;
-
-                /**
-                 * 显示traceId
-                 * 默认：true
-                 */
-                traceId?: boolean;
-            };
-        }
+            traceId?: boolean;
+        };
     }
+}
 
-    export interface Logger {
-        info: winston.LeveledLogMethod;
-        warn: winston.LeveledLogMethod;
-        error: winston.LeveledLogMethod;
-    }
+export interface Logger {
+    info: winston.LeveledLogMethod;
+    warn: winston.LeveledLogMethod;
+    error: winston.LeveledLogMethod;
+    setMetaData: (data: any) => void;
 }
 
-export function createLogger(options?: Rife.Logger.Options) {
+export function createLogger(options?: Logger.Options) {
     let transports: winston.transport[] = [];
     let config = {
         writeToConsole: options?.writeToConsole ?? isDev(),
@@ -177,11 +176,19 @@ export function createLogger(options?: Rife.Logger.Options) {
         transports,
     });
 
-    const logger: Rife.Logger = {
+    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, instance };
+    return { logger };
 }