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,180 +1,181 @@
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 extend = require("extend");
18
- import { Message, Outbound, Inbound } from "./comms/messages/Messages";
19
- import * as path from "path";
20
-
21
- // Internal abstract class for all errors.
22
- class ApiError extends Error {
23
- constructor(message: string, code?: number, httpCode?: number) {
24
- super(message);
25
- this.name = 'ApiError';
26
- this.code = code || 0;
27
- this.httpCode = httpCode || 400;
28
- let pos: any = {};
29
- if (typeof this.stack !== 'undefined') {
30
- try {
31
- // Another weirdo decision by NodeJS to not include the line numbers and source. Only a text based stack trace.
32
- let lines = this.stack.split('\n');
33
- for (let i = 0; i < lines.length; i++) {
34
- let line = lines[i];
35
- if (line.trimLeft().startsWith('at ')) {
36
- let lastParen = line.lastIndexOf(')');
37
- let firstParen = line.indexOf('(');
38
- if (lastParen >= 0 && firstParen >= 0) {
39
- let p = line.substring(firstParen + 1, lastParen);
40
- let m = /(\:\d+\:\d+)(?!.*\1)/g;
41
- let matches = p.match(m);
42
- let linecol = '';
43
- let lastIndex = -1;
44
- if (matches.length > 0) {
45
- linecol = matches[matches.length - 1];
46
- lastIndex = p.lastIndexOf(linecol);
47
- p = p.substring(0, lastIndex);
48
- if (linecol.startsWith(':')) linecol = linecol.substring(1);
49
- let lastcolon = linecol.lastIndexOf(':');
50
- if (lastcolon !== -1) {
51
- pos.column = parseInt(linecol.substring(lastcolon + 1), 10);
52
- pos.line = parseInt(linecol.substring(0, lastcolon), 10);
53
- }
54
- }
55
- let po = path.parse(p);
56
- pos.dir = po.dir;
57
- pos.file = po.base;
58
- }
59
- break;
60
- }
61
- }
62
- } catch (e) { }
63
- }
64
- this.position = pos;
65
- }
66
- public code: number = 0;
67
- public httpCode: number = 500;
68
- public position: any = {}
69
- }
70
- class EquipmentError extends ApiError {
71
- constructor(message: string, code: number, eqType: string) {
72
- super(message, 210, 400);
73
- this.name = 'EquipmentError';
74
- this.equipmentType = eqType;
75
- }
76
- public equipmentType: string;
77
- }
78
- export class EquipmentNotFoundError extends EquipmentError {
79
- constructor(message: string, eqType: string) {
80
- super(message, 204, eqType);
81
- this.name = 'EquipmentNotFound';
82
- }
83
- }
84
- export class InvalidEquipmentIdError extends EquipmentError {
85
- constructor(message: string, id: number, eqType: string) {
86
- super(message, 250, eqType);
87
- this.name = 'InvalidEquipmentId';
88
- }
89
- public id: number;
90
- }
91
- export class InvalidEquipmentDataError extends EquipmentError {
92
- constructor(message: string, eqType: string, eqData) {
93
- super(message, 270, eqType);
94
- this.name = 'InvalidEquipmentData';
95
- this.eqData = eqData;
96
- }
97
- public eqData;
98
- }
99
- export class ServiceProcessError extends ApiError {
100
- constructor(message: string, serviceName: string, process?: string) {
101
- super(message, 290, 400);
102
- this.name = 'ServiceProcessError';
103
- this.service = serviceName;
104
- this.process = process;
105
- }
106
- public process: string;
107
- public service: string;
108
- }
109
- export class ServiceParameterError extends ApiError {
110
- constructor(message: string, serviceName: string, paramName: string, value) {
111
- super(message, 280, 400);
112
- this.name = 'InvalidServiceParameter';
113
-
114
- this.value = value;
115
- this.parameter = paramName;
116
- this.service = serviceName;
117
- }
118
- public value;
119
- public parameter: string;
120
- public service: string;
121
- }
122
- export class InvalidOperationError extends ApiError {
123
- constructor(message: string, operation: string) {
124
- super(message, 100, 400);
125
- this.name = 'InvalidOperation';
126
- this.operation = operation;
127
- }
128
- public operation: string;
129
- }
130
- export class EquipmentTimeoutError extends ApiError {
131
- constructor(message: string, operation: string) {
132
- super(message, 100, 400);
133
- this.name = 'TimeoutError';
134
- this.operation = operation;
135
- }
136
- public operation: string;
137
- }
138
- export class ParameterOutOfRangeError extends InvalidOperationError {
139
- constructor(message: string, operation: string, parameter: string, value) {
140
- super(message, operation);
141
- this.name = 'ParameterOutOfRange';
142
- this.operation = operation;
143
- }
144
- public value;
145
- public parameter: string;
146
- }
147
- export class BoardProcessError extends ApiError {
148
- constructor(message: string, process?: string) {
149
- super(message, 300, 400);
150
- this.name = 'ProcessingError';
151
- this.process = process;
152
- }
153
- public process: string;
154
-
155
- }
156
-
157
- export class MessageError extends ApiError {
158
- constructor(msg: Message, message: string, code?: number, httpCode?: number) {
159
- super(message, code, httpCode);
160
- this.name = 'MessageError';
161
- this.msg = msg;
162
- this.code = code || 500;
163
- }
164
- public msg: Message;
165
- }
166
- export class OutboundMessageError extends MessageError {
167
- constructor(msg: Outbound, message: string, code?: number, httpCode?: number) {
168
- super(msg, message, code, httpCode);
169
- this.name = 'OutboundMessageError';
170
- this.code = code || 501;
171
- }
172
- }
173
- export class InboundMessageError extends MessageError {
174
- constructor(msg: Inbound, message: string, code?: number, httpCode?: number) {
175
- super(msg, message, code, httpCode);
176
- this.name = 'InboundMessageError';
177
- this.code = code || 502;
178
- }
179
- }
180
-
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 extend = require("extend");
19
+ import { Message, Outbound, Inbound } from "./comms/messages/Messages";
20
+ import * as path from "path";
21
+
22
+ // Internal abstract class for all errors.
23
+ class ApiError extends Error {
24
+ constructor(message: string, code?: number, httpCode?: number) {
25
+ super(message);
26
+ this.name = 'ApiError';
27
+ this.code = code || 0;
28
+ this.httpCode = httpCode || 400;
29
+ let pos: any = {};
30
+ if (typeof this.stack !== 'undefined') {
31
+ try {
32
+ // Another weirdo decision by NodeJS to not include the line numbers and source. Only a text based stack trace.
33
+ let lines = this.stack.split('\n');
34
+ for (let i = 0; i < lines.length; i++) {
35
+ let line = lines[i];
36
+ if (line.trimLeft().startsWith('at ')) {
37
+ let lastParen = line.lastIndexOf(')');
38
+ let firstParen = line.indexOf('(');
39
+ if (lastParen >= 0 && firstParen >= 0) {
40
+ let p = line.substring(firstParen + 1, lastParen);
41
+ let m = /(\:\d+\:\d+)(?!.*\1)/g;
42
+ let matches = p.match(m);
43
+ let linecol = '';
44
+ let lastIndex = -1;
45
+ if (matches.length > 0) {
46
+ linecol = matches[matches.length - 1];
47
+ lastIndex = p.lastIndexOf(linecol);
48
+ p = p.substring(0, lastIndex);
49
+ if (linecol.startsWith(':')) linecol = linecol.substring(1);
50
+ let lastcolon = linecol.lastIndexOf(':');
51
+ if (lastcolon !== -1) {
52
+ pos.column = parseInt(linecol.substring(lastcolon + 1), 10);
53
+ pos.line = parseInt(linecol.substring(0, lastcolon), 10);
54
+ }
55
+ }
56
+ let po = path.parse(p);
57
+ pos.dir = po.dir;
58
+ pos.file = po.base;
59
+ }
60
+ break;
61
+ }
62
+ }
63
+ } catch (e) { }
64
+ }
65
+ this.position = pos;
66
+ }
67
+ public code: number = 0;
68
+ public httpCode: number = 500;
69
+ public position: any = {}
70
+ }
71
+ class EquipmentError extends ApiError {
72
+ constructor(message: string, code: number, eqType: string) {
73
+ super(message, 210, 400);
74
+ this.name = 'EquipmentError';
75
+ this.equipmentType = eqType;
76
+ }
77
+ public equipmentType: string;
78
+ }
79
+ export class EquipmentNotFoundError extends EquipmentError {
80
+ constructor(message: string, eqType: string) {
81
+ super(message, 204, eqType);
82
+ this.name = 'EquipmentNotFound';
83
+ }
84
+ }
85
+ export class InvalidEquipmentIdError extends EquipmentError {
86
+ constructor(message: string, id: number, eqType: string) {
87
+ super(message, 250, eqType);
88
+ this.name = 'InvalidEquipmentId';
89
+ }
90
+ public id: number;
91
+ }
92
+ export class InvalidEquipmentDataError extends EquipmentError {
93
+ constructor(message: string, eqType: string, eqData) {
94
+ super(message, 270, eqType);
95
+ this.name = 'InvalidEquipmentData';
96
+ this.eqData = eqData;
97
+ }
98
+ public eqData;
99
+ }
100
+ export class ServiceProcessError extends ApiError {
101
+ constructor(message: string, serviceName: string, process?: string) {
102
+ super(message, 290, 400);
103
+ this.name = 'ServiceProcessError';
104
+ this.service = serviceName;
105
+ this.process = process;
106
+ }
107
+ public process: string;
108
+ public service: string;
109
+ }
110
+ export class ServiceParameterError extends ApiError {
111
+ constructor(message: string, serviceName: string, paramName: string, value) {
112
+ super(message, 280, 400);
113
+ this.name = 'InvalidServiceParameter';
114
+
115
+ this.value = value;
116
+ this.parameter = paramName;
117
+ this.service = serviceName;
118
+ }
119
+ public value;
120
+ public parameter: string;
121
+ public service: string;
122
+ }
123
+ export class InvalidOperationError extends ApiError {
124
+ constructor(message: string, operation: string) {
125
+ super(message, 100, 400);
126
+ this.name = 'InvalidOperation';
127
+ this.operation = operation;
128
+ }
129
+ public operation: string;
130
+ }
131
+ export class EquipmentTimeoutError extends ApiError {
132
+ constructor(message: string, operation: string) {
133
+ super(message, 100, 400);
134
+ this.name = 'TimeoutError';
135
+ this.operation = operation;
136
+ }
137
+ public operation: string;
138
+ }
139
+ export class ParameterOutOfRangeError extends InvalidOperationError {
140
+ constructor(message: string, operation: string, parameter: string, value) {
141
+ super(message, operation);
142
+ this.name = 'ParameterOutOfRange';
143
+ this.operation = operation;
144
+ }
145
+ public value;
146
+ public parameter: string;
147
+ }
148
+ export class BoardProcessError extends ApiError {
149
+ constructor(message: string, process?: string) {
150
+ super(message, 300, 400);
151
+ this.name = 'ProcessingError';
152
+ this.process = process;
153
+ }
154
+ public process: string;
155
+
156
+ }
157
+
158
+ export class MessageError extends ApiError {
159
+ constructor(msg: Message, message: string, code?: number, httpCode?: number) {
160
+ super(message, code, httpCode);
161
+ this.name = 'MessageError';
162
+ this.msg = msg;
163
+ this.code = code || 500;
164
+ }
165
+ public msg: Message;
166
+ }
167
+ export class OutboundMessageError extends MessageError {
168
+ constructor(msg: Outbound, message: string, code?: number, httpCode?: number) {
169
+ super(msg, message, code, httpCode);
170
+ this.name = 'OutboundMessageError';
171
+ this.code = code || 501;
172
+ }
173
+ }
174
+ export class InboundMessageError extends MessageError {
175
+ constructor(msg: Inbound, message: string, code?: number, httpCode?: number) {
176
+ super(msg, message, code, httpCode);
177
+ this.name = 'InboundMessageError';
178
+ this.code = code || 502;
179
+ }
180
+ }
181
+