@nocobase/logger 1.2.12-alpha → 1.3.0-alpha.20240710084543

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/logger",
-  "version": "1.2.12-alpha",
+  "version": "1.3.0-alpha.20240710084543",
   "description": "nocobase logging library",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
@@ -18,5 +18,5 @@
     "winston-daily-rotate-file": "^5.0.0",
     "winston-transport": "^4.7.0"
   },
-  "gitHead": "553231d4882496cb7f1f17fa7541899ce82a27ab"
+  "gitHead": "07a8b596fc64a9779a194cb9b0dc2ca7570ed9d4"
 }

package/lib/config.d.ts

@@ -1,12 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-export declare const getLoggerLevel: () => string;
-export declare const getLoggerFilePath: (...paths: string[]) => string;
-export declare const getLoggerTransport: () => ('console' | 'file' | 'dailyRotateFile')[];
-export declare const getLoggerFormat: () => 'logfmt' | 'json' | 'delimiter' | 'console';

package/lib/config.js

@@ -1,59 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var config_exports = {};
-__export(config_exports, {
-  getLoggerFilePath: () => getLoggerFilePath,
-  getLoggerFormat: () => getLoggerFormat,
-  getLoggerLevel: () => getLoggerLevel,
-  getLoggerTransport: () => getLoggerTransport
-});
-module.exports = __toCommonJS(config_exports);
-var import_path = __toESM(require("path"));
-const getLoggerLevel = /* @__PURE__ */ __name(() => process.env.LOGGER_LEVEL || (process.env.APP_ENV === "development" ? "debug" : "info"), "getLoggerLevel");
-const getLoggerFilePath = /* @__PURE__ */ __name((...paths) => {
-  return import_path.default.resolve(process.env.LOGGER_BASE_PATH || import_path.default.resolve(process.cwd(), "storage", "logs"), ...paths);
-}, "getLoggerFilePath");
-const getLoggerTransport = /* @__PURE__ */ __name(() => (process.env.LOGGER_TRANSPORT || "console,dailyRotateFile").split(","), "getLoggerTransport");
-const getLoggerFormat = /* @__PURE__ */ __name(() => process.env.LOGGER_FORMAT || (process.env.APP_ENV === "development" ? "console" : "json"), "getLoggerFormat");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getLoggerFilePath,
-  getLoggerFormat,
-  getLoggerLevel,
-  getLoggerTransport
-});

package/lib/format.d.ts

@@ -1,43 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-import winston from 'winston';
-import { LoggerOptions } from './logger';
-/**
- * @internal
- */
-export declare const getFormat: (format?: LoggerOptions['format']) => winston.Logform.Format;
-/**
- * @internal
- */
-export declare const colorFormat: winston.Logform.Format;
-/**
- * @internal
- */
-export declare const stripColorFormat: winston.Logform.Format;
-/**
- * @internal
- *https://brandur.org/logfmt
- */
-export declare const logfmtFormat: winston.Logform.Format;
-/**
- * @internal
- */
-export declare const consoleFormat: winston.Logform.Format;
-/**
- * @internal
- */
-export declare const delimiterFormat: winston.Logform.Format;
-/**
- * @internal
- */
-export declare const escapeFormat: winston.Logform.Format;
-/**
- * @internal
- */
-export declare const sortFormat: winston.Logform.Format;

package/lib/format.js

