feat: add --interactive-expire option for configurable aircraft display timeout

Author: xoolive

crates/jet1090/src/main.rs

@@ -74,6 +74,18 @@ struct Options {
     #[arg(long, conflicts_with = "history_expire")]
     no_history_expire: Option<bool>,
 
+    /// How long to keep aircraft visible in interactive mode (in seconds), 0 for no expiration
+    #[arg(
+        long,
+        default_value = "30",
+        conflicts_with = "no_interactive_expire"
+    )]
+    interactive_expire: Option<u64>,
+
+    /// Disable interactive mode aircraft expiration
+    #[arg(long, conflicts_with = "interactive_expire")]
+    no_interactive_expire: Option<bool>,
+
     /// Downlink formats to select for stdout, file output and history in REST API (keep empty to select all)
     #[arg(long, value_name = "DF")]
     df_filter: Option<Vec<u16>>,
@@ -194,6 +206,17 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             options.history_expire = Some(history_expire);
         }
     }
+    if cli_options.no_interactive_expire.is_some_and(|x| x) {
+        options.interactive_expire = Some(0);
+    } else if let Some(interactive_expire) = cli_options.interactive_expire {
+        if interactive_expire == 30
+            && cli_options.no_interactive_expire.is_some_and(|x| x)
+        {
+            options.interactive_expire = Some(0);
+        } else {
+            options.interactive_expire = Some(interactive_expire);
+        }
+    }
     if cli_options.df_filter.is_some() {
         options.df_filter = cli_options.df_filter;
     }
@@ -341,6 +364,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         width,
         is_search_mode: false,
         search_query: "".to_string(),
+        interactive_expire: options.interactive_expire.unwrap_or(30),
     }));
     let app_dec = app_tui.clone();
     let app_web = app_tui.clone();
@@ -583,6 +607,7 @@ pub struct Jet1090 {
     width: u16,
     is_search_mode: bool,
     search_query: String,
+    interactive_expire: u64,
 }
 
 #[derive(Debug, Default, PartialEq)]

crates/jet1090/src/source.rs

@@ -11,15 +11,15 @@ use rs1090::source::sero;
 #[cfg(feature = "ssh")]
 use rs1090::source::ssh::{TunnelledTcp, TunnelledWebsocket};
 
-#[cfg(feature = "sdr")]
-use desperado::IqAsyncSource;
 #[cfg(feature = "pluto")]
 use desperado::pluto::PlutoConfig;
 #[cfg(feature = "rtlsdr")]
 use desperado::rtlsdr::{DeviceSelector, RtlSdrConfig};
 #[cfg(feature = "soapy")]
 use desperado::soapy::SoapyConfig;
 #[cfg(feature = "sdr")]
+use desperado::IqAsyncSource;
+#[cfg(feature = "sdr")]
 use desperado::{DeviceConfig, Gain};
 use serde::{Deserialize, Serialize};
 use tokio::sync::mpsc::Sender;

crates/jet1090/src/table.rs

@@ -25,6 +25,9 @@ pub fn build_table(frame: &mut Frame, app: &mut Jet1090) {
 
     let states = &app.state_vectors;
 
+    // Get the interactive expire threshold (0 means no expiration)
+    let interactive_expire = app.interactive_expire;
+
     // Filter items based on search query
     let search_query = app.search_query.to_lowercase().replace("-", "");
     let search_regex =
@@ -33,8 +36,8 @@ pub fn build_table(frame: &mut Frame, app: &mut Jet1090) {
         .values()
         .filter(|sv| {
             (sv.cur.count > 1)
-                    // Only show aircraft seen in the last 30 seconds
-                    && (now as i64 - sv.cur.lastseen as i64) < 30
+                    // Only show aircraft seen within the expiration threshold (or always if 0)
+                    && (interactive_expire == 0 || (now as i64 - sv.cur.lastseen as i64) < interactive_expire as i64)
                     && (sv.cur.callsign.as_ref().is_some_and(|s| {
                         search_regex.is_match(&s.to_lowercase())
                     }) || search_regex
@@ -203,8 +206,12 @@ pub fn build_table(frame: &mut Frame, app: &mut Jet1090) {
     };
     let rows = sorted_elts
         .iter()
-        // Only show aircraft seen in the last 30 seconds
-        .filter(|sv| (now as i64 - sv.cur.lastseen as i64) < 30)
+        // Only show aircraft seen within the expiration threshold (or always if 0)
+        .filter(|sv| {
+            interactive_expire == 0
+                || (now as i64 - sv.cur.lastseen as i64)
+                    < interactive_expire as i64
+        })
         .enumerate()
         .map(|(i, sv)| {
             let color = match i % 2 {