feat: detect and handle peer drop on active connections

src-tauri/Cargo.toml

@@ -44,7 +44,7 @@ sqlx = { version = "0.8", features = [
 ] }
 struct-patch = "0.4"
 strum = { version = "0.26", features = ["derive"] }
-tauri = { version = "1.8", features = [
+tauri = { version = "1.8", features = [ "notification-all",
   "dialog-all",
   "clipboard-all",
   "http-all",

src-tauri/src/bin/defguard-client.rs

@@ -28,7 +28,7 @@ use defguard_client::{
     database::{self, models::settings::Settings},
     enterprise::periodic::config::poll_config,
     events::SINGLE_INSTANCE,
-    periodic::version::poll_version,
+    periodic::{connection::verify_active_connections, version::poll_version},
     service,
     tray::{configure_tray_icon, handle_tray_event, reload_tray_menu},
     utils::load_log_targets,
@@ -53,7 +53,7 @@ extern crate log;
 
 // for tauri log plugin
 const LOG_TARGETS: [LogTarget; 2] = [LogTarget::Stdout, LogTarget::LogDir];
-const LOG_FILTER: [&str; 5] = ["tauri", "sqlx", "hyper", "h2", "tower"];
+const LOG_FILTER: [&str; 6] = ["tauri", "sqlx", "hyper", "h2", "tower", "webview"];
 
 lazy_static! {
     static ref LOG_INCLUDES: Vec<String> = load_log_targets();
@@ -253,6 +253,7 @@ async fn main() {
     debug!("Starting periodic tasks (config and version polling)...");
     tauri::async_runtime::spawn(poll_version(app_handle.clone()));
     tauri::async_runtime::spawn(poll_config(app_handle.clone()));
+    tauri::async_runtime::spawn(verify_active_connections(app_handle.clone()));
     debug!("Periodic tasks have been started");
 
     // load tray menu after database initialization to show all instance and locations

src-tauri/src/commands.rs

@@ -141,7 +141,6 @@ pub async fn disconnect(
                 }
             };
         }
-
         info!("Disconnected from {connection_type} {name}(ID: {location_id})");
         Ok(())
     } else {
@@ -629,7 +628,7 @@ impl DateTimeAggregation {
     }
 }
 
-fn get_aggregation(from: NaiveDateTime) -> Result<DateTimeAggregation, Error> {
+pub fn get_aggregation(from: NaiveDateTime) -> Result<DateTimeAggregation, Error> {
     // Use hourly aggregation for longer periods
     let aggregation = match Utc::now().naive_utc() - from {
         duration if duration >= Duration::hours(8) => Ok(DateTimeAggregation::Hour),
@@ -658,6 +657,7 @@ pub async fn location_stats(
             location_id,
             &from,
             &aggregation,
+            None,
         )
         .await?
         .into_iter()

src-tauri/src/database/models/location_stats.rs

@@ -14,13 +14,13 @@ use crate::{
 #[derive(Debug, Serialize, Deserialize)]
 pub struct LocationStats<I = NoId> {
     id: I,
-    location_id: Id,
+    pub(crate) location_id: Id,
     upload: i64,
     download: i64,
-    last_handshake: i64,
+    pub(crate) last_handshake: i64,
     collected_at: NaiveDateTime,
     listen_port: u32,
-    persistent_keepalive_interval: Option<u16>,
+    pub(crate) persistent_keepalive_interval: Option<u16>,
 }
 
 impl From<LocationStats<Id>> for CommonLocationStats<Id> {
@@ -138,11 +138,13 @@ impl LocationStats<Id> {
         location_id: Id,
         from: &NaiveDateTime,
         aggregation: &DateTimeAggregation,
+        limit: Option<i32>,
     ) -> Result<Vec<Self>, Error>
     where
         E: SqliteExecutor<'e>,
     {
         let aggregation = aggregation.fstring();
+        let query_limit = limit.unwrap_or(-1);
         let stats = query_as!(
             LocationStats,
             "WITH cte AS ( \
@@ -165,10 +167,12 @@ impl LocationStats<Id> {
             	persistent_keepalive_interval \"persistent_keepalive_interval?: u16\" \
             FROM cte \
             WHERE location_id = $2 AND collected_at >= $3 \
-            GROUP BY collected_at ORDER BY collected_at",
+            GROUP BY collected_at ORDER BY collected_at \
+            LIMIT $4",
             aggregation,
             location_id,
-            from
+            from,
+            query_limit
         )
         .fetch_all(executor)
         .await?;

src-tauri/src/database/models/tunnel.rs

@@ -242,13 +242,13 @@ impl Tunnel<NoId> {
 #[derive(Debug, Serialize, Deserialize)]
 pub struct TunnelStats<I = NoId> {
     id: I,
-    tunnel_id: Id,
+    pub tunnel_id: Id,
     upload: i64,
     download: i64,
-    last_handshake: i64,
+    pub last_handshake: i64,
     collected_at: NaiveDateTime,
     listen_port: u32,
-    persistent_keepalive_interval: Option<u16>,
+    pub persistent_keepalive_interval: Option<u16>,
 }
 
 impl TunnelStats {

src-tauri/src/events.rs

@@ -4,3 +4,4 @@ pub static INSTANCE_UPDATE: &str = "instance-update";
 pub static LOCATION_UPDATE: &str = "location-update";
 pub static APP_VERSION_FETCH: &str = "app-version-fetch";
 pub static CONFIG_CHANGED: &str = "config-changed";
+pub static DEAD_CONNECTION_DROPPED: &str = "dead-connection-dropped";