@bitpoolos/edge-bacnet 1.4.7 → 1.5.1

package/bacnet_gateway.html

@@ -161,6 +161,7 @@
       device_read_schedule_value: { value: "15", required: true },
       device_read_schedule_options: { value: "Minutes", required: true },
       deviceRangeRegisters: { value: [] },
+      portRangeRegisters: { value: [] },
       cacheFileEnabled: { value: false, required: true },
       sanitise_device_schedule: { value: "60", required: false },
       sanitise_device_schedule_value: { value: "1", required: false },
@@ -237,14 +238,15 @@
 
       queryAdapters();
 
-      if (node.vm1 == undefined) {
+      window.confirmDialogExists = window.confirmDialogExists || false;
+
+      if (node.vm1 == undefined && !window.confirmDialogExists) {
         const confirmDialog = document.createElement("p-confirm-dialog");
         document.getElementById("serverParent").appendChild(confirmDialog);
+        window.confirmDialogExists = true;
       }
 
       const { createApp, ref, onMounted } = Vue;
-      const ConfirmDialog = primevue.confirmdialog;
-      const ConfirmationService = primevue.confirmationservice;
       const ListBox = primevue.listbox;
 
       //prime vue app
@@ -347,7 +349,7 @@
             contentType: "application/json",
             data: JSON.stringify(jsonPayload),
             success: function (result) { },
-            timeout: 10000,
+            timeout: 15000,
           });
         };
 
@@ -368,7 +370,8 @@
         });
       });
 
-      //device scan range matrix
+      //start device scan range matrix
+
       $("#node-input-deviceIdRangeMatrix-container")
         .css("min-width", "350px")
         .editableList({
@@ -402,12 +405,13 @@
 
             $(htmlRow).appendTo(fragment);
             row[0].appendChild(fragment);
-            document.getElementById("node-input-reg-block-count").innerHTML = $(
+
+            document.getElementById("node-input-reg-block-count-deviceIdRangeMatrix").innerHTML = $(
               "#node-input-deviceIdRangeMatrix-container"
             ).editableList("length");
           },
           removeItem: function (data) {
-            document.getElementById("node-input-reg-block-count").innerHTML = $(
+            document.getElementById("node-input-reg-block-count-deviceIdRangeMatrix").innerHTML = $(
               "#node-input-deviceIdRangeMatrix-container"
             ).editableList("length");
           },
@@ -415,7 +419,7 @@
           scrollOnAdd: false,
           header: $("<div style='display:flex; padding:10px 10px 0px 5px; column-gap: 10px'>").append(
             $.parseHTML(
-              "<div><span class='bp-matrix-heading'>Device ID Range(s)</span> </div><div class='bp-matrix-count' style='color: gray'><label id='node-input-reg-block-count' >0</label>  </div>"
+              "<div><span class='bp-matrix-heading'>Device ID Range(s)</span> </div><div class='bp-matrix-count' style='color: gray'><label id='node-input-reg-block-count-deviceIdRangeMatrix' >0</label>  </div>"
             )
           ),
           buttons: [
@@ -454,7 +458,7 @@
               title: "Delete all registers",
               click: function (evt) {
                 $("#node-input-deviceIdRangeMatrix-container").editableList("empty");
-                document.getElementById("node-input-reg-block-count").innerHTML = 0;
+                document.getElementById("node-input-reg-block-count-deviceIdRangeMatrix").innerHTML = 0;
               },
             },
           ],
@@ -472,7 +476,117 @@
         });
       }
 
