@axinom/mosaic-service-common 0.15.1-rc.6 → 0.16.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.
- package/CHANGELOG.md +9 -0
- package/dist/common/config/env-var-extensions.js +1 -1
- package/dist/common/config/env-var-extensions.js.map +1 -1
- package/dist/common/logging/generate-log.d.ts +7 -1
- package/dist/common/logging/generate-log.d.ts.map +1 -1
- package/dist/common/logging/generate-log.js +20 -6
- package/dist/common/logging/generate-log.js.map +1 -1
- package/dist/common/logging/logger.d.ts +6 -0
- package/dist/common/logging/logger.d.ts.map +1 -1
- package/dist/common/logging/logger.js +9 -2
- package/dist/common/logging/logger.js.map +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,15 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [0.16.0](https://dev.azure.com/axinom/CMS/_git/Navy/branchCompare?baseVersion=GT@axinom/mosaic-service-common@0.15.0&targetVersion=GT@axinom/mosaic-service-common@0.16.0) (2022-04-01)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
* added logger middleware ([bdf350f](https://dev.azure.com/axinom/CMS/_git/Navy/commit/bdf350fc735bb8fe2cf92effbed93a5deaccb6dd))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
6
15
|
## [0.15.0](https://dev.azure.com/axinom/CMS/_git/Navy/branchCompare?baseVersion=GT@axinom/mosaic-service-common@0.14.0&targetVersion=GT@axinom/mosaic-service-common@0.15.0) (2022-03-16)
|
|
7
16
|
|
|
8
17
|
|
|
@@ -30,7 +30,7 @@ const asLogLevel = (logLevel) => {
|
|
|
30
30
|
loggerContext: 'asLogLevel',
|
|
31
31
|
});
|
|
32
32
|
// Unlike with our default logger - this will log string with both dev and prod env, since we cannot rely on config object here.
|
|
33
|
-
if (warningWasNotYetLogged) {
|
|
33
|
+
if (log && warningWasNotYetLogged) {
|
|
34
34
|
((_a = global.mosaicConsole) !== null && _a !== void 0 ? _a : console).warn(JSON.stringify(log));
|
|
35
35
|
warningWasNotYetLogged = false;
|
|
36
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-var-extensions.js","sourceRoot":"","sources":["../../../src/common/config/env-var-extensions.ts"],"names":[],"mappings":";;;AACA,sCAAsC;AACtC,wCAAmD;AAEnD;;GAEG;AACH,IAAI,sBAAsB,GAAG,IAAI,CAAC;AAElC;;;;;GAKG;AACI,MAAM,UAAU,GAA4C,CACjE,QAAgB,EACY,EAAE;;IAC9B,MAAM,WAAW,GAAG,CAAC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IACnD,MAAM,KAAK,GAAG,kBAAQ,CAAC,WAAoC,CAAC,CAAC;IAC7D,IAAI,KAAK,KAAK,SAAS,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QACpD,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAQ,CAAC;aACzC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;aAC/B,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,MAAM,GAAG,GAAG,IAAA,qBAAW,EAAC;YACtB,OAAO,EAAE;gBACP,OAAO,EAAE,cAAc,QAAQ,2DAA2D,cAAc,EAAE;gBAC1G,OAAO,EAAE,EAAE,IAAI,EAAE,kBAAS,CAAC,YAAY,EAAE;aAC1C;YACD,KAAK,EAAE,kBAAQ,CAAC,IAAI;YACpB,aAAa,EAAE,YAAY;SAC5B,CAAC,CAAC;QAEH,gIAAgI;QAChI,IAAI,sBAAsB,EAAE;
|
|
1
|
+
{"version":3,"file":"env-var-extensions.js","sourceRoot":"","sources":["../../../src/common/config/env-var-extensions.ts"],"names":[],"mappings":";;;AACA,sCAAsC;AACtC,wCAAmD;AAEnD;;GAEG;AACH,IAAI,sBAAsB,GAAG,IAAI,CAAC;AAElC;;;;;GAKG;AACI,MAAM,UAAU,GAA4C,CACjE,QAAgB,EACY,EAAE;;IAC9B,MAAM,WAAW,GAAG,CAAC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IACnD,MAAM,KAAK,GAAG,kBAAQ,CAAC,WAAoC,CAAC,CAAC;IAC7D,IAAI,KAAK,KAAK,SAAS,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QACpD,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAQ,CAAC;aACzC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;aAC/B,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,MAAM,GAAG,GAAG,IAAA,qBAAW,EAAC;YACtB,OAAO,EAAE;gBACP,OAAO,EAAE,cAAc,QAAQ,2DAA2D,cAAc,EAAE;gBAC1G,OAAO,EAAE,EAAE,IAAI,EAAE,kBAAS,CAAC,YAAY,EAAE;aAC1C;YACD,KAAK,EAAE,kBAAQ,CAAC,IAAI;YACpB,aAAa,EAAE,YAAY;SAC5B,CAAC,CAAC;QAEH,gIAAgI;QAChI,IAAI,GAAG,IAAI,sBAAsB,EAAE;YACjC,CAAC,MAAA,MAAM,CAAC,aAAa,mCAAI,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5D,sBAAsB,GAAG,KAAK,CAAC;SAChC;KACF;IACD,OAAO,MAAC,QAAkC,mCAAI,EAAE,CAAC;AACnD,CAAC,CAAC;AAzBW,QAAA,UAAU,cAyBrB;AAEW,QAAA,+BAA+B,GAAG;IAC7C,2BAA2B,EAAE,GAAS,EAAE;QACtC,sBAAsB,GAAG,IAAI,CAAC;IAChC,CAAC;CACF,CAAC;AAEF;;;;GAIG;AACI,MAAM,uBAAuB,GAAwB,CAC1D,KAAa,EACb,MAAe,EACf,aAAsB,EACd,EAAE;IACV,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,KAAK,CAAC;KACd;IACD,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CACb,2DAA2D,CAC5D,CAAC;KACH;IACD,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,+BAA+B,MAAM,EAAE,CAAC,CAAC;KAC3E;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAjBW,QAAA,uBAAuB,2BAiBlC;AAEF;;;;;;;GAOG;AACI,MAAM,cAAc,GAAwB,CAAC,KAAa,EAAU,EAAE;IAC3E,OAAO,IAAA,+BAAuB,EAC5B,KAAK,EACL,4BAA4B,EAC5B,0IAA0I,CAC3I,CAAC;AACJ,CAAC,CAAC;AANW,QAAA,cAAc,kBAMzB"}
|
|
@@ -21,9 +21,15 @@ interface GenerateLogMasking {
|
|
|
21
21
|
skipMaskMiddleware?: SkipMaskMiddleware;
|
|
22
22
|
maskOptions?: MaskOptions;
|
|
23
23
|
}
|
|
24
|
+
/**
|
|
25
|
+
* Modify the log data or return `undefined` to not log it at all.
|
|
26
|
+
*/
|
|
27
|
+
export interface LogMiddleware {
|
|
28
|
+
(log: Log): Log | undefined;
|
|
29
|
+
}
|
|
24
30
|
/**
|
|
25
31
|
* Generates a default log object without relying on config values.
|
|
26
32
|
*/
|
|
27
|
-
export declare const generateLog: (values: GenerateLogValues, masking?: GenerateLogMasking | undefined) => Log;
|
|
33
|
+
export declare const generateLog: (values: GenerateLogValues, masking?: GenerateLogMasking | undefined, logMiddleware?: LogMiddleware[] | undefined) => Log | undefined;
|
|
28
34
|
export {};
|
|
29
35
|
//# sourceMappingURL=generate-log.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-log.d.ts","sourceRoot":"","sources":["../../../src/common/logging/generate-log.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAW5D;;GAEG;AACH,UAAU,iBAAiB;IACzB,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC;IAC7B,KAAK,EAAE,QAAQ,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;
|
|
1
|
+
{"version":3,"file":"generate-log.d.ts","sourceRoot":"","sources":["../../../src/common/logging/generate-log.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAW5D;;GAEG;AACH,UAAU,iBAAiB;IACzB,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC;IAC7B,KAAK,EAAE,QAAQ,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,UAAU,kBAAkB;IAC1B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,GAAG,SAAS,CAAC;CAC7B;AAED;;GAEG;AACH,eAAO,MAAM,WAAW,WACd,iBAAiB,4FAGxB,GAAG,GAAG,SAoER,CAAC"}
|
|
@@ -19,18 +19,17 @@ const parseTimestamp = (timestamp) => {
|
|
|
19
19
|
/**
|
|
20
20
|
* Generates a default log object without relying on config values.
|
|
21
21
|
*/
|
|
22
|
-
const generateLog = (values, masking) => {
|
|
22
|
+
const generateLog = (values, masking, logMiddleware) => {
|
|
23
23
|
var _a;
|
|
24
24
|
const { message: msg, logtime, context, details, } = typeof values.message === 'string'
|
|
25
25
|
? { message: values.message }
|
|
26
26
|
: values.message;
|
|
27
|
-
|
|
27
|
+
let logMessage = {
|
|
28
28
|
logtime: parseTimestamp(logtime),
|
|
29
29
|
loglevel: log_level_1.LogLevel[values.level],
|
|
30
30
|
context: context || values.loggerContext,
|
|
31
31
|
component: values.component,
|
|
32
|
-
|
|
33
|
-
let sensitiveProperties = {
|
|
32
|
+
// sensitive properties
|
|
34
33
|
message: !(0, helpers_1.isNullOrWhitespace)(msg)
|
|
35
34
|
? msg
|
|
36
35
|
: values.error
|
|
@@ -39,7 +38,22 @@ const generateLog = (values, masking) => {
|
|
|
39
38
|
details: (0, helpers_1.isEmptyObject)(details) ? undefined : details,
|
|
40
39
|
error: (0, serialize_error_1.serializeError)(values.error),
|
|
41
40
|
};
|
|
42
|
-
|
|
41
|
+
if (logMiddleware && logMiddleware.length > 0) {
|
|
42
|
+
for (const logMiddlewareFunction of logMiddleware) {
|
|
43
|
+
const result = logMiddlewareFunction(logMessage);
|
|
44
|
+
if (result === undefined) {
|
|
45
|
+
return undefined;
|
|
46
|
+
}
|
|
47
|
+
logMessage = result;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
// TODO: check if we can change the masking as a middleware as well
|
|
51
|
+
const result = (_a = masking === null || masking === void 0 ? void 0 : masking.skipMaskMiddleware) === null || _a === void 0 ? void 0 : _a.call(masking, logMessage, masking === null || masking === void 0 ? void 0 : masking.maskMiddleware, masking === null || masking === void 0 ? void 0 : masking.maskOptions);
|
|
52
|
+
let sensitiveProperties = {
|
|
53
|
+
message: logMessage.message,
|
|
54
|
+
details: logMessage.details,
|
|
55
|
+
error: logMessage.error,
|
|
56
|
+
};
|
|
43
57
|
if (result === null || result === void 0 ? void 0 : result.modifiedLog) {
|
|
44
58
|
// Override only sensitive values
|
|
45
59
|
sensitiveProperties = {
|
|
@@ -53,7 +67,7 @@ const generateLog = (values, masking) => {
|
|
|
53
67
|
if (!(result === null || result === void 0 ? void 0 : result.skipMasking) && masking && masking.maskMiddleware) {
|
|
54
68
|
sensitiveProperties = (0, mask_middleware_1.maskObject)(sensitiveProperties, masking.maskMiddleware, masking.maskOptions);
|
|
55
69
|
}
|
|
56
|
-
return Object.assign(Object.assign({},
|
|
70
|
+
return Object.assign(Object.assign({}, logMessage), sensitiveProperties);
|
|
57
71
|
};
|
|
58
72
|
exports.generateLog = generateLog;
|
|
59
73
|
//# sourceMappingURL=generate-log.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-log.js","sourceRoot":"","sources":["../../../src/common/logging/generate-log.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,qDAAiD;AACjD,wCAA+D;AAC/D,2CAAuC;AAGvC,uDAA4E;AAG5E,MAAM,cAAc,GAAG,CAAC,SAAoC,EAAU,EAAE;;IACtE,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACrC,IAAI;QACF,OAAO,SAAS,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,mCAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;KACrE;IAAC,WAAM;QACN,OAAO,GAAG,CAAC;KACZ;AACH,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"generate-log.js","sourceRoot":"","sources":["../../../src/common/logging/generate-log.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ErrorObject } from 'serialize-error';
|
|
2
2
|
import { BasicConfig } from '../config';
|
|
3
3
|
import { Dict } from '../types';
|
|
4
|
+
import { LogMiddleware } from './generate-log';
|
|
4
5
|
import { LogLevel } from './log-level';
|
|
5
6
|
import { LogMessage } from './log-message';
|
|
6
7
|
import { MaskMiddleware } from './mask-middleware';
|
|
@@ -46,6 +47,10 @@ export interface LoggerOptions {
|
|
|
46
47
|
* It is also possible to modify selected properties of a log using this middleware (properties include `message`, `details` and `error`).
|
|
47
48
|
*/
|
|
48
49
|
skipMaskMiddleware?: SkipMaskMiddleware;
|
|
50
|
+
/**
|
|
51
|
+
* Middleware functions that is are applied in the given order to change the log details object before writing the log.
|
|
52
|
+
*/
|
|
53
|
+
logMiddleware?: LogMiddleware[];
|
|
49
54
|
}
|
|
50
55
|
/**
|
|
51
56
|
* Sets masking middleware that is applied to all Loggers which are instantiated after this call. Can be overridden by middleware passed as a Logger constructor parameter.
|
|
@@ -68,6 +73,7 @@ export declare class Logger {
|
|
|
68
73
|
private readonly loggerContext;
|
|
69
74
|
private readonly maskMiddleware?;
|
|
70
75
|
private readonly skipMaskMiddleware?;
|
|
76
|
+
private readonly logMiddleware;
|
|
71
77
|
/**
|
|
72
78
|
* Creates a Logger instance using provided options object.
|
|
73
79
|
* Default values are used if options are not provided.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/common/logging/logger.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAwC,MAAM,WAAW,CAAC;AAE9E,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/common/logging/logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,6 +44,7 @@ class Logger {
|
|
|
44
44
|
this.maskMiddleware = options === null || options === void 0 ? void 0 : options.maskMiddleware;
|
|
45
45
|
this.skipMaskMiddleware = options === null || options === void 0 ? void 0 : options.skipMaskMiddleware;
|
|
46
46
|
this.maxLevel = this.setMaxLogLevel();
|
|
47
|
+
this.logMiddleware = (options === null || options === void 0 ? void 0 : options.logMiddleware) || [];
|
|
47
48
|
}
|
|
48
49
|
setMaxLogLevel() {
|
|
49
50
|
var _a;
|
|
@@ -97,7 +98,10 @@ class Logger {
|
|
|
97
98
|
return ((_d = global.mosaicConsole) !== null && _d !== void 0 ? _d : console).log;
|
|
98
99
|
}
|
|
99
100
|
};
|
|
100
|
-
|
|
101
|
+
const formattedLog = this.format(level, message, error);
|
|
102
|
+
if (formattedLog) {
|
|
103
|
+
getLogFn(level)(formattedLog);
|
|
104
|
+
}
|
|
101
105
|
}
|
|
102
106
|
skipLog(level) {
|
|
103
107
|
return level > this.maxLevel;
|
|
@@ -133,7 +137,10 @@ class Logger {
|
|
|
133
137
|
maskMode: (_a = this.config.secureLoggingMode) !== null && _a !== void 0 ? _a : mask_middleware_1.MaskMode.SECRETS_HIDDEN,
|
|
134
138
|
keywords: this.config.logMaskKeywords,
|
|
135
139
|
},
|
|
136
|
-
});
|
|
140
|
+
}, this.logMiddleware);
|
|
141
|
+
if (log === undefined) {
|
|
142
|
+
return undefined;
|
|
143
|
+
}
|
|
137
144
|
if (this.config.isDev) {
|
|
138
145
|
return (0, util_1.inspect)((0, helpers_1.removeEmptyProperties)(log), {
|
|
139
146
|
depth: null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/common/logging/logger.ts"],"names":[],"mappings":";;;AAGA,+BAA+B;AAC/B,sCAA8E;AAC9E,wCAAmD;AAEnD,
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/common/logging/logger.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axinom/mosaic-service-common",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.16.0",
|
|
4
4
|
"description": "Common helpers and PostgreSQL-related functionality",
|
|
5
5
|
"author": "Axinom",
|
|
6
6
|
"license": "PROPRIETARY",
|
|
@@ -62,5 +62,5 @@
|
|
|
62
62
|
"publishConfig": {
|
|
63
63
|
"access": "public"
|
|
64
64
|
},
|
|
65
|
-
"gitHead": "
|
|
65
|
+
"gitHead": "2d8cec2958a2cc6f80ee764d21e66b4fe1729bb5"
|
|
66
66
|
}
|