@digital-alchemy/core 0.1.0 → 0.1.2
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/circadian.extension.js +0 -1
- package/dist/automation/extensions/circadian.extension.js.map +1 -1
- package/dist/automation/extensions/light-manager.extension.d.ts +1 -1
- package/dist/automation/extensions/light-manager.extension.js +3 -5
- package/dist/automation/extensions/light-manager.extension.js.map +1 -1
- package/dist/automation/extensions/managed-switch.extension.js +1 -1
- package/dist/automation/extensions/managed-switch.extension.js.map +1 -1
- package/dist/automation/extensions/room.extension.js +1 -3
- package/dist/automation/extensions/room.extension.js.map +1 -1
- package/dist/automation/extensions/sequence-matcher.extension.js +1 -5
- package/dist/automation/extensions/sequence-matcher.extension.js.map +1 -1
- package/dist/automation/extensions/solar-calc.extension.d.ts +1 -1
- package/dist/automation/extensions/solar-calc.extension.js +1 -2
- package/dist/automation/extensions/solar-calc.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/scheduler.extension.d.ts +5 -4
- package/dist/boilerplate/extensions/scheduler.extension.js +87 -86
- package/dist/boilerplate/extensions/scheduler.extension.js.map +1 -1
- package/dist/boilerplate/extensions/wiring.extension.js +8 -11
- 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/wiring.helper.d.ts +0 -1
- 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/hass/extensions/websocket-api.extension.js +0 -2
- package/dist/hass/extensions/websocket-api.extension.js.map +1 -1
- package/dist/nexus/entities.extension.js +0 -1
- package/dist/nexus/entities.extension.js.map +1 -1
- package/dist/synapse/extensions/registry.extension.js +0 -1
- package/dist/synapse/extensions/registry.extension.js.map +1 -1
- package/dist/type-writer/build.extension.js +1 -2
- package/dist/type-writer/build.extension.js.map +1 -1
- package/dist/type-writer/main.js +0 -0
- 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 +22 -13
|
@@ -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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"circadian.extension.js","sourceRoot":"","sources":["../../../src/automation/extensions/circadian.extension.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAG1B,+CAAiD;AACjD,wCAA8C;AAE9C,MAAM,GAAG,GAAG,CAAC,CAAC;AACd,MAAM,GAAG,GAAG,CAAC,CAAC;AAEd;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,EAChC,MAAM,EACN,SAAS,EACT,SAAS,EACT,OAAO,EACP,UAAU,EACV,MAAM,EACN,OAAO,EACP,KAAK,GACU;IACf,IAAI,eAA0D,CAAC;IAE/D,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE;QAC1B,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC;YACzC,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YAClC,OAAO;QACT,CAAC;QACD,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC;YAC/B,OAAO;YACP,YAAY,EAAE,aAAa;YAC3B,IAAI,EAAE,qBAAqB;YAC3B,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,qBAAqB;YAC7C,mBAAmB,EAAE,GAAG;SACzB,CAAC,CAAC;QACH,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC;QAEtC,SAAS,CAAC,IAAI,CAAC;YACb,
|
|
1
|
+
{"version":3,"file":"circadian.extension.js","sourceRoot":"","sources":["../../../src/automation/extensions/circadian.extension.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ export type ColorLight = GenericEntityDTO<{
|
|
|
19
19
|
supported_features: number;
|
|
20
20
|
xy_color: [x: number, y: number];
|
|
21
21
|
}>;
|
|
22
|
-
export declare function LightManager({ logger, hass, scheduler, lifecycle, automation, config,
|
|
22
|
+
export declare function LightManager({ logger, hass, scheduler, lifecycle, automation, config, }: TServiceParams): {
|
|
23
23
|
manageLight: (entity: ENTITY_STATE<PICK_ENTITY<"light">>, scene: SceneDefinition) => Promise<void>;
|
|
24
24
|
registerRoom: (room: RoomDefinition) => Set<RoomDefinition<string>>;
|
|
25
25
|
};
|
|
@@ -1,9 +1,8 @@
|
|
|
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
|
-
function LightManager({ logger, hass, scheduler, lifecycle, automation, config,
|
|
5
|
+
function LightManager({ logger, hass, scheduler, lifecycle, automation, config, }) {
|
|
7
6
|
/**
|
|
8
7
|
* Lights fall into one of the following:
|
|
9
8
|
*
|
|
@@ -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);
|
|
@@ -221,7 +220,6 @@ function LightManager({ logger, hass, scheduler, lifecycle, automation, config,
|
|
|
221
220
|
logger.debug(`setting up light adjustment cron`);
|
|
222
221
|
let earlyStop;
|
|
223
222
|
scheduler.cron({
|
|
224
|
-
context,
|
|
225
223
|
exec: async () => {
|
|
226
224
|
let stopped = false;
|
|
227
225
|
if (earlyStop) {
|
|
@@ -234,7 +232,7 @@ function LightManager({ logger, hass, scheduler, lifecycle, automation, config,
|
|
|
234
232
|
stopped = true;
|
|
235
233
|
earlyStop = undefined;
|
|
236
234
|
};
|
|
237
|
-
await (0,
|
|
235
|
+
await (0, utilities_1.eachLimit)(list, config.automation.CIRCADIAN_RATE, async ({ light, diff }) => {
|
|
238
236
|
if (stopped) {
|
|
239
237
|
return;
|
|
240
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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"}
|
|
@@ -47,7 +47,7 @@ function ManagedSwitch({ logger, hass, scheduler }) {
|
|
|
47
47
|
await updateEntities(expected, entityList, context);
|
|
48
48
|
};
|
|
49
49
|
// * Always run on a schedule
|
|
50
|
-
scheduler.cron({
|
|
50
|
+
scheduler.cron({ exec: async () => await update(), schedule });
|
|
51
51
|
// * Update when relevant things update
|
|
52
52
|
if (!utilities_1.is.empty(onUpdate)) {
|
|
53
53
|
[onUpdate].flat().forEach(i => {
|
|
@@ -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;QAE9C,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAClC,EAAE,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAC,CACzE,CAAC;QACF,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QACD,wBAAwB;QACxB,IAAI,SAAS,CAAC,MAAM,KAAK,kBAAM,EAAE,CAAC;YAChC,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,MAAM,CAAC,CAAC;QAC5C,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;QACtC,CAAC;QACD,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,wDAAwD;IACxD,SAAS,YAAY,CAAC,EACpB,OAAO,EACP,SAAS,EACT,QAAQ,GAAG,0BAAc,CAAC,YAAY,EACtC,UAAU,EACV,QAAQ,GAAG,EAAE,GACQ;QACrB,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,2BAA2B,CAAC,CAAC;QAClE,MAAM,UAAU,GAAG,cAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAEjE,sCAAsC;QACtC,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE;YACxB,MAAM,QAAQ,GAAG,UAAU,EAAE,CAAC;YAC9B,IAAI,CAAC,cAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC1B,IAAI,CAAC,cAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC5B,MAAM,CAAC,KAAK,CACV,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,EAChC,2CAA2C,CAC5C,CAAC;oBACF,OAAO;gBACT,CAAC;gBACD,OAAO;YACT,CAAC;YACD,MAAM,cAAc,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QACtD,CAAC,CAAC;QAEF,6BAA6B;QAC7B,SAAS,CAAC,IAAI,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"managed-switch.extension.js","sourceRoot":"","sources":["../../../src/automation/extensions/managed-switch.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
|
|
@@ -24,7 +23,6 @@ function Room({ logger, hass, synapse, scheduler, automation, context: parentCon
|
|
|
24
23
|
return importedValue;
|
|
25
24
|
}
|
|
26
25
|
scheduler.cron({
|
|
27
|
-
context,
|
|
28
26
|
exec: async () => {
|
|
29
27
|
let current = currentScene.state;
|
|
30
28
|
if (!SCENE_LIST.includes(current)) {
|
|
@@ -106,7 +104,7 @@ function Room({ logger, hass, synapse, scheduler, automation, context: parentCon
|
|
|
106
104
|
}),
|
|
107
105
|
// Set lights to current color temp
|
|
108
106
|
new Promise(async (done) => {
|
|
109
|
-
await (0,
|
|
107
|
+
await (0, __1.eachSeries)(Object.keys(lights), async (entity_id) => {
|
|
110
108
|
const change = lights[entity_id];
|
|
111
109
|
await hass.call.light.turn_on({
|
|
112
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,13 +1,9 @@
|
|
|
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
4
|
const uuid_1 = require("uuid");
|
|
7
5
|
const utilities_1 = require("../../utilities");
|
|
8
6
|
const __1 = require("..");
|
|
9
|
-
// eslint-disable-next-line @typescript-eslint/unbound-method
|
|
10
|
-
const { get } = object_path_1.default;
|
|
11
7
|
function SequenceWatcher({ logger, hass, config }) {
|
|
12
8
|
const ACTIVE = new Map();
|
|
13
9
|
const WATCHED_EVENTS = new Map();
|
|
@@ -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)) {
|
|
@@ -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":"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"}
|
|
@@ -5,7 +5,7 @@ export type SolarEvents = "dawn" | "dusk" | "solarNoon" | "sunrise" | "nightStar
|
|
|
5
5
|
/**
|
|
6
6
|
* Benefits from a persistent cache, like Redis
|
|
7
7
|
*/
|
|
8
|
-
export declare function SolarCalculator({ logger, cache, scheduler,
|
|
8
|
+
export declare function SolarCalculator({ logger, cache, scheduler, hass, lifecycle, }: TServiceParams): SolarReference;
|
|
9
9
|
type OnSolarEvent = {
|
|
10
10
|
context: TContext;
|
|
11
11
|
label?: string;
|
|
@@ -30,7 +30,7 @@ const UNLIMITED = 0;
|
|
|
30
30
|
/**
|
|
31
31
|
* Benefits from a persistent cache, like Redis
|
|
32
32
|
*/
|
|
33
|
-
function SolarCalculator({ logger, cache, scheduler,
|
|
33
|
+
function SolarCalculator({ logger, cache, scheduler, hass, lifecycle, }) {
|
|
34
34
|
let config;
|
|
35
35
|
const event = new node_cache_1.EventEmitter();
|
|
36
36
|
event.setMaxListeners(UNLIMITED);
|
|
@@ -50,7 +50,6 @@ function SolarCalculator({ logger, cache, scheduler, context, hass, lifecycle, }
|
|
|
50
50
|
// Rebuild references hourly
|
|
51
51
|
//
|
|
52
52
|
scheduler.cron({
|
|
53
|
-
context,
|
|
54
53
|
exec: () => PopulateReferences(),
|
|
55
54
|
schedule: utilities_1.CronExpression.EVERY_HOUR,
|
|
56
55
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solar-calc.extension.js","sourceRoot":"","sources":["../../../src/automation/extensions/solar-calc.extension.ts"],"names":[],"mappings":";;;;AAAA,0DAAqC;AACrC,2CAA0C;AAI1C,+CAA4E;AAC5E,0BAAiD;AAajD,MAAM,WAAW,GAAG;IAClB,MAAM;IACN,YAAY;IACZ,aAAa;IACb,MAAM;IACN,YAAY;IACZ,UAAU;IACV,SAAS;IACT,QAAQ;IACR,WAAW;CACK,CAAC;AAEnB,MAAM,SAAS,GAAG,yBAAyB,CAAC;AAE5C,MAAM,mBAAmB,GAAG;IAC1B,UAAU,EAAE,CAAC,CAAC;IACd,gBAAgB,EAAE,EAAE;IACpB,KAAK,EAAE,EAAE;IACT,OAAO,EAAE,KAAK;IACd,UAAU,EAAE,GAAG;IACf,QAAQ,EAAE,CAAC;CACZ,CAAC;AACF,MAAM,SAAS,GAAG,CAAC,CAAC;AAEpB;;GAEG;AACH,SAAgB,eAAe,CAAC,EAC9B,MAAM,EACN,KAAK,EACL,SAAS,EACT,
|
|
1
|
+
{"version":3,"file":"solar-calc.extension.js","sourceRoot":"","sources":["../../../src/automation/extensions/solar-calc.extension.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,14 +1,15 @@
|
|
|
1
1
|
import { Dayjs } from "dayjs";
|
|
2
2
|
import { schedule } from "node-cron";
|
|
3
|
+
import { TContext } from "../..";
|
|
3
4
|
import { Schedule, SchedulerOptions, TServiceParams } from "../helpers";
|
|
4
|
-
export declare function Scheduler({ logger, lifecycle }: TServiceParams): {
|
|
5
|
-
cron: ({
|
|
5
|
+
export declare function Scheduler({ logger, lifecycle }: TServiceParams): (context: TContext) => {
|
|
6
|
+
cron: ({ exec, schedule: scheduleList, label, }: SchedulerOptions & {
|
|
6
7
|
schedule: Schedule | Schedule[];
|
|
7
8
|
}) => () => void;
|
|
8
|
-
interval: ({
|
|
9
|
+
interval: ({ exec, interval, label, }: SchedulerOptions & {
|
|
9
10
|
interval: number;
|
|
10
11
|
}) => () => void;
|
|
11
|
-
sliding: ({
|
|
12
|
+
sliding: ({ exec, reset, next, label, }: SchedulerOptions & {
|
|
12
13
|
/**
|
|
13
14
|
* How often to run the `next` method, to retrieve the next scheduled execution time
|
|
14
15
|
*/
|
|
@@ -15,102 +15,103 @@ function Scheduler({ logger, lifecycle }) {
|
|
|
15
15
|
stop.delete(stopFunctions);
|
|
16
16
|
});
|
|
17
17
|
});
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
18
|
+
return (context) => {
|
|
19
|
+
// node-cron
|
|
20
|
+
function cron({ exec, schedule: scheduleList, label, }) {
|
|
21
|
+
const stopFunctions = [];
|
|
22
|
+
[scheduleList].flat().forEach(cronSchedule => {
|
|
23
|
+
logger.trace({ context, label, schedule: cronSchedule }, `start schedule`);
|
|
24
|
+
const cronJob = (0, node_cron_1.schedule)(cronSchedule, async () => await __1.ZCC.safeExec({
|
|
25
|
+
duration: helpers_1.SCHEDULE_EXECUTION_TIME,
|
|
26
|
+
errors: helpers_1.SCHEDULE_ERRORS,
|
|
27
|
+
exec,
|
|
28
|
+
executions: helpers_1.SCHEDULE_EXECUTION_COUNT,
|
|
29
|
+
labels: { context, label },
|
|
30
|
+
}));
|
|
31
|
+
lifecycle.onReady(() => {
|
|
32
|
+
logger.trace({ context, schedule: cronSchedule }, "start cron");
|
|
33
|
+
cronJob.start();
|
|
34
|
+
});
|
|
35
|
+
const stopFunction = () => {
|
|
36
|
+
logger.trace({ context, label, schedule: cronSchedule }, `stop schedule`);
|
|
37
|
+
cronJob.stop();
|
|
38
|
+
};
|
|
39
|
+
stop.add(stopFunction);
|
|
40
|
+
stopFunctions.push(stopFunction);
|
|
41
|
+
return stopFunction;
|
|
42
|
+
});
|
|
43
|
+
return () => stopFunctions.forEach(stop => stop());
|
|
44
|
+
}
|
|
45
|
+
// setInterval
|
|
46
|
+
function interval({ exec, interval, label, }) {
|
|
47
|
+
let runningInterval;
|
|
30
48
|
lifecycle.onReady(() => {
|
|
31
|
-
logger.trace({ context
|
|
32
|
-
|
|
49
|
+
logger.trace({ context }, "start interval");
|
|
50
|
+
runningInterval = setInterval(async () => await __1.ZCC.safeExec({
|
|
51
|
+
duration: helpers_1.SCHEDULE_EXECUTION_TIME,
|
|
52
|
+
errors: helpers_1.SCHEDULE_ERRORS,
|
|
53
|
+
exec,
|
|
54
|
+
executions: helpers_1.SCHEDULE_EXECUTION_COUNT,
|
|
55
|
+
labels: { context, label },
|
|
56
|
+
}), interval);
|
|
33
57
|
});
|
|
34
58
|
const stopFunction = () => {
|
|
35
|
-
|
|
36
|
-
|
|
59
|
+
if (runningInterval) {
|
|
60
|
+
clearInterval(runningInterval);
|
|
61
|
+
}
|
|
37
62
|
};
|
|
38
63
|
stop.add(stopFunction);
|
|
39
|
-
stopFunctions.push(stopFunction);
|
|
40
64
|
return stopFunction;
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
65
|
+
}
|
|
66
|
+
function sliding({ exec, reset, next, label, }) {
|
|
67
|
+
const scheduleStop = cron({
|
|
68
|
+
exec: () => {
|
|
69
|
+
if (timeout) {
|
|
70
|
+
logger.warn({ context }, `sliding schedule retrieving next execution time before previous ran`);
|
|
71
|
+
clearTimeout(timeout);
|
|
72
|
+
}
|
|
73
|
+
let nextTime = next();
|
|
74
|
+
if (!nextTime) {
|
|
75
|
+
// nothing to do?
|
|
76
|
+
// will try again next schedule
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
nextTime = (0, dayjs_1.default)(nextTime);
|
|
80
|
+
if ((0, dayjs_1.default)().isAfter(nextTime)) {
|
|
81
|
+
logger.warn({ nextTime: nextTime.toISOString() }, `cannot schedule sliding schedules for the past`);
|
|
82
|
+
// or anything else really
|
|
83
|
+
// life sucks that way
|
|
84
|
+
return;
|
|
85
|
+
}
|
|
86
|
+
if (nextTime) {
|
|
87
|
+
timeout = setTimeout(async () => {
|
|
88
|
+
await __1.ZCC.safeExec({
|
|
89
|
+
duration: helpers_1.SCHEDULE_EXECUTION_TIME,
|
|
90
|
+
errors: helpers_1.SCHEDULE_ERRORS,
|
|
91
|
+
exec,
|
|
92
|
+
executions: helpers_1.SCHEDULE_EXECUTION_COUNT,
|
|
93
|
+
labels: { context, label },
|
|
94
|
+
});
|
|
95
|
+
}, Math.abs((0, dayjs_1.default)().diff(nextTime, "ms")));
|
|
96
|
+
}
|
|
97
|
+
},
|
|
98
|
+
label,
|
|
99
|
+
schedule: reset,
|
|
100
|
+
});
|
|
101
|
+
let timeout;
|
|
102
|
+
return () => {
|
|
103
|
+
scheduleStop();
|
|
69
104
|
if (timeout) {
|
|
70
|
-
logger.warn({ context }, `sliding schedule retrieving next execution time before previous ran`);
|
|
71
105
|
clearTimeout(timeout);
|
|
106
|
+
timeout = undefined;
|
|
72
107
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
nextTime = (0, dayjs_1.default)(nextTime);
|
|
80
|
-
if ((0, dayjs_1.default)().isAfter(nextTime)) {
|
|
81
|
-
logger.warn({ nextTime: nextTime.toISOString() }, `cannot schedule sliding schedules for the past`);
|
|
82
|
-
// or anything else really
|
|
83
|
-
// life sucks that way
|
|
84
|
-
return;
|
|
85
|
-
}
|
|
86
|
-
if (nextTime) {
|
|
87
|
-
timeout = setTimeout(async () => {
|
|
88
|
-
await __1.ZCC.safeExec({
|
|
89
|
-
duration: helpers_1.SCHEDULE_EXECUTION_TIME,
|
|
90
|
-
errors: helpers_1.SCHEDULE_ERRORS,
|
|
91
|
-
exec,
|
|
92
|
-
executions: helpers_1.SCHEDULE_EXECUTION_COUNT,
|
|
93
|
-
labels: { context, label },
|
|
94
|
-
});
|
|
95
|
-
}, Math.abs((0, dayjs_1.default)().diff(nextTime, "ms")));
|
|
96
|
-
}
|
|
97
|
-
},
|
|
98
|
-
label,
|
|
99
|
-
schedule: reset,
|
|
100
|
-
});
|
|
101
|
-
let timeout;
|
|
102
|
-
return () => {
|
|
103
|
-
scheduleStop();
|
|
104
|
-
if (timeout) {
|
|
105
|
-
clearTimeout(timeout);
|
|
106
|
-
timeout = undefined;
|
|
107
|
-
}
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
return {
|
|
111
|
+
cron,
|
|
112
|
+
interval,
|
|
113
|
+
sliding,
|
|
108
114
|
};
|
|
109
|
-
}
|
|
110
|
-
return {
|
|
111
|
-
cron,
|
|
112
|
-
interval,
|
|
113
|
-
sliding,
|
|
114
115
|
};
|
|
115
116
|
}
|
|
116
117
|
exports.Scheduler = Scheduler;
|