@bitpoolos/edge-bacnet 1.0.6 → 1.0.9

package/bacnet_client.js

@@ -1,11 +1,10 @@
 /*
   MIT License Copyright 2021, 2022 - Bitpool Pty Ltd
 */
-
-const bacnet = require('./resources/bacstack/lib/client');
-const baEnum = require('./resources/bacstack/lib/enum');
-const baAsn1 = require('./resources/bacstack/lib/asn1');
-const { EventEmitter } = require('events');
+const bacnet = require('./resources/node-bacnet/index.js');
+const baEnum = bacnet.enum;
+const bacnetIdMax = baEnum.ASN1_MAX_PROPERTY_ID;
+const { EventEmitter, captureRejectionSymbol } = require('events');
 const { DeviceObjectId, DeviceObject, logger, getUnit, roundDecimalPlaces } = require('./common');
 const { ToadScheduler, SimpleIntervalJob, Task } = require('toad-scheduler')
 const { BacnetDevice } = require('./bacnet_device');
@@ -17,7 +16,6 @@ class BacnetClient extends EventEmitter {
         super();
         let that = this;
         that.deviceList = [];
-        that.pointReferenceList = [];
         that.networkTree = {};
         that.lastWhoIs = null;
         that.client = null;
@@ -34,10 +32,34 @@ class BacnetClient extends EventEmitter {
             that.device_id_range_enabled = config.device_id_range_enabled;
             that.device_id_range_start = config.device_id_range_start;
             that.device_id_range_end = config.device_id_range_end;
+            that.deviceId = config.deviceId;
+            that.broadCastAddr = config.broadCastAddr;
+            that.manual_instance_range_enabled = config.manual_instance_range_enabled;
+            that.manual_instance_range_start = config.manual_instance_range_start;
+            that.manual_instance_range_end = config.manual_instance_range_end;
 
             that.readPropertyMultipleOptions = {
                 maxSegments: that.maxSegments,
-                apduSize: that.apduSize
+                maxApdu: that.apduSize
+            };
+
+            that.selfObjectList = [
+                {value: {type: baEnum.ObjectType.DEVICE, instance: that.deviceId}, type: 12}
+            ];
+
+            that.selfData = {
+                8: {
+                    [baEnum.PropertyIdentifier.OBJECT_IDENTIFIER]: [{value: {type: baEnum.ObjectType.DEVICE, instance: that.deviceId}, type: 12}],  // OBJECT_IDENTIFIER
+                    [baEnum.PropertyIdentifier.OBJECT_LIST]: that.selfObjectList,                                                  // OBJECT_IDENTIFIER
+                    [baEnum.PropertyIdentifier.OBJECT_NAME]: [{value: 'Bitpool Edge BACnet Gateway', type: 7}],            // OBJECT_NAME
+                    [baEnum.PropertyIdentifier.OBJECT_TYPE]: [{value: 8, type: 9}],                          // OBJECT_TYPE
+                    [baEnum.PropertyIdentifier.DESCRIPTION]: [{value: 'Bitpool Edge BACnet gateway', type: 7}],          // DESCRIPTION
+                    [baEnum.PropertyIdentifier.SYSTEM_STATUS]: [{value: 0, type: 9}], // SYSTEM_STATUS
+                    [baEnum.PropertyIdentifier.VENDOR_NAME]:  [{value: "Bitpool", type: 7}], //VENDOR_NAME
+                    [baEnum.PropertyIdentifier.VENDOR_IDENTIFIER]:  [{value: 9999, type: 7}], //VENDOR_IDENTIFIER
+                    [baEnum.PropertyIdentifier.MODEL_NAME]:  [{value: "bitpool-edge", type: 7}],  //MODEL_NAME
+                    [baEnum.PropertyIdentifier.FIRMWARE_REVISION]:  [{value: "Node-Red v3.0.2", type: 7}], //FIRMWARE_REVISION
+                }
             };
 
             try {
@@ -59,6 +81,8 @@ class BacnetClient extends EventEmitter {
                 });
 
                 const queryJob = new SimpleIntervalJob({ seconds: parseInt(that.discover_polling_schedule), }, queryDevices)
+                //const queryJob = new SimpleIntervalJob({ seconds: 10, }, queryDevices)
+
                 
                 that.scheduler.addSimpleIntervalJob(queryJob);
 
@@ -77,30 +101,85 @@ class BacnetClient extends EventEmitter {
                     that.queryDevices();
                   }, "5000")
 
-            } catch(e){
+            } catch(e) {
                 console.log("Issue initializing client: ", e)
             }
 
             //who is callback
             that.client.on('iAm', (device) => {
-                //only add unique device to array
-                let foundIndex = that.deviceList.findIndex(ele => ele.getAddress() == device.address);
-                if(foundIndex == -1) {
-                    let newBacnetDevice = new BacnetDevice(device);
-                    newBacnetDevice.setLastSeen(Date.now());
-                    that.updateDeviceName(newBacnetDevice);
-                    that.deviceList.push(newBacnetDevice);
-
-                } else if(foundIndex !== -1) {
-                    that.deviceList[foundIndex].updateDeviceConfig(device);
-                    that.deviceList[foundIndex].setLastSeen(Date.now());
-                    that.updateDeviceName(that.deviceList[foundIndex]);
+                if(device.header.sender.address !== that.config.localIpAdrress) {
+                    //only add unique device to array
+                    let foundIndex = that.deviceList.findIndex(ele => ele.getDeviceId() == device.payload.deviceId);
+                    if(foundIndex == -1) {
+                        let newBacnetDevice = new BacnetDevice(device);
+                        newBacnetDevice.setLastSeen(Date.now());
+                        that.updateDeviceName(newBacnetDevice);
+                        that.deviceList.push(newBacnetDevice);
+
+                    } else if(foundIndex !== -1) {
+                        that.deviceList[foundIndex].updateDeviceConfig(device);
+                        that.deviceList[foundIndex].setLastSeen(Date.now());
+                        that.updateDeviceName(that.deviceList[foundIndex]);
+                    }
+                    
+                    //emit event for node-red to log 
+                    that.emit('deviceFound', device);
                 }
-                
-                //emit event for node-red to log 
-                that.emit('deviceFound', device);
             });
-        } catch(e){
+
+            that.client.on('whoIs', (device) => {
+                that.client.iAmResponse(that.broadCastAddr, that.deviceId, baEnum.Segmentation.SEGMENTED_BOTH, 27823);
+            });
+
+            that.client.on('readPropertyMultiple', (data) => {
+                try {
+                    if(data.payload.properties[0]){
+                        let objectId = data.payload.properties[0].objectId.type;
+                        let objectInstance = data.payload.properties[0].objectId.instance;
+                        let propId = data.payload.properties[0].properties[0].id.toString();
+                        let responseObj = that.selfData[objectId][propId];
+    
+                        if(responseObj !== null && responseObj !== "undefined") {    
+                            that.client.readPropertyMultipleResponse(data.address, data.invokeId, responseObj);
+                        } else {    
+                            this.client.errorResponse(
+                                data.address, 
+                                baEnum.ConfirmedServices.SERVICE_CONFIRMED_READ_PROPERTY, 
+                                data.invokeId, 
+                                baEnum.ErrorClasses.ERROR_CLASS_PROPERTY, 
+                                baEnum.ErrorCodes.ERROR_CODE_UNKNOWN_PROPERTY
+                            );
+                        }
+                    }
+
+                } catch(e) {
+                    //console.log("Local BACnet device readPropertyMultiple error: ");
+                }
+            });
+
+            that.client.on('readProperty', (data) => {
+                try {
+                    let objectId = data.payload.objectId.type;
+                    let propId = data.payload.property.id.toString();
+                    let responseObj = that.selfData[objectId][propId];
+                    if(responseObj !== null && responseObj !== undefined && typeof responseObj !== "undefined") {
+                        that.client.readPropertyResponse(data.header.sender.address, data.invokeId, objectId, data.payload.property, responseObj);
+                    } else {
+                        this.client.errorResponse(
+                            data.address, 
+                            baEnum.ConfirmedServiceChoice.READ_PROPERTY, 
+                            data.invokeId,
+                            baEnum.ErrorClass.PROPERTY, 
+                            baEnum.ErrorCode.UNKNOWN_PROPERTY
+                        );
+                    }
+                } catch(e){
+                    console.log("Local BACnet device readProperty error: ", e);
+                }
+
+            });
+
+        } catch(e) {
             console.log("Issue with creating bacnet client, see error:  ", e);
         }
 
