@bitpoolos/edge-bacnet 1.3.1 → 1.4.0

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## [1.4.0] - 05-07-2024
+
+### Summary
+
+Fixed read list export for sites with large point counts. 
+
+Removed auto tree reload on read node UI. UI tree must be manually reloaded now. 
+
+Fixed export to CSV bug. 
+
+Fixed state array text not found bug
+
+Removed unecessary debug. 
+
+Updated required json saved to node JSON file. 
+
+Added github pull requests
+    - Added create object and delete object to bacnet server 
+    - Added write property to bacnet server 
+
+Added Simple With Status read property type.
+    - This type sends a msg.payload that consists of {presentValue, timestamp, status}
+    - Status is currently online and offline
+
+Changed inject node to only 1 selectable type of inject (Discover or Poll)
+
+
+## [1.3.2] - 18-06-2024
+
+### Summary 
+
+Bug fix for API request URL paths. Updated for using node-red host setting.
+
 ## [1.3.1] - 06-06-2024
 
 ### Summary 

package/bacnet_client.js

@@ -322,31 +322,13 @@ class BacnetClient extends EventEmitter {
 
   updatePointsForDevice(deviceObject) {
     let that = this;
-    return new Promise((resolve, reject) => {
+    return new Promise(async (resolve, reject) => {
       try {
         let device = that.deviceList.find((ele) => ele.getDeviceId() == deviceObject.deviceId);
-        that.updateDeviceName(device);
-
-
-        //test
-
-        that.getProtocolSupported(device).then(function (result) {
-          console.log("updatePointsForDevice getProtocolSupported ", result.values[0].originalBitString);
-          console.log(result.values[0]);
-          console.log(result);
-          console.log(result.values[0]);
-          let decodedValues = decodeBitArray(8, result.values[0].originalBitString.value);
-          device.setProtocolServicesSupported(decodedValues);
-        }).catch(function (error) {
-          that.logOut("getProtocolSupported error: ", error);
-        });
-
-        //test
-
+        await that.updateDeviceName(device);
 
         if (device.getIsProtocolServicesSet() == false) {
           that.getProtocolSupported(device).then(function (result) {
-            console.log("updatePointsForDevice getProtocolSupported ", result.values[0].originalBitString);
             let decodedValues = decodeBitArray(8, result.values[0].originalBitString.value);
             device.setProtocolServicesSupported(decodedValues);
           }).catch(function (error) {
@@ -685,14 +667,17 @@ class BacnetClient extends EventEmitter {
         // Process points for the current device
         const pointsToRead = readConfig.pointsToRead[key];
         const pointNames = Object.keys(pointsToRead);
-        const totalPoints = pointNames.length;
+        let totalPoints = pointNames.length;
         let requestArray = [];
         let processedPoints = 0; // Counter for processed points
 
         // Process each point for the device in batches
         for (let i = 0; i < pointNames.length; i++) {
           const pointName = pointNames[i];
-          if (pointName === "deviceName") continue;
+          if (pointName === "deviceName") {
+            totalPoints = totalPoints - 1;
+            continue;
+          }
 
           const pointConfig = pointsToRead[pointName];
           const objectId = that.getObjectId(pointName, pointConfig, that);
@@ -760,10 +745,12 @@ class BacnetClient extends EventEmitter {
           if (isNumber(val)) {
             pointRef.presentValue = roundDecimalPlaces(val, roundDecimal);
             if (pointRef.meta.objectId.type == 19 || pointRef.meta.objectId.type == 13 || pointRef.meta.objectId.type == 14) {
-              if (val != 0) {
-                pointRef.presentValue = pointRef.stateTextArray[val - 1].value;
-              } else {
-                pointRef.presentValue = pointRef.stateTextArray[val].value;
+              if (pointRef.stateTextArray && typeof pointRef.stateTextArray[0].value !== "object") {
+                if (val != 0) {
+                  pointRef.presentValue = pointRef.stateTextArray[val - 1].value;
+                } else {
+                  pointRef.presentValue = pointRef.stateTextArray[val].value;
+                }
               }
             }
           } else {
@@ -772,12 +759,23 @@ class BacnetClient extends EventEmitter {
             }
           }
 
+          pointRef.timestamp = Date.now();
+          pointRef.status = "online";
+
           // Store the point data in results
           bacnetResults[deviceName][pointNameRef] = pointRef;
         }
       });
     } catch (err) {
       that.logOut("Error processing batch:", err);
+
+      requestArray.forEach(request => {
+        let pointRef = request.pointRef;
+        pointRef.status = "offline";
+
+        bacnetResults[deviceName][cacheRef.pointName] = pointRef;
+      });
+
     }
   }
 
@@ -798,6 +796,9 @@ class BacnetClient extends EventEmitter {
         bacnetResults[deviceName][pointName] = pointRef;
       } catch (err) {
         that.logOut(`Error updating point ${pointName}:`, err);
+
+        pointRef.status = "offline";
+        bacnetResults[deviceName][pointName] = pointRef;
       }
     }
   }
@@ -1501,8 +1502,6 @@ class BacnetClient extends EventEmitter {
 
     treeWorker.cacheData();
 
-    //const missingDevices = await that.getDevicesNotRenderedYet();
-
     for (let i = 0; i < that.deviceList.length; i++) {
       let device = that.deviceList[i];
       await treeWorker.processDevice(device, i);
@@ -1736,9 +1735,6 @@ class BacnetClient extends EventEmitter {
                       case baEnum.PropertyIdentifier.OBJECT_TYPE:
                         if (object.value[0] && object.value[0].value) values[objectId].objectType = object.value[0].value;
                         break;
-                      case baEnum.PropertyIdentifier.OBJECT_IDENTIFIER:
-                        if (object.value[0] && object.value[0].value) values[objectId].objectID = object.value[0].value;
-                        break;
                       case baEnum.PropertyIdentifier.PROPERTY_LIST:
                         if (object.value) values[objectId].propertyList = that.mapPropsToArray(object.value);
                         break;
@@ -1752,13 +1748,11 @@ class BacnetClient extends EventEmitter {
                           values[objectId].modificationDate = object.value[0].value;
                         }
                         break;
-
                       case baEnum.PropertyIdentifier.PROGRAM_STATE:
                         if (object.value[0]) {
                           values[objectId].programState = that.getPROP_PROGRAM_STATE(object.value[0].value);
                         }
                         break;
-
                       case baEnum.PropertyIdentifier.RECORD_COUNT:
                         if (object.value[0]) {
                           values[objectId].recordCount = object.value[0].value;

package/bacnet_gateway.html

@@ -75,19 +75,19 @@
 <script type="text/javascript">
   class NodeService {
     getNetworkData() {
-      return fetch("/bitpool-bacnet-data/getNetworkTree").then((res) => res.json());
+      return fetch(RED.settings.httpNodeRoot + "bitpool-bacnet-data/getNetworkTree").then((res) => res.json());
     }
     rebuildDataModel() {
-      return fetch("/bitpool-bacnet-data/rebuildDataModel").then((res) => res.json());
+      return fetch(RED.settings.httpNodeRoot + "bitpool-bacnet-data/rebuildDataModel").then((res) => res.json());
     }
     clearBacnetServerPoints() {
-      return fetch("/bitpool-bacnet-data/clearBacnetServerPoints").then((res) => res.json());
+      return fetch(RED.settings.httpNodeRoot + "bitpool-bacnet-data/clearBacnetServerPoints").then((res) => res.json());
     }
     getBacnetServerPoints() {
-      return fetch('/bitpool-bacnet-data/getBacnetServerPoints').then(res => res.json());
+      return fetch(RED.settings.httpNodeRoot + 'bitpool-bacnet-data/getBacnetServerPoints').then(res => res.json());
     }
     purgeDevice(device) {
-      return fetch('/bitpool-bacnet-data/purgeDevice', {
+      return fetch(RED.settings.httpNodeRoot + 'bitpool-bacnet-data/purgeDevice', {
         method: 'POST',
         headers: {
           'Accept': 'application/json',
@@ -97,7 +97,7 @@
       }).then(res => res.json());
     }
     updatePointsForDevice(device) {
-      return fetch('/bitpool-bacnet-data/updatePointsForDevice', {
+      return fetch(RED.settings.httpNodeRoot + 'bitpool-bacnet-data/updatePointsForDevice', {
         method: 'POST',
         headers: {
           'Accept': 'application/json',
@@ -107,7 +107,7 @@
       }).then(res => res.json());
     }
     setDeviceDisplayName(device, displayName) {
-      return fetch('/bitpool-bacnet-data/setDeviceDisplayName', {
+      return fetch(RED.settings.httpNodeRoot + 'bitpool-bacnet-data/setDeviceDisplayName', {
         method: 'POST',
         headers: {
           'Accept': 'application/json',
@@ -117,7 +117,7 @@
       }).then(res => res.json());
     }
     setPointDisplayName(deviceKey, pointName, pointDisplayName) {
-      return fetch('/bitpool-bacnet-data/setPointDisplayName', {
+      return fetch(RED.settings.httpNodeRoot + 'bitpool-bacnet-data/setPointDisplayName', {
         method: 'POST',
         headers: {
           'Accept': 'application/json',
@@ -127,7 +127,7 @@
       }).then(res => res.json());
     }
     importReadList(payload) {
-      return fetch('/bitpool-bacnet-data/importReadList', {
+      return fetch(RED.settings.httpNodeRoot + 'bitpool-bacnet-data/importReadList', {
         method: 'POST',
         headers: {
           'Accept': 'application/json',
@@ -213,7 +213,7 @@
       function queryAdapters() {
         let nicSelector = document.getElementById("node-input-local_device_address");
         $.ajax({
-          url: "/bitpool-bacnet-data/getNetworkInterfaces",
+          url: RED.settings.httpNodeRoot + "bitpool-bacnet-data/getNetworkInterfaces",
           success: function (data) {
             let keys = Object.keys(data);
 
@@ -289,7 +289,7 @@
                 let app = this;
                 $.ajax({
                   type: "POST",
-                  url: '/bitpool-bacnet-data/clearBacnetServerPoint',
+                  url: RED.settings.httpNodeRoot + 'bitpool-bacnet-data/clearBacnetServerPoint',
                   dataType: 'json',
                   contentType: 'application/json',
                   data: JSON.stringify(json),
@@ -342,7 +342,7 @@
 
           $.ajax({
             type: "POST",
-            url: "/bitpool-bacnet-data/updateDeviceList",
+            url: RED.settings.httpNodeRoot + "bitpool-bacnet-data/updateDeviceList",
             dataType: "json",
             contentType: "application/json",
             data: JSON.stringify(jsonPayload),
@@ -356,7 +356,7 @@
 
       $("#file-export").click(function (params) {
         $.ajax({
-          url: "/bitpool-bacnet-data/getDeviceList",
+          url: RED.settings.httpNodeRoot + "bitpool-bacnet-data/getDeviceList",
           success: function (deviceList) {
             let data = "text/json;charset=utf-8," + encodeURIComponent(JSON.stringify(deviceList));
             let aEle = document.getElementById("exportJSON");

package/bacnet_gateway.js

@@ -5,7 +5,6 @@
 module.exports = function (RED) {
   const { BacnetClient } = require("./bacnet_client");
   const { BacnetClientConfig, getIpAddress } = require("./common");
-  const { exec } = require("child_process");
   const { BacnetServer } = require("./bacnet_server.js");
 
   function BitpoolBacnetGatewayDevice(config) {
@@ -109,21 +108,27 @@ module.exports = function (RED) {
           }, 3000);
         }
         if (outputType.json && !outputType.mqtt) {
-          if (objectPropertyType.fullObject && objectPropertyType.simplePayload) {
-            sendSimpleJson(values, readNodeName);
-            sendJsonAsMqtt(values, readNodeName);
-          } else if (objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
+          //json
+          if (objectPropertyType.simpleWithStatus && !objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
+            //simpleWithStatus
+            sendSimpleWithStatus(values, readNodeName, true);
+          } else if (objectPropertyType.fullObject && !objectPropertyType.simplePayload && !objectPropertyType.simpleWithStatus) {
+            //fullObject
             sendJsonAsMqtt(values, readNodeName);
-          } else if (!objectPropertyType.fullObject && objectPropertyType.simplePayload) {
+          } else if (objectPropertyType.simplePayload && !objectPropertyType.fullObject && !objectPropertyType.simpleWithStatus) {
+            //simplePayload
             sendSimpleJson(values, readNodeName);
           }
         } else if (!outputType.json && outputType.mqtt) {
-          if (objectPropertyType.fullObject && objectPropertyType.simplePayload) {
+          //mqtt
+          if (objectPropertyType.simpleWithStatus && !objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
+            //simpleWithStatus
+            sendSimpleWithStatus(values, readNodeName, false);
+          } else if (objectPropertyType.fullObject && !objectPropertyType.simplePayload && !objectPropertyType.simpleWithStatus) {
+            //fullObject
             sendAsMqtt(values, readNodeName);
-            sendSimpleMqtt(values, readNodeName);
-          } else if (objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
-            sendAsMqtt(values, readNodeName);
-          } else if (!objectPropertyType.fullObject && objectPropertyType.simplePayload) {
+          } else if (objectPropertyType.simplePayload && !objectPropertyType.fullObject && !objectPropertyType.simpleWithStatus) {
+            //simplePayload
             sendSimpleMqtt(values, readNodeName);
           }
         }
@@ -159,6 +164,23 @@ 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}`;
+      }
+
+      node.send({ payload: newValue, topic: formattedTopic });
+    });
+
     node.on("input", function (msg) {
       if (msg.topic && msg.payload !== null) {
         if (node.bacnetServer) {
@@ -420,21 +442,27 @@ module.exports = function (RED) {
             }, 3000);
           }
           if (outputType.json && !outputType.mqtt) {
-            if (objectPropertyType.fullObject && objectPropertyType.simplePayload) {
-              sendSimpleJson(values, readNodeName);
-              sendJsonAsMqtt(values, readNodeName);
-            } else if (objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
+            //json
+            if (objectPropertyType.simpleWithStatus && !objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
+              //simpleWithStatus
+              sendSimpleWithStatus(values, readNodeName, true);
+            } else if (objectPropertyType.fullObject && !objectPropertyType.simplePayload && !objectPropertyType.simpleWithStatus) {
+              //fullObject
               sendJsonAsMqtt(values, readNodeName);
-            } else if (!objectPropertyType.fullObject && objectPropertyType.simplePayload) {
+            } else if (objectPropertyType.simplePayload && !objectPropertyType.fullObject && !objectPropertyType.simpleWithStatus) {
+              //simplePayload
               sendSimpleJson(values, readNodeName);
             }
           } else if (!outputType.json && outputType.mqtt) {
-            if (objectPropertyType.fullObject && objectPropertyType.simplePayload) {
-              sendAsMqtt(values, readNodeName);
-              sendSimpleMqtt(values, readNodeName);
-            } else if (objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
+            //mqtt
+            if (objectPropertyType.simpleWithStatus && !objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
+              //simpleWithStatus
+              sendSimpleWithStatus(values, readNodeName, false);
+            } else if (objectPropertyType.fullObject && !objectPropertyType.simplePayload && !objectPropertyType.simpleWithStatus) {
+              //fullObject
               sendAsMqtt(values, readNodeName);
-            } else if (!objectPropertyType.fullObject && objectPropertyType.simplePayload) {
+            } else if (objectPropertyType.simplePayload && !objectPropertyType.fullObject && !objectPropertyType.simpleWithStatus) {
+              //simplePayload
               sendSimpleMqtt(values, readNodeName);
             }
           }
@@ -466,6 +494,97 @@ module.exports = function (RED) {
       return pointName;
     }
 
+    sendSimpleWithStatus = function (values, readNodeName, isJson) {
+      let devices = Object.keys(values);
+      devices.forEach(function (device) {
+        if (device !== "_msgid") {
+          let points = values[device];
+          let structuredObject = {};
+          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"],
+                timestamp: points[point]["timestamp"],
+                status: points[point]["status"]
+              };
+
+              if (isJson) {
+                //json payload
+                structuredObject[point] = payload;
+              } else {
+                //mqtt payload
+                msgg.payload = payload;
+                node.send(msgg);
+                msgg = {};
+              }
+            }
+          }
+
+          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}`;
+              }
+            }
+
+            msgg.topic = topic;
+            msgg.payload = structuredObject;
+            node.send(msgg);
+            msgg = {};
+          }
+        }
+      });
+    }
+
     sendSimpleMqtt = function (values, readNodeName) {
       let devices = Object.keys(values);
       devices.forEach(function (device) {