-      document.getElementById("node-input-reg-block-count").innerHTML = node.deviceRangeRegisters.length;
+      document.getElementById("node-input-reg-block-count-deviceIdRangeMatrix").innerHTML = node.deviceRangeRegisters.length;
+
+      //end device id range matrix
+
+      //start port range matrix
+
+      $("#node-input-portRangeMatrix-container")
+        .css("min-width", "350px")
+        .editableList({
+          addItem: function (row, index, data) {
+            row.css({ overflow: "none", whiteSpace: "nowrap" });
+            let rowData = {};
+            if (data && typeof data.enabled == "boolean" && typeof data.start == "string" && typeof data.end == "string") {
+              if (data.enabled === true) {
+                rowData.enabled = "checked";
+              } else if (data.enabled === false) {
+                rowData.enabled = "";
+              }
+              rowData.start = data.start;
+              rowData.end = data.end;
+            } else {
+              rowData.enabled = "";
+              rowData.start = "";
+              rowData.end = "";
+            }
+
+            let itemNumber = index + 1;
+            let fragment = document.createDocumentFragment();
+            let htmlRow = `
+                <div class="form-row" id="node-input-port_range">
+                    <span class='bp-matrix-itemIndex'> ${itemNumber} </span>
+                    <a style="padding-left: 60px;">Start: </a><input type="number" id="node-input-port_range_entry_start" style="width: 125px;" min="0" max="64738" value="${rowData.start}" />
+                    <a style="padding-left: 35px;">End: </a><input type="number" id="node-input-port_range_entry_end" style="width: 125px;" min="1" max="64738" value="${rowData.end}" />
+                    <label class='bp-matrix-enable' for="node-input-port_range_entry"><i class="icon-tag"></i><span data-i18n="bitpool-bacnet.label.port_range_entry"></span>
+                    <input type="checkbox" id="node-input-port_range_entry_enabled" style="width: auto;" ${rowData.enabled} /> </label>
+                </div>`;
+
+            $(htmlRow).appendTo(fragment);
+            row[0].appendChild(fragment);
+            document.getElementById("node-input-reg-block-count-portRangeMatrix").innerHTML = $(
+              "#node-input-portRangeMatrix-container"
+            ).editableList("length");
+          },
+          removeItem: function (data) {
+            document.getElementById("node-input-reg-block-count-portRangeMatrix").innerHTML = $(
+              "#node-input-portRangeMatrix-container"
+            ).editableList("length");
+          },
+          removable: true,
+          scrollOnAdd: false,
+          header: $("<div style='display:flex; padding:10px 10px 0px 5px; column-gap: 10px'>").append(
+            $.parseHTML(
+              "<div><span class='bp-matrix-heading'>Port Range(s)</span> </div><div class='bp-matrix-count' style='color: gray'><label id='node-input-reg-block-count-portRangeMatrix' >0</label>  </div>"
+            )
+          ),
+          buttons: [
+            {
+              label: "json",
+              icon: "fa fa-share",
+              title: "Export tags as JSON to browser",
+              click: function (evt) {
+                var portRangeRegisters = $("#node-input-portRangeMatrix-container").editableList("items");
+                var mapItems = [];
+                portRangeRegisters.each(function (i) {
+                  var registerMap = $(this);
+                  var mapItem = {
+                    enabled: registerMap.find("#node-input-port_range_entry_enabled").val(),
+                    start: registerMap.find("#node-input-port_range_entry_start").val(),
+                    end: registerMap.find("#node-input-port_range_entry_end").val(),
+                  };
+                  mapItems.push(mapItem);
+                });
+                var oMyBlob = new Blob(
+                  [
+                    JSON.stringify(mapItems, null, 0)
+                      .replaceAll(/\[{/gi, "[\n{")
+                      .replaceAll(/}\]/gi, "}\n]")
+                      .replaceAll(/},/gi, "},\n")
+                      .replaceAll(/{/gi, "  {"),
+                  ],
+                  { type: "text/json" }
+                );
+                window.open(URL.createObjectURL(oMyBlob));
+              },
+            },
+            {
+              label: "delete",
+              icon: "fa-regular fa-trash-can",
+              title: "Delete all registers",
+              click: function (evt) {
+                $("#node-input-portRangeMatrix-container").editableList("empty");
+                document.getElementById("node-input-reg-block-count-portRangeMatrix").innerHTML = 0;
+              },
+            },
+          ],
+        });
+
+      if (node.portRangeRegisters.length > 0) {
+        for (var i = 0; i < node.portRangeRegisters.length; i++) {
+          $("#node-input-portRangeMatrix-container").editableList("addItem", node.portRangeRegisters[i]);
+        }
+      } else {
+        $("#node-input-portRangeMatrix-container").editableList("addItem", {
+          enabled: true,
+          start: "47808",
+          end: "47808",
+        });
+      }
+
+      document.getElementById("node-input-reg-block-count-portRangeMatrix").innerHTML = node.portRangeRegisters.length;
+      //end port range matrix
     },
     oneditsave: function () {
       let node = this;
@@ -503,6 +617,18 @@
         };
         node.deviceRangeRegisters.push(mapItem);
       });
