@commercetools-backend/loggers 27.5.3 → 27.5.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
+
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
|
+
|
|
3
5
|
var expressWinston = require('express-winston');
|
|
4
6
|
var winston = require('winston');
|
|
5
7
|
var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
|
|
@@ -20,7 +22,7 @@ var setIn = require('lodash/set');
|
|
|
20
22
|
var unsetIn = require('lodash/unset');
|
|
21
23
|
var logform = require('logform');
|
|
22
24
|
|
|
23
|
-
function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
|
|
25
|
+
function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
|
|
24
26
|
|
|
25
27
|
function _interopNamespace(e) {
|
|
26
28
|
if (e && e.__esModule) return e;
|
|
@@ -36,7 +38,7 @@ function _interopNamespace(e) {
|
|
|
36
38
|
}
|
|
37
39
|
});
|
|
38
40
|
}
|
|
39
|
-
n
|
|
41
|
+
n["default"] = e;
|
|
40
42
|
return Object.freeze(n);
|
|
41
43
|
}
|
|
42
44
|
|
|
@@ -57,14 +59,14 @@ var getIn__default = /*#__PURE__*/_interopDefault(getIn);
|
|
|
57
59
|
var setIn__default = /*#__PURE__*/_interopDefault(setIn);
|
|
58
60
|
var unsetIn__default = /*#__PURE__*/_interopDefault(unsetIn);
|
|
59
61
|
|
|
60
|
-
function ownKeys(e, r) { var t = _Object$keys__default
|
|
61
|
-
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default
|
|
62
|
+
function ownKeys(e, r) { var t = _Object$keys__default["default"](e); if (_Object$getOwnPropertySymbols__default["default"]) { var o = _Object$getOwnPropertySymbols__default["default"](e); r && (o = _filterInstanceProperty__default["default"](o).call(o, function (r) { return _Object$getOwnPropertyDescriptor__default["default"](e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
63
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context2 = ownKeys(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context3 = ownKeys(Object(t))).call(_context3, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
|
|
62
64
|
const parseIps = request => {
|
|
63
65
|
const forwardedFor = request.headers['x-forwarded-for'];
|
|
64
66
|
if (!forwardedFor) {
|
|
65
67
|
return [];
|
|
66
68
|
}
|
|
67
|
-
const remoteAddresses = _Array$isArray__default
|
|
69
|
+
const remoteAddresses = _Array$isArray__default["default"](forwardedFor) ? forwardedFor : forwardedFor.split(',');
|
|
68
70
|
return remoteAddresses;
|
|
69
71
|
};
|
|
70
72
|
const createAccessLogSkipper = options => request => {
|
|
@@ -72,7 +74,7 @@ const createAccessLogSkipper = options => request => {
|
|
|
72
74
|
if (Boolean(options.silent)) {
|
|
73
75
|
return true;
|
|
74
76
|
}
|
|
75
|
-
const hasMatchingIgnoreUrl = _someInstanceProperty__default
|
|
77
|
+
const hasMatchingIgnoreUrl = _someInstanceProperty__default["default"](_context = options.ignoreUrls ?? []).call(_context, uriPathOrRegex => {
|
|
76
78
|
if (typeof uriPathOrRegex === 'string') {
|
|
77
79
|
return request.originalUrl === uriPathOrRegex;
|
|
78
80
|
}
|
|
@@ -101,11 +103,11 @@ const mapRequestMetadata = request => {
|
|
|
101
103
|
|
|
102
104
|
const createAccessLoggerMiddleware = function () {
|
|
103
105
|
let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
104
|
-
const formatters = winston__namespace
|
|
106
|
+
const formatters = winston__namespace["default"].format.combine(winston__namespace["default"].format.timestamp(), ...(options.formatters ?? []), options.json ? winston__namespace["default"].format.json() : winston__namespace["default"].format.cli());
|
|
105
107
|
const skip = createAccessLogSkipper(options);
|
|
106
|
-
return expressWinston__default
|
|
108
|
+
return expressWinston__default["default"].logger({
|
|
107
109
|
level: options.level ?? 'info',
|
|
108
|
-
transports: [new winston__namespace
|
|
110
|
+
transports: [new winston__namespace["default"].transports.Console()],
|
|
109
111
|
format: formatters,
|
|
110
112
|
meta: true,
|
|
111
113
|
expressFormat: true,
|
|
@@ -129,20 +131,20 @@ const createApplicationLogger = function () {
|
|
|
129
131
|
};
|
|
130
132
|
|
|
131
133
|
function rewriteField(info, field) {
|
|
132
|
-
const fromFieldValue = getIn__default
|
|
134
|
+
const fromFieldValue = getIn__default["default"](info, field.from);
|
|
133
135
|
const preserveFromField = field.preserveFromField ?? false;
|
|
134
136
|
if (fromFieldValue) {
|
|
135
137
|
if (!preserveFromField) {
|
|
136
|
-
unsetIn__default
|
|
138
|
+
unsetIn__default["default"](info, field.from);
|
|
137
139
|
}
|
|
138
|
-
setIn__default
|
|
140
|
+
setIn__default["default"](info, field.to, field.replaceValue ? field.replaceValue(fromFieldValue) : fromFieldValue);
|
|
139
141
|
}
|
|
140
142
|
}
|
|
141
143
|
function rewriteFieldsFormatter(options) {
|
|
142
144
|
return logform.format(info => {
|
|
143
145
|
var _context;
|
|
144
|
-
const clone = cloneDeep__default
|
|
145
|
-
_forEachInstanceProperty__default
|
|
146
|
+
const clone = cloneDeep__default["default"](info);
|
|
147
|
+
_forEachInstanceProperty__default["default"](_context = options.fields).call(_context, field => {
|
|
146
148
|
rewriteField(clone, field);
|
|
147
149
|
});
|
|
148
150
|
return clone;
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
+
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
|
+
|
|
3
5
|
var expressWinston = require('express-winston');
|
|
4
6
|
var winston = require('winston');
|
|
5
7
|
var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
|
|
@@ -20,7 +22,7 @@ var setIn = require('lodash/set');
|
|
|
20
22
|
var unsetIn = require('lodash/unset');
|
|
21
23
|
var logform = require('logform');
|
|
22
24
|
|
|
23
|
-
function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
|
|
25
|
+
function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
|
|
24
26
|
|
|
25
27
|
function _interopNamespace(e) {
|
|
26
28
|
if (e && e.__esModule) return e;
|
|
@@ -36,7 +38,7 @@ function _interopNamespace(e) {
|
|
|
36
38
|
}
|
|
37
39
|
});
|
|
38
40
|
}
|
|
39
|
-
n
|
|
41
|
+
n["default"] = e;
|
|
40
42
|
return Object.freeze(n);
|
|
41
43
|
}
|
|
42
44
|
|
|
@@ -57,14 +59,14 @@ var getIn__default = /*#__PURE__*/_interopDefault(getIn);
|
|
|
57
59
|
var setIn__default = /*#__PURE__*/_interopDefault(setIn);
|
|
58
60
|
var unsetIn__default = /*#__PURE__*/_interopDefault(unsetIn);
|
|
59
61
|
|
|
60
|
-
function ownKeys(e, r) { var t = _Object$keys__default
|
|
61
|
-
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default
|
|
62
|
+
function ownKeys(e, r) { var t = _Object$keys__default["default"](e); if (_Object$getOwnPropertySymbols__default["default"]) { var o = _Object$getOwnPropertySymbols__default["default"](e); r && (o = _filterInstanceProperty__default["default"](o).call(o, function (r) { return _Object$getOwnPropertyDescriptor__default["default"](e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
63
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context2 = ownKeys(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context3 = ownKeys(Object(t))).call(_context3, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
|
|
62
64
|
const parseIps = request => {
|
|
63
65
|
const forwardedFor = request.headers['x-forwarded-for'];
|
|
64
66
|
if (!forwardedFor) {
|
|
65
67
|
return [];
|
|
66
68
|
}
|
|
67
|
-
const remoteAddresses = _Array$isArray__default
|
|
69
|
+
const remoteAddresses = _Array$isArray__default["default"](forwardedFor) ? forwardedFor : forwardedFor.split(',');
|
|
68
70
|
return remoteAddresses;
|
|
69
71
|
};
|
|
70
72
|
const createAccessLogSkipper = options => request => {
|
|
@@ -72,7 +74,7 @@ const createAccessLogSkipper = options => request => {
|
|
|
72
74
|
if (Boolean(options.silent)) {
|
|
73
75
|
return true;
|
|
74
76
|
}
|
|
75
|
-
const hasMatchingIgnoreUrl = _someInstanceProperty__default
|
|
77
|
+
const hasMatchingIgnoreUrl = _someInstanceProperty__default["default"](_context = options.ignoreUrls ?? []).call(_context, uriPathOrRegex => {
|
|
76
78
|
if (typeof uriPathOrRegex === 'string') {
|
|
77
79
|
return request.originalUrl === uriPathOrRegex;
|
|
78
80
|
}
|
|
@@ -101,11 +103,11 @@ const mapRequestMetadata = request => {
|
|
|
101
103
|
|
|
102
104
|
const createAccessLoggerMiddleware = function () {
|
|
103
105
|
let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
104
|
-
const formatters = winston__namespace
|
|
106
|
+
const formatters = winston__namespace["default"].format.combine(winston__namespace["default"].format.timestamp(), ...(options.formatters ?? []), options.json ? winston__namespace["default"].format.json() : winston__namespace["default"].format.cli());
|
|
105
107
|
const skip = createAccessLogSkipper(options);
|
|
106
|
-
return expressWinston__default
|
|
108
|
+
return expressWinston__default["default"].logger({
|
|
107
109
|
level: options.level ?? 'info',
|
|
108
|
-
transports: [new winston__namespace
|
|
110
|
+
transports: [new winston__namespace["default"].transports.Console()],
|
|
109
111
|
format: formatters,
|
|
110
112
|
meta: true,
|
|
111
113
|
expressFormat: true,
|
|
@@ -129,20 +131,20 @@ const createApplicationLogger = function () {
|
|
|
129
131
|
};
|
|
130
132
|
|
|
131
133
|
function rewriteField(info, field) {
|
|
132
|
-
const fromFieldValue = getIn__default
|
|
134
|
+
const fromFieldValue = getIn__default["default"](info, field.from);
|
|
133
135
|
const preserveFromField = field.preserveFromField ?? false;
|
|
134
136
|
if (fromFieldValue) {
|
|
135
137
|
if (!preserveFromField) {
|
|
136
|
-
unsetIn__default
|
|
138
|
+
unsetIn__default["default"](info, field.from);
|
|
137
139
|
}
|
|
138
|
-
setIn__default
|
|
140
|
+
setIn__default["default"](info, field.to, field.replaceValue ? field.replaceValue(fromFieldValue) : fromFieldValue);
|
|
139
141
|
}
|
|
140
142
|
}
|
|
141
143
|
function rewriteFieldsFormatter(options) {
|
|
142
144
|
return logform.format(info => {
|
|
143
145
|
var _context;
|
|
144
|
-
const clone = cloneDeep__default
|
|
145
|
-
_forEachInstanceProperty__default
|
|
146
|
+
const clone = cloneDeep__default["default"](info);
|
|
147
|
+
_forEachInstanceProperty__default["default"](_context = options.fields).call(_context, field => {
|
|
146
148
|
rewriteField(clone, field);
|
|
147
149
|
});
|
|
148
150
|
return clone;
|
|
@@ -20,7 +20,7 @@ import unsetIn from 'lodash/unset';
|
|
|
20
20
|
import { format } from 'logform';
|
|
21
21
|
|
|
22
22
|
function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
23
|
-
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(t),
|
|
23
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context3 = ownKeys(Object(t))).call(_context3, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
24
24
|
const parseIps = request => {
|
|
25
25
|
const forwardedFor = request.headers['x-forwarded-for'];
|
|
26
26
|
if (!forwardedFor) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@commercetools-backend/loggers",
|
|
3
|
-
"version": "27.5.
|
|
3
|
+
"version": "27.5.4",
|
|
4
4
|
"description": "Opinionated JSON loggers for HTTP server applications",
|
|
5
5
|
"bugs": "https://github.com/commercetools/merchant-center-application-kit/issues",
|
|
6
6
|
"repository": {
|