nodejs-poolcontroller 7.5.1 → 7.7.0

package/web/bindings/mqtt.json

@@ -1,42 +1,42 @@
 {
-    "context": {
-        "name": "MQTT",
-        "options": {
-            "formatter": [
-                {
-                    "transform": ".toLowerCase()"
-                },
-                {
-                    "regexkey": "\\s",
-                    "replace": "",
-                    "description": "Remove whitespace"
-                },
-                {
-                    "regexkey": "\\/",
-                    "replace": "",
-                    "description": "Remove /"
-                },
-                {
-                    "regexkey": "\\+",
-                    "replace": "",
-                    "description": "Remove +"
-                },
-                {
-                    "regexkey": "\\$",
-                    "replace": "",
-                    "description": "Remove $"
-                },
-                {
-                    "regexkey": "\\#",
-                    "replace": "",
-                    "description": "Remove #"
-                }
-            ],
-            "rootTopic-DIRECTIONS": "You can override the root topic by renaming _rootTopic to rootTopic",
-            "_rootTopic": "@bind=(state.equipment.alias).replace(' ','-').replace('/','').toLowerCase();",
-            "clientId": "@bind='mqttjs_njsPC_'+Math.random().toString(16).substr(2, 8);"
+  "context": {
+    "name": "MQTT",
+    "options": {
+      "formatter": [
+        {
+          "transform": ".toLowerCase()"
+        },
+        {
+          "regexkey": "\\s",
+          "replace": "",
+          "description": "Remove whitespace"
+        },
+        {
+          "regexkey": "\\/",
+          "replace": "",
+          "description": "Remove /"
+        },
+        {
+          "regexkey": "\\+",
+          "replace": "",
+          "description": "Remove +"
+        },
+        {
+          "regexkey": "\\$",
+          "replace": "",
+          "description": "Remove $"
+        },
+        {
+          "regexkey": "\\#",
+          "replace": "",
+          "description": "Remove #"
         }
-    },
+      ],
+      "rootTopic-DIRECTIONS": "You can override the root topic by renaming _rootTopic to rootTopic",
+      "_rootTopic": "@bind=(state.equipment.alias).replace(' ','-').replace('/','').toLowerCase();",
+      "clientId": "@bind='mqttjs_njsPC_'+Math.random().toString(16).substr(2, 8);"
+    }
+  },
   "events": [
     {
       "name": "config",
@@ -67,7 +67,7 @@
         },
         {
           "topic": "state/startTime",
-          "message":  "@bind=data.startTime;"
+          "message": "@bind=data.startTime;"
         }
       ]
     },
@@ -184,7 +184,50 @@
           "topic": "state/temps/solar",
           "message": "{\"temp\":@bind=data.solar;}",
           "description": "Send solar temp.",
-          "filter": "@bind=typeof data.solar === 'undefined';"
+          "filter": "@bind=typeof data.solar !== 'undefined';"
+        },
+        {
+          "topic": "state/temps/solarSensor2",
+          "message": "{\"temp\":@bind=data.solarSensor2;}",
+          "description": "Solar temp",
+          "filter": "@bind=typeof data.solarSensor2 !== 'undefined';"
+        },
+        {
+          "topic": "state/temps/solarSensor3",
+          "message": "{\"temp\":@bind=data.solarSensor3;}",
+          "description": "Solar temp",
+          "filter": "@bind=typeof data.solarSensor3 !== 'undefined';"
+        },
+        {
+          "topic": "state/temps/solarSensor4",
+          "message": "{\"temp\":@bind=data.solarSensor4;}",
+          "description": "Solar temp",
+          "filter": "@bind=typeof data.solarSensor4 !== 'undefined';"
+        },
+
+        {
+          "topic": "state/temps/waterSensor1",
+          "message": "{\"temp\":@bind=data.waterSensor1;}",
+          "description": "Water temp sensor 1",
+          "filter": "@bind=typeof data.waterSensor1 !== 'undefined';"
+        },
+        {
+          "topic": "state/temps/waterSensor2",
+          "message": "{\"temp\":@bind=data.waterSensor2;}",
+          "description": "Water temp sensor 2",
+          "filter": "@bind=typeof data.waterSensor2 !== 'undefined';"
+        },
+        {
+          "topic": "state/temps/waterSensor3",
+          "message": "{\"temp\":@bind=data.waterSensor3;}",
+          "description": "Water temp sensor 3",
+          "filter": "@bind=typeof data.waterSensor3 !== 'undefined';"
+        },
+        {
+          "topic": "state/temps/waterSensor4",
+          "message": "{\"temp\":@bind=data.waterSensor4;}",
+          "description": "Water temp sensor 4",
+          "filter": "@bind=typeof data.waterSensor4 !== 'undefined';"
         },
         {
           "topic": "state/temps/units",
@@ -303,6 +346,11 @@
           "message": "{\"type\":@bind=data.type;}",
           "description": "Send type."
         },
