@bitpoolos/edge-bacnet 1.4.2 → 1.4.3

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [1.4.3] - 01-08-2024
+### Summary 
+
+Minor updates.
+
+Added refresh button to readList tab on read node, to handle scenarios where read node jsons may be programatically created. 
+
+Added "Use device name in topic" topic property in inject and read nodes. This option toggles whether or not the device name is included in the msg.topic. 
+
+Merge github PR 19. Added ability to configure the creation of a BacnetServer object:
+```javascript
+        payload = {
+            value: 12,
+            resolution: 0,
+            priorityArray: 0,
+            units: 0,
+        }
+```
+
+Inject nodes may need to be deleted and replaced. Try deploying node-red 2 times to instantiate the new deviceName property.
+
+
 ## [1.4.2] - 23-07-2024
 ### Summary 
 

package/bacnet_gateway.js

@@ -107,41 +107,42 @@ module.exports = function (RED) {
             node.status({});
           }, 3000);
         }
+        let useDeviceName = outputType.useDeviceName;
         if (outputType.json && !outputType.mqtt && !outputType.pointJson) {
           //json
           if (objectPropertyType.simpleWithStatus && !objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
             //simpleWithStatus
-            sendSimpleWithStatus(values, readNodeName, true);
+            sendSimpleWithStatus(values, readNodeName, true, useDeviceName);
           } else if (objectPropertyType.fullObject && !objectPropertyType.simplePayload && !objectPropertyType.simpleWithStatus) {
             //fullObject
-            sendJsonAsMqtt(values, readNodeName);
+            sendJsonAsMqtt(values, readNodeName, useDeviceName);
           } else if (objectPropertyType.simplePayload && !objectPropertyType.fullObject && !objectPropertyType.simpleWithStatus) {
             //simplePayload
-            sendSimpleJson(values, readNodeName);
+            sendSimpleJson(values, readNodeName, useDeviceName);
           }
         } else if (outputType.mqtt && !outputType.json && !outputType.pointJson) {
           //mqtt
           if (objectPropertyType.simpleWithStatus && !objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
             //simpleWithStatus
-            sendSimpleWithStatus(values, readNodeName, false);
+            sendSimpleWithStatus(values, readNodeName, false, useDeviceName);
           } else if (objectPropertyType.fullObject && !objectPropertyType.simplePayload && !objectPropertyType.simpleWithStatus) {
             //fullObject
-            sendAsMqtt(values, readNodeName);
+            sendAsMqtt(values, readNodeName, useDeviceName);
           } else if (objectPropertyType.simplePayload && !objectPropertyType.fullObject && !objectPropertyType.simpleWithStatus) {
             //simplePayload
-            sendSimpleMqtt(values, readNodeName);
+            sendSimpleMqtt(values, readNodeName, useDeviceName);
           }
         } else if (outputType.pointJson && !outputType.json && !outputType.mqtt) {
           //pointJson
           if (objectPropertyType.simpleWithStatus && !objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
             //simpleWithStatus
-            sendSimpleWithStatus(values, readNodeName, false);
+            sendSimpleWithStatus(values, readNodeName, false, useDeviceName);
           } else if (objectPropertyType.fullObject && !objectPropertyType.simplePayload && !objectPropertyType.simpleWithStatus) {
             //fullObject
-            sendIndividualMsgJson(values, readNodeName);
+            sendIndividualMsgJson(values, readNodeName, useDeviceName);
           } else if (objectPropertyType.simplePayload && !objectPropertyType.fullObject && !objectPropertyType.simpleWithStatus) {
             //simplePayload
-            sendSimpleJsonPerPoint(values, readNodeName);
+            sendSimpleJsonPerPoint(values, readNodeName, useDeviceName);
           }
         }
       }
@@ -456,41 +457,42 @@ module.exports = function (RED) {
               node.status({});
             }, 3000);
           }
+          let useDeviceName = outputType.useDeviceName;
           if (outputType.json && !outputType.mqtt && !outputType.pointJson) {
             //json
             if (objectPropertyType.simpleWithStatus && !objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
               //simpleWithStatus
-              sendSimpleWithStatus(values, readNodeName, true);
+              sendSimpleWithStatus(values, readNodeName, true, useDeviceName);
             } else if (objectPropertyType.fullObject && !objectPropertyType.simplePayload && !objectPropertyType.simpleWithStatus) {
               //fullObject
-              sendJsonAsMqtt(values, readNodeName);
+              sendJsonAsMqtt(values, readNodeName, useDeviceName);
             } else if (objectPropertyType.simplePayload && !objectPropertyType.fullObject && !objectPropertyType.simpleWithStatus) {
               //simplePayload
-              sendSimpleJson(values, readNodeName);
+              sendSimpleJson(values, readNodeName, useDeviceName);
             }
           } else if (outputType.mqtt && !outputType.json && !outputType.pointJson) {
             //mqtt
             if (objectPropertyType.simpleWithStatus && !objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
               //simpleWithStatus
-              sendSimpleWithStatus(values, readNodeName, false);
+              sendSimpleWithStatus(values, readNodeName, false, useDeviceName);
             } else if (objectPropertyType.fullObject && !objectPropertyType.simplePayload && !objectPropertyType.simpleWithStatus) {
               //fullObject
-              sendAsMqtt(values, readNodeName);
+              sendAsMqtt(values, readNodeName, useDeviceName);
             } else if (objectPropertyType.simplePayload && !objectPropertyType.fullObject && !objectPropertyType.simpleWithStatus) {
               //simplePayload
-              sendSimpleMqtt(values, readNodeName);
+              sendSimpleMqtt(values, readNodeName, useDeviceName);
             }
           } else if (outputType.pointJson && !outputType.json && !outputType.mqtt) {
             //pointJson
             if (objectPropertyType.simpleWithStatus && !objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
               //simpleWithStatus
-              sendSimpleWithStatus(values, readNodeName, false);
+              sendSimpleWithStatus(values, readNodeName, false, useDeviceName);
             } else if (objectPropertyType.fullObject && !objectPropertyType.simplePayload && !objectPropertyType.simpleWithStatus) {
               //fullObject
-              sendIndividualMsgJson(values, readNodeName);
+              sendIndividualMsgJson(values, readNodeName, useDeviceName);
             } else if (objectPropertyType.simplePayload && !objectPropertyType.fullObject && !objectPropertyType.simpleWithStatus) {
               //simplePayload
-              sendSimpleJsonPerPoint(values, readNodeName);
+              sendSimpleJsonPerPoint(values, readNodeName, useDeviceName);
             }
           }
         }
