@bitpoolos/edge-bacnet 1.2.5 → 1.2.7

package/bacnet_read.html

@@ -106,7 +106,7 @@
                             app.pollFrequency = parseInt(result.pollFrequency);
                             app.deviceCount = result.deviceList.length;
                             //progress bar percentage
-                            let progressVal = parseInt((result.renderList.length / result.deviceList.length) * 100);
+                            let progressVal = parseInt((result.renderListCount / result.deviceList.length) * 100);
                             if(typeof progressVal == "number" && !isNaN(progressVal)) {
                                 app.progressBarValue = progressVal;
                             } else {
@@ -231,7 +231,7 @@
                             node.hiddenDeployToggle = !node.prevHiddenToggleState;
 
                         } catch(e) {
-                            console.log("removeAllClicked error: ", e);
+                            //do nothing
                         }
 
                         app.$forceUpdate();
@@ -241,11 +241,26 @@
                         //update UI
                         let parentDeviceName = slotProps.node.parentDevice;
                         let foundDeviceIndex = this.readDevices ? this.readDevices.findIndex(ele => ele.label == parentDeviceName) : -1;
-                        let parentDevice = this.devices.find(ele => ele.label == parentDeviceName);
+                        let device = this.deviceList.find(ele => ele.deviceName == parentDeviceName);
+                        let deviceAddress = app.getDeviceAddress(device.address);
+                        let key = `${deviceAddress}-${device.deviceId}`;
+                        let parentDevice = this.devices.find(ele => ele.ipAddr == deviceAddress);
+                        let childDevice;
+                        if(device.isMstp){
+                            let foundChildIndex = parentDevice.children[1].children.findIndex(ele => ele.label == parentDeviceName);
+                            if(foundChildIndex !== -1) {
+                                childDevice = parentDevice.children[1].children[foundChildIndex];
+                            }
+                        } 
 
                         if (foundDeviceIndex == -1) {
                             //no read devices present, add new
-                            let newReadParent = {...parentDevice};
+                            let newReadParent;
+                            if(childDevice) {
+                                newReadParent = {...childDevice};
+                            } else{
+                                newReadParent = {...parentDevice};
+                            } 
                             newReadParent.children = [];
                             newReadParent.children.push(slotProps.node);
 
@@ -260,22 +275,10 @@
                         }
 
                         //set show added to true 
-                        let slot = parentDevice.children.find(ele => ele.pointName == slotProps.node.pointName);
-                        slot.showAdded = true;
-
+                        slotProps.node.showAdded = true;
                         this.$forceUpdate();
 
                         //update node-red data structure
-                        let device = this.deviceList.find(ele => {
-                            if(ele.address.address) {
-                                return ele.address.address == parentDevice.ipAddr && ele.deviceId == parentDevice.deviceId;
-                            } else {
-                                return ele.address == parentDevice.ipAddr && ele.deviceId == parentDevice.deviceId;
-                            }
-                        });
-                        let deviceAddress = app.getDeviceAddress(device.address);
-                        let key = `${deviceAddress}-${device.deviceId}`;
-
                         if (!this.pointsToRead[key]) {
                             this.pointsToRead[key] = {};
                         }
@@ -294,6 +297,9 @@
                         let parentDeviceName = slotProps.node.parentDevice;
                         let foundDeviceIndex = this.readDevices ? this.readDevices.findIndex(ele => ele.label == parentDeviceName) : -1;
                         let parentDevice = this.devices.find(ele => ele.label == parentDeviceName);
+                        let device = this.deviceList.find(ele => ele.deviceName == parentDeviceName);
+                        let deviceAddress = app.getDeviceAddress(device.address);
+                        let key = `${deviceAddress}-${device.deviceId}`;
 
                         if (foundDeviceIndex !== -1) {
                             let foundIndex = this.readDevices[foundDeviceIndex].children.findIndex(ele => ele.key == slotProps.node.key && ele.pointName == slotProps.node.pointName);
@@ -304,21 +310,10 @@
                         }
 
                         //set show added to true 
