@bitpoolos/edge-bacnet 1.2.8 → 1.3.1

package/bacnet_read.js

@@ -5,96 +5,80 @@
 
 
 module.exports = function (RED) {
-    const http = require("http");
-    const { ReadCommandConfig } = require('./common');
-    const baEnum = require('./resources/node-bacstack-ts/dist/index.js').enum;
-
-    function BitpoolBacnetReadDevice (config) {
-      RED.nodes.createNode(this, config);
-      var node = this;
-
-      this.json = config.json;
-      this.mqtt = config.mqtt;
-      this.roundDecimal = config.roundDecimal;
-      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;
-
-      
-
-      this.object_props = getObjectProps(this);
+  const http = require("http");
+  const { ReadCommandConfig } = require('./common');
+  const baEnum = require('./resources/node-bacstack-ts/dist/index.js').enum;
+
+  function BitpoolBacnetReadDevice(config) {
+    RED.nodes.createNode(this, config);
+    var node = this;
+
+    this.json = config.json;
+    this.mqtt = config.mqtt;
+    this.roundDecimal = config.roundDecimal;
+    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;
+
+
+
+    this.object_props = getObjectProps(this);
+
+    function getObjectProps(node) {
+      var propArr = [];
+      if (node.object_property_simplePayload == true) {
+        propArr.push({ id: baEnum.PropertyIdentifier.PRESENT_VALUE });
+      }
+      if (node.object_property_fullObject == true) {
+        propArr.push(
+          { id: baEnum.PropertyIdentifier.PRESENT_VALUE },
+          { id: baEnum.PropertyIdentifier.DESCRIPTION },
+          { id: baEnum.PropertyIdentifier.STATUS_FLAGS },
+          { id: baEnum.PropertyIdentifier.RELIABILITY },
+          { id: baEnum.PropertyIdentifier.OUT_OF_SERVICE },
+          { id: baEnum.PropertyIdentifier.UNITS }
+
+        );
+      }
+
+      //add object name for every request as its used in formatting
+      propArr.push({ id: baEnum.PropertyIdentifier.OBJECT_NAME });
+
+      return propArr;
+    };
 
-      function getObjectProps(node) {
-        var propArr = [];
-        if(node.object_property_simplePayload == true){
-          propArr.push({ id: baEnum.PropertyIdentifier.PRESENT_VALUE });
-        }
-        if(node.object_property_fullObject == true){
-          propArr.push(
-            { id: baEnum.PropertyIdentifier.PRESENT_VALUE },
-            { id: baEnum.PropertyIdentifier.DESCRIPTION },
-            { id: baEnum.PropertyIdentifier.STATUS_FLAGS },
-            { id: baEnum.PropertyIdentifier.RELIABILITY },
-            { id: baEnum.PropertyIdentifier.OUT_OF_SERVICE },
-            { id: baEnum.PropertyIdentifier.UNITS }
-            
-            );
+    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,
+          fullObject: node.object_property_fullObject
+        },
+        outputType: {
+          json: node.json,
+          mqtt: node.mqtt
         }
-
-        //add object name for every request as its used in formatting
-        propArr.push({ id: baEnum.PropertyIdentifier.OBJECT_NAME});
-
-        return propArr;
-      };
-
-      //send point list status for device priority queue 
-      let headers = {
-        'Content-Type' : "application/json"
       };
 
-      const agent = new http.Agent({
-        rejectUnauthorized: false
-      });
+      node.send(output);
 
-      let priorityDevicesMsg = {
-        doUpdatePriorityDevices: true,
-        priorityDevices: node.pointsToRead
-      };
+      setTimeout(() => {
+        node.status({});
+      }, 3000);
 
-      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,
-            fullObject: node.object_property_fullObject
-          },
-          outputType: {
-            json: node.json,
-            mqtt: node.mqtt
-          }
-        };
-        
-        node.send(output);
-
-        setTimeout(() => {
-          node.status({});
-        }, 3000);
-
-      });
+    });
 
-    };
+  };
 
-    RED.nodes.registerType('Bacnet-Discovery', BitpoolBacnetReadDevice);
+  RED.nodes.registerType('Bacnet-Discovery', BitpoolBacnetReadDevice);
 };