@bitpoolos/edge-bacnet 1.2.3 → 1.2.4

package/bacnet_client.js

@@ -319,7 +319,6 @@ class BacnetClient extends EventEmitter {
                             }
                             
                         } else {
-                            that.logOut("queryPriorityDevices: invalid device found: ", device);
                             query(index);
                         }
                     } else if(index == priorityDevices.length) {
@@ -359,12 +358,12 @@ class BacnetClient extends EventEmitter {
     sanitizeDeviceList() {
         let that = this;
         
-        //1 hour in seconds
-        let timeoutThreshold = parseInt(that.discover_polling_schedule);
+        //Discover frequencey x 2
+        let timeoutThreshold = parseInt(that.discover_polling_schedule) * 2;
 
         that.deviceList.forEach(function(device, index) {
-            if(((Date.now() - device.getLastSeen()) / 1000) >  timeoutThreshold && device.getPriorityQueueIsActive() == false) {
-                //render device hasnt responded to whoIs for over an hour
+            if(((Date.now() - device.getLastSeen()) / 1000) > timeoutThreshold && device.getPriorityQueueIsActive() == false) {
+                //render device hasnt responded to whoIs for disover frequency x 2
 
                 let renderListIndex = that.renderList.findIndex(ele => ele.deviceId == device.getDeviceId());
 
@@ -988,16 +987,18 @@ class BacnetClient extends EventEmitter {
         });
     }
 
-    updatePriorityQueue(req) {
+    updatePriorityQueue(priorityDevices) {
         let that = this;
         return new Promise(async function(resolve, reject) {
             try {
-                let keys = Object.keys(req.body);
+                let keys = Object.keys(priorityDevices);
                 if(keys.length > 0) { 
                     keys.forEach(function(key) {
                         let device = that.deviceList.find(ele => `${that.getDeviceAddress(ele)}-${ele.getDeviceId()}` == key);
-                        let points = req.body[key];
-                        device.setPriorityQueue(points);
+                        let points = priorityDevices[key];
+                        if(device) {
+                            device.setPriorityQueue(points);
+                        }
                     });
                 } else if(keys.length == 0) {
                     that.clearPriorityQueues();
@@ -1309,7 +1310,8 @@ class BacnetClient extends EventEmitter {
                     }
                 }
             }
-            reject("Unexpectedly found end of loop, line 1214");
+            that.networkTree[deviceKey] = values;
+            resolve(that.networkTree);
         });
     }
 

package/bacnet_gateway.js

@@ -177,6 +177,11 @@ module.exports = function (RED) {
       } else if (msg.payload == "BindEvents") {
         node.bacnetClient.removeAllListeners();
         bindEventListeners();
+      } else if (msg.doUpdatePriorityDevices == true && msg.priorityDevices !== null) {
+        node.bacnetClient.updatePriorityQueue(msg.priorityDevices).then(function (result) {
+        }).catch(function (error) {
+          logOut("Error updating priorityQueue: ", error);
+        });
       }
 
     });
@@ -264,21 +269,6 @@ module.exports = function (RED) {
       }
     });
 
-    //route handler for priority queue
-    RED.httpAdmin.post('/bitpool-bacnet-data/priorityQueue', function (req, res) {
-      if (!node.bacnetClient) {
-        logOut("Issue with the bacnetClient while getting device list: ", node.bacnetClient);
-        res.send(false);
-      } else {
-        node.bacnetClient.updatePriorityQueue(req).then(function (result) {
-          res.send(result);
-        }).catch(function (error) {
-          res.send(error);
-          logOut("Error updating priorityQueue: ", error);
-        });
-      }
-    });
-
     node.on('close', function () {
       //do nothing
     });

package/bacnet_read.html

@@ -159,7 +159,7 @@
                         this.$forceUpdate()
 
                         //update node-red data structure to forward to gateway
-                        let device = this.deviceList.find(ele => ele.deviceName == slotProps.node.label);
+                        let device = this.deviceList.find(ele => ele.address == slotProps.node.ipAddr && ele.deviceId == slotProps.node.deviceId);
                         let deviceAddress = app.getDeviceAddress(device.address);
                         let key = `${deviceAddress}-${device.deviceId}`;
                         let points = this.pointList[key];
@@ -208,7 +208,7 @@
                             this.$forceUpdate();
 
                             //update node-red data structure
-                            let device = this.deviceList.find(ele => ele.deviceName == slotProps.node.label);
+                            let device = this.deviceList.find(ele => ele.address == slotProps.node.ipAddr && ele.deviceId == slotProps.node.deviceId);
                             let deviceAddress = app.getDeviceAddress(device.address);
                             let key = `${deviceAddress}-${device.deviceId}`;
                             if (this.pointsToRead[key]) {
@@ -254,7 +254,7 @@
                         this.$forceUpdate();
 
                         //update node-red data structure
-                        let device = this.deviceList.find(ele => ele.deviceName == parentDeviceName);
+                        let device = this.deviceList.find(ele => ele.address == parentDevice.ipAddr && ele.deviceId == parentDevice.deviceId);
                         let deviceAddress = app.getDeviceAddress(device.address);
                         let key = `${deviceAddress}-${device.deviceId}`;
 
@@ -292,7 +292,7 @@
                         this.$forceUpdate();
 
                         //update node-red data stucture
-                        let device = this.deviceList.find(ele => ele.deviceName == parentDeviceName);
+                        let device = this.deviceList.find(ele => 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];

package/bacnet_read.js

@@ -60,14 +60,12 @@ module.exports = function (RED) {
         rejectUnauthorized: false
       });
 
-      fetch('http://localhost:1880/bitpool-bacnet-data/priorityQueue', {method: 'POST', headers: headers, agent: agent, body: JSON.stringify(node.pointsToRead)})
-      .then(function(res) {
-        //do nothing
-      }).catch(function(error) {
-        //do nothing
-      });
+      let priorityDevicesMsg = {
+        doUpdatePriorityDevices: true,
+        priorityDevices: node.pointsToRead
+      };
 
-      
+      node.send(priorityDevicesMsg);
 
       node.on('input', function(msg) {
 

package/package.json

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