@nocobase/logger 0.11.1-alpha.5 → 0.12.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/logger",
-  "version": "0.11.1-alpha.5",
+  "version": "0.12.0-alpha.2",
   "description": "nocobase logging library",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
@@ -15,5 +15,5 @@
     "winston": "^3.8.2",
     "winston-daily-rotate-file": "^4.7.1"
   },
-  "gitHead": "1dcfd15a7d95a40b0a2f60e1de19ec574066fb20"
+  "gitHead": "a95e9e2666f0318c955113a4735bc005a2c9a767"
 }

package/src/create-app-logger.ts

@@ -1,81 +0,0 @@
-import { randomUUID } from 'crypto';
-import Koa from 'koa';
-import { pick } from 'lodash';
-import { createLogger, LoggerOptions } from './create-logger';
-
-const defaultRequestWhitelist = [
-  'action',
-  'header.x-role',
-  'header.x-hostname',
-  'header.x-timezone',
-  'header.x-locale',
-  'referer',
-];
-
-const defaultResponseWhitelist = ['status'];
-
-export interface AppLoggerOptions extends LoggerOptions {
-  skip?: (ctx?: any) => Promise<boolean>;
-  requestWhitelist?: string[];
-  responseWhitelist?: string[];
-}
-
-export function createAppLogger(options: AppLoggerOptions = {}) {
-  const {
-    skip,
-    requestWhitelist = defaultRequestWhitelist,
-    responseWhitelist = defaultResponseWhitelist,
-    ...others
-  } = options;
-  const instance = createLogger(others);
-  const middleware = async (ctx: Koa.Context, next: Koa.Next) => {
-    if (skip && (await skip(ctx))) {
-      return next();
-    }
-    const logger = ctx.app['logger'];
-    const startTime = Date.now();
-    const info = {
-      level: 'info',
-      message: `END: ${ctx.method} ${ctx.url}`,
-      req: ctx.request.toJSON(),
-    };
-
-    ctx.reqId = ctx.req['id'] = randomUUID();
-    ctx.logger = ctx.log = logger.child({ reqId: ctx.reqId });
-
-    ctx.logger.info(`BEGIN: ${ctx.method} ${ctx.url}`);
-
-    let error;
-
-    try {
-      await next();
-    } catch (e) {
-      error = e;
-    } finally {
-      info['res'] = ctx.response.toJSON();
-      // info['status'] = ctx.status;
-      if (Math.floor(ctx.status / 100) == 5) {
-        info.level = 'error';
-        info['errors'] = ctx.body?.['errors'] || ctx.body;
-      } else if (Math.floor(ctx.status / 100) == 4) {
-        info.level = 'warn';
-        info['errors'] = ctx.body?.['errors'] || ctx.body;
-      }
-      info['responseTime'] = Date.now() - startTime;
-      if (ctx.action) {
-        info['req']['action'] = ctx.action?.toJSON?.();
-      }
-      info['req'] = pick(info['req'], requestWhitelist);
-      info['res'] = pick(info['res'], responseWhitelist);
-      ctx.logger.log(info);
-    }
-
-    if (error) {
-      throw error;
-    }
-  };
-
-  return { instance, middleware };
-}
-
-export default createAppLogger;

package/src/create-logger.ts

@@ -1,71 +0,0 @@
-import path from 'path';
-import winston, { format, Logger } from 'winston';
-import 'winston-daily-rotate-file';
-
-const { combine, timestamp, colorize, simple } = format;
-
-export function getLoggerLevel(): string {
-  return process.env.LOGGER_LEVEL || 'info';
-}
-
-export function getLoggerFilePath(...paths: string[]): string {
-  return path.resolve(process.env.LOGGER_BASE_PATH || path.resolve(process.cwd(), 'storage', 'logs'), ...paths);
-}
-
-const Transports = {
-  console(options) {
-    return new winston.transports.Console({
-      format: combine(simple(), colorize()),
-      ...options,
-    });
-  },
-  dailyRotateFile(options: any) {
-    let dirname = getLoggerFilePath();
-    if (!path.isAbsolute(dirname)) {
-      dirname = path.resolve(process.cwd(), dirname);
-    }
-    return new winston.transports.DailyRotateFile({
-      dirname,
-      level: getLoggerLevel(),
-      filename: 'nocobase-%DATE%.log',
-      datePattern: 'YYYY-MM-DD-HH',
-      maxFiles: '14d',
-      ...options,
-    });
-  },
-};
-
-function toArr(value: any) {
-  if (Array.isArray(value)) {
-    return value;
-  }
-  return value ? value.split(',') : [];
-}
-
-type WinstonTransport = string | string[] | winston.transport | winston.transport[];
-
-interface LoggerOptions extends Omit<winston.LoggerOptions, 'transports'> {
-  transports?: WinstonTransport;
-}
-
-function createLogger(options: LoggerOptions = {}) {
-  const transports: winston.transport[] = toArr(options?.transports || ['console', 'dailyRotateFile'])
-    .map((t) => {
-      if (typeof t === 'string') {
-        return Transports[t]();
-      }
-      return t;
-    })
-    .filter((t) => t);
-  const logger = winston.createLogger({
-    level: getLoggerLevel(),
-    levels: winston.config.cli.levels,
-    format: combine(timestamp(), format.errors({ stack: true }), format.json(), colorize()),
-    ...options,
-    transports,
-  });
-  winston.addColors(winston.config.cli.colors);
-  return logger;
-}
-
-export { Logger, LoggerOptions, Transports, createLogger };

package/src/index.ts

@@ -1,2 +0,0 @@
-export * from './create-app-logger';
-export * from './create-logger';