@@ -514,7 +516,94 @@ module.exports = function (RED) {
       }
     }
 
-    sendSimpleWithStatus = function (values, readNodeName, isJson) {
+    function getTopicString(type, useDeviceName, readNodeName, device, pointName, prop) {
+      let topic = "";
+      if (
+        node.nodeName !== "gateway" &&
+        node.nodeName !== "" &&
+        node.nodeName !== "null" &&
+        node.nodeName !== "undefined" &&
+        typeof node.nodeName == "string"
+      ) {
+        if (readNodeName !== '' &&
+          readNodeName !== null &&
+          readNodeName !== undefined
+        ) {
+          if (useDeviceName) {
+            topic = `${node.nodeName}/${readNodeName}/${device}`;
+          } else {
+            topic = `${node.nodeName}/${readNodeName}`;
+          }
+
+        } else {
+          if (useDeviceName) {
+            topic = `${node.nodeName}/${device}`;
+          } else {
+            topic = `${node.nodeName}`;
+          }
+        }
+      } else {
+        if (readNodeName !== '' &&
+          readNodeName !== null &&
+          readNodeName !== undefined
+        ) {
+          if (useDeviceName) {
+            topic = `BITPOOL_BACNET_GATEWAY/${readNodeName}/${device}`;
+          } else {
+            topic = `BITPOOL_BACNET_GATEWAY/${readNodeName}`;
+          }
+
+        } else {
+          if (useDeviceName) {
+            topic = `BITPOOL_BACNET_GATEWAY/${device}`;
+          } else {
+            topic = `BITPOOL_BACNET_GATEWAY`;
+          }
+        }
+      }
+
+      switch (type) {
+        case "sendSimpleWithStatus":
+          topic += `/${pointName}`;
+          break;
+
+        case "sendSimpleWithStatusJson":
+          //do nothing
+          break;
+
+        case "sendSimpleMqtt":
+          topic += `/${pointName}`;
+          break;
+
+        case "sendAsMqtt":
+          topic += `/${pointName}/${prop}`;
+          break;
+
+        case "sendSimpleJson":
+          //do nothing
+          break;
+
+        case "sendJsonAsMqtt":
+          //do nothing
+          break;
+
+        case "sendIndividualMsgJson":
+          topic += `/${pointName}`;
+          break;
+
+        case "sendSimpleJsonPerPoint":
+          topic += `/${pointName}`;
+          break;
+
+        default:
+          break;
+      }
+
+      return topic;
+
+    }
+
+    sendSimpleWithStatus = function (values, readNodeName, isJson, useDeviceName) {
       let devices = Object.keys(values);
       devices.forEach(function (device) {
         if (device !== "_msgid") {
@@ -524,31 +613,9 @@ module.exports = function (RED) {
           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 topic = getTopicString("sendSimpleWithStatus", useDeviceName, readNodeName, device, pointName);
+
+              msgg.topic = topic;
               let payload = {
                 presentValue: points[point]["presentValue"],
                 timestamp: points[point]["timestamp"],
@@ -569,32 +636,7 @@ module.exports = function (RED) {
 
           if (isJson) {
             //json payload
-            let topic = "";
-            if (
-              node.nodeName !== "gateway" &&
-              node.nodeName !== "" &&
-              node.nodeName !== "null" &&
-              node.nodeName !== "undefined" &&
-              typeof node.nodeName == "string"
-            ) {
-              if (readNodeName !== '' &&
-                readNodeName !== null &&
-                readNodeName !== undefined
-              ) {
-                topic = `${node.nodeName}/${readNodeName}/${device}`;
-              } else {
-                topic = `${node.nodeName}/${device}`;
-              }
-            } else {
-              if (readNodeName !== '' &&
-                readNodeName !== null &&
-                readNodeName !== undefined
-              ) {
-                topic = `BITPOOL_BACNET_GATEWAY/${readNodeName}/${device}`;
-              } else {
-                topic = `BITPOOL_BACNET_GATEWAY/${device}`;
-              }
-            }
+            let topic = getTopicString("sendSimpleWithStatusJson", useDeviceName, readNodeName, device);
 
             msgg.topic = topic;
             msgg.payload = structuredObject;
@@ -605,7 +647,7 @@ module.exports = function (RED) {
       });
     }
 
-    sendSimpleMqtt = function (values, readNodeName) {
+    sendSimpleMqtt = function (values, readNodeName, useDeviceName) {
       let devices = Object.keys(values);
       devices.forEach(function (device) {
         if (device !== "_msgid") {
@@ -617,31 +659,9 @@ module.exports = function (RED) {
               pointProps.forEach(function (prop) {
                 let msg = {};
                 if (prop == "presentValue") {
-                  if (
-                    node.nodeName !== "gateway" &&
-                    node.nodeName !== "" &&
-                    node.nodeName !== "null" &&
-                    node.nodeName !== "undefined" &&
-                    typeof node.nodeName == "string"
-                  ) {
-                    if (readNodeName !== '' &&
-                      readNodeName !== null &&
-                      readNodeName !== undefined
-                    ) {
-                      msg.topic = `${node.nodeName}/${readNodeName}/${device}/${pointName}`;
-                    } else {
-                      msg.topic = `${node.nodeName}/${device}/${pointName}`;
-                    }
-                  } else {
-                    if (readNodeName !== '' &&
-                      readNodeName !== null &&
-                      readNodeName !== undefined
-                    ) {
-                      msg.topic = `BITPOOL_BACNET_GATEWAY/${readNodeName}/${device}/${pointName}`;
-                    } else {
-                      msg.topic = `BITPOOL_BACNET_GATEWAY/${device}/${pointName}`;
-                    }
-                  }
+                  let topic = getTopicString("sendSimpleMqtt", useDeviceName, readNodeName, device, pointName);
+
+                  msg.topic = topic;
                   msg.payload = points[point][prop];
                   node.send(msg);
                 }
@@ -653,7 +673,7 @@ module.exports = function (RED) {
     };
 
     // Breaks down response JSON object into mqtt topic / payload
-    sendAsMqtt = function (values, readNodeName) {
+    sendAsMqtt = function (values, readNodeName, useDeviceName) {
       let devices = Object.keys(values);
       devices.forEach(function (device) {
         if (device !== "_msgid") {
@@ -665,31 +685,8 @@ module.exports = function (RED) {
               pointProps.forEach(function (prop) {
                 let msg = {};
                 if (prop !== "objectName") {
-                  if (
-                    node.nodeName !== "gateway" &&
-                    node.nodeName !== "" &&
-                    node.nodeName !== "null" &&
-                    node.nodeName !== "undefined" &&
-                    typeof node.nodeName == "string"
-                  ) {
-                    if (readNodeName !== '' &&
-                      readNodeName !== null &&
-                      readNodeName !== undefined
-                    ) {
-                      msg.topic = `${node.nodeName}/${readNodeName}/${device}/${pointName}/${prop}`;
-                    } else {
-                      msg.topic = `${node.nodeName}/${device}/${pointName}/${prop}`;
-                    }
-                  } else {
-                    if (readNodeName !== '' &&
-                      readNodeName !== null &&
-                      readNodeName !== undefined
-                    ) {
-                      msg.topic = `BITPOOL_BACNET_GATEWAY/${readNodeName}/${device}/${pointName}/${prop}`;
-                    } else {
-                      msg.topic = `BITPOOL_BACNET_GATEWAY/${device}/${pointName}/${prop}`;
-                    }
-                  }
+                  let topic = getTopicString("sendAsMqtt", useDeviceName, readNodeName, device, pointName, prop);
+                  msg.topic = topic;
                   msg.payload = points[point][prop];
                   node.send(msg);
                 }
@@ -700,7 +697,7 @@ module.exports = function (RED) {
       });
     };
 
-    sendSimpleJson = function (values, readNodeName) {
+    sendSimpleJson = function (values, readNodeName, useDeviceName) {
       let devices = Object.keys(values);
       devices.forEach(function (device) {
         let msgg = {};
@@ -722,81 +719,36 @@ module.exports = function (RED) {
               });
             }
           }
-          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}`;
-            } else {
-              msgg.topic = `${node.nodeName}/${device}`;
-            }
-          } else {
-            if (readNodeName !== '' &&
-              readNodeName !== null &&
-              readNodeName !== undefined
-            ) {
-              msgg.topic = `BITPOOL_BACNET_GATEWAY/${readNodeName}/${device}`;
-            } else {
-              msgg.topic = `BITPOOL_BACNET_GATEWAY/${device}`;
-            }
-          }
+          let topic = getTopicString("sendSimpleJson", useDeviceName, readNodeName, device);
+          msgg.topic = topic;
           msgg.payload = value[device];
           node.send(msgg);
         }
       });
     };
 
-    sendJsonAsMqtt = function (values, readNodeName) {
+    sendJsonAsMqtt = function (values, readNodeName, useDeviceName) {
       if (typeof values == "object") {
         let keys = Object.keys(values);
         keys.forEach(function (key) {
           let points = values[key];
           let msgg = {};
           let structuredObject = {};
-          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}`;
-            } else {
-              msgg.topic = `${node.nodeName}/${key}`;
-            }
-          } else {
-            if (readNodeName !== '' &&
-              readNodeName !== null &&
-              readNodeName !== undefined
-            ) {
-              msgg.topic = `BITPOOL_BACNET_GATEWAY/${readNodeName}/${key}`;
-            } else {
-              msgg.topic = `BITPOOL_BACNET_GATEWAY/${key}`;
-            }
-          }
+
+          let topic = getTopicString("sendJsonAsMqtt", useDeviceName, readNodeName, key);
+          msgg.topic = topic;
+
           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) {
+    sendIndividualMsgJson = function (values, readNodeName, useDeviceName) {
       if (typeof values == "object") {
         let keys = Object.keys(values);
         keys.forEach(function (key) {
@@ -804,31 +756,8 @@ module.exports = function (RED) {
           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}`;
-              }
-            }
+            let topic = getTopicString("sendIndividualMsgJson", useDeviceName, readNodeName, key, pointName);
+            msgg.topic = topic;
 
             msgg.payload = points[point];
             node.send(msgg);
@@ -838,7 +767,7 @@ module.exports = function (RED) {
       }
     }
 
-    sendSimpleJsonPerPoint = function (values, readNodeName) {
+    sendSimpleJsonPerPoint = function (values, readNodeName, useDeviceName) {
       let devices = Object.keys(values);
       devices.forEach(function (device) {
         if (device !== "_msgid") {
@@ -847,31 +776,9 @@ module.exports = function (RED) {
           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 topic = getTopicString("sendSimpleJsonPerPoint", useDeviceName, readNodeName, device, pointName);
+
+              msgg.topic = topic;
               let payload = {
                 presentValue: points[point]["presentValue"]
               };

package/bacnet_read.html

@@ -22,6 +22,7 @@
             object_property_simplePayload: { value: false },
             object_property_simpleWithStatus: { value: false },
             object_property_fullObject: { value: true },
+            useDeviceName: { value: true },
         },
         inputs: 1,
         outputs: 1,
@@ -838,6 +839,9 @@
 
                         app.$forceUpdate();
                     },
+                    refreshReadListTree() {
+                        this.addToReadDevices(this.pointsToRead);
+                    },
                     calculateMstpCount(slotProps) {
                         let count = 0;
                         slotProps.node.children.forEach(function (child) {
@@ -894,6 +898,8 @@
             document.getElementById("node-input-pointJson").checked = node.pointJson;
             document.getElementById("node-input-pointJson").onclick = handleMsgTypeClick;
 
+            document.getElementById("node-input-useDeviceName").checked = node.useDeviceName;
+
             var menu = document.querySelector(".context-menu");
             window.addEventListener("click", (event) => {
                 menu.style.display = "none";
@@ -1218,8 +1224,11 @@
         <input type="file" id="readlist-file-upload" accept="application/JSON" class="inputStyle" style="display: none;" />
 
         <button @click="removeAllDevices()" class="removeAllDevicesButton" title="Remove all devices">
-          <i class="pi pi-minus-circle" style="color: #ff0000; padding-right: 5px;"> </i
-          ><a style="color: #ff0000;">Remove All Devices</a>
+          <a style="color: #ff0000;">Remove All Devices</a>
+        </button>
+
+        <button @click="refreshReadListTree()" class="refreshReadListButton" title="Refresh tree">
+            <i class="pi pi-refresh" style="color: #00AEEF;"> </i>
         </button>
       </div>
 
@@ -1349,6 +1358,22 @@
         </div>
       </div>
 
+      <hr />
+
+      <div class="objectPropertiesLabel" style="margin-top: 20px; margin-bottom: 20px;">
+        <label
+        for="node-input-useDeviceName"
+        style="width: auto; align-items: start;"
+        class="objectPropertiesLabel">
+        <i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.useDeviceName"></span>
+        <input
+            class=" objectProp"
+            type="checkbox"
+            id="node-input-useDeviceName" />
+        <a style="white-space: nowrap; padding-left: 20px;">Use device name in topic</a>
+        </label>
+      </div>
+
       <div class="form-row">
         <label for="node-input-roundDecimal"> Decimal place precision </label>
         <input type="number" id="node-input-roundDecimal" placeholder="None" />

package/bacnet_read.js

@@ -26,7 +26,7 @@ module.exports = function (RED) {
     this.object_property_simpleWithStatus = config.object_property_simpleWithStatus;
     this.object_property_fullObject = config.object_property_fullObject;
 
-
+    this.useDeviceName = config.useDeviceName;
 
     this.object_props = getObjectProps(this);
 
@@ -63,6 +63,7 @@ module.exports = function (RED) {
       let jsonType = false;
       let mqttType = false;
       let pointJsonType = false;
+      let useDeviceName = false;
 
       if (msg.simplePayload) {
         object_property_simplePayload = msg.simplePayload;
@@ -88,6 +89,12 @@ module.exports = function (RED) {
         pointJsonType = node.pointJson
       }
 
+      if (msg.useDeviceName) {
+        useDeviceName = msg.useDeviceName;
+      } else {
+        useDeviceName = node.useDeviceName;
+      }
+
       let readConfig = new ReadCommandConfig(node.pointsToRead, node.object_props, node.roundDecimal);
 
       let output = {
@@ -103,7 +110,8 @@ module.exports = function (RED) {
         outputType: {
           json: jsonType,
           mqtt: mqttType,
-          pointJson: pointJsonType
+          pointJson: pointJsonType,
+          useDeviceName: useDeviceName
         }
       };
 

package/bacnet_server.js

@@ -6,12 +6,12 @@ const { EventEmitter } = require("events");
 
 /**
  * Class representing a BACnet Server.
- * 
+ *
  * This class initializes a BACnet server with specified client, device ID, and Node-Red version.
  * It provides methods to set device name, add objects, retrieve objects, clear server points, clear server point, and get server points.
- * 
+ *
  * Simulates a BACnet IP device on a regular IP network
- * 
+ *
  * @constructor
  * @param {Object} client - The BACnet client object.
  * @param {number} deviceId - The ID of the device.
@@ -248,7 +248,7 @@ class BacnetServer extends EventEmitter {
 
     /**
      * Set the name of the device.
-     * 
+     *
      * @param {string} nodeName - The new name for the device.
      */
     setDeviceName(nodeName) {
@@ -259,116 +259,85 @@ class BacnetServer extends EventEmitter {
     }
 
     /**
-     * Adds a new object to the BacnetServer's object store based on the provided name and value.
-     * 
+     * Adds a new object to the BacnetServer's object store based on the provided name and payload.
+     *
      * @param {string} name - The name of the object to be added.
-     * @param {number|boolean|string} value - The value of the object to be added.
+     * @param {number|boolean|string|object} payload - The payload of the object to be added.
      * @returns {void}
      */
-    addObject(name, value) {
+    addObject(name, payload) {
         let that = this;
-        let objectType = that.getBacnetObjectType(value);
+        let objectType = that.getBacnetObjectType(payload.value ?? payload);
         if (name && objectType) {
             let instanceNumber;
             if (name.includes('|')) {
                 // split name, assign last part to instanceNumber and the rest to name
                 let nameParts = name.split('|');
-                instanceNumber = nameParts[nameParts.length - 1];
-                nameParts.pop();
+                instanceNumber = nameParts.pop();
                 name = nameParts.join('|');
             }
-            let formattedName = name.replaceAll('.', '_');
-            formattedName = formattedName.replaceAll('/', '_');
-            if (objectType == "number") {
-                let foundIndex = that.objectStore[baEnum.ObjectType.ANALOG_VALUE].findIndex(ele => ele[baEnum.PropertyIdentifier.OBJECT_NAME][0].value == formattedName);
-                if (foundIndex == -1) {
-                    let objectId = that.getObjectIdentifier(baEnum.ObjectType.ANALOG_VALUE, instanceNumber);
-                    that.objectStore[baEnum.ObjectType.ANALOG_VALUE].push({
-                        [baEnum.PropertyIdentifier.OBJECT_NAME]: [{ value: formattedName, type: 7 }],
-                        [baEnum.PropertyIdentifier.OBJECT_TYPE]: [{ value: baEnum.ObjectType.ANALOG_VALUE, type: 9 }],
-                        [baEnum.PropertyIdentifier.DESCRIPTION]: [{ value: '', type: 7 }],
-                        [baEnum.PropertyIdentifier.OBJECT_IDENTIFIER]: [{ value: { type: baEnum.ObjectType.ANALOG_VALUE, instance: objectId }, type: 12 }],
-                        [baEnum.PropertyIdentifier.PRESENT_VALUE]: [{ value: value, type: 4 }],
-                        [baEnum.PropertyIdentifier.STATUS_FLAGS]: [{ value: 0, type: 8 }],
-                        [baEnum.PropertyIdentifier.EVENT_STATE]: [{ value: 0, type: 9 }],
-                        [baEnum.PropertyIdentifier.OUT_OF_SERVICE]: [{ value: 0, type: 9 }],
-                        [baEnum.PropertyIdentifier.UNITS]: [{ value: 95, type: 9 }],
-                        [baEnum.PropertyIdentifier.PRIORITY_ARRAY]: [{ value: 0, type: 9 }],
-                        [baEnum.PropertyIdentifier.MAX_PRES_VALUE]: [{ value: value, type: 4 }],
-                        [baEnum.PropertyIdentifier.MIN_PRES_VALUE]: [{ value: value, type: 4 }],
-                        [baEnum.PropertyIdentifier.RESOLUTION]: [{ value: 0, type: 4 }],
-                        [baEnum.PropertyIdentifier.PROPERTY_LIST]:
-                            [
-                                { value: baEnum.PropertyIdentifier.OBJECT_NAME, type: 9 },
-                                { value: baEnum.PropertyIdentifier.OBJECT_TYPE, type: 9 },
-                                { value: baEnum.PropertyIdentifier.DESCRIPTION, type: 9 },
-                                { value: baEnum.PropertyIdentifier.OBJECT_IDENTIFIER, type: 9 },
-                                { value: baEnum.PropertyIdentifier.PRESENT_VALUE, type: 9 },
-                                { value: baEnum.PropertyIdentifier.STATUS_FLAGS, type: 9 },
-                                { value: baEnum.PropertyIdentifier.EVENT_STATE, type: 9 },
-                                { value: baEnum.PropertyIdentifier.OUT_OF_SERVICE, type: 9 },
-                                { value: baEnum.PropertyIdentifier.UNITS, type: 9 },
-                                { value: baEnum.PropertyIdentifier.PRIORITY_ARRAY, type: 9 },
-                                { value: baEnum.PropertyIdentifier.MAX_PRES_VALUE, type: 9 },
-                                { value: baEnum.PropertyIdentifier.MIN_PRES_VALUE, type: 9 },
-                                { value: baEnum.PropertyIdentifier.RESOLUTION, type: 9 },
-                            ],
-                    });
-
-                    that.objectList.push({ value: { type: baEnum.ObjectType.ANALOG_VALUE, instance: objectId }, type: 12 })
-                    that.objectStore[baEnum.ObjectType.DEVICE][baEnum.PropertyIdentifier.OBJECT_LIST] = that.objectList;
-                } else if (foundIndex !== -1) {
-                    let foundObject = that.objectStore[baEnum.ObjectType.ANALOG_VALUE][foundIndex];
-                    foundObject[baEnum.PropertyIdentifier.PRESENT_VALUE][0].value = value;
-                    that.objectStore[baEnum.ObjectType.DEVICE][baEnum.PropertyIdentifier.OBJECT_LIST] = that.objectList;
-                }
-            } else if (objectType == "boolean") {
-                let foundIndex = that.objectStore[baEnum.ObjectType.BINARY_VALUE].findIndex(ele => ele[baEnum.PropertyIdentifier.OBJECT_NAME][0].value == formattedName);
-                if (foundIndex == -1) {
-                    let objectId = that.getObjectIdentifier(baEnum.ObjectType.BINARY_VALUE);
-                    that.objectStore[baEnum.ObjectType.BINARY_VALUE].push({
-                        [baEnum.PropertyIdentifier.OBJECT_NAME]: [{ value: formattedName, type: 7 }],
-                        [baEnum.PropertyIdentifier.OBJECT_TYPE]: [{ value: baEnum.ObjectType.BINARY_VALUE, type: 9 }],
-                        [baEnum.PropertyIdentifier.DESCRIPTION]: [{ value: '', type: 7 }],
-                        [baEnum.PropertyIdentifier.OBJECT_IDENTIFIER]: [{ value: { type: baEnum.ObjectType.BINARY_VALUE, instance: objectId }, type: 12 }],
-                        [baEnum.PropertyIdentifier.PRESENT_VALUE]: [{ value: value, type: 1 }],
-                        [baEnum.PropertyIdentifier.STATUS_FLAGS]: [{ value: 0, type: 8 }],
-                        [baEnum.PropertyIdentifier.EVENT_STATE]: [{ value: 0, type: 9 }],
-                        [baEnum.PropertyIdentifier.OUT_OF_SERVICE]: [{ value: 0, type: 9 }],
-                        [baEnum.PropertyIdentifier.ACTIVE_TEXT]: [{ value: 'ACTIVE', type: 7 }],
-                        [baEnum.PropertyIdentifier.INACTIVE_TEXT]: [{ value: 'INACTIVE', type: 7 }],
-                    });
+            let formattedName = name.replaceAll('.', '_').replaceAll('/', '_');
+
+            const getCommonProperties = (type, valueType) => ({
+                [baEnum.PropertyIdentifier.OBJECT_NAME]: [{ value: formattedName, type: 7 }],
+                [baEnum.PropertyIdentifier.OBJECT_TYPE]: [{ value: type, type: 9 }],
+                [baEnum.PropertyIdentifier.DESCRIPTION]: [{ value: payload.description ?? '', type: 7 }],
+                [baEnum.PropertyIdentifier.OBJECT_IDENTIFIER]: [{ value: { type: type, instance: that.getObjectIdentifier(type, instanceNumber) }, type: 12 }],
+                [baEnum.PropertyIdentifier.PRESENT_VALUE]: [{ value: payload.value ?? payload, type: valueType }],
+                [baEnum.PropertyIdentifier.STATUS_FLAGS]: [{ value: payload.statusFlags ?? 0, type: 8 }],
+                [baEnum.PropertyIdentifier.EVENT_STATE]: [{ value: payload.eventState ?? 0, type: 9 }],
+                [baEnum.PropertyIdentifier.OUT_OF_SERVICE]: [{ value: payload.outOfService ?? 0, type: 9 }],
+            });
 
-                    that.objectList.push({ value: { type: baEnum.ObjectType.BINARY_VALUE, instance: objectId }, type: 12 })
-                    that.objectStore[baEnum.ObjectType.DEVICE][baEnum.PropertyIdentifier.OBJECT_LIST] = that.objectList;
-                } else if (foundIndex !== -1) {
-                    let foundObject = that.objectStore[baEnum.ObjectType.BINARY_VALUE][foundIndex];
-                    foundObject[baEnum.PropertyIdentifier.PRESENT_VALUE][0].value = value;
-                    that.objectStore[baEnum.ObjectType.DEVICE][baEnum.PropertyIdentifier.OBJECT_LIST] = that.objectList;
-                }
-            } else if (objectType == "string") {
-                let foundIndex = that.objectStore[baEnum.ObjectType.CHARACTERSTRING_VALUE].findIndex(ele => ele[baEnum.PropertyIdentifier.OBJECT_NAME][0].value == formattedName);
+            const addObjectToStore = (type, valueType, extraProperties = {}) => {
+                let foundIndex = that.objectStore[type].findIndex(ele => ele[baEnum.PropertyIdentifier.OBJECT_NAME][0].value == formattedName);
                 if (foundIndex == -1) {
-                    let objectId = that.getObjectIdentifier(baEnum.ObjectType.CHARACTERSTRING_VALUE);
-                    that.objectStore[baEnum.ObjectType.CHARACTERSTRING_VALUE].push({
-                        [baEnum.PropertyIdentifier.OBJECT_NAME]: [{ value: formattedName, type: 7 }],
-                        [baEnum.PropertyIdentifier.OBJECT_TYPE]: [{ value: baEnum.ObjectType.CHARACTERSTRING_VALUE, type: 9 }],
-                        [baEnum.PropertyIdentifier.DESCRIPTION]: [{ value: '', type: 7 }],
-                        [baEnum.PropertyIdentifier.OBJECT_IDENTIFIER]: [{ value: { type: baEnum.ObjectType.CHARACTERSTRING_VALUE, instance: objectId }, type: 12 }],
-                        [baEnum.PropertyIdentifier.PRESENT_VALUE]: [{ value: value, type: 7 }],
-                        [baEnum.PropertyIdentifier.STATUS_FLAGS]: [{ value: 0, type: 8 }],
-                        [baEnum.PropertyIdentifier.EVENT_STATE]: [{ value: 0, type: 9 }],
-                        [baEnum.PropertyIdentifier.OUT_OF_SERVICE]: [{ value: 0, type: 9 }],
-                        [baEnum.PropertyIdentifier.UNITS]: [{ value: 95, type: 9 }]
-                    });
-
-                    that.objectList.push({ value: { type: baEnum.ObjectType.CHARACTERSTRING_VALUE, instance: objectId }, type: 12 })
+                    let newObject = {
+                        ...getCommonProperties(type, valueType),
+                        ...extraProperties
+                    };
+                    that.objectStore[type].push(newObject);
+                    that.objectList.push({ value: { type: type, instance: newObject[baEnum.PropertyIdentifier.OBJECT_IDENTIFIER][0].value.instance }, type: 12 });
                     that.objectStore[baEnum.ObjectType.DEVICE][baEnum.PropertyIdentifier.OBJECT_LIST] = that.objectList;
-                } else if (foundIndex !== -1) {
-                    let foundObject = that.objectStore[baEnum.ObjectType.CHARACTERSTRING_VALUE][foundIndex];
-                    foundObject[baEnum.PropertyIdentifier.PRESENT_VALUE][0].value = value;
+                } else {
+                    let foundObject = that.objectStore[type][foundIndex];
+                    foundObject[baEnum.PropertyIdentifier.PRESENT_VALUE][0].value = payload.value ?? payload;
                     that.objectStore[baEnum.ObjectType.DEVICE][baEnum.PropertyIdentifier.OBJECT_LIST] = that.objectList;
                 }
+            };
+
+            if (objectType === "number") {
+                addObjectToStore(baEnum.ObjectType.ANALOG_VALUE, 4, {
+                    [baEnum.PropertyIdentifier.UNITS]: [{ value: payload.units ?? 95, type: 9 }],
+                    [baEnum.PropertyIdentifier.MAX_PRES_VALUE]: [{ value: payload.value ?? payload, type: 4 }],
+                    [baEnum.PropertyIdentifier.MIN_PRES_VALUE]: [{ value: payload.value ?? payload, type: 4 }],
+                    [baEnum.PropertyIdentifier.RESOLUTION]: [{ value: payload.resolution ?? 0, type: 4 }],
+                    [baEnum.PropertyIdentifier.PRIORITY_ARRAY]: [{ value: payload.priorityArray ?? 0, type: 9 }],
+                    [baEnum.PropertyIdentifier.PROPERTY_LIST]: [
+                        { value: baEnum.PropertyIdentifier.OBJECT_NAME, type: 9 },
+                        { value: baEnum.PropertyIdentifier.OBJECT_TYPE, type: 9 },
+                        { value: baEnum.PropertyIdentifier.DESCRIPTION, type: 9 },
+                        { value: baEnum.PropertyIdentifier.OBJECT_IDENTIFIER, type: 9 },
+                        { value: baEnum.PropertyIdentifier.PRESENT_VALUE, type: 9 },
+                        { value: baEnum.PropertyIdentifier.STATUS_FLAGS, type: 9 },
+                        { value: baEnum.PropertyIdentifier.EVENT_STATE, type: 9 },
+                        { value: baEnum.PropertyIdentifier.OUT_OF_SERVICE, type: 9 },
+                        { value: baEnum.PropertyIdentifier.UNITS, type: 9 },
+                        { value: baEnum.PropertyIdentifier.PRIORITY_ARRAY, type: 9 },
+                        { value: baEnum.PropertyIdentifier.MAX_PRES_VALUE, type: 9 },
+                        { value: baEnum.PropertyIdentifier.MIN_PRES_VALUE, type: 9 },
+                        { value: baEnum.PropertyIdentifier.RESOLUTION, type: 9 },
+                    ]
+                });
+            } else if (objectType === "boolean") {
+                addObjectToStore(baEnum.ObjectType.BINARY_VALUE, 1, {
+                    [baEnum.PropertyIdentifier.ACTIVE_TEXT]: [{ value: 'ACTIVE', type: 7 }],
+                    [baEnum.PropertyIdentifier.INACTIVE_TEXT]: [{ value: 'INACTIVE', type: 7 }]
+                });
+            } else if (objectType === "string") {
+                addObjectToStore(baEnum.ObjectType.CHARACTERSTRING_VALUE, 7, {
+                    [baEnum.PropertyIdentifier.UNITS]: [{ value: payload.units ?? 95, type: 9 }]
+                });
             }
         }
         Store_Config_Server(JSON.stringify({ objectList: that.objectList, objectStore: that.objectStore }));
@@ -376,7 +345,7 @@ class BacnetServer extends EventEmitter {
 
     /**
      * Retrieves a specific property of an object based on the object ID, property ID, and instance number.
-     * 
+     *
      * @param {number} objectId - The ID of the object type.
      * @param {number} propId - The ID of the property to retrieve.
      * @param {number} instance - The instance number of the object.
@@ -405,7 +374,7 @@ class BacnetServer extends EventEmitter {
 
     /**
      * Retrieves a specific property of an object based on the object ID, property ID, and instance number and modify his value.
-     * 
+     *
      * @param {number} objectId - The ID of the object type.
      * @param {number} propId - The ID of the property to retrieve.
      * @param {number} instance - The instance number of the object.
@@ -436,7 +405,7 @@ class BacnetServer extends EventEmitter {
 
     /**
      * Retrieves the properties of a specific object instance from the objectStore based on the provided parameters.
-     * 
+     *
      * @param {number} objectId - The type of the object to retrieve.
      * @param {number} propId - The property identifier to retrieve.
      * @param {number} instance - The instance number of the object to retrieve.
@@ -534,7 +503,7 @@ class BacnetServer extends EventEmitter {
 
     /**
      * Removes a server point from the objectStore and objectList based on the provided JSON data.
-     * 
+     *
      * @param {Object} json - The JSON data containing information about the server point to be removed.
      * @param {string} json.body.type - The type of the server point ('SV' for CharacterString, 'BV' for BinaryValue, default is AnalogValue).
      * @param {number} json.body.instance - The instance number of the server point to be removed.
@@ -597,7 +566,7 @@ class BacnetServer extends EventEmitter {
      * - name: The name of the object.
      * - type: The type of the object (AV for Analog Value, SV for Character String Value, BV for Binary Value).
      * - instance: The instance number of the object.
-     * 
+     *
      * @returns {Promise<Array>} A promise that resolves with an array of points sorted by instance number.
      * @throws {Error} If an error occurs during the retrieval process.
      */
@@ -688,7 +657,7 @@ class BacnetServer extends EventEmitter {
 
     /**
      * Determines the BACnet object type based on the provided value.
-     * 
+     *
      * @param {any} value - The value to determine the BACnet object type for.
      * @returns {string|null} The BACnet object type as a string ('string', 'number', 'boolean') or null if the type is not recognized.
      */
@@ -702,6 +671,8 @@ class BacnetServer extends EventEmitter {
                 return "number"
             case "boolean":
                 return "boolean"
+            case "object":
+                return "object"
             default:
                 return null
         }
@@ -709,7 +680,7 @@ class BacnetServer extends EventEmitter {
 
     /**
      * Returns the object identifier for the given type and instance number.
-     * 
+     *
      * @param {string} type - The type of the object.
      * @param {number} instanceNumber - The instance number of the object.
      * @returns {number} The object identifier.
@@ -728,4 +699,4 @@ class BacnetServer extends EventEmitter {
     }
 }
 
-module.exports = { BacnetServer };
+module.exports = { BacnetServer };

package/bitpool_inject.html

@@ -142,6 +142,26 @@
             </div>
         </div>
 
+
+        <div class="injectHeading" style="margin-top: 20px;">
+            <a>Topic Properties</a>
+        </div>
+
+        <div class="objectPropertiesLabel" style="margin-top: 20px;">
+            <label
+            for="node-input-useDeviceName"
+            style="padding-left: 4px; width: auto; align-items: start;"
+            class="objectPropertiesLabel">
+            <i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.useDeviceName"></span>
+            <input
+                style="margin-left: 5px;"
+                class=" objectProp"
+                type="checkbox"
+                id="node-input-useDeviceName" />
+            <a style="white-space: nowrap; padding-left: 20px;">Use device name in topic</a>
+            </label>
+        </div>
+
         <div class="injectHeading" style="margin-top: 20px;">
             <a>Msg Properties</a>
         </div>
@@ -476,6 +496,7 @@
                 object_property_simplePayload: { value: false },
                 object_property_simpleWithStatus: { value: false },
                 object_property_fullObject: { value: true },
+                useDeviceName: { value: true },
             },
             icon: "bitpool.svg",
             inputs: 0,
@@ -779,6 +800,8 @@
                 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-useDeviceName").checked = node.useDeviceName;
+
 
                 document.getElementById("node-input-doDiscover").onclick = handleCheckboxClick;
                 document.getElementById("node-input-doPoll").onclick = handleCheckboxClick;

package/bitpool_inject.js

@@ -60,6 +60,9 @@ module.exports = function (RED) {
         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.useDeviceName = n.useDeviceName;
+
         this.json = n.json;
         this.mqtt = n.mqtt;
         this.pointJson = n.pointJson;
@@ -121,6 +124,8 @@ module.exports = function (RED) {
             msg.mqtt = node.mqtt;
             msg.pointJson = node.pointJson;
 
+            msg.useDeviceName = node.useDeviceName;
+
 
             var errors = [];
             var props = this.props;

package/package.json

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

package/resources/style.css

@@ -15,6 +15,16 @@
 
 /* Read node styles */
 
+.refreshReadListButton {
+    border: none;
+    border-radius: 40px;
+    height: 35px;
+    width: 35px;
+    & i {
+        color: #6c757d !important;
+    }
+}
+
 .p-treenode-label {
     color: black;
     width: 100%;
@@ -150,6 +160,8 @@
     float: right;
     display: flex;
     align-items: center;
+    padding: 5px;
+    font-weight: bold;
 }
 .removeAllDevicesButton:hover {
     background-color: #d5d5d5;
@@ -247,7 +259,6 @@
     z-index: 10;
 }
 
-
 .context-menu {
     --mouse-x: 0;
     --mouse-y: 0;