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