nodejs-poolcontroller 7.2.0 → 7.5.1

package/web/bindings/influxDB.json

@@ -77,6 +77,66 @@
         }
       ]
     },
+    {
+      "name": "chemicalDose",
+      "points": [
+        {
+          "measurement": "chemicalDose",
+          "description": "Active doses recorded by chemical dosed",
+          "series": {
+            "value": "@bind=data.start;"
+          },
+          "tags": [
+            {
+              "name": "chemical",
+              "value": "@bind=data.chem;"
+            }
+          ],
+          "fields": [
+            {
+              "name": "volumeDosed",
+              "value": "@bind=data.volumeDosed;",
+              "type": "float"
+            },
+            {
+              "name": "timeDosed",
+              "value": "@bind=data.timeDosed;",
+              "type": "float"
+            },
+            {
+              "name": "id",
+              "value": "@bind=data.id;",
+              "type": "int"
+            },
+            {
+              "name": "demand",
+              "value": "@bind=data.demand;",
+              "type": "float"
+            },
+            {
+              "name": "setpoint",
+              "value": "@bind=data.setpoint;",
+              "type": "float"
+            },
+            {
+              "name": "method",
+              "value": "@bind=data.method;",
+              "type": "string"
+            },
+            {
+              "name": "status",
+              "value": "@bind=data.status;",
+              "type": "string"
+            },
+            {
+              "name": "end",
+              "value": "@bind=data.end;",
+              "type": "date"
+            }
+          ]
+        }
+      ]
+    },
     {
       "name": "chemController",
       "vars": {
@@ -127,7 +187,7 @@
             },
             {
               "name": "pump is dosing",
-              "value": "@bind=data.ph.pump.isDosing?1:0;",
+              "value": "@bind=typeof data.ph.pump.isDosing !== 'undefined'?data.ph.pump.isDosing?1:0:0;",
               "type": "int"
             },
             {
@@ -291,7 +351,7 @@
             },
             {
               "name": "pump is dosing",
-              "value": "@bind=data.orp.pump.isDosing?1:0;",
+              "value": "@bind=typeof data.orp.pump.isDosing !== 'undefined'?data.orp.pump.isDosing?1:0:0;",
               "type": "int"
             },
             {
@@ -408,6 +468,11 @@
               "name": "volume dosed",
               "value": "@bind=data.ph.volumeDosed;",
               "type": "int"
+            },
+            {
+              "name": "orp demand",
+              "value": "@bind=data.orp.demand;",
+              "type": "int"
             }
           ]
         },
@@ -542,8 +607,6 @@
         }
       ]
     },
-
-
     {
       "name": "circuit",
       "description": "Bind circuit emit",
@@ -816,6 +879,11 @@
               "name": "spaSetpoint",
               "value": "@bind=data.spaSetpoint;",
               "type": "int"
+            },
+            {
+              "name": "target output",
+              "value": "@bind=data.targetOutput;",
+              "type": "int"
             }
           ]
         }
@@ -825,6 +893,90 @@
       "name": "config",
       "description": "Not used for updates",
       "enabled": false
+    },
+    {
+      "name": "filter",
+      "description": "Bind filter to measurements",
+      "points": [
+        {
+          "measurement": "filter",
+          "tags": [
+            {
+              "name": "units",
+              "value": "@bind=data.pressureUnits.desc;"
+            },
+            {
+              "name": "filterType",
+              "value": "@bind=data.filterType.desc;"
+            },
+            {
+              "name": "body",
+              "value": "@bind=data.body.desc;"
+            },
+            {
+              "name": "name",
+              "value": "@bind=data.name;"
+            },
+            {
+              "name": "id",
+              "value": "@bind=data.id;"
+            }
+          ],
+          "fields": [
+            {
+              "name": "isOn",
+              "value": "@bind=data.isOn;",
+              "type": "boolean"
+            },
+            {
+              "name": "isOnVal",
+              "value": "@bind=data.isOn?1:0;",
+              "type": "integer"
+            },
+            {
+              "name": "pressure",
+              "value": "@bind=data.pressure;",
+              "type": "float"
+            },
+            {
+              "name": "referencePressure",
+              "value": "@bind=data.refPressure;",
+              "type": "float"
+            },
+            {
+              "name": "cleanPercentage",
+              "value": "@bind=data.cleanPercentage;",
+              "type": "float"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "cover",
+      "description": "Bind cover to measurements",
+      "points": [
+        {
+          "measurement": "cover",
+          "tags": [
+            {
+              "name": "name",
+              "value": "@bind=data.name;"
+            },
+            {
+              "name": "id",
+              "value": "@bind=data.id;"
+            }
+          ],
+          "fields": [
+            {
+              "name": "isClosed",
+              "value": "@bind=data.isClosed;",
+              "type": "boolean"
+            }
+          ]
+        }
+      ]
     }
   ]
-}
+}

package/web/bindings/mqtt.json

@@ -64,6 +64,10 @@
         {
           "topic": "state/mode",
           "message": "@bind=data.mode;"
+        },
+        {
+          "topic": "state/startTime",
+          "message":  "@bind=data.startTime;"
         }
       ]
     },