@@ -1,179 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var format_exports = {};
-__export(format_exports, {
-  colorFormat: () => colorFormat,
-  consoleFormat: () => consoleFormat,
-  delimiterFormat: () => delimiterFormat,
-  escapeFormat: () => escapeFormat,
-  getFormat: () => getFormat,
-  logfmtFormat: () => logfmtFormat,
-  sortFormat: () => sortFormat,
-  stripColorFormat: () => stripColorFormat
-});
-module.exports = __toCommonJS(format_exports);
-var import_chalk = __toESM(require("chalk"));
-var import_winston = __toESM(require("winston"));
-var import_config = require("./config");
-var import_lodash = require("lodash");
-const DEFAULT_DELIMITER = "|";
-const colorize = {};
-const getFormat = /* @__PURE__ */ __name((format) => {
-  const configFormat = format || (0, import_config.getLoggerFormat)();
-  let logFormat;
-  switch (configFormat) {
-    case "console":
-      logFormat = import_winston.default.format.combine(consoleFormat);
-      break;
-    case "logfmt":
-      logFormat = logfmtFormat;
-      break;
-    case "delimiter":
-      logFormat = import_winston.default.format.combine(escapeFormat, delimiterFormat);
-      break;
-    case "json":
-      logFormat = import_winston.default.format.combine(import_winston.default.format.json({ deterministic: false }));
-      break;
-    default:
-      return import_winston.default.format.combine(format);
-  }
-  return import_winston.default.format.combine(sortFormat, logFormat);
-}, "getFormat");
-const colorFormat = import_winston.default.format((info) => {
-  Object.entries(info).forEach(([k, v]) => {
-    var _a;
-    const level = info["level"];
-    if (colorize[k]) {
-      info[k] = colorize[k](v);
-      return;
-    }
-    if ((_a = colorize[level]) == null ? void 0 : _a[k]) {
-      info[k] = colorize[level][k](v);
-      return;
-    }
-  });
-  return info;
-})();
-const stripColorFormat = import_winston.default.format((info) => {
-  Object.entries(info).forEach(([k, v]) => {
-    if (typeof v !== "string") {
-      return;
-    }
-    const regex = new RegExp(`\\x1b\\[\\d+m`, "g");
-    info[k] = v.replace(regex, "");
-  });
-  return info;
-})();
-const logfmtFormat = import_winston.default.format.printf(
-  (info) => Object.entries(info).map(([k, v]) => {
-    if (typeof v === "object") {
-      try {
-        v = JSON.stringify(v);
-      } catch (error) {
-        v = String(v);
-      }
-    }
-    if (v === void 0 || v === null) {
-      v = "";
-    }
-    return `${k}=${v}`;
-  }).join(" ")
-);
-const consoleFormat = import_winston.default.format.printf((info) => {
-  const keys = ["level", "timestamp", "message"];
-  Object.entries(info).forEach(([k, v]) => {
-    if (typeof v === "object") {
-      if ((0, import_lodash.isEmpty)(v)) {
-        info[k] = "";
-        return;
-      }
-      try {
-        info[k] = JSON.stringify(v);
-      } catch (error) {
-        info[k] = String(v);
-      }
-    }
-    if (v === void 0 || v === null) {
-      info[k] = "";
-    }
-  });
-  const tags = Object.entries(info).filter(([k, v]) => !keys.includes(k) && v).map(([k, v]) => `${k}=${v}`).join(" ");
-  const level = `[${info.level}]`.padEnd(7, " ");
-  const message = info.message.padEnd(44, " ");
-  const color = {
-    error: import_chalk.default.red,
-    warn: import_chalk.default.yellow,
-    info: import_chalk.default.green,
-    debug: import_chalk.default.blue,
-    trace: import_chalk.default.cyan
-  }[info.level] || import_chalk.default.white;
-  const colorized = message.startsWith("Executing") ? color(`${info.timestamp} ${level}`) + ` ${message}` : color(`${info.timestamp} ${level} ${message}`);
-  return `${colorized} ${tags}`;
-});
-const delimiterFormat = import_winston.default.format.printf(
-  (info) => Object.entries(info).map(([, v]) => {
-    if (typeof v === "object") {
-      try {
-        return JSON.stringify(v);
-      } catch (error) {
-        return String(v);
-      }
-    }
-    return v;
-  }).join(DEFAULT_DELIMITER)
-);
-const escapeFormat = import_winston.default.format((info) => {
-  let { message } = info;
-  if (typeof message === "string" && message.includes(DEFAULT_DELIMITER)) {
-    message = message.replace(/"/g, '\\"');
-    message = `"${message}"`;
-  }
-  return { ...info, message };
-})();
-const sortFormat = import_winston.default.format((info) => ({ level: info.level, ...info }))();
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  colorFormat,
-  consoleFormat,
-  delimiterFormat,
-  escapeFormat,
-  getFormat,
-  logfmtFormat,
-  sortFormat,
-  stripColorFormat
-});

package/lib/index.d.ts

@@ -1,13 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-export * from './config';
-export * from './logger';
-export * from './system-logger';
-export * from './request-logger';
-export * from './transports';

package/lib/index.js

@@ -1,38 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var src_exports = {};
-module.exports = __toCommonJS(src_exports);
-__reExport(src_exports, require("./config"), module.exports);
-__reExport(src_exports, require("./logger"), module.exports);
-__reExport(src_exports, require("./system-logger"), module.exports);
-__reExport(src_exports, require("./request-logger"), module.exports);
-__reExport(src_exports, require("./transports"), module.exports);
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ...require("./config"),
-  ...require("./logger"),
-  ...require("./system-logger"),
-  ...require("./request-logger"),
-  ...require("./transports")
-});

