@bitpoolos/edge-bacnet 1.6.6 → 1.6.7

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [1.6.7] - 15-01-2026
+
+Bug fix: 
+
+- Fix UI tree rendering issue with MSTP folders
+
+Minor update: 
+
+- Styling
+- Added properties to device points and minor change to device point polling
+
 ## [1.6.6] - 20-11-2025
 
 Minor update:

package/bacnet_client.js

@@ -362,7 +362,7 @@ class BacnetClient extends EventEmitter {
     let that = this;
     let address = device.getAddress().address;
     let deviceId = device.getDeviceId();
-    let foundParentIndex = that.deviceList.findIndex((ele) => that.getDeviceAddress(ele) == address);
+    let foundParentIndex = that.deviceList.findIndex((ele) => that.getDeviceAddress(ele) == address && !ele.getIsMstpDevice());
     if (foundParentIndex !== -1) {
       that.deviceList[foundParentIndex].addChildDevice(deviceId);
       device.setParentDeviceId(that.deviceList[foundParentIndex].getDeviceId());
@@ -1368,8 +1368,8 @@ class BacnetClient extends EventEmitter {
       port: device.getPort(),
     };
 
-    // Define all properties to be read
-    const allProperties = [
+    // Define default properties for non-device objects
+    const defaultProperties = [
       { id: baEnum.PropertyIdentifier.PRESENT_VALUE },
       { id: baEnum.PropertyIdentifier.DESCRIPTION },
       { id: baEnum.PropertyIdentifier.UNITS },
@@ -1384,8 +1384,66 @@ class BacnetClient extends EventEmitter {
       { id: baEnum.PropertyIdentifier.VENDOR_NAME },
     ];
 
+    // Use device-specific properties for type 8, otherwise use default
+    const propertiesToRead = type === 8 ? BacnetDevice.getDeviceObjectProperties() : defaultProperties;
+
+    // Function to read properties individually
+    const readPropertiesIndividually = (resolve, reject) => {
+      const promises = propertiesToRead.map(
+        (property) =>
+          new Promise((propertyResolve) => {
+            that.client.readProperty(
+              addressObject,
+              { type: type, instance: instance },
+              property.id,
+              readIndividualPropsOptions,
+              (err, value) => {
+                if (err) {
+                  propertyResolve(null);
+                } else {
+                  propertyResolve({
+                    id: property.id,
+                    index: value.property.index,
+                    value: value.values,
+                  });
+                }
+              }
+            );
+          })
+      );
+
+      Promise.all(promises)
+        .then((resultArray) => {
+          // Filter out null results
+          const validResults = resultArray.filter((result) => result !== null);
+
+          resolve({
+            error: null,
+            value: {
+              values: [
+                {
+                  objectId: {
+                    type: type,
+                    instance: instance,
+                  },
+                  values: validResults,
+                },
+              ],
+            },
+          });
+        })
+        .catch(reject);
+    };
+
     return new Promise((resolve, reject) => {
-      // Try to read all properties at once
+      // For Device objects (type 8), skip ALL attempt - many MSTP devices don't support it
+      // Go straight to reading individual properties for better reliability
+      if (type === 8) {
+        readPropertiesIndividually(resolve, reject);
+        return;
+      }
+
+      // For other object types, try to read all properties at once first
       that
         ._readObject(addressObject, type, instance, [{ id: baEnum.PropertyIdentifier.ALL }], readOptions)
         .then((result) => {
@@ -1394,61 +1452,13 @@ class BacnetClient extends EventEmitter {
             resolve(result);
           } else {
             // If not, proceed to read individual properties
-            readPropertiesIndividually();
+            readPropertiesIndividually(resolve, reject);
           }
         })
         .catch(() => {
           // On error, proceed to read individual properties
-          readPropertiesIndividually();
+          readPropertiesIndividually(resolve, reject);
         });
-
-      // Function to read properties individually
-      const readPropertiesIndividually = () => {
-        const promises = allProperties.map(
-          (property, index) =>
-            new Promise((propertyResolve) => {
-              that.client.readProperty(
-                addressObject,
-                { type: type, instance: instance },
-                property.id,
-                readIndividualPropsOptions,
-                (err, value) => {
-                  if (err) {
-                    propertyResolve(null);
-                  } else {
-                    propertyResolve({
-                      id: property.id,
-                      index: value.property.index,
-                      value: value.values,
-                    });
-                  }
-                }
-              );
-            })
-        );
-
-        Promise.all(promises)
-          .then((resultArray) => {
-            // Filter out null results
-            const validResults = resultArray.filter((result) => result !== null);
-
-            resolve({
-              error: null,
-              value: {
-                values: [
-                  {
-                    objectId: {
-                      type: type,
-                      instance: instance,
-                    },
-                    values: validResults,
-                  },
-                ],
-              },
-            });
-          })
-          .catch(reject);
-      };
     });
   }
 
@@ -2102,10 +2112,23 @@ class BacnetClient extends EventEmitter {
                           }
                           break;
                         case baEnum.PropertyIdentifier.VENDOR_NAME:
-                          if (object.value) {
-                            if (object.value[0].value && typeof object.value[0].value == "string") {
-                              values[objectId].vendorName = object.value[0].value;
-                            }
+                          if (object.value && object.value[0] && object.value[0].value && typeof object.value[0].value == "string") {
+                            values[objectId].vendorName = object.value[0].value;
+                          }
+                          break;
+                        case baEnum.PropertyIdentifier.MODEL_NAME:
+                          if (object.value && object.value[0] && object.value[0].value && typeof object.value[0].value == "string") {
+                            values[objectId].modelName = object.value[0].value;
+                          }
+                          break;
+                        case baEnum.PropertyIdentifier.FIRMWARE_REVISION:
+                          if (object.value && object.value[0] && object.value[0].value && typeof object.value[0].value == "string") {
+                            values[objectId].firmwareRevision = object.value[0].value;
+                          }
+                          break;
+                        case baEnum.PropertyIdentifier.APPLICATION_SOFTWARE_VERSION:
+                          if (object.value && object.value[0] && object.value[0].value && typeof object.value[0].value == "string") {
+                            values[objectId].applicationSoftwareVersion = object.value[0].value;
                           }
                           break;
                       }

package/bacnet_device.js

@@ -1,4 +1,31 @@
+const bacnet = require("./resources/node-bacstack-ts/dist/index.js");
+const baEnum = bacnet.enum;
+
+// Device Object (type 8) properties - critical properties guaranteed per ASHRAE 135
+// These are the minimum required properties that all BACnet devices must support
+const DEVICE_OBJECT_PROPERTIES = [
+    { id: baEnum.PropertyIdentifier.OBJECT_IDENTIFIER },
+    { id: baEnum.PropertyIdentifier.OBJECT_NAME },
+    { id: baEnum.PropertyIdentifier.OBJECT_TYPE },
+    { id: baEnum.PropertyIdentifier.SYSTEM_STATUS },
+    { id: baEnum.PropertyIdentifier.VENDOR_NAME },
+    { id: baEnum.PropertyIdentifier.VENDOR_IDENTIFIER },
+    { id: baEnum.PropertyIdentifier.MODEL_NAME },
+    { id: baEnum.PropertyIdentifier.FIRMWARE_REVISION },
+    { id: baEnum.PropertyIdentifier.APPLICATION_SOFTWARE_VERSION },
+    { id: baEnum.PropertyIdentifier.DESCRIPTION },
+];
+
 class BacnetDevice {
+    /**
+     * Returns the standardized list of properties to read for Device objects (type 8).
+     * These are critical properties guaranteed to exist on all BACnet devices per ASHRAE 135.
+     * @returns {Array} Array of property identifier objects
+     */
+    static getDeviceObjectProperties() {
+        return DEVICE_OBJECT_PROPERTIES;
+    }
+
     constructor(fromImport, config) {
         let that = this;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitpoolos/edge-bacnet",
-  "version": "1.6.6",
+  "version": "1.6.7",
   "description": "A bacnet gateway for node-red",
   "dependencies": {
     "@plus4nodered/ts-node-bacnet": "^1.0.0-beta.2",
@@ -26,13 +26,15 @@
     }
   },
   "keywords": [
+    "BACnet",
     "node-red",
     "bitpool",
     "bitpoolos",
     "edge",
     "big data",
     "iot",
-    "BACnet"
+    "building automation",
+    "bms"
   ],
   "engines": {
     "node": ">=12.0.0"

package/resources/style.css

@@ -319,8 +319,13 @@
   margin-left: 10px;
   background-color: #00aeef;
   color: #ffffff;
-  border-radius: 45%;
-  font-size: 12px;
+  border-radius: 4px;
+  font-size: 11px;
+  font-weight: 500;
+  padding: 2px 6px;
+  display: inline-block;
+  vertical-align: middle;
+  line-height: 1.2;
 }
 
 .pointAddedToRead {

package/treeBuilder.js

@@ -355,6 +355,12 @@ class treeBuilder {
     this.addPointProperty(pointProperties, "Modification Date", point.modificationDate);
     this.addPointProperty(pointProperties, "Program State", point.programState);
     this.addPointProperty(pointProperties, "Record Count", point.recordCount);
+    
+    // Add device-specific properties (type 8)
+    this.addPointProperty(pointProperties, "Vendor Name", point.vendorName);
+    this.addPointProperty(pointProperties, "Model Name", point.modelName);
+    this.addPointProperty(pointProperties, "Firmware Revision", point.firmwareRevision);
+    this.addPointProperty(pointProperties, "Application Software Version", point.applicationSoftwareVersion);
 
     // Return the array of point properties
     return pointProperties;