@@ -73,7 +77,7 @@
       "topics": [
         {
           "topic": "state/circuits/@bind=data.id;/@bind=data.name;",
-          "message": "{\"id\":@bind=data.id;,\"isOn\":@bind=data.isOn?'\"on\"':'\"off\"';}",
+          "message": "{\"id\":@bind=data.id;,\"isOn\":@bind=data.isOn?'\"on\"':'\"off\"';,\"endTime\":\"@bind=data.endTime;\"}",
           "description": "Bind 'on'/'off' as a message to the state topic."
         },
         {
@@ -116,6 +120,11 @@
           "options": { "qos": 2 },
           "enabled": false
         },
+        {
+          "topic": "state/circuits/@bind=data.id;/@bind=data.name;/endTime",
+          "message": "{\"id\":@bind=data.id;,\"endTime\":@bind=data.endTime;}",
+          "description": "Bind endTime as a message to the state topic."
+        },
         {
           "topic": "state/circuits/@bind=data.id;/@bind=data.name;/object",
           "message": "@bind=data;",
@@ -146,15 +155,19 @@
         }
       ]
     },
-
     {
       "name": "feature",
       "description": "Populate the features topics",
       "topics": [
         {
           "topic": "state/features/@bind=data.id;/@bind=data.name;",
-          "message": "{\"id\":@bind=data.id;,\"isOn\":@bind=data.isOn?'\"on\"':'\"off\"';}",
+          "message": "{\"id\":@bind=data.id;,\"isOn\":@bind=data.isOn?'\"on\"':'\"off\"';,\"endTime\":\"@bind=data.endTime;\"}",
           "description": "Bind 'on'/'off' as a message to the state topic."
+        },
+        {
+          "topic": "state/features/@bind=data.id;/@bind=data.name;/endTime",
+          "message": "{\"id\":@bind=data.id;,\"endTime\":@bind=data.endTime;}",
+          "description": "Bind endTime as a message to the state topic."
         }
       ]
     },
@@ -179,6 +192,32 @@
         }
       ]
     },
+    {
+      "name": "circuitGroup",
+      "description": "Populate the circuitGroup topic",
+      "topics": [
+        {
+          "topic": "state/circuitGroups/@bind=data.id;/name",
+          "message": "{\"id\":@bind=data.id;,\"isOn\":@bind=data.isOn?'\"on\"':'\"off\"';}",
+          "description": "Bind name to the state topic."
+        },
+        {
+          "topic": "state/circuitGroups/@bind=data.id;/isOn",
+          "message": "{\"id\":@bind=data.id;,\"isOn\":@bind=data.isOn?'\"on\"':'\"off\"';}",
+          "description": "Bind the on/off status to the topic."
+        },
+        {
+          "topic": "state/circuitGroups/@bind=data.id;/type",
+          "message": "{\"type\":@bind=data.type;}"
+        },
+        {
+          "topic": "state/circuitGroups/@bind=data.id;/showInFeatures",
+          "message": "{\"showInFeatures\":@bind=data.showInFeatures;}",
+          "description": "Indicates wether the item should show in features."
+        }
+
+      ]
+    },
     {
       "name": "body",
       "description": "Populate the body topic",
@@ -203,6 +242,11 @@
           "message": "{\"setPoint\":@bind=data.setPoint;}",
           "description": "Send set point."
         },
