@bitpoolos/edge-bacnet 1.6.0 → 1.6.2

package/examples/4-Inspector.json

@@ -0,0 +1,368 @@
+[
+  {
+    "id": "1617c14c07ac6e16",
+    "type": "Bacnet-Gateway",
+    "z": "f1fc21f44027188c",
+    "name": "",
+    "local_device_address": "",
+    "local_interface_name": "",
+    "apduTimeout": 6000,
+    "roundDecimal": 2,
+    "local_device_port": 47808,
+    "apduSize": "5",
+    "maxSegments": "0x50",
+    "retries": "5",
+    "broadCastAddr": "255.255.255.255",
+    "toLogIam": false,
+    "discover_polling_schedule": "900",
+    "discover_polling_schedule_value": "15",
+    "discover_polling_schedule_options": "Minutes",
+    "deviceId": 817001,
+    "logErrorToConsole": false,
+    "serverEnabled": true,
+    "device_read_schedule": "900",
+    "device_read_schedule_value": "15",
+    "device_read_schedule_options": "Minutes",
+    "deviceRangeRegisters": [
+      {
+        "enabled": true,
+        "start": "0",
+        "end": "4194303"
+      }
+    ],
+    "portRangeRegisters": [
+      {
+        "enabled": true,
+        "start": "47808",
+        "end": "47808"
+      }
+    ],
+    "cacheFileEnabled": true,
+    "sanitise_device_schedule": "3600",
+    "sanitise_device_schedule_value": "1",
+    "sanitise_device_schedule_options": "Hours",
+    "x": 840,
+    "y": 440,
+    "wires": [
+      [
+        "8db122ce13172090",
+        "df826da5f464306c"
+      ]
+    ]
+  },
+  {
+    "id": "3dbfbb72574a201c",
+    "type": "Bacnet-Discovery",
+    "z": "f1fc21f44027188c",
+    "name": "",
+    "events": true,
+    "json": true,
+    "mqtt": false,
+    "pointJson": false,
+    "hiddenDeployToggle": false,
+    "prevHiddenToggleState": false,
+    "roundDecimal": 2,
+    "pointsToRead": {},
+    "readDevices": [],
+    "object_property_simplePayload": false,
+    "object_property_simpleWithStatus": false,
+    "object_property_fullObject": true,
+    "useDeviceName": true,
+    "x": 670,
+    "y": 360,
+    "wires": [
+      [
+        "1617c14c07ac6e16",
+        "df826da5f464306c"
+      ]
+    ]
+  },
+  {
+    "id": "ae5c90c50e252352",
+    "type": "Bacnet-Write",
+    "z": "f1fc21f44027188c",
+    "name": "",
+    "applicationTag": "4",
+    "priority": "16",
+    "pointsToWrite": [],
+    "writeDevices": [],
+    "hiddenDeployToggle": false,
+    "prevHiddenToggleState": false,
+    "x": 670,
+    "y": 520,
+    "wires": [
+      [
+        "1617c14c07ac6e16"
+      ]
+    ]
+  },
+  {
+    "id": "e4837a22dc540343",
+    "type": "Bitpool-Inject",
+    "z": "f1fc21f44027188c",
+    "name": "Discover",
+    "props": [
+      {
+        "p": "payload"
+      },
+      {
+        "p": "topic",
+        "vt": "str"
+      }
+    ],
+    "repeat": "",
+    "crontab": "",
+    "once": false,
+    "onceDelay": 0.1,
+    "topic": "",
+    "payload": "",
+    "payloadType": "date",
+    "doPoll": false,
+    "doDiscover": true,
+    "json": false,
+    "mqtt": false,
+    "pointJson": true,
+    "object_property_simplePayload": false,
+    "object_property_simpleWithStatus": false,
+    "object_property_fullObject": true,
+    "useDeviceName": true,
+    "x": 660,
+    "y": 440,
+    "wires": [
+      [
+        "1617c14c07ac6e16"
+      ]
+    ]
+  },
+  {
+    "id": "67bd88188ddd1166",
+    "type": "Bitpool-Inject",
+    "z": "f1fc21f44027188c",
+    "name": "Poll",
+    "props": [
+      {
+        "p": "payload"
+      },
+      {
+        "p": "topic",
+        "vt": "str"
+      }
+    ],
+    "repeat": "",
+    "crontab": "",
+    "once": false,
+    "onceDelay": 0.1,
+    "topic": "",
+    "payload": "",
+    "payloadType": "date",
+    "doPoll": true,
+    "doDiscover": false,
+    "json": false,
+    "mqtt": false,
+    "pointJson": true,
+    "object_property_simplePayload": false,
+    "object_property_simpleWithStatus": false,
+    "object_property_fullObject": true,
+    "useDeviceName": true,
+    "x": 490,
+    "y": 520,
+    "wires": [
+      [
+        "ae5c90c50e252352"
+      ]
+    ]
+  },
+  {
+    "id": "6d1719920e0c3838",
+    "type": "Bitpool-Inject",
+    "z": "f1fc21f44027188c",
+    "name": "Poll",
+    "props": [
+      {
+        "p": "payload"
+      },
+      {
+        "p": "topic",
+        "vt": "str"
+      }
+    ],
+    "repeat": "",
+    "crontab": "",
+    "once": false,
+    "onceDelay": 0.1,
+    "topic": "",
+    "payload": "",
+    "payloadType": "date",
+    "doPoll": true,
+    "doDiscover": false,
+    "json": false,
+    "mqtt": false,
+    "pointJson": true,
+    "object_property_simplePayload": false,
+    "object_property_simpleWithStatus": false,
+    "object_property_fullObject": true,
+    "useDeviceName": true,
+    "x": 490,
+    "y": 360,
+    "wires": [
+      [
+        "3dbfbb72574a201c"
+      ]
+    ]
+  },
+  {
+    "id": "8db122ce13172090",
+    "type": "debug",
+    "z": "f1fc21f44027188c",
+    "name": "debug 1",
+    "active": true,
+    "tosidebar": true,
+    "console": false,
+    "tostatus": false,
+    "complete": "true",
+    "targetType": "full",
+    "statusVal": "",
+    "statusType": "auto",
+    "x": 1040,
+    "y": 440,
+    "wires": []
+  },
+  {
+    "id": "df826da5f464306c",
+    "type": "Bacnet-Inspector",
+    "z": "f1fc21f44027188c",
+    "name": "",
+    "siteName": "INSPECTOR_SITE_NAME",
+    "totalUniqueReadCount": 0,
+    "x": 1070,
+    "y": 360,
+    "wires": [
+      [
+        "6eeed73a4976730b"
+      ]
+    ]
+  },
+  {
+    "id": "6eeed73a4976730b",
+    "type": "debug",
+    "z": "f1fc21f44027188c",
+    "name": "debug 2",
+    "active": true,
+    "tosidebar": true,
+    "console": false,
+    "tostatus": false,
+    "complete": "true",
+    "targetType": "full",
+    "statusVal": "",
+    "statusType": "auto",
+    "x": 1300,
+    "y": 360,
+    "wires": []
+  },
+  {
+    "id": "70b41e715ed44733",
+    "type": "Bitpool-Inject",
+    "z": "f1fc21f44027188c",
+    "name": "sendMqttStats",
+    "props": [
+      {
+        "p": "type",
+        "v": "sendMqttStats",
+        "vt": "str"
+      }
+    ],
+    "repeat": "",
+    "crontab": "",
+    "once": false,
+    "onceDelay": 0.1,
+    "topic": "",
+    "doPoll": true,
+    "doDiscover": false,
+    "json": false,
+    "mqtt": false,
+    "pointJson": true,
+    "object_property_simplePayload": false,
+    "object_property_simpleWithStatus": false,
+    "object_property_fullObject": true,
+    "useDeviceName": true,
+    "x": 870,
+    "y": 240,
+    "wires": [
+      [
+        "df826da5f464306c"
+      ]
+    ]
+  },
+  {
+    "id": "031ec232c48e17de",
+    "type": "Bitpool-Inject",
+    "z": "f1fc21f44027188c",
+    "name": "getBacnetStats",
+    "props": [
+      {
+        "p": "type",
+        "v": "getBacnetStats",
+        "vt": "str"
+      }
+    ],
+    "repeat": "",
+    "crontab": "",
+    "once": false,
+    "onceDelay": 0.1,
+    "topic": "",
+    "doPoll": true,
+    "doDiscover": false,
+    "json": false,
+    "mqtt": false,
+    "pointJson": true,
+    "object_property_simplePayload": false,
+    "object_property_simpleWithStatus": false,
+    "object_property_fullObject": true,
+    "useDeviceName": true,
+    "x": 860,
+    "y": 300,
+    "wires": [
+      [
+        "df826da5f464306c"
+      ]
+    ]
+  },
+  {
+    "id": "74e1dd56bce21e2f",
+    "type": "Bitpool-Inject",
+    "z": "f1fc21f44027188c",
+    "name": "reset",
+    "props": [
+      {
+        "p": "reset",
+        "v": "true",
+        "vt": "bool"
+      },
+      {
+        "p": "topic",
+        "vt": "str"
+      }
+    ],
+    "repeat": "",
+    "crontab": "",
+    "once": false,
+    "onceDelay": 0.1,
+    "topic": "",
+    "doPoll": true,
+    "doDiscover": false,
+    "json": false,
+    "mqtt": false,
+    "pointJson": true,
+    "object_property_simplePayload": false,
+    "object_property_simpleWithStatus": false,
+    "object_property_fullObject": true,
+    "useDeviceName": true,
+    "x": 890,
+    "y": 180,
+    "wires": [
+      [
+        "df826da5f464306c"
+      ]
+    ]
+  }
+]