@@ -118,6 +197,21 @@ class BacnetClient extends EventEmitter {
 
     }
 
+    rebuildDataModel() {
+        let that = this;
+        return new Promise((resolve, reject) => {
+            try {
+                that.deviceList = [];
+                that.renderList = [];
+                that.networkTree = {};
+                resolve(true);
+            } catch(e) {
+                console.log("Error clearing BACnet data model: ", e);
+                reject(e);
+            }
+        });
+    }
+
     queryDevices() {
         let that = this;
         that.deviceList.forEach(function(device, index){
@@ -125,15 +219,37 @@ class BacnetClient extends EventEmitter {
             .acquire()
             .then(function(release) {
                 try {
+
+                    // that.getDevicePointListWithoutObjectList(device).then(function() {
+                    //     that.buildJsonObject(device).then(function() {
+                    //         release();
+                    //     }).catch(function(e) {
+                    //         release();
+                    //     });
+                    // }).catch(function(e) {
+                    //     release();
+                    // });
+
                     that.getDevicePointList(device).then(function() {
                         that.buildJsonObject(device).then(function() {
                             release();
                         }).catch(function(e) {
                             release();
                         });
-                    }).catch(function(e){
+                    }).catch(function(e) {
+                        that.getDevicePointListWithoutObjectList(device).then(function() {
+                            that.buildJsonObject(device).then(function() {
+                                release();
+                            }).catch(function(e) {
+                                release();
+                            });
+                        }).catch(function(e) {
+                            release();
+                        });
                         release();
                     });
+
+
                 } catch(e) {
                     console.log("Error while querying devices: ", e);
                     release();
@@ -144,7 +260,7 @@ class BacnetClient extends EventEmitter {
 
     updateDeviceName(device) {
         let that = this;
-        that._getDeviceName(device.address, device.deviceId).then(function(deviceName) {
+        that._getDeviceName(device.getAddress(), device.getDeviceId()).then(function(deviceName) {
             device.setDeviceName(deviceName);
         });
     }
@@ -183,21 +299,6 @@ class BacnetClient extends EventEmitter {
         }
     };
 
-    buildPointReferenceList(promiseArray){
-        let that = this;
-
-        let points = promiseArray.map(function(element){return element.point})
-        let promises = promiseArray.map(function(element){return element.promise})
-        promiseArray.forEach(function(element){
-            let point = element.point;
-
-            Promise.resolve(element.promise).then(function(result){
-                that.pointReferenceList.push({})
-            });
-        });
-
-    }
-
     getValidPointProperties(point, requestedProps){
         let availableProps = point.propertyList;
         let newProps = [];
@@ -208,7 +309,7 @@ class BacnetClient extends EventEmitter {
                 if(foundInAvailable) newProps.push(prop);
             });
             //add object name for use in formatting
-            newProps.push({id: baEnum.PropertyIds.PROP_OBJECT_NAME});
+            newProps.push({id: baEnum.PropertyIdentifier.OBJECT_NAME});
         } catch(e){
             console.log("Issue finding valid object properties, see error: ", e);
         }
@@ -216,7 +317,7 @@ class BacnetClient extends EventEmitter {
         return newProps;
     }
 
-    doRead(readConfig, outputType, msgId) {
+    doRead(readConfig, outputType, objectPropertyType, msgId) {
         let that = this;
 
         that.roundDecimal = readConfig.precision;
@@ -224,16 +325,37 @@ class BacnetClient extends EventEmitter {
         let propertiesToRead = readConfig.objectProperties;
 
         try {
-            devicesToRead.forEach(function(deviceAddress) {
-                let requestArray = [];
+
+            // const requestArray1 = [{
+            //     objectId: { type: baEnum.ObjectType.OBJECT_TRENDLOG, instance: 300002 },
+            //     properties: [{ id: baEnum.PropertyIdentifier.PRESENT_VALUE },
+            //         { id: baEnum.PropertyIdentifier.LOG_BUFFER }]
+            // }];
+
+            // this.client.readPropertyMultiple("10.0.8.202", requestArray1, that.readPropertyMultipleOptions, (error, value) => {
+            //     console.log("error: ", error);
+            //     console.log("value: ", value.values[0].values[0]);
+            //     console.log("value: ", value.values[0].values[1]);
+            //     //console.log(JSON.stringify(value));
+            // });
+
+            // that.client.readRange("10.0.8.202", 300002, 1, 5, {},  (error, value) => {
+            //     console.log("that.client.readRange:  ");
+            //     console.log("error: ", error);
+            //     console.log("value: ", value);
+            // });
+
+
+
+            devicesToRead.forEach(function(deviceId) {
                 let readPromiseArray = [];
-                let pointsToReadNames = Object.keys(readConfig.pointsToRead[deviceAddress]);
-                let device = that.deviceList.find(ele => ele.address == deviceAddress);
+                let pointsToReadNames = Object.keys(readConfig.pointsToRead[deviceId]);
+                let device = that.deviceList.find(ele => ele.getDeviceId() == deviceId);
                 pointsToReadNames.forEach(function(pointName, index) {
-                    let point = readConfig.pointsToRead[deviceAddress][pointName];
-                    readPromiseArray.push(that._readObjectFull(deviceAddress, point.meta.objectId.type, point.meta.objectId.instance));
+                    let point = readConfig.pointsToRead[deviceId][pointName];
+                    readPromiseArray.push(that._readObjectFull(device.getAddress(), point.meta.objectId.type, point.meta.objectId.instance));
                 });
-                that.readDeviceAndEmitJSON(readPromiseArray, device, outputType, propertiesToRead, msgId);
+                that.readDeviceAndEmitJSON(readPromiseArray, device, outputType, propertiesToRead, objectPropertyType, msgId);
             });
 
         } catch(e){
@@ -242,9 +364,9 @@ class BacnetClient extends EventEmitter {
 
     }
 
-    readDeviceAndEmitJSON(readPromiseArray, device, outputType, propertiesToRead, msgId) {
+    readDeviceAndEmitJSON(readPromiseArray, device, outputType, propertiesToRead, objectPropertyType, msgId) {
         let that = this;
-        let deviceName = device.deviceName;
+        let deviceName = device.getDeviceName();
 
         let bacnetResults = {
             [deviceName]: []
@@ -261,45 +383,71 @@ class BacnetClient extends EventEmitter {
                         element.values.forEach(function(point){
                             point.values.forEach(function(object) {                             
                                 let toReadProperty = propertiesToRead.findIndex(ele => ele.id == object.id);
+                                let objectName = that._findValueById(point.values, baEnum.PropertyIdentifier.OBJECT_NAME);
                                 //checks for error code json structure, returned for invalid bacnet requests
-                                if(!object.value.value && toReadProperty !== -1) {      
+                                if(!object.value.value && toReadProperty !== -1 && objectName !== "") {      
                                     var currobjectId = point.objectId.type
                                     let bac_obj = that.getObjectType(currobjectId);                                
-                                    let objectName = that._findValueById(point.values, baEnum.PropertyIds.PROP_OBJECT_NAME);
-
                                     let objectId;
+                                    objectId = objectName;
+                                    
+                                    /*
                                     if(objectName !== null) {
                                         objectName = objectName.split(" ").join("_");
                                         objectId = objectName + "_" + bac_obj + '_' + point.objectId.instance;
                                     } else {
                                         objectId = bac_obj + '_' + point.objectId.instance;
                                     }
+                                    */
 
                                     //init json object
                                     if(!values[objectId]) values[objectId] = {};
 
                                     switch(object.id) {
-                                        case baEnum.PropertyIds.PROP_PRESENT_VALUE:                                            
-                                            if(object.value[0] && object.value[0].value) values[objectId].presentValue = roundDecimalPlaces(object.value[0].value, that.roundDecimal);
+                                        case baEnum.PropertyIdentifier.PRESENT_VALUE:
+                                            if(object.value[0] && 
+                                               object.value[0].value !== "undefined" && 
+                                               object.value[0].value !== null && 
+                                               typeof object.value[0].value == "number") values[objectId].presentValue = roundDecimalPlaces(object.value[0].value, that.roundDecimal);
                                             break;
-                                        case baEnum.PropertyIds.PROP_DESCRIPTION:
+                                        case baEnum.PropertyIdentifier.DESCRIPTION:
                                             if(object.value[0]) values[objectId].description = object.value[0].value;
                                             break;
-                                        case baEnum.PropertyIds.PROP_STATUS_FLAGS:
+                                        case baEnum.PropertyIdentifier.STATUS_FLAGS:
                                             if(object.value[0] && object.value[0].value) values[objectId].statusFlags = that.getStatusFlags(object);
                                             break;
-                                        case baEnum.PropertyIds.PROP_RELIABILITY:
+                                        case baEnum.PropertyIdentifier.RELIABILITY:
                                             if(object.value[0]) values[objectId].reliability = that.getPROP_RELIABILITY(object.value[0].value);
                                             break; 
-                                        case baEnum.PropertyIds.PROP_OUT_OF_SERVICE:
+                                        case baEnum.PropertyIdentifier.OUT_OF_SERVICE:
                                             if(object.value[0]) values[objectId].outOfService = object.value[0].value;
                                             break;
-                                        case baEnum.PropertyIds.PROP_UNITS:
+                                        case baEnum.PropertyIdentifier.UNITS:
                                             if(object.value[0] && object.value[0].value) values[objectId].units = getUnit(object.value[0].value);
                                             break;
-                                        case baEnum.PropertyIds.PROP_OBJECT_NAME:
+                                        case baEnum.PropertyIdentifier.OBJECT_NAME:
                                             if(object.value[0] && object.value[0].value) values[objectId].objectName = object.value[0].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;
                                     }
                                 }
                             });
@@ -311,7 +459,7 @@ class BacnetClient extends EventEmitter {
                     }
                 });
                 if(Object.keys(bacnetResults[deviceName]).length !== 0) {
-                    that.emit('values', device, bacnetResults, outputType, msgId, successfulResults);
+                    that.emit('values', bacnetResults, outputType, objectPropertyType);
                 }
                 
             }).catch(function (error) {
@@ -323,8 +471,6 @@ class BacnetClient extends EventEmitter {
         }
     }
 
-
-
     _getDeviceName(address, deviceId) {
         let that = this;
         return new Promise((resolve, reject) => {
@@ -370,13 +516,13 @@ class BacnetClient extends EventEmitter {
                     newProps.push(prop);
                     break;
                 case 13:
-                    if(prop.id == baEnum.PropertyIds.PROP_PRESENT_VALUE || prop.id == baEnum.PropertyIds.PROP_OBJECT_NAME) newProps.push(prop);
+                    if(prop.id == baEnum.PropertyIdentifier.PRESENT_VALUE || prop.id == baEnum.PropertyIdentifier.OBJECT_NAME) newProps.push(prop);
                     break;     
                 case 14:
-                    if(prop.id == baEnum.PropertyIds.PROP_PRESENT_VALUE || prop.id == baEnum.PropertyIds.PROP_OBJECT_NAME) newProps.push(prop);
+                    if(prop.id == baEnum.PropertyIdentifier.PRESENT_VALUE || prop.id == baEnum.PropertyIdentifier.OBJECT_NAME) newProps.push(prop);
                     break;   
                 case 19:
-                    if(prop.id == baEnum.PropertyIds.PROP_PRESENT_VALUE || prop.id == baEnum.PropertyIds.PROP_OBJECT_NAME) newProps.push(prop);
+                    if(prop.id == baEnum.PropertyIdentifier.PRESENT_VALUE || prop.id == baEnum.PropertyIdentifier.OBJECT_NAME) newProps.push(prop);
                     break;              
             }
         });
@@ -387,9 +533,27 @@ class BacnetClient extends EventEmitter {
         let that = this;
         return new Promise(async function(resolve, reject) {
             try {
-                let result = await that.scanDevice(device);
+                let result = await that.scanDevice(device);     
                 device.setPointsList(result);
                 resolve(result);
+            } catch(e) {
+                console.log(`Error getting point list for ${device.getAddress()} - ${device.getDeviceId()}: `, e);
+                reject(e);
+            }
+        });
+    }
+
+    getDevicePointListWithoutObjectList(device) {
+        let that = this;
+        return new Promise(function(resolve, reject) {
+            try {
+                that.scanDeviceManually(device).then(function(result) {
+                    device.setPointsList(result);
+                    resolve(result);
+                }).catch(function(error) {
+                    reject(error);
+                });
+
 
             } catch(e) {
                 console.log("Error getting point list: ", e);
@@ -399,6 +563,97 @@ class BacnetClient extends EventEmitter {
         });
     }
 
+    scanDeviceManually(device) {
+        let that = this;
+       // console.log("scanning device: ", device.getAddress());
+        return new Promise(function(resolve, reject) {
+            let objectNameProperty = [{ id: baEnum.PropertyIdentifier.OBJECT_NAME }];
+            let address = device.getAddress();
+            //let deviceInstance = device.deviceId();
+            //let objectTypeList = [0, 1, 2, 3, 4, 5, 8, 13, 14, 19];
+            let objectTypeList = [0, 1, 2, 3];
+            let instanceRange = {start: 0, end: 100};
+            let requestArray = [];
+            let maxRequestThreshold = 1000;
+            let requestRate = 20;
+            let requestBuffer = [];
+            let sendBuffer = [];
+
+            //requestBuffer.push(that._readObjectFull(address, 8, deviceInstance));
+
+            if(that.manual_instance_range_enabled == true) {
+                instanceRange.start = that.manual_instance_range_start;
+                maxRequestThreshold = that.manual_instance_range_end;
+                if(that.manual_instance_range_end < requestRate) {
+                    requestRate = that.manual_instance_range_end;
+                }
+            }
+
+            for(let typeListIndex = 0; typeListIndex < objectTypeList.length; typeListIndex++){
+                let objectType = objectTypeList[typeListIndex];
+                for(let i = instanceRange.start; i <= instanceRange.end; i++) {
+
+                    requestArray.push({
+                        objectId: { type: objectType, instance: i },
+                        properties: objectNameProperty
+                    })
+
+                    if(requestArray.length == requestRate ) {
+                        requestBuffer.push(that._readObjectWithRequestArray(address, requestArray));
+                        instanceRange.end += requestRate;
+                        requestArray = [];
+                        if(i >= maxRequestThreshold) {
+                            instanceRange.end = maxRequestThreshold;
+                            if(typeListIndex == objectTypeList.length-1) {
+                                send();
+                            }
+                            
+                            break;
+                        }
+                    }
+                }
+
+                instanceRange.end = 100;
+            };
+
+             function send() {
+                //console.log("request buffer size: ", requestBuffer.length);
+
+                for(let index = 0; index < requestBuffer.length; index++) {
+                    let promise = requestBuffer[index];
+                    try {
+                        Promise.resolve(promise).then(function(result) {
+                            let keys = Object.keys(result);
+                            for (const [key, value] of Object.entries(result)) {
+                                if(key == "value" && typeof value == "object") {
+                                    for(let x = 0; x < value.values.length; x++) {
+                                        let ele = value.values[x];
+                                        let valueRoot = ele.values[0].value[0];
+                                        if(!valueRoot.value.errorClass && !valueRoot.value.errorCode) {
+                                           // console.log("pushing to send buffer");
+                                            sendBuffer.push({"value": ele.objectId, "type": 12});
+                                        }
+                                    }
+                                }
+                            }
+
+                            if(index == requestBuffer.length - 1) {
+                               // console.log("resolving send buffer");
+                                resolve(sendBuffer);
+                            }
+
+                        }).catch(function(error) {
+                            reject(error);
+                        });
+
+                    } catch(e) {
+                        reject(e)
+                    }
+                }
+            }
+        });
+    }
+
     _readObjectWithRequestArray(deviceAddress, requestArray) {
         let that = this;
 
@@ -431,9 +686,9 @@ class BacnetClient extends EventEmitter {
     _readDeviceName(deviceAddress, deviceId, callback){
         let that = this;
         const requestArray = [{
-            objectId: { type: baEnum.ObjectTypes.OBJECT_DEVICE, instance: deviceId },
+            objectId: { type: baEnum.ObjectType.DEVICE, instance: deviceId },
             properties: [
-                { id: baEnum.PropertyIds.PROP_OBJECT_NAME }
+                { id: baEnum.PropertyIdentifier.OBJECT_NAME }
             ]
         }];
 
@@ -443,8 +698,8 @@ class BacnetClient extends EventEmitter {
     _readObjectList(deviceAddress, deviceId, callback) {
         let that = this;
         const requestArray = [{
-            objectId: { type: baEnum.ObjectTypes.OBJECT_DEVICE, instance: deviceId },
-            properties: [{ id: baEnum.PropertyIds.PROP_OBJECT_LIST }
+            objectId: { type: baEnum.ObjectType.DEVICE, instance: deviceId },
+            properties: [{ id: baEnum.PropertyIdentifier.OBJECT_LIST }
             ]
         }];
         
@@ -458,38 +713,44 @@ class BacnetClient extends EventEmitter {
     _readObjectFull(deviceAddress, type, instance) {
 
         return this._readObject(deviceAddress, type, instance, [
-            { id: baEnum.PropertyIds.PROP_OBJECT_IDENTIFIER },
-            { id: baEnum.PropertyIds.PROP_OBJECT_NAME },
-            { id: baEnum.PropertyIds.PROP_OBJECT_TYPE },
-            { id: baEnum.PropertyIds.PROP_DESCRIPTION },
-            { id: baEnum.PropertyIds.PROP_UNITS },
-            { id: baEnum.PropertyIds.PROP_PRESENT_VALUE },
-            { id: baEnum.PropertyIds.PROP_PROPERTY_LIST },
-            { id: baEnum.PropertyIds.PROP_STATUS_FLAGS },
-            { id: baEnum.PropertyIds.PROP_RELIABILITY },
-            { id: baEnum.PropertyIds.PROP_OUT_OF_SERVICE }
+            { id: baEnum.PropertyIdentifier.OBJECT_IDENTIFIER },
+            { id: baEnum.PropertyIdentifier.OBJECT_NAME },
+            { id: baEnum.PropertyIdentifier.OBJECT_TYPE },
+            { id: baEnum.PropertyIdentifier.DESCRIPTION },
+            { id: baEnum.PropertyIdentifier.UNITS },
+            { id: baEnum.PropertyIdentifier.PRESENT_VALUE },
+            { id: baEnum.PropertyIdentifier.PROPERTY_LIST },
+            { id: baEnum.PropertyIdentifier.STATUS_FLAGS },
+            { id: baEnum.PropertyIdentifier.RELIABILITY },
+            { id: baEnum.PropertyIdentifier.OUT_OF_SERVICE },
+
+            { id: baEnum.PropertyIdentifier.SYSTEM_STATUS },
+            { id: baEnum.PropertyIdentifier.MODIFICATION_DATE },
+            { id: baEnum.PropertyIdentifier.PROGRAM_STATE },
+            { id: baEnum.PropertyIdentifier.RECORD_COUNT }
+
         ]);
     };
 
     _readObjectPropList(deviceAddress, type, instance) {
 
         return this._readObject(deviceAddress, type, instance, [
-            { id: baEnum.PropertyIds.PROP_PROPERTY_LIST }
+            { id: baEnum.PropertyIdentifier.PROPERTY_LIST }
         ]);
     };
 
     _readObjectId(deviceAddress, type, instance) {
 
         return this._readObject(deviceAddress, type, instance, [
-            { id: baEnum.PropertyIds.PROP_OBJECT_IDENTIFIER }
+            { id: baEnum.PropertyIdentifier.OBJECT_IDENTIFIER }
         ]);
     }
 
     _readObjectPresentValue(deviceAddress, type, instance) {
 
         return this._readObject(deviceAddress, type, instance, [
-            { id: baEnum.PropertyIds.PROP_PRESENT_VALUE },
-            { id: baEnum.PropertyIds.PROP_OBJECT_NAME}
+            { id: baEnum.PropertyIdentifier.PRESENT_VALUE },
+            { id: baEnum.PropertyIdentifier.OBJECT_NAME}
         ]);
     }
 
@@ -573,11 +834,11 @@ class BacnetClient extends EventEmitter {
         const objectInfo = object.values[0].objectId;
         const deviceObjectId = new DeviceObjectId(objectInfo.type, objectInfo.instance);
         const objectProperties = object.values[0].values;
-        const name = this._findValueById(objectProperties, baEnum.PropertyIds.PROP_OBJECT_NAME);
-        const PROP_DESCRIPTION = this._findValueById(objectProperties, baEnum.PropertyIds.PROP_DESCRIPTION);
-        const type = this._findValueById(objectProperties, baEnum.PropertyIds.PROP_OBJECT_TYPE);
-        const PROP_UNITS = this._findValueById(objectProperties, baEnum.PropertyIds.PROP_UNITS);
-        const presentValue = this._findValueById(objectProperties, baEnum.PropertyIds.PROP_PRESENT_VALUE);
+        const name = this._findValueById(objectProperties, baEnum.PropertyIdentifier.OBJECT_NAME);
+        const PROP_DESCRIPTION = this._findValueById(objectProperties, baEnum.PropertyIdentifier.DESCRIPTION);
+        const type = this._findValueById(objectProperties, baEnum.PropertyIdentifier.OBJECT_TYPE);
+        const PROP_UNITS = this._findValueById(objectProperties, baEnum.PropertyIdentifier.UNITS);
+        const presentValue = this._findValueById(objectProperties, baEnum.PropertyIdentifier.PRESENT_VALUE);
 
         return new DeviceObject(deviceObjectId, name, PROP_DESCRIPTION, type, PROP_UNITS, presentValue);
     }
@@ -613,7 +874,7 @@ class BacnetClient extends EventEmitter {
 
     scanDevice(device) {
         return new Promise((resolve, reject) => {
-            this._readObjectList(device.address, device.deviceId, (err, result) => {
+            this._readObjectList(device.getAddress(), device.getDeviceId(), (err, result) => {
                 if (!err) {
                     try {
                         resolve(result.values[0].values[0].value);
@@ -640,7 +901,8 @@ class BacnetClient extends EventEmitter {
         let that = this;
         let options = {
             lowLimit: 0,
-            highLimit: baAsn1.BACNET_MAX_INSTANCE
+            highLimit: bacnetIdMax,
+            'net': 65535
         };
 
         if(that.device_id_range_enabled == true) {
@@ -649,7 +911,25 @@ class BacnetClient extends EventEmitter {
         }
 
         if(that.client) {
-            that.client.whoIs(options);
+            that.client.whoIs({'net': 65535});
+
+            //that.client.whoIs(options);
+            //that.client.whoIs({'net':3});
+
+            // that.client.whoIs({'net':3001});
+
+            // read a point through a router to an MSTP device
+            // that.client.readProperty({address: '10.0.8.212',net:3001,adr:[20]} , {type: 8, instance: 2002}, 77, (err, value) => {
+            //     console.log('value: ', value);
+            //     console.log('err: ', err);
+            // });
+
+            // that.client.readProperty({address: '10.0.8.212',net:3001,adr:[20]} , {type: 8, instance: 2002}, 77, (err, value) => {
+            //     console.log('value: ', value);
+            //     console.log('err: ', err);
+            // });
+
+
         } else {
             that.reinitializeClient(that.config);
         }
@@ -681,22 +961,37 @@ class BacnetClient extends EventEmitter {
     }
 
     buildNetworkTreeData() {
-        let that = this;        
+        let that = this;  
+        let displayNameCharThreshold = 40;
         return new Promise(async function(resolve, reject) {
             if(!that.renderList) that.renderList = [];
             if(that.deviceList && that.networkTree) {
                 that.deviceList.forEach(function(deviceInfo, index) {
                     let ipAddr = deviceInfo.getAddress();
+                    let deviceId = deviceInfo.getDeviceId();
                     let deviceName = deviceInfo.getDeviceName() == null ? ipAddr : deviceInfo.getDeviceName();                    
-                    let deviceObject = that.networkTree[ipAddr];
+                    let deviceObject = that.networkTree[deviceId];
+                    let isMstpDevice = deviceInfo.getIsMstpDevice();
 
                     if(deviceObject) {
                         let children = [];
                         let pointIndex = 0;
 
                         for(const pointName in deviceObject) {
+                            //console.log("buidling tree obj for: ", pointName);
                             let pointProperties = [];
                             let values = deviceObject[pointName];
+                            let displayName = pointName;
+                            if(pointName.length > displayNameCharThreshold) {
+                                displayName = "";
+                                let charArray = pointName.split("");
+                                for(let i = 0; i < charArray.length; i++){
+                                    if(i < displayNameCharThreshold){
+                                        displayName += charArray[i];
+                                    }
+                                }
+                                displayName += "...";
+                            }
 
                             if(values.objectName){
                                 pointProperties.push({"key": `${index}-${pointIndex}-0`, "label": `Name: ${values.objectName}`, "data": values.objectName, "icon": "pi pi-bolt", "children": null});
@@ -713,17 +1008,30 @@ class BacnetClient extends EventEmitter {
                             if(values.units){
                                 pointProperties.push({"key": `${index}-${pointIndex}-4`, "label": `Units: ${values.units}`, "data": `${values.units}`, "icon": "pi pi-bolt", "children": null});
                             }
-                            if(values.presentValue !== "undefined" && values.presentValue !== null) {
+                            if(values.presentValue !== "undefined" && values.presentValue !== null && typeof values.presentValue !== "undefined") {
                                 pointProperties.push({"key": `${index}-${pointIndex}-5`, "label": `Present Value: ${values.presentValue}`, "data": `${values.presentValue}`, "icon": "pi pi-bolt", "children": null});
                             }
-                            children.push({"key": `${index}-${pointIndex}`, "label": pointName, "data": pointName, "icon": "", "children": pointProperties, "type": "point", "parentDevice": deviceName, "showAdded": false, "bacnetType": values.meta.objectId.type})
+                            if(values.systemStatus !== null && typeof values.systemStatus !== "undefined" && values.systemStatus !== ""){
+                                pointProperties.push({"key": `${index}-${pointIndex}-6`, "label": `System Status: ${values.systemStatus}`, "data": `${values.systemStatus}`, "icon": "pi pi-bolt", "children": null});
+                            }
+                            if(values.modificationDate && !values.modificationDate.errorClass) {
+                                pointProperties.push({"key": `${index}-${pointIndex}-7`, "label": `Modification Date: ${values.modificationDate}`, "data": `${values.modificationDate}`, "icon": "pi pi-bolt", "children": null});
+                            }
+                            if(values.programState){
+                                pointProperties.push({"key": `${index}-${pointIndex}-8`, "label": `Program State: ${values.programState}`, "data": `${values.programState}`, "icon": "pi pi-bolt", "children": null});
+                            }
+                            if(values.recordCount && !values.recordCount.errorClass){
+                                pointProperties.push({"key": `${index}-${pointIndex}-9`, "label": `Record Count: ${values.recordCount}`, "data": `${values.recordCount}`, "icon": "pi pi-bolt", "children": null});
+                            }
+
+                            children.push({"key": `${index}-${pointIndex}`, "label": displayName, "data": displayName, "pointName": pointName, "icon": that.getPointIcon(values.meta.objectId.type), "children": pointProperties, "type": "point", "parentDevice": deviceName, "showAdded": false, "bacnetType": values.meta.objectId.type})
                             pointIndex++;
                         }
-                        let foundIndex = that.renderList.findIndex(ele => ele.key == index && ele.ipAddr == ipAddr);
+                        let foundIndex = that.renderList.findIndex(ele => ele.key == index && ele.deviceId == deviceId);
                         if(foundIndex !== -1) {
-                            that.renderList[foundIndex] = {"key": index, "label": deviceName, "data": deviceName, "icon": "pi pi-box", "children": children.sort(that.sortPoints), "type": "device", "lastSeen": deviceInfo.getLastSeen(), "showAdded": false, "ipAddr": ipAddr};
+                            that.renderList[foundIndex] = {"key": index, "label": deviceName, "data": deviceName, "icon": that.getDeviceIcon(isMstpDevice), "children": children.sort(that.sortPoints), "type": "device", "lastSeen": deviceInfo.getLastSeen(), "showAdded": false, "ipAddr": ipAddr, "deviceId": deviceId, "isMstpDevice": isMstpDevice};
                         } else if(foundIndex == -1) {
-                            that.renderList.push({"key": index, "label": deviceName, "data": deviceName, "icon": "pi pi-box", "children": children.sort(that.sortPoints), "type": "device", "lastSeen": deviceInfo.getLastSeen(), "showAdded": false, "ipAddr": ipAddr});
+                            that.renderList.push({"key": index, "label": deviceName, "data": deviceName, "icon": that.getDeviceIcon(isMstpDevice), "children": children.sort(that.sortPoints), "type": "device", "lastSeen": deviceInfo.getLastSeen(), "showAdded": false, "ipAddr": ipAddr, "deviceId": deviceId, "isMstpDevice": isMstpDevice});
                         }
                         if(index == that.deviceList.length - 1) {
                             resolve({renderList: that.renderList, deviceList: that.deviceList, pointList: that.networkTree, pollFrequency: that.discover_polling_schedule});
@@ -741,73 +1049,68 @@ class BacnetClient extends EventEmitter {
         let address = device.address;
         let pointList = device.getPointsList();
 
-        return new Promise(function(resolve, reject) {           
+        return new Promise(function(resolve, reject) {
             let promiseArray = [];
-            pointList.forEach(function(point, pointListIndex) {
-                promiseArray.push(that._readObjectFull(address, point.value.type, point.value.instance));
-                if(pointListIndex == pointList.length - 1) {
-                    Promise.all(promiseArray).then(function(objectList){
-                        that.buildResponse(objectList, device).then(function() {
-                            that.lastNetworkPoll = Date.now();
-                            resolve({deviceList: that.deviceList, pointList: that.networkTree});
-                        }).catch(function(e){
+            if(typeof pointList !== "undefined" && pointList.length > 0) {
+                pointList.forEach(function(point, pointListIndex) {
+                    promiseArray.push(that._readObjectFull(address, point.value.type, point.value.instance));
+                    if(pointListIndex == pointList.length - 1) {
+                        Promise.all(promiseArray).then(function(objectList){
+                            that.buildResponse(objectList, device).then(function() {
+                                that.lastNetworkPoll = Date.now();
+                                resolve({deviceList: that.deviceList, pointList: that.networkTree});
+                            }).catch(function(e){
+                                console.log("Error while building json object: ", e);
+                                reject(e);
+                            });
+                        }).catch(function(e) {
                             console.log("Error while building json object: ", e);
                             reject(e);
                         });
-                    }).catch(function(e) {
-                        console.log("Error while building json object: ", e);
-                        reject(e);
-                    });
-                }
-            });
+                    }
+                });
+            } else {
+                reject("Unable to build network tree, empty point list");
+            }
         });
     }
 
     // Builds response object for a fully qualified 
     buildResponse(fullObjects, device) {
         let that = this;
-        let deviceName = device.getDeviceName();
-        let ipAddr = device.getAddress();
-
         return new Promise(function(resolve, reject) {
-            let values = that.networkTree[device.getAddress()] ? that.networkTree[device.getAddress()] : {};
-
-            for(let i = 0; i < fullObjects.length; i++) {
-            
+            let values = that.networkTree[device.getDeviceId()] ? that.networkTree[device.getDeviceId()] : {};
+            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) {
-
                         let currobjectId = pointProperty.objectId.type
                         let bac_obj = that.getObjectType(currobjectId);
-                        
-                        let objectName = that._findValueById(pointProperty.values, baEnum.PropertyIds.PROP_OBJECT_NAME);
-                        let objectType = that._findValueById(pointProperty.values, baEnum.PropertyIds.PROP_OBJECT_TYPE);
-                        
+                        let objectName = that._findValueById(pointProperty.values, baEnum.PropertyIdentifier.OBJECT_NAME);
+                        let objectType = that._findValueById(pointProperty.values, baEnum.PropertyIdentifier.OBJECT_TYPE);
                         let objectId;
                         if(objectName !== null) {
-                            objectName = objectName.split(" ").join("_");
+                            //objectName = objectName.split(" ").join("_");
                             objectId = objectName + "_" + bac_obj + '_' + pointProperty.objectId.instance;
                         } else {
                             objectId = bac_obj + '_' + pointProperty.objectId.instance;
                         }
-
-                        if(!values[objectId]) values[objectId] = {};
-                        values[objectId].meta = {
-                            objectId: pointProperty.objectId
-                        };
-                        
                         try {
                             pointProperty.values.forEach(function(object, objectIndex) {
                                 //checks for error code json structure, returned for invalid bacnet requests
-                                if(!object.value.value) {
+                                if(!object.value.value && !object.value[0].value.errorClass && !object.value.errorClass) {
+
+                                    if(!values[objectId]) values[objectId] = {};
+                                    values[objectId].meta = {
+                                        objectId: pointProperty.objectId
+                                    };
+
                                     switch(object.id) {
-                                        case baEnum.PropertyIds.PROP_PRESENT_VALUE:
+                                        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(objectType == 3 || objectType == 4 || objectType == 5) {
                                                     if(object.value[0].value == 0) {
                                                         values[objectId].presentValue = false;
                                                     } else if(object.value[0].value == 1) {
@@ -819,29 +1122,52 @@ class BacnetClient extends EventEmitter {
                                             } 
                                             values[objectId].meta.arrayIndex = object.index;
                                             break;
-                                        case baEnum.PropertyIds.PROP_DESCRIPTION:
+                                        case baEnum.PropertyIdentifier.DESCRIPTION:
                                             if(object.value[0]) values[objectId].description = object.value[0].value;
                                             break;
-                                        case baEnum.PropertyIds.PROP_UNITS:
+                                        case baEnum.PropertyIdentifier.UNITS:
                                             if(object.value[0] && object.value[0].value) values[objectId].units = getUnit(object.value[0].value);
                                             break;
-                                        case baEnum.PropertyIds.PROP_OBJECT_NAME:
+                                        case baEnum.PropertyIdentifier.OBJECT_NAME:
                                             if(object.value[0] && object.value[0].value) values[objectId].objectName = object.value[0].value;
                                             break;
-                                        case baEnum.PropertyIds.PROP_OBJECT_TYPE:
+                                        case baEnum.PropertyIdentifier.OBJECT_TYPE:
                                             if(object.value[0] && object.value[0].value) values[objectId].objectType = object.value[0].value;
                                             break;
-                                        case baEnum.PropertyIds.PROP_OBJECT_IDENTIFIER:
+                                        case baEnum.PropertyIdentifier.OBJECT_IDENTIFIER:
                                             if(object.value[0] && object.value[0].value) values[objectId].objectID = object.value[0].value;
                                             break;    
-                                        case baEnum.PropertyIds.PROP_PROPERTY_LIST:
+                                        case baEnum.PropertyIdentifier.PROPERTY_LIST:
                                             if(object.value) values[objectId].propertyList = that.mapPropsToArray(object.value);
-                                            break;                                                                                        
+                                            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;
                                     }
                                 }
-
                                 if(pointPropertyIndex == successfulResult.values.length - 1 && objectIndex == pointProperty.values.length - 1 && i == fullObjects.length - 1) {
-                                    that.networkTree[device.getAddress()] = values;
+                                    that.networkTree[device.getDeviceId()] = values;
                                     resolve(that.networkTree);
                                 } 
                             });
@@ -853,12 +1179,12 @@ class BacnetClient extends EventEmitter {
                 } else {
                     //error found in point property
                     if(i == fullObjects.length - 1) {
-                        that.networkTree[device.getAddress()] = values;
+                        that.networkTree[device.getDeviceId()] = values;
                         resolve(that.networkTree);
                     }
                 }
             }
-            reject("Unexpectedly found end of loop, line 861");
+            reject("Unexpectedly found end of loop, line 1170");
         });
     }
 
@@ -870,6 +1196,104 @@ class BacnetClient extends EventEmitter {
         return uniquePropArray;
     }
 
+    getPROP_PROGRAM_STATE(value) {
+        switch(value) {
+            case 0:
+                return "0 - Idle";
+            case 1:
+                return "1 - Loading";
+            case 2:
+                return "2 - Running";
+            case 3:
+                return "3 - Waiting";
+            case 4:
+                return "4 - Halted";
+            case 5:
+                return "5 - Unloading";
+            default:
+                return "";
+        }
+    }
+
+    getPROP_SYSTEM_STATUS(value) {
+        switch(value) {
+            case 0:
+                return "0 - Operational";
+            case 1:
+                return "1 - Operational Readonly";
+            case 2:
+                return "2 - Download Required";
+            case 3:
+                return "3 - Download In Progress";
+            case 4:
+                return "4 - Non Operational";
+            case 5:
+                return "5 - Backup In Progress";
+            default:
+                return "";
+        }
+    }
+
+    getPointIcon(objectId) {
+        switch(objectId) {
+            case 0:
+                //AI
+                return "pi pi-tags";
+            case 1:
+                //AO
+                return "pi pi-tags";
+            case 2:
+                //AV
+                return "pi pi-tags";
+            case 3: 
+                //BI
+                return "pi pi-tags";
+            case 4:
+                //BO
+                return "pi pi-tags";
+            case 5:
+                //BV
+                return "pi pi-tags";
+            case 8:
+                //Device
+                return "pi pi-box";
+            case 13: 
+                //MI
+                return "pi pi-tags";
+            case 14:
+                //MO
+                return "pi pi-tags";
+            case 19:
+                //MV
+                return "pi pi-tags";
+            case 10:
+                //File
+                return "pi pi-file";
+            case 16:
+                //Program
+                return "pi pi-database";
+            case 20:
+                //Trendlog
+                return "pi pi-chart-line";
+            case 15:
+                //Notification Class
+                return "pi pi-bell";
+            case 56:
+                return "pi pi-sitemap";
+            case 178:
+                return "pi pi-lock";
+            case 20:
+                return "pi pi-chart-line";        
+            case 17:
+                return "pi pi-calendar";
+            case 6:
+                return "pi pi-calendar";
+            default:
+                //Return circle for all other types
+                return "pi pi-tags";
+        }
+    }
+
     getObjectType(objectId) {
         switch(objectId) {
             case 0:
@@ -935,6 +1359,15 @@ class BacnetClient extends EventEmitter {
     getStatusFlags(flags) {
         return flags.value[0].value;
     }
+
+    getDeviceIcon(isMstp){
+        if(isMstp == true) {
+            return "pi pi-share-alt"
+        } else if(isMstp == false) {
+           return "pi pi-server"
+        }
+        return "pi pi-server";
+    }
 }
 
 module.exports = { BacnetClient };