package/lib/logger.d.ts

@@ -1,32 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-import winston, { LeveledLogMethod, Logger as WinstonLogger } from 'winston';
-import 'winston-daily-rotate-file';
-interface Logger extends WinstonLogger {
-    trace: LeveledLogMethod;
-}
-interface LoggerOptions extends Omit<winston.LoggerOptions, 'transports' | 'format'> {
-    dirname?: string;
-    filename?: string;
-    format?: 'logfmt' | 'json' | 'delimiter' | 'console' | winston.Logform.Format;
-    transports?: ('console' | 'file' | 'dailyRotateFile' | winston.transport)[];
-}
-export declare const levels: {
-    trace: number;
-    debug: number;
-    info: number;
-    warn: number;
-    error: number;
-};
-export declare const createLogger: (options: LoggerOptions) => Logger;
-/**
- * @internal
- */
-export declare const createConsoleLogger: (options?: winston.LoggerOptions) => Logger;
-export { Logger, LoggerOptions };

package/lib/logger.js

@@ -1,90 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var logger_exports = {};
-__export(logger_exports, {
-  createConsoleLogger: () => createConsoleLogger,
-  createLogger: () => createLogger,
-  levels: () => levels
-});
-module.exports = __toCommonJS(logger_exports);
-var import_winston = __toESM(require("winston"));
-var import_winston_daily_rotate_file = require("winston-daily-rotate-file");
-var import_config = require("./config");
-var import_transports = require("./transports");
-var import_format = require("./format");
-const levels = {
-  trace: 4,
-  debug: 3,
-  info: 2,
-  warn: 1,
-  error: 0
-};
-const createLogger = /* @__PURE__ */ __name((options) => {
-  if (process.env.GITHUB_ACTIONS) {
-    return createConsoleLogger();
-  }
-  const { format, ...rest } = options;
-  const winstonOptions = {
-    levels,
-    level: (0, import_config.getLoggerLevel)(),
-    ...rest,
-    transports: (0, import_transports.getTransports)(options)
-  };
-  return import_winston.default.createLogger(winstonOptions);
-}, "createLogger");
-const createConsoleLogger = /* @__PURE__ */ __name((options) => {
-  const { format, ...rest } = options || {};
-  return import_winston.default.createLogger({
-    levels,
-    level: (0, import_config.getLoggerLevel)(),
-    format: import_winston.default.format.combine(
-      import_winston.default.format.timestamp({
-        format: "YYYY-MM-DD HH:mm:ss"
-      }),
-      format || import_format.consoleFormat
-    ),
-    ...rest || {},
-    transports: [new import_winston.default.transports.Console()]
-  });
-}, "createConsoleLogger");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createConsoleLogger,
-  createLogger,
-  levels
-});

package/lib/request-logger.d.ts

@@ -1,15 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-import { Logger, LoggerOptions } from './logger';
-export interface RequestLoggerOptions extends LoggerOptions {
-    skip?: (ctx?: any) => Promise<boolean>;
-    requestWhitelist?: string[];
-    responseWhitelist?: string[];
-}
-export declare const requestLogger: (appName: string, requestLogger: Logger, options?: RequestLoggerOptions) => (ctx: any, next: any) => Promise<void>;

package/lib/request-logger.js