package/inspector.html

@@ -35,8 +35,8 @@
             </span>
             <div class="status-text">
               <span class="statBlockValue">
-                {{statCounts?.readCount}}
-                <span class="stat-percentage">{{statPercentages.readCount}}%</span>
+                {{statCounts?.statBlock.ok}}
+                <span class="stat-percentage">{{statPercentages.ok}}%</span>
               </span>
               <span class="statBlockKey">Points OK</span>
             </div>
@@ -133,9 +133,9 @@
         <div class="center">
           <p class="headertext">{{siteName}} - Point Status Display</p>
         </div>
-        <p-datatable :value="displayData" paginator :rows="12" filterDisplay="menu" :filters="filters"
-          v-model:filters="filters" :sortMode="'multiple'" @filter="onFilter" scrollable scrollHeight="800px"
-          class="datatable fixed-height-table">
+        <p-datatable :value="displayData" paginator scrollable scrollHeight="800px" :rows="12" filterDisplay="menu"
+          :filters="filters" v-model:filters="filters" :sortMode="'multiple'" @filter="onFilter"
+          class="datatable fixed-height-table" :loading="loading">
           <template #header>
             <div class="tableHeaderDiv">
               <div style="margin-right: 5px">
@@ -177,6 +177,14 @@
               </div>
             </div>
           </template>
