Fix MQTT root issue in controller node

Fixes second issue in #15
tbowmo · Jun 21, 2018 · 987dff7 · 987dff7
1 parent 687186f
commit 987dff7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "author": {
     "name": "Thomas Bowman Mørch"
   },
-  "version": "3.1.1",
+  "version": "3.1.2",
   "scripts": {
     "build": "mkdir -p dist/nodes/ && cp -a src/nodes/*.html dist/nodes/ && cp -R src/migrations dist && tsc ",
     "pretest": "tsc",

diff --git a/src/lib/mysensors-controller.ts b/src/lib/mysensors-controller.ts
@@ -16,6 +16,7 @@ export class MysensorsController {
         private timeResponse: boolean,
         private timeZone: string,
         private measurementSystem: string,
+        private mqttRoot: string,
     ) { }
 
     public async messageHandler(msg: IMysensorsMsg): Promise<IMysensorsMsg | undefined> {
@@ -97,6 +98,7 @@ export class MysensorsController {
     private encode(msg: IMysensorsMsg| undefined) {
         let encoder: IDecoder| undefined;
         if (NullCheck.isDefinedOrNonNull(msg)) {
+            msg.topicRoot = this.mqttRoot;
             if (msg.origin === MsgOrigin.serial) {
                 encoder = new MysensorsSerial();
             } else if (msg.origin === MsgOrigin.mqtt) {

diff --git a/src/nodes/common.ts b/src/nodes/common.ts
@@ -37,6 +37,7 @@ export interface IControllerProperties extends NodeProperties {
     timeresponse?: boolean;
     timezone?: string;
     measurementsystem?: string;
+    mqttroot?: string;
 }
 
 export interface IControllerConfig extends Node {

diff --git a/src/nodes/controller.html b/src/nodes/controller.html
@@ -8,7 +8,8 @@
             handleid: {value: true},
             timeresponse: {value: true},
             timezone: {value: 'UTC'},
-            measurementsystem: {value: 'M'}
+            measurementsystem: {value: 'M'},
+            mqttroot: {value: 'mys-out'}
         },
         inputs:1,
         outputs:1,
@@ -51,6 +52,10 @@
         <label for="node-input-name"><i class="icon-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
+    <div class="form-row">
+        <label for="node-input-mqttroot"><i class="icon-tag"></i> MQTT root</label>
+        <input type="text" id="node-input-mqttroot" placeholder="mys-out">
+    </div>
     <div class="form-row">
         <label for="node-input-database"><i class="icon-tag"></i> Database</label>
         <input type="text" id="node-input-database" placeholder="Database">

diff --git a/src/nodes/controller.ts b/src/nodes/controller.ts
@@ -15,6 +15,7 @@ export = (RED: Red) => {
                     props.timeresponse || true,
                     props.timezone || 'UTC',
                     props.measurementsystem || 'M',
+                    props.mqttroot || 'mys-out',
                 );
                 this.on('input', (msg: IMysensorsMsg) => {
                     (this.controller).messageHandler(msg).then((msgOut: IMysensorsMsg| undefined) => {