@bitpoolos/edge-bacnet 1.4.4 → 1.4.6

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);
@@ -90,10 +98,8 @@ class BacnetClient extends EventEmitter {
 
         //buildNetworkTreeData task
         const buildNetworkTree = new Task("simple task", () => {
-
           that.doTreeBuilder();
           that.countDevices();
-
         });
 
         const buildNetworkTreeJob = new SimpleIntervalJob({ seconds: 5 }, buildNetworkTree);
@@ -104,6 +110,7 @@ class BacnetClient extends EventEmitter {
 
         setTimeout(() => {
           that.queryDevices();
+          that.buildJsonTree();
         }, "5000");
       } catch (e) {
         that.logOut("Issue initializing client: ", e);
@@ -213,28 +220,30 @@ class BacnetClient extends EventEmitter {
           if (lastIndex) {
             let formattedName = deviceName.substring(0, lastIndex);
             formattedName = `${formattedName.trim()}_Device_${deviceId}`;
-            if (that.networkTree[deviceKey][formattedName] &&
-              Object.keys(that.networkTree[deviceKey][formattedName]).length > 0) {
+            if (
+              that.networkTree[deviceKey][formattedName] &&
+              Object.keys(that.networkTree[deviceKey][formattedName]).length > 0
+            ) {
               delete that.networkTree[deviceKey]["device"];
             }
           }
         }
       } else {
         const json = {
-          "objectId": {
-            "type": 8,
-            "instance": device.getDeviceId()
-          }
+          objectId: {
+            type: 8,
+            instance: device.getDeviceId(),
+          },
         };
 
         if (that.networkTree[deviceKey] && that.networkTree[deviceKey]["device"]) {
           that.networkTree[deviceKey]["device"]["meta"] = json;
         } else {
           that.networkTree[deviceKey] = {
-            "device": {
-              "meta": json
-            }
-          }
+            device: {
+              meta: json,
+            },
+          };
         }
       }
     } catch (e) {
@@ -262,7 +271,6 @@ class BacnetClient extends EventEmitter {
         }
       );
     });
-
   }
 
   addToParentMstpNetwork(device) {
@@ -289,6 +297,7 @@ class BacnetClient extends EventEmitter {
         that.renderList = [];
         that.networkTree = {};
         that.pollInProgress = false;
+        that.buildJsonInProgress = false;
         that.renderListCount = 0;
         resolve(true);
       } catch (e) {
@@ -302,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];
@@ -320,59 +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) {
@@ -405,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);
       }
     });
@@ -441,7 +443,7 @@ class BacnetClient extends EventEmitter {
         for (let key in payload) {
           let device = payload[key];
           for (let pointName in device) {
-            let pointObject = device[pointName]
+            let pointObject = device[pointName];
             if (that.networkTree[key][pointName]) {
               that.networkTree[key][pointName] = pointObject;
             }
@@ -455,108 +457,89 @@ class BacnetClient extends EventEmitter {
     });
   }
 
-  queryDevices() {
+  //test re write
+  async queryDevices() {
     let that = this;
+    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 (error) {
+                that.logOut("getProtocolSupported error: ", error);
+                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.pollInProgress = true;
-
-    let index = 0;
-
-    query(index);
-
-    function query(index) {
-      let device = that.deviceList[index];
-
-      if (index < that.deviceList.length) {
-        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);
 
-        if (typeof device == "object") {
-          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);
-            });
-          }
-          try {
+                  index++;
+                  await query(index);
+                }
+              }
+            } catch (e) {
+              that.logOut("Error while querying devices: ", e);
 
-            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) {
-                  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);
             }
-          } 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);
+        });
     });
   }
 
