@bitpoolos/edge-bacnet 1.2.6 → 1.2.7

package/bacnet_device.js

@@ -20,6 +20,18 @@ class BacnetDevice {
             that.priorityQueue = config.priorityQueue;
             that.lastPriorityQueueTS = config.lastPriorityQueueTS;
 
+            if(config.childDevices) {
+                that.childDevices = config.childDevices;
+            } else {
+                that.childDevices = [];
+            }
+
+            if(config.parentDeviceId) {
+                that.parentDeviceId = config.parentDeviceId;
+            } else {
+                that.parentDeviceId = null;
+            }
+
         } else if(fromImport == false) {
             if(config.net && config.adr) {
                 that.address = {address: config.address, net: config.net, adr: config.adr};
@@ -42,9 +54,49 @@ class BacnetDevice {
             that.priorityQueueIsActive = false;
             that.priorityQueue = [];
             that.lastPriorityQueueTS = null;
+            that.childDevices = [];
+            that.parentDeviceId = null;
+        }
+    }
+
+    setParentDeviceId(deviceId) {
+        this.parentDeviceId = deviceId;
+    }
+
+    getParentDeviceId() {
+        return this.parentDeviceId;
+    }
+
+    hasChildDevices() {
+        if(this.childDevices.length > 0) {
+            return true;
+        } else if(this.childDevices.length == 0) {
+            return false;
+        }
+    }
+
+    addChildDevice(deviceId) {
+        let foundIndex = this.childDevices.findIndex(ele => ele == deviceId);
+
+        if(foundIndex == -1) {
+            this.childDevices.push(deviceId);
+        } else {
+            this.childDevices[foundIndex] = deviceId
         }
     }
 
+    getChildDevice(deviceId) {
+        let foundIndex = this.childDevices.findIndex(ele => ele == deviceId);
+
+        if(foundIndex !== -1) return this.childDevices[foundIndex];
+
+        return null;
+    }
+
+    getChildDevices() {
+        return this.childDevices;
+    }
+
     setLastPriorityQueueTS() {
         this.lastPriorityQueueTS = Date.now();
     }

package/bacnet_gateway.html

@@ -1,11 +1,12 @@
 <!-- 
-  MIT License Copyright 2021, 2022 - Bitpool Pty Ltd
+  MIT License Copyright 2021, 2024 - Bitpool Pty Ltd
 -->
 <!-- PrimeVue -->
 <link href="resources/@bitpoolos/edge-bacnet/primevue-saga-blue-theme.css" rel="stylesheet" />
 <link href="resources/@bitpoolos/edge-bacnet/primevue.min.css" rel="stylesheet" />
 <link href="resources/@bitpoolos/edge-bacnet/primeflex.min.css" rel="stylesheet" />
 <link href="resources/@bitpoolos/edge-bacnet/primeicons.css" rel="stylesheet" />
+<link href="resources/@bitpoolos/edge-bacnet/style.css" rel="stylesheet" />
 
 <script>
   //custom script loader to ensure dependencies load every time
@@ -113,6 +114,7 @@
       device_read_schedule_value: { value: "1", required: true },
       device_read_schedule_options: { value: "Minutes", required: true },
       deviceRangeRegisters: { value: [] },
+      cacheFileEnabled: {value: false, required: true},
     },
     networkInterfaces: [],
     inputs: 1,
@@ -634,7 +636,7 @@
         <input type="text" id="node-input-apduTimeout" placeholder="10000" />
       </div>
 
-      <div class="form-row">
+      <div class="form-row" style="display: none;">
         <label for="node-input-apduSize"
           ><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.apduSize"></span>Max Apdu Size</label
         >
@@ -648,7 +650,7 @@
         </select>
       </div>
 
-      <div class="form-row">
+      <div class="form-row" style="display: none;">
         <label for="node-input-maxSegments"
           ><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.maxSegments"></span>Max Segments</label
         >
