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,136 +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 { Inbound, Protocol } from "../Messages";
19
- import { state, BodyTempState, HeaterState } from "../../../State";
20
- import { sys, ControllerType, Heater } from "../../../Equipment";
21
-
22
- export class HeaterStateMessage {
23
- public static process(msg: Inbound) {
24
- if (msg.protocol === Protocol.Heater) {
25
- switch (msg.action) {
26
- case 112: // This is a message from a master controlling MasterTemp or UltraTemp ETi
27
- break;
28
- case 114: // This is a message from a master controlling UltraTemp
29
- msg.isProcessed = true;
30
- break;
31
- case 113:
32
- HeaterStateMessage.processHybridStatus(msg);
33
- break;
34
- case 116:
35
- HeaterStateMessage.processMasterTempStatus(msg);
36
- break;
37
- case 115:
38
- HeaterStateMessage.processUltraTempStatus(msg);
39
- break;
40
- }
41
- }
42
- }
43
- public static processHeaterCommand(msg: Inbound) {
44
- let heater: Heater = sys.heaters.getItemByAddress(msg.source);
45
- // At this point there is no other configuration data for ET
46
- if (sys.controllerType === ControllerType.EasyTouch) {
47
- let htype = sys.board.valueMaps.heaterTypes.transform(heater.type);
48
- switch (htype.name) {
49
- case 'hybrid':
50
- heater.economyTime = msg.extractPayloadByte(3);
51
- heater.maxBoostTemp = msg.extractPayloadByte(4);
52
- break;
53
- }
54
- }
55
- }
56
- public static processHybridStatus(msg: Inbound) {
57
- //[165, 0, 16, 112, 113, 10][1, 1, 0, 0, 0, 0, 0, 0, 0, 0][1, 162]
58
- let heater: Heater = sys.heaters.getItemByAddress(msg.source);
59
- let sheater = state.heaters.getItemById(heater.id);
60
- sheater.isOn = msg.extractPayloadByte(0) > 0;
61
- if (heater.master > 0) {
62
- let sbody = sheater.bodyId > 0 ? state.temps.bodies.getItemById(sheater.bodyId) : undefined;
63
- if (typeof sbody !== 'undefined') {
64
- switch (msg.extractPayloadByte(1)) {
65
- case 1:
66
- sbody.heatStatus = sys.board.valueMaps.heatStatus.getValue('hpheat');
67
- break;
68
- case 2:
69
- sbody.heatStatus = sys.board.valueMaps.heatStatus.getValue('heater');
70
- break;
71
- case 3:
72
- sbody.heatStatus = sys.board.valueMaps.heatStatus.getValue('dual');
73
- break;
74
- case 4:
75
- sbody.heatStatus = sys.board.valueMaps.heatStatus.getValue('dual');
76
- break;
77
- default:
78
- sbody.heatStatus = sys.board.valueMaps.heatStatus.getValue('off');
79
- break;
80
- }
81
- }
82
- }
83
- sheater.commStatus = 0;
84
- state.equipment.messages.removeItemByCode(`heater:${heater.id}:comms`);
85
- msg.isProcessed = true;
86
- }
87
- public static processUltraTempStatus(msg: Inbound) {
88
- // RKS: 07-03-21 - We only know byte 2 at this point for Ultratemp for the 115 message we are processing here. The
89
- // byte description
90
- // ------------------------------------------------
91
- // 0 Unknown (always seems to be 160 for response)
92
- // 1 Unknown (always 1)
93
- // 2 Current heater status 0=off, 1=heat, 2=cool
94
- // 3-9 Unknown
95
-
96
- // 114 message - outbound response
97
- //[165, 0, 112, 16, 114, 10][144, 0, 0, 0, 0, 0, 0, 0, 0, 0][2, 49] // OCP to Heater
98
- // byte description
99
- // ------------------------------------------------
100
- // 0 Unknown (always seems to be 144 for request)
101
- // 1 Current heater status 0=off, 1=heat, 2=cool
102
- // 3 Believed to be ofset temp
103
- // 4-9 Unknown
104
-
105
- // byto 0: always seems to be 144 for outbound
106
- // byte 1: Sets heater mode to 0 = Off 1 = Heat 2 = Cool
107
- //[165, 0, 16, 112, 115, 10][160, 1, 0, 3, 0, 0, 0, 0, 0, 0][2, 70] // Heater Reply
108
- let heater: Heater = sys.heaters.getItemByAddress(msg.source);
109
- let sheater = state.heaters.getItemById(heater.id);
110
- let byte = msg.extractPayloadByte(2);
111
- sheater.isOn = byte >= 1;
112
- sheater.isCooling = byte === 2;
113
- sheater.commStatus = 0;
114
- state.equipment.messages.removeItemByCode(`heater:${heater.id}:comms`);
115
- msg.isProcessed = true;
116
- }
117
- public static processMasterTempStatus(msg: Inbound) {
118
- //[255, 0, 255][165, 0, 16, 112, 116, 23][67, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 10, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0][2, 66]
119
- // Byte 1 is the indicator to which setpoint it is heating to.
120
- // Byte 8 increments over time when the heater is on.
121
- // Byte 13 looks like the mode the heater is in for instance it is in cooldown mode.
122
- // 0 = Normal
123
- // 2 = ??????
124
- // 6 = Cooldown
125
- // Byte 14 looks like the cooldown delay in minutes.
126
- let heater: Heater = sys.heaters.getItemByAddress(msg.source);
127
- let sheater = state.heaters.getItemById(heater.id);
128
- let byte = msg.extractPayloadByte(1);
129
- sheater.isOn = byte >= 1;
130
- sheater.isCooling = false;
131
- sheater.commStatus = 0;
132
- state.equipment.messages.removeItemByCode(`heater:${heater.id}:comms`);
133
- msg.isProcessed = true;
134
- }
135
-
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 { Inbound, Protocol } from "../Messages";
19
+ import { state, BodyTempState, HeaterState } from "../../../State";
20
+ import { sys, ControllerType, Heater } from "../../../Equipment";
21
+ import { logger } from '../../../../logger/Logger';
22
+
23
+ export class HeaterStateMessage {
24
+ public static process(msg: Inbound) {
25
+ if (msg.protocol === Protocol.Heater) {
26
+ switch (msg.action) {
27
+ case 112: // This is a message from a master controlling MasterTemp or UltraTemp ETi
28
+ break;
29
+ case 114: // This is a message from a master controlling UltraTemp
30
+ msg.isProcessed = true;
31
+ break;
32
+ case 113:
33
+ HeaterStateMessage.processHybridStatus(msg);
34
+ break;
35
+ case 116:
36
+ HeaterStateMessage.processMasterTempStatus(msg);
37
+ break;
38
+ case 115:
39
+ HeaterStateMessage.processUltraTempStatus(msg);
40
+ break;
41
+ }
42
+ }
43
+ }
44
+ public static processHeaterCommand(msg: Inbound) {
45
+ let heater: Heater = sys.heaters.getItemByAddress(msg.source);
46
+ // At this point there is no other configuration data for ET
47
+ if (sys.controllerType === ControllerType.EasyTouch) {
48
+ let htype = sys.board.valueMaps.heaterTypes.transform(heater.type);
49
+ switch (htype.name) {
50
+ case 'hybrid':
51
+ heater.economyTime = msg.extractPayloadByte(3);
52
+ heater.maxBoostTemp = msg.extractPayloadByte(4);
53
+ break;
54
+ }
55
+ }
56
+ }
57
+ public static processHybridStatus(msg: Inbound) {
58
+ //[165, 0, 16, 112, 113, 10][1, 1, 0, 0, 0, 0, 0, 0, 0, 0][1, 162]
59
+ let heater: Heater = sys.heaters.getItemByAddress(msg.source);
60
+ let sheater = state.heaters.getItemById(heater.id);
61
+ sheater.isOn = msg.extractPayloadByte(0) > 0;
62
+ if (heater.master > 0) {
63
+ let sbody = sheater.bodyId > 0 ? state.temps.bodies.getItemById(sheater.bodyId) : undefined;
64
+ if (typeof sbody !== 'undefined') {
65
+ switch (msg.extractPayloadByte(1)) {
66
+ case 1:
67
+ sbody.heatStatus = sys.board.valueMaps.heatStatus.getValue('hpheat');
68
+ break;
69
+ case 2:
70
+ sbody.heatStatus = sys.board.valueMaps.heatStatus.getValue('heater');
71
+ break;
72
+ case 3:
73
+ sbody.heatStatus = sys.board.valueMaps.heatStatus.getValue('dual');
74
+ break;
75
+ case 4:
76
+ sbody.heatStatus = sys.board.valueMaps.heatStatus.getValue('dual');
77
+ break;
78
+ default:
79
+ sbody.heatStatus = sys.board.valueMaps.heatStatus.getValue('off');
80
+ break;
81
+ }
82
+ }
83
+ }
84
+ sheater.commStatus = 0;
85
+ state.equipment.messages.removeItemByCode(`heater:${heater.id}:comms`);
86
+ msg.isProcessed = true;
87
+ }
88
+ public static processUltraTempStatus(msg: Inbound) {
89
+ // RKS: 07-03-21 - UltraTemp RS-485 protocol reverse engineering notes.
90
+ // The heat pump communicates via Action 114 (command) / 115 (response) messages.
91
+ //
92
+ // Action 115 - inbound response (heat pump -> controller, heartbeat every ~1s)
93
+ // [165, 0, 16, 112, 115, 10][160, 1, 0, 3, 0, 0, 0, 0, 0, 0][2, 70]
94
+ // byte description
95
+ // ------------------------------------------------
96
+ // 0 Always 160 for response
97
+ // 1 Always 1
98
+ // 2 Current heater status: 0=off, 1=heat, 2=cool
99
+ // 3 Believed to be offset temp
100
+ // 4-9 Unknown
101
+ //
102
+ // Action 114 - outbound command (controller -> heat pump)
103
+ // [165, 0, 112, 16, 114, 10][144, 0, 0, 0, 0, 0, 0, 0, 0, 0][2, 49]
104
+ // byte description
105
+ // ------------------------------------------------
106
+ // 0 Always 144 for request
107
+ // 1 Sets heater mode: 0=off, 1=heat, 2=cool
108
+ // 3 Believed to be offset temp
109
+ // 4-9 Unknown
110
+ let heater: Heater = sys.heaters.getItemByAddress(msg.source);
111
+ if (typeof heater === 'undefined' || !heater.isActive) {
112
+ // Heat pump not configured for this address
113
+ msg.isProcessed = true;
114
+ return;
115
+ }
116
+ let sheater = state.heaters.getItemById(heater.id);
117
+ let byte = msg.extractPayloadByte(2);
118
+ let prevOn = sheater.isOn;
119
+ let prevCooling = sheater.isCooling;
120
+ sheater.isOn = byte >= 1;
121
+ sheater.isCooling = byte === 2;
122
+ sheater.commStatus = 0;
123
+ state.equipment.messages.removeItemByCode(`heater:${heater.id}:comms`);
124
+ if (prevOn !== sheater.isOn || prevCooling !== sheater.isCooling) {
125
+ logger.info(`UltraTemp heartbeat: src=${msg.source} status=${byte} (${byte === 0 ? 'OFF' : byte === 1 ? 'HEAT' : 'COOL'}) heater=${heater.name}`);
126
+ }
127
+ msg.isProcessed = true;
128
+ }
129
+ public static processMasterTempStatus(msg: Inbound) {
130
+ //[255, 0, 255][165, 0, 16, 112, 116, 23][67, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 10, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0][2, 66]
131
+ // Byte 1 is the indicator to which setpoint it is heating to.
132
+ // Byte 8 increments over time when the heater is on.
133
+ // Byte 13 looks like the mode the heater is in for instance it is in cooldown mode.
134
+ // 0 = Normal
135
+ // 2 = ??????
136
+ // 6 = Cooldown
137
+ // Byte 14 looks like the cooldown delay in minutes.
138
+ let heater: Heater = sys.heaters.getItemByAddress(msg.source);
139
+ let sheater = state.heaters.getItemById(heater.id);
140
+ let byte = msg.extractPayloadByte(1);
141
+ sheater.isOn = byte >= 1;
142
+ sheater.isCooling = false;
143
+ sheater.commStatus = 0;
144
+ state.equipment.messages.removeItemByCode(`heater:${heater.id}:comms`);
145
+ msg.isProcessed = true;
146
+ }
147
+
136
148
  }