@bitpoolos/edge-bacnet 1.4.1 → 1.4.2

package/CHANGELOG.md

@@ -1,4 +1,25 @@
 # Changelog
+
+## [1.4.2] - 23-07-2024
+### Summary 
+
+Improved UI tree generation, fixing some unique scenarios where devices were not being correctly added. 
+
+Added new payload type: Individual JSON. This publishes JSON payloads to a point level, rather than to a device or property level. 
+
+Added payload and output types to be configured via Inject node. Any checked options in the inject node will take priority over read node options. Note - to use read node output types only, please deselect all inject node output options.
+
+Added dumb BACnet parent devices to UI tree, for unique situations where MSTP devices are on a network without a parent IP device. 
+
+Bug fixes:
+ - Importing read list was incorrectly generating UI 
+ - Block per device JSON payloads were not using DisplayName and JSON key 
+ - Added node-red context variable to monitor if writeProperty event has been subscribed to, avoiding a new subscription for every node-red deploy.
+ - Fixed issue requiring Bacnet server to be constantly enabled in order for the node to function. 
+
+
+No nodes need to be deleted and replaced for this update. 
+
 ## [1.4.1] - 09-07-2024
 
 ### Summary

package/README.md

@@ -39,6 +39,8 @@ $ npm install @bitpoolos/edge-bacnet
 The module can be updated via the Node-RED pallette manager, or via the npm cli. 
 
 ```javascript
+Note: the following is our reccommendation based on error encountered in our experience. The below steps are mostly critical for updates that modify or add new properties to the UI of a node. Refer to comments in changelog.
+
 Upon updating to the latest version, we highly recommend:
  - Check out the changelog for latest feature notes and updates 
  - Remove all @bitpoolos/edge-bacnet nodes from all flows 

package/bacnet_gateway.js

@@ -45,8 +45,6 @@ module.exports = function (RED) {
     //determines whether or not to log a found device on whoIs response
     this.toLogIam = config.toLogIam;
 
-    this.websocketListener = null;
-
     node.bacnetConfig = new BacnetClientConfig(
       node.apduTimeout,
       node.localDeviceAddress,
@@ -75,6 +73,8 @@ module.exports = function (RED) {
     } else {
       node.bacnetClient = new BacnetClient(node.bacnetConfig);
       nodeContext.set("bacnetClient", node.bacnetClient);
+
+      nodeContext.set("serverWritePropEvent", false);
     }
 
     node.bacnetClient.scanMatrix = node.deviceRangeRegisters.filter((ele) => ele.enabled === true);
@@ -107,7 +107,7 @@ module.exports = function (RED) {
             node.status({});
           }, 3000);
         }
-        if (outputType.json && !outputType.mqtt) {
+        if (outputType.json && !outputType.mqtt && !outputType.pointJson) {
           //json
           if (objectPropertyType.simpleWithStatus && !objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
             //simpleWithStatus
@@ -119,7 +119,7 @@ module.exports = function (RED) {
             //simplePayload
             sendSimpleJson(values, readNodeName);
           }
-        } else if (!outputType.json && outputType.mqtt) {
+        } else if (outputType.mqtt && !outputType.json && !outputType.pointJson) {
           //mqtt
           if (objectPropertyType.simpleWithStatus && !objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
             //simpleWithStatus
@@ -131,6 +131,18 @@ module.exports = function (RED) {
             //simplePayload
             sendSimpleMqtt(values, readNodeName);
           }
+        } else if (outputType.pointJson && !outputType.json && !outputType.mqtt) {
+          //pointJson
+          if (objectPropertyType.simpleWithStatus && !objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
+            //simpleWithStatus
+            sendSimpleWithStatus(values, readNodeName, false);
+          } else if (objectPropertyType.fullObject && !objectPropertyType.simplePayload && !objectPropertyType.simpleWithStatus) {
+            //fullObject
+            sendIndividualMsgJson(values, readNodeName);
+          } else if (objectPropertyType.simplePayload && !objectPropertyType.fullObject && !objectPropertyType.simpleWithStatus) {
+            //simplePayload
+            sendSimpleJsonPerPoint(values, readNodeName);
+          }
         }
       }
     });
@@ -164,22 +176,25 @@ module.exports = function (RED) {
       }
     }
 
-    node.bacnetServer.on("writeProperty", (topic, newValue) => {
-      let formattedTopic = topic;
-      if (
-        node.nodeName !== "gateway" &&
-        node.nodeName !== "" &&
-        node.nodeName !== "null" &&
-        node.nodeName !== "undefined" &&
-        typeof node.nodeName == "string"
-      ) {
-        formattedTopic = `${node.nodeName}/BITPOOL_EDGE_BACNET_GATEWAY/BACNET_SERVER/${topic}`;
-      } else {
-        formattedTopic = `BITPOOL_EDGE_BACNET_GATEWAY/BACNET_SERVER/${topic}`;
-      }
+    if (node.bacnetServerEnabled == true && node.bacnetClient && node.bacnetServer && nodeContext.get("serverWritePropEvent") == false) {
+      node.bacnetServer.on("writeProperty", (topic, newValue) => {
+        let formattedTopic = topic;
+        if (
+          node.nodeName !== "gateway" &&
+          node.nodeName !== "" &&
+          node.nodeName !== "null" &&
+          node.nodeName !== "undefined" &&
+          typeof node.nodeName == "string"
+        ) {
+          formattedTopic = `${node.nodeName}/BITPOOL_EDGE_BACNET_GATEWAY/BACNET_SERVER/${topic}`;
+        } else {
+          formattedTopic = `BITPOOL_EDGE_BACNET_GATEWAY/BACNET_SERVER/${topic}`;
+        }
 
-      node.send({ payload: newValue, topic: formattedTopic });
-    });
+        node.send({ payload: newValue, topic: formattedTopic });
+      });
+      nodeContext.set("serverWritePropEvent", true);
+    }
 
     node.on("input", function (msg) {
       if (msg.topic && msg.payload !== null) {
@@ -441,7 +456,7 @@ module.exports = function (RED) {
               node.status({});
             }, 3000);
           }
-          if (outputType.json && !outputType.mqtt) {
+          if (outputType.json && !outputType.mqtt && !outputType.pointJson) {
             //json
             if (objectPropertyType.simpleWithStatus && !objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
               //simpleWithStatus
@@ -453,7 +468,7 @@ module.exports = function (RED) {
               //simplePayload
               sendSimpleJson(values, readNodeName);
             }
-          } else if (!outputType.json && outputType.mqtt) {
+          } else if (outputType.mqtt && !outputType.json && !outputType.pointJson) {
             //mqtt
             if (objectPropertyType.simpleWithStatus && !objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
               //simpleWithStatus
@@ -465,6 +480,18 @@ module.exports = function (RED) {
               //simplePayload
               sendSimpleMqtt(values, readNodeName);
             }
+          } else if (outputType.pointJson && !outputType.json && !outputType.mqtt) {
+            //pointJson
+            if (objectPropertyType.simpleWithStatus && !objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
+              //simpleWithStatus
+              sendSimpleWithStatus(values, readNodeName, false);
+            } else if (objectPropertyType.fullObject && !objectPropertyType.simplePayload && !objectPropertyType.simpleWithStatus) {
+              //fullObject
+              sendIndividualMsgJson(values, readNodeName);
+            } else if (objectPropertyType.simplePayload && !objectPropertyType.fullObject && !objectPropertyType.simpleWithStatus) {
+              //simplePayload
+              sendSimpleJsonPerPoint(values, readNodeName);
+            }
           }
         }
       });
@@ -487,13 +514,6 @@ module.exports = function (RED) {
       }
     }
 
-    function getPointName(object, pointName) {
-      if (object.displayName) {
-        return object.displayName;
-      }
-      return pointName;
-    }
-
     sendSimpleWithStatus = function (values, readNodeName, isJson) {
       let devices = Object.keys(values);
       devices.forEach(function (device) {
@@ -739,6 +759,7 @@ module.exports = function (RED) {
         keys.forEach(function (key) {
           let points = values[key];
           let msgg = {};
+          let structuredObject = {};
           if (
             node.nodeName !== "gateway" &&
             node.nodeName !== "" &&
@@ -764,12 +785,112 @@ module.exports = function (RED) {
               msgg.topic = `BITPOOL_BACNET_GATEWAY/${key}`;
             }
           }
-          msgg.payload = points;
+          for (let point in points) {
+            let pointName = getPointName(points[point], point);
+            structuredObject[pointName] = points[point];
+          }
+
+          msgg.payload = structuredObject;
           node.send(msgg);
         });
       }
     };
-  }
 
+    sendIndividualMsgJson = function (values, readNodeName) {
+      if (typeof values == "object") {
+        let keys = Object.keys(values);
+        keys.forEach(function (key) {
+          let points = values[key];
+          let msgg = {};
+          for (let point in points) {
+            let pointName = getPointName(points[point], point);
+            if (
+              node.nodeName !== "gateway" &&
+              node.nodeName !== "" &&
+              node.nodeName !== "null" &&
+              node.nodeName !== "undefined" &&
+              typeof node.nodeName == "string"
+            ) {
+              if (readNodeName !== '' &&
+                readNodeName !== null &&
+                readNodeName !== undefined
+              ) {
+                msgg.topic = `${node.nodeName}/${readNodeName}/${key}/${pointName}`;
+              } else {
+                msgg.topic = `${node.nodeName}/${key}/${pointName}`;
+              }
+            } else {
+              if (readNodeName !== '' &&
+                readNodeName !== null &&
+                readNodeName !== undefined
+              ) {
+                msgg.topic = `BITPOOL_BACNET_GATEWAY/${readNodeName}/${key}/${pointName}`;
+              } else {
+                msgg.topic = `BITPOOL_BACNET_GATEWAY/${key}/${pointName}`;
+              }
+            }
+
+            msgg.payload = points[point];
+            node.send(msgg);
+            msgg = {};
+          }
+        });
+      }
+    }
+
+    sendSimpleJsonPerPoint = function (values, readNodeName) {
+      let devices = Object.keys(values);
+      devices.forEach(function (device) {
+        if (device !== "_msgid") {
+          let points = values[device];
+          let msgg = {};
+          for (let point in points) {
+            if (points[point] && "presentValue" in points[point]) {
+              let pointName = getPointName(points[point], point);
+              if (
+                node.nodeName !== "gateway" &&
+                node.nodeName !== "" &&
+                node.nodeName !== "null" &&
+                node.nodeName !== "undefined" &&
+                typeof node.nodeName == "string"
+              ) {
+                if (readNodeName !== '' &&
+                  readNodeName !== null &&
+                  readNodeName !== undefined
+                ) {
+                  msgg.topic = `${node.nodeName}/${readNodeName}/${device}/${pointName}`;
+                } else {
+                  msgg.topic = `${node.nodeName}/${device}/${pointName}`;
+                }
+              } else {
+                if (readNodeName !== '' &&
+                  readNodeName !== null &&
+                  readNodeName !== undefined
+                ) {
+                  msgg.topic = `BITPOOL_BACNET_GATEWAY/${readNodeName}/${device}/${pointName}`;
+                } else {
+                  msgg.topic = `BITPOOL_BACNET_GATEWAY/${device}/${pointName}`;
+                }
+              }
+              let payload = {
+                presentValue: points[point]["presentValue"]
+              };
+              msgg.payload = payload;
+              node.send(msgg);
+              msgg = {};
+            }
+          }
+        }
+      });
+    }
+
+    function getPointName(object, pointName) {
+      if (object.displayName) {
+        return object.displayName;
+      }
+      return pointName;
+    }
+
+  }
   RED.nodes.registerType("Bacnet-Gateway", BitpoolBacnetGatewayDevice);
 };

package/bacnet_read.html

@@ -11,6 +11,7 @@
             events: { value: true },
             json: { value: true },
             mqtt: { value: false },
+            pointJson: { value: false },
             hiddenDeployToggle: { value: false },
             prevHiddenToggleState: { value: false },
             roundDecimal: { value: 2 },
@@ -725,75 +726,21 @@
                                         if (pointName == "deviceName") {
                                             app.nodeService.setDeviceDisplayName(device, point);
                                             treeDevice.label = point;
-                                        }
-                                        let pointInTree = treeDevice.children[0].children.find(
-                                            (ele) => ele.data == pointName && ele.bacnetType == point.meta.objectId.type
-                                        );
-
-                                        if (pointInTree) {
-                                            pointInTree.label = point.displayName;
-
-                                            const isDeviceInReadList = app.readDevices
-                                                ? app.readDevices.findIndex((ele) => ele.deviceId == treeDevice.deviceId)
-                                                : -1;
-
-                                            if (isDeviceInReadList == -1) {
-                                                //no read devices present, add new
-                                                let newReadParent = JSON.parse(JSON.stringify(treeDevice));
-                                                newReadParent.children[0].children = [];
-                                                newReadParent.children[0].children.push(pointInTree);
-                                                if (app.readDevices) {
-                                                    app.readDevices.push(newReadParent);
-                                                } else {
-                                                    app.readDevices = [newReadParent];
-                                                }
-                                            } else {
-                                                // read device found, add point to existing
-                                                let pointIndex = app.readDevices[isDeviceInReadList].children[0].children.findIndex(
-                                                    (ele) => ele.data == point.objectName
-                                                );
-                                                if (pointIndex == -1) {
-                                                    app.readDevices[isDeviceInReadList].children[0].children.push(pointInTree);
-                                                } else {
-                                                    app.readDevices[isDeviceInReadList].children[0].children[pointIndex] = pointInTree;
-                                                }
-                                            }
-                                        }
-                                    }
-                                } else {
-                                    //search mstp devices
-                                    let mstpIndex = app.devices[foundIndex].children[1].children.findIndex((ele) => ele.deviceId == id);
-
-                                    if (mstpIndex !== -1) {
-                                        let mstpDevice = app.devices[foundIndex].children[1].children[mstpIndex];
-                                        let device = app.deviceList.find((ele) => {
-                                            if (ele.address.address) {
-                                                return ele.address.address == ip && ele.deviceId == id;
-                                            } else {
-                                                return ele.address == ip && ele.deviceId == id;
-                                            }
-                                        });
-
-                                        for (let pointName in importedDevice) {
-                                            let point = importedDevice[pointName];
-                                            if (pointName == "deviceName") {
-                                                app.nodeService.setDeviceDisplayName(device, point);
-                                                mstpDevice.label = point;
-                                            }
-                                            let pointInTree = mstpDevice.children[0].children.find(
-                                                (ele) => ele.data == pointName && ele.bacnetType == point.meta.objectId.type
+                                        } else {
+                                            let pointInTree = treeDevice.children[0].children.find(
+                                                (ele) => ele.bacnetInstance == point.meta.objectId.instance && ele.bacnetType == point.meta.objectId.type
                                             );
 
                                             if (pointInTree) {
                                                 pointInTree.label = point.displayName;
 
                                                 const isDeviceInReadList = app.readDevices
-                                                    ? app.readDevices.findIndex((ele) => ele.deviceId == mstpDevice.deviceId)
+                                                    ? app.readDevices.findIndex((ele) => ele.deviceId == treeDevice.deviceId)
                                                     : -1;
 
                                                 if (isDeviceInReadList == -1) {
                                                     //no read devices present, add new
-                                                    let newReadParent = JSON.parse(JSON.stringify(mstpDevice));
+                                                    let newReadParent = JSON.parse(JSON.stringify(treeDevice));
                                                     newReadParent.children[0].children = [];
                                                     newReadParent.children[0].children.push(pointInTree);
                                                     if (app.readDevices) {
@@ -814,6 +761,74 @@
                                                 }
                                             }
                                         }
+                                    }
+                                } else {
+                                    //search mstp devices
+                                    let mstpIndex = -1;
+                                    let folderIndex = -1;
+
+                                    app.devices[foundIndex].children.forEach(function (child, index) {
+                                        let temporaryIndex = -1;
+                                        if (child.label.includes("MSTP")) {
+                                            temporaryIndex = child.children.findIndex((ele) => ele.deviceId == id);
+                                        }
+                                        if (temporaryIndex !== -1) {
+                                            mstpIndex = temporaryIndex;
+                                            folderIndex = index;
+                                        }
+                                    });
+
+                                    if (mstpIndex !== -1 && folderIndex !== -1) {
+                                        let mstpDevice = app.devices[foundIndex].children[folderIndex].children[mstpIndex];
+                                        let device = app.deviceList.find((ele) => {
+                                            if (ele.address.address) {
+                                                return ele.address.address == ip && ele.deviceId == id;
+                                            } else {
+                                                return ele.address == ip && ele.deviceId == id;
+                                            }
+                                        });
+
+                                        for (let pointName in importedDevice) {
+                                            let point = importedDevice[pointName];
+                                            if (pointName == "deviceName") {
+                                                app.nodeService.setDeviceDisplayName(device, point);
+                                                mstpDevice.label = point;
+                                            } else {
+                                                let pointInTree = mstpDevice.children[0].children.find(
+                                                    (ele) => ele.bacnetInstance == point.meta.objectId.instance && ele.bacnetType == point.meta.objectId.type
+                                                );
+
+                                                if (pointInTree) {
+                                                    pointInTree.label = point.displayName;
+
+                                                    const isDeviceInReadList = app.readDevices
+                                                        ? app.readDevices.findIndex((ele) => ele.deviceId == mstpDevice.deviceId)
+                                                        : -1;
+
+                                                    if (isDeviceInReadList == -1) {
+                                                        //no read devices present, add new
+                                                        let newReadParent = JSON.parse(JSON.stringify(mstpDevice));
+                                                        newReadParent.children[0].children = [];
+                                                        newReadParent.children[0].children.push(pointInTree);
+                                                        if (app.readDevices) {
+                                                            app.readDevices.push(newReadParent);
+                                                        } else {
+                                                            app.readDevices = [newReadParent];
+                                                        }
+                                                    } else {
+                                                        // read device found, add point to existing
+                                                        let pointIndex = app.readDevices[isDeviceInReadList].children[0].children.findIndex(
+                                                            (ele) => ele.data == point.objectName
+                                                        );
+                                                        if (pointIndex == -1) {
+                                                            app.readDevices[isDeviceInReadList].children[0].children.push(pointInTree);
+                                                        } else {
+                                                            app.readDevices[isDeviceInReadList].children[0].children[pointIndex] = pointInTree;
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
                                     } else {
                                         // not part of device list at all, notify user
                                     }
@@ -876,6 +891,8 @@
             document.getElementById("node-input-json").onclick = handleMsgTypeClick;
             document.getElementById("node-input-mqtt").checked = node.mqtt;
             document.getElementById("node-input-mqtt").onclick = handleMsgTypeClick;
+            document.getElementById("node-input-pointJson").checked = node.pointJson;
+            document.getElementById("node-input-pointJson").onclick = handleMsgTypeClick;
 
             var menu = document.querySelector(".context-menu");
             window.addEventListener("click", (event) => {
@@ -904,10 +921,16 @@
 
             function handleMsgTypeClick() {
                 if (this.id == "node-input-json") {
-                    document.getElementById("node-input-mqtt").checked = !document.getElementById("node-input-mqtt").checked;
+                    document.getElementById("node-input-mqtt").checked = false;
+                    document.getElementById("node-input-pointJson").checked = false;
                 }
                 if (this.id == "node-input-mqtt") {
-                    document.getElementById("node-input-json").checked = !document.getElementById("node-input-json").checked;
+                    document.getElementById("node-input-json").checked = false;
+                    document.getElementById("node-input-pointJson").checked = false;
+                }
+                if (this.id == "node-input-pointJson") {
+                    document.getElementById("node-input-json").checked = false;
+                    document.getElementById("node-input-mqtt").checked = false;
                 }
             }
 
@@ -1312,6 +1335,17 @@
               >Individual msgs</label
             >
           </div>
+          <div style="display: flex; flex-direction: row; align-items: flex-start;">
+            <input
+              class="checkbox-round"
+              type="checkbox"
+              id="node-input-pointJson"
+              style="width: 13px; margin-left: 5px;" /><label
+              for="node-input-pointJson"
+              style="padding-left: 20px; width: fit-content;"
+              >Individual JSON</label
+            >
+          </div>
         </div>
       </div>
 

package/bacnet_read.js

@@ -15,6 +15,7 @@ module.exports = function (RED) {
 
     this.json = config.json;
     this.mqtt = config.mqtt;
+    this.pointJson = config.pointJson;
     this.roundDecimal = config.roundDecimal;
     this.pointsToRead = config.pointsToRead;
     this.readDevices = config.readDevices;
@@ -55,20 +56,54 @@ module.exports = function (RED) {
     node.on('input', function (msg) {
       node.status({ fill: "blue", shape: "dot", text: "Reading values" });
 
+      let object_property_simplePayload = false;
+      let object_property_simpleWithStatus = false;
+      let object_property_fullObject = false;
+
+      let jsonType = false;
+      let mqttType = false;
+      let pointJsonType = false;
+
+      if (msg.simplePayload) {
+        object_property_simplePayload = msg.simplePayload;
+      } else if (msg.simpleWithStatus) {
+        object_property_simpleWithStatus = msg.simpleWithStatus;
+      } else if (msg.fullObject) {
+        object_property_fullObject = msg.fullObject;
+      } else {
+        object_property_simplePayload = node.object_property_simplePayload;
+        object_property_simpleWithStatus = node.object_property_simpleWithStatus;
+        object_property_fullObject = node.object_property_fullObject;
+      }
+
+      if (msg.json) {
+        jsonType = msg.json;
+      } else if (msg.mqtt) {
+        mqttType = msg.mqtt;
+      } else if (msg.pointJson) {
+        pointJsonType = msg.pointJson;
+      } else {
+        jsonType = node.json;
+        mqttType = node.mqtt;
+        pointJsonType = node.pointJson
+      }
+
       let readConfig = new ReadCommandConfig(node.pointsToRead, node.object_props, node.roundDecimal);
+
       let output = {
         type: "Read",
         id: node.id,
         readNodeName: node.nodeName,
         options: readConfig,
         objectPropertyType: {
-          simplePayload: node.object_property_simplePayload,
-          simpleWithStatus: node.object_property_simpleWithStatus,
-          fullObject: node.object_property_fullObject
+          simplePayload: object_property_simplePayload,
+          simpleWithStatus: object_property_simpleWithStatus,
+          fullObject: object_property_fullObject
         },
         outputType: {
-          json: node.json,
-          mqtt: node.mqtt
+          json: jsonType,
+          mqtt: mqttType,
+          pointJson: pointJsonType
         }
       };
 

package/bitpool_inject.html

@@ -42,7 +42,104 @@
                 </div>
             </div>
 
-            
+            <div class="form-row" style="display: flex; width: fit-content; flex-wrap: nowrap; flex-direction: row; padding-top: 10px; margin-left: auto; margin-right: auto;">
+
+                <div
+                  id="node-input-object_properties_group"
+                  style="display: flex; align-items: flex-start; flex-direction: column;">
+                    <label
+                    for="node-input-object_properties_group"
+                    style="display: flex; align-items: center; white-space: nowrap; text-decoration: underline;"
+                    >
+                        Object Properties:
+                    </label>
+                    
+                    <div class="objectPropertiesLabel">
+                        <label
+                        for="node-input-object_property_simplePayload"
+                        style="padding-left: 4px; width: auto; align-items: start;"
+                        class="objectPropertiesLabel">
+                        <i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.object_property_simplePayload"></span>
+                        <input
+                            style="margin-left: 5px;"
+                            class=" objectProp"
+                            type="checkbox"
+                            id="node-input-object_property_simplePayload" />
+                        <a style="white-space: nowrap; padding-left: 20px;">Simple Payload</a>
+                        </label>
+                    </div>
+        
+                    <div class="objectPropertiesLabel">
+                        <label
+                        for="node-input-object_property_simpleWithStatus"
+                        style="padding-left: 4px; width: auto; align-items: start;"
+                        class="objectPropertiesLabel">
+                        <i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.object_property_simpleWithStatus"></span>
+                        <input
+                            style="margin-left: 5px;"
+                            class=" objectProp"
+                            type="checkbox"
+                            id="node-input-object_property_simpleWithStatus" />
+                        <a style="white-space: nowrap; padding-left: 20px;">Simple With Status</a>
+                        </label>
+                    </div>
+        
+                    <div class="objectPropertiesLabel">
+                        <label
+                        for="node-input-object_property_fullObject"
+                        style="padding-left: 4px; width: auto; align-items: start;"
+                        class="objectPropertiesLabel">
+                        <i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.object_property_fullObject"></span>
+                        <input
+                            style="margin-left: 5px;"
+                            class=" objectProp"
+                            type="checkbox"
+                            id="node-input-object_property_fullObject" />
+                        <a style="white-space: nowrap; padding-left: 20px;">Full Object</a>
+                        </label>
+                    </div>
+        
+                </div>
+                <div
+                  id="node-input-msgType"
+                  style="display: flex; align-items: flex-start; flex-direction: column; padding-left: 50px;">
+                  <label for="node-input-msgType" style="text-decoration: underline;"> Message type: </label>
+                  <!-- class= checkbox-round -->
+                  <div style="display: flex; flex-direction: row; align-items: flex-start;">
+                    <input
+                      class="checkbox-round"
+                      type="checkbox"
+                      id="node-input-json"
+                      style="width: 13px; margin-left: 5px;" /><label
+                      for="node-input-json"
+                      style="padding-left: 20px; width: fit-content;"
+                      >Block per device</label
+                    >
+                  </div>
+                  <div style="display: flex; flex-direction: row; align-items: flex-start;">
+                    <input
+                      class="checkbox-round"
+                      type="checkbox"
+                      id="node-input-mqtt"
+                      style="width: 13px; margin-left: 5px;" /><label
+                      for="node-input-mqtt"
+                      style="padding-left: 20px; width: fit-content;"
+                      >Individual msgs</label
+                    >
+                  </div>
+                  <div style="display: flex; flex-direction: row; align-items: flex-start;">
+                    <input
+                      class="checkbox-round"
+                      type="checkbox"
+                      id="node-input-pointJson"
+                      style="width: 13px; margin-left: 5px;" /><label
+                      for="node-input-pointJson"
+                      style="padding-left: 20px; width: fit-content;"
+                      >Individual JSON</label
+                    >
+                  </div>
+                </div>
+            </div>
         </div>
 
         <div class="injectHeading" style="margin-top: 20px;">
@@ -373,6 +470,12 @@
                 payloadType: { value: "date" },
                 doPoll: { value: true },
                 doDiscover: { value: false },
+                json: { value: false },
+                mqtt: { value: false },
+                pointJson: { value: true },
+                object_property_simplePayload: { value: false },
+                object_property_simpleWithStatus: { value: false },
+                object_property_fullObject: { value: true },
             },
             icon: "bitpool.svg",
             inputs: 0,
@@ -669,10 +772,26 @@
                 $("#inject-time-type-select").trigger("change");
                 $("#inject-time-interval-time-start").trigger("change");
 
+                document.getElementById("node-input-object_property_simplePayload").checked = node.object_property_simplePayload;
+                document.getElementById("node-input-object_property_simplePayload").onclick = handlePayloadCheckboxClick;
+                document.getElementById("node-input-object_property_simpleWithStatus").checked = node.object_property_simpleWithStatus;
+                document.getElementById("node-input-object_property_simpleWithStatus").onclick = handlePayloadCheckboxClick;
+                document.getElementById("node-input-object_property_fullObject").checked = node.object_property_fullObject;
+                document.getElementById("node-input-object_property_fullObject").onclick = handlePayloadCheckboxClick;
+
 
                 document.getElementById("node-input-doDiscover").onclick = handleCheckboxClick;
                 document.getElementById("node-input-doPoll").onclick = handleCheckboxClick;
 
+                document.getElementById("node-input-json").checked = node.json;
+                document.getElementById("node-input-json").onclick = handleMsgTypeClick;
+                document.getElementById("node-input-mqtt").checked = node.mqtt;
+                document.getElementById("node-input-mqtt").onclick = handleMsgTypeClick;
+                document.getElementById("node-input-pointJson").checked = node.pointJson;
+                document.getElementById("node-input-pointJson").onclick = handleMsgTypeClick;
+
+
+
                 function handleCheckboxClick() {
                     if (this.id == "node-input-doDiscover") {
                         document.getElementById("node-input-doPoll").checked = false;
@@ -682,6 +801,36 @@
                     }
                 }
 
+                function handlePayloadCheckboxClick() {
+                    if (this.id == "node-input-object_property_simplePayload") {
+                        document.getElementById("node-input-object_property_fullObject").checked = false;
+                        document.getElementById("node-input-object_property_simpleWithStatus").checked = false;
+                    }
+                    if (this.id == "node-input-object_property_simpleWithStatus") {
+                        document.getElementById("node-input-object_property_fullObject").checked = false;
+                        document.getElementById("node-input-object_property_simplePayload").checked = false;
+                    }
+                    if (this.id == "node-input-object_property_fullObject") {
+                        document.getElementById("node-input-object_property_simplePayload").checked = false;
+                        document.getElementById("node-input-object_property_simpleWithStatus").checked = false;
+                    }
+                }
+
+                function handleMsgTypeClick() {
+                    if (this.id == "node-input-json") {
+                        document.getElementById("node-input-mqtt").checked = false;
+                        document.getElementById("node-input-pointJson").checked = false;
+                    }
+                    if (this.id == "node-input-mqtt") {
+                        document.getElementById("node-input-json").checked = false;
+                        document.getElementById("node-input-pointJson").checked = false;
+                    }
+                    if (this.id == "node-input-pointJson") {
+                        document.getElementById("node-input-json").checked = false;
+                        document.getElementById("node-input-mqtt").checked = false;
+                    }
+                }
+
             },
             oneditsave: function () {
                 var repeat = "";

package/bitpool_inject.js

@@ -19,28 +19,28 @@
 */
 
 
- module.exports = function(RED) {
+module.exports = function (RED) {
     "use strict";
-    const {scheduleTask} = require("cronosjs");
+    const { scheduleTask } = require("cronosjs");
 
     function BitpoolInjectNode(n) {
-        RED.nodes.createNode(this,n);
+        RED.nodes.createNode(this, n);
 
         /* Handle legacy */
-        if(!Array.isArray(n.props)){
+        if (!Array.isArray(n.props)) {
             n.props = [];
             n.props.push({
-                p:'payload',
-                v:n.payload,
-                vt:n.payloadType
+                p: 'payload',
+                v: n.payload,
+                vt: n.payloadType
             });
             n.props.push({
-                p:'topic',
-                v:n.topic,
-                vt:'str'
+                p: 'topic',
+                v: n.topic,
+                vt: 'str'
             });
         } else {
-            for (var i=0,l=n.props.length; i<l; i++) {
+            for (var i = 0, l = n.props.length; i < l; i++) {
                 if (n.props[i].p === 'payload' && !n.props[i].hasOwnProperty('v')) {
                     n.props[i].v = n.payload;
                     n.props[i].vt = n.payloadType;
@@ -56,6 +56,14 @@
         this.once = n.once;
         this.doPoll = n.doPoll;
         this.doDiscover = n.doDiscover;
+
+        this.object_property_simplePayload = n.object_property_simplePayload;
+        this.object_property_simpleWithStatus = n.object_property_simpleWithStatus;
+        this.object_property_fullObject = n.object_property_fullObject;
+        this.json = n.json;
+        this.mqtt = n.mqtt;
+        this.pointJson = n.pointJson;
+
         this.onceDelay = (n.onceDelay || 0.1) * 1000;
         this.interval_id = null;
         this.cronjob = null;
@@ -68,7 +76,7 @@
                     prop.exp = RED.util.prepareJSONataExpression(val, node);
                 }
                 catch (err) {
-                    node.error(RED._("inject.errors.invalid-expr", {error:err.message}));
+                    node.error(RED._("inject.errors.invalid-expr", { error: err.message }));
                     prop.exp = null;
                 }
             }
@@ -83,27 +91,37 @@
             if (this.repeat && !isNaN(this.repeat) && this.repeat > 0) {
                 this.repeat = this.repeat * 1000;
                 this.debug(RED._("inject.repeat", this));
-                this.interval_id = setInterval(function() {
+                this.interval_id = setInterval(function () {
                     node.emit("input", {});
                 }, this.repeat);
             } else if (this.crontab) {
                 this.debug(RED._("inject.crontab", this));
-                this.cronjob = scheduleTask(this.crontab,() => { node.emit("input", {})});
+                this.cronjob = scheduleTask(this.crontab, () => { node.emit("input", {}) });
             }
         };
 
         if (this.once) {
-            this.onceTimeout = setTimeout( function() {
-                node.emit("input",{});
+            this.onceTimeout = setTimeout(function () {
+                node.emit("input", {});
                 node.repeaterSetup();
             }, this.onceDelay);
         } else {
             node.repeaterSetup();
         }
 
-        this.on("input", function(msg, send, done) {
+        this.on("input", function (msg, send, done) {
             msg.doDiscover = node.doDiscover;
             msg.doPoll = node.doPoll;
+
+            msg.simplePayload = node.object_property_simplePayload;
+            msg.simpleWithStatus = node.object_property_simpleWithStatus;
+            msg.fullObject = node.object_property_fullObject;
+
+            msg.json = node.json;
+            msg.mqtt = node.mqtt;
+            msg.pointJson = node.pointJson;
+
+
             var errors = [];
             var props = this.props;
             if (msg.__user_inject_props__ && Array.isArray(msg.__user_inject_props__)) {
@@ -124,14 +142,14 @@
                             var val = RED.util.evaluateJSONataExpression(exp, msg);
                             RED.util.setMessageProperty(msg, property, val, true);
                         }
-                        catch  (err) {
+                        catch (err) {
                             errors.push(err.message);
                         }
                     }
                     return;
                 }
                 try {
-                    RED.util.setMessageProperty(msg,property,RED.util.evaluateNodeProperty(value, valueType, this, msg),true);
+                    RED.util.setMessageProperty(msg, property, RED.util.evaluateNodeProperty(value, valueType, this, msg), true);
                 } catch (err) {
                     errors.push(err.toString());
                 }
@@ -146,9 +164,9 @@
         });
     }
 
-    RED.nodes.registerType("Bitpool-Inject",BitpoolInjectNode);
+    RED.nodes.registerType("Bitpool-Inject", BitpoolInjectNode);
 
-    BitpoolInjectNode.prototype.close = function() {
+    BitpoolInjectNode.prototype.close = function () {
         if (this.onceTimeout) {
             clearTimeout(this.onceTimeout);
         }
@@ -160,7 +178,7 @@
         }
     };
 
-    RED.httpAdmin.post("/inject/:id", RED.auth.needsPermission("inject.write"), function(req,res) {
+    RED.httpAdmin.post("/inject/:id", RED.auth.needsPermission("inject.write"), function (req, res) {
         var node = RED.nodes.getNode(req.params.id);
         if (node != null) {
             try {
@@ -170,9 +188,9 @@
                     node.receive();
                 }
                 res.sendStatus(200);
-            } catch(err) {
+            } catch (err) {
                 res.sendStatus(500);
-                node.error(RED._("inject.failed",{error:err.toString()}));
+                node.error(RED._("inject.failed", { error: err.toString() }));
             }
         } else {
             res.sendStatus(404);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitpoolos/edge-bacnet",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "A bacnet gateway for node-red",
   "dependencies": {
     "@plus4nodered/ts-node-bacnet": "^1.0.0-beta.2",

package/treeBuilder.js

@@ -1,4 +1,5 @@
 const { Store_Config } = require("./common");
+const { BacnetDevice } = require("./bacnet_device");
 
 /**
  * The `treeBuilder` class is responsible for building and processing the network tree structure.
@@ -111,6 +112,42 @@ class treeBuilder {
         }
     }
 
+    addEmptyIpRootDevice(childDevice) {
+
+        const ipAddress = this.getDeviceIpAddress(childDevice);
+
+        let deviceIndex = this.deviceList.findIndex(ele => ele.address === ipAddress && ele.deviceId === null && ele.deviceName === ipAddress && ele.displayName === ipAddress);
+
+        if (deviceIndex === -1) {
+            let newDevice = {
+                address: ipAddress,
+                isMstp: false,
+                deviceId: null,
+                maxApdu: childDevice.getMaxApdu(),
+                segmentation: childDevice.getSegmentation(),
+                vendorId: childDevice.getVendorId(),
+                lastSeen: null,
+                deviceName: ipAddress,
+                pointsList: [],
+                pointListUpdateTs: null,
+                manualDiscoveryMode: false,
+                pointListRetryCount: 0,
+                priorityQueueIsActive: false,
+                priorityQueue: [],
+                lastPriorityQueueTS: null,
+                childDevices: [childDevice.getDeviceId()],
+                parentDeviceId: null,
+                displayName: ipAddress,
+                protocolServicesSupported: [],
+                isProtocolServicesSet: false,
+                isInitialQuery: true,
+            };
+
+            let newBacnetDevice = new BacnetDevice(true, newDevice);
+            this.deviceList.push(newBacnetDevice);
+        }
+    }
+
     /**
      * Process the points of a device and add them to the render list.
      * 
@@ -124,7 +161,7 @@ class treeBuilder {
      */
     async processDevicePoints(device, deviceObject, deviceName, ipAddress, deviceId, index) {
         // Initialize the list of children points
-        const children = [];
+        let children = [];
 
         // Process each point in the device object
         for (const pointName in deviceObject) {
@@ -171,6 +208,7 @@ class treeBuilder {
             parentDeviceId: device.getDeviceId(),
             showAdded: false,
             bacnetType: point.meta.objectId.type,
+            bacnetInstance: point.meta.objectId.instance,
         };
     }
 
@@ -305,7 +343,21 @@ class treeBuilder {
                 } else {
                     mstpNetworkFolder.children[mstpDeviceIndex] = newDeviceEntry;
                 }
+            } else {
+                //no parent found in render list
+
+                if (parentDeviceId !== null) {
+                    let parentDeviceListIndex = this.deviceList.findIndex(ele => ele.getDeviceId == parentDeviceId);
+
+                    if (parentDeviceListIndex !== -1) {
+                        let parentDevice = this.deviceList[parentDeviceListIndex];
+                        this.addRootDeviceFolder(parentDevice, parentDevice.getDeviceName(), parentDeviceListIndex, parentDevice.getAddress(), parentDeviceId);
+                    }
+                } else {
+                    this.addEmptyIpRootDevice(device);
+                }
             }
+
         } else {
             // Add the new device entry to the root of the render list
             if (foundIndex === -1) {