@nocobase/logger 0.9.1-alpha.2 → 0.9.2-alpha.2

package/lib/create-app-logger.js

@@ -5,58 +5,41 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createAppLogger = createAppLogger;
 exports.default = void 0;
-
 function _crypto() {
   const data = require("crypto");
-
   _crypto = function _crypto() {
     return data;
   };
-
   return data;
 }
-
 function _lodash() {
   const data = require("lodash");
-
   _lodash = function _lodash() {
     return data;
   };
-
   return data;
 }
-
 var _createLogger = require("./create-logger");
-
 const _excluded = ["skip", "requestWhitelist", "responseWhitelist"];
-
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 const defaultRequestWhitelist = ['action', 'header.x-role', 'header.x-hostname', 'header.x-timezone', 'header.x-locale', 'referer'];
 const defaultResponseWhitelist = ['status'];
-
 function createAppLogger(options = {}) {
   const skip = options.skip,
-        _options$requestWhite = options.requestWhitelist,
-        requestWhitelist = _options$requestWhite === void 0 ? defaultRequestWhitelist : _options$requestWhite,
-        _options$responseWhit = options.responseWhitelist,
-        responseWhitelist = _options$responseWhit === void 0 ? defaultResponseWhitelist : _options$responseWhit,
-        others = _objectWithoutProperties(options, _excluded);
-
+    _options$requestWhite = options.requestWhitelist,
+    requestWhitelist = _options$requestWhite === void 0 ? defaultRequestWhitelist : _options$requestWhite,
+    _options$responseWhit = options.responseWhitelist,
+    responseWhitelist = _options$responseWhit === void 0 ? defaultResponseWhitelist : _options$responseWhit,
+    others = _objectWithoutProperties(options, _excluded);
   const instance = (0, _createLogger.createLogger)(others);
-
   const middleware = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(function* (ctx, next) {
       if (skip && (yield skip(ctx))) {
         return next();
       }
-
       const logger = ctx.app['logger'];
       const startTime = Date.now();
       const info = {
@@ -70,54 +53,43 @@ function createAppLogger(options = {}) {
       });
       ctx.logger.info(`BEGIN: ${ctx.method} ${ctx.url}`);
       let error;
-
       try {
         yield next();
       } catch (e) {
         error = e;
       } finally {
-        info['res'] = ctx.response.toJSON(); // info['status'] = ctx.status;
-
+        info['res'] = ctx.response.toJSON();
+        // info['status'] = ctx.status;
         if (Math.floor(ctx.status / 100) == 5) {
           var _ctx$body;
-
           info.level = 'error';
           info['errors'] = ((_ctx$body = ctx.body) === null || _ctx$body === void 0 ? void 0 : _ctx$body['errors']) || ctx.body;
         } else if (Math.floor(ctx.status / 100) == 4) {
           var _ctx$body2;
-
           info.level = 'warn';
           info['errors'] = ((_ctx$body2 = ctx.body) === null || _ctx$body2 === void 0 ? void 0 : _ctx$body2['errors']) || ctx.body;
         }
-
         info['responseTime'] = Date.now() - startTime;
-
         if (ctx.action) {
           var _ctx$action, _ctx$action$toJSON;
-
           info['req']['action'] = (_ctx$action = ctx.action) === null || _ctx$action === void 0 ? void 0 : (_ctx$action$toJSON = _ctx$action.toJSON) === null || _ctx$action$toJSON === void 0 ? void 0 : _ctx$action$toJSON.call(_ctx$action);
         }
-
         info['req'] = (0, _lodash().pick)(info['req'], requestWhitelist);
         info['res'] = (0, _lodash().pick)(info['res'], responseWhitelist);
         ctx.logger.log(info);
       }
-
       if (error) {
         throw error;
       }
     });
-
     return function middleware(_x, _x2) {
       return _ref.apply(this, arguments);
     };
   }();
-
   return {
     instance,
     middleware
   };
 }
-
 var _default = createAppLogger;
 exports.default = _default;

package/lib/create-logger.d.ts

@@ -1,5 +1,7 @@
 import winston, { Logger } from 'winston';
 import 'winston-daily-rotate-file';
