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.
Files changed (105) hide show
  1. package/.eslintrc.json +36 -36
  2. package/.github/ISSUE_TEMPLATE/1-bug-report.yml +84 -84
  3. package/.github/ISSUE_TEMPLATE/2-docs.md +12 -12
  4. package/.github/ISSUE_TEMPLATE/3-proposal.md +28 -28
  5. package/.github/ISSUE_TEMPLATE/config.yml +8 -8
  6. package/.github/copilot-instructions.md +63 -63
  7. package/.github/workflows/ghcr-publish.yml +67 -67
  8. package/AGENTS.md +597 -0
  9. package/CONTRIBUTING.md +74 -74
  10. package/Changelog +292 -284
  11. package/Dockerfile +62 -62
  12. package/Gruntfile.js +40 -40
  13. package/LICENSE +661 -661
  14. package/README.md +318 -309
  15. package/anslq25/MessagesMock.ts +221 -221
  16. package/anslq25/boards/MockBoardFactory.ts +49 -49
  17. package/anslq25/boards/MockEasyTouchBoard.ts +696 -696
  18. package/anslq25/boards/MockSystemBoard.ts +216 -216
  19. package/anslq25/chemistry/MockChlorinator.ts +98 -98
  20. package/anslq25/pumps/MockPump.ts +83 -83
  21. package/app.ts +115 -115
  22. package/config/Config.ts +0 -0
  23. package/config/VersionCheck.ts +0 -0
  24. package/controller/Constants.ts +809 -805
  25. package/controller/Equipment.ts +2688 -2664
  26. package/controller/Errors.ts +181 -181
  27. package/controller/Lockouts.ts +549 -549
  28. package/controller/State.ts +3738 -3701
  29. package/controller/boards/AquaLinkBoard.ts +1003 -1003
  30. package/controller/boards/BoardFactory.ts +53 -53
  31. package/controller/boards/EasyTouchBoard.ts +3202 -3202
  32. package/controller/boards/IntelliCenterBoard.ts +4393 -3899
  33. package/controller/boards/IntelliComBoard.ts +69 -69
  34. package/controller/boards/IntelliTouchBoard.ts +382 -382
  35. package/controller/boards/NixieBoard.ts +1944 -1944
  36. package/controller/boards/SunTouchBoard.ts +400 -400
  37. package/controller/boards/SystemBoard.ts +5268 -5268
  38. package/controller/comms/Comms.ts +1272 -1255
  39. package/controller/comms/ScreenLogic.ts +1665 -1665
  40. package/controller/comms/messages/Messages.ts +1433 -1406
  41. package/controller/comms/messages/config/ChlorinatorMessage.ts +5 -0
  42. package/controller/comms/messages/config/CircuitGroupMessage.ts +0 -0
  43. package/controller/comms/messages/config/CircuitMessage.ts +0 -0
  44. package/controller/comms/messages/config/ConfigMessage.ts +6 -0
  45. package/controller/comms/messages/config/CoverMessage.ts +0 -0
  46. package/controller/comms/messages/config/CustomNameMessage.ts +31 -31
  47. package/controller/comms/messages/config/EquipmentMessage.ts +216 -210
  48. package/controller/comms/messages/config/ExternalMessage.ts +96 -10
  49. package/controller/comms/messages/config/FeatureMessage.ts +0 -0
  50. package/controller/comms/messages/config/GeneralMessage.ts +0 -0
  51. package/controller/comms/messages/config/HeaterMessage.ts +0 -0
  52. package/controller/comms/messages/config/IntellichemMessage.ts +0 -0
  53. package/controller/comms/messages/config/OptionsMessage.ts +194 -174
  54. package/controller/comms/messages/config/PumpMessage.ts +0 -0
  55. package/controller/comms/messages/config/RemoteMessage.ts +0 -0
  56. package/controller/comms/messages/config/ScheduleMessage.ts +401 -390
  57. package/controller/comms/messages/config/SecurityMessage.ts +0 -0
  58. package/controller/comms/messages/config/ValveMessage.ts +0 -0
  59. package/controller/comms/messages/status/ChlorinatorStateMessage.ts +0 -0
  60. package/controller/comms/messages/status/EquipmentStateMessage.ts +1158 -822
  61. package/controller/comms/messages/status/HeaterStateMessage.ts +135 -135
  62. package/controller/comms/messages/status/IntelliChemStateMessage.ts +448 -448
  63. package/controller/comms/messages/status/IntelliValveStateMessage.ts +36 -36
  64. package/controller/comms/messages/status/PumpStateMessage.ts +0 -0
  65. package/controller/comms/messages/status/RegalModbusStateMessage.ts +410 -410
  66. package/controller/comms/messages/status/VersionMessage.ts +103 -41
  67. package/controller/nixie/Nixie.ts +173 -173
  68. package/controller/nixie/NixieEquipment.ts +104 -104
  69. package/controller/nixie/bodies/Body.ts +120 -120
  70. package/controller/nixie/bodies/Filter.ts +135 -135
  71. package/controller/nixie/chemistry/ChemController.ts +2724 -2724
  72. package/controller/nixie/chemistry/ChemDoser.ts +806 -806
  73. package/controller/nixie/chemistry/Chlorinator.ts +367 -367
  74. package/controller/nixie/circuits/Circuit.ts +478 -478
  75. package/controller/nixie/heaters/Heater.ts +834 -834
  76. package/controller/nixie/pumps/Pump.ts +1193 -1193
  77. package/controller/nixie/schedules/Schedule.ts +401 -401
  78. package/controller/nixie/valves/Valve.ts +170 -170
  79. package/defaultConfig.json +352 -352
  80. package/docker-compose.yml +31 -31
  81. package/logger/DataLogger.ts +448 -448
  82. package/logger/Logger.ts +448 -436
  83. package/package.json +58 -58
  84. package/sendSocket.js +32 -32
  85. package/tsconfig.json +25 -25
  86. package/types/express-multer.d.ts +32 -32
  87. package/web/Server.ts +1937 -1927
  88. package/web/bindings/aqualinkD.json +559 -559
  89. package/web/bindings/influxDB.json +1066 -1066
  90. package/web/bindings/mqtt.json +721 -721
  91. package/web/bindings/mqttAlt.json +746 -746
  92. package/web/bindings/rulesManager.json +54 -54
  93. package/web/bindings/smartThings-Hubitat.json +31 -31
  94. package/web/bindings/valveRelays.json +20 -20
  95. package/web/bindings/vera.json +25 -25
  96. package/web/interfaces/baseInterface.ts +188 -188
  97. package/web/interfaces/httpInterface.ts +148 -148
  98. package/web/interfaces/influxInterface.ts +283 -283
  99. package/web/interfaces/mqttInterface.ts +695 -695
  100. package/web/interfaces/ruleInterface.ts +101 -87
  101. package/web/services/config/Config.ts +1063 -1053
  102. package/web/services/config/ConfigSocket.ts +0 -0
  103. package/web/services/state/State.ts +0 -0
  104. package/web/services/state/StateSocket.ts +0 -0
  105. 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