+        {
+          "topic": "state/temps/bodies/@bind=data.id;/@bind=data.name;/coolSetpoint",
+          "message": "{\"coolSetpoint\":@bind=data.coolSetpoint;}",
+          "description": "Send cool set point."
+        },
         {
           "topic": "state/temps/bodies/@bind=data.id;/@bind=data.name;/temp",
           "message": "{\"temp\":@bind=data.temp;}",
@@ -263,11 +307,6 @@
           "topic": "state/chlorinators/@bind=data.id;/@bind=data.name;/targetOutput",
           "message": "{\"targetOutput\":@bind=data.targetOutput;}",
           "description": "Send targetOutput."
-        },
-        {
-          "topic": "state/chlorinators/@bind=data.id;/@bind=data.name;/virtualControllerStatus",
-          "message": "{\"virtualControllerStatus\":@bind=data.virtualControllerStatus;}",
-          "description": "Send virtualControllerStatus."
         }
       ]
     },
@@ -291,6 +330,10 @@
         {
           "topic": "state/lightgroups/@bind=data.id;/@bind=data.name;/type",
           "message": "{\"type\":@bind=data.type;}"
+        },
+        {
+          "topic": "state/lightgroups/@bind=data.id;/@bind=data.name;/endTime",
+          "message": "{\"endTime\":@bind=data.endTime;}"
         }
       ]
     },
@@ -368,6 +411,11 @@
           "message": "@bind=data.orp.level;",
           "enabled": true
         },
+        {
+          "topic": "state/chemControllers/@bind=data.id;/@bind=data.name;/orp/demand",
+          "message": "@bind=data.orp.demand;",
+          "enabled": true
+        },
         {
           "topic": "state/chemControllers/@bind=data.id;/@bind=data.name;/orp/doseTime",
           "message": "@bind=data.orp.doseTime;",
@@ -471,15 +519,14 @@
           "topic": "config/chemControllers/@bind=data.id;/@bind=data.name;/borates",
           "message": "@bind=vars.cfg.borates;"
         },
-        {
-          "topic": "state/chemControllers/@bind=data.id;/@bind=data.name;/virtualControllerStatus",
-          "message": "@bind=data.virtualControllerStatus;"
-        },
         {
           "topic": "state/chemControllers/@bind=data.id;/@bind=data.name;/acidDemand",
           "message": "@bind=data.ph.demand;"
         },
-
+        {
+          "topic": "state/chemControllers/@bind=data.id;/@bind=data.name;/orpDemand",
+          "message": "@bind=data.orp.demand;"
+        },
         {
           "topic": "state/chemControllers/@bind=data.id;/@bind=data.name;/alarms/flow",
           "message": "@bind=data.alarms.flow;"
@@ -535,6 +582,58 @@
         }
       ]
     },
+    {
+      "name": "filter",
+      "description": "Populate the filter topic",
+      "topics": [
+        {
+          "topic": "state/filters/@bind=data.id;/@bind=data.name;",
+          "message": "{\"id\":@bind=data.id;,\"isOn\":@bind=data.isOn?'\"on\"':'\"off\"';}",
+          "description": "Bind 'on'/'off' as a message to the state topic."
+        },
+        {
+          "topic": "state/filters/@bind=data.id;/@bind=data.name;/pressure",
+          "message": "{\"pressure\":@bind=data.pressure;}",
+          "description": "Send current pressure."
+        },
+        {
+          "topic": "state/filters/@bind=data.id;/@bind=data.name;/refPressure",
+          "message": "{\"refPressure\":@bind=data.refPressure;}",
+          "description": "Send reference pressure (when circuits are on)."
+        },
+        {
+          "topic": "state/filters/@bind=data.id;/@bind=data.name;/body",
+          "message": "{\"body\":@bind=data.body.desc;}",
+          "description": "Send associated body."
+        },
+        {
+          "topic": "state/filters/@bind=data.id;/@bind=data.name;/filterType",
+          "message": "{\"filterType\":@bind=data.filterType.desc;}",
+          "description": "Send filter type."
+        },
+        {
+          "topic": "state/filters/@bind=data.id;/@bind=data.name;/pressureUnits",
+          "message": "{\"pressureUnits\":@bind=data.pressureUnits.desc;}",
+          "description": "Send pressureUnits."
+        },
+        {
+          "topic": "state/filters/@bind=data.id;/@bind=data.name;/cleanPercentage",
+          "message": "{\"cleanPercentage\":@bind=data.cleanPercentage;}",
+          "description": "Send cleanPercentage."
+        }
+      ]
+    },
+    {
+      "name": "cover",
+      "description": "Populate the cover topic",
+      "topics": [
+        {
+          "topic": "state/covers/@bind=data.id;/@bind=data.name;",
+          "message": "{\"id\":@bind=data.id;,\"isClosed\":@bind=data.isClosed?'\"true\"':'\"false\"';}",
+          "description": "Bind isClosed as a message to the state topic."
+        }
+      ]
+    },
     {
       "name": "*",
       "description": "DEFAULT: Sends the entire emitted response.",

package/web/bindings/mqttAlt.json

@@ -63,8 +63,11 @@
         {
           "topic": "state/mode",
           "message": "@bind=data.mode;"
+        },
+        {
+          "topic": "state/startTime",
+          "message": "@bind=data.startTime;"
         }
-
       ]
     },
     {
@@ -86,6 +89,11 @@
           "message": "@bind=data.type;",
           "description": "The type of circuit we are dealing with."
         },
