@commercetools-backend/loggers 27.9.1 → 27.9.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.
|
@@ -72,11 +72,11 @@ const parseIps = request => {
|
|
|
72
72
|
return remoteAddresses;
|
|
73
73
|
};
|
|
74
74
|
const createAccessLogSkipper = options => request => {
|
|
75
|
-
var _context
|
|
75
|
+
var _context;
|
|
76
76
|
if (Boolean(options.silent)) {
|
|
77
77
|
return true;
|
|
78
78
|
}
|
|
79
|
-
const hasMatchingIgnoreUrl = _someInstanceProperty__default["default"](_context =
|
|
79
|
+
const hasMatchingIgnoreUrl = _someInstanceProperty__default["default"](_context = options.ignoreUrls ?? []).call(_context, uriPathOrRegex => {
|
|
80
80
|
if (typeof uriPathOrRegex === 'string') {
|
|
81
81
|
return request.originalUrl === uriPathOrRegex;
|
|
82
82
|
}
|
|
@@ -86,31 +86,29 @@ const createAccessLogSkipper = options => request => {
|
|
|
86
86
|
};
|
|
87
87
|
const mapRequestMetadata = request => {
|
|
88
88
|
try {
|
|
89
|
-
|
|
90
|
-
const remoteAddress = (_request$socket = request.socket) === null || _request$socket === void 0 ? void 0 : _request$socket.remoteAddress;
|
|
89
|
+
const remoteAddress = request.socket?.remoteAddress;
|
|
91
90
|
const proxyIps = parseIps(request);
|
|
92
91
|
const _proxyIps = _slicedToArray(proxyIps, 1),
|
|
93
92
|
clientIp = _proxyIps[0];
|
|
94
93
|
return _objectSpread({
|
|
95
|
-
clientIp: clientIp
|
|
94
|
+
clientIp: clientIp ?? remoteAddress,
|
|
96
95
|
proxyIps,
|
|
97
96
|
hostname: request.socket ? request.hostname : undefined
|
|
98
97
|
}, remoteAddress ? {
|
|
99
98
|
remoteAddress
|
|
100
99
|
} : {});
|
|
101
100
|
} catch (error) {
|
|
102
|
-
console.error(
|
|
101
|
+
console.error(`Failed to parse request metadata`, error);
|
|
103
102
|
return {};
|
|
104
103
|
}
|
|
105
104
|
};
|
|
106
105
|
|
|
107
106
|
const createAccessLoggerMiddleware = function () {
|
|
108
|
-
var _options$formatters, _options$level;
|
|
109
107
|
let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
110
|
-
const formatters = winston__namespace["default"].format.combine(winston__namespace["default"].format.timestamp(), ...(
|
|
108
|
+
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());
|
|
111
109
|
const skip = createAccessLogSkipper(options);
|
|
112
110
|
return expressWinston__default["default"].logger({
|
|
113
|
-
level:
|
|
111
|
+
level: options.level ?? 'info',
|
|
114
112
|
transports: [new winston__namespace["default"].transports.Console()],
|
|
115
113
|
format: formatters,
|
|
116
114
|
meta: true,
|
|
@@ -123,11 +121,10 @@ const createAccessLoggerMiddleware = function () {
|
|
|
123
121
|
};
|
|
124
122
|
|
|
125
123
|
const createApplicationLogger = function () {
|
|
126
|
-
var _options$formatters, _options$level;
|
|
127
124
|
let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
128
|
-
const formatters = winston__namespace.format.combine(...(
|
|
125
|
+
const formatters = winston__namespace.format.combine(...(options.formatters ?? []), options.json ? winston__namespace.format.json() : winston__namespace.format.combine(winston__namespace.format.cli(), winston__namespace.format.simple()));
|
|
129
126
|
return winston__namespace.createLogger({
|
|
130
|
-
level:
|
|
127
|
+
level: options.level ?? 'info',
|
|
131
128
|
format: formatters,
|
|
132
129
|
transports: [new winston__namespace.transports.Console({
|
|
133
130
|
silent: Boolean(options.silent)
|
|
@@ -150,9 +147,8 @@ function redactFieldsFormatter(options) {
|
|
|
150
147
|
}
|
|
151
148
|
|
|
152
149
|
function rewriteField(info, field) {
|
|
153
|
-
var _field$preserveFromFi;
|
|
154
150
|
const fromFieldValue = getIn__default["default"](info, field.from);
|
|
155
|
-
const preserveFromField =
|
|
151
|
+
const preserveFromField = field.preserveFromField ?? false;
|
|
156
152
|
if (fromFieldValue) {
|
|
157
153
|
if (!preserveFromField) {
|
|
158
154
|
unsetIn__default["default"](info, field.from);
|
|
@@ -72,11 +72,11 @@ const parseIps = request => {
|
|
|
72
72
|
return remoteAddresses;
|
|
73
73
|
};
|
|
74
74
|
const createAccessLogSkipper = options => request => {
|
|
75
|
-
var _context
|
|
75
|
+
var _context;
|
|
76
76
|
if (Boolean(options.silent)) {
|
|
77
77
|
return true;
|
|
78
78
|
}
|
|
79
|
-
const hasMatchingIgnoreUrl = _someInstanceProperty__default["default"](_context =
|
|
79
|
+
const hasMatchingIgnoreUrl = _someInstanceProperty__default["default"](_context = options.ignoreUrls ?? []).call(_context, uriPathOrRegex => {
|
|
80
80
|
if (typeof uriPathOrRegex === 'string') {
|
|
81
81
|
return request.originalUrl === uriPathOrRegex;
|
|
82
82
|
}
|
|
@@ -86,31 +86,29 @@ const createAccessLogSkipper = options => request => {
|
|
|
86
86
|
};
|
|
87
87
|
const mapRequestMetadata = request => {
|
|
88
88
|
try {
|
|
89
|
-
|
|
90
|
-
const remoteAddress = (_request$socket = request.socket) === null || _request$socket === void 0 ? void 0 : _request$socket.remoteAddress;
|
|
89
|
+
const remoteAddress = request.socket?.remoteAddress;
|
|
91
90
|
const proxyIps = parseIps(request);
|
|
92
91
|
const _proxyIps = _slicedToArray(proxyIps, 1),
|
|
93
92
|
clientIp = _proxyIps[0];
|
|
94
93
|
return _objectSpread({
|
|
95
|
-
clientIp: clientIp
|
|
94
|
+
clientIp: clientIp ?? remoteAddress,
|
|
96
95
|
proxyIps,
|
|
97
96
|
hostname: request.socket ? request.hostname : undefined
|
|
98
97
|
}, remoteAddress ? {
|
|
99
98
|
remoteAddress
|
|
100
99
|
} : {});
|
|
101
100
|
} catch (error) {
|
|
102
|
-
console.error(
|
|
101
|
+
console.error(`Failed to parse request metadata`, error);
|
|
103
102
|
return {};
|
|
104
103
|
}
|
|
105
104
|
};
|
|
106
105
|
|
|
107
106
|
const createAccessLoggerMiddleware = function () {
|
|
108
|
-
var _options$formatters, _options$level;
|
|
109
107
|
let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
110
|
-
const formatters = winston__namespace["default"].format.combine(winston__namespace["default"].format.timestamp(), ...(
|
|
108
|
+
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());
|
|
111
109
|
const skip = createAccessLogSkipper(options);
|
|
112
110
|
return expressWinston__default["default"].logger({
|
|
113
|
-
level:
|
|
111
|
+
level: options.level ?? 'info',
|
|
114
112
|
transports: [new winston__namespace["default"].transports.Console()],
|
|
115
113
|
format: formatters,
|
|
116
114
|
meta: true,
|
|
@@ -123,11 +121,10 @@ const createAccessLoggerMiddleware = function () {
|
|
|
123
121
|
};
|
|
124
122
|
|
|
125
123
|
const createApplicationLogger = function () {
|
|
126
|
-
var _options$formatters, _options$level;
|
|
127
124
|
let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
128
|
-
const formatters = winston__namespace.format.combine(...(
|
|
125
|
+
const formatters = winston__namespace.format.combine(...(options.formatters ?? []), options.json ? winston__namespace.format.json() : winston__namespace.format.combine(winston__namespace.format.cli(), winston__namespace.format.simple()));
|
|
129
126
|
return winston__namespace.createLogger({
|
|
130
|
-
level:
|
|
127
|
+
level: options.level ?? 'info',
|
|
131
128
|
format: formatters,
|
|
132
129
|
transports: [new winston__namespace.transports.Console({
|
|
133
130
|
silent: Boolean(options.silent)
|
|
@@ -150,9 +147,8 @@ function redactFieldsFormatter(options) {
|
|
|
150
147
|
}
|
|
151
148
|
|
|
152
149
|
function rewriteField(info, field) {
|
|
153
|
-
var _field$preserveFromFi;
|
|
154
150
|
const fromFieldValue = getIn__default["default"](info, field.from);
|
|
155
|
-
const preserveFromField =
|
|
151
|
+
const preserveFromField = field.preserveFromField ?? false;
|
|
156
152
|
if (fromFieldValue) {
|
|
157
153
|
if (!preserveFromField) {
|
|
158
154
|
unsetIn__default["default"](info, field.from);
|
|
@@ -31,11 +31,11 @@ const parseIps = request => {
|
|
|
31
31
|
return remoteAddresses;
|
|
32
32
|
};
|
|
33
33
|
const createAccessLogSkipper = options => request => {
|
|
34
|
-
var _context
|
|
34
|
+
var _context;
|
|
35
35
|
if (Boolean(options.silent)) {
|
|
36
36
|
return true;
|
|
37
37
|
}
|
|
38
|
-
const hasMatchingIgnoreUrl = _someInstanceProperty(_context =
|
|
38
|
+
const hasMatchingIgnoreUrl = _someInstanceProperty(_context = options.ignoreUrls ?? []).call(_context, uriPathOrRegex => {
|
|
39
39
|
if (typeof uriPathOrRegex === 'string') {
|
|
40
40
|
return request.originalUrl === uriPathOrRegex;
|
|
41
41
|
}
|
|
@@ -45,31 +45,29 @@ const createAccessLogSkipper = options => request => {
|
|
|
45
45
|
};
|
|
46
46
|
const mapRequestMetadata = request => {
|
|
47
47
|
try {
|
|
48
|
-
|
|
49
|
-
const remoteAddress = (_request$socket = request.socket) === null || _request$socket === void 0 ? void 0 : _request$socket.remoteAddress;
|
|
48
|
+
const remoteAddress = request.socket?.remoteAddress;
|
|
50
49
|
const proxyIps = parseIps(request);
|
|
51
50
|
const _proxyIps = _slicedToArray(proxyIps, 1),
|
|
52
51
|
clientIp = _proxyIps[0];
|
|
53
52
|
return _objectSpread({
|
|
54
|
-
clientIp: clientIp
|
|
53
|
+
clientIp: clientIp ?? remoteAddress,
|
|
55
54
|
proxyIps,
|
|
56
55
|
hostname: request.socket ? request.hostname : undefined
|
|
57
56
|
}, remoteAddress ? {
|
|
58
57
|
remoteAddress
|
|
59
58
|
} : {});
|
|
60
59
|
} catch (error) {
|
|
61
|
-
console.error(
|
|
60
|
+
console.error(`Failed to parse request metadata`, error);
|
|
62
61
|
return {};
|
|
63
62
|
}
|
|
64
63
|
};
|
|
65
64
|
|
|
66
65
|
const createAccessLoggerMiddleware = function () {
|
|
67
|
-
var _options$formatters, _options$level;
|
|
68
66
|
let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
69
|
-
const formatters = winston__default.format.combine(winston__default.format.timestamp(), ...(
|
|
67
|
+
const formatters = winston__default.format.combine(winston__default.format.timestamp(), ...(options.formatters ?? []), options.json ? winston__default.format.json() : winston__default.format.cli());
|
|
70
68
|
const skip = createAccessLogSkipper(options);
|
|
71
69
|
return expressWinston.logger({
|
|
72
|
-
level:
|
|
70
|
+
level: options.level ?? 'info',
|
|
73
71
|
transports: [new winston__default.transports.Console()],
|
|
74
72
|
format: formatters,
|
|
75
73
|
meta: true,
|
|
@@ -82,11 +80,10 @@ const createAccessLoggerMiddleware = function () {
|
|
|
82
80
|
};
|
|
83
81
|
|
|
84
82
|
const createApplicationLogger = function () {
|
|
85
|
-
var _options$formatters, _options$level;
|
|
86
83
|
let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
87
|
-
const formatters = winston.format.combine(...(
|
|
84
|
+
const formatters = winston.format.combine(...(options.formatters ?? []), options.json ? winston.format.json() : winston.format.combine(winston.format.cli(), winston.format.simple()));
|
|
88
85
|
return winston.createLogger({
|
|
89
|
-
level:
|
|
86
|
+
level: options.level ?? 'info',
|
|
90
87
|
format: formatters,
|
|
91
88
|
transports: [new winston.transports.Console({
|
|
92
89
|
silent: Boolean(options.silent)
|
|
@@ -109,9 +106,8 @@ function redactFieldsFormatter(options) {
|
|
|
109
106
|
}
|
|
110
107
|
|
|
111
108
|
function rewriteField(info, field) {
|
|
112
|
-
var _field$preserveFromFi;
|
|
113
109
|
const fromFieldValue = getIn(info, field.from);
|
|
114
|
-
const preserveFromField =
|
|
110
|
+
const preserveFromField = field.preserveFromField ?? false;
|
|
115
111
|
if (fromFieldValue) {
|
|
116
112
|
if (!preserveFromField) {
|
|
117
113
|
unsetIn(info, field.from);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@commercetools-backend/loggers",
|
|
3
|
-
"version": "27.9.
|
|
3
|
+
"version": "27.9.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": {
|