nodejs-poolcontroller 7.6.1 → 8.0.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 (102) hide show
  1. package/.eslintrc.json +36 -45
  2. package/.github/ISSUE_TEMPLATE/1-bug-report.yml +84 -0
  3. package/.github/ISSUE_TEMPLATE/2-docs.md +12 -0
  4. package/.github/ISSUE_TEMPLATE/3-proposal.md +28 -0
  5. package/.github/ISSUE_TEMPLATE/config.yml +8 -0
  6. package/CONTRIBUTING.md +74 -74
  7. package/Changelog +242 -215
  8. package/Dockerfile +17 -17
  9. package/Gruntfile.js +40 -40
  10. package/LICENSE +661 -661
  11. package/README.md +195 -191
  12. package/anslq25/MessagesMock.ts +218 -0
  13. package/anslq25/boards/MockBoardFactory.ts +50 -0
  14. package/anslq25/boards/MockEasyTouchBoard.ts +696 -0
  15. package/anslq25/boards/MockSystemBoard.ts +217 -0
  16. package/anslq25/chemistry/MockChlorinator.ts +75 -0
  17. package/anslq25/pumps/MockPump.ts +84 -0
  18. package/app.ts +10 -14
  19. package/config/Config.ts +26 -8
  20. package/config/VersionCheck.ts +8 -4
  21. package/controller/Constants.ts +59 -25
  22. package/controller/Equipment.ts +2667 -2459
  23. package/controller/Errors.ts +181 -180
  24. package/controller/Lockouts.ts +534 -436
  25. package/controller/State.ts +596 -77
  26. package/controller/boards/AquaLinkBoard.ts +1003 -0
  27. package/controller/boards/BoardFactory.ts +53 -45
  28. package/controller/boards/EasyTouchBoard.ts +3079 -2653
  29. package/controller/boards/IntelliCenterBoard.ts +3821 -4230
  30. package/controller/boards/IntelliComBoard.ts +69 -63
  31. package/controller/boards/IntelliTouchBoard.ts +384 -241
  32. package/controller/boards/NixieBoard.ts +1871 -1675
  33. package/controller/boards/SunTouchBoard.ts +393 -0
  34. package/controller/boards/SystemBoard.ts +5244 -4697
  35. package/controller/comms/Comms.ts +905 -541
  36. package/controller/comms/ScreenLogic.ts +1663 -0
  37. package/controller/comms/messages/Messages.ts +382 -54
  38. package/controller/comms/messages/config/ChlorinatorMessage.ts +8 -4
  39. package/controller/comms/messages/config/CircuitGroupMessage.ts +5 -2
  40. package/controller/comms/messages/config/CircuitMessage.ts +82 -13
  41. package/controller/comms/messages/config/ConfigMessage.ts +3 -1
  42. package/controller/comms/messages/config/CoverMessage.ts +2 -1
  43. package/controller/comms/messages/config/CustomNameMessage.ts +31 -30
  44. package/controller/comms/messages/config/EquipmentMessage.ts +5 -1
  45. package/controller/comms/messages/config/ExternalMessage.ts +33 -3
  46. package/controller/comms/messages/config/FeatureMessage.ts +2 -1
  47. package/controller/comms/messages/config/GeneralMessage.ts +2 -1
  48. package/controller/comms/messages/config/HeaterMessage.ts +145 -11
  49. package/controller/comms/messages/config/IntellichemMessage.ts +2 -1
  50. package/controller/comms/messages/config/OptionsMessage.ts +16 -27
  51. package/controller/comms/messages/config/PumpMessage.ts +62 -47
  52. package/controller/comms/messages/config/RemoteMessage.ts +80 -13
  53. package/controller/comms/messages/config/ScheduleMessage.ts +390 -347
  54. package/controller/comms/messages/config/SecurityMessage.ts +2 -1
  55. package/controller/comms/messages/config/ValveMessage.ts +44 -27
  56. package/controller/comms/messages/status/ChlorinatorStateMessage.ts +44 -91
  57. package/controller/comms/messages/status/EquipmentStateMessage.ts +139 -30
  58. package/controller/comms/messages/status/HeaterStateMessage.ts +135 -86
  59. package/controller/comms/messages/status/IntelliChemStateMessage.ts +448 -445
  60. package/controller/comms/messages/status/IntelliValveStateMessage.ts +36 -35
  61. package/controller/comms/messages/status/PumpStateMessage.ts +92 -2
  62. package/controller/comms/messages/status/VersionMessage.ts +2 -1
  63. package/controller/nixie/Nixie.ts +173 -162
  64. package/controller/nixie/NixieEquipment.ts +104 -103
  65. package/controller/nixie/bodies/Body.ts +120 -120
  66. package/controller/nixie/bodies/Filter.ts +135 -135
  67. package/controller/nixie/chemistry/ChemController.ts +2682 -2498
  68. package/controller/nixie/chemistry/ChemDoser.ts +806 -0
  69. package/controller/nixie/chemistry/Chlorinator.ts +367 -314
  70. package/controller/nixie/circuits/Circuit.ts +402 -248
  71. package/controller/nixie/heaters/Heater.ts +815 -649
  72. package/controller/nixie/pumps/Pump.ts +934 -661
  73. package/controller/nixie/schedules/Schedule.ts +319 -257
  74. package/controller/nixie/valves/Valve.ts +170 -170
  75. package/defaultConfig.json +346 -286
  76. package/logger/DataLogger.ts +448 -448
  77. package/logger/Logger.ts +38 -9
  78. package/package.json +60 -56
  79. package/tsconfig.json +25 -25
  80. package/web/Server.ts +275 -117
  81. package/web/bindings/aqualinkD.json +560 -0
  82. package/web/bindings/homeassistant.json +437 -0
  83. package/web/bindings/influxDB.json +1066 -1021
  84. package/web/bindings/mqtt.json +721 -654
  85. package/web/bindings/mqttAlt.json +746 -684
  86. package/web/bindings/rulesManager.json +54 -54
  87. package/web/bindings/smartThings-Hubitat.json +31 -31
  88. package/web/bindings/valveRelays.json +20 -20
  89. package/web/bindings/vera.json +25 -25
  90. package/web/interfaces/baseInterface.ts +188 -136
  91. package/web/interfaces/httpInterface.ts +148 -124
  92. package/web/interfaces/influxInterface.ts +283 -245
  93. package/web/interfaces/mqttInterface.ts +695 -475
  94. package/web/interfaces/ruleInterface.ts +87 -0
  95. package/web/services/config/Config.ts +177 -49
  96. package/web/services/config/ConfigSocket.ts +2 -1
  97. package/web/services/state/State.ts +154 -3
  98. package/web/services/state/StateSocket.ts +69 -18
  99. package/web/services/utilities/Utilities.ts +232 -42
  100. package/.github/ISSUE_TEMPLATE/bug_report.md +0 -52
  101. package/config copy.json +0 -300
  102. package/issue_template.md +0 -52
