nodejs-poolcontroller 8.3.0 → 8.4.1

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 (107) 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/157_issues.md +101 -0
  9. package/AGENTS.md +613 -0
  10. package/CONTRIBUTING.md +74 -74
  11. package/Changelog +292 -284
  12. package/Dockerfile +62 -62
  13. package/Gruntfile.js +40 -40
  14. package/LICENSE +661 -661
  15. package/README.md +329 -309
  16. package/anslq25/MessagesMock.ts +221 -221
  17. package/anslq25/boards/MockBoardFactory.ts +49 -49
  18. package/anslq25/boards/MockEasyTouchBoard.ts +696 -696
  19. package/anslq25/boards/MockSystemBoard.ts +216 -216
  20. package/anslq25/chemistry/MockChlorinator.ts +98 -98
  21. package/anslq25/pumps/MockPump.ts +83 -83
  22. package/app.ts +115 -115
  23. package/config/Config.ts +0 -0
  24. package/config/VersionCheck.ts +0 -0
  25. package/controller/Constants.ts +809 -805
  26. package/controller/Equipment.ts +2737 -2664
  27. package/controller/Errors.ts +181 -181
  28. package/controller/Lockouts.ts +549 -549
  29. package/controller/State.ts +3746 -3701
  30. package/controller/boards/AquaLinkBoard.ts +1175 -1003
  31. package/controller/boards/BoardFactory.ts +53 -53
  32. package/controller/boards/EasyTouchBoard.ts +3246 -3202
  33. package/controller/boards/IntelliCenterBoard.ts +4581 -3899
  34. package/controller/boards/IntelliComBoard.ts +69 -69
  35. package/controller/boards/IntelliTouchBoard.ts +382 -382
  36. package/controller/boards/NixieBoard.ts +1947 -1944
  37. package/controller/boards/SunTouchBoard.ts +401 -400
  38. package/controller/boards/SystemBoard.ts +5303 -5268
  39. package/controller/comms/Comms.ts +1278 -1255
  40. package/controller/comms/ScreenLogic.ts +1665 -1665
  41. package/controller/comms/messages/Messages.ts +1627 -1406
  42. package/controller/comms/messages/config/ChlorinatorMessage.ts +5 -0
  43. package/controller/comms/messages/config/CircuitGroupMessage.ts +0 -0
  44. package/controller/comms/messages/config/CircuitMessage.ts +0 -0
  45. package/controller/comms/messages/config/ConfigMessage.ts +6 -0
  46. package/controller/comms/messages/config/CoverMessage.ts +0 -0
  47. package/controller/comms/messages/config/CustomNameMessage.ts +31 -31
  48. package/controller/comms/messages/config/EquipmentMessage.ts +250 -210
  49. package/controller/comms/messages/config/ExternalMessage.ts +1051 -903
  50. package/controller/comms/messages/config/FeatureMessage.ts +0 -0
  51. package/controller/comms/messages/config/GeneralMessage.ts +65 -0
  52. package/controller/comms/messages/config/HeaterMessage.ts +0 -0
  53. package/controller/comms/messages/config/IntellichemMessage.ts +0 -0
  54. package/controller/comms/messages/config/OptionsMessage.ts +207 -174
  55. package/controller/comms/messages/config/PumpMessage.ts +427 -421
  56. package/controller/comms/messages/config/RemoteMessage.ts +0 -0
  57. package/controller/comms/messages/config/ScheduleMessage.ts +401 -390
  58. package/controller/comms/messages/config/SecurityMessage.ts +37 -13
  59. package/controller/comms/messages/config/ValveMessage.ts +0 -0
  60. package/controller/comms/messages/status/ChlorinatorStateMessage.ts +0 -0
  61. package/controller/comms/messages/status/EquipmentStateMessage.ts +940 -822
  62. package/controller/comms/messages/status/HeaterStateMessage.ts +147 -135
  63. package/controller/comms/messages/status/IntelliChemStateMessage.ts +448 -448
  64. package/controller/comms/messages/status/IntelliValveStateMessage.ts +36 -36
  65. package/controller/comms/messages/status/NeptuneModbusStateMessage.ts +217 -0
  66. package/controller/comms/messages/status/PumpStateMessage.ts +0 -0
  67. package/controller/comms/messages/status/RegalModbusStateMessage.ts +410 -410
  68. package/controller/comms/messages/status/VersionMessage.ts +152 -41
  69. package/controller/nixie/Nixie.ts +173 -173
  70. package/controller/nixie/NixieEquipment.ts +104 -104
  71. package/controller/nixie/bodies/Body.ts +120 -120
  72. package/controller/nixie/bodies/Filter.ts +135 -135
  73. package/controller/nixie/chemistry/ChemController.ts +2756 -2724
  74. package/controller/nixie/chemistry/ChemDoser.ts +806 -806
  75. package/controller/nixie/chemistry/Chlorinator.ts +367 -367
  76. package/controller/nixie/circuits/Circuit.ts +478 -478
  77. package/controller/nixie/heaters/Heater.ts +843 -834
  78. package/controller/nixie/pumps/Pump.ts +1336 -1193
  79. package/controller/nixie/schedules/Schedule.ts +401 -401
  80. package/controller/nixie/valves/Valve.ts +170 -170
  81. package/defaultConfig.json +352 -352
  82. package/docker-compose.yml +32 -31
  83. package/logger/DataLogger.ts +448 -448
  84. package/logger/Logger.ts +459 -436
  85. package/package.json +58 -58
  86. package/sendSocket.js +32 -32
  87. package/tsconfig.json +26 -25
  88. package/types/express-multer.d.ts +32 -32
  89. package/web/Server.ts +1939 -1927
  90. package/web/bindings/aqualinkD.json +559 -559
  91. package/web/bindings/influxDB.json +1066 -1066
  92. package/web/bindings/mqtt.json +721 -721
  93. package/web/bindings/mqttAlt.json +746 -746
  94. package/web/bindings/rulesManager.json +54 -54
  95. package/web/bindings/smartThings-Hubitat.json +31 -31
  96. package/web/bindings/valveRelays.json +20 -20
  97. package/web/bindings/vera.json +25 -25
  98. package/web/interfaces/baseInterface.ts +188 -188
  99. package/web/interfaces/httpInterface.ts +148 -148
  100. package/web/interfaces/influxInterface.ts +283 -283
  101. package/web/interfaces/mqttInterface.ts +695 -695
  102. package/web/interfaces/ruleInterface.ts +101 -87
  103. package/web/services/config/Config.ts +1212 -1053
  104. package/web/services/config/ConfigSocket.ts +0 -0
  105. package/web/services/state/State.ts +21 -0
  106. package/web/services/state/StateSocket.ts +28 -0
  107. package/web/services/utilities/Utilities.ts +233 -233
