@bitpoolos/edge-bacnet 1.6.0 → 1.6.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.6.1] - 14-04-2025
+
+Bug fixes: 
+  - Inspector stats were calculating incorrectly in certain scenarios
+  - Inspector downloaded HTML files had incorrect stat percentages
+  - Inspector Last_Polled_Time stat was always "UNKNOWN", now shows correct date time.
+
+Minor updates: 
+  - Inspector BACnet main stats now output on msg.type = getBacnetStats inject. Can be set on a scheduled inject. 
+  - Updated Examples with Inspector
+
+
 ## [1.6.0] - 09-04-2025
 
 New features:

package/bacnet_inspector.js

@@ -115,10 +115,6 @@ module.exports = function (RED) {
     this.batchInterval = setInterval(processBatch, BATCH_PROCESS_INTERVAL);
     this.syncInterval = setInterval(syncWithFlowContext, SYNC_INTERVAL);
 
-    const debouncedGetBacnetStats = debounce((node, context, msg) => {
-      getModelStats();
-    }, 3000);
-
     // Function to sync cache to flow context
     function syncWithFlowContext() {
       const flow = context.flow;
@@ -187,7 +183,7 @@ module.exports = function (RED) {
 
     node.on("input", function (msg, send, done) {
       if (msg.type === "getBacnetStats") {
-        processMessage(msg, send, done);
+        getPublishedPointsList();
       } else if (msg.type === "Read") {
         calculateCombinedReadList(node, msg);
         if (done) done();
@@ -197,7 +193,6 @@ module.exports = function (RED) {
         if (done) done();
       } else if (msg.payload && msg.topic) {
         //regular bacnet output
-        debouncedGetBacnetStats(node, context, msg);
         // Queue the message for batch processing instead of immediate processing
         messageQueue.push({ msg, send, done });
         if (messageQueue.length >= MAX_BATCH_SIZE) {
@@ -218,6 +213,7 @@ module.exports = function (RED) {
           }
           if (done) done();
         });
+
       } else if (msg.reset === true) {
         node.status({ text: "Resetting..." });
 
@@ -249,17 +245,6 @@ module.exports = function (RED) {
       }
     });
 
-    // Process individual messages that shouldn't be batched
-    function processMessage(msg, send, done) {
-      try {
-        getBacnetStats(node, context, msg);
-        if (done) done();
-      } catch (error) {
-        console.error("Error processing message:", error);
-        if (done) done(error);
-      }
-    }
-
     // Process a batch of messages efficiently
     function processBatch() {
       if (messageQueue.length === 0) return;
@@ -293,6 +278,10 @@ module.exports = function (RED) {
 
       // Use cached data instead of flow context
       const now = new Date();
+      const flow = context.flow;
+
+      // Set the last point pushed time
+      flow.set("Last_Point_Pushed_Time", now.toISOString());
 
       // Process all messages in the batch
       messages.forEach((msg) => {
@@ -449,6 +438,13 @@ module.exports = function (RED) {
 
       // Update the node status
       node.status({ text: "Points Online: " + cachedData.onlineCount + "/" + cachedData.totalUniquePolledCount });
+
+      // Periodically call getModelStats to keep model stats updated
+      // Use a debounce pattern to avoid calling it too frequently
+      if (!processBatchData.lastModelStatsUpdate || (now - processBatchData.lastModelStatsUpdate) > 3000) {
+        getModelStats();
+        processBatchData.lastModelStatsUpdate = now;
+      }
     }
 
     //API Request Handlers Start
@@ -925,146 +921,6 @@ module.exports = function (RED) {
       return msg;
     }
 
-    //calculates bacnet stats on correctly injected msg to inspector node
-    //fired on every valid bacnet output
-    function getBacnetStats(node, context, msg) {
-      let flow = context.flow;
-      let now = new Date(); // Create a new Date object
-
-      // Initialize or retrieve the current list of unique topics and the count from the context context
-      let uniqueTopics = flow.get("uniqueReadTopics") || [];
-      let topicStatusMap = flow.get("topicStatusMap") || {}; // Store status per topic
-      let topicDataMap = flow.get("topicDataMap") || {}; // Store presentValue, timestamp, and last value change time per topic
-      let totalUniqueCount = flow.get("totalUniquePolledCount") || 0;
-      let onlineCount = flow.get("onlineCount") || 0;
-      let offlineCount = flow.get("offlineCount") || 0;
-
-      flow.set("site_Name", node.siteName);
-
-      // Calculate the IP address of the edge device
-      var IP_Add = getIPAddresses(); // Get the IP address of the current device
-      var IP_Str = "NA";
-      if (IP_Add[0]) {
-        IP_Str = IP_Add[0].replace(/\./g, "");
-      } // If an IP address of the first network adapter exists remove the full stops
-
-      // Get the current message's topic, status, presentValue, and timestamp
-      let topic = msg.topic;
-      let status = msg.payload.status;
-      let error = msg.payload.error;
-      let presentValue = msg.payload.presentValue;
-      let timestamp = msg.payload.timestamp;
-
-      // Extract properties only if they exist
-      let deviceID = msg.payload.meta?.device?.deviceId;
-      let objectType = msg.payload.meta?.objectId?.type;
-      let objectInstance = msg.payload.meta?.objectId?.instance;
-      let pointName = msg.payload?.objectName;
-
-      if (pointName !== undefined) {
-        pointName = pointName + "_" + getObjectType(objectType) + "_" + objectInstance;
-      }
-
-      let displayName = msg.payload?.displayName;
-      let deviceName = msg.payload.meta?.device?.deviceName;
-
-      let ipAddress =
-        typeof msg.payload.meta?.device?.address === "object"
-          ? msg.payload.meta.device.address.address
-          : msg.payload.meta?.device?.address;
-
-      // Only proceed if the status key exists
-      if (status !== undefined) {
-        // Check if the topic is already in the unique topics list
-        if (!uniqueTopics.includes(topic)) {
-          uniqueTopics.push(topic);
-          totalUniqueCount++;
-        }
-
-        // Update the status in the topicStatusMap
-        if (topicStatusMap[topic] !== status) {
-          // Adjust counts based on the previous status
-          if (topicStatusMap[topic] === "online") {
-            onlineCount--;
-          } else if (topicStatusMap[topic] === "offline") {
-            offlineCount--;
-          }
-
-          // Update with the new status
-          topicStatusMap[topic] = status;
-
-          // Adjust counts based on the new status
-          if (status === "online") {
-            onlineCount++;
-          } else if (status === "offline") {
-            offlineCount++;
-          }
-        }
-
-        // Create an entry in the data map if it doesn't already exist
-        if (!topicDataMap[topic]) {
-          topicDataMap[topic] = {
-            presentValue: presentValue,
-            status: status,
-            bacnetLastSeen: timestamp,
-            lastCOVTime: now.getTime(), // Initialize last value change time
-          };
-
-          // Add properties conditionally if they exist or are explicitly set to 0
-          if (deviceID !== undefined) topicDataMap[topic].deviceID = deviceID;
-          if (objectType !== undefined) topicDataMap[topic].objectType = objectType;
-          if (objectInstance !== undefined) topicDataMap[topic].objectInstance = objectInstance;
-          if (pointName !== undefined) topicDataMap[topic].pointName = pointName;
-          if (displayName !== undefined) topicDataMap[topic].displayName = displayName;
-          if (deviceName !== undefined) topicDataMap[topic].deviceName = deviceName;
-          if (ipAddress !== undefined) topicDataMap[topic].ipAddress = ipAddress;
-          if (error !== undefined) topicDataMap[topic].error = error;
-          topicDataMap[topic].key =
-            topicDataMap[topic].deviceID + ":" + topicDataMap[topic].objectType + ":" + topicDataMap[topic].objectInstance;
-        } else {
-          // If the entry already exists
-
-          if (presentValue != topicDataMap[topic].presentValue) {
-            // If the present value has changed
-            topicDataMap[topic].lastCOVTime = now.getTime(); // Update last value change time
-          }
-
-          topicDataMap[topic].presentValue = presentValue; // Update the existing timestamp and present value
-          topicDataMap[topic].bacnetLastSeen = timestamp; // Update timestamp
-
-          // Update properties conditionally if they exist or are explicitly set to 0
-          if (deviceID !== undefined) topicDataMap[topic].deviceID = deviceID;
-          if (objectType !== undefined) topicDataMap[topic].objectType = objectType;
-          if (objectInstance !== undefined) topicDataMap[topic].objectInstance = objectInstance;
-          if (pointName !== undefined) topicDataMap[topic].pointName = pointName;
-          if (displayName !== undefined) topicDataMap[topic].displayName = displayName;
-          if (deviceName !== undefined) topicDataMap[topic].deviceName = deviceName;
-          if (ipAddress !== undefined) topicDataMap[topic].ipAddress = ipAddress;
-          if (error !== undefined) topicDataMap[topic].error = error;
-          topicDataMap[topic].key =
-            topicDataMap[topic].deviceID + ":" + topicDataMap[topic].objectType + ":" + topicDataMap[topic].objectInstance;
-        }
-      } else {
-        node.warn("Status key is missing for topic: " + topic);
-      }
-
-      let offlinePercentage = (offlineCount / (onlineCount + offlineCount)) * 100;
-
-      node.statBlock.offlinePercentage = offlinePercentage;
-
-      // Store the updated unique topics, status map, topic data map, and counts back in the context context
-      flow.set("uniqueTopics", uniqueTopics);
-      flow.set("topicStatusMap", topicStatusMap);
-      flow.set("topicDataMap", topicDataMap);
-      flow.set("totalUniquePolledCount", totalUniqueCount);
-      flow.set("onlineCount", onlineCount);
-      flow.set("offlineCount", offlineCount);
-      flow.set("offlinePercentage", offlinePercentage);
-
-      // Update the node status
-      node.status({ text: "Points Online: " + onlineCount + "/" + totalUniqueCount });
-    }
-
     function makeGetRequest(route) {
       return new Promise((resolve, reject) => {
         try {

package/bacnet_inspector_worker.js

@@ -367,7 +367,7 @@ function processModelStats(data) {
   }
 
   // Update statBlock
-  statBlock.missing = pointMatchDiscoveryNotPublishingCount;
+  statBlock.missing = pointNotInDiscoveryCount;
   statBlock.warnings = pointMatchDiscoveryNotPublishingCount;
   statBlock.unmapped = unmappedCount;
 

package/examples/1-Discover-Read.json

@@ -1 +1,170 @@
-[{"id":"a19aaf3c40f060de","type":"Bacnet-Gateway","z":"1bc98a48ab9b3af5","name":"","local_device_address":"","apduTimeout":6000,"roundDecimal":2,"local_device_port":47808,"apduSize":"5","maxSegments":"0x50","retries":"5","broadCastAddr":"255.255.255.255","toLogIam":true,"discover_polling_schedule":"120","discover_polling_schedule_value":"2","discover_polling_schedule_options":"Minutes","device_id_range_enabled":false,"device_id_range_start":"","device_id_range_end":"","deviceId":"817001","manual_instance_range_enabled":false,"manual_instance_range_start":"","manual_instance_range_end":"","logErrorToConsole":false,"serverEnabled":false,"device_read_schedule":"60","device_read_schedule_value":"1","device_read_schedule_options":"Minutes","x":660,"y":420,"wires":[["9d8b6ea1f9d11977"]]},{"id":"3e5f5a6efe7bf8cd","type":"Bitpool-Inject","z":"1bc98a48ab9b3af5","name":"Discover","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"","payloadType":"date","doPoll":false,"doDiscover":true,"x":480,"y":420,"wires":[["a19aaf3c40f060de"]]},{"id":"1774359e5a636b58","type":"Bitpool-Inject","z":"1bc98a48ab9b3af5","name":"Poll","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"","payloadType":"date","doPoll":true,"doDiscover":false,"x":310,"y":360,"wires":[["bfec7e0b535bef97"]]},{"id":"9d8b6ea1f9d11977","type":"debug","z":"1bc98a48ab9b3af5","name":"debug 1","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","statusVal":"","statusType":"auto","x":840,"y":420,"wires":[]},{"id":"bfec7e0b535bef97","type":"Bacnet-Discovery","z":"1bc98a48ab9b3af5","name":"","events":true,"json":false,"mqtt":true,"hiddenDeployToggle":false,"prevHiddenToggleState":false,"roundDecimal":2,"pointsToRead":{},"readDevices":[],"object_property_simplePayload":true,"object_property_fullObject":false,"x":490,"y":360,"wires":[["a19aaf3c40f060de"]]}]
+[
+  {
+    "id": "ba92a36a18ffdfac",
+    "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": false,
+    "sanitise_device_schedule": "3600",
+    "sanitise_device_schedule_value": "1",
+    "sanitise_device_schedule_options": "Hours",
+    "x": 800,
+    "y": 460,
+    "wires": [
+      [
+        "0688901dadf6d984"
+      ]
+    ]
+  },
+  {
+    "id": "c404d53530d50ce9",
+    "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": 630,
+    "y": 400,
+    "wires": [
+      [
+        "ba92a36a18ffdfac"
+      ]
+    ]
+  },
+  {
+    "id": "d89267e068e24882",
+    "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": 470,
+    "y": 400,
+    "wires": [
+      [
+        "c404d53530d50ce9"
+      ]
+    ]
+  },
+  {
+    "id": "5f5537b37018ec25",
+    "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": 620,
+    "y": 460,
+    "wires": [
+      [
+        "ba92a36a18ffdfac"
+      ]
+    ]
+  },
+  {
+    "id": "0688901dadf6d984",
+    "type": "debug",
+    "z": "f1fc21f44027188c",
+    "name": "debug 1",
+    "active": true,
+    "tosidebar": true,
+    "console": false,
+    "tostatus": false,
+    "complete": "false",
+    "statusVal": "",
+    "statusType": "auto",
+    "x": 1000,
+    "y": 460,
+    "wires": []
+  }
+]

package/examples/2-Discover-Write.json

@@ -1 +1,164 @@
-[{"id":"e478e80571442399","type":"Bacnet-Gateway","z":"1bc98a48ab9b3af5","name":"","local_device_address":"","apduTimeout":6000,"roundDecimal":2,"local_device_port":47808,"apduSize":"5","maxSegments":"0x50","retries":"5","broadCastAddr":"255.255.255.255","toLogIam":true,"discover_polling_schedule":"60","discover_polling_schedule_value":"1","discover_polling_schedule_options":"Minutes","device_id_range_enabled":false,"device_id_range_start":"","device_id_range_end":"","deviceId":"817001","manual_instance_range_enabled":false,"manual_instance_range_start":"","manual_instance_range_end":"","logErrorToConsole":false,"serverEnabled":false,"device_read_schedule":"60","device_read_schedule_value":"1","device_read_schedule_options":"Minutes","x":700,"y":320,"wires":[["0313b7ee1cfa6b42"]]},{"id":"c2e012301c4a6af4","type":"Bitpool-Inject","z":"1bc98a48ab9b3af5","name":"Discover","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"","payloadType":"date","doPoll":false,"doDiscover":true,"x":520,"y":320,"wires":[["e478e80571442399"]]},{"id":"8172620e7be7b505","type":"Bitpool-Inject","z":"1bc98a48ab9b3af5","name":"Poll","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"1","payloadType":"num","doPoll":true,"doDiscover":false,"x":370,"y":400,"wires":[["b3293195b7c5bd9d"]]},{"id":"0313b7ee1cfa6b42","type":"debug","z":"1bc98a48ab9b3af5","name":"debug 1","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","statusVal":"","statusType":"auto","x":880,"y":320,"wires":[]},{"id":"b3293195b7c5bd9d","type":"Bacnet-Write","z":"1bc98a48ab9b3af5","name":"","applicationTag":"4","priority":"16","pointsToWrite":[],"writeDevices":[],"hiddenDeployToggle":false,"prevHiddenToggleState":false,"x":530,"y":400,"wires":[["e478e80571442399"]]}]
+[
+  {
+    "id": "25ee9078510fe398",
+    "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": 420,
+    "wires": [
+      [
+        "f41ef6737463370e"
+      ]
+    ]
+  },
+  {
+    "id": "0f90856ca1808ee7",
+    "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": 420,
+    "wires": [
+      [
+        "25ee9078510fe398"
+      ]
+    ]
+  },
+  {
+    "id": "c7f1aa7764f29aa1",
+    "type": "Bacnet-Write",
+    "z": "f1fc21f44027188c",
+    "name": "",
+    "applicationTag": "4",
+    "priority": "16",
+    "pointsToWrite": [],
+    "writeDevices": [],
+    "hiddenDeployToggle": false,
+    "prevHiddenToggleState": false,
+    "x": 670,
+    "y": 500,
+    "wires": [
+      [
+        "25ee9078510fe398"
+      ]
+    ]
+  },
+  {
+    "id": "c97fbed9db70de7f",
+    "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": 500,
+    "wires": [
+      [
+        "c7f1aa7764f29aa1"
+      ]
+    ]
+  },
+  {
+    "id": "f41ef6737463370e",
+    "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": 420,
+    "wires": []
+  }
+]

package/examples/3-Discover-Read-Write.json

@@ -1 +1,227 @@
-[{"id":"e6ef82c5497d2d12","type":"Bacnet-Gateway","z":"1bc98a48ab9b3af5","name":"","local_device_address":"","apduTimeout":6000,"roundDecimal":2,"local_device_port":47808,"apduSize":"5","maxSegments":"0x50","retries":"5","broadCastAddr":"255.255.255.255","toLogIam":true,"discover_polling_schedule":"60","discover_polling_schedule_value":"1","discover_polling_schedule_options":"Minutes","device_id_range_enabled":false,"device_id_range_start":"","device_id_range_end":"","deviceId":"817001","manual_instance_range_enabled":false,"manual_instance_range_start":"","manual_instance_range_end":"","logErrorToConsole":false,"serverEnabled":false,"device_read_schedule":"60","device_read_schedule_value":"1","device_read_schedule_options":"Minutes","x":740,"y":340,"wires":[["13c868a66ecd17df"]]},{"id":"4df39409775f724e","type":"Bitpool-Inject","z":"1bc98a48ab9b3af5","name":"Discover","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"","payloadType":"date","doPoll":false,"doDiscover":true,"x":560,"y":340,"wires":[["e6ef82c5497d2d12"]]},{"id":"67e4f714757a028e","type":"Bitpool-Inject","z":"1bc98a48ab9b3af5","name":"Poll","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"1","payloadType":"num","doPoll":true,"doDiscover":false,"x":410,"y":420,"wires":[["b8931cb1a1c69ffb"]]},{"id":"13c868a66ecd17df","type":"debug","z":"1bc98a48ab9b3af5","name":"debug 1","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","statusVal":"","statusType":"auto","x":920,"y":340,"wires":[]},{"id":"b8931cb1a1c69ffb","type":"Bacnet-Write","z":"1bc98a48ab9b3af5","name":"","applicationTag":"4","priority":"16","pointsToWrite":[],"writeDevices":[],"hiddenDeployToggle":false,"prevHiddenToggleState":false,"x":570,"y":420,"wires":[["e6ef82c5497d2d12"]]},{"id":"a95e261a4cc2662b","type":"Bitpool-Inject","z":"1bc98a48ab9b3af5","name":"Poll","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"","payloadType":"date","doPoll":true,"doDiscover":false,"x":410,"y":280,"wires":[["08df19608ade8576"]]},{"id":"08df19608ade8576","type":"Bacnet-Discovery","z":"1bc98a48ab9b3af5","name":"","events":true,"json":false,"mqtt":true,"hiddenDeployToggle":false,"prevHiddenToggleState":false,"roundDecimal":2,"pointsToRead":{},"readDevices":[],"object_property_simplePayload":true,"object_property_fullObject":false,"x":570,"y":280,"wires":[["e6ef82c5497d2d12"]]}]
+[
+  {
+    "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"
+      ]
+    ]
+  },
+  {
+    "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"
+      ]
+    ]
+  },
+  {
+    "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": "false",
+    "statusVal": "",
+    "statusType": "auto",
+    "x": 1040,
+    "y": 440,
+    "wires": []
+  }
+]

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>
@@ -244,6 +244,7 @@
           selectedColumns: [],
           statPercentages: {
             readCount: 0,
+            ok: 0,
             error: 0,
             missing: 0,
             warnings: 0,
@@ -288,6 +289,7 @@
             const total = tableData.length || 1; // Avoid division by zero
             app.statPercentages = {
               readCount: Math.round((data.statCounts.readCount / total) * 100),
+              ok: Math.round((data.statCounts.statBlock.ok / 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),
@@ -401,14 +403,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 +417,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.1",
   "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,
@@ -146,6 +147,7 @@ async function processPrimeVueHtml(appData) {
         const total = this.tableData.length || 1; // Avoid division by zero
         this.statPercentages = {
           readCount: Math.round((this.statCounts.readCount / total) * 100),
+          ok: Math.round((this.statCounts.statBlock.ok / 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),
@@ -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

@@ -475,4 +475,29 @@ 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;
 }

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,
@@ -278,6 +279,7 @@ async function generatePrimeVueAppHtmlStatic(appData, filename = "bacnet-inspect
           const total = this.tableData.length || 1; // Avoid division by zero
           this.statPercentages = {
             readCount: Math.round((this.statCounts.readCount / total) * 100) || 0,
+            ok: Math.round((this.statCounts.statBlock?.ok / 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,