@@ -1,101 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var request_logger_exports = {};
-__export(request_logger_exports, {
-  requestLogger: () => requestLogger
-});
-module.exports = __toCommonJS(request_logger_exports);
-var import_lodash = require("lodash");
-const defaultRequestWhitelist = [
-  "action",
-  "header.x-role",
-  "header.x-hostname",
-  "header.x-timezone",
-  "header.x-locale",
-  "header.x-authenticator",
-  "header.x-data-source",
-  "referer"
-];
-const defaultResponseWhitelist = ["status"];
-const requestLogger = /* @__PURE__ */ __name((appName, requestLogger2, options) => {
-  return async (ctx, next) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    const reqId = ctx.reqId;
-    const path = /^\/api\/(.+):(.+)/.exec(ctx.path);
-    const contextLogger = ctx.app.log.child({ reqId, module: path == null ? void 0 : path[1], submodule: path == null ? void 0 : path[2] });
-    ctx.logger = ctx.log = contextLogger;
-    const startTime = Date.now();
-    const requestInfo = {
-      method: ctx.method,
-      path: ctx.url
-    };
-    requestLogger2.info({
-      message: `request ${ctx.method} ${ctx.url}`,
-      ...requestInfo,
-      req: (0, import_lodash.pick)(ctx.request.toJSON(), (options == null ? void 0 : options.requestWhitelist) || defaultRequestWhitelist),
-      action: (_b = (_a = ctx.action) == null ? void 0 : _a.toJSON) == null ? void 0 : _b.call(_a),
-      app: appName,
-      reqId
-    });
-    let error;
-    try {
-      await next();
-    } catch (e) {
-      error = e;
-    } finally {
-      const cost = Date.now() - startTime;
-      const status = ctx.status;
-      const info = {
-        message: `response ${ctx.url}`,
-        ...requestInfo,
-        res: (0, import_lodash.pick)(ctx.response.toJSON(), (options == null ? void 0 : options.responseWhitelist) || defaultResponseWhitelist),
-        action: (_d = (_c = ctx.action) == null ? void 0 : _c.toJSON) == null ? void 0 : _d.call(_c),
-        userId: (_f = (_e = ctx.auth) == null ? void 0 : _e.user) == null ? void 0 : _f.id,
-        status: ctx.status,
-        cost,
-        app: appName,
-        reqId
-      };
-      if (Math.floor(status / 100) == 5) {
-        requestLogger2.error({ ...info, res: ((_g = ctx.body) == null ? void 0 : _g["errors"]) || ctx.body });
-      } else if (Math.floor(status / 100) == 4) {
-        requestLogger2.warn({ ...info, res: ((_h = ctx.body) == null ? void 0 : _h["errors"]) || ctx.body });
-      } else {
-        requestLogger2.info(info);
-      }
-    }
-    ctx.res.setHeader("X-Request-Id", reqId);
-    if (error) {
-      throw error;
-    }
-  };
-}, "requestLogger");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  requestLogger
-});

package/lib/system-logger.d.ts

@@ -1,26 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-import { Logger, LoggerOptions } from './logger';
-export interface SystemLoggerOptions extends LoggerOptions {
-    seperateError?: boolean;
-}
-export type logMethod = (message: string, meta?: {
-    module?: string;
-    submodule?: string;
-    method?: string;
-    [key: string]: any;
-}) => SystemLogger;
-export interface SystemLogger extends Omit<Logger, 'info' | 'warn' | 'error' | 'debug' | 'trace'> {
-    info: logMethod;
-    warn: logMethod;
-    error: logMethod;
-    debug: logMethod;
-    trace: logMethod;
-}
-export declare const createSystemLogger: (options: SystemLoggerOptions) => SystemLogger;

package/lib/system-logger.js

@@ -1,147 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var system_logger_exports = {};
-__export(system_logger_exports, {
-  createSystemLogger: () => createSystemLogger
-});
-module.exports = __toCommonJS(system_logger_exports);
-var import_winston = __toESM(require("winston"));
-var import_logger = require("./logger");
-var import_winston_transport = __toESM(require("winston-transport"));
-var import_triple_beam = require("triple-beam");
-var import_format = require("./format");
-const _SystemLoggerTransport = class _SystemLoggerTransport extends import_winston_transport.default {
-  logger;
-  errorLogger;
-  constructor({ seperateError, filename, ...options }) {
-    super({ ...options, format: null });
-    this.logger = (0, import_logger.createLogger)({
-      ...options,
-      filename,
-      format: import_winston.default.format.combine(
-        (0, import_winston.format)((info) => seperateError && info.level === "error" ? false : info)(),
-        (0, import_format.getFormat)(options.format)
-      )
-    });
-    if (seperateError) {
-      this.errorLogger = (0, import_logger.createLogger)({
-        ...options,
-        filename: `${filename}_error`,
-        level: "error"
-      });
-    }
-  }
-  log(info, callback) {
-    const { level, message, reqId, app, dataSourceKey, stack, cause, [import_triple_beam.SPLAT]: args } = info;
-    const logger = level === "error" && this.errorLogger ? this.errorLogger : this.logger;
-    const { module: module2, submodule, method, ...meta } = (args == null ? void 0 : args[0]) || {};
-    if (!(cause == null ? void 0 : cause.onlyLogCause)) {
-      logger.log({
-        level,
-        message,
-        stack,
-        meta,
-        module: module2 || info["module"] || "",
-        submodule: submodule || info["submodule"] || "",
-        method: method || "",
-        app,
-        reqId,
-        dataSourceKey: dataSourceKey || "main"
-      });
-    }
-    if (cause) {
-      logger.log({
-        level,
-        message: cause.message,
-        stack: cause.stack,
-        app,
-        reqId
-      });
-    }
-    callback(null, true);
-  }
-  close() {
-    this.logger.close();
-    if (this.errorLogger) {
-      this.errorLogger.close();
-    }
-  }
-};
-__name(_SystemLoggerTransport, "SystemLoggerTransport");
-let SystemLoggerTransport = _SystemLoggerTransport;
-function child(defaultRequestMetadata) {
-  const logger = this;
-  return Object.create(logger, {
-    write: {
-      value: function(info) {
-        const infoClone = Object.assign({}, defaultRequestMetadata, info);
-        if (info instanceof Error) {
-          infoClone.stack = info.stack;
-          infoClone.message = info.message;
-          infoClone.cause = info.cause;
-        }
-        logger.write(infoClone);
-      }
-    }
-  });
-}
-__name(child, "child");
-const createSystemLogger = /* @__PURE__ */ __name((options) => {
-  const transport = new SystemLoggerTransport(options);
-  transport.once("unpipe", () => {
-    transport.close();
-  });
-  const logger = import_winston.default.createLogger({
-    levels: import_logger.levels,
-    transports: [transport]
-    // Due to the use of custom log levels,
-    // we have to use the any type until Winston updates the type definitions.
-  });
-  return new Proxy(logger, {
-    get(target, prop) {
-      if (prop === "child") {
-        return child.bind(target);
-      }
-      return Reflect.get(target, prop);
-    }
-  });
-}, "createSystemLogger");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createSystemLogger
-});