+        {
+          "topic": "state/circuits/@bind=data.id;/endTime",
+          "message": "@bind=data.endTime;",
+          "description":  "The end time for the circuit."
+        },
         {
           "topic": "state/circuits/@bind=data.id;/lightingTheme",
           "message": "@bind=data.lightingTheme;",
@@ -95,7 +103,12 @@
         {
           "topic": "state/circuits/@bind=data.id;/showInFeatures",
           "message": "@bind=data.showInFeatures;",
-          "description": "Indicates wether the item should show in features."
+          "description": "Indicates whether the item should show in features."
+        },
+        {
+          "topic": "state/circuits/@bind=data.id;/endTime",
+          "message": "@bind=data.endTime;",
+          "description": "Indicates end time for a circuit (when it will turn off)."
         }
       ]
     },
@@ -113,6 +126,11 @@
           "message": "@bind=data.isOn;",
           "description": "Bind the on/off status to the topic."
         },
+        {
+          "topic": "state/features/@bind=data.id;/endTime",
+          "message": "@bind=data.endTime;",
+          "description": "The end time for the feature."
+        },
         {
           "topic": "state/features/@bind=data.id;/type",
           "message": "@bind=data.type;",
@@ -121,7 +139,12 @@
         {
           "topic": "state/features/@bind=data.id;/showInFeatures",
           "message": "@bind=data.showInFeatures;",
-          "description": "Indicates wether the item should show in features."
+          "description": "Indicates whether the item should show in features."
+        },
+        {
+          "topic": "state/features/@bind=data.id;/endTime",
+          "message": "@bind=data.endTime;",
+          "description": "Indicates end time for a features (when it will turn off)."
         }
       ]
     },
@@ -150,6 +173,10 @@
         {
           "topic": "state/lightGroups/@bind=data.id;/type",
           "message": "@bind=data.type;"
+        },
+        {
+          "topic": "state/lightGroups/@bind=data.id;/endTime",
+          "message": "@bind=data.endTime;"
         }
       ]
     },
@@ -174,7 +201,12 @@
         {
           "topic": "state/circuitGroups/@bind=data.id;/showInFeatures",
           "message": "@bind=data.showInFeatures;",
-          "description": "Indicates wether the item should show in features."
+          "description": "Indicates whether the item should show in features."
+        },
+        {
+          "topic": "state/circuitGroups/@bind=data.id;/endTime",
+          "message": "@bind=data.showInFeatures;",
+          "description": "Indicates end time for the circuitGroup (when it will turn off)."
         }
 
       ]
@@ -309,6 +341,11 @@
           "message": "@bind=data.setPoint;",
           "description": "Setpoint."
         },
+        {
+          "topic": "state/temps/bodies/@bind=data.id;/coolSetpoint",
+          "message": "@bind=data.coolSetpoint;",
+          "description": "Cool setpoint."
+        },
         {
           "topic": "state/temps/bodies/@bind=data.id;/temp",
           "message": "@bind=data.temp;",
@@ -374,11 +411,6 @@
           "topic": "state/chlorinators/@bind=data.id;/targetOutput",
           "message": "@bind=data.targetOutput;",
           "description": "Send targetOutput."
-        },
-        {
-          "topic": "state/chlorinators/@bind=data.id;/virtualControllerStatus",
-          "message": "@bind=data.virtualControllerStatus;",
-          "description": "Send virtualControllerStatus."
         }
       ]
     },