@@ -734,6 +736,11 @@
         </select>
       </div>
 
+      <div class="form-row">
+        <label for="node-input-cacheFileEnabled"> Cache file enabled: </label>
+        <input type="checkbox" id="node-input-cacheFileEnabled" style="width: auto;" />
+      </div>
+
       <div class="form-row">
         <label for="node-input-toLog"> Log found device: </label>
         <input type="checkbox" id="node-input-toLogIam" style="width: auto;" />

package/bacnet_gateway.js

@@ -34,6 +34,7 @@ module.exports = function (RED) {
     this.retries = config.retries;
     this.bacnetServer = nodeContext.get("bacnetServer") || null;
     this.deviceRangeRegisters = config.deviceRangeRegisters;
+    this.cacheFileEnabled = config.cacheFileEnabled;
 
     //client and config store
     this.bacnetConfig = nodeContext.get("bacnetConfig");
@@ -60,7 +61,8 @@ module.exports = function (RED) {
       node.manual_instance_range_start,
       node.manual_instance_range_end,
       node.device_read_schedule,
-      node.retries
+      node.retries,
+      node.cacheFileEnabled
     );
 
     nodeContext.set("bacnetConfig", node.bacnetConfig);
@@ -95,25 +97,25 @@ module.exports = function (RED) {
     node.bacnetClient.removeAllListeners();
 
     // Value response event handler for READ commands
-    node.bacnetClient.on("values", (values, outputType, objectPropertyType) => {
+    node.bacnetClient.on("values", (values, outputType, objectPropertyType, readNodeName) => {
       if (typeof values !== "undefined" && Object.keys(values).length) {
         if (outputType.json && !outputType.mqtt) {
           if (objectPropertyType.fullObject && objectPropertyType.simplePayload) {
-            sendSimpleJson(values);
-            sendJsonAsMqtt(values);
+            sendSimpleJson(values, readNodeName);
+            sendJsonAsMqtt(values, readNodeName);
           } else if (objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
-            sendJsonAsMqtt(values);
+            sendJsonAsMqtt(values, readNodeName);
           } else if (!objectPropertyType.fullObject && objectPropertyType.simplePayload) {
-            sendSimpleJson(values);
+            sendSimpleJson(values, readNodeName);
           }
         } else if (!outputType.json && outputType.mqtt) {
           if (objectPropertyType.fullObject && objectPropertyType.simplePayload) {
-            sendAsMqtt(values);
-            sendSimpleMqtt(values);
+            sendAsMqtt(values, readNodeName);
+            sendSimpleMqtt(values, readNodeName);
           } else if (objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
-            sendAsMqtt(values);
+            sendAsMqtt(values, readNodeName);
           } else if (!objectPropertyType.fullObject && objectPropertyType.simplePayload) {
-            sendSimpleMqtt(values);
+            sendSimpleMqtt(values, readNodeName);
           }
         }
       }
@@ -156,14 +158,12 @@ module.exports = function (RED) {
       }
 
       if (msg.type == "Read") {
-        node.bacnetClient.doRead(msg.options, msg.outputType, msg.objectPropertyType, msg._msgid);
+        node.bacnetClient.doRead(msg.options, msg.outputType, msg.objectPropertyType, msg.readNodeName);
       } else if (msg.type == "Write") {
-        node.bacnetClient.doWrite(msg.value, msg.options).then(function (result) {});
+        node.bacnetClient.doWrite(msg.value, msg.options);
       } else if (msg.doDiscover == true) {
         node.status({ fill: "blue", shape: "dot", text: "Sending global Who is" });
-
         node.bacnetClient.globalWhoIs();
-
         setTimeout(() => {
           node.status({});
         }, 2000);
@@ -177,6 +177,8 @@ module.exports = function (RED) {
           .catch(function (error) {
             logOut("Error updating priorityQueue: ", error);
           });
+      } else if (msg.testFunc == true) {
+        node.bacnetClient.testFunction();
       }
     });
 
@@ -310,24 +312,24 @@ module.exports = function (RED) {
 
     function bindEventListeners() {
       // Value response event handler for READ commands
-      node.bacnetClient.on("values", (device, values, outputType, msgId, fullResult) => {
+      node.bacnetClient.on("values", (device, values, outputType, readNodeName, fullResult) => {
         if (outputType.json && !outputType.mqtt) {
           if (objectPropertyType.fullObject && objectPropertyType.simplePayload) {
-            sendSimpleJson(values);
-            sendJsonAsMqtt(values);
+            sendSimpleJson(values, readNodeName);
+            sendJsonAsMqtt(values, readNodeName);
           } else if (objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
-            sendJsonAsMqtt(values);
+            sendJsonAsMqtt(values, readNodeName);
           } else if (!objectPropertyType.fullObject && objectPropertyType.simplePayload) {
-            sendSimpleJson(values);
+            sendSimpleJson(values, readNodeName);
           }
         } else if (!outputType.json && outputType.mqtt) {
           if (objectPropertyType.fullObject && objectPropertyType.simplePayload) {
-            sendAsMqtt(values);
-            sendSimpleMqtt(values);
+            sendAsMqtt(values, readNodeName);
+            sendSimpleMqtt(values, readNodeName);
           } else if (objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
-            sendAsMqtt(values);
+            sendAsMqtt(values, readNodeName);
           } else if (!objectPropertyType.fullObject && objectPropertyType.simplePayload) {
-            sendSimpleMqtt(values);
+            sendSimpleMqtt(values, readNodeName);
           }
         }
       });
@@ -350,7 +352,7 @@ module.exports = function (RED) {
       }
     }
 
-    sendSimpleMqtt = function (values) {
+    sendSimpleMqtt = function (values, readNodeName) {
       let devices = Object.keys(values);
       devices.forEach(function (device) {
         if (device !== "_msgid") {
@@ -368,9 +370,23 @@ module.exports = function (RED) {
                     node.nodeName !== "undefined" &&
                     typeof node.nodeName == "string"
                   ) {
-                    msg.topic = `${node.nodeName}/${device}/${point}`;
+                    if(readNodeName !== ''&&
+                      readNodeName !== null &&
+                      readNodeName !== undefined
+                    ) {
+                      msg.topic = `${node.nodeName}/${readNodeName}/${device}/${point}`;
+                    } else {
+                      msg.topic = `${node.nodeName}/${device}/${point}`;
+                    }
                   } else {
-                    msg.topic = `BITPOOL_BACNET_GATEWAY/${device}/${point}`;
+                    if(readNodeName !== ''&&
+                      readNodeName !== null &&
+                      readNodeName !== undefined
+                    ) {
+                      msg.topic = `BITPOOL_BACNET_GATEWAY/${readNodeName}/${device}/${point}`;
+                    } else {
+                      msg.topic = `BITPOOL_BACNET_GATEWAY/${device}/${point}`;
+                    }
                   }
                   msg.payload = points[point][prop];
                   node.send(msg);
@@ -383,7 +399,7 @@ module.exports = function (RED) {
     };
 
     // Breaks down response JSON object into mqtt topic / payload
-    sendAsMqtt = function (values) {
+    sendAsMqtt = function (values, readNodeName) {
       let devices = Object.keys(values);
       devices.forEach(function (device) {
         if (device !== "_msgid") {
@@ -401,9 +417,23 @@ module.exports = function (RED) {
                     node.nodeName !== "undefined" &&
                     typeof node.nodeName == "string"
                   ) {
-                    msg.topic = `${node.nodeName}/${device}/${point}/${prop}`;
+                    if(readNodeName !== ''&&
+                      readNodeName !== null &&
+                      readNodeName !== undefined
+                    ) {
+                      msg.topic = `${node.nodeName}/${readNodeName}/${device}/${point}/${prop}`;
+                    } else {
+                      msg.topic = `${node.nodeName}/${device}/${point}/${prop}`;
+                    }
                   } else {
-                    msg.topic = `BITPOOL_BACNET_GATEWAY/${device}/${point}/${prop}`;
+                    if(readNodeName !== ''&&
+                      readNodeName !== null &&
+                      readNodeName !== undefined
+                    ) {
+                      msg.topic = `BITPOOL_BACNET_GATEWAY/${readNodeName}/${device}/${point}/${prop}`;
+                    } else {
+                      msg.topic = `BITPOOL_BACNET_GATEWAY/${device}/${point}/${prop}`;
+                    }
                   }
                   msg.payload = points[point][prop];
                   node.send(msg);
@@ -415,7 +445,7 @@ module.exports = function (RED) {
       });
     };
 
-    sendSimpleJson = function (values) {
+    sendSimpleJson = function (values, readNodeName) {
       let devices = Object.keys(values);
       devices.forEach(function (device) {
         let msgg = {};
@@ -424,7 +454,6 @@ module.exports = function (RED) {
             [device]: {},
           };
           let points = values[device];
-
           for (var point in points) {
             if (points[point]) {
               let pointProps = Object.keys(points[point]);
@@ -444,9 +473,23 @@ module.exports = function (RED) {
             node.nodeName !== "undefined" &&
             typeof node.nodeName == "string"
           ) {
-            msgg.topic = `${node.nodeName}/${device}`;
+            if(readNodeName !== ''&&
+               readNodeName !== null &&
+               readNodeName !== undefined
+            ) {
+              msgg.topic = `${node.nodeName}/${readNodeName}/${device}`;
+            } else {
+              msgg.topic = `${node.nodeName}/${device}`;
+            }
           } else {
-            msgg.topic = `BITPOOL_BACNET_GATEWAY/${device}`;
+            if(readNodeName !== ''&&
+               readNodeName !== null &&
+               readNodeName !== undefined
+            ) {
+              msgg.topic = `BITPOOL_BACNET_GATEWAY/${readNodeName}/${device}`;
+            } else {
+              msgg.topic = `BITPOOL_BACNET_GATEWAY/${device}`;
+            }
           }
           msgg.payload = value[device];
           node.send(msgg);
@@ -454,13 +497,12 @@ module.exports = function (RED) {
       });
     };
 
-    sendJsonAsMqtt = function (values) {
+    sendJsonAsMqtt = function (values, readNodeName) {
       if (typeof values == "object") {
         let keys = Object.keys(values);
         keys.forEach(function (key) {
           let points = values[key];
           let msgg = {};
-
           if (
             node.nodeName !== "gateway" &&
             node.nodeName !== "" &&
@@ -468,9 +510,23 @@ module.exports = function (RED) {
             node.nodeName !== "undefined" &&
             typeof node.nodeName == "string"
           ) {
-            msgg.topic = `${node.nodeName}/${key}`;
+            if(readNodeName !== ''&&
+               readNodeName !== null &&
+               readNodeName !== undefined
+            ) {
+              msgg.topic = `${node.nodeName}/${readNodeName}/${key}`;
+            } else {
+              msgg.topic = `${node.nodeName}/${key}`;
+            }
           } else {
-            msgg.topic = `BITPOOL_BACNET_GATEWAY/${key}`;
+            if(readNodeName !== ''&&
+               readNodeName !== null &&
+               readNodeName !== undefined
+            ) {
+              msgg.topic = `BITPOOL_BACNET_GATEWAY/${readNodeName}/${key}`;
+            } else {
+              msgg.topic = `BITPOOL_BACNET_GATEWAY/${key}`;
+            }
           }
           msgg.payload = points;
           node.send(msgg);

package/bacnet_read.html

@@ -106,7 +106,7 @@
                             app.pollFrequency = parseInt(result.pollFrequency);
                             app.deviceCount = result.deviceList.length;
                             //progress bar percentage
-                            let progressVal = parseInt((result.renderList.length / result.deviceList.length) * 100);
+                            let progressVal = parseInt((result.renderListCount / result.deviceList.length) * 100);
                             if(typeof progressVal == "number" && !isNaN(progressVal)) {
                                 app.progressBarValue = progressVal;
                             } else {
@@ -241,11 +241,26 @@
                         //update UI
                         let parentDeviceName = slotProps.node.parentDevice;
                         let foundDeviceIndex = this.readDevices ? this.readDevices.findIndex(ele => ele.label == parentDeviceName) : -1;
-                        let parentDevice = this.devices.find(ele => ele.label == parentDeviceName);
+                        let device = this.deviceList.find(ele => ele.deviceName == parentDeviceName);
+                        let deviceAddress = app.getDeviceAddress(device.address);
+                        let key = `${deviceAddress}-${device.deviceId}`;
+                        let parentDevice = this.devices.find(ele => ele.ipAddr == deviceAddress);
+                        let childDevice;
+                        if(device.isMstp){
+                            let foundChildIndex = parentDevice.children[1].children.findIndex(ele => ele.label == parentDeviceName);
+                            if(foundChildIndex !== -1) {
+                                childDevice = parentDevice.children[1].children[foundChildIndex];
+                            }
+                        } 
 
                         if (foundDeviceIndex == -1) {
                             //no read devices present, add new
-                            let newReadParent = {...parentDevice};
+                            let newReadParent;
+                            if(childDevice) {
+                                newReadParent = {...childDevice};
+                            } else{
+                                newReadParent = {...parentDevice};
+                            } 
                             newReadParent.children = [];
                             newReadParent.children.push(slotProps.node);
 
@@ -260,22 +275,10 @@
                         }
 
                         //set show added to true 
-                        let slot = parentDevice.children.find(ele => ele.pointName == slotProps.node.pointName);
-                        slot.showAdded = true;
-
+                        slotProps.node.showAdded = true;
                         this.$forceUpdate();
 
                         //update node-red data structure
-                        let device = this.deviceList.find(ele => {
-                            if(ele.address.address) {
-                                return ele.address.address == parentDevice.ipAddr && ele.deviceId == parentDevice.deviceId;
-                            } else {
-                                return ele.address == parentDevice.ipAddr && ele.deviceId == parentDevice.deviceId;
-                            }
-                        });
-                        let deviceAddress = app.getDeviceAddress(device.address);
-                        let key = `${deviceAddress}-${device.deviceId}`;
-
                         if (!this.pointsToRead[key]) {
                             this.pointsToRead[key] = {};
                         }
@@ -294,6 +297,9 @@
                         let parentDeviceName = slotProps.node.parentDevice;
                         let foundDeviceIndex = this.readDevices ? this.readDevices.findIndex(ele => ele.label == parentDeviceName) : -1;
                         let parentDevice = this.devices.find(ele => ele.label == parentDeviceName);
+                        let device = this.deviceList.find(ele => ele.deviceName == parentDeviceName);
+                        let deviceAddress = app.getDeviceAddress(device.address);
+                        let key = `${deviceAddress}-${device.deviceId}`;
 
                         if (foundDeviceIndex !== -1) {
                             let foundIndex = this.readDevices[foundDeviceIndex].children.findIndex(ele => ele.key == slotProps.node.key && ele.pointName == slotProps.node.pointName);
@@ -304,21 +310,10 @@
                         }
 
                         //set show added to true 
-                        let slot = parentDevice.showAdded ? slotProps.node : parentDevice.children.find(ele => ele.pointName == slotProps.node.pointName);
-                        slot.showAdded = false;
                         slotProps.node.showAdded = false;
                         this.$forceUpdate();
 
                         //update node-red data stucture
-                        let device = this.deviceList.find(ele => {
-                            if(ele.address.address) {
-                                return ele.address.address == parentDevice.ipAddr && ele.deviceId == parentDevice.deviceId;
-                            } else {
-                                return ele.address == parentDevice.ipAddr && ele.deviceId == parentDevice.deviceId;
-                            }
-                        });
-                        let deviceAddress = app.getDeviceAddress(device.address);
-                        let key = `${deviceAddress}-${device.deviceId}`;
                         let point = this.pointList[key][slotProps.node.pointName];
                         if (this.pointsToRead[key][point.objectName]) delete this.pointsToRead[key][point.objectName];
                         //if last point is removed, deleted whole entry
@@ -508,9 +503,6 @@
         .pointLabel {
             font-weight: 400;
         }
-        /* .p-treenode-children {
-            background-color: #f0f0f0;
-        } */
         .deviceLabel {
             font-weight: 100;
         }
@@ -536,15 +528,17 @@
         }
         .p-treenode-children > li > .p-treenode-children > li {
             font-size: 14px;
-            height: 25px;
+            /* height: 35px; */
             color: #b5b5b5 !important;
         }
         .p-treenode-children > li > .p-treenode-children > .p-treenode-label {
             color: #b5b5b5 !important;
         }
+        /*
         .p-treenode-children > li > .p-treenode-children > li:last-child {
-            padding-bottom: 30px;
+            padding-bottom: 30px; 
         }
+        */
         .p-tree-toggler:enabled:hover {
             background: #d5d5d5 !important;
         }
@@ -561,6 +555,7 @@
         .statusOffline {
             color: red;
         }
+        
         .deviceLabel {
             position: absolute;
         }
@@ -669,6 +664,22 @@
             padding-right: 20px;
         }
 
+        .p-tree .p-treenode-children {
+            padding: 0 !important;
+        }
+
+        .p-tree-toggler .p-link {
+            width: 25px !important;
+        }
+
+        
+        /*
+        .p-treenode-content {
+            height: 15px;
+        }
+        */
+
+
     </style>
     
     <div class="form-row">
@@ -711,7 +722,7 @@
                     
 
                     <div id="deviceListApp">
-                        <p-tree :value="devices" selectable="false" :filter="true" filterMode="lenient" filterPlaceholder="No results found." v-if="hasData()">  
+                        <p-tree :value="devices" selectable="false" :filter="true" filterMode="lenient" filterPlaceholder="No results found." v-if="hasData()">
                             <template #device="slotProps">
                                 <div v-if="isDeviceActive(slotProps)" class="deviceLabelParent">
                                     <b class="deviceLabel">{{slotProps.node.label}} <b class="statusOnline deviceStatus">Online</b></b>
@@ -736,6 +747,15 @@
                                 </button>
                             </template>
 
+                            <!-- <template #pointFolder="slotProps">
+
+                            </template>
+
+                            
+                            <template #deviceFolder="slotProps">
+
+                            </template> -->
+
                             <template #point="slotProps" v-model:class="pointContent">                                
                                 <b class="pointLabel">{{slotProps.node.label}}</b>
 

package/bacnet_read.js

@@ -19,6 +19,7 @@ module.exports = function (RED) {
       this.pointsToRead = config.pointsToRead;
       this.readDevices = config.readDevices;
       this.id = config.id;
+      this.nodeName = config.name;
 
       this.object_property_simplePayload = config.object_property_simplePayload;
       this.object_property_fullObject = config.object_property_fullObject;
@@ -67,12 +68,13 @@ module.exports = function (RED) {
       node.send(priorityDevicesMsg);
 
       node.on('input', function(msg) {
+        node.status({ fill: "blue", shape: "dot", text: "Reading values" });
 
         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,
@@ -83,9 +85,13 @@ module.exports = function (RED) {
             mqtt: node.mqtt
           }
         };
-
+        
         node.send(output);
 
+        setTimeout(() => {
+          node.status({});
+        }, 3000);
+
       });
 
     };