@bitpoolos/edge-bacnet 1.2.6 → 1.2.7

package/bacnet_write.html

@@ -162,11 +162,27 @@
                         //update UI
                         let parentDeviceName = slotProps.node.parentDevice;
                         let foundDeviceIndex = this.writeDevices ? this.writeDevices.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);
 
@@ -183,18 +199,12 @@
 
                         slotProps.node.showAdded = true;
 
+                        console.log("write point added, slotProps.node: ", slotProps.node);
+
                         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}`;
+
                         let point = this.pointList[key][slotProps.node.pointName];
                         point.deviceId = device.deviceId;
                         point.deviceAddress = device.address;
@@ -212,6 +222,8 @@
 
                         if (!found) this.pointsToWrite.push(point);
 
+                        console.log("this.pointsToWrite: ", this.pointsToWrite);
+
                         //force a deploy state
                         node.hiddenDeployToggle = !node.prevHiddenToggleState;
                     },
@@ -365,13 +377,13 @@
 <script type="text/html" data-template-name="Bacnet-Write">
     <style>
         .p-treenode-label {
-            /* color: white; */
             color: black;
             width: 100%;
         }
         .p-tree {
             background: inherit !important;
             border: inherit !important;
+            padding-right: 0px !important;
         }
         .p-button {
             margin-right: .5rem;
@@ -383,15 +395,11 @@
             float: right;
         }
         .addPointButton:hover, .minusPointButton:hover {
-            /* background: #282A36 !important; */
             background: #d5d5d5 !important;
         }
         .pointLabel {
             font-weight: 400;
         }
-        /* .p-treenode-children {
-            background-color: #f0f0f0;
-        } */
         .deviceLabel {
             font-weight: 100;
         }
@@ -404,12 +412,10 @@
         .bacnetbutton {
             background: none;
             border: none;
-            /* color: white; */
             color: black;
             font-weight: 400;
         }
         .bacnetbutton:hover {
-            /* background: #21232e; */
             background: #f0f0f0;
             border-radius: 10px;
         }
@@ -419,17 +425,13 @@
         }
         .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;
-        }
         .p-tree-toggler:enabled:hover {
-            /* background: #21232e !important; */
             background: #d5d5d5 !important;
         }
         .p-tree-toggler:focus {
@@ -441,14 +443,15 @@
         }
         .statusOnline {
             color: #11c511;
-
         }
         .statusOffline {
             color: red;
         }
+        /*
         .deviceLabel {
-            position: relative;
+            position: absolute;
         }
+        */
         .objectPropertiesLabel {
             display: flex !important;
             flex-direction: row;
@@ -457,23 +460,60 @@
         .p-tree .p-tree-container .p-treenode .p-treenode-content:focus {
             outline: 0 none !important;
             outline-offset: 0 !important;
-            box-shadow: inset 0 0 0 0.15rem #44475a !important;
+            box-shadow: inset 0 0 0 1px #bdbdbd !important;
+        }
+        .checkbox-round {
+            width: 13px !important;
+            height: 13px !important;
+            background-color: white;
+            border-radius: 50%;
+            vertical-align: middle;
+            border: 1px solid #ddd;
+            appearance: none;
+            -webkit-appearance: none;
+            outline: none;
+            cursor: pointer;
+        }
+        .checkbox-round:checked {
+            background-color: #00AEEF;
+        }
+        .checkbox-round:focus {
+            outline: none !important;
         }
         .p-tree-filter:focus, .p-tree-filter:focus-visible, .p-inputtext:enabled:hover {
-            box-shadow: inset 0 0 0 0.15rem #44475a !important;
+            box-shadow: inset 0 0 0 0.15rem #dfdcdc !important;
             border-color: transparent !important;
         }
         .bacnetbutton > .pi {
             display: flex;
         }
+        .p-tree-container {
+            margin: 0 !important;
+        }
         .reloadButtonIcon {
             font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !important;
         }
+        .removeAllDevicesButton {
+            border: none;
+            background: none;
+            font-size: 14px !important;
+            float: right;
+            display: flex;
+            align-items: center;
+        }
+        .removeAllDevicesButton:hover {
+            background-color: #d5d5d5;
+            border-radius: 10px;
+        }
         .reloadButton {
             border: none;
             background: none;
-            margin-right: 20px !important;
-            margin-bottom: 10px !important;
+            font-size: 14px !important;
+            float: right;
+        }
+        .rebuildDataButton {
+            border: none;
+            background: none;
             font-size: 14px !important;
             float: right;
         }
@@ -481,11 +521,47 @@
             background-color: #d5d5d5;
             border-radius: 10px;
         }
+        .rebuildDataButton:hover {
+            background-color: #d5d5d5;
+            border-radius: 10px;
+        }
+        .headerDiv {
+            display: flex;
+            flex-direction: row;
+            flex-wrap: nowrap;
+            justify-content: space-around;
+            height: 20px;
+        }
+        .msgTypeDiv {
+            display: flex;
+            align-items: flex-start;
+            flex-direction: column;
+        }
+        .p-progressbar .p-progressbar-value {
+            background: #00AEEF !important;
+        }
         .p-treenode-label {
             overflow: hidden;
             white-space: nowrap;
             text-overflow: ellipsis;
         }
+        .buttonGroup {
+            padding-left: 7px;
+        }
+        #read-readList-tab {
+            display: flex; 
+            flex-direction: column;
+        }
+        .removeAllDevicesDiv {
+            font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+            padding-right: 20px;
+        }
+        .p-tree .p-treenode-children {
+            padding: 0 !important;
+        }
+        .p-tree-toggler .p-link {
+            width: 25px !important;
+        }
 
     </style>
 

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,8 @@ class BacnetClientConfig {
     manual_instance_range_start,
     manual_instance_range_end,
     device_read_schedule,
-    retries
+    retries,
+    cacheFileEnabled
   ) {
     this.apduTimeout = apduTimeout;
     this.localIpAdrress = localIpAdrress;
@@ -107,6 +108,7 @@ class BacnetClientConfig {
     this.manual_instance_range_end = manual_instance_range_end;
     this.device_read_schedule = device_read_schedule;
     this.retries = retries;
+    this.cacheFileEnabled = cacheFileEnabled;
   }
 }
 
@@ -220,17 +222,25 @@ const doNodeRedRestart = function () {
 // STORE CONFIG FUNCTION ==========================================================
 //
 // ================================================================================
-async function Store_Config(data) {
+function Store_Config(data) {
   try {
-    await fs.writeFile("edge-bacnet-datastore.cfg", data, (err) => {
-      if (err) {
-        console.log("Store_Config writeFile error: ", err);
+    fs.access("edge-bacnet-datastore.cfg", fs.constants.W_OK, async function(err) {
+      if(err){
+        console.log("Store_Config writeAccess error found: ", err);
+      } else {
+        await fs.writeFile("edge-bacnet-datastore.cfg", data, {encoding: "utf8", flag: "w"}, (err) => {
+          if (err) {
+            console.log("Store_Config writeFile error: ", err);
+          }
+        });
       }
     });
-  } catch (e) {
+  } catch(e){
     //do nothing
   }
-}
+};
+
+
 
 // READ CONFIG SYNC FUNCTION ======================================================
 //
@@ -238,14 +248,15 @@ async function Store_Config(data) {
 function Read_Config_Sync() {
   var data = "{}";
   try {
-    data = fs.readFileSync("edge-bacnet-datastore.cfg", { encoding: "utf8", flag: "r" });
-  } catch (err) {
-    //console.log("Read_Config_Sync error:", err);
-    data = "{}";
+    data = fs.readFileSync("edge-bacnet-datastore.cfg", { encoding: 'utf8', flag: 'r' });
+  }
+  catch (err) {
+    console.log("Read_Config_Sync error:", err);
+    data = '{}';
     Store_Config(data);
   }
   return data;
-}
+};
 
 // STORE CONFIG FUNCTION - BACNET SERVER ==========================================
 //
@@ -276,6 +287,10 @@ function Read_Config_Sync_Server() {
   return data;
 }
 
+function isNumber(value) {
+  return value != null && typeof value === 'number' && !isNaN(value);
+}
+
 module.exports = {
   BacnetConfig,
   BacnetClientConfig,
@@ -290,4 +305,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.7",
   "description": "A bacnet gateway for node-red",
   "dependencies": {
     "@plus4nodered/ts-node-bacnet": "^1.0.0-beta.2",
@@ -50,4 +50,4 @@
     "type": "github",
     "url": "git+https://github.com/bitpool/edge-bacnet.git"
   }
-}
+}

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;
+}