@bitpoolos/edge-bacnet 1.1.7 → 1.2.1

package/bacnet_read.html

@@ -106,8 +106,17 @@
                             app.pollFrequency = parseInt(result.pollFrequency);
                             app.deviceCount = result.deviceList.length;
                             //progress bar percentage
-                            app.progressBarValue = parseInt((result.renderList.length / result.deviceList.length) * 100);
+                            let progressVal = parseInt((result.renderList.length / result.deviceList.length) * 100);
+                            if(typeof progressVal == "number" && !isNaN(progressVal)) {
+                                app.progressBarValue = progressVal;
+                            } else {
+                                app.progressBarValue = 0;
+                            }
+
+                            app.$forceUpdate();
                         });
+
+                        app.$forceUpdate();
                     },
                     rebuildDataModel() {
                         let app = this;
@@ -116,15 +125,14 @@
                                 app.progressBarValue = 0;
                             }
                         });
-
-
+                        app.$forceUpdate();
                     },
                     addAllDevices() {
                         let app = this;
                         app.devices.forEach(function (device) {
                             app.addAllClicked({"node": device});
                         });
-
+                        app.$forceUpdate();
                     },
                     addAllClicked(slotProps) {
                         //update UI 
@@ -169,7 +177,7 @@
                         node.hiddenDeployToggle = !node.prevHiddenToggleState;
                     },
                     removeAllDevices() {
-                        let app = this;
+                        let app = this;                        
 
                         let clone = JSON.parse(JSON.stringify(app.readDevices));
 
@@ -214,6 +222,7 @@
                             console.log("removeAllClicked error: ", e);
                         }
 
+                        app.$forceUpdate();
                     },
                     addPointClicked(slotProps) {
                         let app = this;
@@ -258,6 +267,8 @@
 
                         //force a deploy state
                         node.hiddenDeployToggle = !node.prevHiddenToggleState;
+
+                        app.$forceUpdate();
                     },
                     removePointClicked(slotProps) {
                         let app = this;
@@ -291,6 +302,8 @@
 
                         //force a deploy state
                         node.hiddenDeployToggle = !node.prevHiddenToggleState;
+
+                        app.$forceUpdate();
                     },
                     getDeviceAddress(addr) {
                         switch(typeof addr) {
@@ -420,16 +433,24 @@
         },
         oneditsave: function () {
             let node = this;
-            if (node.vm.$data.devices && node.vm.$data.devices.length > 0) node.devices = node.vm.$data.devices;
-            if (node.vm.$data.readDevices && node.vm.$data.readDevices.length > 0) node.readDevices = node.vm.$data.readDevices;
-            if (node.vm.$data.pointsToRead && node.vm.$data.pointsToRead.length > 0) node.pointsToRead = node.vm.$data.pointsToRead;
+            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;
+
+            // if (node.vm.$data.devices && node.vm.$data.devices.length > 0) node.devices = node.vm.$data.devices;
+            // if (node.vm.$data.readDevices && node.vm.$data.readDevices.length > 0) node.readDevices = node.vm.$data.readDevices;
+            // if (node.vm.$data.pointsToRead && node.vm.$data.pointsToRead.length > 0) node.pointsToRead = node.vm.$data.pointsToRead;
 
         },
         oneditcancel: function () {
             let node = this;
-            if (node.vm.$data.devices && node.vm.$data.devices.length > 0) node.devices = node.vm.$data.devices;
-            if (node.vm.$data.readDevices && node.vm.$data.readDevices.length > 0) node.readDevices = node.vm.$data.readDevices;
-            if (node.vm.$data.pointsToRead && node.vm.$data.pointsToRead.length > 0) node.pointsToRead = node.vm.$data.pointsToRead;
+            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;
+
+            // if (node.vm.$data.devices && node.vm.$data.devices.length > 0) node.devices = node.vm.$data.devices;
+            // if (node.vm.$data.readDevices && node.vm.$data.readDevices.length > 0) node.readDevices = node.vm.$data.readDevices;
+            // if (node.vm.$data.pointsToRead && node.vm.$data.pointsToRead.length > 0) node.pointsToRead = node.vm.$data.pointsToRead;
         }
     });
 

package/bacnet_read.js