+export declare function getLoggerLevel(): string;
+export declare function getLoggerFilePath(...paths: string[]): string;
 declare const Transports: {
     console(options: any): winston.transports.ConsoleTransportInstance;
     dailyRotateFile(options: any): import("winston-daily-rotate-file");

package/lib/create-logger.js

@@ -11,95 +11,77 @@ Object.defineProperty(exports, "Logger", {
 });
 exports.Transports = void 0;
 exports.createLogger = createLogger;
-
+exports.getLoggerFilePath = getLoggerFilePath;
+exports.getLoggerLevel = getLoggerLevel;
 function _path() {
   const data = _interopRequireDefault(require("path"));
-
   _path = function _path() {
     return data;
   };
-
   return data;
 }
-
 function _winston() {
   const data = _interopRequireWildcard(require("winston"));
-
   _winston = function _winston() {
     return data;
   };
-
   return data;
 }
-
 require("winston-daily-rotate-file");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 const combine = _winston().format.combine,
-      timestamp = _winston().format.timestamp,
-      colorize = _winston().format.colorize,
-      simple = _winston().format.simple;
-
-function loggingLevel() {
+  timestamp = _winston().format.timestamp,
+  colorize = _winston().format.colorize,
+  simple = _winston().format.simple;
+function getLoggerLevel() {
   return process.env.LOGGER_LEVEL || 'info';
 }
-
+function getLoggerFilePath(...paths) {
+  return _path().default.resolve(process.env.LOGGER_BASE_PATH || _path().default.resolve(process.cwd(), 'storage', 'logs'), ...paths);
+}
 const Transports = {
   console(options) {
     return new (_winston().default.transports.Console)(_objectSpread({
       format: combine(simple(), colorize())
     }, options));
   },
-
   dailyRotateFile(options) {
-    let dirname = process.env.DAILY_ROTATE_FILE_DIRNAME || _path().default.resolve(process.cwd(), './storage/logs');
-
+    let dirname = getLoggerFilePath();
     if (!_path().default.isAbsolute(dirname)) {
       dirname = _path().default.resolve(process.cwd(), dirname);
     }
-
     return new (_winston().default.transports.DailyRotateFile)(_objectSpread({
       dirname,
-      level: loggingLevel(),
+      level: getLoggerLevel(),
       filename: 'nocobase-%DATE%.log',
       datePattern: 'YYYY-MM-DD-HH',
       maxFiles: '14d'
     }, options));
   }
-
 };
 exports.Transports = Transports;
-
 function toArr(value) {
   if (Array.isArray(value)) {
     return value;
   }
-
   return value ? value.split(',') : [];
 }
-
 function createLogger(options = {}) {
   const transports = toArr((options === null || options === void 0 ? void 0 : options.transports) || ['console', 'dailyRotateFile']).map(t => {
     if (typeof t === 'string') {
       return Transports[t]();
     }
-
     return t;
   }).filter(t => t);
-
   const logger = _winston().default.createLogger(_objectSpread(_objectSpread({
-    level: loggingLevel(),
+    level: getLoggerLevel(),
     levels: _winston().default.config.cli.levels,
     format: combine(timestamp(), _winston().format.errors({
       stack: true
@@ -107,8 +89,6 @@ function createLogger(options = {}) {
   }, options), {}, {
     transports
   }));
-
   _winston().default.addColors(_winston().default.config.cli.colors);
-
   return logger;
 }

package/lib/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _createAppLogger = require("./create-app-logger");
-
 Object.keys(_createAppLogger).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _createAppLogger[key]) return;
@@ -16,9 +14,7 @@ Object.keys(_createAppLogger).forEach(function (key) {
     }
   });
 });
-
 var _createLogger = require("./create-logger");
-
 Object.keys(_createLogger).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _createLogger[key]) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/logger",
-  "version": "0.9.1-alpha.2",
+  "version": "0.9.2-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": "d588a68eca4feed4642a4cb317301011266fe5c9"
+  "gitHead": "1a0de6908b2b1854bdf434fcafa8909cb65bb8a3"
 }

package/src/create-logger.ts

@@ -4,10 +4,14 @@ import 'winston-daily-rotate-file';
 
 const { combine, timestamp, colorize, simple } = format;
 
-function loggingLevel() {
+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({
@@ -16,13 +20,13 @@ const Transports = {
     });
   },
   dailyRotateFile(options: any) {
-    let dirname = process.env.DAILY_ROTATE_FILE_DIRNAME || path.resolve(process.cwd(), './storage/logs');
+    let dirname = getLoggerFilePath();
     if (!path.isAbsolute(dirname)) {
       dirname = path.resolve(process.cwd(), dirname);
     }
     return new winston.transports.DailyRotateFile({
       dirname,
-      level: loggingLevel(),
+      level: getLoggerLevel(),
       filename: 'nocobase-%DATE%.log',
       datePattern: 'YYYY-MM-DD-HH',
       maxFiles: '14d',
@@ -54,7 +58,7 @@ function createLogger(options: LoggerOptions = {}) {
     })
     .filter((t) => t);
   const logger = winston.createLogger({
-    level: loggingLevel(),
+    level: getLoggerLevel(),
     levels: winston.config.cli.levels,
     format: combine(timestamp(), format.errors({ stack: true }), format.json(), colorize()),
     ...options,