package/lib/transports.d.ts

@@ -1,20 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-import winston from 'winston';
-import { DailyRotateFileTransportOptions } from 'winston-daily-rotate-file';
-import { LoggerOptions } from './logger';
-export declare const Transports: {
-    console: (options?: winston.transports.ConsoleTransportOptions) => winston.transports.ConsoleTransportInstance;
-    file: (options?: winston.transports.FileTransportOptions) => winston.transports.FileTransportInstance;
-    dailyRotateFile: (options?: DailyRotateFileTransportOptions) => import("winston-daily-rotate-file");
-};
-/**
- * @internal
- */
-export declare const getTransports: (options: LoggerOptions) => winston.transports.ConsoleTransportInstance | (import("winston-daily-rotate-file") | winston.transport)[];

package/lib/transports.js

@@ -1,95 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var transports_exports = {};
-__export(transports_exports, {
-  Transports: () => Transports,
-  getTransports: () => getTransports
-});
-module.exports = __toCommonJS(transports_exports);
-var import_winston = __toESM(require("winston"));
-var import_config = require("./config");
-var import_path = __toESM(require("path"));
-var import_format = require("./format");
-const Transports = {
-  console: (options) => new import_winston.default.transports.Console(options),
-  file: (options) => new import_winston.default.transports.File({
-    maxsize: Number(process.env.LOGGER_MAX_SIZE) || 1024 * 1024 * 20,
-    maxFiles: Number(process.env.LOGGER_MAX_FILES) || 10,
-    ...options
-  }),
-  dailyRotateFile: (options) => new import_winston.default.transports.DailyRotateFile({
-    maxSize: Number(process.env.LOGGER_MAX_SIZE),
-    maxFiles: Number(process.env.LOGGER_MAX_FILES) || "14d",
-    ...options
-  })
-};
-const getTransports = /* @__PURE__ */ __name((options) => {
-  const { filename, format: _format, transports: _transports } = options;
-  let { dirname } = options;
-  const configTransports = _transports || (0, import_config.getLoggerTransport)();
-  const configFormat = _format || (0, import_config.getLoggerFormat)();
-  dirname = dirname || (0, import_config.getLoggerFilePath)();
-  if (!import_path.default.isAbsolute(dirname)) {
-    dirname = import_path.default.resolve(process.cwd(), dirname);
-  }
-  const format = import_winston.default.format.combine(
-    import_winston.default.format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }),
-    (0, import_format.getFormat)(configFormat)
-  );
-  const transports = {
-    console: () => Transports.console({
-      format: import_winston.default.format.combine(format)
-    }),
-    file: () => Transports.file({
-      dirname,
-      filename: filename.includes(".log") ? filename : `${filename}.log`,
-      format
-    }),
-    dailyRotateFile: () => Transports.dailyRotateFile({
-      dirname,
-      filename: filename.includes("%DATE%") || filename.includes(".log") ? filename : `${filename}_%DATE%.log`,
-      format
-    })
-  };
-  return (configTransports == null ? void 0 : configTransports.map((t) => typeof t === "string" ? transports[t]() : t)) || transports["console"]();
-}, "getTransports");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  Transports,
-  getTransports
-});