nodejs-poolcontroller 7.6.0 → 7.6.1

package/web/services/config/Config.ts

@@ -605,15 +605,15 @@ export class ConfigRoute {
             let themes = typeof circuit !== 'undefined' && typeof circuit.getLightThemes === 'function' ? circuit.getLightThemes(circuit.type) : [];
             return res.status(200).send(themes);
         });
+        app.get('/config/circuit/:id/lightCommands', (req, res) => {
+            let circuit = sys.circuits.getInterfaceById(parseInt(req.params.id, 10));
+            let commands = typeof circuit !== 'undefined' && typeof circuit.getLightThemes === 'function' ? circuit.getLightCommands(circuit.type) : [];
+            return res.status(200).send(commands);
+        });
+
         app.get('/config/chlorinator/:id', (req, res) => {
             return res.status(200).send(sys.chlorinators.getItemById(parseInt(req.params.id, 10)).get());
         });
-        //app.put('/config/chlorinator', (req, res) => {
-        //    let chlor = sys.chlorinators.getItemById(parseInt(req.body.id, 10), true);
-        //    sys.board.chlorinator.setChlorProps(chlor, req.body);
-        //    // if (chlor.isVirtual) { sys.board.virtualChlorinatorController.start(); }
-        //    return res.status(200).send(sys.chlorinators.getItemById(parseInt(req.params.id, 10)).get());
-        //});
         app.get('/config/chlorinators/search', async (req, res, next) => {
             // Change the options for the pool.
             try {
@@ -624,103 +624,6 @@ export class ConfigRoute {
                 next(err);
             }
         });
-        /*         app.get('/config/pump/:id/circuits', (req, res) => {
-                    return res.status(200).send(sys.pumps.getItemById(parseInt(req.params.id, 10)).get().circuits);
-                });
-                app.get('/config/pump/availableCircuits', (req, res) => {
-                    return res.status(200).send(sys.board.pumps.availableCircuits());
-                });
-                app.get('/config/pump/:id/circuit/:circuitid', (req, res) => {
-                    return res.status(200).send(sys.pumps.getItemById(parseInt(req.params.id, 10)).get().circuits[parseInt(req.params.circuitid, 10)]);
-                });
-                app.get('/config/pump/:id/nextAvailablePumpCircuit', (req, res) => {
-                    // if no pumpCircuitId is available, 0 will be returned
-                    let _id = sys.pumps.getItemById(parseInt(req.params.id, 10)).nextAvailablePumpCircuit();
-                    return res.status(200).send(_id.toString());
-                }); */
-        /*
-        app.put('/config/pump/:id/pumpCircuit', (req, res) => {
-            // if no pumpCircuitId is specified, set it as 0 and take the next available one
-            req.url = `${ req.url }/0`;
-            req.next();
-        });
-         app.put('/config/pump/:id/pumpCircuit/:pumpCircuitId', (req, res) => {
-            // RSG - do we want a /config/pump/:id/pumpCircuit/ that will just assume the next circuit?
-            let pump = sys.pumps.getItemById(parseInt(req.params.id, 10));
-            let _pumpCircuitId = parseInt(req.params.pumpCircuitId, 10);
-            let _circuit = parseInt(req.body.circuit, 10);
-            let _rate = parseInt(req.body.rate, 10);
-            let _units = parseInt(req.body.units, 10) || pump.defaultUnits;
-            let pumpCircuit = {
-                pump: parseInt(req.params.id, 10),
-                pumpCircuitId: isNaN(_pumpCircuitId) ? undefined : _pumpCircuitId,
-                circuit: isNaN(_circuit) ? undefined : _circuit,
-                rate: isNaN(_rate) ? undefined : _rate,
-                units: isNaN(_units) ? undefined : _units
-            };
-            let { result, reason } = pump.setPumpCircuit(pumpCircuit);
-            if (result === 'OK')
-                return res.status(200).send({ result: result, reason: reason });
-            else
-                return res.status(500).send({ result: result, reason: reason });
-        }); */
-        /*         app.delete('/config/pump/:id/pumpCircuit/:pumpCircuitId', (req, res) => {
-                    let pump = sys.pumps.getItemById(parseInt(req.params.id, 10));
-                    // pump.circuits.removeItemById(parseInt(req.params.pumpCircuitId, 10));
-                    pump.deletePumpCircuit(parseInt(req.params.pumpCircuitId, 10));
-                    return res.status(200).send('OK');
-                }); */
-        /*         app.get('/config/pump/types', (req, res) => {
-                    let pumpTypes = sys.board.pumps.getPumpTypes();
-                    return res.status(200).send(pumpTypes);
-                });
-                app.get('/config/pump/units', (req, res) => {
-                    // get all units for all system board
-                    let pumpTypes = sys.board.pumps.getCircuitUnits();
-                    return res.status(200).send(pumpTypes);
-                });
-                app.get('/config/pump/:id/units', (req, res) => {
-                    // get units for all specific pump types
-                    // need to coorerce into array if only a single unit is returned; by default getExtended will return an array
-                    // if there is 1+ object so this creates parity
-                    let pump = sys.pumps.getItemById(parseInt(req.params.id, 10));
-                    let pumpTypes = sys.board.pumps.getCircuitUnits(pump);
-                    if (!Array.isArray(pumpTypes)) pumpTypes = [pumpTypes];
-                    return res.status(200).send(pumpTypes);
-                });
-                app.put('/config/pump/:pumpId/type', (req, res) => {
-                    const _type = parseInt(req.body.pumpType, 10);
-                    const _pumpId = parseInt(req.params.pumpId, 10);
-                    // RG - this was left as it's own end point because trying to combine changing the pump type (which requires resetting the pump values) while simultaneously setting new pump values was tricky. 
-                    let pump = sys.pumps.getItemById(_pumpId);
-                    if (sys.controllerType === ControllerType.Virtual) {
-                        pump.isVirtual = true;
-                    }
-                    if (_type !== pump.type) {
-                        pump.setType(_type);
-                    }
-                    return res.status(200).send('OK');
-                }); */
-        /*       app.get('/config/pump/:pumpId', (req, res) => {
-                  let pump = sys.pumps.getItemById(parseInt(req.params.pumpId, 10)).get(true);
-                  return res.status(200).send(pump);
-              });
-              app.put('/config/pump/:pumpId', (req, res) => {
-                  // this will change the pump type
-                  let _type = parseInt(req.body.pumpType, 10);
-                  let pump = sys.pumps.getItemById(parseInt(req.params.pumpId, 10));
-                  if (sys.controllerType === ControllerType.Virtual) {
-                      // if virtualController, add the virtual pump
-                      pump.isVirtual = true;
-                  }
-      
-                  if (_type !== pump.type && typeof _type !== 'undefined') {
-                      pump.setType(_type);
-                  }
-                  // get a new instance of the pump here because setType will remove/add a new instance
-                  if (Object.keys(req.body).length) sys.pumps.getItemById(parseInt(req.params.pumpId, 10)).setPump(req.body);
-                  return res.status(200).send('OK');
-              }); */
         app.delete('/config/pump/:pumpId', (req, res) => {
             let pump = sys.pumps.getItemById(parseInt(req.params.pumpId, 10));
             if (pump.type === 0) {
@@ -738,13 +641,12 @@ export class ConfigRoute {
         });
         app.get('/config/lightGroups/themes', (req, res) => {
             // RSG: is this and /config/circuit/:id/lightThemes both needed?
-
-            // if (sys.controllerType === ControllerType.IntelliCenter) {
             let grp = sys.lightGroups.getItemById(parseInt(req.body.id, 10));
             return res.status(200).send(grp.getLightThemes());
-            // }
-            // else
-            //     return res.status(200).send(sys.intellibrite.getLightThemes());
+        });
+        app.get('/config/lightGroups/commands', (req, res) => {
+            let grp = sys.lightGroups.getItemById(parseInt(req.body.id, 10));
+            return res.status(200).send(grp.getLightCommands());
         });
         app.get('/config/lightGroup/:id', (req, res) => {
             // if (sys.controllerType === ControllerType.IntelliCenter) {

package/web/services/state/State.ts

@@ -214,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);
@@ -330,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/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);
+        });
+    }
 }