-                        let slot = parentDevice.showAdded ? slotProps.node : parentDevice.children.find(ele => ele.pointName == slotProps.node.pointName);
-                        slot.showAdded = false;
                         slotProps.node.showAdded = false;
                         this.$forceUpdate();
 
                         //update node-red data stucture
-                        let device = this.deviceList.find(ele => {
-                            if(ele.address.address) {
-                                return ele.address.address == parentDevice.ipAddr && ele.deviceId == parentDevice.deviceId;
-                            } else {
-                                return ele.address == parentDevice.ipAddr && ele.deviceId == parentDevice.deviceId;
-                            }
-                        });
-                        let deviceAddress = app.getDeviceAddress(device.address);
-                        let key = `${deviceAddress}-${device.deviceId}`;
                         let point = this.pointList[key][slotProps.node.pointName];
                         if (this.pointsToRead[key][point.objectName]) delete this.pointsToRead[key][point.objectName];
                         //if last point is removed, deleted whole entry
@@ -460,12 +455,22 @@
             if (node.vm.$data.devices) node.devices = node.vm.$data.devices;
             if (node.vm.$data.readDevices) node.readDevices = node.vm.$data.readDevices;
             if (node.vm.$data.pointsToRead) node.pointsToRead = node.vm.$data.pointsToRead;
+            //clear reload data function
+            if(node.reloadTimer) {
+                clearInterval(node.reloadTimer);
+                node.reloadTimer = null;
+            }
         },
         oneditcancel: function () {
             let node = this;
             if (node.vm.$data.devices) node.devices = node.vm.$data.devices;
             if (node.vm.$data.readDevices) node.readDevices = node.vm.$data.readDevices;
             if (node.vm.$data.pointsToRead) node.pointsToRead = node.vm.$data.pointsToRead;
+            //clear reload data function
+            if(node.reloadTimer) {
+                clearInterval(node.reloadTimer);
+                node.reloadTimer = null;
+            }
         }
     });
 
@@ -498,9 +503,6 @@
         .pointLabel {
             font-weight: 400;
         }
-        /* .p-treenode-children {
-            background-color: #f0f0f0;
-        } */
         .deviceLabel {
             font-weight: 100;
         }
@@ -526,15 +528,17 @@
         }
         .p-treenode-children > li > .p-treenode-children > li {
             font-size: 14px;
-            height: 25px;
+            /* height: 35px; */
             color: #b5b5b5 !important;
         }
         .p-treenode-children > li > .p-treenode-children > .p-treenode-label {
             color: #b5b5b5 !important;
         }
+        /*
         .p-treenode-children > li > .p-treenode-children > li:last-child {
-            padding-bottom: 30px;
+            padding-bottom: 30px; 
         }
+        */
         .p-tree-toggler:enabled:hover {
             background: #d5d5d5 !important;
         }
@@ -551,6 +555,7 @@
         .statusOffline {
             color: red;
         }
+        
         .deviceLabel {
             position: absolute;
         }
@@ -659,6 +664,22 @@
             padding-right: 20px;
         }
 
+        .p-tree .p-treenode-children {
+            padding: 0 !important;
+        }
+
+        .p-tree-toggler .p-link {
+            width: 25px !important;
+        }
+
+        
+        /*
+        .p-treenode-content {
+            height: 15px;
+        }
+        */
+
+
     </style>
     
     <div class="form-row">
@@ -701,7 +722,7 @@
                     
 
                     <div id="deviceListApp">
-                        <p-tree :value="devices" selectable="false" :filter="true" filterMode="lenient" filterPlaceholder="No results found." v-if="hasData()">  
+                        <p-tree :value="devices" selectable="false" :filter="true" filterMode="lenient" filterPlaceholder="No results found." v-if="hasData()">
                             <template #device="slotProps">
                                 <div v-if="isDeviceActive(slotProps)" class="deviceLabelParent">
                                     <b class="deviceLabel">{{slotProps.node.label}} <b class="statusOnline deviceStatus">Online</b></b>
@@ -726,6 +747,15 @@
                                 </button>
                             </template>
 
