@nocobase/logger 2.1.0-alpha.20 → 2.1.0-alpha.22

package/lib/request-logger.js

@@ -31,6 +31,7 @@ __export(request_logger_exports, {
 });
 module.exports = __toCommonJS(request_logger_exports);
 var import_lodash = require("lodash");
+const REQUEST_SOURCE_HEADER = "x-request-source";
 const defaultRequestWhitelist = [
   "action",
   "header.x-role",
@@ -39,6 +40,7 @@ const defaultRequestWhitelist = [
   "header.x-locale",
   "header.x-authenticator",
   "header.x-data-source",
+  "header.x-request-source",
   "header.referer"
 ];
 const defaultResponseWhitelist = ["status"];
@@ -50,10 +52,11 @@ const defaultActionBlackList = [
 ];
 const requestLogger = /* @__PURE__ */ __name((appName, requestLogger2, options) => {
   return /* @__PURE__ */ __name(async function requestLoggerMiddleware(ctx, next) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
     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] });
+    const requestSource = (_b = (_a = ctx.request) == null ? void 0 : _a.header) == null ? void 0 : _b[REQUEST_SOURCE_HEADER];
     ctx.logger = ctx.log = contextLogger;
     const startTime = Date.now();
     const requestInfo = {
@@ -64,8 +67,9 @@ const requestLogger = /* @__PURE__ */ __name((appName, requestLogger2, options)
       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),
+      action: (_d = (_c = ctx.action) == null ? void 0 : _c.toJSON) == null ? void 0 : _d.call(_c),
       app: appName,
+      ...requestSource ? { requestSource } : {},
       reqId
     });
     ctx.res.setHeader("X-Request-Id", reqId);
@@ -81,19 +85,20 @@ const requestLogger = /* @__PURE__ */ __name((appName, requestLogger2, options)
         message: `response ${ctx.url}`,
         ...requestInfo,
         res: (0, import_lodash.pick)(ctx.response.toJSON(), (options == null ? void 0 : options.responseWhitelist) || defaultResponseWhitelist),
-        action: (0, import_lodash.omit)((_d = (_c = ctx.action) == null ? void 0 : _c.toJSON) == null ? void 0 : _d.call(_c), defaultActionBlackList),
-        userId: (_f = (_e = ctx.auth) == null ? void 0 : _e.user) == null ? void 0 : _f.id,
-        username: (_h = (_g = ctx.auth) == null ? void 0 : _g.user) == null ? void 0 : _h.username,
+        action: (0, import_lodash.omit)((_f = (_e = ctx.action) == null ? void 0 : _e.toJSON) == null ? void 0 : _f.call(_e), defaultActionBlackList),
+        userId: (_h = (_g = ctx.auth) == null ? void 0 : _g.user) == null ? void 0 : _h.id,
+        username: (_j = (_i = ctx.auth) == null ? void 0 : _i.user) == null ? void 0 : _j.username,
         status: ctx.status,
         cost,
         app: appName,
+        ...requestSource ? { requestSource } : {},
         reqId,
         bodySize: ctx.response.length
       };
       if (Math.floor(status / 100) == 5) {
-        requestLogger2.error({ ...info, res: ((_i = ctx.body) == null ? void 0 : _i["errors"]) || ctx.body });
+        requestLogger2.error({ ...info, res: ((_k = ctx.body) == null ? void 0 : _k["errors"]) || ctx.body });
       } else if (Math.floor(status / 100) == 4) {
-        requestLogger2.warn({ ...info, res: ((_j = ctx.body) == null ? void 0 : _j["errors"]) || ctx.body });
+        requestLogger2.warn({ ...info, res: ((_l = ctx.body) == null ? void 0 : _l["errors"]) || ctx.body });
       } else {
         requestLogger2.info(info);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/logger",
-  "version": "2.1.0-alpha.20",
+  "version": "2.1.0-alpha.22",
   "description": "nocobase logging library",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
@@ -11,7 +11,7 @@
     "directory": "packages/logger"
   },
   "dependencies": {
-    "@nocobase/utils": "2.1.0-alpha.20",
+    "@nocobase/utils": "2.1.0-alpha.22",
     "chalk": "^4",
     "lodash": "^4.17.21",
     "triple-beam": "^1.4.1",
@@ -19,5 +19,5 @@
     "winston-daily-rotate-file": "^5.0.0",
     "winston-transport": "^4.7.0"
   },
-  "gitHead": "3d1535db6bf93ca23257faf474afee0d565f54c6"
+  "gitHead": "81ed83f158f172cca607b36beaf8428b14ba16ad"
 }