@@ -509,8 +541,12 @@
           "message": "@bind=vars.cfg.borates;"
         },
         {
-          "topic": "state/chemControllers/@bind=data.id;/virtualControllerStatus",
-          "message": "@bind=data.virtualControllerStatus;"
+          "topic": "state/chemControllers/@bind=data.id;/@bind=data.name;/acidDemand",
+          "message": "@bind=data.ph.demand;"
+        },
+        {
+          "topic": "state/chemControllers/@bind=data.id;/@bind=data.name;/orpDemand",
+          "message": "@bind=data.orp.demand;"
         },
         {
           "topic": "state/chemControllers/@bind=data.id;/alarms/flow",
@@ -566,6 +602,68 @@
         }
       ]
     },
+    {
+      "name": "filter",
+      "description": "Populate the filter topic",
+      "topics": [
+        {
+          "topic": "state/filters/@bind=data.id;/name",
+          "message": "@bind=data.name;",
+          "description": "Bind the name topic."
+        },
+        {
+          "topic": "state/filters/@bind=data.id;/isOn",
+          "message": "@bind=data.currentOutput > 0;",
+          "description": "Bind 'on'/'off' as a message to the state topic."
+        },
+        {
+          "topic": "state/filters/@bind=data.id;/body",
+          "message": "@bind=data.body.desc;",
+          "description": "Send body description."
+        },
+        {
+          "topic": "state/filters/@bind=data.id;/cleanPercentage",
+          "message": "@bind=data.cleanPercentage;",
+          "description": "Send clean percentage."
+        },
+        {
+          "topic": "state/filters/@bind=data.id;/filterType",
+          "message": "@bind=data.filterType.desc;",
+          "description": "Send filter type."
+        },
+        {
+          "topic": "state/filters/@bind=data.id;/pressure",
+          "message": "@bind=data.pressure;",
+          "description": "Send pressure."
+        },
+        {
+          "topic": "state/filters/@bind=data.id;/pressureUnits",
+          "message": "@bind=data.pressureUnits.desc;",
+          "description": "Send pressure units."
+        },
+        {
+          "topic": "state/filters/@bind=data.id;/refPressure",
+          "message": "@bind=data.refPressure;",
+          "description": "Send reference pressure."
+        }
+      ]
+    },
+    {
+      "name": "cover",
+      "description": "Populate the cover topic",
+      "topics": [
+        {
+          "topic": "state/covers/@bind=data.id;/name",
+          "message": "@bind=data.name;",
+          "description": "Bind the name topic."
+        },
+        {
+          "topic": "state/covers/@bind=data.id;/isClosed",
+          "message": "@bind=data.isClosed;",
+          "description": "Bind isClosed as a message to the state topic."
+        }
+      ]
+    },
     {
       "name": "*",
       "description": "DEFAULT: Sends the entire emitted response.",

package/web/interfaces/baseInterface.ts

@@ -2,7 +2,8 @@ import extend = require("extend");
 import { logger } from "../../logger/Logger";
 import { sys as sysAlias } from "../../controller/Equipment";
 import { state as stateAlias} from "../../controller/State";
-import { webApp as webAppAlias} from '../Server';
+import { webApp as webAppAlias } from '../Server';
+import { utils, Timestamp } from "../../controller/Constants";
 
 export class BaseInterfaceBindings {
     constructor(cfg) {

package/web/interfaces/httpInterface.ts

@@ -100,11 +100,13 @@ export class HttpInterfaceBindings extends BaseInterfaceBindings {
                         opts.headers["CONTENT-LENGTH"] = Buffer.byteLength(sbody || '');
                     }
                     if (opts.port === 443 || (opts.protocol || '').startsWith('https')) {
+                        opts.protocol = 'https:';
                         req = https.request(opts, (response: http.IncomingMessage) => {
                             //console.log(response);
                         });
                     }
                     else {
+                        opts.protocol = 'http:';
                         req = http.request(opts, (response: http.IncomingMessage) => {
                             //console.log(response.statusCode);
                         });