nodejs-poolcontroller 7.2.0 → 7.5.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';
@@ -44,7 +46,9 @@ export class StateRoute {
         });
         app.put('/state/chemController/manualMix', async (req, res, next) => {
             try {
+                logger.debug(`Starting manual mix`);
                 let schem = await sys.board.chemControllers.manualMixAsync(req.body);
+                logger.debug(`Started manual mix`);
                 return res.status(200).send(schem.getExtended());
             }
             catch (err) { next(err); }
@@ -77,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 || {};
@@ -91,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);
@@ -107,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());
@@ -163,8 +209,8 @@ export class StateRoute {
             catch (err) {next(err);}
         });    
         app.put('/state/circuit/setTheme', async (req, res, next) => {
-           try {
-               let theme = await state.circuits.setLightThemeAsync(parseInt(req.body.id, 10), parseInt(req.body.theme, 10));
+            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); }
@@ -227,7 +273,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); }

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}`);
@@ -132,7 +149,7 @@ export class StateSocket {
                         if (isBodyOn || !controller.orp.flowReadingsOnly) scontroller.orp.level = scontroller.orp.probe.level;
                     }
                     if (typeof data.temperature !== 'undefined') scontroller.ph.probe.temperature = data.temperauture;
-                    if (typeof data.tempUnits !== 'undefined') scontroller.ph.probe.tempUnits = data.tempUnits;
+                    if (typeof data.tempUnits !== 'undefined') scontroller.ph.probe.tempUnits = sys.board.valueMaps.tempUnits.encode(data.tempUnits);
                     if (typeof data.acidTank !== 'undefined') {
                         if (!isNaN(parseFloat(data.acidTank.level))) scontroller.ph.tank.level = parseFloat(data.acidTank.level);
                         if (!isNaN(parseFloat(data.acidTank.capacity))) scontroller.ph.tank.capacity = controller.ph.tank.capacity = parseFloat(data.acidTank.capacity);
@@ -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) {