+          <template #loading>
+            <div class="loading-overlay">
+              <div class="loading-spinner">
+                <i class="pi pi-spin pi-spinner" style="font-size: 2rem"></i>
+                <p>Loading data...</p>
+              </div>
+            </div>
+          </template>
           <p-column v-for="col in visibleColumns" :key="col.field" :field="col.field" :header="col.header" sortable
             filter></p-column>
           <template #paginatorstart>
@@ -188,6 +196,7 @@
             </span>
           </template>
         </p-datatable>
+
       </div>
     </div>
   </div>
@@ -199,7 +208,7 @@
       data() {
         return {
           tableData: null,
-          loading: false,
+          loading: true,
           totalRecords: 0,
           first: 0,
           lazyParams: {},
@@ -244,6 +253,7 @@
           selectedColumns: [],
           statPercentages: {
             readCount: 0,
+            ok: 0,
             error: 0,
             missing: 0,
             warnings: 0,
@@ -262,6 +272,7 @@
         this.observeHeaderHeight();
 
         this.selectedColumns = JSON.parse(JSON.stringify(this.allColumns));
+        this.loading = true;
 
         fetch("/getModelStats")
           .then((response) => {
@@ -287,18 +298,22 @@
             // Calculate percentages
             const total = tableData.length || 1; // Avoid division by zero
             app.statPercentages = {
-              readCount: Math.round((data.statCounts.readCount / total) * 100),
-              error: Math.round((data.statCounts.statBlock.error / total) * 100),
-              missing: Math.round((data.statCounts.statBlock.missing / total) * 100),
-              warnings: Math.round((data.statCounts.statBlock.warnings / total) * 100),
-              deviceIdChange: Math.round((data.statCounts.statBlock.deviceIdChange / total) * 100),
-              deviceIdConflict: Math.round((data.statCounts.statBlock.deviceIdConflict / total) * 100),
-              unmapped: Math.round((data.statCounts.statBlock.unmapped / total) * 100)
+              readCount: Math.round((data.statCounts.readCount / total) * 10000) / 100,
+              ok: Math.round((data.statCounts.statBlock.ok / total) * 10000) / 100,
+              error: Math.round((data.statCounts.statBlock.error / total) * 10000) / 100,
+              missing: Math.round((data.statCounts.statBlock.missing / total) * 10000) / 100,
+              warnings: Math.round((data.statCounts.statBlock.warnings / total) * 10000) / 100,
+              deviceIdChange: Math.round((data.statCounts.statBlock.deviceIdChange / total) * 10000) / 100,
+              deviceIdConflict: Math.round((data.statCounts.statBlock.deviceIdConflict / total) * 10000) / 100,
+              unmapped: Math.round((data.statCounts.statBlock.unmapped / total) * 10000) / 100
             };
           })
           .catch((error) => {
             // Handle any errors
             console.error("Error:", error);
+          })
+          .finally(() => {
+            app.loading = false;
           });
       },
       computed: {
@@ -401,14 +416,6 @@
           if (!this.selectedColumns) return false;
           return this.selectedColumns.some((item) => item.field === option.field);
         },
-        getRowClass(rowData) {
-          console.log("rowData", rowData);
-          if (rowData.dataModelStatus.includes("Point OK")) return "row-ok";
-          if (rowData.dataModelStatus.includes("Point Error")) return "row-error";
-          if (rowData.dataModelStatus.includes("Point Warning")) return "row-warning";
-          if (rowData.dataModelStatus.includes("Point Missing")) return "row-missing";
-          return ""; // Default, no class
-        },
         downloadCSV() {
           window.location.href = "/getmodelstatscsv";
         },
@@ -423,6 +430,7 @@
             filters: this.filters,
             selectedColumns: this.selectedColumns,
             allColumns: this.allColumns,
+            statPercentages: this.statPercentages  // Include the calculated percentages
           };
           downloadPrimeVueAppAsHtml(filename, data);
         },