@@ -1,124 +1,148 @@
1
- /* nodejs-poolController. An application to control pool equipment.
2
- Copyright (C) 2016, 2017, 2018, 2019, 2020. Russell Goldin, tagyoureit. russ.goldin@gmail.com
3
-
4
- This program is free software: you can redistribute it and/or modify
5
- it under the terms of the GNU Affero General Public License as
6
- published by the Free Software Foundation, either version 3 of the
7
- License, or (at your option) any later version.
8
-
9
- This program is distributed in the hope that it will be useful,
10
- but WITHOUT ANY WARRANTY; without even the implied warranty of
11
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
- GNU Affero General Public License for more details.
13
-
14
- You should have received a copy of the GNU Affero General Public License
15
- along with this program. If not, see <http://www.gnu.org/licenses/>.
16
- */
17
- import { HttpInterfaceServer } from "../../web/Server";
18
- import * as http2 from "http2";
19
- import * as http from "http";
20
- import * as https from "https";
21
- import extend=require("extend");
22
- import { logger } from "../../logger/Logger";
23
- import { sys } from "../../controller/Equipment";
24
- import { state } from "../../controller/State";
25
- import { InterfaceContext, InterfaceEvent, BaseInterfaceBindings } from "./baseInterface";
26
-
27
- export class HttpInterfaceBindings extends BaseInterfaceBindings {
28
- constructor(cfg) {
29
- super(cfg);
30
- }
31
- public bindEvent(evt: string, ...data: any) {
32
- // Find the binding by first looking for the specific event name.
33
- // If that doesn't exist then look for the "*" (all events).
34
- if (typeof this.events !== 'undefined') {
35
- let evts = this.events.filter(elem => elem.name === evt);
36
- // If we don't have an explicitly defined event then see if there is a default.
37
- if (evts.length === 0) {
38
- let e = this.events.find(elem => elem.name === '*');
39
- evts = e ? [e] : [];
40
- }
41
-
42
- let baseOpts = extend(true, { headers: {} }, this.cfg.options, this.context.options);
43
- if ((typeof baseOpts.hostname === 'undefined' || !baseOpts.hostname) && (typeof baseOpts.host === 'undefined' || !baseOpts.host || baseOpts.host === '*')) {
44
- logger.warn(`Interface: ${ this.cfg.name } has not resolved to a valid host.`);
45
- return;
46
- }
47
- if (evts.length > 0) {
48
- let toks = {};
49
- for (let i = 0; i < evts.length; i++) {
50
- let e = evts[i];
51
- if (typeof e.enabled !== 'undefined' && !e.enabled) continue;
52
- let opts = extend(true, baseOpts, e.options);
53
- // Figure out whether we need to check the filter.
54
- if (typeof e.filter !== 'undefined') {
55
- this.buildTokens(e.filter, evt, toks, e, data[0]);
56
- if (eval(this.replaceTokens(e.filter, toks)) === false) continue;
57
- }
58
-
59
- // If we are still waiting on mdns then blow this off.
60
- if ((typeof opts.hostname === 'undefined' || !opts.hostname) && (typeof opts.host === 'undefined' || !opts.host || opts.host === '*')) {
61
- logger.warn(`Interface: ${ this.cfg.name } Event: ${ e.name } has not resolved to a valid host.`);
62
- continue;
63
- }
64
-
65
- // Put together the data object.
66
- let sbody = '';
67
- switch (this.cfg.contentType) {
68
- //case 'application/json':
69
- //case 'json':
70
- default:
71
- sbody = typeof e.body !== 'undefined' ? JSON.stringify(e.body) : '';
72
- break;
73
- // We may need an XML output and can add transforms for that
74
- // later. There isn't a native xslt processor in node and most
75
- // of them that I looked at seemed pretty amatuer hour or overbearing
76
- // as they used SAX. => Need down and clean not down and dirty... we aren't building
77
- // a web client at this point.
78
- }
79
- this.buildTokens(sbody, evt, toks, e, data[0]);
80
- sbody = this.replaceTokens(sbody, toks);
81
- for (let prop in opts) {
82
- if (prop === 'headers') {
83
- for (let header in opts.headers) {
84
- this.buildTokens(opts.headers[header], evt, toks, e, data[0]);
85
- opts.headers[header] = this.replaceTokens(opts.headers[header], toks);
86
- }
87
- }
88
- else if (typeof opts[prop] === 'string') {
89
- this.buildTokens(opts[prop], evt, toks, e, data[0]);
90
- opts[prop] = this.replaceTokens(opts[prop] || '', toks);
91
- }
92
- }
93
- if (typeof opts.path !== 'undefined') opts.path = encodeURI(opts.path); // Encode the data just in case we have spaces.
94
- // opts.headers["CONTENT-LENGTH"] = Buffer.byteLength(sbody || '');
95
- logger.debug(`Sending [${evt}] request to ${this.cfg.name}: ${JSON.stringify(opts)}`);
96
- let req: http.ClientRequest;
97
- // We should now have all the tokens. Put together the request.
98
- if (typeof sbody !== 'undefined') {
99
- if (sbody.charAt(0) === '"' && sbody.charAt(sbody.length - 1) === '"') sbody = sbody.substr(1, sbody.length - 2);
100
- opts.headers["CONTENT-LENGTH"] = Buffer.byteLength(sbody || '');
101
- }
102
- if (opts.port === 443 || (opts.protocol || '').startsWith('https')) {
103
- opts.protocol = 'https:';
104
- req = https.request(opts, (response: http.IncomingMessage) => {
105
- //console.log(response);
106
- });
107
- }
108
- else {
109
- opts.protocol = 'http:';
110
- req = http.request(opts, (response: http.IncomingMessage) => {
111
- //console.log(response.statusCode);
112
- });
113
- }
114
- req.on('error', (err, req, res) => { logger.error(err); });
115
- if (typeof sbody !== 'undefined') {
116
- req.write(sbody);
117
- }
118
- req.end();
119
- }
120
- }
121
- }
122
- }
123
- }
124
-
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
+