nodejs-poolcontroller 8.3.0 → 8.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.eslintrc.json +36 -36
- package/.github/ISSUE_TEMPLATE/1-bug-report.yml +84 -84
- package/.github/ISSUE_TEMPLATE/2-docs.md +12 -12
- package/.github/ISSUE_TEMPLATE/3-proposal.md +28 -28
- package/.github/ISSUE_TEMPLATE/config.yml +8 -8
- package/.github/copilot-instructions.md +63 -63
- package/.github/workflows/ghcr-publish.yml +67 -67
- package/AGENTS.md +597 -0
- package/CONTRIBUTING.md +74 -74
- package/Changelog +292 -284
- package/Dockerfile +62 -62
- package/Gruntfile.js +40 -40
- package/LICENSE +661 -661
- package/README.md +318 -309
- package/anslq25/MessagesMock.ts +221 -221
- package/anslq25/boards/MockBoardFactory.ts +49 -49
- package/anslq25/boards/MockEasyTouchBoard.ts +696 -696
- package/anslq25/boards/MockSystemBoard.ts +216 -216
- package/anslq25/chemistry/MockChlorinator.ts +98 -98
- package/anslq25/pumps/MockPump.ts +83 -83
- package/app.ts +115 -115
- package/config/Config.ts +0 -0
- package/config/VersionCheck.ts +0 -0
- package/controller/Constants.ts +809 -805
- package/controller/Equipment.ts +2688 -2664
- package/controller/Errors.ts +181 -181
- package/controller/Lockouts.ts +549 -549
- package/controller/State.ts +3738 -3701
- package/controller/boards/AquaLinkBoard.ts +1003 -1003
- package/controller/boards/BoardFactory.ts +53 -53
- package/controller/boards/EasyTouchBoard.ts +3202 -3202
- package/controller/boards/IntelliCenterBoard.ts +4393 -3899
- package/controller/boards/IntelliComBoard.ts +69 -69
- package/controller/boards/IntelliTouchBoard.ts +382 -382
- package/controller/boards/NixieBoard.ts +1944 -1944
- package/controller/boards/SunTouchBoard.ts +400 -400
- package/controller/boards/SystemBoard.ts +5268 -5268
- package/controller/comms/Comms.ts +1272 -1255
- package/controller/comms/ScreenLogic.ts +1665 -1665
- package/controller/comms/messages/Messages.ts +1433 -1406
- package/controller/comms/messages/config/ChlorinatorMessage.ts +5 -0
- package/controller/comms/messages/config/CircuitGroupMessage.ts +0 -0
- package/controller/comms/messages/config/CircuitMessage.ts +0 -0
- package/controller/comms/messages/config/ConfigMessage.ts +6 -0
- package/controller/comms/messages/config/CoverMessage.ts +0 -0
- package/controller/comms/messages/config/CustomNameMessage.ts +31 -31
- package/controller/comms/messages/config/EquipmentMessage.ts +216 -210
- package/controller/comms/messages/config/ExternalMessage.ts +96 -10
- package/controller/comms/messages/config/FeatureMessage.ts +0 -0
- package/controller/comms/messages/config/GeneralMessage.ts +0 -0
- package/controller/comms/messages/config/HeaterMessage.ts +0 -0
- package/controller/comms/messages/config/IntellichemMessage.ts +0 -0
- package/controller/comms/messages/config/OptionsMessage.ts +194 -174
- package/controller/comms/messages/config/PumpMessage.ts +0 -0
- package/controller/comms/messages/config/RemoteMessage.ts +0 -0
- package/controller/comms/messages/config/ScheduleMessage.ts +401 -390
- package/controller/comms/messages/config/SecurityMessage.ts +0 -0
- package/controller/comms/messages/config/ValveMessage.ts +0 -0
- package/controller/comms/messages/status/ChlorinatorStateMessage.ts +0 -0
- package/controller/comms/messages/status/EquipmentStateMessage.ts +1158 -822
- package/controller/comms/messages/status/HeaterStateMessage.ts +135 -135
- package/controller/comms/messages/status/IntelliChemStateMessage.ts +448 -448
- package/controller/comms/messages/status/IntelliValveStateMessage.ts +36 -36
- package/controller/comms/messages/status/PumpStateMessage.ts +0 -0
- package/controller/comms/messages/status/RegalModbusStateMessage.ts +410 -410
- package/controller/comms/messages/status/VersionMessage.ts +103 -41
- package/controller/nixie/Nixie.ts +173 -173
- package/controller/nixie/NixieEquipment.ts +104 -104
- package/controller/nixie/bodies/Body.ts +120 -120
- package/controller/nixie/bodies/Filter.ts +135 -135
- package/controller/nixie/chemistry/ChemController.ts +2724 -2724
- package/controller/nixie/chemistry/ChemDoser.ts +806 -806
- package/controller/nixie/chemistry/Chlorinator.ts +367 -367
- package/controller/nixie/circuits/Circuit.ts +478 -478
- package/controller/nixie/heaters/Heater.ts +834 -834
- package/controller/nixie/pumps/Pump.ts +1193 -1193
- package/controller/nixie/schedules/Schedule.ts +401 -401
- package/controller/nixie/valves/Valve.ts +170 -170
- package/defaultConfig.json +352 -352
- package/docker-compose.yml +31 -31
- package/logger/DataLogger.ts +448 -448
- package/logger/Logger.ts +448 -436
- package/package.json +58 -58
- package/sendSocket.js +32 -32
- package/tsconfig.json +25 -25
- package/types/express-multer.d.ts +32 -32
- package/web/Server.ts +1937 -1927
- package/web/bindings/aqualinkD.json +559 -559
- package/web/bindings/influxDB.json +1066 -1066
- package/web/bindings/mqtt.json +721 -721
- package/web/bindings/mqttAlt.json +746 -746
- package/web/bindings/rulesManager.json +54 -54
- package/web/bindings/smartThings-Hubitat.json +31 -31
- package/web/bindings/valveRelays.json +20 -20
- package/web/bindings/vera.json +25 -25
- package/web/interfaces/baseInterface.ts +188 -188
- package/web/interfaces/httpInterface.ts +148 -148
- package/web/interfaces/influxInterface.ts +283 -283
- package/web/interfaces/mqttInterface.ts +695 -695
- package/web/interfaces/ruleInterface.ts +101 -87
- package/web/services/config/Config.ts +1063 -1053
- package/web/services/config/ConfigSocket.ts +0 -0
- package/web/services/state/State.ts +0 -0
- package/web/services/state/StateSocket.ts +0 -0
- package/web/services/utilities/Utilities.ts +233 -233
|
@@ -1,87 +1,101 @@
|
|
|
1
|
-
/* nodejs-poolController. An application to control pool equipment.
|
|
2
|
-
Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022.
|
|
3
|
-
Russell Goldin, tagyoureit. russ.goldin@gmail.com
|
|
4
|
-
|
|
5
|
-
This program is free software: you can redistribute it and/or modify
|
|
6
|
-
it under the terms of the GNU Affero General Public License as
|
|
7
|
-
published by the Free Software Foundation, either version 3 of the
|
|
8
|
-
License, or (at your option) any later version.
|
|
9
|
-
|
|
10
|
-
This program is distributed in the hope that it will be useful,
|
|
11
|
-
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
12
|
-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
13
|
-
GNU Affero General Public License for more details.
|
|
14
|
-
|
|
15
|
-
You should have received a copy of the GNU Affero General Public License
|
|
16
|
-
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
|
-
*/
|
|
18
|
-
import { webApp } from "../../web/Server";
|
|
19
|
-
import extend=require("extend");
|
|
20
|
-
import { logger } from "../../logger/Logger";
|
|
21
|
-
import { PoolSystem, sys } from "../../controller/Equipment";
|
|
22
|
-
import { State, state } from "../../controller/State";
|
|
23
|
-
import { InterfaceContext, InterfaceEvent, BaseInterfaceBindings } from "./baseInterface";
|
|
24
|
-
|
|
25
|
-
export class RuleInterfaceBindings extends BaseInterfaceBindings {
|
|
26
|
-
constructor(cfg) { super(cfg);}
|
|
27
|
-
declare events: RuleInterfaceEvent[];
|
|
28
|
-
public bindProcessor(evt: RuleInterfaceEvent) {
|
|
29
|
-
if (evt.processorBound) return;
|
|
30
|
-
if (typeof evt.fnProcessor === 'undefined') {
|
|
31
|
-
let fnBody = Array.isArray(evt.processor) ? evt.processor.join('\n') : evt.processor;
|
|
32
|
-
if (typeof fnBody !== 'undefined' && fnBody !== '') {
|
|
33
|
-
//let AsyncFunction = Object.getPrototypeOf(async => () => { }).constructor;
|
|
34
|
-
let AsyncFunction = Object.getPrototypeOf(async function () { }).constructor;
|
|
35
|
-
try {
|
|
36
|
-
evt.fnProcessor = new AsyncFunction('rule', 'options', 'vars', 'logger', 'webApp', 'sys', 'state', 'data', fnBody) as (rule: RuleInterfaceEvent, vars: any, sys: PoolSystem, state: State, data: any) => void;
|
|
37
|
-
} catch (err) { logger.error(`Error compiling rule event processor: ${err} -- ${fnBody}`); }
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
evt.processorBound = true;
|
|
41
|
-
}
|
|
42
|
-
public executeProcessor(eventName: string, evt: RuleInterfaceEvent, ...data: any) {
|
|
43
|
-
this.bindProcessor(evt);
|
|
44
|
-
let vars = this.bindVarTokens(evt, eventName, data);
|
|
45
|
-
let opts = extend(true, this.cfg.options, this.context.options, evt.options);
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
if
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
//
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
}
|
|
86
|
-
|
|
87
|
-
|
|
1
|
+
/* nodejs-poolController. An application to control pool equipment.
|
|
2
|
+
Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022.
|
|
3
|
+
Russell Goldin, tagyoureit. russ.goldin@gmail.com
|
|
4
|
+
|
|
5
|
+
This program is free software: you can redistribute it and/or modify
|
|
6
|
+
it under the terms of the GNU Affero General Public License as
|
|
7
|
+
published by the Free Software Foundation, either version 3 of the
|
|
8
|
+
License, or (at your option) any later version.
|
|
9
|
+
|
|
10
|
+
This program is distributed in the hope that it will be useful,
|
|
11
|
+
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
12
|
+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
13
|
+
GNU Affero General Public License for more details.
|
|
14
|
+
|
|
15
|
+
You should have received a copy of the GNU Affero General Public License
|
|
16
|
+
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
|
+
*/
|
|
18
|
+
import { webApp } from "../../web/Server";
|
|
19
|
+
import extend=require("extend");
|
|
20
|
+
import { logger } from "../../logger/Logger";
|
|
21
|
+
import { PoolSystem, sys } from "../../controller/Equipment";
|
|
22
|
+
import { State, state } from "../../controller/State";
|
|
23
|
+
import { InterfaceContext, InterfaceEvent, BaseInterfaceBindings } from "./baseInterface";
|
|
24
|
+
|
|
25
|
+
export class RuleInterfaceBindings extends BaseInterfaceBindings {
|
|
26
|
+
constructor(cfg) { super(cfg);}
|
|
27
|
+
declare events: RuleInterfaceEvent[];
|
|
28
|
+
public bindProcessor(evt: RuleInterfaceEvent) {
|
|
29
|
+
if (evt.processorBound) return;
|
|
30
|
+
if (typeof evt.fnProcessor === 'undefined') {
|
|
31
|
+
let fnBody = Array.isArray(evt.processor) ? evt.processor.join('\n') : evt.processor;
|
|
32
|
+
if (typeof fnBody !== 'undefined' && fnBody !== '') {
|
|
33
|
+
//let AsyncFunction = Object.getPrototypeOf(async => () => { }).constructor;
|
|
34
|
+
let AsyncFunction = Object.getPrototypeOf(async function () { }).constructor;
|
|
35
|
+
try {
|
|
36
|
+
evt.fnProcessor = new AsyncFunction('rule', 'options', 'vars', 'logger', 'webApp', 'sys', 'state', 'data', fnBody) as (rule: RuleInterfaceEvent, vars: any, sys: PoolSystem, state: State, data: any) => void;
|
|
37
|
+
} catch (err) { logger.error(`Error compiling rule event processor: ${err} -- ${fnBody}`); }
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
evt.processorBound = true;
|
|
41
|
+
}
|
|
42
|
+
public executeProcessor(eventName: string, evt: RuleInterfaceEvent, ...data: any) {
|
|
43
|
+
this.bindProcessor(evt);
|
|
44
|
+
let vars = this.bindVarTokens(evt, eventName, data);
|
|
45
|
+
let opts = extend(true, this.cfg.options, this.context.options, evt.options);
|
|
46
|
+
// `fnProcessor` is an AsyncFunction; we should await it to avoid unhandled promise rejections
|
|
47
|
+
// and to preserve consistent ordering when multiple events fire in a tight loop.
|
|
48
|
+
if (typeof evt.fnProcessor !== 'undefined') {
|
|
49
|
+
Promise.resolve(evt.fnProcessor(evt, opts, vars, logger, webApp, sys, state, data))
|
|
50
|
+
.catch(err => logger.error(`Error executing rule event processor (${eventName}): ${err?.message || err}`));
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
public bindEvent(evt: string, ...data: any) {
|
|
54
|
+
// Find the binding by first looking for the specific event name.
|
|
55
|
+
// If that doesn't exist then look for the "*" (all events).
|
|
56
|
+
if (typeof this.events !== 'undefined') {
|
|
57
|
+
let evts = this.events.filter(elem => elem.name === evt);
|
|
58
|
+
// If we don't have an explicitly defined event then see if there is a default.
|
|
59
|
+
if (evts.length === 0) {
|
|
60
|
+
let e = this.events.find(elem => elem.name === '*');
|
|
61
|
+
evts = e ? [e] : [];
|
|
62
|
+
}
|
|
63
|
+
if (evts.length > 0) {
|
|
64
|
+
let toks = {};
|
|
65
|
+
for (let i = 0; i < evts.length; i++) {
|
|
66
|
+
let e = evts[i];
|
|
67
|
+
if (typeof e.enabled !== 'undefined' && !e.enabled) continue;
|
|
68
|
+
// Figure out whether we need to check the filter.
|
|
69
|
+
if (typeof e.filter !== 'undefined') {
|
|
70
|
+
try {
|
|
71
|
+
this.buildTokens(e.filter, evt, toks, e, data[0]);
|
|
72
|
+
if (eval(this.replaceTokens(e.filter, toks)) === false) continue;
|
|
73
|
+
} catch (err) {
|
|
74
|
+
logger.error(`Error evaluating rule filter (${evt}): ${err?.message || err} -- ${e.filter}`);
|
|
75
|
+
continue;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
// Look for the processor.
|
|
79
|
+
try {
|
|
80
|
+
this.executeProcessor(evt, e, ...data);
|
|
81
|
+
} catch (err) {
|
|
82
|
+
logger.error(`Error running rule processor (${evt}): ${err?.message || err}`);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
class RuleInterfaceEvent extends InterfaceEvent {
|
|
90
|
+
event: string;
|
|
91
|
+
description: string;
|
|
92
|
+
fnProcessor: (rule: RuleInterfaceEvent, options:any, vars: any, logger: any, webApp: any, sys: PoolSystem, state: State, data: any) => Promise<void> | void;
|
|
93
|
+
processorBound: boolean = false;
|
|
94
|
+
}
|
|
95
|
+
export interface IRuleInterfaceEvent {
|
|
96
|
+
event: string,
|
|
97
|
+
description: string,
|
|
98
|
+
processor?: string
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
|