@@ -6,7 +6,7 @@
 
 module.exports = function (RED) {
     const { ReadCommandConfig } = require('./common');
-    const baEnum = require('./resources/node-bacnet/index.js').enum;
+    const baEnum = require('./resources/node-bacstack-ts/dist/index.js').enum;
 
     function BitpoolBacnetReadDevice (config) {
       RED.nodes.createNode(this, config);

package/bacnet_server.js

@@ -1,4 +1,5 @@
-const bacnet = require('./resources/node-bacnet/index.js');
+const bacnet = require('./resources/node-bacstack-ts/dist/index.js');
+const pjson = require('./package.json');
 const baEnum = bacnet.enum;
 const {Store_Config_Server, Read_Config_Sync_Server } = require('./common');
 
@@ -10,22 +11,57 @@ class BacnetServer {
         that.objectIdNumber = 1;
         that.nodeRedVersion = nodeRedVersion;
         that.deviceId = deviceId;
+        that.vendorId = 1401;
         that.objectList = [
             {value: {type: baEnum.ObjectType.DEVICE, instance: that.deviceId}, type: 12}
         ];
         that.objectStore = {
             [baEnum.ObjectType.DEVICE]: {
-                [baEnum.PropertyIdentifier.OBJECT_IDENTIFIER]: [{value: {type: baEnum.ObjectType.DEVICE, instance: that.deviceId}, type: 12}],  // OBJECT_IDENTIFIER
-                [baEnum.PropertyIdentifier.OBJECT_LIST]: that.objectList,                                                  // 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: 1401, type: 7}], //VENDOR_IDENTIFIER
-                [baEnum.PropertyIdentifier.MODEL_NAME]:  [{value: "bitpool-edge", type: 7}],  //MODEL_NAME
-                [baEnum.PropertyIdentifier.FIRMWARE_REVISION]:  [{value: "Node-Red " + that.nodeRedVersion, type: 7}], //FIRMWARE_REVISION
-            },
+                [baEnum.PropertyIdentifier.OBJECT_IDENTIFIER]: [{value: {type: baEnum.ObjectType.DEVICE, instance: that.deviceId}, type: 12}],
+                [baEnum.PropertyIdentifier.OBJECT_LIST]: that.objectList, 
+                [baEnum.PropertyIdentifier.OBJECT_NAME]: [{value: 'Bitpool Edge BACnet Gateway', type: 7}],
+                [baEnum.PropertyIdentifier.OBJECT_TYPE]: [{value: 8, type: 9}],
+                [baEnum.PropertyIdentifier.DESCRIPTION]: [{value: 'Bitpool Edge BACnet gateway', type: 7}],
+                [baEnum.PropertyIdentifier.SYSTEM_STATUS]: [{value: 0, type: 9}], 
+                [baEnum.PropertyIdentifier.VENDOR_NAME]:  [{value: "Bitpool", type: 7}], 
+                [baEnum.PropertyIdentifier.VENDOR_IDENTIFIER]:  [{value: that.vendorId, type: 2}],
+                [baEnum.PropertyIdentifier.MODEL_NAME]:  [{value: "bitpool-edge", type: 7}],  
+                [baEnum.PropertyIdentifier.FIRMWARE_REVISION]:  [{value: "Node-Red " + that.nodeRedVersion, type: 7}], 
+                [baEnum.PropertyIdentifier.PROTOCOL_REVISION]:  [{value: 19, type: 2}],
+                [baEnum.PropertyIdentifier.PROTOCOL_VERSION]:  [{value: 0, type: 2}],
+                [baEnum.PropertyIdentifier.APPLICATION_SOFTWARE_VERSION]:  [{value: pjson.version, type: 7}],
+                [baEnum.PropertyIdentifier.PROTOCOL_SERVICES_SUPPORTED]:  [{value: { value: [ 0, 80, 0, 4, 4 ], bitsUsed: 40 }, type: 8}],
+                [baEnum.PropertyIdentifier.PROTOCOL_OBJECT_TYPES_SUPPORTED]:  [{value: { value: [ 0, 80, 0, 4, 4 ], bitsUsed: 40 }, type: 8}],
+                [baEnum.PropertyIdentifier.MAX_APDU_LENGTH_ACCEPTED]:  [{value: 1476, type: 2}],
+                [baEnum.PropertyIdentifier.SEGMENTATION_SUPPORTED]:  [{value: 0, type: 9}],
+                [baEnum.PropertyIdentifier.APDU_TIMEOUT]:  [{value: that.bacnetClient.config.apduTimeout, type: 2}],
+                [baEnum.PropertyIdentifier.NUMBER_OF_APDU_RETRIES]:  [{value: 3, type: 2}],
+                [baEnum.PropertyIdentifier.DEVICE_ADDRESS_BINDING]:  [{value: 0, type: 12}],
+                [baEnum.PropertyIdentifier.DATABASE_REVISION]:  [{value: 19, type: 2}],
+                [baEnum.PropertyIdentifier.PROPERTY_LIST]:  [
+                    {value: baEnum.PropertyIdentifier.OBJECT_IDENTIFIER, type: 9 }, 
+                    {value: baEnum.PropertyIdentifier.OBJECT_LIST, type: 9 },
+                    {value: baEnum.PropertyIdentifier.OBJECT_NAME, type: 9 },
+                    {value: baEnum.PropertyIdentifier.OBJECT_TYPE, type: 9 },
+                    {value: baEnum.PropertyIdentifier.DESCRIPTION, type: 9 },
+                    {value: baEnum.PropertyIdentifier.SYSTEM_STATUS, type: 9 },
+                    {value: baEnum.PropertyIdentifier.VENDOR_NAME, type: 9 },
+                    {value: baEnum.PropertyIdentifier.VENDOR_IDENTIFIER, type: 9 },
+                    {value: baEnum.PropertyIdentifier.MODEL_NAME, type: 9 },
+                    {value: baEnum.PropertyIdentifier.FIRMWARE_REVISION, type: 9 },
+                    {value: baEnum.PropertyIdentifier.PROTOCOL_REVISION, type: 9 },
+                    {value: baEnum.PropertyIdentifier.PROTOCOL_VERSION, type: 9 },
+                    {value: baEnum.PropertyIdentifier.APPLICATION_SOFTWARE_VERSION, type: 9 },
+                    {value: baEnum.PropertyIdentifier.PROTOCOL_SERVICES_SUPPORTED, type: 9 },
+                    {value: baEnum.PropertyIdentifier.PROTOCOL_OBJECT_TYPES_SUPPORTED, type: 9 },
+                    {value: baEnum.PropertyIdentifier.MAX_APDU_LENGTH_ACCEPTED, type: 9 },
+                    {value: baEnum.PropertyIdentifier.SEGMENTATION_SUPPORTED, type: 9 },
+                    {value: baEnum.PropertyIdentifier.APDU_TIMEOUT, type: 9 },
+                    {value: baEnum.PropertyIdentifier.NUMBER_OF_APDU_RETRIES, type: 9 },
+                    {value: baEnum.PropertyIdentifier.DEVICE_ADDRESS_BINDING, type: 9 },
+                    {value: baEnum.PropertyIdentifier.DATABASE_REVISION, type: 9 },
+                ],
+            }, 
             [baEnum.ObjectType.ANALOG_VALUE]: [],
             [baEnum.ObjectType.CHARACTERSTRING_VALUE]: []
         };
@@ -45,20 +81,20 @@ class BacnetServer {
         }
 
         that.bacnetClient.client.on('whoIs', (device) => {
-            that.bacnetClient.client.iAmResponse(that.bacnetClient.broadCastAddr, that.deviceId, baEnum.Segmentation.SEGMENTED_BOTH, 27823);
+            that.bacnetClient.client.iAmResponse(that.deviceId, baEnum.Segmentation.SEGMENTED_BOTH, that.vendorId);
+            that.lastWhoIsRecived = Date.now();
         });
 
         that.bacnetClient.client.on('readPropertyMultiple', (data) => {
 
-            let senderAddress = data.header.sender.address;
-            let requestProps = data.payload.properties;
+            let senderAddress = data.address;
+            let requestProps = data.request.properties;
             let responseObject = [];
 
             try {
                 if(requestProps) {
 
                     for(let i = 0; i < requestProps.length; i++) {
-
                         let prop = requestProps[i].properties[0].id;
                         let type = requestProps[i].objectId.type;
                         let instance = requestProps[i].objectId.instance;
@@ -70,7 +106,6 @@ class BacnetServer {
                         
                         if(i == requestProps.length - 1) {
                             if(responseObject.length > 0) {
-
                                 that.bacnetClient.client.readPropertyMultipleResponse(senderAddress, data.invokeId, responseObject);
                             } else {
                                 that.bacnetClient.client.errorResponse(
@@ -96,17 +131,25 @@ class BacnetServer {
                     baEnum.ErrorCode.UNKNOWN_PROPERTY
                 );
             }
+
         });
 
         that.bacnetClient.client.on('readProperty', (data) => {
+
             try {
-                let objectId = data.payload.objectId.type;
-                let objectInstance = data.payload.objectId.instance;
-                let propId = data.payload.property.id.toString();
+
+                let objectId = data.request.objectId.type;
+                let objectInstance = data.request.objectId.instance;
+                let propId = data.request.property.id.toString();
+
                 let responseObj = that.getObject(objectId, propId, objectInstance);
 
+                if(propId == baEnum.PropertyIdentifier.OBJECT_LIST &&  ((Date.now() - that.lastWhoIsRecived) / 1000) < 0.7) {
+                    responseObj = [{value:that.objectList.length, type: 2}];
+                }
                 if(responseObj !== null && responseObj !== undefined && typeof responseObj !== "undefined") {
-                    that.bacnetClient.client.readPropertyResponse(data.header.sender.address, data.invokeId, objectId, data.payload.property, responseObj);
+                    
+                    that.bacnetClient.client.readPropertyResponse(data.address, data.invokeId, objectId, data.request.property, responseObj);
                 } else {
                     that.bacnetClient.client.errorResponse(
                         data.address, 
@@ -123,7 +166,7 @@ class BacnetServer {
         });
 
         //do initial iAm broadcast when BACnet server starts
-        that.bacnetClient.client.iAmResponse(that.bacnetClient.broadCastAddr, that.deviceId, baEnum.Segmentation.SEGMENTED_BOTH, 27823);
+        that.bacnetClient.client.iAmResponse(that.deviceId, baEnum.Segmentation.SEGMENTED_BOTH, that.vendorId);
     }
 
     setDeviceName(nodeName) {
@@ -152,7 +195,27 @@ class BacnetServer {
                      [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.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})
@@ -317,7 +380,6 @@ class BacnetServer {
         return objectId;
     }
 
-
 }
 
 module.exports = { BacnetServer };

package/common.js

@@ -6,7 +6,7 @@ const { createLogger, format, transports } = require('winston');
 const { randomUUID } = require('crypto');
 const os = require('os');
 const { exec } = require("child_process");
-const baEnum = require('./resources/node-bacnet/index.js').enum;
+const baEnum = require('./resources/node-bacstack-ts/dist/index.js').enum;
 const fs = require('fs');
 
 const logger = createLogger({
@@ -80,7 +80,8 @@ class BacnetClientConfig {
     manual_instance_range_enabled,
     manual_instance_range_start,
     manual_instance_range_end,
-    bacnetServerEnabled
+    device_read_schedule,
+    retries
   ) {
     this.apduTimeout = apduTimeout;
     this.localIpAdrress = localIpAdrress;
@@ -97,7 +98,8 @@ class BacnetClientConfig {
     this.manual_instance_range_enabled = manual_instance_range_enabled;
     this.manual_instance_range_start = manual_instance_range_start;
     this.manual_instance_range_end = manual_instance_range_end;
-    this.bacnetServerEnabled = bacnetServerEnabled;
+    this.device_read_schedule = device_read_schedule;
+    this.retries = retries;
   }
 };
 
@@ -210,11 +212,15 @@ const doNodeRedRestart = function() {
 //
 // ================================================================================
 async function Store_Config(data) {
-  await fs.writeFile("edge-bacnet-datastore.cfg", data, (err) => {
-    if (err) {
-      console.log("Store_Config writeFile error: ", err);
-    }
-  });
+  try {
+    await fs.writeFile("edge-bacnet-datastore.cfg", data, (err) => {
+      if (err) {
+        console.log("Store_Config writeFile error: ", err);
+      }
+    });
+  } catch(e){
+    //do nothing
+  }
 };
 
 // READ CONFIG SYNC FUNCTION ======================================================
@@ -223,9 +229,9 @@ async function Store_Config(data) {
 function Read_Config_Sync() {
   var data = "{}";
   try {
-    data = fs.readFileSync("edge-bacnet-datastore.cfg", {encoding:'utf8', flag:'r'});
+    data = fs.readFileSync("edge-bacnet-datastore.cfg", { encoding: 'utf8', flag: 'r' });
   }
-  catch(err) {
+  catch (err) {
     console.log("Read_Config_Sync error:", err);
     data = '{}';
     Store_Config(data);
@@ -237,11 +243,15 @@ function Read_Config_Sync() {
 //
 // ================================================================================
 async function Store_Config_Server(data) {
-  await fs.writeFile("edge-bacnet-server-datastore.cfg", data, (err) => {
-    if (err) {
-      console.log("Store_Config_Server writeFile error: ", err);
-    }
-  });
+  try {
+    await fs.writeFile("edge-bacnet-server-datastore.cfg", data, (err) => {
+      if (err) {
+        console.log("Store_Config_Server writeFile error: ", err);
+      }
+    });
+  }
+  catch (err) {
+  }
 };
 
 // READ CONFIG SYNC FUNCTION - BACNET SERVER ======================================
@@ -262,13 +272,10 @@ function Read_Config_Sync_Server() {
 };
 
 module.exports = {
-  DeviceObjectId, 
-  DeviceObject, 
   BacnetConfig, 
   BacnetClientConfig, 
   ReadCommandConfig, 
-  WriteCommandConfig, 
-  logger, 
+  WriteCommandConfig,
   getUnit, 
   generateId, 
   getIpAddress, 

package/examples/1-Discover-Read.json

@@ -1 +1 @@
-[{"id":"697c8ed4b294882c","type":"Bacnet-Gateway","z":"29e22a8fbd476c06","name":"","local_device_address":"","apduTimeout":6000,"roundDecimal":2,"local_device_port":47808,"apduSize":"5","maxSegments":"0x50","broadCastAddr":"255.255.255.255","toLogIam":true,"discover_polling_schedule":"60","discover_polling_schedule_value":"1","discover_polling_schedule_options":"Minutes","device_id_range_enabled":false,"device_id_range_start":"","device_id_range_end":"","deviceId":"817001","manual_instance_range_enabled":false,"manual_instance_range_start":"","manual_instance_range_end":"","logErrorToConsole":false,"serverEnabled":false,"bacnetServerRebuildSchedule":"604800","bacnetServerRebuildSchedule_value":"7","bacnetServerRebuildSchedule_options":"Days","x":640,"y":380,"wires":[["d78c0f4d2fb9befa"]]},{"id":"d129d123e7eedbca","type":"Bitpool-Inject","z":"29e22a8fbd476c06","name":"Discover","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"","payloadType":"date","doPoll":false,"doDiscover":true,"x":460,"y":380,"wires":[["697c8ed4b294882c"]]},{"id":"2dc599ab69789b27","type":"Bitpool-Inject","z":"29e22a8fbd476c06","name":"Poll","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"","payloadType":"date","doPoll":true,"doDiscover":false,"x":290,"y":320,"wires":[["282edf29720defca"]]},{"id":"d78c0f4d2fb9befa","type":"debug","z":"29e22a8fbd476c06","name":"debug 1","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","statusVal":"","statusType":"auto","x":820,"y":380,"wires":[]},{"id":"282edf29720defca","type":"Bacnet-Discovery","z":"29e22a8fbd476c06","name":"","events":true,"json":false,"mqtt":true,"hiddenDeployToggle":false,"prevHiddenToggleState":false,"roundDecimal":2,"pointsToRead":{},"readDevices":[],"object_property_simplePayload":true,"object_property_fullObject":false,"x":470,"y":320,"wires":[["697c8ed4b294882c"]]}]
+[{"id":"a19aaf3c40f060de","type":"Bacnet-Gateway","z":"1bc98a48ab9b3af5","name":"","local_device_address":"","apduTimeout":6000,"roundDecimal":2,"local_device_port":47808,"apduSize":"5","maxSegments":"0x50","retries":"5","broadCastAddr":"255.255.255.255","toLogIam":true,"discover_polling_schedule":"120","discover_polling_schedule_value":"2","discover_polling_schedule_options":"Minutes","device_id_range_enabled":false,"device_id_range_start":"","device_id_range_end":"","deviceId":"817001","manual_instance_range_enabled":false,"manual_instance_range_start":"","manual_instance_range_end":"","logErrorToConsole":false,"serverEnabled":false,"device_read_schedule":"60","device_read_schedule_value":"1","device_read_schedule_options":"Minutes","x":660,"y":420,"wires":[["9d8b6ea1f9d11977"]]},{"id":"3e5f5a6efe7bf8cd","type":"Bitpool-Inject","z":"1bc98a48ab9b3af5","name":"Discover","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"","payloadType":"date","doPoll":false,"doDiscover":true,"x":480,"y":420,"wires":[["a19aaf3c40f060de"]]},{"id":"1774359e5a636b58","type":"Bitpool-Inject","z":"1bc98a48ab9b3af5","name":"Poll","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"","payloadType":"date","doPoll":true,"doDiscover":false,"x":310,"y":360,"wires":[["bfec7e0b535bef97"]]},{"id":"9d8b6ea1f9d11977","type":"debug","z":"1bc98a48ab9b3af5","name":"debug 1","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","statusVal":"","statusType":"auto","x":840,"y":420,"wires":[]},{"id":"bfec7e0b535bef97","type":"Bacnet-Discovery","z":"1bc98a48ab9b3af5","name":"","events":true,"json":false,"mqtt":true,"hiddenDeployToggle":false,"prevHiddenToggleState":false,"roundDecimal":2,"pointsToRead":{},"readDevices":[],"object_property_simplePayload":true,"object_property_fullObject":false,"x":490,"y":360,"wires":[["a19aaf3c40f060de"]]}]

package/examples/2-Discover-Write.json

@@ -1 +1 @@
-[{"id":"e478e80571442399","type":"Bacnet-Gateway","z":"29e22a8fbd476c06","name":"","local_device_address":"","apduTimeout":6000,"roundDecimal":2,"local_device_port":47808,"apduSize":"5","maxSegments":"0x50","broadCastAddr":"255.255.255.255","toLogIam":true,"discover_polling_schedule":"60","discover_polling_schedule_value":"1","discover_polling_schedule_options":"Minutes","device_id_range_enabled":false,"device_id_range_start":"","device_id_range_end":"","deviceId":"817001","manual_instance_range_enabled":false,"manual_instance_range_start":"","manual_instance_range_end":"","logErrorToConsole":false,"serverEnabled":false,"bacnetServerRebuildSchedule":"604800","bacnetServerRebuildSchedule_value":"7","bacnetServerRebuildSchedule_options":"Days","x":620,"y":320,"wires":[["0313b7ee1cfa6b42"]]},{"id":"c2e012301c4a6af4","type":"Bitpool-Inject","z":"29e22a8fbd476c06","name":"Discover","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"","payloadType":"date","doPoll":false,"doDiscover":true,"x":440,"y":320,"wires":[["e478e80571442399"]]},{"id":"8172620e7be7b505","type":"Bitpool-Inject","z":"29e22a8fbd476c06","name":"Poll","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"1","payloadType":"num","doPoll":true,"doDiscover":false,"x":290,"y":400,"wires":[["b3293195b7c5bd9d"]]},{"id":"0313b7ee1cfa6b42","type":"debug","z":"29e22a8fbd476c06","name":"debug 1","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","statusVal":"","statusType":"auto","x":800,"y":320,"wires":[]},{"id":"b3293195b7c5bd9d","type":"Bacnet-Write","z":"29e22a8fbd476c06","name":"","applicationTag":"4","priority":"16","pointsToWrite":[],"writeDevices":[],"hiddenDeployToggle":false,"prevHiddenToggleState":false,"x":450,"y":400,"wires":[["e478e80571442399"]]}]
+[{"id":"e478e80571442399","type":"Bacnet-Gateway","z":"1bc98a48ab9b3af5","name":"","local_device_address":"","apduTimeout":6000,"roundDecimal":2,"local_device_port":47808,"apduSize":"5","maxSegments":"0x50","retries":"5","broadCastAddr":"255.255.255.255","toLogIam":true,"discover_polling_schedule":"60","discover_polling_schedule_value":"1","discover_polling_schedule_options":"Minutes","device_id_range_enabled":false,"device_id_range_start":"","device_id_range_end":"","deviceId":"817001","manual_instance_range_enabled":false,"manual_instance_range_start":"","manual_instance_range_end":"","logErrorToConsole":false,"serverEnabled":false,"device_read_schedule":"60","device_read_schedule_value":"1","device_read_schedule_options":"Minutes","x":700,"y":320,"wires":[["0313b7ee1cfa6b42"]]},{"id":"c2e012301c4a6af4","type":"Bitpool-Inject","z":"1bc98a48ab9b3af5","name":"Discover","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"","payloadType":"date","doPoll":false,"doDiscover":true,"x":520,"y":320,"wires":[["e478e80571442399"]]},{"id":"8172620e7be7b505","type":"Bitpool-Inject","z":"1bc98a48ab9b3af5","name":"Poll","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"1","payloadType":"num","doPoll":true,"doDiscover":false,"x":370,"y":400,"wires":[["b3293195b7c5bd9d"]]},{"id":"0313b7ee1cfa6b42","type":"debug","z":"1bc98a48ab9b3af5","name":"debug 1","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","statusVal":"","statusType":"auto","x":880,"y":320,"wires":[]},{"id":"b3293195b7c5bd9d","type":"Bacnet-Write","z":"1bc98a48ab9b3af5","name":"","applicationTag":"4","priority":"16","pointsToWrite":[],"writeDevices":[],"hiddenDeployToggle":false,"prevHiddenToggleState":false,"x":530,"y":400,"wires":[["e478e80571442399"]]}]

package/examples/3-Discover-Read-Write.json

@@ -1 +1 @@
-[{"id":"e6ef82c5497d2d12","type":"Bacnet-Gateway","z":"29e22a8fbd476c06","name":"","local_device_address":"","apduTimeout":6000,"roundDecimal":2,"local_device_port":47808,"apduSize":"5","maxSegments":"0x50","broadCastAddr":"255.255.255.255","toLogIam":true,"discover_polling_schedule":"60","discover_polling_schedule_value":"1","discover_polling_schedule_options":"Minutes","device_id_range_enabled":false,"device_id_range_start":"","device_id_range_end":"","deviceId":"817001","manual_instance_range_enabled":false,"manual_instance_range_start":"","manual_instance_range_end":"","logErrorToConsole":false,"serverEnabled":false,"bacnetServerRebuildSchedule":"604800","bacnetServerRebuildSchedule_value":"7","bacnetServerRebuildSchedule_options":"Days","x":660,"y":360,"wires":[["13c868a66ecd17df"]]},{"id":"4df39409775f724e","type":"Bitpool-Inject","z":"29e22a8fbd476c06","name":"Discover","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"","payloadType":"date","doPoll":false,"doDiscover":true,"x":480,"y":360,"wires":[["e6ef82c5497d2d12"]]},{"id":"67e4f714757a028e","type":"Bitpool-Inject","z":"29e22a8fbd476c06","name":"Poll","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"1","payloadType":"num","doPoll":true,"doDiscover":false,"x":330,"y":440,"wires":[["b8931cb1a1c69ffb"]]},{"id":"13c868a66ecd17df","type":"debug","z":"29e22a8fbd476c06","name":"debug 1","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","statusVal":"","statusType":"auto","x":840,"y":360,"wires":[]},{"id":"b8931cb1a1c69ffb","type":"Bacnet-Write","z":"29e22a8fbd476c06","name":"","applicationTag":"4","priority":"16","pointsToWrite":[],"writeDevices":[],"hiddenDeployToggle":false,"prevHiddenToggleState":false,"x":490,"y":440,"wires":[["e6ef82c5497d2d12"]]},{"id":"a95e261a4cc2662b","type":"Bitpool-Inject","z":"29e22a8fbd476c06","name":"Poll","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"","payloadType":"date","doPoll":true,"doDiscover":false,"x":330,"y":300,"wires":[["08df19608ade8576"]]},{"id":"08df19608ade8576","type":"Bacnet-Discovery","z":"29e22a8fbd476c06","name":"","events":true,"json":false,"mqtt":true,"hiddenDeployToggle":false,"prevHiddenToggleState":false,"roundDecimal":2,"pointsToRead":{},"readDevices":[],"object_property_simplePayload":true,"object_property_fullObject":false,"x":490,"y":300,"wires":[["e6ef82c5497d2d12"]]}]
+[{"id":"e6ef82c5497d2d12","type":"Bacnet-Gateway","z":"1bc98a48ab9b3af5","name":"","local_device_address":"","apduTimeout":6000,"roundDecimal":2,"local_device_port":47808,"apduSize":"5","maxSegments":"0x50","retries":"5","broadCastAddr":"255.255.255.255","toLogIam":true,"discover_polling_schedule":"60","discover_polling_schedule_value":"1","discover_polling_schedule_options":"Minutes","device_id_range_enabled":false,"device_id_range_start":"","device_id_range_end":"","deviceId":"817001","manual_instance_range_enabled":false,"manual_instance_range_start":"","manual_instance_range_end":"","logErrorToConsole":false,"serverEnabled":false,"device_read_schedule":"60","device_read_schedule_value":"1","device_read_schedule_options":"Minutes","x":740,"y":340,"wires":[["13c868a66ecd17df"]]},{"id":"4df39409775f724e","type":"Bitpool-Inject","z":"1bc98a48ab9b3af5","name":"Discover","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"","payloadType":"date","doPoll":false,"doDiscover":true,"x":560,"y":340,"wires":[["e6ef82c5497d2d12"]]},{"id":"67e4f714757a028e","type":"Bitpool-Inject","z":"1bc98a48ab9b3af5","name":"Poll","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"1","payloadType":"num","doPoll":true,"doDiscover":false,"x":410,"y":420,"wires":[["b8931cb1a1c69ffb"]]},{"id":"13c868a66ecd17df","type":"debug","z":"1bc98a48ab9b3af5","name":"debug 1","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","statusVal":"","statusType":"auto","x":920,"y":340,"wires":[]},{"id":"b8931cb1a1c69ffb","type":"Bacnet-Write","z":"1bc98a48ab9b3af5","name":"","applicationTag":"4","priority":"16","pointsToWrite":[],"writeDevices":[],"hiddenDeployToggle":false,"prevHiddenToggleState":false,"x":570,"y":420,"wires":[["e6ef82c5497d2d12"]]},{"id":"a95e261a4cc2662b","type":"Bitpool-Inject","z":"1bc98a48ab9b3af5","name":"Poll","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"","payloadType":"date","doPoll":true,"doDiscover":false,"x":410,"y":280,"wires":[["08df19608ade8576"]]},{"id":"08df19608ade8576","type":"Bacnet-Discovery","z":"1bc98a48ab9b3af5","name":"","events":true,"json":false,"mqtt":true,"hiddenDeployToggle":false,"prevHiddenToggleState":false,"roundDecimal":2,"pointsToRead":{},"readDevices":[],"object_property_simplePayload":true,"object_property_fullObject":false,"x":570,"y":280,"wires":[["e6ef82c5497d2d12"]]}]

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@bitpoolos/edge-bacnet",
-  "version": "1.1.7",
+  "version": "1.2.1",
   "description": "A bacnet gateway for node-red",
   "dependencies": {
+    "@plus4nodered/ts-node-bacnet": "^1.0.0-beta.2",
     "async-mutex": "^0.4.0",
     "cronosjs": "^1.7.1",
     "debug": "^4.1.1",
     "iconv-lite": "^0.5.1",
-    "underscore": "^1.10.2",
-    "node-bacnet": "^0.2.4",
     "toad-scheduler": "^1.6.0",
+    "underscore": "^1.10.2",
     "winston": "^3.2.1"
   },
   "node-red": {

package/resources/{node-bacnet/LICENSE.md → node-bacstack-ts/LICENSE}

@@ -1,8 +1,7 @@
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2018-2020 Community Driven
-
-Copyright (c) 2017-2019 Fabio Huser (fh1ch)
+Copyright (c) 2022-present PLUS for Node-RED <team@plus4nodered.com>
+origin Copyright (c) 2017-2021 Fabio Huser <fabio@fh1.ch>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/resources/node-bacstack-ts/README.md

@@ -0,0 +1,75 @@
+# TS Node BACstack
+
+A BACnet® protocol stack written in pure TypeScript from contributors and maintained by [PLUS for Node-RED](http://plus4nodered.com/).
+BACnet® is a protocol to interact with building automation devices defined by ASHRAE.
+
+
+## Install
+
+Run the following command in your Node-RED user directory - typically `~/.node-red`
+
+        npm install ts-node-bacnet
+
+try these options on npm install to build from source if you have problems to install
+
+        --unsafe-perm --build-from-source
+
+### Features
+
+The BACnet standard defines a wide variety of services as part of it's
+specification. While Node BACstack tries to be as complete as possible,
+following services are already supported at this point in time:
+
+| Service                        |                                      Execute                                      | Handle                                                                        |
+|--------------------------------|:---------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------:|
+| Who Is                         | [yes](http://books.plus4nodered.com/ts-node-bacnet/whoIs)                        | [yes](http://books.plus4nodered.com/ts-node-bacnet/event:whoIs)       |
+| I Am                           |                                       yes¹                                        | [yes](http://books.plus4nodered.com/ts-node-bacnet/event:iAm)         |
+| Who Has                        |                                       yes¹                                        | yes¹                                                                          |
+| I Have                         |                                       yes¹                                        | yes¹                                                                          |
+| Time Sync                      |           [yes](http://books.plus4nodered.com/ts-node-bacnet/timeSync)           | [yes](http://books.plus4nodered.com/ts-node-bacnet/event:timeSync)    |
+| UTC Time Sync                  |         [yes](http://books.plus4nodered.com/ts-node-bacnet/timeSyncUTC)          | [yes](http://books.plus4nodered.com/ts-node-bacnet/event:timeSyncUTC) |
+| Read Property                  |         [yes](http://books.plus4nodered.com/ts-node-bacnet/readProperty)         | yes¹                                                                          |
+| Read Property Multiple         |     [yes](http://books.plus4nodered.com/ts-node-bacnet/readPropertyMultiple)     | yes¹                                                                          |
+| Read Range                     |          [yes](http://books.plus4nodered.com/ts-node-bacnet/readRange)           | yes¹                                                                          |
+| Write Property                 |        [yes](http://books.plus4nodered.com/ts-node-bacnet/writeProperty)         | yes¹                                                                          |
+| Write Property Multiple        |    [yes](http://books.plus4nodered.com/ts-node-bacnet/writePropertyMultiple)     | yes¹                                                                          |
+| Add List Element               |                                       yes¹                                        | yes¹                                                                          |
+| Remove List Element            |                                       yes¹                                        | yes¹                                                                          |
+| Create Object                  |                                       yes¹                                        | yes¹                                                                          |
+| Delete Object                  |         [yes](http://books.plus4nodered.com/ts-node-bacnet/deleteObject)         | yes¹                                                                          |
+| Subscribe COV                  |         [yes](http://books.plus4nodered.com/ts-node-bacnet/subscribeCOV)         | yes¹                                                                          |
+| Subscribe Property             |      [yes](http://books.plus4nodered.com/ts-node-bacnet/subscribeProperty)       | yes¹                                                                          |
+| Atomic Read File               |           [yes](http://books.plus4nodered.com/ts-node-bacnet/readFile)           | yes¹                                                                          |
+| Atomic Write File              |          [yes](http://books.plus4nodered.com/ts-node-bacnet/writeFile)           | yes¹                                                                          |
+| Reinitialize Device            |      [yes](http://books.plus4nodered.com/ts-node-bacnet/reinitializeDevice)      | yes¹                                                                          |
+| Device Communication Control   |  [yes](http://books.plus4nodered.com/ts-node-bacnet/deviceCommunicationControl)  | yes¹                                                                          |
+| Get Alarm Summary²             |       [yes](http://books.plus4nodered.com/ts-node-bacnet/getAlarmSummary)        | yes¹                                                                          |
+| Get Event Information          |     [yes](http://books.plus4nodered.com/ts-node-bacnet/getEventInformation)      | yes¹                                                                          |
+| Get Enrollment Summary²        |     [yes](http://books.plus4nodered.com/ts-node-bacnet/getEnrollmentSummary)     | yes¹                                                                          |
+| Acknowledge Alarm              |                                       yes¹                                        | yes¹                                                                          |
+| Confirmed Event Notification   |                                       yes¹                                        | yes¹                                                                          |
+| Unconfirmed Event Notification |                                       yes¹                                        | yes¹                                                                          |
+| Unconfirmed Private Transfer   |  [yes](http://books.plus4nodered.com/ts-node-bacnet/unconfirmedPrivateTransfer)  | yes¹                                                                          |
+| Confirmed Private Transfer     |   [yes](http://books.plus4nodered.com/ts-node-bacnet/confirmedPrivateTransfer)   | yes¹                                                                          |
+
+¹ Support implemented as Beta (untested, undocumented, breaking interface)
+² Deprecated BACnet® function, available for backwards compatibility
+
+## Contribution
+
+Special thanks to Fabio Huser for the [fundamental work](https://github.com/fh1ch/node-bacstack).
+**Yes, sure!** Please help us to make it even better and become a community member of [PLUS for Node-RED](http://plus4nodered.com/)!
+
+#### Happy coding!
+
+## License
+
+MIT
+Copyright (c) 2022-present [PLUS for Node-RED](http://plus4nodered.com/)
+origin Copyright (c) 2017-2021 Fabio Huser <fabio@fh1.ch>
+
+## Note
+
+This is not an official product of the BACnet Advocacy Group.
+BACnet® is a registered trademark of American Society of Heating, Refrigerating and Air-Conditioning Engineers (ASHRAE).
+We're buying the specifications of ASHARE to programm for this library.

package/resources/{node-bacnet → node-bacstack-ts/dist}/index.js

@@ -1,5 +1,3 @@
 'use strict';
-
 module.exports = require('./lib/client');
-module.exports._ = require('underscore');
 module.exports.enum = require('./lib/enum');