@bitpoolos/edge-bacnet 1.4.5 → 1.4.6

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [1.4.6] - 17-09-2024
+### Summary
+
+Minor fixes.
+
+Wrapped updateDeviceName function with promise to avoid network conflict for clients. 
+
+Fixed UI styling bugs, primarily with long names and numbers wrapping.
+
+Added ability to set device name of dummy MSTP routers. 
+
+Improved error handling for querying devices and building point json structures.
+
+Fixed read node point export bug.
+
+Excluded commas via point name conditioning 
+
+Fixed gateway port assignment bug - ability to communicate on different ports working now.
+
+More async / await refactoring.
+
+
 ## [1.4.5] - 16-08-2024
 ### Summary
 

package/bacnet_client.js

@@ -27,6 +27,7 @@ class BacnetClient extends EventEmitter {
     that.mutex = new Mutex();
     that.manualMutex = new Mutex();
     that.pollInProgress = false;
+    that.buildJsonInProgress = false;
     that.scanMatrix = [];
     that.renderListCount = 0;
 
@@ -63,6 +64,7 @@ class BacnetClient extends EventEmitter {
       };
 
       try {
+
         that.client = new bacnet.Client({
           apduTimeout: config.apduTimeout,
           interface: config.localIpAdrress,
@@ -81,7 +83,13 @@ class BacnetClient extends EventEmitter {
 
         //query device task
         const queryDevices = new Task("simple task", () => {
-          if (!that.pollInProgress) that.queryDevices();
+          if (!that.pollInProgress) {
+            that.queryDevices();
+          }
+
+          if (!that.buildJsonInProgress) {
+            that.buildJsonTree();
+          }
         });
 
         const queryJob = new SimpleIntervalJob({ seconds: parseInt(that.device_read_schedule) }, queryDevices);
@@ -102,6 +110,7 @@ class BacnetClient extends EventEmitter {
 
         setTimeout(() => {
           that.queryDevices();
+          that.buildJsonTree();
         }, "5000");
       } catch (e) {
         that.logOut("Issue initializing client: ", e);
@@ -288,6 +297,7 @@ class BacnetClient extends EventEmitter {
         that.renderList = [];
         that.networkTree = {};
         that.pollInProgress = false;
+        that.buildJsonInProgress = false;
         that.renderListCount = 0;
         resolve(true);
       } catch (e) {
@@ -301,9 +311,7 @@ class BacnetClient extends EventEmitter {
     let that = this;
     return new Promise((resolve, reject) => {
       try {
-        let renderListIndex = that.renderList.findIndex(
-          (ele) => ele.deviceId == device.deviceId && ele.ipAddr == device.address
-        );
+        let renderListIndex = that.renderList.findIndex((ele) => ele.deviceId == device.deviceId && ele.ipAddr == device.address);
         let deviceListIndex = that.deviceList.findIndex((ele) => ele.getDeviceId() == device.deviceId);
         let deviceKey = device.address + "-" + device.deviceId;
         delete that.networkTree[deviceKey];
@@ -319,62 +327,46 @@ class BacnetClient extends EventEmitter {
     });
   }
 
-  updatePointsForDevice(deviceObject) {
-    let that = this;
-    return new Promise(async (resolve, reject) => {
-      try {
-        let device = that.deviceList.find((ele) => ele.getDeviceId() == deviceObject.deviceId);
-        await that.updateDeviceName(device);
-
-        if (device.getIsProtocolServicesSet() == false) {
-          that
-            .getProtocolSupported(device)
-            .then(function (result) {
-              let decodedValues = decodeBitArray(8, result.values[0].originalBitString.value);
-              device.setProtocolServicesSupported(decodedValues);
-            })
-            .catch(function (error) {
-              that.logOut("getProtocolSupported error: ", error);
-            });
+  async updatePointsForDevice(deviceObject) {
+    try {
+      let device = this.deviceList.find((ele) => ele.getDeviceId() === deviceObject.deviceId);
+
+      if (!device) {
+        throw new Error(`Device with ID ${deviceObject.deviceId} not found`);
+      }
+
+      await this.updateDeviceName(device);
+
+      if (!device.getIsProtocolServicesSet()) {
+        try {
+          const result = await this.getProtocolSupported(device);
+          const decodedValues = decodeBitArray(8, result.values[0].originalBitString.value);
+          device.setProtocolServicesSupported(decodedValues);
+        } catch (error) {
+          this.logOut("getProtocolSupported error: ", error);
         }
+      }
 
-        that
-          .getDevicePointList(device)
-          .then(function () {
-            that
-              .buildJsonObject(device)
-              .then(function () {
-                // do nothing for now
-                resolve(true);
-              })
-              .catch(function (e) {
-                that.logOut(`Update points list error 1: ${that.getDeviceAddress(device)}`, e);
-              });
-          })
-          .catch(function (e) {
-            that.logOut(`Update points list error 2: ${that.getDeviceAddress(device)}`, e);
-            device.setManualDiscoveryMode(true);
-            that
-              .getDevicePointListWithoutObjectList(device)
-              .then(function () {
-                that
-                  .buildJsonObject(device)
-                  .then(function () {
-                    // do nothing for now
-                    resolve(true);
-                  })
-                  .catch(function (e) {
-                    that.logOut(`Update points list error 3: ${that.getDeviceAddress(device)}`, e);
-                  });
-              })
-              .catch(function (e) {
-                that.logOut(`Update points list error 4: ${that.getDeviceAddress(device)}`, e);
-              });
-          });
+      try {
+        await this.getDevicePointList(device);
+        await this.buildJsonObject(device);
       } catch (e) {
-        reject(e);
+        this.logOut(`Update points list error 2: ${this.getDeviceAddress(device)}`, e);
+        device.setManualDiscoveryMode(true);
+
+        try {
+          await this.getDevicePointListWithoutObjectList(device);
+          await this.buildJsonObject(device);
+        } catch (e) {
+          this.logOut(`Update points list error 4: ${this.getDeviceAddress(device)}`, e);
+        }
       }
-    });
+
+      return true;
+    } catch (e) {
+      this.logOut(`Error in updatePointsForDevice: ${e.message}`, e);
+      throw e; // Re-throw the error to be handled by the caller
+    }
   }
 
   applyDisplayNames(pointsToRead) {
@@ -407,13 +399,21 @@ class BacnetClient extends EventEmitter {
     let that = this;
     return new Promise((resolve, reject) => {
       try {
-        let device = that.deviceList.find((ele) => ele.getDeviceId() == deviceObject.deviceId);
+        let address = "";
+        if (typeof deviceObject.address == "string") {
+          address = deviceObject.address;
+        } else if (typeof deviceObject.address == "object") {
+          address = deviceObject.address.address;
+        }
+
+        let device = that.deviceList.find(
+          (ele) => that.getDeviceAddress(ele) == address && ele.getDeviceId() == deviceObject.deviceId
+        );
         device.setDisplayName(displayName);
         that.buildTreeException = true;
         resolve(true);
       } catch (e) {
         that.logOut("setDeviceDisplayName error: ", e);
-
         reject(e);
       }
     });
@@ -457,108 +457,89 @@ class BacnetClient extends EventEmitter {
     });
   }
 
-  queryDevices() {
+  //test re write
+  async queryDevices() {
     let that = this;
-
-    that.pollInProgress = true;
-
-    let index = 0;
-
-    query(index);
-
-    function query(index) {
-      let device = that.deviceList[index];
-
-      if (index < that.deviceList.length) {
-        index++;
-
-        if (typeof device == "object") {
-          if (device.getIsProtocolServicesSet() == false) {
-            that
-              .getProtocolSupported(device)
-              .then(function (result) {
+    try {
+      that.pollInProgress = true;
+      let index = 0;
+      await query(index);
+
+      async function query(index) {
+        if (index < that.deviceList.length) {
+          let device = that.deviceList[index];
+          if (typeof device == "object" && (device.getIsDumbMstpRouter() == false || device.getIsDumbMstpRouter() == undefined)) {
+            if (device.getIsProtocolServicesSet() == false) {
+              try {
+                let result = await that.getProtocolSupported(device);
                 let decodedValues = decodeBitArray(8, result.values[0].originalBitString.value);
                 device.setProtocolServicesSupported(decodedValues);
-              })
-              .catch(function (error) {
+              } catch (error) {
                 that.logOut("getProtocolSupported error: ", error);
-              });
-          }
-          try {
-            if (device.getSegmentation() !== 3) {
-              that.updateDeviceName(device);
-              that
-                .getDevicePointList(device)
-                .then(function () {
-                  that
-                    .buildJsonObject(device)
-                    .then(function () {
-                      query(index);
-                    })
-                    .catch(function (e) {
-                      that.logOut(`getDevicePointList error: ${device.getAddress()}`, e);
-                      query(index);
-                    });
-                })
-                .catch(function (e) {
+                index++;
+                await query(index);
+              }
+            }
+            try {
+              await that.updateDeviceName(device);
+              if (device.getSegmentation() !== 3) {
+                try {
+                  await that.getDevicePointList(device);
+
+                  index++;
+                  await query(index);
+                } catch (e) {
                   that.logOut(`getDevicePointList error: ${device.getAddress()}`, e);
-                  that
-                    .getDevicePointListWithoutObjectList(device)
-                    .then(function () {
-                      that
-                        .buildJsonObject(device)
-                        .then(function () {
-                          query(index);
-                        })
-                        .catch(function (e) {
-                          that.logOut(`getDevicePointList error: ${device.getAddress()}`, e);
-                          query(index);
-                        });
-                    })
-                    .catch(function (e) {
-                      query(index);
-                    });
-                });
-            } else if (device.getSegmentation() == 3) {
-              that.updateDeviceName(device);
-              that
-                .getDevicePointListWithoutObjectList(device)
-                .then(function () {
-                  that
-                    .buildJsonObject(device)
-                    .then(function () {
-                      query(index);
-                    })
-                    .catch(function (e) {
-                      that.logOut(`getDevicePointList error: ${device.getAddress()}`, e);
-                      query(index);
-                    });
-                })
-                .catch(function (e) {
-                  query(index);
-                });
+
+                  index++;
+                  await query(index);
+                }
+              } else if (device.getSegmentation() == 3) {
+                try {
+                  await that.getDevicePointListWithoutObjectList(device);
+                  index++;
+                  await query(index);
+                } catch (e) {
+                  that.logOut(`getDevicePointList error: ${device.getAddress()}`, e);
+
+                  index++;
+                  await query(index);
+                }
+              }
+            } catch (e) {
+              that.logOut("Error while querying devices: ", e);
+
+              index++;
+              await query(index);
             }
-          } catch (e) {
-            that.logOut("Error while querying devices: ", e);
-            query(index);
+          } else {
+            index++;
+            await query(index);
           }
-        } else {
-          that.logOut("queryDevices: invalid device found: ", device);
-          query(index);
+        } else if (index == that.deviceList.length) {
+          that.pollInProgress = false;
         }
-      } else if (index == that.deviceList.length) {
-        that.pollInProgress = false;
       }
+    } catch (e) {
+      that.logOut("Error while querying devices: ", e);
     }
   }
 
   updateDeviceName(device) {
     let that = this;
-    that._getDeviceName(device.getAddress(), device.getDeviceId()).then(function (deviceObject) {
-      if (typeof deviceObject.name == "string") {
-        device.setDeviceName(deviceObject.name + " " + device.getDeviceId());
-        device.setPointsList(deviceObject.devicePointEntry);
-      }
+    return new Promise((resolve, reject) => {
+      that
+        ._getDeviceName(device.getAddress(), device.getDeviceId())
+        .then(function (deviceObject) {
+          if (typeof deviceObject.name == "string") {
+            device.setDeviceName(deviceObject.name + " " + device.getDeviceId());
+            device.setPointsList(deviceObject.devicePointEntry);
+          }
+          resolve();
+        })
+        .catch(function (e) {
+          reject(e);
+        });
     });
   }
 
@@ -598,7 +579,13 @@ class BacnetClient extends EventEmitter {
 
       // //query device task
       const queryDevices = new Task("simple task", () => {
-        if (!that.pollInProgress) that.queryDevices();
+        if (!that.pollInProgress) {
+          that.queryDevices();
+        }
+
+        if (!that.buildJsonInProgress) {
+          that.buildJsonTree();
+        }
       });
 
       const queryJob = new SimpleIntervalJob({ seconds: parseInt(config.device_read_schedule) }, queryDevices);
@@ -780,11 +767,7 @@ 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 (pointRef.meta.objectId.type == 19 || pointRef.meta.objectId.type == 13 || pointRef.meta.objectId.type == 14) {
               if (pointRef.stateTextArray && typeof pointRef.stateTextArray[0].value !== "object") {
                 if (val != 0) {
                   pointRef.presentValue = pointRef.stateTextArray[val - 1].value;
@@ -941,8 +924,12 @@ class BacnetClient extends EventEmitter {
             }
           } catch (e) {
             that.logOut("Unable to get device name: ", e);
+            reject(e);
           }
         }
+        if (err) {
+          reject(err);
+        }
       });
     });
   }
@@ -995,6 +982,7 @@ class BacnetClient extends EventEmitter {
         device.setManualDiscoveryMode(false);
         let result = await that.scanDevice(device);
         device.setPointsList(result);
+        device.setLastSeen(Date.now());
         resolve(result);
       } catch (e) {
         that.logOut(`Error getting point list for ${device.getAddress().toString()} - ${device.getDeviceId()}: `, e);
@@ -1011,6 +999,7 @@ class BacnetClient extends EventEmitter {
           .scanDeviceManually(device)
           .then(function (result) {
             device.setPointsList(result);
+            device.setLastSeen(Date.now());
             resolve(result);
           })
           .catch(function (error) {
@@ -1615,280 +1604,232 @@ class BacnetClient extends EventEmitter {
     }
   }
 
-  buildJsonObject(device) {
+  async buildJsonTree() {
     let that = this;
-    let address = device.address;
-    let pointList = device.getPointsList();
-    let requestMutex = new Mutex();
+    that.buildJsonInProgress = true;
+    for (let i = 0; i < that.deviceList.length; i++) {
+      try {
+        let device = that.deviceList[i];
+        await that.buildJsonObject(device);
+      } catch (e) {
+        that.logOut("buildJsonTree error: ", e);
+      }
+    }
 
-    return new Promise(function (resolve, reject) {
-      let promiseArray = [];
-      if (typeof pointList !== "undefined" && pointList.length > 0) {
-        pointList.forEach(function (point, pointListIndex) {
-          requestMutex.acquire().then(function (release) {
-            if (device.getIsInitialQuery()) {
-              that
-                ._readObjectLite(device, address, point.value.type, point.value.instance)
-                .then(function (result) {
-                  if (!result.error) {
-                    if (result.length > 0 && Array.isArray(result)) {
-                      promiseArray = result;
-                    } else {
-                      promiseArray.push(result);
-                    }
-                  }
+    that.buildJsonInProgress = false;
+  }
 
-                  release();
-
-                  if (pointListIndex == pointList.length - 1) {
-                    device.setIsInitialQuery(false);
-                    that
-                      .buildResponse(promiseArray, device)
-                      .then(function () {
-                        that.lastNetworkPoll = Date.now();
-                        resolve({ deviceList: that.deviceList, pointList: that.networkTree });
-                      })
-                      .catch(function (e) {
-                        that.logOut("Error while building json object: ", e);
-                        reject(e);
-                      });
-                  }
-                })
-                .catch(function (e) {
-                  release();
-                  that.logOut("_readObjectLite error: ", e);
-
-                  if (pointListIndex == pointList.length - 1) {
-                    device.setIsInitialQuery(false);
-                    that
-                      .buildResponse(promiseArray, device)
-                      .then(function () {
-                        that.lastNetworkPoll = Date.now();
-                        resolve({ deviceList: that.deviceList, pointList: that.networkTree });
-                      })
-                      .catch(function (e) {
-                        that.logOut("Error while building json object: ", e);
-                        reject(e);
-                      });
-                  }
-                });
-            } else {
-              that
-                ._readObjectFull(device, address, point.value.type, point.value.instance)
-                .then(function (result) {
-                  if (!result.error) {
-                    if (result.length > 0 && Array.isArray(result)) {
-                      promiseArray = result;
-                    } else {
-                      promiseArray.push(result);
-                    }
-                  }
 
-                  release();
-
-                  if (pointListIndex == pointList.length - 1) {
-                    that
-                      .buildResponse(promiseArray, device)
-                      .then(function () {
-                        that.lastNetworkPoll = Date.now();
-                        resolve({ deviceList: that.deviceList, pointList: that.networkTree });
-                      })
-                      .catch(function (e) {
-                        that.logOut("Error while building json object: ", e);
-                        reject(e);
-                      });
-                  }
-                })
-                .catch(function (e) {
-                  release();
-                  that.logOut("_readObjectFull error: ", e);
-
-                  if (pointListIndex == pointList.length - 1) {
-                    that
-                      .buildResponse(promiseArray, device)
-                      .then(function () {
-                        that.lastNetworkPoll = Date.now();
-                        resolve({ deviceList: that.deviceList, pointList: that.networkTree });
-                      })
-                      .catch(function (e) {
-                        that.logOut("Error while building json object: ", e);
-                        reject(e);
-                      });
-                  }
-                });
-            }
-          });
-        });
-      } else {
-        reject("Unable to build network tree, empty point list");
+  async buildJsonObject(device) {
+    try {
+      const address = device.address;
+      const pointList = device.getPointsList();
+      const requestMutex = new Mutex();
+      const promiseArray = [];
+
+      if (typeof pointList === "undefined" || pointList.length === 0) {
+        throw new Error("Unable to build network tree, empty point list");
       }
-    });
+
+      for (const point of pointList) {
+        await requestMutex.acquire();
+
+        let result;
+        if (device.getIsInitialQuery()) {
+          result = await this._readObjectLite(device, address, point.value.type, point.value.instance);
+        } else {
+          result = await this._readObjectFull(device, address, point.value.type, point.value.instance);
+        }
+
+        if (!result.error) {
+          device.setLastSeen(Date.now());
+          if (result.length > 0 && Array.isArray(result)) {
+            promiseArray.push(...result);
+          } else {
+            promiseArray.push(result);
+          }
+        }
+
+        requestMutex.release();
+      }
+
+      await this.buildResponse(promiseArray, device);
+      this.lastNetworkPoll = Date.now();
+
+      return { deviceList: this.deviceList, pointList: this.networkTree };
+    } catch (error) {
+      this.logOut("Error while building json object: ", error);
+      throw error;
+    }
   }
 
   // Builds response object for a fully qualified
   buildResponse(fullObjects, device) {
     let that = this;
-    const reg = /[$#\/\\+]/gi;
+    const reg = /[$#\/\\+,]/gi;
     return new Promise(function (resolve, reject) {
-      let deviceKey =
-        typeof device.getAddress() == "object"
-          ? device.getAddress().address + "-" + device.getDeviceId()
-          : device.getAddress() + "-" + device.getDeviceId();
-      let values = that.networkTree[deviceKey] ? that.networkTree[deviceKey] : {};
-      for (let i = 0; i < fullObjects.length; i++) {
-        let obj = fullObjects[i];
-        let successfulResult = !obj.error ? obj.value : null;
-        if (successfulResult) {
-          successfulResult.values.forEach(function (pointProperty, pointPropertyIndex) {
-            if (!pointProperty.objectId && successfulResult.objectId && !pointProperty.values && successfulResult.values) {
-              pointProperty = successfulResult;
-            }
-
-            let currobjectId = pointProperty.objectId.type;
-            let bac_obj = that.getObjectType(currobjectId);
-            let objectName = that._findValueById(pointProperty.values, baEnum.PropertyIdentifier.OBJECT_NAME);
-            let objectType = pointProperty.objectId.type;
-
-            let objectId;
-            if (objectName !== null && typeof objectName == "string") {
-              objectName = objectName.replace(reg, "");
-              objectId = objectName + "_" + bac_obj + "_" + pointProperty.objectId.instance;
+      try {
+        let deviceKey =
+          typeof device.getAddress() == "object"
+            ? device.getAddress().address + "-" + device.getDeviceId()
+            : device.getAddress() + "-" + device.getDeviceId();
+        let values = that.networkTree[deviceKey] ? that.networkTree[deviceKey] : {};
+        for (let i = 0; i < fullObjects.length; i++) {
+          let obj = fullObjects[i];
+          let successfulResult = !obj.error ? obj.value : null;
+          if (successfulResult) {
+            successfulResult.values.forEach(function (pointProperty, pointPropertyIndex) {
+              if (!pointProperty.objectId && successfulResult.objectId && !pointProperty.values && successfulResult.values) {
+                pointProperty = successfulResult;
+              }
 
-              try {
-                pointProperty.values.forEach(function (object, objectIndex) {
-                  //checks for error code json structure, returned for invalid bacnet requests
-                  if (object && object.value && !object.value.errorClass) {
-                    if (!values[objectId]) values[objectId] = {};
-                    values[objectId].meta = {
-                      objectId: pointProperty.objectId,
-                    };
-
-                    switch (object.id) {
-                      case baEnum.PropertyIdentifier.PRESENT_VALUE:
-                        if (object.value[0] && object.value[0].value !== "undefined" && object.value[0].value !== null) {
-                          //check for binary object type
-                          if (objectType == 3 || objectType == 4 || objectType == 5) {
-                            if (object.value[0].value == 0) {
-                              values[objectId].presentValue = false;
-                            } else if (object.value[0].value == 1) {
-                              values[objectId].presentValue = true;
-                            }
-                          } else if (objectType == 40) {
-                            //character string
-                            values[objectId].presentValue = object.value[0].value;
-                          } else if (objectType == 13 || objectType == 14 || objectType == 19) {
-                            //check for MSV MSI MSO - for enum state text
-                            if (values[objectId].stateTextArray && values[objectId].stateTextArray.length > 0) {
+              let currobjectId = pointProperty.objectId.type;
+              let bac_obj = that.getObjectType(currobjectId);
+              let objectName = that._findValueById(pointProperty.values, baEnum.PropertyIdentifier.OBJECT_NAME);
+              let objectType = pointProperty.objectId.type;
+
+              let objectId;
+              if (objectName !== null && typeof objectName == "string") {
+                objectName = objectName.replace(reg, "");
+                objectId = objectName + "_" + bac_obj + "_" + pointProperty.objectId.instance;
+
+                try {
+                  pointProperty.values.forEach(function (object, objectIndex) {
+                    //checks for error code json structure, returned for invalid bacnet requests
+                    if (object && object.value && !object.value.errorClass) {
+                      if (!values[objectId]) values[objectId] = {};
+                      values[objectId].meta = {
+                        objectId: pointProperty.objectId,
+                      };
+
+                      switch (object.id) {
+                        case baEnum.PropertyIdentifier.PRESENT_VALUE:
+                          if (object.value[0] && object.value[0].value !== "undefined" && object.value[0].value !== null) {
+                            //check for binary object type
+                            if (objectType == 3 || objectType == 4 || objectType == 5) {
                               if (object.value[0].value == 0) {
-                                values[objectId].presentValue = values[objectId].stateTextArray[object.value[0].value].value;
-                              } else if (object.value[0].value !== 0) {
-                                values[objectId].presentValue =
-                                  values[objectId].stateTextArray[object.value[0].value - 1].value;
+                                values[objectId].presentValue = false;
+                              } else if (object.value[0].value == 1) {
+                                values[objectId].presentValue = true;
+                              }
+                            } else if (objectType == 40) {
+                              //character string
+                              values[objectId].presentValue = object.value[0].value;
+                            } else if (objectType == 13 || objectType == 14 || objectType == 19) {
+                              //check for MSV MSI MSO - for enum state text
+                              if (values[objectId].stateTextArray && values[objectId].stateTextArray.length > 0) {
+                                if (object.value[0].value == 0) {
+                                  values[objectId].presentValue = values[objectId].stateTextArray[object.value[0].value].value;
+                                } else if (object.value[0].value !== 0) {
+                                  values[objectId].presentValue =
+                                    values[objectId].stateTextArray[object.value[0].value - 1].value;
+                                }
                               }
+                            } else if (objectType !== 8) {
+                              values[objectId].presentValue = roundDecimalPlaces(object.value[0].value, 2);
+                            }
+                          }
+                          values[objectId].meta.arrayIndex = object.index;
+                          break;
+                        case baEnum.PropertyIdentifier.DESCRIPTION:
+                          if (object.value[0]) values[objectId].description = object.value[0].value;
+                          break;
+                        case baEnum.PropertyIdentifier.UNITS:
+                          if (object.value[0] && object.value[0].value) values[objectId].units = getUnit(object.value[0].value);
+                          break;
+                        case baEnum.PropertyIdentifier.OBJECT_NAME:
+                          if (object.value[0] && object.value[0].value) {
+                            values[objectId].objectName = object.value[0].value.replace(reg, "");
+                            if (!values[objectId].displayName) {
+                              values[objectId].displayName = object.value[0].value.replace(reg, "");
                             }
-                          } else if (objectType !== 8) {
-                            values[objectId].presentValue = roundDecimalPlaces(object.value[0].value, 2);
                           }
-                        }
-                        values[objectId].meta.arrayIndex = object.index;
-                        break;
-                      case baEnum.PropertyIdentifier.DESCRIPTION:
-                        if (object.value[0]) values[objectId].description = object.value[0].value;
-                        break;
-                      case baEnum.PropertyIdentifier.UNITS:
-                        if (object.value[0] && object.value[0].value)
-                          values[objectId].units = getUnit(object.value[0].value);
-                        break;
-                      case baEnum.PropertyIdentifier.OBJECT_NAME:
-                        if (object.value[0] && object.value[0].value) {
-                          values[objectId].objectName = object.value[0].value.replace(reg, "");
-                          if (!values[objectId].displayName) {
-                            values[objectId].displayName = object.value[0].value.replace(reg, "");
+                          break;
+                        case baEnum.PropertyIdentifier.OBJECT_TYPE:
+                          if (object.value[0] && object.value[0].value) values[objectId].objectType = object.value[0].value;
+                          break;
+                        case baEnum.PropertyIdentifier.PROPERTY_LIST:
+                          if (object.value) values[objectId].propertyList = that.mapPropsToArray(object.value);
+                          break;
+                        case baEnum.PropertyIdentifier.SYSTEM_STATUS:
+                          if (object.value[0]) {
+                            values[objectId].systemStatus = that.getPROP_SYSTEM_STATUS(object.value[0].value);
                           }
-                        }
-                        break;
-                      case baEnum.PropertyIdentifier.OBJECT_TYPE:
-                        if (object.value[0] && object.value[0].value) values[objectId].objectType = object.value[0].value;
-                        break;
-                      case baEnum.PropertyIdentifier.PROPERTY_LIST:
-                        if (object.value) values[objectId].propertyList = that.mapPropsToArray(object.value);
-                        break;
-                      case baEnum.PropertyIdentifier.SYSTEM_STATUS:
-                        if (object.value[0]) {
-                          values[objectId].systemStatus = that.getPROP_SYSTEM_STATUS(object.value[0].value);
-                        }
-                        break;
-                      case baEnum.PropertyIdentifier.MODIFICATION_DATE:
-                        if (object.value[0]) {
-                          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;
-                        }
-                        break;
-                      case baEnum.PropertyIdentifier.PRIORITY_ARRAY:
-                        if (object.value.length > 0) {
-                          values[objectId].hasPriorityArray = true;
-                        }
-                        break;
-                      case baEnum.PropertyIdentifier.STATE_TEXT:
-                        if (object.value) {
-                          values[objectId].stateTextArray = object.value;
-                          if (
-                            typeof values[objectId].presentValue == "number" &&
-                            values[objectId].presentValue !== null &&
-                            values[objectId].presentValue !== undefined
-                          ) {
-                            const tempIndex = values[objectId].presentValue;
-                            if (tempIndex == 0) {
-                              values[objectId].presentValue = values[objectId].stateTextArray[tempIndex].value;
-                            } else if (tempIndex !== 0) {
-                              values[objectId].presentValue = values[objectId].stateTextArray[tempIndex - 1].value;
+                          break;
+                        case baEnum.PropertyIdentifier.MODIFICATION_DATE:
+                          if (object.value[0]) {
+                            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;
+                          }
+                          break;
+                        case baEnum.PropertyIdentifier.PRIORITY_ARRAY:
+                          if (object.value.length > 0) {
+                            values[objectId].hasPriorityArray = true;
+                          }
+                          break;
+                        case baEnum.PropertyIdentifier.STATE_TEXT:
+                          if (object.value) {
+                            values[objectId].stateTextArray = object.value;
+                            if (
+                              typeof values[objectId].presentValue == "number" &&
+                              values[objectId].presentValue !== null &&
+                              values[objectId].presentValue !== undefined
+                            ) {
+                              const tempIndex = values[objectId].presentValue;
+                              if (tempIndex == 0) {
+                                values[objectId].presentValue = values[objectId].stateTextArray[tempIndex].value;
+                              } else if (tempIndex !== 0) {
+                                values[objectId].presentValue = values[objectId].stateTextArray[tempIndex - 1].value;
+                              }
                             }
                           }
-                        }
-                        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;
+                          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;
+                            }
                           }
-                        }
-                        break;
+                          break;
+                      }
                     }
-                  }
-                  if (
-                    pointPropertyIndex == successfulResult.values.length - 1 &&
-                    objectIndex == pointProperty.values.length - 1 &&
-                    i == fullObjects.length - 1
-                  ) {
-                    that.networkTree[deviceKey] = values;
-                    resolve(that.networkTree);
-                  }
-                });
-              } catch (e) {
-                that.logOut("issue resolving bacnet payload, see error:  ", e);
-                reject(e);
+                    if (
+                      pointPropertyIndex == successfulResult.values.length - 1 &&
+                      objectIndex == pointProperty.values.length - 1 &&
+                      i == fullObjects.length - 1
+                    ) {
+                      that.networkTree[deviceKey] = values;
+                      resolve(that.networkTree);
+                    }
+                  });
+                } catch (e) {
+                  that.logOut("issue resolving bacnet payload, see error:  ", e);
+                  reject(e);
+                }
               }
+            });
+          } else {
+            //error found in point property
+            if (i == fullObjects.length - 1) {
+              that.networkTree[deviceKey] = values;
+              resolve(that.networkTree);
             }
-          });
-        } else {
-          //error found in point property
-          if (i == fullObjects.length - 1) {
-            that.networkTree[deviceKey] = values;
-            resolve(that.networkTree);
           }
         }
+        that.networkTree[deviceKey] = values;
+        resolve(that.networkTree);
+      } catch (e) {
+        reject(e);
       }
-      that.networkTree[deviceKey] = values;
-      resolve(that.networkTree);
     });
   }
 

package/bacnet_device.js

@@ -35,6 +35,7 @@ class BacnetDevice {
             that.protocolServicesSupported = config.protocolServicesSupported;
             that.isProtocolServicesSet = config.isProtocolServicesSet;
             that.isInitialQuery = config.isInitialQuery;
+            that.isDumbMstpRouter = config.isDumbMstpRouter;
 
         } else if (fromImport == false) {
             if (config.net && config.adr) {
@@ -64,9 +65,18 @@ class BacnetDevice {
             that.protocolServicesSupported = [];
             that.isProtocolServicesSet = false;
             that.isInitialQuery = true;
+            that.isDumbMstpRouter = false;
         }
     }
 
+    setIsDumbMstpRouter(isDumbMstp) {
+        this.isDumbMstpRouter = isDumbMstp;
+    }
+
+    getIsDumbMstpRouter() {
+        return this.isDumbMstpRouter;
+    }
+
     setDisplayName(displayName) {
         this.displayName = displayName;
     }

package/bacnet_read.html

@@ -59,6 +59,7 @@
                         showPointNameDialog: ref(false),
                         deviceDisplayNameValue: ref(),
                         pointDisplayNameValue: ref(),
+                        calculateProgressBarWidth: ref(),
                     };
                 },
                 setup() {
@@ -130,6 +131,7 @@
                             app.pointList = result.pointList;
                             app.pollFrequency = parseInt(result.pollFrequency);
                             app.deviceCount = result.deviceList.length;
+
                             //progress bar percentage
                             let progressVal = parseInt((result.renderListCount / result.deviceList.length) * 100);
                             if (typeof progressVal == "number" && !isNaN(progressVal)) {
@@ -138,6 +140,15 @@
                                 app.progressBarValue = 0;
                             }
 
+                            //set progress bar width based on device count integer digit length
+                            if (app.deviceCount.toString().length >= 5) {
+                                app.calculateProgressBarWidth = "width: 200px;";
+                            } else if (app.deviceCount.toString().length == 4) {
+                                app.calculateProgressBarWidth = "width: 210px;";
+                            } else if (app.deviceCount.toString().length < 4) {
+                                app.calculateProgressBarWidth = "width: 220px;";
+                            }
+
                             app.$forceUpdate();
                         });
 
@@ -434,6 +445,16 @@
                                         link.click();
                                     }
                                 }
+                            } else {
+                                if (parseInt(key) == keys.length - 1) {
+                                    // last iteration
+                                    var encodedUri = encodeURI(csvContent);
+                                    var link = document.createElement("a");
+                                    link.setAttribute("href", encodedUri);
+                                    link.setAttribute("download", "pointslist.csv");
+                                    document.body.appendChild(link);
+                                    link.click();
+                                }
                             }
                         }
                     },
@@ -451,6 +472,8 @@
                         let app = this;
                         if ((Date.now() - slotProps.node.lastSeen) / 1000 < app.pollFrequency + 5) {
                             return true;
+                        } else if (slotProps.node.isDumbMstpRouter == true || slotProps.node.isDumbMstpRouter == "true") {
+                            return true;
                         }
                         return false;
                     },
@@ -530,7 +553,7 @@
                                 app.pointDisplayNameValue = app.rightClickedPoint.node.label;
                                 break;
                             case "updatePoint":
-                                app.updatePoint(app.rightClickedDevice);
+                                app.updatePoint(app.rightClickedPoint);
                                 break;
                             default:
                                 break;
@@ -1061,7 +1084,7 @@
                 *
                 *
             -->
-    <div id="read-networkTree-tab" style="display:none">
+    <div id="read-networkTree-tab" style="display:none" class="bp-networktree-tab">
       <div id="read-networkTree-tab-content" class="networkTreeContent" style="display:none">
         <p-dialog
           v-model:visible="showDeviceNameDialog"
@@ -1107,8 +1130,8 @@
 
         <div class="headerDiv">
           <a class="countStatus" style="margin-left: 15px;"> <span class="bp-deviceCount">{{deviceCount}}</span> Device(s)</a>
-          <p-progressbar :value="progressBarValue" :show-value="true" style="width: 220px; height: 20px;"></p-progressbar>
-          <div class="buttonGroup" style="padding-left: 15px;">
+          <p-progressbar class="bp-readNode-progressbar" :value="progressBarValue" :show-value="true" :style="calculateProgressBarWidth"></p-progressbar>
+          <div class="buttonGroup">
             <button @click="rebuildDataModel()" class="rebuildDataButton" title="Rebuild Data Model">
               <i class="pi pi-wrench" style="color: #969696;"></i>
             </button>
@@ -1136,7 +1159,7 @@
                 <div v-if="isDeviceActive(slotProps)" class="deviceLabelParent">
                   <b class="deviceLabel">
                     <span class="statusOnline deviceStatus dotOnline dot"></span>
-                    {{slotProps.node.label}}
+                    <span class="deviceLabelSpan">{{slotProps.node.label}}</span>
                     <span v-if="hasMstpDevices(slotProps)" class="mstpDeviceCount"
                       >&nbsp; {{calculateMstpCount(slotProps)}} &nbsp;</span
                     >
@@ -1146,7 +1169,7 @@
                 <div v-else>
                   <b class="deviceLabel">
                     <span class="statusOffline deviceStatus dotOffline dot"></span>
-                    {{slotProps.node.label}}
+                    <span class="deviceLabelSpan">{{slotProps.node.label}}</span>
                     <span v-if="hasMstpDevices(slotProps)" class="mstpDeviceCount"
                       >&nbsp; {{calculateMstpCount(slotProps)}} &nbsp;</span
                     >

package/package.json

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

package/resources/node-bacstack-ts/dist/lib/client.js

@@ -41,6 +41,7 @@ class Client extends events_1.EventEmitter {
         this._lastSequenceNumber = 0;
         this._segmentStore = [];
         options = options || {};
+
         this._settings = {
             port: options.port || 47808,
             interface: options.interface,
@@ -48,11 +49,13 @@ class Client extends events_1.EventEmitter {
             broadcastAddress: options.broadcastAddress || '255.255.255.255',
             apduTimeout: options.apduTimeout || 3000
         };
+
         this._transport = this._settings.transport || new transport_1.Transport({
             port: this._settings.port,
             interface: this._settings.interface,
             broadcastAddress: this._settings.broadcastAddress
         });
+
         // Setup code
         this._transport.on('message', this._receiveData.bind(this));
         this._transport.on('error', this._receiveError.bind(this));

package/resources/node-bacstack-ts/dist/lib/transport.js

@@ -7,11 +7,16 @@ const DEFAULT_BACNET_PORT = 47808;
 class Transport extends events_1.EventEmitter {
     constructor(settings) {
         super();
-        this._lastSendMessages = {};
-        this._settings = settings;
-        this._server = (0, dgram_1.createSocket)({ type: 'udp4', reuseAddr: true });
-        this._server.on('message', (msg, rinfo) => this.emit('message', msg, rinfo.address));
-        this._server.on('error', (err) => this.emit('message', err));
+        try {
+            this._lastSendMessages = {};
+            this._settings = settings;
+            this._server = (0, dgram_1.createSocket)({ type: 'udp4', reuseAddr: true });
+            this._server.on('message', (msg, rinfo) => this.emit('message', msg, rinfo.address));
+            this._server.on('error', (err) => this.emit('message', err));
+
+        } catch (e) {
+            //console.log("Transport constructor error: ", e);
+        }
     }
     getBroadcastAddress() {
         return this._settings.broadcastAddress;
@@ -33,9 +38,9 @@ class Transport extends events_1.EventEmitter {
                 delete this._lastSendMessages[messageKey];
             }, 10000); // delete after 10s, hopefully all cases are handled by that
         }
-        const [address, port] = receiver.split(':');
-        this._server.send(buffer, 0, offset, port || DEFAULT_BACNET_PORT, address);
 
+        const [address, port] = receiver.split(':');
+        this._server.send(buffer, 0, offset, this._settings.port || DEFAULT_BACNET_PORT, address);
     }
     open() {
         this._server.bind(this._settings.port, this._settings.interface, () => {

package/resources/style.css

@@ -46,10 +46,17 @@
 }
 .pointLabel {
   font-weight: 400;
+  text-wrap: pretty;
+  display: inline-block;
+  max-width: 85%;
 }
 .deviceLabel {
   color: #1F2731;
   font-weight: 400;
+  text-wrap: pretty;
+}
+.deviceLabelSpan {
+  vertical-align: bottom;
 }
 .removeAllButton {
   float: right;
@@ -248,6 +255,7 @@
   flex-wrap: nowrap;
   justify-content: space-between;
   height: 20px;
+  min-width: max-content;
 }
 .msgTypeDiv {
   display: flex;
@@ -262,8 +270,11 @@
   white-space: nowrap;
   text-overflow: ellipsis;
 }
-.buttonGroup {
-  padding-left: 7px;
+.bp-readNode-progressbar {
+  height: 20px !important;
+}
+.bp-networktree-tab {
+  /* min-width: 590px; */
 }
 #read-readList-tab {
   display: flex;
@@ -296,6 +307,7 @@
   border-radius: 50%;
   display: inline-block;
   margin-right: 5px;
+  vertical-align: middle;
 }
 .dotOnline {
   background-color: #63B686;
@@ -405,7 +417,7 @@
     font-size: 1rem !important;
   }
   .p-dialog-content {
-    padding: 0.5em 0.75rem 0.5rem 0.75rem;
+    padding: 0.5em 0.75rem 0.5rem 0.75rem !important;
 
     & label {
       font-size: 0.9rem !important;
@@ -500,14 +512,11 @@
   input[type=checkbox]:focus {
     outline: none;
   }
-
 }
-
 .bp-checkbox {
     accent-color: white;
     bottom: -3px;
 }
-
 .bp-import-buttons {
   margin-top: 25px;
   label {
@@ -527,10 +536,10 @@
   }
 }
 
-.red-ui-tab {
+/* .red-ui-tab {
   border-top-left-radius: 5px;
   border-top-right-radius: 5px;
-}
+} */
 
 .node-input-deviceIdRangeMatrix-container-row {
   border-radius: 10px;

package/treeBuilder.js

@@ -63,11 +63,45 @@ class treeBuilder {
         // Check if the device object exists and the device name is valid
         if (deviceObject) {
             await this.processDevicePoints(device, deviceObject, deviceName, ipAddress, deviceId, index);
+
+            //delete dummy object if all conditions satisfied
+            if (deviceName !== null) {
+                if (deviceId !== null) {
+                    let lastIndex = deviceName.lastIndexOf(deviceId);
+                    if (lastIndex) {
+                        let formattedName = deviceName.substring(0, lastIndex);
+                        formattedName = `${formattedName.trim()}_Device_${deviceId}`;
+                        if (
+                            this.networkTree[deviceKey][formattedName] &&
+                            Object.keys(this.networkTree[deviceKey][formattedName]).length > 0 &&
+                            this.networkTree[deviceKey]["device"]
+                        ) {
+                            delete this.networkTree[deviceKey]["device"];
+                        }
+                    }
+                }
+            }
+
         } else {
-            //console.log("Unable to find device object");
+            //invalid ip object, likely dumb mstp router
+            if (device.getIsDumbMstpRouter()) {
+                //update dumb mstp router name
+                await this.updateDumbMstpRouterName(deviceName, ipAddress, deviceId);
+            }
         }
     }
 
+    async updateDumbMstpRouterName(deviceName, ipAddress, deviceId) {
+        return new Promise((resolve, reject) => {
+            let listDeviceIndex = this.renderList.findIndex(item => item.deviceId == deviceId && item.ipAddr == ipAddress && item.isDumbMstpRouter == true);
+            if (listDeviceIndex !== -1) {
+                this.renderList[listDeviceIndex].label = deviceName;
+                this.renderList[listDeviceIndex].data = deviceName;
+            }
+            resolve();
+        });
+    }
+
     /**
      * Add the root device folder to the render list.
      *
@@ -88,8 +122,9 @@ class treeBuilder {
 
             // Check if the device already exists in the renderList
             const existingDeviceIndex = this.renderList.findIndex(item => item.deviceId === deviceId && item.ipAddr === ipAddress);
-
             if (existingDeviceIndex === -1) { // Device not found, add new entry
+                let isDumbMstpRouter = false;
+                if (device.getIsDumbMstpRouter() && deviceId == null) isDumbMstpRouter = true;
                 const rootFolder = {
                     key: index,
                     label: displayName,
@@ -103,6 +138,7 @@ class treeBuilder {
                     deviceId,
                     isMstpDevice: device.getIsMstpDevice(),
                     initialName: device.getDeviceName(),
+                    isDumbMstpRouter: isDumbMstpRouter,
                 };
 
                 // Add the root folder to the render list
@@ -112,10 +148,10 @@ class treeBuilder {
     }
 
     addEmptyIpRootDevice(childDevice) {
-
         const ipAddress = this.getDeviceIpAddress(childDevice);
 
-        let deviceIndex = this.deviceList.findIndex(ele => ele.address === ipAddress && ele.deviceId === null && ele.deviceName === ipAddress && ele.displayName === ipAddress);
+        //let deviceIndex = this.deviceList.findIndex(ele => ele.address === ipAddress && ele.deviceId === null && ele.deviceName === ipAddress && ele.displayName === ipAddress);
+        let deviceIndex = this.deviceList.findIndex(ele => ele.address === ipAddress && ele.deviceId === null);
 
         if (deviceIndex === -1) {
             let newDevice = {
@@ -140,6 +176,7 @@ class treeBuilder {
                 protocolServicesSupported: [],
                 isProtocolServicesSet: false,
                 isInitialQuery: true,
+                isDumbMstpRouter: true,
             };
 
             let newBacnetDevice = new BacnetDevice(true, newDevice);
@@ -287,7 +324,6 @@ class treeBuilder {
     updateRenderList(children, device, deviceName, index, ipAddress, deviceId) {
         // Create the folder structure for the device
         const folderJson = this.createFolderJson(children, device.hasChildDevices(), deviceId);
-
         if (!this.renderList) {
             this.renderList = [];
         }