@@ -1,148 +1,148 @@
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 { HttpInterfaceServer } from "../../web/Server";
19
- import * as http2 from "http2";
20
- import * as http from "http";
21
- import * as https from "https";
22
- import extend=require("extend");
23
- import { logger } from "../../logger/Logger";
24
- import { PoolSystem, sys } from "../../controller/Equipment";
25
- import { State, state } from "../../controller/State";
26
- import { InterfaceContext, InterfaceEvent, BaseInterfaceBindings } from "./baseInterface";
27
-
28
- export class HttpInterfaceBindings extends BaseInterfaceBindings {
29
- constructor(cfg) {
30
- super(cfg);
31
- }
32
- declare sockets: HttpInterfaceSocketEvent[];
33
- public bindEvent(evt: string, ...data: any) {
34
- // Find the binding by first looking for the specific event name.
35
- // If that doesn't exist then look for the "*" (all events).
36
- if (typeof this.events !== 'undefined') {
37
- let evts = this.events.filter(elem => elem.name === evt);
38
- // If we don't have an explicitly defined event then see if there is a default.
39
- if (evts.length === 0) {
40
- let e = this.events.find(elem => elem.name === '*');
41
- evts = e ? [e] : [];
42
- }
43
-
44
- let baseOpts = extend(true, { headers: {} }, this.cfg.options, this.context.options);
45
- if ((typeof baseOpts.hostname === 'undefined' || !baseOpts.hostname) && (typeof baseOpts.host === 'undefined' || !baseOpts.host || baseOpts.host === '*')) {
46
- logger.warn(`Interface: ${ this.cfg.name } has not resolved to a valid host.`);
47
- return;
48
- }
49
- if (evts.length > 0) {
50
- let toks = {};
51
- for (let i = 0; i < evts.length; i++) {
52
- let e = evts[i];
53
- if (typeof e.enabled !== 'undefined' && !e.enabled) continue;
54
- let opts = extend(true, baseOpts, e.options);
55
- // Figure out whether we need to check the filter.
56
- if (typeof e.filter !== 'undefined') {
57
- this.buildTokens(e.filter, evt, toks, e, data[0]);
58
- if (eval(this.replaceTokens(e.filter, toks)) === false) continue;
59
- }
60
-
61
- // If we are still waiting on mdns then blow this off.
62
- if ((typeof opts.hostname === 'undefined' || !opts.hostname) && (typeof opts.host === 'undefined' || !opts.host || opts.host === '*')) {
63
- logger.warn(`Interface: ${ this.cfg.name } Event: ${ e.name } has not resolved to a valid host.`);
64
- continue;
65
- }
66
-
67
- // Put together the data object.
68
- let sbody = '';
69
- switch (this.cfg.contentType) {
70
- //case 'application/json':
71
- //case 'json':
72
- default:
73
- sbody = typeof e.body !== 'undefined' ? JSON.stringify(e.body) : '';
74
- break;
75
- // We may need an XML output and can add transforms for that
76
- // later. There isn't a native xslt processor in node and most
77
- // of them that I looked at seemed pretty amatuer hour or overbearing
78
- // as they used SAX. => Need down and clean not down and dirty... we aren't building
79
- // a web client at this point.
80
- }
81
- this.buildTokens(sbody, evt, toks, e, data[0]);
82
- sbody = this.replaceTokens(sbody, toks);
83
- for (let prop in opts) {
84
- if (prop === 'headers') {
85
- for (let header in opts.headers) {
86
- this.buildTokens(opts.headers[header], evt, toks, e, data[0]);
87
- opts.headers[header] = this.replaceTokens(opts.headers[header], toks);
88
- }
89
- }
90
- else if (typeof opts[prop] === 'string') {
91
- this.buildTokens(opts[prop], evt, toks, e, data[0]);
92
- opts[prop] = this.replaceTokens(opts[prop] || '', toks);
93
- }
94
- }
95
- if (typeof opts.path !== 'undefined') opts.path = encodeURI(opts.path); // Encode the data just in case we have spaces.
96
- // opts.headers["CONTENT-LENGTH"] = Buffer.byteLength(sbody || '');
97
- logger.debug(`Sending [${evt}] request to ${this.cfg.name}: ${JSON.stringify(opts)}`);
98
- let req: http.ClientRequest;
99
- // We should now have all the tokens. Put together the request.
100
- if (typeof sbody !== 'undefined') {
101
- if (sbody.charAt(0) === '"' && sbody.charAt(sbody.length - 1) === '"') sbody = sbody.substr(1, sbody.length - 2);
102
- opts.headers["CONTENT-LENGTH"] = Buffer.byteLength(sbody || '');
103
- }
104
- if (opts.port === 443 || (opts.protocol || '').startsWith('https')) {
105
- opts.protocol = 'https:';
106
- req = https.request(opts, (response: http.IncomingMessage) => {
107
- //console.log(response);
108
- });
109
- }
110
- else {
111
- opts.protocol = 'http:';
112
- req = http.request(opts, (response: http.IncomingMessage) => {
113
- //console.log(response.statusCode);
114
- });
115
- }
116
- req.on('error', (err, req, res) => {
117
- logger.error(`Error sending request for event ${evt}: ${err.message}`);
118
- });
119
- if (typeof sbody !== 'undefined') {
120
- req.write(sbody);
121
- }
122
- req.end();
123
- }
124
- }
125
- }
126
- }
127
- }
128
- class HttpInterfaceSocketEvent {
129
- event: string;
130
- description: string;
131
- processor: (sock: HttpInterfaceSocketEvent, sys: PoolSystem, state: State, value: any) => void;
132
- constructor(sock: any) {
133
- this.event = sock.event;
134
- if (typeof sock.processor !== 'undefined') {
135
- let fnBody = Array.isArray(sock.processor) ? sock.processor.join('\n') : sock.processor;
136
- try {
137
- this.processor = new Function('sock', 'sys', 'state', 'value', fnBody) as (sock: HttpInterfaceSocketEvent, sys: PoolSystem, state: State, value: any) => void;
138
- } catch (err) { logger.error(`Error compiling socket event processor: ${err} -- ${fnBody}`); }
139
- }
140
- }
141
- }
142
- export interface IHTTPInterfaceSocketEvent {
143
- event: string,
144
- description: string,
145
- processor?: string
146
- }
147
-
148
-
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 { HttpInterfaceServer } from "../../web/Server";
19
+ import * as http2 from "http2";
20
+ import * as http from "http";
21
+ import * as https from "https";
22
+ import extend=require("extend");
23
+ import { logger } from "../../logger/Logger";
24
+ import { PoolSystem, sys } from "../../controller/Equipment";
25
+ import { State, state } from "../../controller/State";
26
+ import { InterfaceContext, InterfaceEvent, BaseInterfaceBindings } from "./baseInterface";
27
+
28
+ export class HttpInterfaceBindings extends BaseInterfaceBindings {
29
+ constructor(cfg) {
30
+ super(cfg);
31
+ }
32
+ declare sockets: HttpInterfaceSocketEvent[];
33
+ public bindEvent(evt: string, ...data: any) {
34
+ // Find the binding by first looking for the specific event name.
35
+ // If that doesn't exist then look for the "*" (all events).
36
+ if (typeof this.events !== 'undefined') {
37
+ let evts = this.events.filter(elem => elem.name === evt);
38
+ // If we don't have an explicitly defined event then see if there is a default.
39
+ if (evts.length === 0) {
40
+ let e = this.events.find(elem => elem.name === '*');
41
+ evts = e ? [e] : [];
42
+ }
43
+
44
+ let baseOpts = extend(true, { headers: {} }, this.cfg.options, this.context.options);
45
+ if ((typeof baseOpts.hostname === 'undefined' || !baseOpts.hostname) && (typeof baseOpts.host === 'undefined' || !baseOpts.host || baseOpts.host === '*')) {
46
+ logger.warn(`Interface: ${ this.cfg.name } has not resolved to a valid host.`);
47
+ return;
48
+ }
49
+ if (evts.length > 0) {
50
+ let toks = {};
51
+ for (let i = 0; i < evts.length; i++) {
52
+ let e = evts[i];
53
+ if (typeof e.enabled !== 'undefined' && !e.enabled) continue;
54
+ let opts = extend(true, baseOpts, e.options);
55
+ // Figure out whether we need to check the filter.
56
+ if (typeof e.filter !== 'undefined') {
57
+ this.buildTokens(e.filter, evt, toks, e, data[0]);
58
+ if (eval(this.replaceTokens(e.filter, toks)) === false) continue;
59
+ }
60
+
61
+ // If we are still waiting on mdns then blow this off.
62
+ if ((typeof opts.hostname === 'undefined' || !opts.hostname) && (typeof opts.host === 'undefined' || !opts.host || opts.host === '*')) {
63
+ logger.warn(`Interface: ${ this.cfg.name } Event: ${ e.name } has not resolved to a valid host.`);
64
+ continue;
65
+ }
66
+
67
+ // Put together the data object.
68
+ let sbody = '';
69
+ switch (this.cfg.contentType) {
70
+ //case 'application/json':
71
+ //case 'json':
72
+ default:
73
+ sbody = typeof e.body !== 'undefined' ? JSON.stringify(e.body) : '';
74
+ break;
75
+ // We may need an XML output and can add transforms for that
76
+ // later. There isn't a native xslt processor in node and most
77
+ // of them that I looked at seemed pretty amatuer hour or overbearing
78
+ // as they used SAX. => Need down and clean not down and dirty... we aren't building
79
+ // a web client at this point.
80
+ }
81
+ this.buildTokens(sbody, evt, toks, e, data[0]);
82
+ sbody = this.replaceTokens(sbody, toks);
83
+ for (let prop in opts) {
84
+ if (prop === 'headers') {
85
+ for (let header in opts.headers) {
86
+ this.buildTokens(opts.headers[header], evt, toks, e, data[0]);
87
+ opts.headers[header] = this.replaceTokens(opts.headers[header], toks);
88
+ }
89
+ }
90
+ else if (typeof opts[prop] === 'string') {
91
+ this.buildTokens(opts[prop], evt, toks, e, data[0]);
92
+ opts[prop] = this.replaceTokens(opts[prop] || '', toks);
93
+ }
94
+ }
95
+ if (typeof opts.path !== 'undefined') opts.path = encodeURI(opts.path); // Encode the data just in case we have spaces.
96
+ // opts.headers["CONTENT-LENGTH"] = Buffer.byteLength(sbody || '');
97
+ logger.debug(`Sending [${evt}] request to ${this.cfg.name}: ${JSON.stringify(opts)}`);
98
+ let req: http.ClientRequest;
99
+ // We should now have all the tokens. Put together the request.
100
+ if (typeof sbody !== 'undefined') {
101
+ if (sbody.charAt(0) === '"' && sbody.charAt(sbody.length - 1) === '"') sbody = sbody.substr(1, sbody.length - 2);
102
+ opts.headers["CONTENT-LENGTH"] = Buffer.byteLength(sbody || '');
103
+ }
104
+ if (opts.port === 443 || (opts.protocol || '').startsWith('https')) {
105
+ opts.protocol = 'https:';
106
+ req = https.request(opts, (response: http.IncomingMessage) => {
107
+ //console.log(response);
108
+ });
109
+ }
110
+ else {
111
+ opts.protocol = 'http:';
112
+ req = http.request(opts, (response: http.IncomingMessage) => {
113
+ //console.log(response.statusCode);
114
+ });
115
+ }
116
+ req.on('error', (err, req, res) => {
117
+ logger.error(`Error sending request for event ${evt}: ${err.message}`);
118
+ });
119
+ if (typeof sbody !== 'undefined') {
120
+ req.write(sbody);
121
+ }
122
+ req.end();
123
+ }
124
+ }
125
+ }
126
+ }
127
+ }
128
+ class HttpInterfaceSocketEvent {
129
+ event: string;
130
+ description: string;
131
+ processor: (sock: HttpInterfaceSocketEvent, sys: PoolSystem, state: State, value: any) => void;
132
+ constructor(sock: any) {
133
+ this.event = sock.event;
134
+ if (typeof sock.processor !== 'undefined') {
135
+ let fnBody = Array.isArray(sock.processor) ? sock.processor.join('\n') : sock.processor;
136
+ try {
137
+ this.processor = new Function('sock', 'sys', 'state', 'value', fnBody) as (sock: HttpInterfaceSocketEvent, sys: PoolSystem, state: State, value: any) => void;
138
+ } catch (err) { logger.error(`Error compiling socket event processor: ${err} -- ${fnBody}`); }
139
+ }
140
+ }
141
+ }
142
+ export interface IHTTPInterfaceSocketEvent {
143
+ event: string,
144
+ description: string,
145
+ processor?: string
146
+ }
147
+
148
+