+        {
+          "topic": "state/chlorinators/@bind=data.id;/@bind=data.name;/model",
+          "message": "{\"type\":@bind=data.model;}",
+          "description": "Send Model."
+        },
         {
           "topic": "state/chlorinators/@bind=data.id;/@bind=data.name;/targetOutput",
           "message": "{\"targetOutput\":@bind=data.targetOutput;}",
@@ -582,6 +630,17 @@
         }
       ]
     },
+    {
+      "name": "chemicalDose",
+      "description": "Event when a chemical is being dosed",
+      "topics": [
+        {
+          "topic": "state/chemControllers/@bind=data.id;/@bind=data.chem;",
+          "message": "@bind=data;",
+          "enabled": true
+        }
+      ]
+    },
     {
       "name": "filter",
       "description": "Populate the filter topic",

package/web/bindings/mqttAlt.json

@@ -92,7 +92,7 @@
         {
           "topic": "state/circuits/@bind=data.id;/endTime",
           "message": "@bind=data.endTime;",
-          "description":  "The end time for the circuit."
+          "description": "The end time for the circuit."
         },
         {
           "topic": "state/circuits/@bind=data.id;/lightingTheme",
@@ -295,6 +295,48 @@
           "description": "Solar temp",
           "filter": "@bind=typeof data.solar !== 'undefined';"
         },
+        {
+          "topic": "state/temps/solarSensor2",
+          "message": "@bind=data.solarSensor2;",
+          "description": "Solar temp",
+          "filter": "@bind=typeof data.solarSensor2 !== 'undefined';"
+        },
+        {
+          "topic": "state/temps/solarSensor3",
+          "message": "@bind=data.solarSensor3;",
+          "description": "Solar temp",
+          "filter": "@bind=typeof data.solarSensor3 !== 'undefined';"
+        },
+        {
+          "topic": "state/temps/solarSensor4",
+          "message": "@bind=data.solarSensor4;",
+          "description": "Solar temp",
+          "filter": "@bind=typeof data.solarSensor4 !== 'undefined';"
+        },
+        {
+          "topic": "state/temps/waterSensor1",
+          "message": "@bind=data.waterSensor1;",
+          "description": "Water temp sensor 1",
+          "filter": "@bind=typeof data.waterSensor1 !== 'undefined';"
+        },
+        {
+          "topic": "state/temps/waterSensor2",
+          "message": "@bind=data.waterSensor2;",
+          "description": "Water temp sensor 2",
+          "filter": "@bind=typeof data.waterSensor2 !== 'undefined';"
+        },
+        {
+          "topic": "state/temps/waterSensor3",
+          "message": "@bind=data.waterSensor3;",
+          "description": "Water temp sensor 3",
+          "filter": "@bind=typeof data.waterSensor3 !== 'undefined';"
+        },
+        {
+          "topic": "state/temps/waterSensor4",
+          "message": "@bind=data.waterSensor4;",
+          "description": "Water temp sensor 4",
+          "filter": "@bind=typeof data.waterSensor4 !== 'undefined';"
+        },
         {
           "topic": "state/temps/units",
           "message": "@bind=data.units;"
@@ -407,6 +449,11 @@
           "message": "@bind=data.type;",
           "description": "Send type."
         },
+        {
+          "topic": "state/chlorinators/@bind=data.id;/model",
+          "message": "@bind=data.model;",
+          "description": "Send Model"
+        },
         {
           "topic": "state/chlorinators/@bind=data.id;/targetOutput",
           "message": "@bind=data.targetOutput;",
@@ -602,6 +649,17 @@
         }
       ]
     },