+                            <!-- <template #pointFolder="slotProps">
+
+                            </template>
+
+                            
+                            <template #deviceFolder="slotProps">
+
+                            </template> -->
+
                             <template #point="slotProps" v-model:class="pointContent">                                
                                 <b class="pointLabel">{{slotProps.node.label}}</b>
 

package/bacnet_read.js

@@ -5,7 +5,6 @@
 
 
 module.exports = function (RED) {
-    const fetch = require('node-fetch');
     const http = require("http");
     const { ReadCommandConfig } = require('./common');
     const baEnum = require('./resources/node-bacstack-ts/dist/index.js').enum;
@@ -20,6 +19,7 @@ module.exports = function (RED) {
       this.pointsToRead = config.pointsToRead;
       this.readDevices = config.readDevices;
       this.id = config.id;
+      this.nodeName = config.name;
 
       this.object_property_simplePayload = config.object_property_simplePayload;
       this.object_property_fullObject = config.object_property_fullObject;
@@ -68,12 +68,13 @@ module.exports = function (RED) {
       node.send(priorityDevicesMsg);
 
       node.on('input', function(msg) {
+        node.status({ fill: "blue", shape: "dot", text: "Reading values" });
 
         let readConfig = new ReadCommandConfig(node.pointsToRead, node.object_props, node.roundDecimal);
-
         let output = {
           type: "Read",
           id: node.id,
+          readNodeName: node.nodeName,
           options: readConfig,
           objectPropertyType: {
             simplePayload: node.object_property_simplePayload,
@@ -84,9 +85,13 @@ module.exports = function (RED) {
             mqtt: node.mqtt
           }
         };
-
+        
         node.send(output);
 
+        setTimeout(() => {
+          node.status({});
+        }, 3000);
+
       });
 
     };

package/bacnet_server.js

@@ -8,7 +8,13 @@ class BacnetServer {
     constructor(client, deviceId, nodeRedVersion) {
         let that = this;        
         that.bacnetClient = client;
-        that.objectIdNumber = 1;
+        
+        // object identifier init
+        that.objectIdNumber = {};
+        that.objectIdNumber[baEnum.ObjectType.ANALOG_VALUE] = 0;
+        that.objectIdNumber[baEnum.ObjectType.CHARACTERSTRING_VALUE] = 0;
+        that.objectIdNumber[baEnum.ObjectType.BINARY_VALUE] = 0;
+
         that.nodeRedVersion = nodeRedVersion;
         that.deviceId = deviceId;
         that.vendorId = 1401;
@@ -63,7 +69,8 @@ class BacnetServer {
                 ],
             }, 
             [baEnum.ObjectType.ANALOG_VALUE]: [],
-            [baEnum.ObjectType.CHARACTERSTRING_VALUE]: []
+            [baEnum.ObjectType.CHARACTERSTRING_VALUE]: [],
+            [baEnum.ObjectType.BINARY_VALUE]: []
         };
 
         try {
@@ -74,6 +81,7 @@ class BacnetServer {
                 if(cachedData.objectStore) {
                     that.objectStore[baEnum.ObjectType.ANALOG_VALUE] = cachedData.objectStore[baEnum.ObjectType.ANALOG_VALUE];
                     that.objectStore[baEnum.ObjectType.CHARACTERSTRING_VALUE] = cachedData.objectStore[baEnum.ObjectType.CHARACTERSTRING_VALUE];
+                    that.objectStore[baEnum.ObjectType.BINARY_VALUE] = cachedData.objectStore[baEnum.ObjectType.BINARY_VALUE];
                 } 
             }
         } catch (error) {
@@ -121,8 +129,6 @@ class BacnetServer {
                 }
 
             } catch(e) {
-                console.log("Bacnet server readPropertyMultiple error: ", e);
-
                 that.bacnetClient.client.errorResponse(
                     data.address, 
                     baEnum.ConfirmedServiceChoice.READ_PROPERTY_MULTIPLE, 
@@ -160,7 +166,7 @@ class BacnetServer {
                     );
                 }
             } catch(e) {
-                console.log("Local BACnet device readProperty error: ", e);
+                //console.log("Local BACnet device readProperty error: ", e);
             }
 
         });
@@ -180,55 +186,87 @@ class BacnetServer {
         let that = this;
         let objectType = that.getBacnetObjectType(value);
         if(name && objectType) {
+            let instanceNumber;
+            if (name.includes('|')) {
+                // split name, assign last part to instanceNumber and the rest to name
+                let nameParts = name.split('|');
+                instanceNumber = nameParts[nameParts.length - 1];
+                nameParts.pop();
+                name = nameParts.join('|');
+            }
             let formattedName = name.replaceAll('.', '_');
             formattedName = formattedName.replaceAll('/', '_');
             if(objectType == "number") {
                 let foundIndex = that.objectStore[baEnum.ObjectType.ANALOG_VALUE].findIndex(ele => ele[baEnum.PropertyIdentifier.OBJECT_NAME][0].value == formattedName);
                 if(foundIndex == -1) {
-                 let objectId = that.getObjectIdentifier();
-                 that.objectStore[baEnum.ObjectType.ANALOG_VALUE].push({
+                    let objectId = that.getObjectIdentifier(baEnum.ObjectType.ANALOG_VALUE, instanceNumber);
+                    that.objectStore[baEnum.ObjectType.ANALOG_VALUE].push({
+                        [baEnum.PropertyIdentifier.OBJECT_NAME]: [{value: formattedName, type: 7}],
+                        [baEnum.PropertyIdentifier.OBJECT_TYPE]: [{value: baEnum.ObjectType.ANALOG_VALUE, type: 9}],
+                        [baEnum.PropertyIdentifier.DESCRIPTION]: [{value: '', type: 7}],
+                        [baEnum.PropertyIdentifier.OBJECT_IDENTIFIER]: [{value: {type: baEnum.ObjectType.ANALOG_VALUE, instance: objectId}, type: 12}],
+                        [baEnum.PropertyIdentifier.PRESENT_VALUE]: [{value: value, type: 4}],
+                        [baEnum.PropertyIdentifier.STATUS_FLAGS]: [{value: 0, type: 8}],
+                        [baEnum.PropertyIdentifier.EVENT_STATE]: [{value: 0, type: 9}],
+                        [baEnum.PropertyIdentifier.OUT_OF_SERVICE]: [{value: 0, type: 9}],
+                        [baEnum.PropertyIdentifier.UNITS]: [{value: 95, type: 9}],
+                        [baEnum.PropertyIdentifier.PRIORITY_ARRAY]: [{value: 0, type: 9}],
+                        [baEnum.PropertyIdentifier.MAX_PRES_VALUE]: [{value: value, type: 4}],
+                        [baEnum.PropertyIdentifier.MIN_PRES_VALUE]: [{value: value, type: 4}],
+                        [baEnum.PropertyIdentifier.RESOLUTION]: [{value: 0, type: 4}],
+                        [baEnum.PropertyIdentifier.PROPERTY_LIST]:
+                        [
+                            {value: baEnum.PropertyIdentifier.OBJECT_NAME, type: 9 }, 
+                            {value: baEnum.PropertyIdentifier.OBJECT_TYPE, type: 9 },
+                            {value: baEnum.PropertyIdentifier.DESCRIPTION, type: 9 },
+                            {value: baEnum.PropertyIdentifier.OBJECT_IDENTIFIER, type: 9 },
+                            {value: baEnum.PropertyIdentifier.PRESENT_VALUE, type: 9 },
+                            {value: baEnum.PropertyIdentifier.STATUS_FLAGS, type: 9 },
+                            {value: baEnum.PropertyIdentifier.EVENT_STATE, type: 9 },
+                            {value: baEnum.PropertyIdentifier.OUT_OF_SERVICE, type: 9 },
+                            {value: baEnum.PropertyIdentifier.UNITS, type: 9 },
+                            {value: baEnum.PropertyIdentifier.PRIORITY_ARRAY, type: 9 },
+                            {value: baEnum.PropertyIdentifier.MAX_PRES_VALUE, type: 9 },
+                            {value: baEnum.PropertyIdentifier.MIN_PRES_VALUE, type: 9 },
+                            {value: baEnum.PropertyIdentifier.RESOLUTION, type: 9 },
+                        ],
+                    });
+     
+                that.objectList.push({value: {type: baEnum.ObjectType.ANALOG_VALUE, instance: objectId}, type: 12})
+                that.objectStore[baEnum.ObjectType.DEVICE][baEnum.PropertyIdentifier.OBJECT_LIST] = that.objectList;
+                } else if(foundIndex !== -1) {
+                    let foundObject = that.objectStore[baEnum.ObjectType.ANALOG_VALUE][foundIndex];
+                    foundObject[baEnum.PropertyIdentifier.PRESENT_VALUE][0].value = value;
+                    that.objectStore[baEnum.ObjectType.DEVICE][baEnum.PropertyIdentifier.OBJECT_LIST] = that.objectList;
+                }
+            } else if (objectType == "boolean") {
+                let foundIndex = that.objectStore[baEnum.ObjectType.BINARY_VALUE].findIndex(ele => ele[baEnum.PropertyIdentifier.OBJECT_NAME][0].value == formattedName);
+                if(foundIndex == -1) {
+                 let objectId = that.getObjectIdentifier(baEnum.ObjectType.BINARY_VALUE);
+                 that.objectStore[baEnum.ObjectType.BINARY_VALUE].push({
                      [baEnum.PropertyIdentifier.OBJECT_NAME]: [{value: formattedName, type: 7}],
-                     [baEnum.PropertyIdentifier.OBJECT_TYPE]: [{value: baEnum.ObjectType.ANALOG_VALUE, type: 9}],
+                     [baEnum.PropertyIdentifier.OBJECT_TYPE]: [{value: baEnum.ObjectType.BINARY_VALUE, type: 9}],
                      [baEnum.PropertyIdentifier.DESCRIPTION]: [{value: '', type: 7}],
-                     [baEnum.PropertyIdentifier.OBJECT_IDENTIFIER]: [{value: {type: baEnum.ObjectType.ANALOG_VALUE, instance: objectId}, type: 12}],
-                     [baEnum.PropertyIdentifier.PRESENT_VALUE]: [{value: value, type: 4}],
+                     [baEnum.PropertyIdentifier.OBJECT_IDENTIFIER]: [{value: {type: baEnum.ObjectType.BINARY_VALUE, instance: objectId}, type: 12}],
+                     [baEnum.PropertyIdentifier.PRESENT_VALUE]: [{value: value, type: 1}],
                      [baEnum.PropertyIdentifier.STATUS_FLAGS]: [{value: 0, type: 8}],
                      [baEnum.PropertyIdentifier.EVENT_STATE]: [{value: 0, type: 9}],
                      [baEnum.PropertyIdentifier.OUT_OF_SERVICE]: [{value: 0, type: 9}],
-                     [baEnum.PropertyIdentifier.UNITS]: [{value: 95, type: 9}],
-                     [baEnum.PropertyIdentifier.PRIORITY_ARRAY]: [{value: 0, type: 9}],
-                     [baEnum.PropertyIdentifier.MAX_PRES_VALUE]: [{value: value, type: 4}],
-                     [baEnum.PropertyIdentifier.MIN_PRES_VALUE]: [{value: value, type: 4}],
-                     [baEnum.PropertyIdentifier.RESOLUTION]: [{value: 0, type: 4}],
-                     [baEnum.PropertyIdentifier.PROPERTY_LIST]:
-                     [
-                         {value: baEnum.PropertyIdentifier.OBJECT_NAME, type: 9 }, 
-                         {value: baEnum.PropertyIdentifier.OBJECT_TYPE, type: 9 },
-                         {value: baEnum.PropertyIdentifier.DESCRIPTION, type: 9 },
-                         {value: baEnum.PropertyIdentifier.OBJECT_IDENTIFIER, type: 9 },
-                         {value: baEnum.PropertyIdentifier.PRESENT_VALUE, type: 9 },
-                         {value: baEnum.PropertyIdentifier.STATUS_FLAGS, type: 9 },
-                         {value: baEnum.PropertyIdentifier.EVENT_STATE, type: 9 },
-                         {value: baEnum.PropertyIdentifier.OUT_OF_SERVICE, type: 9 },
-                         {value: baEnum.PropertyIdentifier.UNITS, type: 9 },
-                         {value: baEnum.PropertyIdentifier.PRIORITY_ARRAY, type: 9 },
-                         {value: baEnum.PropertyIdentifier.MAX_PRES_VALUE, type: 9 },
-                         {value: baEnum.PropertyIdentifier.MIN_PRES_VALUE, type: 9 },
-                         {value: baEnum.PropertyIdentifier.RESOLUTION, type: 9 },
-                     ],
+                     [baEnum.PropertyIdentifier.ACTIVE_TEXT]: [{value: 'ACTIVE', type: 7}],
+                     [baEnum.PropertyIdentifier.INACTIVE_TEXT]: [{value: 'INACTIVE', type: 7}],
                  });
      
-                 that.objectList.push({value: {type: baEnum.ObjectType.ANALOG_VALUE, instance: objectId}, type: 12})
+                 that.objectList.push({value: {type: baEnum.ObjectType.BINARY_VALUE, instance: objectId}, type: 12})
                  that.objectStore[baEnum.ObjectType.DEVICE][baEnum.PropertyIdentifier.OBJECT_LIST] = that.objectList;
                 } else if(foundIndex !== -1) {
-                    let foundObject = that.objectStore[baEnum.ObjectType.ANALOG_VALUE][foundIndex];
+                    let foundObject = that.objectStore[baEnum.ObjectType.BINARY_VALUE][foundIndex];
                     foundObject[baEnum.PropertyIdentifier.PRESENT_VALUE][0].value = value;
                     that.objectStore[baEnum.ObjectType.DEVICE][baEnum.PropertyIdentifier.OBJECT_LIST] = that.objectList;
                 }
             } else if(objectType == "string") {
                 let foundIndex = that.objectStore[baEnum.ObjectType.CHARACTERSTRING_VALUE].findIndex(ele => ele[baEnum.PropertyIdentifier.OBJECT_NAME][0].value == formattedName);
                 if(foundIndex == -1) {
-                 let objectId = that.getObjectIdentifier();
+                 let objectId = that.getObjectIdentifier(baEnum.ObjectType.CHARACTERSTRING_VALUE);
                  that.objectStore[baEnum.ObjectType.CHARACTERSTRING_VALUE].push({
                      [baEnum.PropertyIdentifier.OBJECT_NAME]: [{value: formattedName, type: 7}],
                      [baEnum.PropertyIdentifier.OBJECT_TYPE]: [{value: baEnum.ObjectType.CHARACTERSTRING_VALUE, type: 9}],
@@ -350,11 +388,119 @@ class BacnetServer {
         that.objectStore[baEnum.ObjectType.CHARACTERSTRING_VALUE] = [];
         that.objectStore[baEnum.ObjectType.ANALOG_VALUE] = [];
 
-        that.objectIdNumber = 1;
+        that.objectIdNumber = {};
+        that.objectIdNumber[baEnum.ObjectType.ANALOG_VALUE] = 0;
+        that.objectIdNumber[baEnum.ObjectType.CHARACTERSTRING_VALUE] = 0;
+        that.objectIdNumber[baEnum.ObjectType.BINARY_VALUE] = 0;
 
         Store_Config_Server(JSON.stringify({objectList: that.objectList, objectStore: that.objectStore}));
     }
 
+    clearServerPoint(json) {
+        let that = this;
+        return new Promise(async function (resolve, reject) {
+            try {
+                let type;
+                switch (json.body.type) {
+                    case 'SV':
+                        type = baEnum.ObjectType.CHARACTERSTRING_VALUE;
+                        break;
+                    case 'BV':
+                        type = baEnum.ObjectType.BINARY_VALUE;
+                        break;
+                    default:
+                        type = baEnum.ObjectType.ANALOG_VALUE;
+                        break;
+                }
+
+                // remove object from objectStore
+                let objectGroup = that.objectStore[type];
+                if (Array.isArray(objectGroup)) {
+                    for (let i = 0; i < objectGroup.length; i++) {
+                        let object = objectGroup[i];
+                        if (object[baEnum.PropertyIdentifier.OBJECT_IDENTIFIER][0].value.instance == json.body.instance) {
+                            that.objectStore[type].splice(i, 1);
+                            break;
+                        }
+                    }
+                } else {
+                    delete that.objectStore[type];
+                }
+
+                // remove object from objectList
+                let objectIndex = that.objectList.findIndex(ele =>
+                    ele.value.instance == json.body.instance && ele.value.type == type);
+                if (objectIndex !== -1) {
+                    that.objectList.splice(objectIndex, 1);
+                }
+
+                // update objectList in device object
+                that.objectStore[baEnum.ObjectType.DEVICE][baEnum.PropertyIdentifier.OBJECT_LIST] = that.objectList;
+
+                Store_Config_Server(JSON.stringify({ objectList: that.objectList, objectStore: that.objectStore }));
+
+                resolve(true);
+            } catch (e) {
+                reject(e);
+            }
+        });
+    }
+
+    getServerPoints() {
+        let that = this;
+        let points = [];
+
+        return new Promise(async function (resolve, reject) {
+            try {
+                // iterate analog value objects
+                if(that.objectStore[baEnum.ObjectType.ANALOG_VALUE] && that.objectStore[baEnum.ObjectType.ANALOG_VALUE].length > 0) {
+                    that.objectStore[baEnum.ObjectType.ANALOG_VALUE].forEach((point) => {
+                        let instance = point[baEnum.PropertyIdentifier.OBJECT_IDENTIFIER][0].value.instance;
+                        let objectName = point[baEnum.PropertyIdentifier.OBJECT_NAME][0].value;
+
+                        points.push({
+                            name: objectName,
+                            type: "AV",
+                            instance
+                        });
+                    });
+                }
+
+                // iterate character string value objects
+                if(that.objectStore[baEnum.ObjectType.CHARACTERSTRING_VALUE] && that.objectStore[baEnum.ObjectType.CHARACTERSTRING_VALUE].length > 0) {
+                    that.objectStore[baEnum.ObjectType.CHARACTERSTRING_VALUE].forEach((point) => {
+                        let instance = point[baEnum.PropertyIdentifier.OBJECT_IDENTIFIER][0].value.instance;
+                        let objectName = point[baEnum.PropertyIdentifier.OBJECT_NAME][0].value;
+
+                        points.push({
+                            name: objectName,
+                            type: "SV",
+                            instance
+                        });
+                    });
+                }
+
+                // iterate binary value objects
+                if(that.objectStore[baEnum.ObjectType.BINARY_VALUE] && that.objectStore[baEnum.ObjectType.BINARY_VALUE].length > 0) {
+                    that.objectStore[baEnum.ObjectType.BINARY_VALUE].forEach((point) => {
+                        let instance = point[baEnum.PropertyIdentifier.OBJECT_IDENTIFIER][0].value.instance;
+                        let objectName = point[baEnum.PropertyIdentifier.OBJECT_NAME][0].value;
+
+                        points.push({
+                            name: objectName,
+                            type: "BV",
+                            instance
+                        });
+                    });
+                }
+
+                resolve(points.sort((a, b) => (a.instance > b.instance) ? 1 : -1));
+            } catch (e) {
+                reject(e);
+            }
+        });
+    }
+
     getRandomArbitrary(min, max) {
         return Math.random() * (max - min) + min;
     }
@@ -367,16 +513,23 @@ class BacnetServer {
                 return "string"
             case "number":
                 return "number"        
+            case "boolean":
+                return "boolean"
             default:
                 return null
         }
     }
 
-    getObjectIdentifier() {
-        let that = this; 
-        let objectId = that.objectIdNumber;
-        that.objectIdNumber++;
-
+    getObjectIdentifier(type, instanceNumber) {
+        let that = this;
+        // manual instance numbering
+        if (instanceNumber) {
+            that.objectIdNumber[type] = instanceNumber + 1;
+            return instanceNumber;
+        }
+        // auto instance numbering
+        let objectId = that.objectIdNumber[type];
+        that.objectIdNumber[type]++;
         return objectId;
     }