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