nodejs-poolcontroller 7.6.0 → 7.6.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 (85) hide show
  1. package/.eslintrc.json +44 -44
  2. package/.github/ISSUE_TEMPLATE/bug_report.md +52 -52
  3. package/CONTRIBUTING.md +74 -74
  4. package/Changelog +215 -215
  5. package/Dockerfile +17 -17
  6. package/Gruntfile.js +40 -40
  7. package/LICENSE +661 -661
  8. package/README.md +191 -186
  9. package/app.ts +0 -0
  10. package/config/Config.ts +24 -2
  11. package/config/VersionCheck.ts +27 -12
  12. package/config copy.json +299 -299
  13. package/controller/Constants.ts +0 -0
  14. package/controller/Equipment.ts +2459 -2405
  15. package/controller/Errors.ts +180 -180
  16. package/controller/Lockouts.ts +436 -422
  17. package/controller/State.ts +51 -26
  18. package/controller/boards/BoardFactory.ts +45 -45
  19. package/controller/boards/EasyTouchBoard.ts +2653 -2537
  20. package/controller/boards/IntelliCenterBoard.ts +4230 -4034
  21. package/controller/boards/IntelliComBoard.ts +63 -63
  22. package/controller/boards/IntelliTouchBoard.ts +241 -241
  23. package/controller/boards/NixieBoard.ts +1675 -1660
  24. package/controller/boards/SystemBoard.ts +4697 -4463
  25. package/controller/comms/Comms.ts +138 -1
  26. package/controller/comms/messages/Messages.ts +3 -5
  27. package/controller/comms/messages/config/ChlorinatorMessage.ts +1 -1
  28. package/controller/comms/messages/config/CircuitGroupMessage.ts +0 -0
  29. package/controller/comms/messages/config/CircuitMessage.ts +0 -0
  30. package/controller/comms/messages/config/ConfigMessage.ts +0 -0
  31. package/controller/comms/messages/config/CoverMessage.ts +0 -0
  32. package/controller/comms/messages/config/CustomNameMessage.ts +30 -30
  33. package/controller/comms/messages/config/EquipmentMessage.ts +0 -0
  34. package/controller/comms/messages/config/ExternalMessage.ts +9 -7
  35. package/controller/comms/messages/config/FeatureMessage.ts +0 -0
  36. package/controller/comms/messages/config/GeneralMessage.ts +0 -0
  37. package/controller/comms/messages/config/HeaterMessage.ts +0 -20
  38. package/controller/comms/messages/config/IntellichemMessage.ts +0 -0
  39. package/controller/comms/messages/config/OptionsMessage.ts +25 -1
  40. package/controller/comms/messages/config/PumpMessage.ts +0 -0
  41. package/controller/comms/messages/config/RemoteMessage.ts +0 -0
  42. package/controller/comms/messages/config/ScheduleMessage.ts +347 -342
  43. package/controller/comms/messages/config/SecurityMessage.ts +0 -0
  44. package/controller/comms/messages/config/ValveMessage.ts +0 -0
  45. package/controller/comms/messages/status/ChlorinatorStateMessage.ts +0 -0
  46. package/controller/comms/messages/status/EquipmentStateMessage.ts +1 -1
  47. package/controller/comms/messages/status/HeaterStateMessage.ts +86 -86
  48. package/controller/comms/messages/status/IntelliChemStateMessage.ts +445 -397
  49. package/controller/comms/messages/status/IntelliValveStateMessage.ts +35 -35
  50. package/controller/comms/messages/status/PumpStateMessage.ts +0 -0
  51. package/controller/comms/messages/status/VersionMessage.ts +0 -0
  52. package/controller/nixie/Nixie.ts +162 -162
  53. package/controller/nixie/NixieEquipment.ts +103 -103
  54. package/controller/nixie/bodies/Body.ts +120 -120
  55. package/controller/nixie/bodies/Filter.ts +135 -135
  56. package/controller/nixie/chemistry/ChemController.ts +2498 -2398
  57. package/controller/nixie/chemistry/Chlorinator.ts +314 -314
  58. package/controller/nixie/circuits/Circuit.ts +248 -245
  59. package/controller/nixie/heaters/Heater.ts +648 -600
  60. package/controller/nixie/pumps/Pump.ts +661 -661
  61. package/controller/nixie/schedules/Schedule.ts +257 -257
  62. package/controller/nixie/valves/Valve.ts +170 -170
  63. package/defaultConfig.json +286 -286
  64. package/issue_template.md +51 -51
  65. package/logger/DataLogger.ts +448 -448
  66. package/logger/Logger.ts +0 -0
  67. package/package.json +56 -56
  68. package/tsconfig.json +25 -25
  69. package/web/Server.ts +2 -2
  70. package/web/bindings/influxDB.json +1021 -981
  71. package/web/bindings/mqtt.json +654 -654
  72. package/web/bindings/mqttAlt.json +684 -684
  73. package/web/bindings/rulesManager.json +54 -54
  74. package/web/bindings/smartThings-Hubitat.json +31 -31
  75. package/web/bindings/valveRelays.json +20 -20
  76. package/web/bindings/vera.json +25 -25
  77. package/web/interfaces/baseInterface.ts +136 -136
  78. package/web/interfaces/httpInterface.ts +124 -124
  79. package/web/interfaces/influxInterface.ts +245 -241
  80. package/web/interfaces/mqttInterface.ts +475 -475
  81. package/web/services/config/Config.ts +10 -108
  82. package/web/services/config/ConfigSocket.ts +0 -0
  83. package/web/services/state/State.ts +71 -4
  84. package/web/services/state/StateSocket.ts +0 -0
  85. package/web/services/utilities/Utilities.ts +42 -42
@@ -1,180 +1,180 @@
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. 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
+