+    {
+      "name": "chemicalDose",
+      "description": "Event when a chemical is being dosed",
+      "topics": [
+        {
+          "topic": "state/chemControllers/@bind=data.id;/@bind=data.chem;",
+          "message": "@bind=data;",
+          "enabled": true
+        }
+      ]
+    },
     {
       "name": "filter",
       "description": "Populate the filter topic",

package/web/interfaces/baseInterface.ts

@@ -126,6 +126,7 @@ export class InterfaceEvent {
     public options: any = {};
     public body: any = {};
     public vars: any = {};
+    public processor?: string[]
 }
 export class InterfaceContext {
     public name: string;

package/web/interfaces/httpInterface.ts

@@ -20,14 +20,15 @@ import * as http from "http";
 import * as https from "https";
 import extend=require("extend");
 import { logger } from "../../logger/Logger";
-import { sys } from "../../controller/Equipment";
-import { state } from "../../controller/State";
+import { PoolSystem, sys } from "../../controller/Equipment";
+import { State, state } from "../../controller/State";
 import { InterfaceContext, InterfaceEvent, BaseInterfaceBindings } from "./baseInterface";
 
 export class HttpInterfaceBindings extends BaseInterfaceBindings {
     constructor(cfg) {
         super(cfg);
     }
+    declare sockets: HttpInterfaceSocketEvent[];
     public bindEvent(evt: string, ...data: any) {
         // Find the binding by first looking for the specific event name.  
         // If that doesn't exist then look for the "*" (all events).
@@ -121,4 +122,24 @@ export class HttpInterfaceBindings extends BaseInterfaceBindings {
         }
     }
 }
+class HttpInterfaceSocketEvent {
+    event: string;
+    description: string;
+    processor: (sock: HttpInterfaceSocketEvent, sys: PoolSystem, state: State, value: any) => void;
+    constructor(sock: any) {
+        this.event = sock.event;
+        if (typeof sock.processor !== 'undefined') {
+            let fnBody = Array.isArray(sock.processor) ? sock.processor.join('\n') : sock.processor;
+            try {
+                this.processor = new Function('sock', 'sys', 'state', 'value', fnBody) as (sock: HttpInterfaceSocketEvent, sys: PoolSystem, state: State, value: any) => void;
+            } catch (err) { logger.error(`Error compiling socket event processor: ${err} -- ${fnBody}`); }
+        }
+    }
+}
+export interface IHTTPInterfaceSocketEvent {
+    event: string,
+    description: string,
+    processor?: string
+}
+
 

package/web/interfaces/influxInterface.ts

@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import extend = require("extend");
-import { ClientOptions, InfluxDB, Point, WriteApi, WritePrecisionType } from '@influxdata/influxdb-client';
+import { ClientOptions, DEFAULT_WriteOptions, InfluxDB, Point, WriteApi, WriteOptions, WritePrecisionType } from '@influxdata/influxdb-client';
 import { utils, Timestamp } from '../../controller/Constants';
 import { logger } from "../../logger/Logger";
 import { BaseInterfaceBindings, InterfaceContext, InterfaceEvent } from "./baseInterface";
@@ -33,7 +33,8 @@ export class InfluxInterfaceBindings extends BaseInterfaceBindings {
         let url = 'http://';
         if (typeof baseOpts.protocol !== 'undefined' && baseOpts.protocol) url = baseOpts.protocol;
         if (!url.endsWith('://')) url += '://';
-        url = `${url}${baseOpts.host}:${baseOpts.port}`;
+        url = `${url}${baseOpts.host}`;
+        if(typeof baseOpts.port !== 'undefined' && baseOpts.port !== null && !isNaN(baseOpts.port)) url = `${url}:${baseOpts.port}`;
         let influxDB: InfluxDB;
         let bucket;
         let org;
@@ -62,9 +63,6 @@ export class InfluxInterfaceBindings extends BaseInterfaceBindings {
             }
             influxDB = new InfluxDB(clientOptions);
         }
-        this.writeApi = influxDB.getWriteApi(org, bucket, 'ms');
-
-
         // set global tags from context
         let baseTags = {}
         baseOpts.tags.forEach(tag => {
@@ -74,7 +72,40 @@ export class InfluxInterfaceBindings extends BaseInterfaceBindings {
             if (typeof sname !== 'undefined' && typeof svalue !== 'undefined' && !sname.includes('@bind') && !svalue.includes('@bind'))
                 baseTags[sname] = svalue;
         })
-        this.writeApi.useDefaultTags(baseTags);
+        //this.writeApi.useDefaultTags(baseTags);
+        const writeOptions:WriteOptions = {
+            /* the maximum points/line to send in a single batch to InfluxDB server */
+            batchSize: baseOpts.batchSize || 100, 
+            /* default tags to add to every point */
+            defaultTags: baseTags,
+            /* maximum time in millis to keep points in an unflushed batch, 0 means don't periodically flush */
+            flushInterval: DEFAULT_WriteOptions.flushInterval,
+            /* maximum size of the retry buffer - it contains items that could not be sent for the first time */
+            maxBufferLines: DEFAULT_WriteOptions.maxBufferLines,
+            /* the count of retries, the delays between retries follow an exponential backoff strategy if there is no Retry-After HTTP header */
+            maxRetries: DEFAULT_WriteOptions.maxRetries,
+            /* maximum delay between retries in milliseconds */
+            maxRetryDelay: DEFAULT_WriteOptions.maxRetryDelay,
+            /* minimum delay between retries in milliseconds */
+            minRetryDelay: DEFAULT_WriteOptions.minRetryDelay, // minimum delay between retries
+            /* a random value of up to retryJitter is added when scheduling next retry */
+            retryJitter: DEFAULT_WriteOptions.retryJitter,
+            // ... or you can customize what to do on write failures when using a writeFailed fn, see the API docs for details
+            writeFailed: function(error, lines, failedAttempts){
+                /** return promise or void */
+                logger.error(`InfluxDB batch write failed writing ${lines.length} lines with ${failedAttempts} failed attempts.  ${error.message}`);
+            },
+            writeSuccess: function(lines){
+                logger.silly(`InfluxDB successfully wrote ${lines.length} lines.`)
+            },
+            maxRetryTime: DEFAULT_WriteOptions.maxRetryTime,
+            exponentialBase: DEFAULT_WriteOptions.exponentialBase,
+            randomRetry: DEFAULT_WriteOptions.randomRetry
+        }
+        this.writeApi = influxDB.getWriteApi(org, bucket, 'ms', writeOptions);
+
+
+
     }
     public bindEvent(evt: string, ...data: any) {
 
@@ -115,6 +146,10 @@ export class InfluxInterfaceBindings extends BaseInterfaceBindings {
                             }
                             else {
                                 logger.error(`InfluxDB tag binding failure on ${evt}:${_tag.name}/${_tag.value} --> ${svalue || 'undefined'}  ${JSON.stringify(data[0])}`);
+                                if (typeof sname === 'undefined') logger.error(`InfluxDB tag name is undefined`);
+                                if (typeof svalue === 'undefined') logger.error(`InfluxDB value is undefined`);
+                                if (svalue.includes('@bind')) logger.error(`InfluxDB value not bound`);
+                                if (svalue === null) logger.error(`InfluxDB value is null`);
                             }
                         })
                         _point.fields.forEach(_field => {
@@ -188,14 +223,14 @@ export class InfluxInterfaceBindings extends BaseInterfaceBindings {
                                 let sec = ts.getSeconds() - 1;
                                 ts.setSeconds(sec);
                                 point2.timestamp(ts);
-                                logger.silly(`Writing influx ${e.name} inverse data point ${point2.toString()})`)
+                                logger.silly(`Batching influx ${e.name} inverse data point ${point2.toString()})`)
                                 this.writeApi.writePoint(point2);
                             }
                             if (typeof point.toLineProtocol() !== 'undefined') {
-                                logger.silly(`Writing influx ${e.name} data point ${point.toString()}`)
+                                logger.silly(`Batching influx ${e.name} data point ${point.toString()}`)
                                 this.writeApi.writePoint(point);
-                                this.writeApi.flush()
-                                    .catch(error => { logger.error(error); });
+                                // this.writeApi.flush()
+                                //     .catch(error => { logger.error(`Error flushing Influx data point ${point.toString()} ${error}`); });
                                 //logger.info(`INFLUX: ${point.toLineProtocol()}`)
                             }
                             else {

package/web/interfaces/mqttInterface.ts

@@ -20,8 +20,8 @@ import * as http from "http";
 import * as https from "https";
 import extend = require("extend");
 import { logger } from "../../logger/Logger";
-import { sys } from "../../controller/Equipment";
-import { state } from "../../controller/State";
+import { PoolSystem, sys } from "../../controller/Equipment";
+import { State, state } from "../../controller/State";
 import { InterfaceEvent, BaseInterfaceBindings } from "./baseInterface";
 import { sys as sysAlias } from "../../controller/Equipment";
 import { state as stateAlias } from "../../controller/State";
@@ -35,8 +35,9 @@ export class MqttInterfaceBindings extends BaseInterfaceBindings {
         this.subscribed = false;
     }
     private client: MqttClient;
-    private topics: string[] = [];
+    private topics: MqttTopicSubscription[] = [];
     declare events: MqttInterfaceEvent[];
+    declare subscriptions: MqttTopicSubscription[];
     private subscribed: boolean; // subscribed to events or not
     private sentInitialMessages = false;
     private init = () => {
@@ -55,7 +56,6 @@ export class MqttInterfaceBindings extends BaseInterfaceBindings {
             url
         }
         this.client = connect(url, opts);
-
         this.client.on('connect', () => {
             try {
                 logger.info(`MQTT connected to ${url}`);
@@ -82,7 +82,7 @@ export class MqttInterfaceBindings extends BaseInterfaceBindings {
             while (this.topics.length > 0) {
                 let topic = this.topics.pop();
                 if (typeof topic !== 'undefined') {
-                    this.client.unsubscribe(topic, (err, packet) => {
+                    this.client.unsubscribe(topic.topicPath, (err, packet) => {
                         if (err) logger.error(`Error unsubscribing from MQTT topic ${topic}`);
                         else {
                             logger.debug(`Unsubscribed from MQTT topic ${topic}`);
@@ -92,47 +92,47 @@ export class MqttInterfaceBindings extends BaseInterfaceBindings {
             }
         } catch (err) { logger.error(`Error unsubcribing to MQTT topic: ${err.message}`); }
     }
-    private subscribe() {
-        try {
-            if (this.topics.length > 0) this.unsubscribe();
-            let root = this.rootTopic();
-            this.topics.push(`${root}/state/+/setState`,
-                `${root}/state/+/setstate`,
-                `${root}/state/+/toggleState`,
-                `${root}/state/+/togglestate`,
-                `${root}/state/body/setPoint`,
-                `${root}/state/body/setpoint`,
-                `${root}/state/body/heatMode`,
-                `${root}/state/body/heatmode`,
-                `${root}/state/+/setTheme`,
-                `${root}/state/+/settheme`,
-                `${root}/state/temps`,
-                `${root}/config/tempSensors`,
-                `${root}/config/chemController`,
-                `${root}/state/chemController`,
-                `${root}/config/chlorinator`,
-                `${root}/state/chlorinator`);
-            for (let i = 0; i < this.topics.length; i++) {
-                let topic = this.topics[i];
-                // await new Promise<void>((resolve, reject) => {
-                this.client.subscribe(topic, (err, granted) => {
-                    if (!err) {
-                        logger.debug(`MQTT subscribed to ${JSON.stringify(granted)}`);
-                        // resolve();
-                    }
-                    else {
-                        logger.error(`MQTT Subscribe: ${err}`);
-                        // reject(err);
-                    }
-                });
-                // });
-
+    protected subscribe() {
+        if (this.topics.length > 0) this.unsubscribe();
+        let root = this.rootTopic();
+        if (typeof this.subscriptions !== 'undefined') {
+            for (let i = 0; i < this.subscriptions.length; i++) {
+                let sub = this.subscriptions[i];
+                if(sub.enabled !== false) this.topics.push(new MqttTopicSubscription(root, sub));
+            }
+        }
+        else {
+            let arrTopics = [
+                `state/+/setState`,
+                `state/+/setstate`,
+                `state/+/toggleState`,
+                `state/+/togglestate`,
+                `state/body/setPoint`,
+                `state/body/setpoint`,
+                `state/body/heatMode`,
+                `state/body/heatmode`,
+                `state/+/setTheme`,
+                `state/+/settheme`,
+                `state/temps`,
+                `config/tempSensors`,
+                `config/chemController`,
+                `state/chemController`,
+                `config/chlorinator`,
+                `state/chlorinator`];
+            for (let i = 0; i < arrTopics.length; i++) {
+                this.topics.push(new MqttTopicSubscription(root, { topic: arrTopics[i] }));
             }
-            this.client.on('message', async (topic, msg) => { try { await this.messageHandler(topic, msg) } catch (err) { logger.error(`Error processing MQTT request ${err}.`) }; })
-            this.subscribed = true;
-        } catch (err) { logger.error(`Error subcribing to MQTT topics`); }
+        }
+        for (let i = 0; i < this.topics.length; i++) {
+            let topic = this.topics[i];
+            this.client.subscribe(topic.topicPath, (err, granted) => {
+                if (!err) logger.debug(`MQTT subscribed to ${JSON.stringify(granted)}`);
+                else logger.error(`MQTT Subscribe: ${err}`);
+            });
+        }
+        this.client.on('message', async (topic, msg) => { try { await this.messageHandler(topic, msg) } catch (err) { logger.error(`Error processing MQTT request ${err}.`) }; })
+        this.subscribed = true;
     }
-
     // this will take in the MQTT Formatter options and format each token that is bound
     // otherwise, it's the same as the base buildTokens fn.
     // This could be combined into one fn but for now it's specific to MQTT formatting of topics
@@ -178,7 +178,6 @@ export class MqttInterfaceBindings extends BaseInterfaceBindings {
         }
         return toks;
     }
-
     private rootTopic = () => {
         let toks = {};
         let baseOpts = extend(true, { headers: {} }, this.cfg.options, this.context.options);
@@ -187,7 +186,6 @@ export class MqttInterfaceBindings extends BaseInterfaceBindings {
         topic = this.replaceTokens(baseOpts.rootTopic, toks);
         return topic;
     }
-
     public bindEvent(evt: string, ...data: any) {
         try {
             if (!this.sentInitialMessages && evt === 'controller' && data[0].status.val === 1) {
@@ -239,10 +237,28 @@ export class MqttInterfaceBindings extends BaseInterfaceBindings {
                             topic = `${rootTopic}/${this.replaceTokens(t.topic, topicToks)}`;
                             // Filter out any topics where there may be undefined in it.  We don't want any of this if that is the case.
                             if (topic.endsWith('/undefined') || topic.indexOf('/undefined/') !== -1 || topic.startsWith('null/') || topic.indexOf('/null') !== -1) return;
-
-
-                            this.buildTokens(t.message, evt, topicToks, e, data[0]);
-                            message = this.tokensReplacer(t.message, evt, topicToks, e, data[0]);
+                            if (typeof t.processor !== 'undefined') {
+                                if (t.ignoreProcessor) message = "err";
+                                else {
+                                    if (typeof t._fnProcessor !== 'function') {
+                                        let fnBody = Array.isArray(t.processor) ? t.processor.join('\n') : t.processor;
+                                        try {
+                                            // Try to compile it.
+                                            t._fnProcessor = new Function('ctx', 'pub', 'sys', 'state', 'data', fnBody) as (ctx: any, pub: MQTTPublishTopic, sys: PoolSystem, state: State, data: any) => any;
+                                        } catch (err) { logger.error(`Error compiling subscription processor: ${err} -- ${fnBody}`); t.ignoreProcessor = true; }
+                                    }
+                                    if (typeof t._fnProcessor === 'function') {
+                                        let ctx = { util: utils }
+                                        try {
+                                            message = t._fnProcessor(ctx, t, sys, state, data[0]).toString();
+                                        } catch (err) { logger.error(`Error publishing MQTT data for topic ${t.topic}: ${err.message}`); message = "err"; }
+                                    }
+                                }
+                            }
+                            else {
+                                this.buildTokens(t.message, evt, topicToks, e, data[0]);
+                                message = this.tokensReplacer(t.message, evt, topicToks, e, data[0]);
+                            }
 
                             let publishOptions: IClientPublishOptions = { retain: typeof baseOpts.retain !== 'undefined' ? baseOpts.retain : true, qos: typeof baseOpts.qos !== 'undefined' ? baseOpts.qos : 2 };
                             let changesOnly = typeof baseOpts.changesOnly !== 'undefined' ? baseOpts.changesOnly : true;
@@ -286,6 +302,16 @@ export class MqttInterfaceBindings extends BaseInterfaceBindings {
         try {
             let msg = message.toString();
             if (msg[0] === '{') msg = JSON.parse(msg);
+
+            let sub: MqttTopicSubscription = this.topics.find(elem => topic === elem.topicPath);
+            if (typeof sub !== 'undefined') {
+                logger.debug(`Topic not found ${topic}`)
+                // Alright so now lets process our results.
+                if (typeof sub.processor === 'function') {
+                    sub.executeProcessor(msg);
+                    return;
+                }
+            }
             const topics = topic.split('/');
             logger.debug(`MQTT: Inbound ${topic}: ${message.toString()}`);
             if (topic.startsWith(this.rootTopic() + '/') && typeof msg === 'object') {
@@ -452,12 +478,10 @@ export class MqttInterfaceBindings extends BaseInterfaceBindings {
         }
     }
 }
-
 class MqttInterfaceEvent extends InterfaceEvent {
-    public topics: IMQTT[]
+    public topics: MQTTPublishTopic[]
 }
-
-export interface IMQTT {
+export class MQTTPublishTopic {
     topic: string;
     message: string;
     description: string;
@@ -468,8 +492,44 @@ export interface IMQTT {
     filter?: string;
     lastSent: MQTTMessage[];
     options: any;
+    processor?: string[];
+    ignoreProcessor: boolean = false;
+    _fnProcessor: (ctx: any, pub: MQTTPublishTopic, sys: PoolSystem, state: State, data: any) => any
 }
 class MQTTMessage {
     topic: string;
     message: string;
 }
+
+class MqttSubscriptions {
+    public subscriptions: IMQTTSubscription[]
+}
+class MqttTopicSubscription {
+    root: string;
+    topic: string;
+    enabled: boolean;
+    processor: (ctx: any, sub: MqttTopicSubscription, sys: PoolSystem, state: State, value: any) => void;
+    constructor(root: string, sub: any) {
+        this.root = sub.root || root;
+        this.topic = sub.topic;
+        if (typeof sub.processor !== 'undefined') {
+            let fnBody = Array.isArray(sub.processor) ? sub.processor.join('\n') : sub.processor;
+            try {
+                this.processor = new Function('ctx', 'sub', 'sys', 'state', 'value', fnBody) as (ctx: any, sub: MqttTopicSubscription, sys: PoolSystem, state: State, value: any) => void;
+            } catch (err) { logger.error(`Error compiling subscription processor: ${err} -- ${fnBody}`); }
+        }
+    }
+    public get topicPath(): string { return `${this.root}/${this.topic}` };
+    public executeProcessor(value: any) {
+        let ctx = { util:utils }
+        this.processor(ctx, this, sys, state, value);
+        state.emitEquipmentChanges();
+    }
+        
+}
+export interface IMQTTSubscription {
+    topic: string,
+    description: string,
+    processor?: string,
+    enabled?: boolean
+}