@bitpoolos/edge-bacnet 1.2.6 → 1.2.8

package/bacnet_write.js

@@ -15,7 +15,7 @@ module.exports = function (RED) {
 
       node.on('input', function(msg) {
 
-        let value = msg.payload == "null" ? null : parseInt(msg.payload);
+        let value = msg.payload == "null" ? null : msg.payload;
         let priority = node.priority == "null" ? null : parseInt(node.priority);
 
         let output = {

package/common.js

@@ -91,7 +91,9 @@ class BacnetClientConfig {
     manual_instance_range_start,
     manual_instance_range_end,
     device_read_schedule,
-    retries
+    retries,
+    cacheFileEnabled,
+    sanitise_device_schedule
   ) {
     this.apduTimeout = apduTimeout;
     this.localIpAdrress = localIpAdrress;
@@ -107,6 +109,8 @@ class BacnetClientConfig {
     this.manual_instance_range_end = manual_instance_range_end;
     this.device_read_schedule = device_read_schedule;
     this.retries = retries;
+    this.cacheFileEnabled = cacheFileEnabled;
+    this.sanitise_device_schedule = sanitise_device_schedule;
   }
 }
 
@@ -222,7 +226,7 @@ const doNodeRedRestart = function () {
 // ================================================================================
 async function Store_Config(data) {
   try {
-    await fs.writeFile("edge-bacnet-datastore.cfg", data, (err) => {
+    await fs.writeFile("edge-bacnet-datastore.cfg", data, { encoding: "utf8", flag: "w" }, (err) => {
       if (err) {
         console.log("Store_Config writeFile error: ", err);
       }
@@ -240,7 +244,7 @@ function Read_Config_Sync() {
   try {
     data = fs.readFileSync("edge-bacnet-datastore.cfg", { encoding: "utf8", flag: "r" });
   } catch (err) {
-    //console.log("Read_Config_Sync error:", err);
+    console.log("Read_Config_Sync error:", err);
     data = "{}";
     Store_Config(data);
   }
@@ -268,14 +272,19 @@ function Read_Config_Sync_Server() {
   try {
     data = fs.readFileSync("edge-bacnet-server-datastore.cfg", { encoding: "utf8", flag: "r" });
   } catch (err) {
-    //console.log("Read_Config_Sync_Server error:", err);
-    if (err.errno == -4058) console.log("Edge-BACnet Server: No save file found, creating new file");
-    data = "{}";
-    Store_Config_Server(data);
+    if (err.errno == -4058) {
+      console.log("Edge-BACnet Server: No save file found, creating new file");
+      data = "{}";
+      Store_Config_Server(data);
+    }
   }
   return data;
 }
 
+function isNumber(value) {
+  return value != null && typeof value === "number" && !isNaN(value);
+}
+
 module.exports = {
   BacnetConfig,
   BacnetClientConfig,
@@ -290,4 +299,5 @@ module.exports = {
   Read_Config_Sync,
   Store_Config_Server,
   Read_Config_Sync_Server,
+  isNumber,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitpoolos/edge-bacnet",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "description": "A bacnet gateway for node-red",
   "dependencies": {
     "@plus4nodered/ts-node-bacnet": "^1.0.0-beta.2",

package/resources/icons/icon-read.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: none;
+        stroke: #6c757d;
+        stroke-linecap: round;
+        stroke-linejoin: round;
+        stroke-width: 2px;
+      }
+    </style>
+  </defs>
+  <circle class="cls-1" cx="15" cy="15" r="14"/>
+  <g>
+    <path class="cls-1" d="M11.21,22s0-14,0-14h5.13c1.91,0,3.46,1.55,3.46,3.46v.54c0,1.91-1.55,3.46-3.46,3.46h-5.13"/>
+    <line class="cls-1" x1="15.51" y1="15.45" x2="20.03" y2="21.94"/>
+  </g>
+</svg>

package/resources/icons/icon-write.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: none;
+        stroke: #6c757d;
+        stroke-linecap: round;
+        stroke-linejoin: round;
+        stroke-width: 2px;
+      }
+    </style>
+  </defs>
+  <circle class="cls-1" cx="15" cy="15" r="14"/>
+  <polyline class="cls-1" points="22.21 9.75 18.61 21.35 15 9.75 11.39 21.35 7.79 9.75"/>
+</svg>

package/resources/node-bacstack-ts/dist/lib/client.js

@@ -616,7 +616,7 @@ class Client extends events_1.EventEmitter {
         const type = baEnum.PduTypes.CONFIRMED_REQUEST | (settings.maxSegments !== baEnum.MaxSegmentsAccepted.SEGMENTS_0 ? baEnum.PduConReqBits.SEGMENTED_RESPONSE_ACCEPTED : 0);
         baApdu.encodeConfirmedServiceRequest(buffer, type, baEnum.ConfirmedServiceChoice.READ_PROPERTY, settings.maxSegments, settings.maxApdu, settings.invokeId, 0, 0);
         baServices.readProperty.encode(buffer, objectId.type, objectId.instance, propertyId, settings.arrayIndex);
-        //baBvlc.encode(buffer.buffer, baEnum.BvlcResultPurpose.ORIGINAL_UNICAST_NPDU, buffer.offset);
+        baBvlc.encode(buffer.buffer, baEnum.BvlcResultPurpose.ORIGINAL_UNICAST_NPDU, buffer.offset);
         this.sendBvlc(address, buffer);
         this._addCallback(settings.invokeId, (err, data) => {
             try{
@@ -672,7 +672,7 @@ class Client extends events_1.EventEmitter {
         baNpdu.encode(buffer, baEnum.NpduControlPriority.NORMAL_MESSAGE | baEnum.NpduControlBits.EXPECTING_REPLY, address, null, DEFAULT_HOP_COUNT, baEnum.NetworkLayerMessageType.WHO_IS_ROUTER_TO_NETWORK, 0);
         baApdu.encodeConfirmedServiceRequest(buffer, baEnum.PduTypes.CONFIRMED_REQUEST, baEnum.ConfirmedServiceChoice.WRITE_PROPERTY, settings.maxSegments, settings.maxApdu, settings.invokeId, 0, 0);
         baServices.writeProperty.encode(buffer, objectId.type, objectId.instance, propertyId, settings.arrayIndex, settings.priority, values);
-        //baBvlc.encode(buffer.buffer, baEnum.BvlcResultPurpose.ORIGINAL_UNICAST_NPDU, buffer.offset);
+        baBvlc.encode(buffer.buffer, baEnum.BvlcResultPurpose.ORIGINAL_UNICAST_NPDU, buffer.offset);
         this.sendBvlc(address, buffer);
         this._addCallback(settings.invokeId, (err) => next(err));
     }
@@ -714,7 +714,7 @@ class Client extends events_1.EventEmitter {
         const type = baEnum.PduTypes.CONFIRMED_REQUEST | (settings.maxSegments !== baEnum.MaxSegmentsAccepted.SEGMENTS_0 ? baEnum.PduConReqBits.SEGMENTED_RESPONSE_ACCEPTED : 0);
         baApdu.encodeConfirmedServiceRequest(buffer, type, baEnum.ConfirmedServiceChoice.READ_PROPERTY_MULTIPLE, settings.maxSegments, settings.maxApdu, settings.invokeId, 0, 0);
         baServices.readPropertyMultiple.encode(buffer, propertiesArray);
-        //baBvlc.encode(buffer.buffer, baEnum.BvlcResultPurpose.ORIGINAL_UNICAST_NPDU, buffer.offset);
+        baBvlc.encode(buffer.buffer, baEnum.BvlcResultPurpose.ORIGINAL_UNICAST_NPDU, buffer.offset);
         this.sendBvlc(address, buffer);
         //this.sendBvlc(address, buffer);
         this._addCallback(settings.invokeId, (err, data) => {

package/resources/style.css

@@ -0,0 +1,11 @@
+.writePointIcon {
+    background: url("icons/icon-write.svg") no-repeat !important;
+    width: 20px;
+    height: 20px;
+}
+
+.readPointIcon {
+    background: url("icons/icon-read.svg") no-repeat !important;
+    width: 20px;
+    height: 20px;
+}