@digital-alchemy/core 0.1.8 → 0.1.10
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.map +1 -1
- package/dist/automation/extensions/light-manager.extension.js +4 -4
- package/dist/automation/extensions/light-manager.extension.js.map +1 -1
- package/dist/automation/extensions/managed-switch.extension.js +3 -3
- package/dist/automation/extensions/managed-switch.extension.js.map +1 -1
- package/dist/automation/extensions/room.extension.js +6 -6
- package/dist/automation/extensions/room.extension.js.map +1 -1
- package/dist/automation/extensions/sequence-matcher.extension.js +4 -4
- package/dist/automation/extensions/sequence-matcher.extension.js.map +1 -1
- package/dist/automation/helpers/reftimes.helper.js +2 -2
- package/dist/automation/helpers/reftimes.helper.js.map +1 -1
- package/dist/boilerplate/extensions/cache.extension.js +2 -2
- package/dist/boilerplate/extensions/cache.extension.js.map +1 -1
- package/dist/boilerplate/extensions/configuration.extension.js +2 -2
- package/dist/boilerplate/extensions/configuration.extension.js.map +1 -1
- package/dist/boilerplate/extensions/logger.extension.js +4 -4
- package/dist/boilerplate/extensions/logger.extension.js.map +1 -1
- package/dist/boilerplate/extensions/scheduler.extension.js +3 -3
- package/dist/boilerplate/extensions/scheduler.extension.js.map +1 -1
- package/dist/boilerplate/extensions/wiring.extension.d.ts +2 -2
- package/dist/boilerplate/extensions/wiring.extension.js +19 -18
- package/dist/boilerplate/extensions/wiring.extension.js.map +1 -1
- package/dist/boilerplate/helpers/cache-memory.helper.js +1 -1
- package/dist/boilerplate/helpers/cache-memory.helper.js.map +1 -1
- package/dist/boilerplate/helpers/config-environment-loader.helper.js +9 -9
- package/dist/boilerplate/helpers/config-environment-loader.helper.js.map +1 -1
- package/dist/boilerplate/helpers/config-file-loader.helper.js +4 -4
- package/dist/boilerplate/helpers/config-file-loader.helper.js.map +1 -1
- package/dist/boilerplate/helpers/fetch.helper.js +2 -2
- package/dist/boilerplate/helpers/fetch.helper.js.map +1 -1
- package/dist/boilerplate/helpers/testing.helper.js +3 -3
- package/dist/boilerplate/helpers/testing.helper.js.map +1 -1
- package/dist/boilerplate/helpers/wiring.helper.d.ts +2 -2
- package/dist/hass/extensions/call-proxy.extension.js +3 -3
- package/dist/hass/extensions/call-proxy.extension.js.map +1 -1
- package/dist/hass/extensions/entity-manager.extension.js +6 -6
- package/dist/hass/extensions/entity-manager.extension.js.map +1 -1
- package/dist/hass/extensions/fetch-api.extension.d.ts +3 -0
- package/dist/hass/extensions/fetch-api.extension.js +10 -2
- package/dist/hass/extensions/fetch-api.extension.js.map +1 -1
- package/dist/hass/extensions/index.d.ts +1 -0
- package/dist/hass/extensions/index.js +1 -0
- package/dist/hass/extensions/index.js.map +1 -1
- package/dist/hass/extensions/validate.extension.d.ts +2 -0
- package/dist/hass/extensions/validate.extension.js +34 -0
- package/dist/hass/extensions/validate.extension.js.map +1 -0
- package/dist/hass/extensions/websocket-api.extension.js +4 -4
- package/dist/hass/extensions/websocket-api.extension.js.map +1 -1
- package/dist/hass/hass.module.d.ts +7 -1
- package/dist/hass/hass.module.js +6 -0
- package/dist/hass/hass.module.js.map +1 -1
- package/dist/hass/helpers/utility.helper.d.ts +4 -0
- package/dist/hass/helpers/utility.helper.js +5 -1
- package/dist/hass/helpers/utility.helper.js.map +1 -1
- package/dist/purge/main.js +0 -0
- package/dist/purge/purge.extension.js +2 -2
- package/dist/purge/purge.extension.js.map +1 -1
- package/dist/synapse/extensions/binary-sensor.extension.js +2 -2
- package/dist/synapse/extensions/binary-sensor.extension.js.map +1 -1
- package/dist/synapse/extensions/registry.extension.js +2 -2
- package/dist/synapse/extensions/registry.extension.js.map +1 -1
- package/dist/synapse/extensions/sensor.extension.js +2 -2
- package/dist/synapse/extensions/sensor.extension.js.map +1 -1
- package/dist/synapse/extensions/switch.extension.js +1 -1
- package/dist/synapse/extensions/switch.extension.js.map +1 -1
- package/dist/type-writer/build.extension.js +1 -1
- package/dist/type-writer/build.extension.js.map +1 -1
- package/dist/type-writer/type-writer.extension.js +10 -8
- package/dist/type-writer/type-writer.extension.js.map +1 -1
- package/dist/utilities/extensions/zcc.extension.js +2 -2
- package/dist/utilities/extensions/zcc.extension.js.map +1 -1
- package/dist/utilities/helpers/async.helper.js +1 -1
- package/dist/utilities/helpers/async.helper.js.map +1 -1
- package/dist/utilities/helpers/extend.helper.js +2 -2
- package/dist/utilities/helpers/extend.helper.js.map +1 -1
- package/dist/utilities/helpers/utilities.helper.js +1 -1
- package/dist/utilities/helpers/utilities.helper.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
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,
|
|
1
|
+
{"version":3,"file":"aggressive-scenes.extension.js","sourceRoot":"","sources":["../../../src/automation/extensions/aggressive-scenes.extension.ts"],"names":[],"mappings":"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"}
|
|
@@ -118,7 +118,7 @@ function LightManager({ logger, hass, scheduler, lifecycle, automation, config,
|
|
|
118
118
|
state: entity.state === "off",
|
|
119
119
|
};
|
|
120
120
|
// ? Find things that don't currently match expectations
|
|
121
|
-
const reasons = Object.keys(stateTests).filter(key => !stateTests[key]);
|
|
121
|
+
const reasons = Object.keys(stateTests).filter((key) => !stateTests[key]);
|
|
122
122
|
let type;
|
|
123
123
|
if (stateTests.state) {
|
|
124
124
|
type = "light_on_off";
|
|
@@ -180,14 +180,14 @@ function LightManager({ logger, hass, scheduler, lifecycle, automation, config,
|
|
|
180
180
|
function buildLightList() {
|
|
181
181
|
// * Produce a list of lights that are supposed to be turned on
|
|
182
182
|
// > Source from the active scene in each loaded room
|
|
183
|
-
const lightsToCheck = utilities_1.is.unique([...rooms.values()].flatMap(room => {
|
|
183
|
+
const lightsToCheck = utilities_1.is.unique([...rooms.values()].flatMap((room) => {
|
|
184
184
|
const current = room.currentSceneDefinition?.definition;
|
|
185
185
|
if (!current) {
|
|
186
186
|
// ? Room set to invalid scene
|
|
187
187
|
// Notice already being emitted from room extension
|
|
188
188
|
return [];
|
|
189
189
|
}
|
|
190
|
-
return Object.keys(room.currentSceneDefinition.definition).filter(key => {
|
|
190
|
+
return Object.keys(room.currentSceneDefinition.definition).filter((key) => {
|
|
191
191
|
if (!utilities_1.is.domain(key, "light")) {
|
|
192
192
|
return false;
|
|
193
193
|
}
|
|
@@ -197,7 +197,7 @@ function LightManager({ logger, hass, scheduler, lifecycle, automation, config,
|
|
|
197
197
|
}));
|
|
198
198
|
// * Calculate how off the light is, omit ones that within tolerance, sort list by difference
|
|
199
199
|
return lightsToCheck
|
|
200
|
-
.map(light => ({
|
|
200
|
+
.map((light) => ({
|
|
201
201
|
diff: getCurrentDiff(hass.entity.byId(light)),
|
|
202
202
|
light,
|
|
203
203
|
}))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"light-manager.extension.js","sourceRoot":"","sources":["../../../src/automation/extensions/light-manager.extension.ts"],"names":[],"mappings":";;;AAOA,+CASyB;AAiCzB,SAAgB,YAAY,CAAC,EAC3B,MAAM,EACN,IAAI,EACJ,SAAS,EACT,SAAS,EACT,UAAU,EACV,MAAM,GACS;IACf;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,KAAK,UAAU,WAAW,CACxB,MAA0C,EAC1C,KAAsB;QAEtB,MAAM,SAAS,GAAG,MAAM,CAAC,SAAiC,CAAC;QAC3D,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAoB,CAAC;QACrD,IAAI,cAAE,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,CAAC,EAAE,SAAS,EAAE,EAAE,4CAA4C,CAAC,CAAC;YACzE,OAAO;QACT,CAAC;QACD,MAAM,eAAe,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC7D,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QACD,IAAI,WAAW,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACrC,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,SAAmC,CAAC;YAEnE,IAAI,cAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,cAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBACtC,MAAM,IAAA,gBAAI,EAAC,IAAI,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"light-manager.extension.js","sourceRoot":"","sources":["../../../src/automation/extensions/light-manager.extension.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,8 +16,8 @@ function ManagedSwitch({ logger, hass, scheduler }) {
|
|
|
16
16
|
const action = current ? "turn_on" : "turn_off";
|
|
17
17
|
const entity_id = [switches]
|
|
18
18
|
.flat()
|
|
19
|
-
.map(i => (utilities_1.is.string(i) ? i : i.entity_id));
|
|
20
|
-
const shouldExecute = entity_id.some(id => !action.includes(hass.entity.byId(id)?.state?.toLocaleLowerCase()));
|
|
19
|
+
.map((i) => (utilities_1.is.string(i) ? i : i.entity_id));
|
|
20
|
+
const shouldExecute = entity_id.some((id) => !action.includes(hass.entity.byId(id)?.state?.toLocaleLowerCase()));
|
|
21
21
|
if (!shouldExecute) {
|
|
22
22
|
return;
|
|
23
23
|
}
|
|
@@ -50,7 +50,7 @@ function ManagedSwitch({ logger, hass, scheduler }) {
|
|
|
50
50
|
scheduler.cron({ exec: async () => await update(), schedule });
|
|
51
51
|
// * Update when relevant things update
|
|
52
52
|
if (!utilities_1.is.empty(onUpdate)) {
|
|
53
|
-
[onUpdate].flat().forEach(i => {
|
|
53
|
+
[onUpdate].flat().forEach((i) => {
|
|
54
54
|
if (utilities_1.is.object(i) && !("entity_id" in i)) {
|
|
55
55
|
const onUpdate = i.onUpdate;
|
|
56
56
|
if (!utilities_1.is.function(onUpdate)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managed-switch.extension.js","sourceRoot":"","sources":["../../../src/automation/extensions/managed-switch.extension.ts"],"names":[],"mappings":";;;AACA,+CAAuE;AAGvE,SAAgB,aAAa,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAkB;IACvE;;OAEG;IACH,KAAK,UAAU,cAAc,CAC3B,OAAgB,EAChB,QAAuB,EACvB,OAAiB;QAEjB,uCAAuC;QACvC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE,EAAE,CAAC;YACvC,MAAM,CAAC,IAAI,CACT,EAAE,OAAO,EAAE,EACX,sDAAsD,CACvD,CAAC;YACF,OAAO;QACT,CAAC;QACD,6GAA6G;QAC7G,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC;QAChD,MAAM,SAAS,GAAG,CAAC,QAAQ,CAAC;aACzB,IAAI,EAAE;aACN,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,cAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"managed-switch.extension.js","sourceRoot":"","sources":["../../../src/automation/extensions/managed-switch.extension.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,7 +59,7 @@ function Room({ logger, hass, synapse, scheduler, automation, context: parentCon
|
|
|
59
59
|
const definition = current.definition;
|
|
60
60
|
if (entity_id in definition) {
|
|
61
61
|
const state = definition[entity_id];
|
|
62
|
-
return Object.keys(state).every(i => ["state", "brightness"].includes(i));
|
|
62
|
+
return Object.keys(state).every((i) => ["state", "brightness"].includes(i));
|
|
63
63
|
}
|
|
64
64
|
return true;
|
|
65
65
|
}
|
|
@@ -69,7 +69,7 @@ function Room({ logger, hass, synapse, scheduler, automation, context: parentCon
|
|
|
69
69
|
const entities = Object.keys(item.definition);
|
|
70
70
|
const kelvin = automation.circadian.getKelvin();
|
|
71
71
|
const list = entities
|
|
72
|
-
.map(name => {
|
|
72
|
+
.map((name) => {
|
|
73
73
|
const value = definition[name];
|
|
74
74
|
if (__1.is.domain(name, "switch")) {
|
|
75
75
|
return [name, value];
|
|
@@ -82,10 +82,10 @@ function Room({ logger, hass, synapse, scheduler, automation, context: parentCon
|
|
|
82
82
|
}
|
|
83
83
|
return [name, { kelvin, ...value }];
|
|
84
84
|
})
|
|
85
|
-
.filter(i => !__1.is.undefined(i));
|
|
85
|
+
.filter((i) => !__1.is.undefined(i));
|
|
86
86
|
return {
|
|
87
|
-
lights: Object.fromEntries(list.filter(i => !__1.is.undefined(i[__1.VALUE].kelvin))),
|
|
88
|
-
scene: Object.fromEntries(list.filter(i => __1.is.undefined(i[__1.VALUE].kelvin))),
|
|
87
|
+
lights: Object.fromEntries(list.filter((i) => !__1.is.undefined(i[__1.VALUE].kelvin))),
|
|
88
|
+
scene: Object.fromEntries(list.filter((i) => __1.is.undefined(i[__1.VALUE].kelvin))),
|
|
89
89
|
};
|
|
90
90
|
}
|
|
91
91
|
async function sceneApply(sceneName) {
|
|
@@ -125,7 +125,7 @@ function Room({ logger, hass, synapse, scheduler, automation, context: parentCon
|
|
|
125
125
|
currentScene.state = sceneName;
|
|
126
126
|
await sceneApply(sceneName);
|
|
127
127
|
}
|
|
128
|
-
SCENE_LIST.forEach(scene => {
|
|
128
|
+
SCENE_LIST.forEach((scene) => {
|
|
129
129
|
const sceneName = `${name} ${scene}`;
|
|
130
130
|
synapse.scene({
|
|
131
131
|
context,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"room.extension.js","sourceRoot":"","sources":["../../../src/automation/extensions/room.extension.ts"],"names":[],"mappings":";;;AAAA,6BAQe;AAef,SAAgB,IAAI,CAAC,EACnB,MAAM,EACN,IAAI,EACJ,OAAO,EACP,SAAS,EACT,UAAU,EACV,OAAO,EAAE,aAAa,GACP;IACf,wDAAwD;IACxD,OAAO,UAAiC,EACtC,IAAI,EACJ,OAAO,EACP,MAAM,GACoB;QAC1B,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,aAAa,CAAC,CAAC;QACrC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAa,CAAC;QAEnD,MAAM,UAAU,GAAG,GAAG,IAAI,gBAAgB,CAAC;QAC3C,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAS;YAC1C,OAAO;YACP,IAAI,EAAE,UAAU;SACjB,CAAC,CAAC;QAEH,SAAS,iBAAiB;YACxB,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;iBACvE,KAAe,CAAC;YACnB,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC;YACnC,IAAI,MAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC7D,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,YAAY,CAAC,KAAK,GAAG,aAAa,CAAC;YACnC,OAAO,aAAa,CAAC;QACvB,CAAC;QAED,SAAS,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,KAAK,IAAI,EAAE;gBACf,IAAI,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC;gBACjC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;oBAClC,OAAO,GAAG,iBAAiB,EAAE,CAAC;oBAC9B,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;wBAClC,MAAM,CAAC,IAAI,CACT,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,IAAI,gBAAgB,EAAE,EAC5C,iCAAiC,CAClC,CAAC;wBACF,OAAO;oBACT,CAAC;oBACD,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,wBAAwB,CAAC,CAAC;gBACxE,CAAC;gBACD,MAAM,UAAU,CAAC,UAAU,CAAC,iBAAiB,CAAC;oBAC5C,OAAO;oBACP,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,IAAI;oBACV,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC;iBACvB,CAAC,CAAC;YACL,CAAC;YACD,QAAQ,EAAE,kBAAc,CAAC,gBAAgB;SAC1C,CAAC,CAAC;QAEH;;;;;WAKG;QACH,SAAS,eAAe,CACtB,SAA+B,EAC/B,MAAe;YAEf,IAAI,CAAC,MAAE,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC;gBACnC,OAAO,KAAK,CAAC;YACf,CAAC;YACD,IAAI,CAAC,MAAE,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACzC,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,KAAe,CAAC,IAAI,EAAE,CAAc,CAAC;YAC1E,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;YACtC,IAAI,SAAS,IAAI,UAAU,EAAE,CAAC;gBAC5B,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAoB,CAAC;gBACvD,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"room.extension.js","sourceRoot":"","sources":["../../../src/automation/extensions/room.extension.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,8 +19,8 @@ function SequenceWatcher({ logger, hass, config }) {
|
|
|
19
19
|
logger.error({ reset: data.reset }, `bad reset type`);
|
|
20
20
|
return;
|
|
21
21
|
}
|
|
22
|
-
const labels = new Set([reset.label].flat().filter(i => !utilities_1.is.empty(i)));
|
|
23
|
-
[...ACTIVE.keys()].forEach(key => {
|
|
22
|
+
const labels = new Set([reset.label].flat().filter((i) => !utilities_1.is.empty(i)));
|
|
23
|
+
[...ACTIVE.keys()].forEach((key) => {
|
|
24
24
|
const item = ACTIVE.get(key);
|
|
25
25
|
if (labels.has(item.label)) {
|
|
26
26
|
item.interrupt.kill("stop");
|
|
@@ -76,7 +76,7 @@ function SequenceWatcher({ logger, hass, config }) {
|
|
|
76
76
|
const remover = hass.socket.onEvent({
|
|
77
77
|
context,
|
|
78
78
|
event: event_type,
|
|
79
|
-
exec: eventData => trigger(event_type, eventData),
|
|
79
|
+
exec: (eventData) => trigger(event_type, eventData),
|
|
80
80
|
label,
|
|
81
81
|
});
|
|
82
82
|
EVENT_REMOVAL.set(event_type, remover);
|
|
@@ -106,7 +106,7 @@ function SequenceWatcher({ logger, hass, config }) {
|
|
|
106
106
|
]);
|
|
107
107
|
// Return a removal function
|
|
108
108
|
return () => {
|
|
109
|
-
const watcher = WATCHED_EVENTS.get(event_type).filter(item => item.id !== id);
|
|
109
|
+
const watcher = WATCHED_EVENTS.get(event_type).filter((item) => item.id !== id);
|
|
110
110
|
if (utilities_1.is.empty(watcher)) {
|
|
111
111
|
logger.debug({ event_type }, `last watcher for event removed, cleaning up socket event listener`);
|
|
112
112
|
WATCHED_EVENTS.delete(event_type);
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
1
|
+
{"version":3,"file":"sequence-matcher.extension.js","sourceRoot":"","sources":["../../../src/automation/extensions/sequence-matcher.extension.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ const dayjs_1 = tslib_1.__importDefault(require("dayjs"));
|
|
|
6
6
|
const utilities_1 = require("../../utilities");
|
|
7
7
|
function refTimes(times) {
|
|
8
8
|
const today = (0, dayjs_1.default)().format("YYYY-MM-DD");
|
|
9
|
-
return times.map(i => (0, dayjs_1.default)(`${today} ${i}`).millisecond(utilities_1.NONE));
|
|
9
|
+
return times.map((i) => (0, dayjs_1.default)(`${today} ${i}`).millisecond(utilities_1.NONE));
|
|
10
10
|
}
|
|
11
11
|
exports.refTimes = refTimes;
|
|
12
12
|
const SLICE_LENGTH = "AM".length;
|
|
@@ -15,7 +15,7 @@ utilities_1.ZCC.refTime = refTimes;
|
|
|
15
15
|
utilities_1.ZCC.shortTime = function (times) {
|
|
16
16
|
const now = (0, dayjs_1.default)();
|
|
17
17
|
const today = now.format("YYYY-MM-DD");
|
|
18
|
-
return times.map(i => {
|
|
18
|
+
return times.map((i) => {
|
|
19
19
|
if (i === "NOW") {
|
|
20
20
|
return now;
|
|
21
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reftimes.helper.js","sourceRoot":"","sources":["../../../src/automation/helpers/reftimes.helper.ts"],"names":[],"mappings":";;;;AAAA,0DAAqC;AAErC,+CAAmD;AAEnD,SAAgB,QAAQ,CAAC,KAAmB;IAC1C,MAAM,KAAK,GAAG,IAAA,eAAK,GAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC3C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,eAAK,EAAC,GAAG,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,gBAAI,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"reftimes.helper.js","sourceRoot":"","sources":["../../../src/automation/helpers/reftimes.helper.ts"],"names":[],"mappings":";;;;AAAA,0DAAqC;AAErC,+CAAmD;AAEnD,SAAgB,QAAQ,CAAC,KAAmB;IAC1C,MAAM,KAAK,GAAG,IAAA,eAAK,GAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC3C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,eAAK,EAAC,GAAG,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,gBAAI,CAAC,CAAC,CAAC;AACpE,CAAC;AAHD,4BAGC;AA8ED,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC;AACjC,MAAM,QAAQ,GAAG,EAAE,CAAC;AACpB,eAAG,CAAC,OAAO,GAAG,QAAQ,CAAC;AAEvB,eAAG,CAAC,SAAS,GAAG,UAAU,KAAkB;IAC1C,MAAM,GAAG,GAAG,IAAA,eAAK,GAAE,CAAC;IACpB,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IACvC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACrB,IAAI,CAAC,KAAK,KAAK,EAAE,CAAC;YAChB,OAAO,GAAG,CAAC;QACb,CAAC;QACD,IAAI,CAAC,KAAK,UAAU,EAAE,CAAC;YACrB,OAAO,IAAA,eAAK,EAAC,GAAG,KAAK,KAAK,CAAC,CAAC;QAC9B,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtD,MAAM,KAAK,IAAI,CAAC;QAChB,IAAI,CAAC,CAAC,MAAM,CAAC,iBAAK,CAAC,CAAC,WAAW,EAAE,KAAK,GAAG,EAAE,CAAC;YAC1C,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC9C,CAAC;QACD,OAAO,IAAA,eAAK,EAAC,GAAG,KAAK,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC,CAAC,WAAW,CAAC,gBAAI,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -62,7 +62,7 @@ function Cache({ logger, lifecycle, config }) {
|
|
|
62
62
|
try {
|
|
63
63
|
const fullPattern = fullKeyName(pattern);
|
|
64
64
|
const keys = await client.keys(fullPattern);
|
|
65
|
-
return keys.map(key => key.slice(Math.max(__1.NONE, prefix().length)));
|
|
65
|
+
return keys.map((key) => key.slice(Math.max(__1.NONE, prefix().length)));
|
|
66
66
|
}
|
|
67
67
|
catch (error) {
|
|
68
68
|
__2.CACHE_DRIVER_ERROR_COUNT.labels("keys").inc();
|
|
@@ -84,7 +84,7 @@ function Cache({ logger, lifecycle, config }) {
|
|
|
84
84
|
logger.error({ error }, `cache set error`);
|
|
85
85
|
}
|
|
86
86
|
},
|
|
87
|
-
setClient: newClient => {
|
|
87
|
+
setClient: (newClient) => {
|
|
88
88
|
logger.debug(`using new cache driver`);
|
|
89
89
|
client = newClient;
|
|
90
90
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.extension.js","sourceRoot":"","sources":["../../../src/boilerplate/extensions/cache.extension.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cache.extension.js","sourceRoot":"","sources":["../../../src/boilerplate/extensions/cache.extension.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,7 +46,7 @@ logger, }) {
|
|
|
46
46
|
// * validate
|
|
47
47
|
// - ensure all required properties have been defined
|
|
48
48
|
configDefinitions.forEach((definitions, project) => {
|
|
49
|
-
Object.keys(definitions).forEach(key => {
|
|
49
|
+
Object.keys(definitions).forEach((key) => {
|
|
50
50
|
const config = [project, key].join(".");
|
|
51
51
|
if (definitions[key].required &&
|
|
52
52
|
__1.is.undefined(__1.ZCC.utils.object.get(configuration, config))) {
|
|
@@ -78,7 +78,7 @@ logger, }) {
|
|
|
78
78
|
// ## Add a library, and it's associated definitions
|
|
79
79
|
function LoadProject(library, definitions) {
|
|
80
80
|
__1.ZCC.utils.object.set(configuration, library, {});
|
|
81
|
-
Object.keys(definitions).forEach(key => {
|
|
81
|
+
Object.keys(definitions).forEach((key) => {
|
|
82
82
|
__1.ZCC.utils.object.set(configuration, [library, key].join("."), definitions[key].default);
|
|
83
83
|
});
|
|
84
84
|
return configDefinitions.set(library, definitions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.extension.js","sourceRoot":"","sources":["../../../src/boilerplate/extensions/configuration.extension.ts"],"names":[],"mappings":";;;AAAA,6BAAkE;AAClE,wCAcoB;AAEpB,YAAY;AACC,QAAA,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;AACtC,QAAA,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;AAC1C,QAAA,2BAA2B,GAAG,6BAA6B,CAAC;AAC5D,QAAA,oBAAoB,GAAG,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAElE,SAAgB,aAAa,CAAC,EAC5B,OAAO,EACP,KAAK,EACL,SAAS;AACT,wCAAwC;AACxC,MAAM,GACS;IACf,yBAAyB;IACzB,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,GAAG,OAAG,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAElE,WAAW;IACX,MAAM,aAAa,GAAG,IAAI,GAAG,EAAgB,CAAC;IAC9C,MAAM,aAAa,GAAyB,EAAE,CAAC;IAC/C,MAAM,iBAAiB,GAAiB,IAAI,GAAG,EAAE,CAAC;IAClD,MAAM,eAAe,GAAG;QACtB,iCAAuB;QACvB,0BAAgB;KACO,CAAC;IAE1B,YAAY;IACZ,gCAAgC;IAChC,KAAK,UAAU,UAAU,CAGvB,WAAwC;QACxC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACzB,iBAAiB;QACjB,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,4BAAkB,CAC1B,OAAO,EACP,gBAAgB,EAChB,iEAAiE,CAClE,CAAC;QACJ,CAAC;QAED,iEAAiE;QACjE,IAAI,MAAE,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;YAC5B,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;YAC1D,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QACvE,CAAC;QAED,UAAU;QACV,MAAM,IAAA,cAAU,EACd,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAE,CAAC,CAAC,CAAC,QAAI,CAAC,CAAC,EACvE,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE;YACjB,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC;gBACzB,WAAW;gBACX,OAAO,EAAE,iBAAiB;gBAC1B,MAAM;aACP,CAAC,CAAC;YACH,IAAA,cAAU,EAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QACnC,CAAC,CACF,CAAC;QAEF,aAAa;QACb,qDAAqD;QACrD,iBAAiB,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,OAAO,EAAE,EAAE;YACjD,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"configuration.extension.js","sourceRoot":"","sources":["../../../src/boilerplate/extensions/configuration.extension.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,20 +38,20 @@ async function Logger({ lifecycle, config }) {
|
|
|
38
38
|
}
|
|
39
39
|
message = message
|
|
40
40
|
// ? partA#partB - highlight it all in yellow
|
|
41
|
-
.replaceAll(new RegExp("([^ ]+#[^ ]+)", "g"), i => chalk.yellow(i))
|
|
41
|
+
.replaceAll(new RegExp("([^ ]+#[^ ]+)", "g"), (i) => chalk.yellow(i))
|
|
42
42
|
// ? [A] > [B] > [C] - highlight the >'s in blue
|
|
43
43
|
.replaceAll("] > [", chalk `] {blue >} [`)
|
|
44
44
|
// ? [Text] - strip brackets, highlight magenta
|
|
45
|
-
.replaceAll(new RegExp("(\\[[^\\]\\[]+\\])", "g"), i => chalk.bold.magenta(i.slice(SYMBOL_START, SYMBOL_END)))
|
|
45
|
+
.replaceAll(new RegExp("(\\[[^\\]\\[]+\\])", "g"), (i) => chalk.bold.magenta(i.slice(SYMBOL_START, SYMBOL_END)))
|
|
46
46
|
// ? {Text} - strip braces, highlight gray
|
|
47
|
-
.replaceAll(new RegExp("(\\{[^\\]}]+\\})", "g"), i => chalk.bold.gray(i.slice(SYMBOL_START, SYMBOL_END)));
|
|
47
|
+
.replaceAll(new RegExp("(\\{[^\\]}]+\\})", "g"), (i) => chalk.bold.gray(i.slice(SYMBOL_START, SYMBOL_END)));
|
|
48
48
|
// ? " - Text" (line prefix with dash) - highlight dash
|
|
49
49
|
if (message.slice(__1.START, frontDash.length) === frontDash) {
|
|
50
50
|
message = `${YELLOW_DASH}${message.slice(frontDash.length)}`;
|
|
51
51
|
}
|
|
52
52
|
return message;
|
|
53
53
|
};
|
|
54
|
-
[...exports.METHOD_COLORS.keys()].forEach(key => {
|
|
54
|
+
[...exports.METHOD_COLORS.keys()].forEach((key) => {
|
|
55
55
|
logger[key] = (context, ...parameters) => {
|
|
56
56
|
const data = __1.is.object(parameters[__1.FIRST])
|
|
57
57
|
? parameters.shift()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.extension.js","sourceRoot":"","sources":["../../../src/boilerplate/extensions/logger.extension.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,+BAAuC;AAEvC,6BAAwD;AA4BxD,MAAM,kBAAkB,GAAG;IACzB,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,IAAI,EAAE,EAAE;IACR,KAAK,EAAE,EAAE;IACT,IAAI,EAAE,EAAE;CACT,CAAC;AAEW,QAAA,aAAa,GAAG,IAAI,GAAG,CAAgC;IAClE,CAAC,OAAO,EAAE,MAAM,CAAC;IACjB,CAAC,OAAO,EAAE,MAAM,CAAC;IACjB,CAAC,MAAM,EAAE,QAAQ,CAAC;IAClB,CAAC,OAAO,EAAE,KAAK,CAAC;IAChB,CAAC,MAAM,EAAE,OAAO,CAAC;IACjB,CAAC,OAAO,EAAE,SAAS,CAAC;CACrB,CAAC,CAAC;AAEH,IAAI,MAAM,GAAG,EAGZ,CAAC;AASF,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,SAAS,GAAG,KAAK,CAAC;AACxB,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,UAAU,GAAG,CAAC,CAAC,CAAC;AAEf,KAAK,UAAU,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,EAAkB;IAChE,MAAM,KAAK,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;IAE9C,MAAM,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IAElD,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAU,EAAE;QACtD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,GAAG,UAAU,EAAE,CAAC;YAChC,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,OAAO,GAAG,OAAO;YACf,6CAA6C;aAC5C,UAAU,CAAC,IAAI,MAAM,CAAC,eAAe,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.extension.js","sourceRoot":"","sources":["../../../src/boilerplate/extensions/logger.extension.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ const helpers_1 = require("../helpers");
|
|
|
10
10
|
function Scheduler({ logger, lifecycle }) {
|
|
11
11
|
const stop = new Set();
|
|
12
12
|
lifecycle.onShutdownStart(() => {
|
|
13
|
-
stop.forEach(stopFunctions => {
|
|
13
|
+
stop.forEach((stopFunctions) => {
|
|
14
14
|
stopFunctions();
|
|
15
15
|
stop.delete(stopFunctions);
|
|
16
16
|
});
|
|
@@ -19,7 +19,7 @@ function Scheduler({ logger, lifecycle }) {
|
|
|
19
19
|
// node-cron
|
|
20
20
|
function cron({ exec, schedule: scheduleList, label, }) {
|
|
21
21
|
const stopFunctions = [];
|
|
22
|
-
[scheduleList].flat().forEach(cronSchedule => {
|
|
22
|
+
[scheduleList].flat().forEach((cronSchedule) => {
|
|
23
23
|
logger.trace({ context, label, schedule: cronSchedule }, `start schedule`);
|
|
24
24
|
const cronJob = (0, node_cron_1.schedule)(cronSchedule, async () => await __1.ZCC.safeExec({
|
|
25
25
|
duration: helpers_1.SCHEDULE_EXECUTION_TIME,
|
|
@@ -40,7 +40,7 @@ function Scheduler({ logger, lifecycle }) {
|
|
|
40
40
|
stopFunctions.push(stopFunction);
|
|
41
41
|
return stopFunction;
|
|
42
42
|
});
|
|
43
|
-
return () => stopFunctions.forEach(stop => stop());
|
|
43
|
+
return () => stopFunctions.forEach((stop) => stop());
|
|
44
44
|
}
|
|
45
45
|
// setInterval
|
|
46
46
|
function interval({ exec, interval, label, }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler.extension.js","sourceRoot":"","sources":["../../../src/boilerplate/extensions/scheduler.extension.ts"],"names":[],"mappings":";;;;AAAA,iDAAiD;AACjD,0DAAqC;AACrC,yCAAqC;AAErC,6BAAkD;AAClD,wCAOoB;AAEpB,SAAgB,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,EAAkB;IAC7D,MAAM,IAAI,GAAG,IAAI,GAAG,EAAoB,CAAC;IAEzC,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE;QAC7B,IAAI,CAAC,OAAO,CAAC,aAAa,
|
|
1
|
+
{"version":3,"file":"scheduler.extension.js","sourceRoot":"","sources":["../../../src/boilerplate/extensions/scheduler.extension.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Counter, Summary } from "prom-client";
|
|
2
|
-
import { TBlackHole, TContext } from "../..";
|
|
2
|
+
import { TBlackHole, TContext, ZCCDefinition } from "../..";
|
|
3
3
|
import { ApplicationConfigurationOptions, ApplicationDefinition, BootstrapOptions, LibraryConfigurationOptions, LibraryDefinition, OptionalModuleConfiguration, ServiceFunction, ServiceMap, StringConfig, TLifecycleBase, TModuleMappings, TResolvedModuleMappings, TServiceReturn } from "../helpers";
|
|
4
4
|
import { Cache } from "./cache.extension";
|
|
5
5
|
import { Configuration } from "./configuration.extension";
|
|
@@ -53,7 +53,7 @@ declare function CreateBoilerplate(): LibraryDefinition<{
|
|
|
53
53
|
}>;
|
|
54
54
|
export declare function CreateLibrary<S extends ServiceMap, C extends OptionalModuleConfiguration>({ name: libraryName, configuration, priorityInit, services, }: LibraryConfigurationOptions<S, C>): LibraryDefinition<S, C>;
|
|
55
55
|
export declare function CreateApplication<S extends ServiceMap, C extends OptionalModuleConfiguration>({ name, services, libraries, configuration, priorityInit, }: ApplicationConfigurationOptions<S, C>): ApplicationDefinition<S, C>;
|
|
56
|
-
declare function WireService(project: string, service: string, definition: ServiceFunction, lifecycle: TLifecycleBase): Promise<TServiceReturn>;
|
|
56
|
+
declare function WireService(project: string, service: string, definition: ServiceFunction, lifecycle: TLifecycleBase, ZCC: ZCCDefinition): Promise<TServiceReturn>;
|
|
57
57
|
declare function Teardown(): Promise<void>;
|
|
58
58
|
declare module "../../utilities" {
|
|
59
59
|
interface ZCCTestingDefinition {
|
|
@@ -148,7 +148,7 @@ function WireOrder(priority, list) {
|
|
|
148
148
|
throw new helpers_1.BootstrapException(WIRING_CONTEXT, "DOUBLE_PRIORITY", "There are duplicate items in the priority load list");
|
|
149
149
|
}
|
|
150
150
|
}
|
|
151
|
-
return [...out, ...list.filter(i => !out.includes(i))];
|
|
151
|
+
return [...out, ...list.filter((i) => !out.includes(i))];
|
|
152
152
|
}
|
|
153
153
|
const CfgManager = () => __1.ZCC?.config;
|
|
154
154
|
// ## Create Library
|
|
@@ -157,14 +157,15 @@ function CreateLibrary({ name: libraryName, configuration, priorityInit, service
|
|
|
157
157
|
const lifecycle = CreateChildLifecycle();
|
|
158
158
|
const generated = {};
|
|
159
159
|
const library = {
|
|
160
|
-
[helpers_1.WIRE_PROJECT]: async () => {
|
|
160
|
+
[helpers_1.WIRE_PROJECT]: async (ZCC) => {
|
|
161
161
|
// This one hasn't been loaded yet, generate an object with all the correct properties
|
|
162
162
|
LOADED_LIFECYCLES.set(libraryName, lifecycle);
|
|
163
163
|
// not defined for boilerplate (chicken & egg)
|
|
164
164
|
// manually added inside the bootstrap process
|
|
165
|
-
|
|
165
|
+
const config = ZCC?.config;
|
|
166
|
+
config?.[configuration_extension_1.LOAD_PROJECT](libraryName, configuration);
|
|
166
167
|
await (0, __1.eachSeries)(WireOrder(priorityInit, Object.keys(services)), async (service) => {
|
|
167
|
-
generated[service] = await WireService(libraryName, service, services[service], lifecycle);
|
|
168
|
+
generated[service] = await WireService(libraryName, service, services[service], lifecycle, ZCC);
|
|
168
169
|
});
|
|
169
170
|
// mental note: people should probably do all their lifecycle attachments at the base level function
|
|
170
171
|
// otherwise, it'll happen after this wire() call, and go into a black hole (worst case) or fatal error ("best" case)
|
|
@@ -173,7 +174,7 @@ function CreateLibrary({ name: libraryName, configuration, priorityInit, service
|
|
|
173
174
|
configuration,
|
|
174
175
|
lifecycle,
|
|
175
176
|
name: libraryName,
|
|
176
|
-
onError: callback => __1.ZCC.event.on((0, helpers_1.DIGITAL_ALCHEMY_LIBRARY_ERROR)(libraryName), callback),
|
|
177
|
+
onError: (callback) => __1.ZCC.event.on((0, helpers_1.DIGITAL_ALCHEMY_LIBRARY_ERROR)(libraryName), callback),
|
|
177
178
|
priorityInit,
|
|
178
179
|
services,
|
|
179
180
|
};
|
|
@@ -184,11 +185,11 @@ exports.CreateLibrary = CreateLibrary;
|
|
|
184
185
|
function CreateApplication({ name, services, libraries = [], configuration = {}, priorityInit, }) {
|
|
185
186
|
const lifecycle = CreateChildLifecycle();
|
|
186
187
|
const application = {
|
|
187
|
-
[helpers_1.WIRE_PROJECT]: async () => {
|
|
188
|
+
[helpers_1.WIRE_PROJECT]: async (ZCC) => {
|
|
188
189
|
LOADED_LIFECYCLES.set(name, lifecycle);
|
|
189
190
|
CfgManager()[configuration_extension_1.LOAD_PROJECT](name, configuration);
|
|
190
191
|
await (0, __1.eachSeries)(WireOrder(priorityInit, Object.keys(services)), async (service) => {
|
|
191
|
-
await WireService(name, service, services[service], lifecycle);
|
|
192
|
+
await WireService(name, service, services[service], lifecycle, ZCC);
|
|
192
193
|
});
|
|
193
194
|
return lifecycle;
|
|
194
195
|
},
|
|
@@ -204,7 +205,7 @@ function CreateApplication({ name, services, libraries = [], configuration = {},
|
|
|
204
205
|
libraries,
|
|
205
206
|
lifecycle,
|
|
206
207
|
name,
|
|
207
|
-
onError: callback => __1.ZCC.event.on(helpers_1.DIGITAL_ALCHEMY_APPLICATION_ERROR, callback),
|
|
208
|
+
onError: (callback) => __1.ZCC.event.on(helpers_1.DIGITAL_ALCHEMY_APPLICATION_ERROR, callback),
|
|
208
209
|
priorityInit,
|
|
209
210
|
services,
|
|
210
211
|
teardown: async () => {
|
|
@@ -221,7 +222,7 @@ function CreateApplication({ name, services, libraries = [], configuration = {},
|
|
|
221
222
|
exports.CreateApplication = CreateApplication;
|
|
222
223
|
// # Wiring
|
|
223
224
|
// ## Wire Service
|
|
224
|
-
async function WireService(project, service, definition, lifecycle) {
|
|
225
|
+
async function WireService(project, service, definition, lifecycle, ZCC) {
|
|
225
226
|
const mappings = MODULE_MAPPINGS.get(project) ?? {};
|
|
226
227
|
if (!__1.is.undefined(mappings[service])) {
|
|
227
228
|
throw new helpers_1.BootstrapException(WIRING_CONTEXT, "DUPLICATE_SERVICE_NAME", `${service} is already defined for ${project}`);
|
|
@@ -231,22 +232,22 @@ async function WireService(project, service, definition, lifecycle) {
|
|
|
231
232
|
REVERSE_MODULE_MAPPING.set(definition, [project, service]);
|
|
232
233
|
const context = COERCE_CONTEXT(`${project}:${service}`);
|
|
233
234
|
// logger gets defined first, so this really is only for the start of the start of bootstrapping
|
|
234
|
-
const logger =
|
|
235
|
+
const logger = ZCC.logger ? ZCC.logger.context(context) : undefined;
|
|
235
236
|
const loaded = LOADED_MODULES.get(project) ?? {};
|
|
236
237
|
LOADED_MODULES.set(project, loaded);
|
|
237
238
|
try {
|
|
238
239
|
logger?.trace(`initializing`);
|
|
239
240
|
const config = CfgManager()?.[configuration_extension_1.INJECTED_DEFINITIONS]();
|
|
240
|
-
const inject = Object.fromEntries([...LOADED_MODULES.keys()].map(project => [
|
|
241
|
+
const inject = Object.fromEntries([...LOADED_MODULES.keys()].map((project) => [
|
|
241
242
|
project,
|
|
242
243
|
LOADED_MODULES.get(project),
|
|
243
244
|
]));
|
|
244
245
|
const params = {
|
|
245
246
|
...inject,
|
|
246
|
-
cache:
|
|
247
|
+
cache: ZCC.cache,
|
|
247
248
|
config,
|
|
248
249
|
context,
|
|
249
|
-
event:
|
|
250
|
+
event: ZCC.event,
|
|
250
251
|
lifecycle,
|
|
251
252
|
logger,
|
|
252
253
|
scheduler: scheduler && scheduler(context),
|
|
@@ -309,7 +310,7 @@ async function Bootstrap(application, options) {
|
|
|
309
310
|
exports.LIB_BOILERPLATE = CreateBoilerplate();
|
|
310
311
|
// * Wire it
|
|
311
312
|
let start = Date.now();
|
|
312
|
-
await exports.LIB_BOILERPLATE[helpers_1.WIRE_PROJECT]();
|
|
313
|
+
await exports.LIB_BOILERPLATE[helpers_1.WIRE_PROJECT](__1.ZCC);
|
|
313
314
|
CONSTRUCT.boilerplate = `${Date.now() - start}ms`;
|
|
314
315
|
// ~ configuration
|
|
315
316
|
CfgManager()[configuration_extension_1.LOAD_PROJECT](exports.LIB_BOILERPLATE.name, exports.LIB_BOILERPLATE.configuration);
|
|
@@ -327,13 +328,13 @@ async function Bootstrap(application, options) {
|
|
|
327
328
|
await (0, __1.eachSeries)(application.libraries, async (i) => {
|
|
328
329
|
start = Date.now();
|
|
329
330
|
logger.info(`[%s] init project`, i.name);
|
|
330
|
-
await i[helpers_1.WIRE_PROJECT]();
|
|
331
|
+
await i[helpers_1.WIRE_PROJECT](__1.ZCC);
|
|
331
332
|
CONSTRUCT[i.name] = `${Date.now() - start}ms`;
|
|
332
333
|
});
|
|
333
334
|
logger.info(`init application`);
|
|
334
335
|
// * Finally the application
|
|
335
336
|
start = Date.now();
|
|
336
|
-
await application[helpers_1.WIRE_PROJECT]();
|
|
337
|
+
await application[helpers_1.WIRE_PROJECT](__1.ZCC);
|
|
337
338
|
CONSTRUCT[application.name] = `${Date.now() - start}ms`;
|
|
338
339
|
// ? Configuration values provided bootstrap take priority over module level
|
|
339
340
|
if (!__1.is.empty(options?.configuration)) {
|
|
@@ -380,8 +381,8 @@ async function Teardown() {
|
|
|
380
381
|
// # Lifecycle
|
|
381
382
|
function CreateChildLifecycle(name) {
|
|
382
383
|
const stages = [...helpers_1.LIFECYCLE_STAGES];
|
|
383
|
-
const childCallbacks = Object.fromEntries(stages.map(i => [i, []]));
|
|
384
|
-
const [onPreInit, onPostConfig, onBootstrap, onReady, onShutdownStart, onShutdownComplete,] = helpers_1.LIFECYCLE_STAGES.map(stage => (callback, priority = NONE) => {
|
|
384
|
+
const childCallbacks = Object.fromEntries(stages.map((i) => [i, []]));
|
|
385
|
+
const [onPreInit, onPostConfig, onBootstrap, onReady, onShutdownStart, onShutdownComplete,] = helpers_1.LIFECYCLE_STAGES.map((stage) => (callback, priority = NONE) => {
|
|
385
386
|
if (completedLifecycleCallbacks.has(`on${stage}`)) {
|
|
386
387
|
// this is makes "earliest run time" logic way easier to implement
|
|
387
388
|
// intended mode of operation
|