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.
- package/.eslintrc.json +44 -44
- package/.github/ISSUE_TEMPLATE/bug_report.md +52 -52
- package/CONTRIBUTING.md +74 -74
- package/Changelog +215 -215
- package/Dockerfile +17 -17
- package/Gruntfile.js +40 -40
- package/LICENSE +661 -661
- package/README.md +191 -186
- package/app.ts +0 -0
- package/config/Config.ts +24 -2
- package/config/VersionCheck.ts +27 -12
- package/config copy.json +299 -299
- package/controller/Constants.ts +0 -0
- package/controller/Equipment.ts +2459 -2405
- package/controller/Errors.ts +180 -180
- package/controller/Lockouts.ts +436 -422
- package/controller/State.ts +51 -26
- package/controller/boards/BoardFactory.ts +45 -45
- package/controller/boards/EasyTouchBoard.ts +2653 -2537
- package/controller/boards/IntelliCenterBoard.ts +4230 -4034
- package/controller/boards/IntelliComBoard.ts +63 -63
- package/controller/boards/IntelliTouchBoard.ts +241 -241
- package/controller/boards/NixieBoard.ts +1675 -1660
- package/controller/boards/SystemBoard.ts +4697 -4463
- package/controller/comms/Comms.ts +138 -1
- package/controller/comms/messages/Messages.ts +3 -5
- package/controller/comms/messages/config/ChlorinatorMessage.ts +1 -1
- package/controller/comms/messages/config/CircuitGroupMessage.ts +0 -0
- package/controller/comms/messages/config/CircuitMessage.ts +0 -0
- package/controller/comms/messages/config/ConfigMessage.ts +0 -0
- package/controller/comms/messages/config/CoverMessage.ts +0 -0
- package/controller/comms/messages/config/CustomNameMessage.ts +30 -30
- package/controller/comms/messages/config/EquipmentMessage.ts +0 -0
- package/controller/comms/messages/config/ExternalMessage.ts +9 -7
- package/controller/comms/messages/config/FeatureMessage.ts +0 -0
- package/controller/comms/messages/config/GeneralMessage.ts +0 -0
- package/controller/comms/messages/config/HeaterMessage.ts +0 -20
- package/controller/comms/messages/config/IntellichemMessage.ts +0 -0
- package/controller/comms/messages/config/OptionsMessage.ts +25 -1
- package/controller/comms/messages/config/PumpMessage.ts +0 -0
- package/controller/comms/messages/config/RemoteMessage.ts +0 -0
- package/controller/comms/messages/config/ScheduleMessage.ts +347 -342
- package/controller/comms/messages/config/SecurityMessage.ts +0 -0
- package/controller/comms/messages/config/ValveMessage.ts +0 -0
- package/controller/comms/messages/status/ChlorinatorStateMessage.ts +0 -0
- package/controller/comms/messages/status/EquipmentStateMessage.ts +1 -1
- package/controller/comms/messages/status/HeaterStateMessage.ts +86 -86
- package/controller/comms/messages/status/IntelliChemStateMessage.ts +445 -397
- package/controller/comms/messages/status/IntelliValveStateMessage.ts +35 -35
- package/controller/comms/messages/status/PumpStateMessage.ts +0 -0
- package/controller/comms/messages/status/VersionMessage.ts +0 -0
- package/controller/nixie/Nixie.ts +162 -162
- package/controller/nixie/NixieEquipment.ts +103 -103
- package/controller/nixie/bodies/Body.ts +120 -120
- package/controller/nixie/bodies/Filter.ts +135 -135
- package/controller/nixie/chemistry/ChemController.ts +2498 -2398
- package/controller/nixie/chemistry/Chlorinator.ts +314 -314
- package/controller/nixie/circuits/Circuit.ts +248 -245
- package/controller/nixie/heaters/Heater.ts +648 -600
- package/controller/nixie/pumps/Pump.ts +661 -661
- package/controller/nixie/schedules/Schedule.ts +257 -257
- package/controller/nixie/valves/Valve.ts +170 -170
- package/defaultConfig.json +286 -286
- package/issue_template.md +51 -51
- package/logger/DataLogger.ts +448 -448
- package/logger/Logger.ts +0 -0
- package/package.json +56 -56
- package/tsconfig.json +25 -25
- package/web/Server.ts +2 -2
- package/web/bindings/influxDB.json +1021 -981
- package/web/bindings/mqtt.json +654 -654
- package/web/bindings/mqttAlt.json +684 -684
- package/web/bindings/rulesManager.json +54 -54
- package/web/bindings/smartThings-Hubitat.json +31 -31
- package/web/bindings/valveRelays.json +20 -20
- package/web/bindings/vera.json +25 -25
- package/web/interfaces/baseInterface.ts +136 -136
- package/web/interfaces/httpInterface.ts +124 -124
- package/web/interfaces/influxInterface.ts +245 -241
- package/web/interfaces/mqttInterface.ts +475 -475
- package/web/services/config/Config.ts +10 -108
- package/web/services/config/ConfigSocket.ts +0 -0
- package/web/services/state/State.ts +71 -4
- package/web/services/state/StateSocket.ts +0 -0
- package/web/services/utilities/Utilities.ts +42 -42
package/logger/Logger.ts
CHANGED
|
File without changes
|
package/package.json
CHANGED
|
@@ -1,56 +1,56 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "nodejs-poolcontroller",
|
|
3
|
-
"version": "7.6.
|
|
4
|
-
"description": "nodejs-poolController",
|
|
5
|
-
"main": "app.js",
|
|
6
|
-
"author": {
|
|
7
|
-
"name": "Russell Goldin",
|
|
8
|
-
"name2": "Robert Strouse"
|
|
9
|
-
},
|
|
10
|
-
"license": "GNU Affero General Public License v3.0",
|
|
11
|
-
"repository": {
|
|
12
|
-
"type": "git",
|
|
13
|
-
"url": "https://github.com/tagyoureit/nodejs-poolController.git"
|
|
14
|
-
},
|
|
15
|
-
"scripts": {
|
|
16
|
-
"start": "npm run build && node dist/app.js",
|
|
17
|
-
"start:cached": "node dist/app.js",
|
|
18
|
-
"build": "tsc",
|
|
19
|
-
"watch": "tsc -w"
|
|
20
|
-
},
|
|
21
|
-
"dependencies": {
|
|
22
|
-
"@influxdata/influxdb-client": "^1.
|
|
23
|
-
"eslint-config-promise": "^2.0.2",
|
|
24
|
-
"express": "^4.17.
|
|
25
|
-
"extend": "^3.0.2",
|
|
26
|
-
"jszip": "^3.7.1",
|
|
27
|
-
"mqtt": "^4.
|
|
28
|
-
"multer": "^1.4.
|
|
29
|
-
"multicast-dns": "^7.2.
|
|
30
|
-
"node-ssdp": "^4.0.1",
|
|
31
|
-
"serialport": "^9.2.
|
|
32
|
-
"socket.io": "^4.
|
|
33
|
-
"socket.io-client": "^4.
|
|
34
|
-
"source-map-support": "^0.5.
|
|
35
|
-
"winston": "^3.
|
|
36
|
-
},
|
|
37
|
-
"devDependencies": {
|
|
38
|
-
"@types/express": "^4.17.13",
|
|
39
|
-
"@types/extend": "^3.0.1",
|
|
40
|
-
"@types/multer": "^1.4.7",
|
|
41
|
-
"@types/node": "^12.20.
|
|
42
|
-
"@typescript-eslint/eslint-plugin": "^
|
|
43
|
-
"@typescript-eslint/parser": "^
|
|
44
|
-
"eslint": "^
|
|
45
|
-
"eslint-config-defaults": "^9.0.0",
|
|
46
|
-
"eslint-config-standard": "^16.0.3",
|
|
47
|
-
"eslint-plugin-import": "^2.
|
|
48
|
-
"eslint-plugin-node": "^11.1.0",
|
|
49
|
-
"eslint-plugin-promise": "^
|
|
50
|
-
"eslint-plugin-standard": "^5.0.0",
|
|
51
|
-
"grunt": "^1.4.1",
|
|
52
|
-
"grunt-banner": "^0.6.0",
|
|
53
|
-
"ts-node": "^10.
|
|
54
|
-
"typescript": "^4.
|
|
55
|
-
}
|
|
56
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"name": "nodejs-poolcontroller",
|
|
3
|
+
"version": "7.6.1",
|
|
4
|
+
"description": "nodejs-poolController",
|
|
5
|
+
"main": "app.js",
|
|
6
|
+
"author": {
|
|
7
|
+
"name": "Russell Goldin",
|
|
8
|
+
"name2": "Robert Strouse"
|
|
9
|
+
},
|
|
10
|
+
"license": "GNU Affero General Public License v3.0",
|
|
11
|
+
"repository": {
|
|
12
|
+
"type": "git",
|
|
13
|
+
"url": "https://github.com/tagyoureit/nodejs-poolController.git"
|
|
14
|
+
},
|
|
15
|
+
"scripts": {
|
|
16
|
+
"start": "npm run build && node dist/app.js",
|
|
17
|
+
"start:cached": "node dist/app.js",
|
|
18
|
+
"build": "tsc",
|
|
19
|
+
"watch": "tsc -w"
|
|
20
|
+
},
|
|
21
|
+
"dependencies": {
|
|
22
|
+
"@influxdata/influxdb-client": "^1.22.0",
|
|
23
|
+
"eslint-config-promise": "^2.0.2",
|
|
24
|
+
"express": "^4.17.2",
|
|
25
|
+
"extend": "^3.0.2",
|
|
26
|
+
"jszip": "^3.7.1",
|
|
27
|
+
"mqtt": "^4.3.5",
|
|
28
|
+
"multer": "^1.4.4",
|
|
29
|
+
"multicast-dns": "^7.2.4",
|
|
30
|
+
"node-ssdp": "^4.0.1",
|
|
31
|
+
"serialport": "^9.2.8",
|
|
32
|
+
"socket.io": "^4.4.1",
|
|
33
|
+
"socket.io-client": "^4.4.1",
|
|
34
|
+
"source-map-support": "^0.5.21",
|
|
35
|
+
"winston": "^3.5.1"
|
|
36
|
+
},
|
|
37
|
+
"devDependencies": {
|
|
38
|
+
"@types/express": "^4.17.13",
|
|
39
|
+
"@types/extend": "^3.0.1",
|
|
40
|
+
"@types/multer": "^1.4.7",
|
|
41
|
+
"@types/node": "^12.20.43",
|
|
42
|
+
"@typescript-eslint/eslint-plugin": "^5.11.0",
|
|
43
|
+
"@typescript-eslint/parser": "^5.11.0",
|
|
44
|
+
"eslint": "^8.8.0",
|
|
45
|
+
"eslint-config-defaults": "^9.0.0",
|
|
46
|
+
"eslint-config-standard": "^16.0.3",
|
|
47
|
+
"eslint-plugin-import": "^2.25.4",
|
|
48
|
+
"eslint-plugin-node": "^11.1.0",
|
|
49
|
+
"eslint-plugin-promise": "^6.0.0",
|
|
50
|
+
"eslint-plugin-standard": "^5.0.0",
|
|
51
|
+
"grunt": "^1.4.1",
|
|
52
|
+
"grunt-banner": "^0.6.0",
|
|
53
|
+
"ts-node": "^10.5.0",
|
|
54
|
+
"typescript": "^4.5.5"
|
|
55
|
+
}
|
|
56
|
+
}
|
package/tsconfig.json
CHANGED
|
@@ -1,25 +1,25 @@
|
|
|
1
|
-
{
|
|
2
|
-
"compilerOptions": {
|
|
3
|
-
"baseUrl": ".",
|
|
4
|
-
// "paths": { "*": [ "@types/*" ] },
|
|
5
|
-
"target":"esnext",
|
|
6
|
-
"module":"commonjs",
|
|
7
|
-
"noImplicitAny": false,
|
|
8
|
-
"removeComments": true,
|
|
9
|
-
"preserveConstEnums": true,
|
|
10
|
-
"sourceMap": true,
|
|
11
|
-
"outDir": "dist",
|
|
12
|
-
"moduleResolution": "node",
|
|
13
|
-
"allowJs": false,
|
|
14
|
-
"allowSyntheticDefaultImports": false,
|
|
15
|
-
"esModuleInterop": false,
|
|
16
|
-
"jsx": "react"
|
|
17
|
-
},
|
|
18
|
-
"include": [
|
|
19
|
-
"web/**/*",
|
|
20
|
-
"logger/**/*",
|
|
21
|
-
"controller/**/*",
|
|
22
|
-
"config/**/*",
|
|
23
|
-
"**/*.ts"
|
|
24
|
-
]
|
|
25
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"compilerOptions": {
|
|
3
|
+
"baseUrl": ".",
|
|
4
|
+
// "paths": { "*": [ "@types/*" ] },
|
|
5
|
+
"target":"esnext",
|
|
6
|
+
"module":"commonjs",
|
|
7
|
+
"noImplicitAny": false,
|
|
8
|
+
"removeComments": true,
|
|
9
|
+
"preserveConstEnums": true,
|
|
10
|
+
"sourceMap": true,
|
|
11
|
+
"outDir": "dist",
|
|
12
|
+
"moduleResolution": "node",
|
|
13
|
+
"allowJs": false,
|
|
14
|
+
"allowSyntheticDefaultImports": false,
|
|
15
|
+
"esModuleInterop": false,
|
|
16
|
+
"jsx": "react"
|
|
17
|
+
},
|
|
18
|
+
"include": [
|
|
19
|
+
"web/**/*",
|
|
20
|
+
"logger/**/*",
|
|
21
|
+
"controller/**/*",
|
|
22
|
+
"config/**/*",
|
|
23
|
+
"**/*.ts"
|
|
24
|
+
]
|
|
25
|
+
}
|
package/web/Server.ts
CHANGED
|
@@ -563,7 +563,7 @@ export class HttpServer extends ProtoServer {
|
|
|
563
563
|
public app: express.Application;
|
|
564
564
|
public server: http.Server;
|
|
565
565
|
public sockServer: SocketIoServer<ClientToServerEvents, ServerToClientEvents>;
|
|
566
|
-
private _sockets: RemoteSocket<ServerToClientEvents>[] = [];
|
|
566
|
+
private _sockets: RemoteSocket<ServerToClientEvents, any>[] = [];
|
|
567
567
|
public emitToClients(evt: string, ...data: any) {
|
|
568
568
|
if (this.isRunning) {
|
|
569
569
|
this.sockServer.emit(evt, ...data);
|
|
@@ -1344,7 +1344,7 @@ export class REMInterfaceServer extends ProtoServer {
|
|
|
1344
1344
|
public sockClient;
|
|
1345
1345
|
protected agent: http.Agent = new http.Agent({ keepAlive: true });
|
|
1346
1346
|
public get isConnected() { return this.sockClient !== 'undefined' && this.sockClient.connected; };
|
|
1347
|
-
private _sockets: RemoteSocket<ServerToClientEvents>[] = [];
|
|
1347
|
+
private _sockets: RemoteSocket<ServerToClientEvents, any>[] = [];
|
|
1348
1348
|
private async sendClientRequest(method: string, url: string, data?: any, timeout: number = 10000): Promise<InterfaceServerResponse> {
|
|
1349
1349
|
try {
|
|
1350
1350
|
|