@digital-alchemy/core 0.1.1 → 0.1.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.
- package/dist/automation/extensions/aggressive-scenes.extension.js +2 -3
- package/dist/automation/extensions/aggressive-scenes.extension.js.map +1 -1
- package/dist/automation/extensions/light-manager.extension.js +2 -3
- package/dist/automation/extensions/light-manager.extension.js.map +1 -1
- package/dist/automation/extensions/room.extension.js +1 -2
- package/dist/automation/extensions/room.extension.js.map +1 -1
- package/dist/automation/extensions/sequence-matcher.extension.js +4 -7
- package/dist/automation/extensions/sequence-matcher.extension.js.map +1 -1
- package/dist/boilerplate/extensions/configuration.extension.js +6 -8
- package/dist/boilerplate/extensions/configuration.extension.js.map +1 -1
- package/dist/boilerplate/extensions/fetch.extension.d.ts +1 -1
- package/dist/boilerplate/extensions/fetch.extension.js +2 -26
- package/dist/boilerplate/extensions/fetch.extension.js.map +1 -1
- package/dist/boilerplate/extensions/logger.extension.d.ts +4 -5
- package/dist/boilerplate/extensions/logger.extension.js +52 -94
- package/dist/boilerplate/extensions/logger.extension.js.map +1 -1
- package/dist/boilerplate/extensions/wiring.extension.d.ts +2 -2
- package/dist/boilerplate/extensions/wiring.extension.js +6 -10
- package/dist/boilerplate/extensions/wiring.extension.js.map +1 -1
- package/dist/boilerplate/helpers/config-environment-loader.helper.js +2 -3
- package/dist/boilerplate/helpers/config-environment-loader.helper.js.map +1 -1
- package/dist/boilerplate/helpers/fetch.helper.d.ts +0 -5
- package/dist/boilerplate/helpers/fetch.helper.js.map +1 -1
- package/dist/boilerplate/helpers/metrics.helper.d.ts +0 -4
- package/dist/boilerplate/helpers/metrics.helper.js +1 -10
- package/dist/boilerplate/helpers/metrics.helper.js.map +1 -1
- package/dist/boilerplate/helpers/wiring.helper.d.ts +1 -2
- package/dist/boilerplate/helpers/wiring.helper.js.map +1 -1
- package/dist/hass/extensions/entity-manager.extension.js +8 -11
- package/dist/hass/extensions/entity-manager.extension.js.map +1 -1
- package/dist/type-writer/build.extension.js +2 -2
- package/dist/type-writer/build.extension.js.map +1 -1
- package/dist/type-writer/main.js +1 -1
- package/dist/type-writer/main.js.map +1 -1
- package/dist/utilities/extensions/zcc.extension.d.ts +6 -0
- package/dist/utilities/extensions/zcc.extension.js +68 -0
- package/dist/utilities/extensions/zcc.extension.js.map +1 -1
- package/dist/utilities/helpers/async.helper.d.ts +1 -0
- package/dist/utilities/helpers/async.helper.js +27 -2
- package/dist/utilities/helpers/async.helper.js.map +1 -1
- package/package.json +23 -18
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AggressiveScenes = void 0;
|
|
4
|
-
const async_1 = require("async");
|
|
5
4
|
const __1 = require("../..");
|
|
6
5
|
const hass_1 = require("../../hass");
|
|
7
6
|
const helpers_1 = require("../helpers");
|
|
@@ -40,7 +39,7 @@ function AggressiveScenes({ logger, config, hass, event, automation, }) {
|
|
|
40
39
|
// ? This is a group
|
|
41
40
|
const id = entity.attributes.entity_id;
|
|
42
41
|
if (__1.is.array(id) && !__1.is.empty(id)) {
|
|
43
|
-
await (0,
|
|
42
|
+
await (0, __1.each)(entity.attributes.entity_id, async (child_id) => {
|
|
44
43
|
const child = hass.entity.byId(child_id);
|
|
45
44
|
if (!child) {
|
|
46
45
|
logger.warn(`%s => %s child entity of group cannot be found`, entity_id, child_id);
|
|
@@ -94,7 +93,7 @@ function AggressiveScenes({ logger, config, hass, event, automation, }) {
|
|
|
94
93
|
return;
|
|
95
94
|
}
|
|
96
95
|
const entities = Object.keys(scene.definition);
|
|
97
|
-
await (0,
|
|
96
|
+
await (0, __1.each)(entities, async (entity_id) => {
|
|
98
97
|
const entity = hass.entity.byId(entity_id);
|
|
99
98
|
if (!entity) {
|
|
100
99
|
// * Home assistant outright does not send an entity for this id
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggressive-scenes.extension.js","sourceRoot":"","sources":["../../../src/automation/extensions/aggressive-scenes.extension.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"aggressive-scenes.extension.js","sourceRoot":"","sources":["../../../src/automation/extensions/aggressive-scenes.extension.ts"],"names":[],"mappings":";;;AAAA,6BAA2D;AAC3D,qCAA+D;AAC/D,wCAMoB;AASpB;;;;;;;;;GASG;AACH,SAAgB,gBAAgB,CAAC,EAC/B,MAAM,EACN,MAAM,EACN,IAAI,EACJ,KAAK,EACL,UAAU,GACK;IACf,wDAAwD;IACxD,KAAK,UAAU,YAAY,CACzB,MAA2C,EAC3C,KAAsB;QAEtB,MAAM,SAAS,GAAG,MAAM,CAAC,SAAkC,CAAC;QAC5D,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAqB,CAAC;QACtD,IAAI,MAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvB,KAAK;YACL,OAAO;QACT,CAAC;QACD,IAAI,MAAM,CAAC,KAAK,KAAK,aAAa,EAAE,CAAC;YACnC,MAAM,CAAC,IAAI,CACT,EAAE,IAAI,EAAE,SAAS,EAAE,EACnB,2CAA2C,CAC5C,CAAC;YACF,OAAO;QACT,CAAC;QACD,IAAI,eAAe,GAAG,KAAK,CAAC;QAC5B,IAAI,MAAM,CAAC,KAAK,KAAK,QAAQ,CAAC,KAAK,EAAE,CAAC;YACpC,MAAM,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC3C,eAAe,GAAG,IAAI,CAAC;QACzB,CAAC;QACD,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QAED,IAAI,WAAW,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACrC,oBAAoB;YACpB,MAAM,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC;YACvC,IAAI,MAAE,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,MAAE,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;gBAClC,MAAM,IAAA,QAAI,EACR,MAAM,CAAC,UAAU,CAAC,SAAoC,EACtD,KAAK,EAAC,QAAQ,EAAC,EAAE;oBACf,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACzC,IAAI,CAAC,KAAK,EAAE,CAAC;wBACX,MAAM,CAAC,IAAI,CACT,gDAAgD,EAChD,SAAS,EACT,QAAQ,CACT,CAAC;wBACF,OAAO;oBACT,CAAC;oBACD,IAAI,KAAK,CAAC,KAAK,KAAK,aAAa,EAAE,CAAC;wBAClC,MAAM,CAAC,IAAI,CACT,EAAE,IAAI,EAAE,QAAQ,EAAE,EAClB,2CAA2C,CAC5C,CAAC;wBACF,OAAO;oBACT,CAAC;oBACD,IAAI,KAAK,CAAC,KAAK,KAAK,QAAQ,CAAC,KAAK,EAAE,CAAC;wBACnC,MAAM,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;oBAC5C,CAAC;gBACH,CAAC,CACF,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,UAAU,kBAAkB,CAC/B,MAA2C,EAC3C,QAA0B;QAE1B,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QACnC,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,EAAE,gBAAgB,CAAC,CAAC;QAC3E,KAAK,CAAC,IAAI,CAAC,sCAA4B,EAAE;YACvC,SAAS;YACT,IAAI,EAAE,eAAe;SACY,CAAC,CAAC;QACrC,IAAI,QAAQ,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YAC5B,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;YAC9C,OAAO;QACT,CAAC;QACD,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IACjD,CAAC;IAED;;;;;;OAMG;IACH,KAAK,UAAU,iBAAiB,CAAC,EAC/B,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,OAAO,GACU;QACjB,IACE,MAAM,CAAC,UAAU,CAAC,iBAAiB,KAAK,KAAK;YAC7C,KAAK,EAAE,UAAU,KAAK,KAAK,EAC3B,CAAC;YACD,gBAAgB;YAChB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,CAAC;YACvB,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,4BAA4B,CAAC,CAAC;YAC1E,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAE,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,MAAE,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/D,sEAAsE;YACtE,kCAAkC;YAClC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAC7B,OAAO;QACT,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAkB,CAAC;QAChE,MAAM,IAAA,QAAI,EAAC,QAAQ,EAAE,KAAK,EAAC,SAAS,EAAC,EAAE;YACrC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,gEAAgE;gBAChE,kCAAkC;gBAClC,EAAE;gBACF,iDAAiD;gBACjD,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,oBAAoB,CAAC,CAAC;gBACxD,OAAO;YACT,CAAC;YACD,MAAM,YAAY,GAAG,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC;YACvC,QAAQ,YAAY,EAAE,CAAC;gBACrB,KAAK,OAAO;oBACV,MAAM,UAAU,CAAC,KAAK,CAAC,WAAW,CAChC,MAA4C,EAC5C,KAAK,CAAC,UAAU,CACjB,CAAC;oBACF,OAAO;gBACT,KAAK,QAAQ;oBACX,MAAM,YAAY,CAChB,MAA6C,EAC7C,KAAK,CAAC,UAAU,CACjB,CAAC;oBACF,OAAO;gBACT;oBACE,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,2BAA2B,CAAC,CAAC;YACtE,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,iBAAiB;KAClB,CAAC;AACJ,CAAC;AAnJD,4CAmJC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.LightManager = void 0;
|
|
4
|
-
const async_1 = require("async");
|
|
5
4
|
const utilities_1 = require("../../utilities");
|
|
6
5
|
function LightManager({ logger, hass, scheduler, lifecycle, automation, config, }) {
|
|
7
6
|
/**
|
|
@@ -43,7 +42,7 @@ function LightManager({ logger, hass, scheduler, lifecycle, automation, config,
|
|
|
43
42
|
if ("entity_id" in entity.attributes) {
|
|
44
43
|
const list = entity.attributes.entity_id;
|
|
45
44
|
if (utilities_1.is.array(list) && !utilities_1.is.empty(list)) {
|
|
46
|
-
await (0,
|
|
45
|
+
await (0, utilities_1.each)(list, async (child_id) => {
|
|
47
46
|
const child = hass.entity.byId(child_id);
|
|
48
47
|
if (!child) {
|
|
49
48
|
logger.warn(`%s => %s child entity of group cannot be found`, entity_id, child_id);
|
|
@@ -233,7 +232,7 @@ function LightManager({ logger, hass, scheduler, lifecycle, automation, config,
|
|
|
233
232
|
stopped = true;
|
|
234
233
|
earlyStop = undefined;
|
|
235
234
|
};
|
|
236
|
-
await (0,
|
|
235
|
+
await (0, utilities_1.eachLimit)(list, config.automation.CIRCADIAN_RATE, async ({ light, diff }) => {
|
|
237
236
|
if (stopped) {
|
|
238
237
|
return;
|
|
239
238
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"light-manager.extension.js","sourceRoot":"","sources":["../../../src/automation/extensions/light-manager.extension.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"light-manager.extension.js","sourceRoot":"","sources":["../../../src/automation/extensions/light-manager.extension.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Room = void 0;
|
|
4
|
-
const async_1 = require("async");
|
|
5
4
|
const __1 = require("../..");
|
|
6
5
|
function Room({ logger, hass, synapse, scheduler, automation, context: parentContext, }) {
|
|
7
6
|
// eslint-disable-next-line sonarjs/cognitive-complexity
|
|
@@ -105,7 +104,7 @@ function Room({ logger, hass, synapse, scheduler, automation, context: parentCon
|
|
|
105
104
|
}),
|
|
106
105
|
// Set lights to current color temp
|
|
107
106
|
new Promise(async (done) => {
|
|
108
|
-
await (0,
|
|
107
|
+
await (0, __1.eachSeries)(Object.keys(lights), async (entity_id) => {
|
|
109
108
|
const change = lights[entity_id];
|
|
110
109
|
await hass.call.light.turn_on({
|
|
111
110
|
brightness: change.brightness,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"room.extension.js","sourceRoot":"","sources":["../../../src/automation/extensions/room.extension.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"room.extension.js","sourceRoot":"","sources":["../../../src/automation/extensions/room.extension.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SequenceWatcher = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
|
-
const object_path_1 = tslib_1.__importDefault(require("object-path"));
|
|
6
|
-
const uuid_1 = require("uuid");
|
|
7
4
|
const utilities_1 = require("../../utilities");
|
|
8
5
|
const __1 = require("..");
|
|
9
|
-
// eslint-disable-next-line @typescript-eslint/unbound-method
|
|
10
|
-
const { get } = object_path_1.default;
|
|
11
6
|
function SequenceWatcher({ logger, hass, config }) {
|
|
12
7
|
const ACTIVE = new Map();
|
|
13
8
|
const WATCHED_EVENTS = new Map();
|
|
14
9
|
const EVENT_REMOVAL = new Map();
|
|
10
|
+
let counter = utilities_1.START;
|
|
15
11
|
async function onMatch(data) {
|
|
16
12
|
await data.exec();
|
|
17
13
|
const reset = data.reset ?? "self";
|
|
@@ -48,7 +44,7 @@ function SequenceWatcher({ logger, hass, config }) {
|
|
|
48
44
|
match.push(...current.match);
|
|
49
45
|
}
|
|
50
46
|
// * Grab the new value from the event, and add it on the list
|
|
51
|
-
const value = get(event_data, data.path);
|
|
47
|
+
const value = utilities_1.ZCC.utils.object.get(event_data, data.path);
|
|
52
48
|
match.push(value);
|
|
53
49
|
// * If the sequence matches, fire the callback
|
|
54
50
|
if (utilities_1.is.equal(match, data.match)) {
|
|
@@ -70,7 +66,8 @@ function SequenceWatcher({ logger, hass, config }) {
|
|
|
70
66
|
function SequenceWatcher(data) {
|
|
71
67
|
const { exec, event_type, match, context, label, path, filter } = data;
|
|
72
68
|
logger.trace({ context }, `setting up sequence watcher`);
|
|
73
|
-
const id =
|
|
69
|
+
const id = counter.toString();
|
|
70
|
+
counter++;
|
|
74
71
|
// If this is the first watcher for this event, set up a listener
|
|
75
72
|
let watcher = WATCHED_EVENTS.get(event_type);
|
|
76
73
|
if (!watcher) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sequence-matcher.extension.js","sourceRoot":"","sources":["../../../src/automation/extensions/sequence-matcher.extension.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sequence-matcher.extension.js","sourceRoot":"","sources":["../../../src/automation/extensions/sequence-matcher.extension.ts"],"names":[],"mappings":";;;AACA,+CAAwD;AACxD,0BAQY;AAEZ,SAAgB,eAAe,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAkB;IACtE,MAAM,MAAM,GAAG,IAAI,GAAG,EAAyB,CAAC;IAChD,MAAM,cAAc,GAAG,IAAI,GAAG,EAA4B,CAAC;IAC3D,MAAM,aAAa,GAAG,IAAI,GAAG,EAAsB,CAAC;IACpD,IAAI,OAAO,GAAG,iBAAK,CAAC;IAEpB,KAAK,UAAU,OAAO,CAAC,IAA0B;QAC/C,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC;QACnC,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;YACrB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACpB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,cAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YACtB,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,gBAAgB,CAAC,CAAC;YACtD,OAAO;QACT,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,cAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACvE,CAAC,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC7B,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC3B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC5B,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,SAAS,OAAO,CAAC,IAAY,EAAE,UAAkB;QAC/C,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;YAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YACxC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO;YACT,CAAC;YAED,4CAA4C;YAC5C,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACjC,MAAM,KAAK,GAAG,EAAE,CAAC;YACjB,IAAI,OAAO,EAAE,CAAC;gBACZ,uDAAuD;gBACvD,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC/B,iDAAiD;gBACjD,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;YAC/B,CAAC;YAED,8DAA8D;YAC9D,MAAM,KAAK,GAAG,eAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAW,CAAC;YACpE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAElB,+CAA+C;YAC/C,IAAI,cAAE,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBAChC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;YACtB,CAAC;YAED,mEAAmE;YACnE,MAAM,SAAS,GAAG,IAAA,iBAAK,EAAC,MAAM,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;YAC5D,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE;gBACf,SAAS;gBACT,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,KAAK;gBACL,KAAK,EAAE,IAAI,CAAC,KAAK;aAClB,CAAC,CAAC;YACH,MAAM,SAAS,CAAC;YAEhB,wDAAwD;YACxD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,SAAS,eAAe,CAGtB,IAAuC;QACvC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACvE,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,EAAE,6BAA6B,CAAC,CAAC;QACzD,MAAM,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC9B,OAAO,EAAE,CAAC;QAEV,iEAAiE;QACjE,IAAI,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC7C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,EAAE,4BAA4B,CAAC,CAAC;YAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;gBAClC,OAAO;gBACP,KAAK,EAAE,UAAU;gBACjB,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC;gBACjD,KAAK;aACN,CAAC,CAAC;YACH,aAAa,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QACzC,CAAC;QAED,yBAAyB;QACzB,cAAc,CAAC,GAAG,CAAC,UAAU,EAAE;YAC7B,GAAG,OAAO;YACV;gBACE,OAAO;gBACP,UAAU;gBACV,IAAI,EAAE,GAAG,EAAE;oBACT,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,wBAAwB,CAAC,CAAC;oBAClE,YAAY,CACV,KAAK,IAAI,EAAE,CACT,MAAM,eAAG,CAAC,QAAQ,CAAC;wBACjB,QAAQ,EAAE,mCAA+B;wBACzC,MAAM,EAAE,2BAAuB;wBAC/B,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,EAAE;wBAC9B,UAAU,EAAE,oCAAgC;wBAC5C,MAAM,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;qBAC3B,CAAC,CACL,CAAC;gBACJ,CAAC;gBACD,MAAM,EAAE,MAAuB;gBAC/B,EAAE;gBACF,KAAK;gBACL,KAAK;gBACL,IAAI;aACL;SACF,CAAC,CAAC;QAEH,4BAA4B;QAC5B,OAAO,GAAG,EAAE;YACV,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,MAAM,CACnD,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CACvB,CAAC;YACF,IAAI,cAAE,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;gBACtB,MAAM,CAAC,KAAK,CACV,EAAE,UAAU,EAAE,EACd,mEAAmE,CACpE,CAAC;gBACF,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;gBAClC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gBAChC,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;gBACjC,OAAO;YACT,CAAC;YACD,cAAc,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC1C,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AA1ID,0CA0IC"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Configuration = exports.INJECTED_DEFINITIONS = exports.EVENT_CONFIGURATION_UPDATED = exports.LOAD_PROJECT = exports.INITIALIZE = void 0;
|
|
4
|
-
const async_1 = require("async");
|
|
5
|
-
const object_path_1 = require("object-path");
|
|
6
4
|
const __1 = require("../..");
|
|
7
5
|
const helpers_1 = require("../helpers");
|
|
8
6
|
// # Symbols
|
|
@@ -36,7 +34,7 @@ logger, }) {
|
|
|
36
34
|
DEFAULT_LOADERS.forEach((i, index) => configLoaders.add([i, index]));
|
|
37
35
|
}
|
|
38
36
|
// * load!
|
|
39
|
-
await (0,
|
|
37
|
+
await (0, __1.eachSeries)([...configLoaders.values()].sort(([, a], [, b]) => (a > b ? __1.UP : __1.DOWN)), async ([loader]) => {
|
|
40
38
|
const merge = await loader({
|
|
41
39
|
application,
|
|
42
40
|
configs: configDefinitions,
|
|
@@ -49,7 +47,7 @@ logger, }) {
|
|
|
49
47
|
Object.keys(definitions).forEach(key => {
|
|
50
48
|
const config = [project, key].join(".");
|
|
51
49
|
if (definitions[key].required &&
|
|
52
|
-
__1.is.undefined(
|
|
50
|
+
__1.is.undefined(__1.ZCC.utils.object.get(configuration, config))) {
|
|
53
51
|
// ruh roh
|
|
54
52
|
throw new helpers_1.BootstrapException(context, "REQUIRED_CONFIGURATION_MISSING", `Configuration property ${config} is not defined`);
|
|
55
53
|
}
|
|
@@ -60,13 +58,13 @@ logger, }) {
|
|
|
60
58
|
function InjectedDefinitions() {
|
|
61
59
|
return new Proxy({}, {
|
|
62
60
|
get(_, project) {
|
|
63
|
-
return
|
|
61
|
+
return __1.ZCC.utils.object.get(configuration, project) ?? {};
|
|
64
62
|
},
|
|
65
63
|
});
|
|
66
64
|
}
|
|
67
65
|
// ## Set a configuration value at runtime
|
|
68
66
|
function SetConfig(project, property, value) {
|
|
69
|
-
|
|
67
|
+
__1.ZCC.utils.object.set(configuration, [project, property].join("."), value);
|
|
70
68
|
// in case anyone needs a hook
|
|
71
69
|
event.emit(exports.EVENT_CONFIGURATION_UPDATED);
|
|
72
70
|
}
|
|
@@ -76,9 +74,9 @@ logger, }) {
|
|
|
76
74
|
}
|
|
77
75
|
// ## Add a library, and it's associated definitions
|
|
78
76
|
function LoadProject(library, definitions) {
|
|
79
|
-
|
|
77
|
+
__1.ZCC.utils.object.set(configuration, library, {});
|
|
80
78
|
Object.keys(definitions).forEach(key => {
|
|
81
|
-
|
|
79
|
+
__1.ZCC.utils.object.set(configuration, [library, key].join("."), definitions[key].default);
|
|
82
80
|
});
|
|
83
81
|
return configDefinitions.set(library, definitions);
|
|
84
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.extension.js","sourceRoot":"","sources":["../../../src/boilerplate/extensions/configuration.extension.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"configuration.extension.js","sourceRoot":"","sources":["../../../src/boilerplate/extensions/configuration.extension.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { DownloadOptions, FetchArguments, FetcherOptions, TServiceParams } from "..";
|
|
2
|
-
export declare function Fetch({ logger, context: parentContext }: TServiceParams): ({
|
|
2
|
+
export declare function Fetch({ logger, context: parentContext }: TServiceParams): ({ headers: baseHeaders, baseUrl, context: logContext, }: FetcherOptions) => {
|
|
3
3
|
download: ({ destination, body, headers, label, context, method, ...fetchWith }: DownloadOptions) => Promise<void>;
|
|
4
4
|
fetch: <T, BODY extends object = undefined>(fetchWith: Partial<FetchArguments<BODY>>) => Promise<T>;
|
|
5
5
|
setBaseUrl: (url: string) => string;
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Fetch = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
|
-
const bottleneck_1 = tslib_1.__importDefault(require("bottleneck"));
|
|
6
4
|
const fs_1 = require("fs");
|
|
7
5
|
const stream_1 = require("stream");
|
|
8
6
|
const util_1 = require("util");
|
|
@@ -10,19 +8,14 @@ const __1 = require("../..");
|
|
|
10
8
|
const __2 = require("..");
|
|
11
9
|
const streamPipeline = (0, util_1.promisify)(stream_1.pipeline);
|
|
12
10
|
function Fetch({ logger, context: parentContext }) {
|
|
13
|
-
const createFetcher = ({
|
|
11
|
+
const createFetcher = ({ headers: baseHeaders, baseUrl, context: logContext,
|
|
14
12
|
// eslint-disable-next-line sonarjs/cognitive-complexity
|
|
15
13
|
}) => {
|
|
16
14
|
const extras = {};
|
|
17
15
|
if (!__1.is.empty(logContext)) {
|
|
18
16
|
extras["context"] = logContext;
|
|
19
17
|
}
|
|
20
|
-
let limiter;
|
|
21
18
|
const capabilities = [];
|
|
22
|
-
if (bottleneck) {
|
|
23
|
-
capabilities.push("bottleneck");
|
|
24
|
-
limiter = new bottleneck_1.default(bottleneck);
|
|
25
|
-
}
|
|
26
19
|
if (!__1.is.empty(capabilities)) {
|
|
27
20
|
logger.trace({ capabilities, ...extras }, `initialized fetcher`);
|
|
28
21
|
}
|
|
@@ -124,24 +117,7 @@ function Fetch({ logger, context: parentContext }) {
|
|
|
124
117
|
__2.FETCH_DOWNLOAD_REQUESTS_SUCCESSFUL.labels(context, label).inc();
|
|
125
118
|
}
|
|
126
119
|
},
|
|
127
|
-
fetch: async (fetchWith) =>
|
|
128
|
-
if (!limiter) {
|
|
129
|
-
return await execFetch(fetchWith);
|
|
130
|
-
}
|
|
131
|
-
let end;
|
|
132
|
-
if (!__1.is.empty(fetchWith.label)) {
|
|
133
|
-
end = __2.FETCH_REQUEST_BOTTLENECK_DELAY.startTimer();
|
|
134
|
-
}
|
|
135
|
-
return limiter.schedule(async () => {
|
|
136
|
-
if (end) {
|
|
137
|
-
end({
|
|
138
|
-
context: fetchWith.context || parentContext,
|
|
139
|
-
label: fetchWith.label,
|
|
140
|
-
});
|
|
141
|
-
}
|
|
142
|
-
return await execFetch(fetchWith);
|
|
143
|
-
});
|
|
144
|
-
},
|
|
120
|
+
fetch: async (fetchWith) => await execFetch(fetchWith),
|
|
145
121
|
setBaseUrl: (url) => (baseUrl = url),
|
|
146
122
|
setHeaders: (headers) => (baseHeaders = headers),
|
|
147
123
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.extension.js","sourceRoot":"","sources":["../../../src/boilerplate/extensions/fetch.extension.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fetch.extension.js","sourceRoot":"","sources":["../../../src/boilerplate/extensions/fetch.extension.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { pino } from "pino";
|
|
2
1
|
import { TContext } from "../..";
|
|
3
2
|
import { TServiceParams } from "..";
|
|
4
3
|
export type TLoggerFunction = ((message: string, ...arguments_: unknown[]) => void) | ((object: object, message?: string, ...arguments_: unknown[]) => void);
|
|
@@ -22,14 +21,14 @@ export interface ILogger {
|
|
|
22
21
|
warn(message: string, ...arguments_: unknown[]): void;
|
|
23
22
|
warn(object: object, message?: string, ...arguments_: unknown[]): void;
|
|
24
23
|
}
|
|
25
|
-
export declare const METHOD_COLORS: Map<
|
|
24
|
+
export declare const METHOD_COLORS: Map<keyof ILogger, CONTEXT_COLORS>;
|
|
26
25
|
export type CONTEXT_COLORS = "grey" | "blue" | "yellow" | "red" | "green" | "magenta";
|
|
27
26
|
export declare function Logger({ lifecycle, config }: TServiceParams): Promise<{
|
|
28
27
|
context: (context: string | TContext) => ILogger;
|
|
29
|
-
getBaseLogger: () => ILogger
|
|
30
|
-
getLogLevel: () =>
|
|
28
|
+
getBaseLogger: () => Record<keyof ILogger, (context: TContext, ...data: [message: string, ...arguments_: unknown[]] | [object: object, message?: string, ...arguments_: unknown[]]) => void>;
|
|
29
|
+
getLogLevel: () => keyof ILogger;
|
|
31
30
|
setBaseLogger: (base: ILogger) => ILogger;
|
|
32
|
-
setLogLevel: (level:
|
|
31
|
+
setLogLevel: (level: keyof ILogger) => void;
|
|
33
32
|
}>;
|
|
34
33
|
declare module "../../utilities" {
|
|
35
34
|
interface ZCCDefinition {
|
|
@@ -1,31 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Logger = exports.METHOD_COLORS = void 0;
|
|
4
|
-
|
|
5
|
-
const
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const dayjs_1 = tslib_1.__importDefault(require("dayjs"));
|
|
6
6
|
const util_1 = require("util");
|
|
7
7
|
const __1 = require("../..");
|
|
8
|
-
let logger = (0, pino_1.pino)({
|
|
9
|
-
level: "debug",
|
|
10
|
-
transport: {
|
|
11
|
-
options: {
|
|
12
|
-
colorize: true,
|
|
13
|
-
crlf: false,
|
|
14
|
-
customPrettifiers: {},
|
|
15
|
-
errorLikeObjectKeys: ["err", "error"],
|
|
16
|
-
errorProps: "",
|
|
17
|
-
hideObject: false,
|
|
18
|
-
ignore: "pid,hostname,level",
|
|
19
|
-
levelFirst: false,
|
|
20
|
-
levelKey: "level",
|
|
21
|
-
messageKey: "msg",
|
|
22
|
-
singleLine: false,
|
|
23
|
-
timestampKey: "time",
|
|
24
|
-
translateTime: "SYS:ddd hh:MM:ss.l",
|
|
25
|
-
},
|
|
26
|
-
target: "pino-pretty",
|
|
27
|
-
},
|
|
28
|
-
}, pino_1.pino.destination({ sync: true }));
|
|
29
8
|
const LOG_LEVEL_PRIORITY = {
|
|
30
9
|
debug: 20,
|
|
31
10
|
error: 50,
|
|
@@ -42,16 +21,14 @@ exports.METHOD_COLORS = new Map([
|
|
|
42
21
|
["info", "green"],
|
|
43
22
|
["fatal", "magenta"],
|
|
44
23
|
]);
|
|
24
|
+
let logger = {};
|
|
45
25
|
const MAX_CUTOFF = 2000;
|
|
46
26
|
const frontDash = " - ";
|
|
27
|
+
const SYMBOL_START = 1;
|
|
28
|
+
const SYMBOL_END = -1;
|
|
47
29
|
async function Logger({ lifecycle, config }) {
|
|
48
30
|
const chalk = (await import("chalk")).default;
|
|
49
|
-
function log(method, context, ...parameters) {
|
|
50
|
-
// standardLogger(method, context, ...parameters);
|
|
51
|
-
prettyLogger(method, context, ...parameters);
|
|
52
|
-
}
|
|
53
31
|
const YELLOW_DASH = chalk.yellowBright(frontDash);
|
|
54
|
-
const highlightContext = (context, level) => chalk.bold[level](`[${context}]`);
|
|
55
32
|
const prettyFormatMessage = (message) => {
|
|
56
33
|
if (!message) {
|
|
57
34
|
return ``;
|
|
@@ -65,83 +42,64 @@ async function Logger({ lifecycle, config }) {
|
|
|
65
42
|
// ? [A] > [B] > [C] - highlight the >'s in blue
|
|
66
43
|
.replaceAll("] > [", chalk `] {blue >} [`)
|
|
67
44
|
// ? [Text] - strip brackets, highlight magenta
|
|
68
|
-
.replaceAll(new RegExp("(\\[[^\\]\\[]+\\])", "g"), i => chalk.bold.magenta(i.slice(
|
|
45
|
+
.replaceAll(new RegExp("(\\[[^\\]\\[]+\\])", "g"), i => chalk.bold.magenta(i.slice(SYMBOL_START, SYMBOL_END)))
|
|
69
46
|
// ? {Text} - strip braces, highlight gray
|
|
70
|
-
.replaceAll(new RegExp("(\\{[^\\]}]+\\})", "g"), i => chalk.bold.gray(i.slice(
|
|
47
|
+
.replaceAll(new RegExp("(\\{[^\\]}]+\\})", "g"), i => chalk.bold.gray(i.slice(SYMBOL_START, SYMBOL_END)));
|
|
71
48
|
// ? " - Text" (line prefix with dash) - highlight dash
|
|
72
|
-
if (message.slice(
|
|
49
|
+
if (message.slice(__1.START, frontDash.length) === frontDash) {
|
|
73
50
|
message = `${YELLOW_DASH}${message.slice(frontDash.length)}`;
|
|
74
51
|
}
|
|
75
52
|
return message;
|
|
76
53
|
};
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
54
|
+
[...exports.METHOD_COLORS.keys()].forEach(key => {
|
|
55
|
+
logger[key] = (context, ...parameters) => {
|
|
56
|
+
const data = __1.is.object(parameters[__1.FIRST])
|
|
57
|
+
? parameters.shift()
|
|
58
|
+
: {};
|
|
59
|
+
const highlighted = chalk.bold[exports.METHOD_COLORS.get(key)](`[${data.context || context}]`);
|
|
60
|
+
const name = data.name;
|
|
61
|
+
delete data.context;
|
|
62
|
+
delete data.name;
|
|
63
|
+
const timestamp = chalk.white(`[${(0, dayjs_1.default)().format("ddd hh:mm:ss.SSS")}]`);
|
|
64
|
+
let logMessage;
|
|
65
|
+
if (!__1.is.empty(parameters)) {
|
|
66
|
+
logMessage = prettyFormatMessage((0, util_1.format)(...parameters));
|
|
85
67
|
}
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
].join(" ");
|
|
90
|
-
if ("error" in data && data.error instanceof Error) {
|
|
91
|
-
// pino is doing something weird, not sure why it won't print useful stuff about the error
|
|
92
|
-
// this keeps the stack attach
|
|
93
|
-
data.stack = data.error.stack.trim().split("\n");
|
|
68
|
+
let message = `${timestamp} ${highlighted}`;
|
|
69
|
+
if (!__1.is.empty(name)) {
|
|
70
|
+
message += chalk.blue(` (${name})`);
|
|
94
71
|
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
72
|
+
if (!__1.is.empty(logMessage)) {
|
|
73
|
+
message += `: ${chalk.cyan(logMessage)}`;
|
|
74
|
+
}
|
|
75
|
+
if (!__1.is.empty(data)) {
|
|
76
|
+
message +=
|
|
77
|
+
"\n" +
|
|
78
|
+
(0, util_1.inspect)(data, {
|
|
79
|
+
colors: true,
|
|
80
|
+
compact: false,
|
|
81
|
+
depth: 10,
|
|
82
|
+
numericSeparator: true,
|
|
83
|
+
})
|
|
84
|
+
.split("\n")
|
|
85
|
+
.slice(SYMBOL_START, SYMBOL_END)
|
|
86
|
+
.join("\n");
|
|
87
|
+
}
|
|
88
|
+
// eslint-disable-next-line no-console
|
|
89
|
+
console.log(message);
|
|
90
|
+
};
|
|
91
|
+
});
|
|
92
|
+
let logLevel = (config.boilerplate.LOG_LEVEL = "trace");
|
|
112
93
|
const shouldLog = (level) => LOG_LEVEL_PRIORITY[level] >= LOG_LEVEL_PRIORITY[logLevel];
|
|
113
|
-
|
|
114
|
-
logger = (0, pino_1.pino)({
|
|
115
|
-
level: config.boilerplate.LOG_LEVEL,
|
|
116
|
-
transport: {
|
|
117
|
-
options: {
|
|
118
|
-
colorize: true,
|
|
119
|
-
crlf: false,
|
|
120
|
-
customPrettifiers: {},
|
|
121
|
-
errorLikeObjectKeys: ["err", "error"],
|
|
122
|
-
errorProps: "error",
|
|
123
|
-
hideObject: false,
|
|
124
|
-
ignore: "pid,hostname,level",
|
|
125
|
-
levelFirst: false,
|
|
126
|
-
levelKey: "level",
|
|
127
|
-
messageKey: "msg",
|
|
128
|
-
singleLine: false,
|
|
129
|
-
timestampKey: "time",
|
|
130
|
-
translateTime: "SYS:ddd hh:MM:ss.l",
|
|
131
|
-
},
|
|
132
|
-
target: "pino-pretty",
|
|
133
|
-
},
|
|
134
|
-
}, pino_1.pino.destination({ sync: true }));
|
|
135
|
-
}
|
|
136
|
-
lifecycle.onPostConfig(() => createBaseLogger());
|
|
94
|
+
lifecycle.onPostConfig(() => (logLevel = config.boilerplate.LOG_LEVEL));
|
|
137
95
|
const out = {
|
|
138
96
|
context: (context) => ({
|
|
139
|
-
debug: (...params) => shouldLog("debug") &&
|
|
140
|
-
error: (...params) => shouldLog("error") &&
|
|
141
|
-
fatal: (...params) => shouldLog("fatal") &&
|
|
142
|
-
info: (...params) => shouldLog("info") &&
|
|
143
|
-
trace: (...params) => shouldLog("trace") &&
|
|
144
|
-
warn: (...params) => shouldLog("warn") &&
|
|
97
|
+
debug: (...params) => shouldLog("debug") && logger.debug(context, ...params),
|
|
98
|
+
error: (...params) => shouldLog("error") && logger.error(context, ...params),
|
|
99
|
+
fatal: (...params) => shouldLog("fatal") && logger.fatal(context, ...params),
|
|
100
|
+
info: (...params) => shouldLog("info") && logger.info(context, ...params),
|
|
101
|
+
trace: (...params) => shouldLog("trace") && logger.trace(context, ...params),
|
|
102
|
+
warn: (...params) => shouldLog("warn") && logger.warn(context, ...params),
|
|
145
103
|
}),
|
|
146
104
|
getBaseLogger: () => logger,
|
|
147
105
|
getLogLevel: () => logLevel,
|