package/package.json

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

package/resources/downloadAsHtml.js

@@ -125,6 +125,7 @@ async function processPrimeVueHtml(appData) {
           selectedColumnValues: CAPTURED_APP_DATA.selectedColumnValues || [],
           statPercentages: CAPTURED_APP_DATA.statPercentages || {
             readCount: 0,
+            ok: 0,
             error: 0,
             missing: 0,
             warnings: 0,
@@ -145,13 +146,14 @@ async function processPrimeVueHtml(appData) {
         // Calculate percentages
         const total = this.tableData.length || 1; // Avoid division by zero
         this.statPercentages = {
-          readCount: Math.round((this.statCounts.readCount / total) * 100),
-          error: Math.round((this.statCounts.statBlock.error / total) * 100),
-          missing: Math.round((this.statCounts.statBlock.missing / total) * 100),
-          warnings: Math.round((this.statCounts.statBlock.warnings / total) * 100),
-          deviceIdChange: Math.round((this.statCounts.statBlock.deviceIdChange / total) * 100),
-          deviceIdConflict: Math.round((this.statCounts.statBlock.deviceIdConflict / total) * 100 || 0),
-          unmapped: Math.round((this.statCounts.statBlock.unmapped / total) * 100)
+          readCount: Math.round((this.statCounts.readCount / total) * 10000) / 100,
+          ok: Math.round((this.statCounts.statBlock.ok / total) * 10000) / 100,
+          error: Math.round((this.statCounts.statBlock.error / total) * 10000) / 100,
+          missing: Math.round((this.statCounts.statBlock.missing / total) * 10000) / 100,
+          warnings: Math.round((this.statCounts.statBlock.warnings / total) * 10000) / 100,
+          deviceIdChange: Math.round((this.statCounts.statBlock.deviceIdChange / total) * 10000) / 100,
+          deviceIdConflict: Math.round((this.statCounts.statBlock.deviceIdConflict / total) * 10000) / 100,
+          unmapped: Math.round((this.statCounts.statBlock.unmapped / total) * 10000) / 100
         };
       },
       computed: {
@@ -285,8 +287,8 @@ async function processPrimeVueHtml(appData) {
                 </span>
                 <div class="status-text">
                   <span class="statBlockValue">
-                    {{statCounts?.readCount}}
-                    <span class="stat-percentage">{{statPercentages.readCount}}%</span>
+                    {{statCounts?.statBlock.ok}}
+                    <span class="stat-percentage">{{statPercentages.ok}}%</span>
                   </span>
                   <span class="statBlockKey">Points OK</span>
                 </div>

package/resources/inspectorStyles.css

@@ -183,32 +183,15 @@ body {
 }
 
 
-/* changes start */
-
-/* Add these rules to forcefully control table height */
-.fixed-height-table {
-  height: 800px !important; /* Fixed height matching scrollHeight */
-}
-
-.fixed-height-table .p-datatable-wrapper {
-  height: calc(800px - 92px) !important; /* Subtract header and paginator height */
-  min-height: calc(800px - 92px) !important;
-}
-
 .fixed-height-table .p-datatable-table {
-  min-height: 800px !important; /* Force table to maintain minimum height */
+  height: 70vh !important;
 }
 
-/* Make sure the table body expands to fill available space */
-.fixed-height-table .p-datatable-tbody {
-  min-height: 760px !important; /* Approximate calculation for body only */
-}
-
-/* Add an empty row to maintain height when filtered results are few */
 .p-datatable-emptymessage td {
   height: 760px !important;
 }
 
+
 .row-missing {
   background-color: #00adef;
 }
@@ -234,7 +217,7 @@ body {
   width: -webkit-fill-available;
   margin: 5px;
   left: 0px;
-  height: 1000px !important;
+  /* height: 1000px !important; */
 }
 
 .datatable-card {
@@ -242,7 +225,7 @@ body {
   padding-bottom: 1rem !important;
   padding-left: 2rem;
   padding-right: 2rem;
-  height: 1000px !important;
+  /* height: 1000px !important; */
 }
 
 .p-multiselect-overlay {
@@ -475,4 +458,58 @@ body {
   box-sizing: border-box;
   max-height: 80vh;
   overflow-y: auto;
+}
+
+.p-datatable-scrollable-body {
+  min-height: 576px !important;
+}
+
+/* Set consistent row heights */
+.p-datatable .p-datatable-tbody>tr {
+  height: 48px !important;
+  min-height: 48px !important;
+  max-height: 48px !important;
+}
+
+/* Make sure content in cells doesn't expand the row */
+.p-datatable .p-datatable-tbody>tr>td {
+  height: 48px !important;
+  padding: 0.5rem 1rem;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+/* Ensure table takes minimum space when empty */
+.p-datatable-empty-message {
+  height: 576px !important;
+}
+.loading-overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: rgba(255, 255, 255, 0.7);
+  z-index: 1000;
+}
+
+.loading-spinner {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 1rem;
+}
+
+.loading-spinner p {
+  margin: 0;
+  color: #495057;
+  font-weight: 500;
+}
+
+.p-datatable .p-datatable-loading-overlay {
+  position: relative;
 }

package/ssrHtmlExporter.js

@@ -52,8 +52,8 @@ async function generatePrimeVueAppHtmlStatic(appData, filename = "bacnet-inspect
             </span>
             <div class="status-text">
               <span class="statBlockValue">
-                {{statCounts?.readCount}}
-                <span class="stat-percentage">{{statPercentages.readCount}}%</span>
+                {{statCounts?.statBlock.ok}}
+                <span class="stat-percentage">{{statPercentages.ok}}%</span>
               </span>
               <span class="statBlockKey">Points OK</span>
             </div>
@@ -258,6 +258,7 @@ async function generatePrimeVueAppHtmlStatic(appData, filename = "bacnet-inspect
             selectedColumns: [],
             statPercentages: {
               readCount: 0,
+              ok: 0,
               error: 0,
               missing: 0,
               warnings: 0,
@@ -277,13 +278,14 @@ async function generatePrimeVueAppHtmlStatic(appData, filename = "bacnet-inspect
           // Calculate percentages
           const total = this.tableData.length || 1; // Avoid division by zero
           this.statPercentages = {
-            readCount: Math.round((this.statCounts.readCount / total) * 100) || 0,
-            error: Math.round((this.statCounts.statBlock?.error / total) * 100) || 0,
-            missing: Math.round((this.statCounts.statBlock?.missing / total) * 100) || 0,
-            warnings: Math.round((this.statCounts.statBlock?.warnings / total) * 100) || 0,
-            deviceIdChange: Math.round((this.statCounts.statBlock?.deviceIdChange / total) * 100) || 0,
-            deviceIdConflict: Math.round((this.statCounts.statBlock?.deviceIdConflict / total) * 100) || 0,
-            unmapped: Math.round((this.statCounts.statBlock?.unmapped / total) * 100) || 0
+            readCount: Math.round((this.statCounts.readCount / total) * 10000) / 100 || 0,
+            ok: Math.round((this.statCounts.statBlock.ok / total) * 10000) / 100 || 0,
+            error: Math.round((this.statCounts.statBlock.error / total) * 10000) / 100 || 0,
+            missing: Math.round((this.statCounts.statBlock.missing / total) * 10000) / 100 || 0,
+            warnings: Math.round((this.statCounts.statBlock.warnings / total) * 10000) / 100 || 0,
+            deviceIdChange: Math.round((this.statCounts.statBlock.deviceIdChange / total) * 10000) / 100 || 0,
+            deviceIdConflict: Math.round((this.statCounts.statBlock.deviceIdConflict / total) * 10000) / 100 || 0,
+            unmapped: Math.round((this.statCounts.statBlock.unmapped / total) * 10000) / 100 || 0
           };
         },
         computed: {