- if (typeof evt.fnProcessor !== undefined) evt.fnProcessor(evt, opts, vars, logger, webApp, sys, state, data);
47
- }
48
- public bindEvent(evt: string, ...data: any) {
49
- // Find the binding by first looking for the specific event name.
50
- // If that doesn't exist then look for the "*" (all events).
51
- if (typeof this.events !== 'undefined') {
52
- let evts = this.events.filter(elem => elem.name === evt);
53
- // If we don't have an explicitly defined event then see if there is a default.
54
- if (evts.length === 0) {
55
- let e = this.events.find(elem => elem.name === '*');
56
- evts = e ? [e] : [];
57
- }
58
- if (evts.length > 0) {
59
- let toks = {};
60
- for (let i = 0; i < evts.length; i++) {
61
- let e = evts[i];
62
- if (typeof e.enabled !== 'undefined' && !e.enabled) continue;
63
- // Figure out whether we need to check the filter.
64
- if (typeof e.filter !== 'undefined') {
65
- this.buildTokens(e.filter, evt, toks, e, data[0]);
66
- if (eval(this.replaceTokens(e.filter, toks)) === false) continue;
67
- }
68
- // Look for the processor.
69
- this.executeProcessor(evt, e, ...data);
70
- }
71
- }
72
- }
73
- }
74
- }
75
- class RuleInterfaceEvent extends InterfaceEvent {
76
- event: string;
77
- description: string;
78
- fnProcessor: (rule: RuleInterfaceEvent, options:any, vars: any, logger: any, webApp: any, sys: PoolSystem, state: State, data: any) => void;
79
- processorBound: boolean = false;
80
- }
81
- export interface IRuleInterfaceEvent {
82
- event: string,
83
- description: string,
84
- processor?: string
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
+