@bitpoolos/edge-bacnet 1.0.6 → 1.0.9

package/bacnet_gateway.js

@@ -4,7 +4,8 @@
 
 module.exports = function (RED) {
     const { BacnetClient } = require('./bacnet_client');
-    const { BacnetClientConfig, getIpAddress } = require('./common');
+    const { BacnetClientConfig, getIpAddress, doNodeRedRestart } = require('./common');
+    const { exec } = require("child_process");
 
     function BitpoolBacnetGatewayDevice (config) {
       RED.nodes.createNode(this, config);
@@ -23,6 +24,12 @@ module.exports = function (RED) {
       this.device_id_range_enabled = config.device_id_range_enabled;
       this.device_id_range_start = config.device_id_range_start;
       this.device_id_range_end = config.device_id_range_end;
+      this.manual_instance_range_enabled = config.manual_instance_range_enabled,
+      this.manual_instance_range_start = config.manual_instance_range_start,
+      this.manual_instance_range_end = config.manual_instance_range_end,
+      this.nodeName = config.name;
+      this.toRestartNodeRed = config.toRestartNodeRed;
+      this.deviceId = config.deviceId;
 
       //client and config store
       this.bacnetConfig = nodeContext.get("bacnetConfig");
@@ -56,42 +63,76 @@ module.exports = function (RED) {
               node.discover_polling_schedule,
               node.device_id_range_enabled,
               node.device_id_range_start,
-              node.device_id_range_end
+              node.device_id_range_end,
+              node.toRestartNodeRed,
+              node.deviceId,
+              node.manual_instance_range_enabled,
+              node.manual_instance_range_start,
+              node.manual_instance_range_end
             );
             nodeContext.set("bacnetConfig", node.bacnetConfig);
 
+            //console.log("toRestartNodeRed:  ", node.toRestartNodeRed);
+
+            // if(node.toRestartNodeRed == true) {
+
+            //   doNodeRedRestart().then(function(result) {
+            //     console.log("restart result: ", result);
+            //   }).catch(function(error) {
+            //     console.log("restart error: ", error);
+            //   });
+
+            //   node.toRestartNodeRed = false;
+            // }
+
             if(typeof node.bacnetClient !== 'undefined') {
-              node.bacnetClient.reinitializeClient(node.bacnetConfig);
               node.bacnetClient.removeAllListeners();
               bindEventListeners();
+              node.bacnetClient.reinitializeClient(node.bacnetConfig);
             } else {
               node.bacnetClient = new BacnetClient(node.bacnetConfig);
               nodeContext.set("bacnetClient", node.bacnetClient);
             }
+
           }
 
           // Clears event handlers of all listeners, avoiding memory leak
           node.bacnetClient.removeAllListeners();
 
-          //bindEventListeners();
-
           // Value response event handler for READ commands
-          node.bacnetClient.on('values', (device, values, outputType, msgId, fullResult) => {
+          node.bacnetClient.on('values', (values, outputType, objectPropertyType) => {
             if(typeof values !== 'undefined' && Object.keys(values).length) {
               if (outputType.json && !outputType.mqtt) {
-                node.send(values);
+                if(objectPropertyType.fullObject && objectPropertyType.simplePayload) {
+                  sendSimpleJson(values);
+                  node.send(values);
+                } else if(objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
+                  node.send(values);
+                } else if(!objectPropertyType.fullObject && objectPropertyType.simplePayload) {
+                  sendSimpleJson(values);
+                }
               } else if(!outputType.json && outputType.mqtt) {
-                sendAsMqtt(values);
-              } else if(outputType.json && outputType.mqtt) {
-                node.send(values);
-                sendAsMqtt(values);
+                if(objectPropertyType.fullObject && objectPropertyType.simplePayload) {
+                  sendAsMqtt(values);
+                  sendSimpleMqtt(values);
+                } else if(objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
+                  sendAsMqtt(values);
+                } else if(!objectPropertyType.fullObject && objectPropertyType.simplePayload) {
+                  sendSimpleMqtt(values);
+                }
               }
             }
           });
 
           // Who Is / Iam event handler
           node.bacnetClient.on('deviceFound', (device) => {
-            if(node.toLogIam) node.warn(`Device found:  ${device.address}`);
+            if(node.toLogIam) {
+              if(device.header.source) {
+                node.warn(`BACnet-MS/TP device found: ${device.payload.deviceId} - ${device.header.sender.address} - Network Id: ${device.header.source.net} - Mac: ${device.header.source.adr[0]}`);
+              } else {
+                node.warn(`BACnet device found: ${device.payload.deviceId} - ${device.header.sender.address}`);
+              }
+            } 
           });
 
           node.status({});
@@ -105,7 +146,7 @@ module.exports = function (RED) {
       node.on('input', function(msg) {
         if(msg.type == "Read") {
 
-          node.bacnetClient.doRead(msg.options, msg.outputType, msg._msgid);
+          node.bacnetClient.doRead(msg.options, msg.outputType, msg.objectPropertyType, msg._msgid);
 
         } else if(msg.type == "Write") {
 
@@ -144,6 +185,23 @@ module.exports = function (RED) {
         }   
       });
 
+      //route handler for rebuild data model command
+      RED.httpAdmin.get('/bitpool-bacnet-data/rebuildDataModel', function(req, res) {
+        if(!node.bacnetClient) {
+          console.log("Issue with the bacnetClient: ", node.bacnetClient);
+          //no bacnet client present
+          node.status({fill:"red",shape:"dot",text:"Please define client"});
+          res.send(false);
+        } else {
+          node.bacnetClient.rebuildDataModel().then(function(result) {
+            res.send(result);
+          }).catch(function(error) {
+            res.send(error);
+            console.log("Error getting network data:  ", error);
+          });
+        }   
+      });
+
       //route handler for network data
       RED.httpAdmin.get('/bitpool-bacnet-data/getNetworkInterfaces', function(req, res) {
         getIpAddress().then(function(result) {
@@ -160,21 +218,30 @@ module.exports = function (RED) {
       function bindEventListeners() {
         // Value response event handler for READ commands
         node.bacnetClient.on('values', (device, values, outputType, msgId, fullResult) => {
-          if(typeof values !== 'undefined' && Object.keys(values).length) {
-            if (outputType.json && !outputType.mqtt) {
+          if (outputType.json && !outputType.mqtt) {
+            if(objectPropertyType.fullObject && objectPropertyType.simplePayload) {
+              sendSimpleJson(values);
               node.send(values);
-            } else if(!outputType.json && outputType.mqtt) {
-              sendAsMqtt(values);
-            } else if(outputType.json && outputType.mqtt) {
+            } else if(objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
               node.send(values);
+            } else if(!objectPropertyType.fullObject && objectPropertyType.simplePayload) {
+              sendSimpleJson(values);
+            }
+          } else if(!outputType.json && outputType.mqtt) {
+            if(objectPropertyType.fullObject && objectPropertyType.simplePayload) {
+              sendAsMqtt(values);
+              sendSimpleMqtt(values);
+            } else if(objectPropertyType.fullObject && !objectPropertyType.simplePayload) {
               sendAsMqtt(values);
+            } else if(!objectPropertyType.fullObject && objectPropertyType.simplePayload) {
+              sendSimpleMqtt(values);
             }
           }
         });
 
         // Who Is / Iam event handler
         node.bacnetClient.on('deviceFound', (device) => {
-          if(node.toLogIam) node.warn(`Device found:  ${device.address}`);
+          if(node.toLogIam) node.warn(`BACnet device found: ${device.deviceId} - ${device.address}`);
         });
       }
 
@@ -191,10 +258,43 @@ module.exports = function (RED) {
         if(node.device_id_range_enabled !== node.bacnetConfig.device_id_range_enabled){ return true;}
         if(node.device_id_range_start !== node.bacnetConfig.device_id_range_start){ return true;}
         if(node.device_id_range_end !== node.bacnetConfig.device_id_range_end){ return true;}
-
+        if(node.toRestartNodeRed !== node.bacnetConfig.toRestartNodeRed){ return true;}
+        if(node.manual_instance_range_enabled !== node.bacnetConfig.manual_instance_range_enabled){ return true;}
+        if(node.manual_instance_range_start !== node.bacnetConfig.manual_instance_range_start){ return true;}
+        if(node.manual_instance_range_end !== node.bacnetConfig.manual_instance_range_end){ return true;}
+        
         return false;
       };
 
+      sendSimpleMqtt = function(values){
+        let devices = Object.keys(values);
+        devices.forEach(function(device) {
+          if(device !== "_msgid") {
+            let points = values[device];
+            for(var point in points) {
+              let pointProps = Object.keys(points[point]);
+              pointProps.forEach(function(prop) {
+                let msg = {};
+                if(prop == "presentValue") {
+                  if(node.nodeName !== "gateway" && 
+                      node.nodeName !== "" && 
+                      node.nodeName !== "null" && 
+                      node.nodeName !== "undefined" && 
+                      typeof node.nodeName == "string") {
+                    msg.topic = `${node.nodeName}/${device}/${point}`;
+                  } else {
+                    msg.topic = `BITPOOL_BACNET_GATEWAY/${device}/${point}`;
+                  }
+                  msg.payload = points[point][prop];
+                  node.send(msg);
+                }
+              });
+            }
+          }
+        });
+      };
+
+
       // Breaks down response JSON object into mqtt topic / payload
       sendAsMqtt = function(values) {
         let devices = Object.keys(values);
@@ -206,7 +306,15 @@ module.exports = function (RED) {
               pointProps.forEach(function(prop) {
                 let msg = {};
                 if(prop !== "objectName") {
-                  msg.topic = `BITPOOL_EDGE_BACNET/${device}/${point}/${prop}`;
+                  if(node.nodeName !== "gateway" && 
+                      node.nodeName !== "" && 
+                      node.nodeName !== "null" && 
+                      node.nodeName !== "undefined" && 
+                      typeof node.nodeName == "string") {
+                    msg.topic = `${node.nodeName}/${device}/${point}/${prop}`;
+                  } else {
+                    msg.topic = `BITPOOL_BACNET_GATEWAY/${device}/${point}/${prop}`;
+                  }
                   msg.payload = points[point][prop];
                   node.send(msg);
                 }
@@ -216,6 +324,29 @@ module.exports = function (RED) {
         });
       };
 
+      sendSimpleJson = function(values) {
+        let devices = Object.keys(values);
+        devices.forEach(function(device) {
+          if(device !== "_msgid") {
+            let value = {
+              [device]: {}
+            };
+            let points = values[device];
+            for(var point in points) {
+              let pointProps = Object.keys(points[point]);
+              pointProps.forEach(function(prop) {
+                if(prop == "presentValue") {
+                  value[device][point] = {
+                    "presentValue": points[point][prop]
+                  };
+                }
+              });
+            }
+            node.send(value);
+          }
+        });
+      };
+
     };
 
     RED.nodes.registerType('Bacnet-Gateway', BitpoolBacnetGatewayDevice);

package/bacnet_object.js

@@ -3,7 +3,7 @@
 */
 
 module.exports = function (RED) {
-    const baEnum = require('./resources/bacstack/lib/enum');
+    const baEnum = require('./resources/node-bacnet/index.js').enum;
     function BitpoolBacnetObject (config) {
       RED.nodes.createNode(this, config)