Include shaped device and unknown IP counts in UI2 template.

src/rust/lqosd/src/node_manager/js_build/src/template.js

@@ -37,4 +37,13 @@ function initDayNightMode() {
     });
 }
 
-initDayNightMode();
+function getDeviceCounts() {
+    $.get("/local-api/deviceCount", (data) => {
+        console.log(data);
+        $("#shapedDeviceCount").text(data.shaped_devices);
+        $("#unknownIpCount").text(data.unknown_ips);
+    })
+}
+
+initDayNightMode();
+getDeviceCounts();

src/rust/lqosd/src/node_manager/local_api.rs

@@ -1,5 +1,6 @@
 mod dashboard_themes;
 mod version_check;
+mod device_counts;
 
 use axum::Router;
 use axum::routing::{get, post};
@@ -11,4 +12,5 @@ pub fn local_api() -> Router {
         .route("/dashletDelete", post(dashboard_themes::delete_theme))
         .route("/dashletGet", post(dashboard_themes::get_theme))
         .route("/versionCheck", get(version_check::version_check))
+        .route("/deviceCount", get(device_counts::count_users))
 }

src/rust/lqosd/src/node_manager/local_api/device_counts.rs

@@ -0,0 +1,42 @@
+use std::net::IpAddr;
+use axum::Json;
+use serde::Serialize;
+use lqos_bus::{bus_request, BusRequest, BusResponse, IpStats};
+use crate::shaped_devices_tracker::SHAPED_DEVICES;
+
+#[derive(Serialize)]
+pub struct DeviceCount {
+    pub shaped_devices: usize,
+    pub unknown_ips: usize,
+}
+
+fn unknown_device_count() -> usize {
+    if let BusResponse::AllUnknownIps(unknowns) = crate::throughput_tracker::all_unknown_ips() {
+        let cfg = SHAPED_DEVICES.read().unwrap();
+        let really_unknown: Vec<IpStats> = unknowns
+            .iter()
+            .filter(|ip| {
+                if let Ok(ip) = ip.ip_address.parse::<IpAddr>() {
+                    let lookup = match ip {
+                        IpAddr::V4(ip) => ip.to_ipv6_mapped(),
+                        IpAddr::V6(ip) => ip,
+                    };
+                    cfg.trie.longest_match(lookup).is_none()
+                } else {
+                    false
+                }
+            })
+            .cloned()
+            .collect();
+        return really_unknown.len();
+    }
+    
+    0
+}
+
+pub async fn count_users() -> Json<DeviceCount> {
+    Json(DeviceCount{
+        shaped_devices: SHAPED_DEVICES.read().unwrap().devices.len(),
+        unknown_ips: unknown_device_count(),
+    })
+}

src/rust/lqosd/src/node_manager/static2/template.html

@@ -56,13 +56,13 @@
                     <!-- Shaped Devices -->
                     <li class="nav-item">
                         <a class="nav-link">
-                            <i class="fa fa-user-circle nav-icon"></i> <span id="shapedDeviceCount" class="badge">0</span> Devices
+                            <i class="fa fa-user-circle nav-icon"></i> <span id="shapedDeviceCount" class="badge">?</span> Devices
                         </a>
                     </li>
                     <!-- Unknown IPs -->
                     <li class="nav-item">
                         <a class="nav-link">
-                            <i class="fa fa-address-card nav-icon"></i> <span id="unknownIpCount" class="badge">0</span> Unknown IP
+                            <i class="fa fa-address-card nav-icon"></i> <span id="unknownIpCount" class="badge">?</span> Unknown IP
                         </a>
                     </li>
                     <!-- Statistics -->