+
+      node.portRangeRegisters = [];
+      let portRanges = $("#node-input-portRangeMatrix-container").editableList("items");
+      portRanges.each(function (i) {
+        let map = $(this);
+        let mapItem = {
+          enabled: map.find("#node-input-port_range_entry_enabled").is(":checked"),
+          start: map.find("#node-input-port_range_entry_start").val(),
+          end: map.find("#node-input-port_range_entry_end").val(),
+        };
+        node.portRangeRegisters.push(mapItem);
+      });
     },
   });
 
@@ -551,10 +677,6 @@
       margin-top: 20px;
       margin-left: 50px;
     }
-    .p-confirm-dialog-accept > .p-button-label,
-    .bacnetServerRebuildSchedule_clearButton > .p-button-label {
-      color: white;
-    }
     .red-ui-editor label {
       font-size: 12px;
     }
@@ -632,8 +754,7 @@
 
       <div class="form-row bp-row" id="networkInterfaceDiv">
         <label for="node-input-local_device_address"
-          ><i class="icon-tag"></i><span data-i18n="bitpool-bacnet.label.local_device_address"></span> Network
-          Interface</label
+          ><i class="icon-tag"></i><span data-i18n="bitpool-bacnet.label.local_device_address"></span> Network Interface</label
         >
         <select id="node-input-local_device_address"></select>
       </div>
@@ -652,6 +773,10 @@
         <input type="text" id="node-input-local_device_port" placeholder="47808" />
       </div>
 
+      <div class="form-row node-input-portRangeMatrix-container-row bp-row">
+        <ol id="node-input-portRangeMatrix-container"></ol>
+      </div>
+
       <div class="form-row bp-row">
         <label for="node-input-deviceId"
           ><i class="icon-tag"></i><span data-i18n="bitpool-bacnet.label.deviceId"></span> Device ID
@@ -764,8 +889,8 @@
 
       <div class="form-row bp-row" style="align-items: center; display: none;">
         <label for="node-input-sanitise_device_schedule_value"
-          ><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.sanitise_device_schedule"></span>Device
-          Sanitisation Frequency</label
+          ><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.sanitise_device_schedule"></span>Device Sanitisation
+          Frequency</label
         >
         <p style="margin-right: 5px; margin-bottom: 0px; padding-left: 7px;">Every</p>
         <input type="text" id="node-input-sanitise_device_schedule" style="display: none;" />
@@ -783,17 +908,17 @@
       </div>
 
       <div class="form-row bp-checkbox-row">
-        <input type="checkbox" id="node-input-cacheFileEnabled" class="bp-checkbox"/>
+        <input type="checkbox" id="node-input-cacheFileEnabled" class="bp-checkbox" />
         <label for="node-input-cacheFileEnabled"> Enable cache file </label>
       </div>
 
       <div class="form-row bp-checkbox-row">
-        <input type="checkbox" id="node-input-toLogIam" class="bp-checkbox"/>
+        <input type="checkbox" id="node-input-toLogIam" class="bp-checkbox" />
         <label for="node-input-toLogIam"> Log found device </label>
       </div>
 
       <div class="form-row bp-checkbox-row" style="border-bottom: 1px solid #cbcbcb; padding-bottom: 20px;">
-        <input type="checkbox" id="node-input-logErrorToConsole" class="bp-checkbox"/>
+        <input type="checkbox" id="node-input-logErrorToConsole" class="bp-checkbox" />
         <label for="node-input-logErrorToConsole"> Log BACnet errors to console </label>
       </div>
 
@@ -815,15 +940,12 @@
 
     <div id="read-server-tab" style="display:none">
       <div class="form-row bp-checkbox-row">
-        <input type="checkbox" id="node-input-serverEnabled" class="bp-checkbox"/>
+        <input type="checkbox" id="node-input-serverEnabled" class="bp-checkbox" />
         <label for="node-input-serverEnabled"> Enable Server </label>
       </div>
 
       <div class="read_server_parent_div" id="serverParent">
-        <div
-          class="form-row bp-row clearServerContainer"
-          id="clearServerContainer"
-          style="align-items: center; display: flex;">
+        <div class="form-row bp-row clearServerContainer" id="clearServerContainer" style="align-items: center; display: flex;">
           <p-button class="bacnetServerRebuildSchedule_clearButton" @click="confirmAll($event)" label="Reinitialize Server">
           </p-button>
         </div>
@@ -856,8 +978,8 @@
   <h3><strong>Gateway Tab</strong></h3>
   <ul class="node-ports">
     <li>
