@commercetools-backend/loggers 27.5.2 → 27.5.3
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,7 +1,5 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
|
-
|
|
5
3
|
var expressWinston = require('express-winston');
|
|
6
4
|
var winston = require('winston');
|
|
7
5
|
var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
|
|
@@ -22,7 +20,7 @@ var setIn = require('lodash/set');
|
|
|
22
20
|
var unsetIn = require('lodash/unset');
|
|
23
21
|
var logform = require('logform');
|
|
24
22
|
|
|
25
|
-
function _interopDefault (e) { return e && e.__esModule ? e : {
|
|
23
|
+
function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
|
|
26
24
|
|
|
27
25
|
function _interopNamespace(e) {
|
|
28
26
|
if (e && e.__esModule) return e;
|
|
@@ -38,7 +36,7 @@ function _interopNamespace(e) {
|
|
|
38
36
|
}
|
|
39
37
|
});
|
|
40
38
|
}
|
|
41
|
-
n
|
|
39
|
+
n.default = e;
|
|
42
40
|
return Object.freeze(n);
|
|
43
41
|
}
|
|
44
42
|
|
|
@@ -59,14 +57,14 @@ var getIn__default = /*#__PURE__*/_interopDefault(getIn);
|
|
|
59
57
|
var setIn__default = /*#__PURE__*/_interopDefault(setIn);
|
|
60
58
|
var unsetIn__default = /*#__PURE__*/_interopDefault(unsetIn);
|
|
61
59
|
|
|
62
|
-
function ownKeys(e, r) { var t = _Object$keys__default
|
|
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
|
|
60
|
+
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; }
|
|
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.default(_context2 = ownKeys(Object(t), true)).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; }
|
|
64
62
|
const parseIps = request => {
|
|
65
63
|
const forwardedFor = request.headers['x-forwarded-for'];
|
|
66
64
|
if (!forwardedFor) {
|
|
67
65
|
return [];
|
|
68
66
|
}
|
|
69
|
-
const remoteAddresses = _Array$isArray__default
|
|
67
|
+
const remoteAddresses = _Array$isArray__default.default(forwardedFor) ? forwardedFor : forwardedFor.split(',');
|
|
70
68
|
return remoteAddresses;
|
|
71
69
|
};
|
|
72
70
|
const createAccessLogSkipper = options => request => {
|
|
@@ -74,7 +72,7 @@ const createAccessLogSkipper = options => request => {
|
|
|
74
72
|
if (Boolean(options.silent)) {
|
|
75
73
|
return true;
|
|
76
74
|
}
|
|
77
|
-
const hasMatchingIgnoreUrl = _someInstanceProperty__default
|
|
75
|
+
const hasMatchingIgnoreUrl = _someInstanceProperty__default.default(_context = options.ignoreUrls ?? []).call(_context, uriPathOrRegex => {
|
|
78
76
|
if (typeof uriPathOrRegex === 'string') {
|
|
79
77
|
return request.originalUrl === uriPathOrRegex;
|
|
80
78
|
}
|
|
@@ -103,11 +101,11 @@ const mapRequestMetadata = request => {
|
|
|
103
101
|
|
|
104
102
|
const createAccessLoggerMiddleware = function () {
|
|
105
103
|
let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
106
|
-
const formatters = winston__namespace
|
|
104
|
+
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());
|
|
107
105
|
const skip = createAccessLogSkipper(options);
|
|
108
|
-
return expressWinston__default
|
|
106
|
+
return expressWinston__default.default.logger({
|
|
109
107
|
level: options.level ?? 'info',
|
|
110
|
-
transports: [new winston__namespace
|
|
108
|
+
transports: [new winston__namespace.default.transports.Console()],
|
|
111
109
|
format: formatters,
|
|
112
110
|
meta: true,
|
|
113
111
|
expressFormat: true,
|
|
@@ -131,20 +129,20 @@ const createApplicationLogger = function () {
|
|
|
131
129
|
};
|
|
132
130
|
|
|
133
131
|
function rewriteField(info, field) {
|
|
134
|
-
const fromFieldValue = getIn__default
|
|
132
|
+
const fromFieldValue = getIn__default.default(info, field.from);
|
|
135
133
|
const preserveFromField = field.preserveFromField ?? false;
|
|
136
134
|
if (fromFieldValue) {
|
|
137
135
|
if (!preserveFromField) {
|
|
138
|
-
unsetIn__default
|
|
136
|
+
unsetIn__default.default(info, field.from);
|
|
139
137
|
}
|
|
140
|
-
setIn__default
|
|
138
|
+
setIn__default.default(info, field.to, field.replaceValue ? field.replaceValue(fromFieldValue) : fromFieldValue);
|
|
141
139
|
}
|
|
142
140
|
}
|
|
143
141
|
function rewriteFieldsFormatter(options) {
|
|
144
142
|
return logform.format(info => {
|
|
145
143
|
var _context;
|
|
146
|
-
const clone = cloneDeep__default
|
|
147
|
-
_forEachInstanceProperty__default
|
|
144
|
+
const clone = cloneDeep__default.default(info);
|
|
145
|
+
_forEachInstanceProperty__default.default(_context = options.fields).call(_context, field => {
|
|
148
146
|
rewriteField(clone, field);
|
|
149
147
|
});
|
|
150
148
|
return clone;
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
|
-
|
|
5
3
|
var expressWinston = require('express-winston');
|
|
6
4
|
var winston = require('winston');
|
|
7
5
|
var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
|
|
@@ -22,7 +20,7 @@ var setIn = require('lodash/set');
|
|
|
22
20
|
var unsetIn = require('lodash/unset');
|
|
23
21
|
var logform = require('logform');
|
|
24
22
|
|
|
25
|
-
function _interopDefault (e) { return e && e.__esModule ? e : {
|
|
23
|
+
function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
|
|
26
24
|
|
|
27
25
|
function _interopNamespace(e) {
|
|
28
26
|
if (e && e.__esModule) return e;
|
|
@@ -38,7 +36,7 @@ function _interopNamespace(e) {
|
|
|
38
36
|
}
|
|
39
37
|
});
|
|
40
38
|
}
|
|
41
|
-
n
|
|
39
|
+
n.default = e;
|
|
42
40
|
return Object.freeze(n);
|
|
43
41
|
}
|
|
44
42
|
|
|
@@ -59,14 +57,14 @@ var getIn__default = /*#__PURE__*/_interopDefault(getIn);
|
|
|
59
57
|
var setIn__default = /*#__PURE__*/_interopDefault(setIn);
|
|
60
58
|
var unsetIn__default = /*#__PURE__*/_interopDefault(unsetIn);
|
|
61
59
|
|
|
62
|
-
function ownKeys(e, r) { var t = _Object$keys__default
|
|
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
|
|
60
|
+
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; }
|
|
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.default(_context2 = ownKeys(Object(t), true)).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; }
|
|
64
62
|
const parseIps = request => {
|
|
65
63
|
const forwardedFor = request.headers['x-forwarded-for'];
|
|
66
64
|
if (!forwardedFor) {
|
|
67
65
|
return [];
|
|
68
66
|
}
|
|
69
|
-
const remoteAddresses = _Array$isArray__default
|
|
67
|
+
const remoteAddresses = _Array$isArray__default.default(forwardedFor) ? forwardedFor : forwardedFor.split(',');
|
|
70
68
|
return remoteAddresses;
|
|
71
69
|
};
|
|
72
70
|
const createAccessLogSkipper = options => request => {
|
|
@@ -74,7 +72,7 @@ const createAccessLogSkipper = options => request => {
|
|
|
74
72
|
if (Boolean(options.silent)) {
|
|
75
73
|
return true;
|
|
76
74
|
}
|
|
77
|
-
const hasMatchingIgnoreUrl = _someInstanceProperty__default
|
|
75
|
+
const hasMatchingIgnoreUrl = _someInstanceProperty__default.default(_context = options.ignoreUrls ?? []).call(_context, uriPathOrRegex => {
|
|
78
76
|
if (typeof uriPathOrRegex === 'string') {
|
|
79
77
|
return request.originalUrl === uriPathOrRegex;
|
|
80
78
|
}
|
|
@@ -103,11 +101,11 @@ const mapRequestMetadata = request => {
|
|
|
103
101
|
|
|
104
102
|
const createAccessLoggerMiddleware = function () {
|
|
105
103
|
let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
106
|
-
const formatters = winston__namespace
|
|
104
|
+
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());
|
|
107
105
|
const skip = createAccessLogSkipper(options);
|
|
108
|
-
return expressWinston__default
|
|
106
|
+
return expressWinston__default.default.logger({
|
|
109
107
|
level: options.level ?? 'info',
|
|
110
|
-
transports: [new winston__namespace
|
|
108
|
+
transports: [new winston__namespace.default.transports.Console()],
|
|
111
109
|
format: formatters,
|
|
112
110
|
meta: true,
|
|
113
111
|
expressFormat: true,
|
|
@@ -131,20 +129,20 @@ const createApplicationLogger = function () {
|
|
|
131
129
|
};
|
|
132
130
|
|
|
133
131
|
function rewriteField(info, field) {
|
|
134
|
-
const fromFieldValue = getIn__default
|
|
132
|
+
const fromFieldValue = getIn__default.default(info, field.from);
|
|
135
133
|
const preserveFromField = field.preserveFromField ?? false;
|
|
136
134
|
if (fromFieldValue) {
|
|
137
135
|
if (!preserveFromField) {
|
|
138
|
-
unsetIn__default
|
|
136
|
+
unsetIn__default.default(info, field.from);
|
|
139
137
|
}
|
|
140
|
-
setIn__default
|
|
138
|
+
setIn__default.default(info, field.to, field.replaceValue ? field.replaceValue(fromFieldValue) : fromFieldValue);
|
|
141
139
|
}
|
|
142
140
|
}
|
|
143
141
|
function rewriteFieldsFormatter(options) {
|
|
144
142
|
return logform.format(info => {
|
|
145
143
|
var _context;
|
|
146
|
-
const clone = cloneDeep__default
|
|
147
|
-
_forEachInstanceProperty__default
|
|
144
|
+
const clone = cloneDeep__default.default(info);
|
|
145
|
+
_forEachInstanceProperty__default.default(_context = options.fields).call(_context, field => {
|
|
148
146
|
rewriteField(clone, field);
|
|
149
147
|
});
|
|
150
148
|
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), true)).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.3",
|
|
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": {
|