nodejs-poolcontroller 7.3.1 → 7.6.1

package/web/services/state/State.ts

@@ -15,6 +15,8 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 import * as express from "express";
+import * as extend from "extend";
+
 import { state, ICircuitState, LightGroupState, ICircuitGroupState, ChemicalDoseState } from "../../../controller/State";
 import { sys } from "../../../controller/Equipment";
 import { utils } from '../../../controller/Constants';
@@ -79,7 +81,21 @@ export class StateRoute {
             catch (err) { next(err); }
 
         });
-        app.search('/state/chemController/:id/doseHistory/ph', async (req, res, next) => {
+        app.get('/state/chemController/:id/doseLog/ph', async (req, res, next) => {
+            try {
+                let schem = state.chemControllers.getItemById(parseInt(req.params.id));
+                let filter = req.body || {};
+                let dh = await DataLogger.readFromEndAsync(`chemDosage_${schem.ph.chemType}.log`, ChemicalDoseState, (lineNumber: number, entry: ChemicalDoseState, arr: ChemicalDoseState[]): boolean => {
+                    if (entry.id !== schem.id) return false;
+                    if (typeof filter.lines !== 'undefined' && filter.lines <= arr.length) return false;
+                    if (typeof filter.date !== 'undefined' && entry.end < filter.date) return false;
+                    return true;
+                });
+                return res.status(200).send(dh);
+            }
+            catch (err) { next(err); }
+        });
+        app.search('/state/chemController/:id/doseLog/ph', async (req, res, next) => {
             try {
                 let schem = state.chemControllers.getItemById(parseInt(req.params.id));
                 let filter = req.body || {};
@@ -93,6 +109,34 @@ export class StateRoute {
             }
             catch (err) { next(err); }
         });
+        app.get('/state/chemController/:id/doseLog/orp', async (req, res, next) => {
+            try {
+                let schem = state.chemControllers.getItemById(parseInt(req.params.id));
+                let filter = req.body || {};
+                let dh = await DataLogger.readFromEndAsync(`chemDosage_orp.log`, ChemicalDoseState, (lineNumber: number, entry: ChemicalDoseState, arr: ChemicalDoseState[]): boolean => {
+                    if (entry.id !== schem.id) return false;
+                    if (typeof filter.lines !== 'undefined' && filter.lines <= arr.length) return false;
+                    if (typeof filter.date !== 'undefined' && entry.end < filter.date) return false;
+                    return true;
+                });
+                return res.status(200).send(dh);
+            }
+            catch (err) { next(err); }
+        });
+        app.search('/state/chemController/:id/doseLog/orp', async (req, res, next) => {
+            try {
+                let schem = state.chemControllers.getItemById(parseInt(req.params.id));
+                let filter = req.body || {};
+                let dh = DataLogger.readFromEnd(`chemDosage_orp.log`, ChemicalDoseState, (lineNumber: number, entry: ChemicalDoseState, arr: ChemicalDoseState[]): boolean => {
+                    if (entry.id !== schem.id) return;
+                    if (typeof filter.lines !== 'undefined' && filter.lines <= arr.length) return false;
+                    if (typeof filter.date !== 'undefined' && entry.end < filter.date) return false;
+                    return true;
+                });
+                return res.status(200).send(dh);
+            }
+            catch (err) { next(err); }
+        });
         app.put('/state/chemController/cancelDosing', async (req, res, next) => {
             try {
                 let schem = await sys.board.chemControllers.cancelDosingAsync(req.body);
@@ -109,7 +153,7 @@ export class StateRoute {
         });
 
         app.get('/state/chlorinator/:id', (req, res) => {
-            res.status(200).send(state.chlorinators.getItemById(parseInt(req.params.id, 10)).get());
+            res.status(200).send(state.chlorinators.getItemById(parseInt(req.params.id, 10), false).getExtended());
         });
         app.get('/state/circuit/:id', (req, res) => {
             res.status(200).send(state.circuits.getItemById(parseInt(req.params.id, 10)).get());
@@ -170,7 +214,44 @@ export class StateRoute {
                return res.status(200).send(theme.get(true));
             } 
             catch (err) { next(err); }
-        }); 
+        });
+        app.put('/state/light/setTheme', async (req, res, next) => {
+            try {
+                let theme = await state.circuits.setLightThemeAsync(parseInt(req.body.id, 10), sys.board.valueMaps.lightThemes.encode(req.body.theme));
+                return res.status(200).send(theme.get(true));
+            }
+            catch (err) { next(err); }
+        });
+
+        app.put('/state/light/runCommand', async (req, res, next) => {
+            try {
+                let slight = await sys.board.circuits.runLightCommandAsync(req.body);
+                return res.status(200).send(slight.get(true));
+            }
+            catch (err) { next(err); }
+        });
+        app.put('/state/light/:id/colorHold', async (req, res, next) => {
+            try {
+                let slight = await sys.board.circuits.runLightCommandAsync({ id: parseInt(req.params.id, 10), command: 'colorhold' });
+                return res.status(200).send(slight.get(true));
+            }
+            catch (err) { next(err); }
+        });
+        app.put('/state/light/:id/colorRecall', async (req, res, next) => {
+            try {
+                let slight = await sys.board.circuits.runLightCommandAsync({ id: parseInt(req.params.id, 10), command: 'colorecall' });
+                return res.status(200).send(slight.get(true));
+            }
+            catch (err) { next(err); }
+        });
+        app.put('/state/light/:id/lightThumper', async (req, res, next) => {
+            try {
+                let slight = await sys.board.circuits.runLightCommandAsync({ id: parseInt(req.params.id, 10), command: 'lightthumper' });
+                return res.status(200).send(slight.get(true));
+            }
+            catch (err) { next(err); }
+        });
+
 /*         app.put('/state/intellibrite/setTheme', (req, res) => {
             let id = sys.board.equipmentIds.circuitGroups.start; 
             if (typeof req.body.theme !== 'undefined') id = parseInt(req.body.id, 10);
@@ -229,7 +310,7 @@ export class StateRoute {
                 if (typeof req.body.heatSetpoint !== 'undefined' && !isNaN(parseInt(req.body.heatSetpoint, 10)))
                     await sys.board.bodies.setHeatSetpointAsync(body, parseInt(req.body.heatSetpoint, 10));
                 else if (typeof req.body.setPoint !== 'undefined' && !isNaN(parseInt(req.body.setPoint, 10)))
-                    await sys.board.bodies.setHeatSetpointAsync(body, parseInt(req.body.heatSetpoint, 10));
+                    await sys.board.bodies.setHeatSetpointAsync(body, parseInt(req.body.setpoint, 10));
                 let tbody = state.temps.bodies.getItemById(body.id);
                 return res.status(200).send(tbody.get(true));
             } catch (err) { next(err); }
@@ -286,27 +367,57 @@ export class StateRoute {
             }
             catch (err) { next(err); }
         });
+        app.put('/state/lightGroup/runCommand', async (req, res, next) => {
+            try {
+                let sgroup = await sys.board.circuits.runLightGroupCommandAsync(req.body);
+                return res.status(200).send(sgroup.get(true));
+            }
+            catch (err) { next(err); }
+        });
         app.put('/state/lightGroup/:id/colorSync', async (req, res, next) => {
             try {
-                let sgroup = await sys.board.circuits.sequenceLightGroupAsync(parseInt(req.params.id, 10), 'sync');
+                let sgroup = await sys.board.circuits.sequenceLightGroupAsync(parseInt(req.params.id, 10), 'colorsync');
                 return res.status(200).send(sgroup.get(true));
             }
             catch (err) { next(err); }
         });
         app.put('/state/lightGroup/:id/colorSet', async (req, res, next) => {
             try {
-                let sgroup = await sys.board.circuits.sequenceLightGroupAsync(parseInt(req.params.id, 10), 'set');
+                let sgroup = await sys.board.circuits.sequenceLightGroupAsync(parseInt(req.params.id, 10), 'colorset');
                 return res.status(200).send(sgroup.get(true));
             }
             catch (err) { next(err); }
         });
         app.put('/state/lightGroup/:id/colorSwim', async (req, res, next) => {
             try {
-                let sgroup = await sys.board.circuits.sequenceLightGroupAsync(parseInt(req.params.id, 10), 'swim');
+                let sgroup = await sys.board.circuits.sequenceLightGroupAsync(parseInt(req.params.id, 10), 'colorswim');
+                return res.status(200).send(sgroup.get(true));
+            }
+            catch (err) { next(err); }
+        });
+        app.put('/state/lightGroup/:id/colorHold', async (req, res, next) => {
+            try {
+                let sgroup = await sys.board.circuits.runLightGroupCommandAsync({ id: parseInt(req.params.id, 10), command: 'colorhold' });
+                return res.status(200).send(sgroup.get(true));
+            }
+            catch (err) { next(err); }
+        });
+        app.put('/state/lightGroup/:id/colorRecall', async (req, res, next) => {
+            try {
+                let sgroup = await sys.board.circuits.runLightGroupCommandAsync({ id: parseInt(req.params.id, 10), command: 'colorrecall' });
+                return res.status(200).send(sgroup.get(true));
+            }
+            catch (err) { next(err); }
+        });
+        app.put('/state/lightGroup/:id/lightThumper', async (req, res, next) => {
+            try {
+                let sgroup = await sys.board.circuits.runLightGroupCommandAsync({ id: parseInt(req.params.id, 10), command: 'lightthumper' });
                 return res.status(200).send(sgroup.get(true));
             }
             catch (err) { next(err); }
         });
+
+
         app.get('/state/emitAll', (req, res) => {
             res.status(200).send(state.emitAllEquipmentChanges());
         });

package/web/services/state/StateSocket.ts

@@ -74,6 +74,7 @@ export class StateSocket {
             }
             catch (err) { logger.error(err); }
         });
+        
         sock.on('/chlorinator', async (data: any) => {
             try {
                 data = JSON.parse(data);
@@ -99,6 +100,22 @@ export class StateSocket {
             }
             catch (err) { logger.error(err); }
         });
+        sock.on('/filter', async (data: any) => {
+            try {
+                data = JSON.parse(data);
+                let id = parseInt(data.id, 10);
+                let filter = sys.filters.find(elem => elem.id === id);
+                if (typeof filter !== 'undefined' && filter.isActive && !isNaN(filter.id)) {
+                    let sfilter = state.filters.getItemById(filter.id, filter.isActive)
+                    let pu = sys.board.valueMaps.pressureUnits.transform(filter.pressureUnits);
+                    if (typeof data.pressure !== 'undefined')
+                        await sys.board.filters.setFilterPressure(filter.id, data.pressure, data.pressureUnits || pu.name);
+                    sfilter.emitEquipmentChange();
+                }
+
+                
+            } catch (err) { logger.error(err); }
+        });
         sock.on('/chemController', async (data: any) => {
             try {
                 //console.log(`chemController: ${data}`);
@@ -144,7 +161,7 @@ export class StateSocket {
                         if (typeof data.orpTank.units === 'string') scontroller.orp.tank.units = controller.orp.tank.units = data.orpTank.units;
                     }
 
-                    // Need to build this out to include the type of controller.  If this is Homegrown or REM Chem we
+                    // Need to build this out to include the type of controller.  If this is REM Chem we
                     // will send the whole rest of the nut over to it.  Intellichem will only let us
                     // set specific values.
                     if (controller.type === 3) {

package/web/services/utilities/Utilities.ts

@@ -1,43 +1,43 @@
-/*  nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-import * as express from 'express';
-import { SsdpServer} from '../../Server';
-import { state } from "../../../controller/State";
-import { sys } from "../../../controller/Equipment";
-
-const extend = require("extend");
-export class UtilitiesRoute {
-
-    public static initRoutes(app: express.Application) {
-        app.get('/device', function(req, res) {
-            // there's got to be a better way to get this than instantiating SsdpServer() again.
-            // RKS: There was I made the function static.
-            let xml = SsdpServer.deviceXML();
-            res.status(200).set('Content-Type', 'text/xml').send(xml);
-        });
-        app.get('/extended/:section', (req, res) => {
-            let cfg = sys.getSection(req.params.section);
-            let st = state.getState(req.params.section);
-            let arr = [];
-            for (let i = 0; i < cfg.length; i++){
-                let p = extend(true, {}, cfg[i], st.find(s => s.id === cfg[i].id));
-                arr.push(p);
-            }
-            return res.status(200).send(arr);
-        });
-    }
+/*  nodejs-poolController.  An application to control pool equipment.
+Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import * as express from 'express';
+import { SsdpServer} from '../../Server';
+import { state } from "../../../controller/State";
+import { sys } from "../../../controller/Equipment";
+
+const extend = require("extend");
+export class UtilitiesRoute {
+
+    public static initRoutes(app: express.Application) {
+        app.get('/device', function(req, res) {
+            // there's got to be a better way to get this than instantiating SsdpServer() again.
+            // RKS: There was I made the function static.
+            let xml = SsdpServer.deviceXML();
+            res.status(200).set('Content-Type', 'text/xml').send(xml);
+        });
+        app.get('/extended/:section', (req, res) => {
+            let cfg = sys.getSection(req.params.section);
+            let st = state.getState(req.params.section);
+            let arr = [];
+            for (let i = 0; i < cfg.length; i++){
+                let p = extend(true, {}, cfg[i], st.find(s => s.id === cfg[i].id));
+                arr.push(p);
+            }
+            return res.status(200).send(arr);
+        });
+    }
 }