-      Network Interface - the desired interface for the bacstack client to bind to. This interface must not have any other
-      BACnet clients bound to it.
+      Network Interface - the desired interface for the bacstack client to bind to. This interface must not have any other BACnet
+      clients bound to it.
     </li>
     <li>
       Broadcast Address - the desired subnet for global msgs to be broadcast and recieved on. This should be as strict as
@@ -872,13 +994,13 @@
     <li>Max APDU Size - BACnet max apdu size</li>
     <li>Max Segments - BACnet max segments</li>
     <li>
-      Global Discover Frequency - the frequency at which the gateway issues global WhoIs BACnet commands. This should be
-      limited to the least amount possible, as over-loading a network can be a serious issue with BACnet commmunications.
+      Global Discover Frequency - the frequency at which the gateway issues global WhoIs BACnet commands. This should be limited
+      to the least amount possible, as over-loading a network can be a serious issue with BACnet commmunications.
     </li>
     <li>
-      Manual Point Discovery Instance Range - if a BACnet device doesnt have a Object list (BACnet objectType:propertyId -
-      8:76), the this bacnet client will enter into manual discovery mode, where it iterates through types and instnace
-      ranges. This range can be used to limit this manual scanning
+      Manual Point Discovery Instance Range - if a BACnet device doesnt have a Object list (BACnet objectType:propertyId - 8:76),
+      the this bacnet client will enter into manual discovery mode, where it iterates through types and instnace ranges. This
+      range can be used to limit this manual scanning
     </li>
     <li>Log Device Found - toggles logging of found devices to the node-red debug tab.</li>
     <li>Log BACnet Errors to Console - toggles logging of BACnet related errors to the node-red console</li>
@@ -891,20 +1013,18 @@
     devices via BACnet/IP
   </p>
   <p>
-    This node only supports 2 BACnet object types, Analog Value - to show numeric data, and a Character String - to show
-    string data.
+    This node only supports 2 BACnet object types, Analog Value - to show numeric data, and a Character String - to show string
+    data.
   </p>
   <ul class="node-ports">
     <li>Enabled - toggles whether or not the local BACnet server is started or not.</li>
-    <li>
-      Clear Server Points - a schedule for the locally generated BACnet points to get cleared from the node object store
-    </li>
+    <li>Clear Server Points - a schedule for the locally generated BACnet points to get cleared from the node object store</li>
   </ul>
 
   <h3><strong>Examples</strong></h3>
   <p>
-    For example flows, please use the examples section for this node. These examples can be found at: Node-red hamburger menu
-    on top right -> Import -> Examples -> @bitpoolos/edge-bacnet
+    For example flows, please use the examples section for this node. These examples can be found at: Node-red hamburger menu on
+    top right -> Import -> Examples -> @bitpoolos/edge-bacnet
   </p>
   <p>
     To find captured examples of settings and flows, please go to our wiki

package/bacnet_gateway.js

@@ -33,6 +33,7 @@ module.exports = function (RED) {
     this.retries = config.retries;
     this.bacnetServer = nodeContext.get("bacnetServer") || null;
     this.deviceRangeRegisters = config.deviceRangeRegisters;
+    this.portRangeRegisters = config.portRangeRegisters;
     this.cacheFileEnabled = config.cacheFileEnabled;
     this.sanitise_device_schedule = config.sanitise_device_schedule;
 
@@ -61,7 +62,8 @@ module.exports = function (RED) {
       node.device_read_schedule,
       node.retries,
       node.cacheFileEnabled,
-      node.sanitise_device_schedule
+      node.sanitise_device_schedule,
+      node.portRangeRegisters.filter((ele) => ele.enabled === true)
     );
 
     nodeContext.set("bacnetConfig", node.bacnetConfig);
@@ -225,11 +227,9 @@ module.exports = function (RED) {
             logOut("Error updating priorityQueue: ", error);
           });
       } else if (msg.testFunc == true) {
-        node.bacnetClient.testFunction(msg.address, msg.type, msg.instance, msg.property);
+        node.bacnetClient.testFunction(msg.address, msg.port, msg.type, msg.instance, msg.property);
       } else if (msg.applyDisplayNames) {
-
         node.status({ fill: "blue", shape: "dot", text: "Updating display names" });
-
         setTimeout(() => {
           node.status({});
         }, 2000);
@@ -240,7 +240,6 @@ module.exports = function (RED) {
           }).catch(function (error) {
             logOut("Error in applyDisplayNames: ", error);
           });
-
       }
     });