@@ -596,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);
@@ -638,7 +627,7 @@ class BacnetClient extends EventEmitter {
 
   findDeviceByKey(key) {
     let that = this;
-    return that.deviceList.find(ele => `${that.getDeviceAddress(ele)}-${ele.getDeviceId()}` === key);
+    return that.deviceList.find((ele) => `${that.getDeviceAddress(ele)}-${ele.getDeviceId()}` === key);
   }
 
   getObjectId(pointName, pointConfig, that) {
@@ -659,7 +648,6 @@ class BacnetClient extends EventEmitter {
     }
   }
 
-
   async doRead(readConfig, outputType, objectPropertyType, readNodeName) {
     const that = this;
     const roundDecimal = readConfig.precision;
@@ -668,7 +656,6 @@ class BacnetClient extends EventEmitter {
     let pendingRequests = 0;
 
     try {
-
       // Process all devices in sequence
       for (let deviceIndex = 0; deviceIndex < devicesToRead.length; deviceIndex++) {
         const key = devicesToRead[deviceIndex];
@@ -711,7 +698,7 @@ class BacnetClient extends EventEmitter {
               objectId: { type: point.meta.objectId.type, instance: point.meta.objectId.instance },
               properties: [{ id: baEnum.PropertyIdentifier.PRESENT_VALUE }],
               pointRef: point,
-              pointName: pointName
+              pointName: pointName,
             });
           }
 
@@ -732,9 +719,16 @@ class BacnetClient extends EventEmitter {
           if (processedPoints >= totalPoints) {
             pendingRequests++;
             // Emit the `values` event for the current device
-            that.emit("values", bacnetResults, outputType, objectPropertyType, readNodeName, pendingRequests, devicesToRead.length);
+            that.emit(
+              "values",
+              bacnetResults,
+              outputType,
+              objectPropertyType,
+              readNodeName,
+              pendingRequests,
+              devicesToRead.length
+            );
             delete bacnetResults[deviceName];
-
           }
         }
       }
@@ -751,18 +745,19 @@ class BacnetClient extends EventEmitter {
       }
 
       let deviceMetaInfo = {
-        "address": device.getAddress(),
-        "isMstp": device.getIsMstpDevice(),
-        "deviceId": device.getDeviceId(),
-        "vendorId": device.getVendorId(),
-        "deviceName": deviceName
+        address: device.getAddress(),
+        isMstp: device.getIsMstpDevice(),
+        deviceId: device.getDeviceId(),
+        vendorId: device.getVendorId(),
+        deviceName: deviceName,
       };
 
       // Process the results of the batch
-      results.value.values.forEach(pointResult => {
-        const cacheRef = requestArray.find(ele =>
-          ele.pointRef.meta.objectId.type === pointResult.objectId.type &&
-          ele.pointRef.meta.objectId.instance === pointResult.objectId.instance
+      results.value.values.forEach((pointResult) => {
+        const cacheRef = requestArray.find(
+          (ele) =>
+            ele.pointRef.meta.objectId.type === pointResult.objectId.type &&
+            ele.pointRef.meta.objectId.instance === pointResult.objectId.instance
         );
 
         if (cacheRef) {
@@ -799,31 +794,31 @@ class BacnetClient extends EventEmitter {
       that.logOut("Error processing batch:", err);
 
       let deviceMetaInfo = {
-        "address": device.getAddress(),
-        "isMstp": device.getIsMstpDevice(),
-        "deviceId": device.getDeviceId(),
-        "vendorId": device.getVendorId(),
-        "deviceName": deviceName
+        address: device.getAddress(),
+        isMstp: device.getIsMstpDevice(),
+        deviceId: device.getDeviceId(),
+        vendorId: device.getVendorId(),
+        deviceName: deviceName,
       };
 
-      requestArray.forEach(request => {
+      requestArray.forEach((request) => {
         let pointRef = request.pointRef;
         pointRef.status = "offline";
+        pointRef.timestamp = Date.now();
         pointRef.meta["device"] = deviceMetaInfo;
 
         bacnetResults[deviceName][request.pointName] = pointRef;
       });
-
     }
   }
 
   async processIndividualPoints(device, requestArray, deviceName, bacnetResults, that, roundDecimal) {
     let deviceMetaInfo = {
-      "address": device.getAddress(),
-      "isMstp": device.getIsMstpDevice(),
-      "deviceId": device.getDeviceId(),
-      "vendorId": device.getVendorId(),
-      "deviceName": deviceName
+      address: device.getAddress(),
+      isMstp: device.getIsMstpDevice(),
+      deviceId: device.getDeviceId(),
+      vendorId: device.getVendorId(),
+      deviceName: deviceName,
     };
 
     for (const request of requestArray) {
@@ -839,6 +834,8 @@ class BacnetClient extends EventEmitter {
         }
 
         pointRef.meta["device"] = deviceMetaInfo;
+        pointRef.timestamp = Date.now();
+        pointRef.status = "online";
 
         // Store the point data in results
         bacnetResults[deviceName][pointName] = pointRef;
@@ -846,7 +843,7 @@ class BacnetClient extends EventEmitter {
         that.logOut(`Error updating point ${pointName}:`, err);
 
         pointRef.meta["device"] = deviceMetaInfo;
-
+        pointRef.timestamp = Date.now();
         pointRef.status = "offline";
         bacnetResults[deviceName][pointName] = pointRef;
       }
@@ -856,11 +853,14 @@ class BacnetClient extends EventEmitter {
   updateManyPoints(device, points) {
     let that = this;
     return new Promise((resolve, reject) => {
-      that._readObjectWithRequestArray(device.getAddress(), points, that.readPropertyMultipleOptions).then(function (results) {
-        resolve(results);
-      }).catch(function (err) {
-        reject(err);
-      });
+      that
+        ._readObjectWithRequestArray(device.getAddress(), points, that.readPropertyMultipleOptions)
+        .then(function (results) {
+          resolve(results);
+        })
+        .catch(function (err) {
+          reject(err);
+        });
     });
   }
 
@@ -924,8 +924,12 @@ class BacnetClient extends EventEmitter {
             }
           } catch (e) {
             that.logOut("Unable to get device name: ", e);
+            reject(e);
           }
         }
+        if (err) {
+          reject(err);
+        }
       });
     });
   }
@@ -978,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);
@@ -994,6 +999,7 @@ class BacnetClient extends EventEmitter {
           .scanDeviceManually(device)
           .then(function (result) {
             device.setPointsList(result);
+            device.setLastSeen(Date.now());
             resolve(result);
           })
           .catch(function (error) {
@@ -1128,8 +1134,9 @@ class BacnetClient extends EventEmitter {
 
     return new Promise((resolve, reject) => {
       // Try to read all properties at once
-      that._readObject(deviceAddress, type, instance, [{ id: baEnum.PropertyIdentifier.ALL }], readOptions)
-        .then(result => {
+      that
+        ._readObject(deviceAddress, type, instance, [{ id: baEnum.PropertyIdentifier.ALL }], readOptions)
+        .then((result) => {
           if (result.value) {
             // If the result has value, resolve the promise
             resolve(result);
@@ -1145,30 +1152,33 @@ class BacnetClient extends EventEmitter {
 
       // Function to read properties individually
       const readPropertiesIndividually = () => {
-        const promises = allProperties.map((property, index) => new Promise((propertyResolve) => {
-          that.client.readProperty(
-            deviceAddress,
-            { type: type, instance: instance },
-            property.id,
-            readOptions,
-            (err, value) => {
-              if (err) {
-                propertyResolve(null);
-              } else {
-                propertyResolve({
-                  id: property.id,
-                  index: value.property.index,
-                  value: value.values,
-                });
-              }
-            }
-          );
-        }));
+        const promises = allProperties.map(
+          (property, index) =>
+            new Promise((propertyResolve) => {
+              that.client.readProperty(
+                deviceAddress,
+                { type: type, instance: instance },
+                property.id,
+                readOptions,
+                (err, value) => {
+                  if (err) {
+                    propertyResolve(null);
+                  } else {
+                    propertyResolve({
+                      id: property.id,
+                      index: value.property.index,
+                      value: value.values,
+                    });
+                  }
+                }
+              );
+            })
+        );
 
         Promise.all(promises)
-          .then(resultArray => {
+          .then((resultArray) => {
             // Filter out null results
-            const validResults = resultArray.filter(result => result !== null);
+            const validResults = resultArray.filter((result) => result !== null);
 
             resolve({
               error: null,
@@ -1190,7 +1200,6 @@ class BacnetClient extends EventEmitter {
     });
   }
 
-
   _readObjectLite(device, deviceAddress, type, instance) {
     const that = this;
     const readOptions = {
@@ -1199,15 +1208,13 @@ class BacnetClient extends EventEmitter {
     };
 
     // Define all properties to be read
-    const allProperties = [
-      { id: baEnum.PropertyIdentifier.PRESENT_VALUE },
-      { id: baEnum.PropertyIdentifier.OBJECT_NAME },
-    ];
+    const allProperties = [{ id: baEnum.PropertyIdentifier.PRESENT_VALUE }, { id: baEnum.PropertyIdentifier.OBJECT_NAME }];
 
     return new Promise((resolve, reject) => {
       // Try to read all properties at once
-      that._readObject(deviceAddress, type, instance, allProperties, readOptions)
-        .then(result => {
+      that
+        ._readObject(deviceAddress, type, instance, allProperties, readOptions)
+        .then((result) => {
           if (result.value) {
             // If the result has value, resolve the promise
             resolve(result);
@@ -1223,30 +1230,33 @@ class BacnetClient extends EventEmitter {
 
       // Function to read properties individually
       const readPropertiesIndividually = () => {
-        const promises = allProperties.map((property, index) => new Promise((propertyResolve) => {
-          that.client.readProperty(
-            deviceAddress,
-            { type: type, instance: instance },
-            property.id,
-            readOptions,
-            (err, value) => {
-              if (err) {
-                propertyResolve(null);
-              } else {
-                propertyResolve({
-                  id: property.id,
-                  index: value.property.index,
-                  value: value.values,
-                });
-              }
-            }
-          );
-        }));
+        const promises = allProperties.map(
+          (property, index) =>
+            new Promise((propertyResolve) => {
+              that.client.readProperty(
+                deviceAddress,
+                { type: type, instance: instance },
+                property.id,
+                readOptions,
+                (err, value) => {
+                  if (err) {
+                    propertyResolve(null);
+                  } else {
+                    propertyResolve({
+                      id: property.id,
+                      index: value.property.index,
+                      value: value.values,
+                    });
+                  }
+                }
+              );
+            })
+        );
 
         Promise.all(promises)
-          .then(resultArray => {
+          .then((resultArray) => {
             // Filter out null results
-            const validResults = resultArray.filter(result => result !== null);
+            const validResults = resultArray.filter((result) => result !== null);
 
             resolve({
               error: null,
@@ -1496,7 +1506,7 @@ class BacnetClient extends EventEmitter {
   }
 
   addUniqueToArray(device, array) {
-    const foundIndex = array.findIndex(ele => ele.getDeviceId() === device.getDeviceId());
+    const foundIndex = array.findIndex((ele) => ele.getDeviceId() === device.getDeviceId());
     if (foundIndex === -1) {
       array.push(device);
     }
@@ -1509,16 +1519,16 @@ class BacnetClient extends EventEmitter {
       const device = that.deviceList[i];
       if (!device.getIsMstpDevice()) {
         //ip device
-        const foundIndex = that.renderList.findIndex(ele => ele.deviceId == device.getDeviceId());
+        const foundIndex = that.renderList.findIndex((ele) => ele.deviceId == device.getDeviceId());
         if (foundIndex == -1) {
           that.addUniqueToArray(device, missingDevices);
         }
       } else {
         //mstp device
-        const foundParentIndex = that.renderList.findIndex(ele => ele.deviceId == device.getParentDeviceId());
+        const foundParentIndex = that.renderList.findIndex((ele) => ele.deviceId == device.getParentDeviceId());
         if (foundParentIndex == -1) {
           //parent not existent in tree
-          const parentDeviceIndex = that.deviceList.findIndex(ele => ele.getDeviceId() === device.getParentDeviceId());
+          const parentDeviceIndex = that.deviceList.findIndex((ele) => ele.getDeviceId() === device.getParentDeviceId());
           if (parentDeviceIndex !== -1) {
             that.addUniqueToArray(that.deviceList[parentDeviceIndex], missingDevices);
           }
@@ -1526,9 +1536,9 @@ class BacnetClient extends EventEmitter {
         } else {
           const parentTreeDevice = that.renderList[foundParentIndex];
           let mstpIndex = -1;
-          parentTreeDevice.children.forEach(child => {
+          parentTreeDevice.children.forEach((child) => {
             if (child.label.includes("MSTP")) {
-              const tempIndex = child.children.findIndex(ele => ele.deviceId == device.getDeviceId());
+              const tempIndex = child.children.findIndex((ele) => ele.deviceId == device.getDeviceId());
               if (tempIndex !== -1) {
                 mstpIndex = tempIndex;
               }
@@ -1548,7 +1558,13 @@ class BacnetClient extends EventEmitter {
   async doTreeBuilder() {
     let that = this;
 
-    const treeWorker = new treeBuilder(that.deviceList, that.networkTree, that.renderList, that.renderListCount, that.initialTreeBuild);
+    const treeWorker = new treeBuilder(
+      that.deviceList,
+      that.networkTree,
+      that.renderList,
+      that.renderListCount,
+      that.initialTreeBuild
+    );
 
     treeWorker.cacheData();
 
@@ -1588,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);
-                      });
-                  }
-                });
 
+  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");
+      }
 
-            } 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);
-                    }
-                  }
+      for (const point of pointList) {
+        await requestMutex.acquire();
 
-                  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");
+        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.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.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.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);
     });
   }