The VIP editor put routing and traffic observations in a dense text block, while nested layouts in the devices grid could let text escape its row. Separate the VIP overview from configuration and draw both live tables with explicit cell bounds, font-aware row heights, clipping and horizontal overflow. Measure columns before painting and keep widths stable as live values change. The overview reuses the existing traffic sparklines for service totals and individual listener backends, with TX/RX rates, health, RTT, open flows and counters. Retain bounded histories by service/listener/backend identity and release them when their resources disappear. Recreated listeners start fresh. Use egui 0.31 Scene and Painter for a pannable, zoomable routing diagram with Fit, clickable backend details and linked table selection. Highlight recent counter growth separately from the backend selected for new connections; idle bindings alone do not imply traffic, and stale activity expires. Draw legend markers directly rather than depending on optional font glyphs. The overview only reads saved observations; edits and deletion still require Save. No dependencies, wire formats, IPC or persistent schemas change. Validation on Linux through nix develop: - cargo fmt --all -- --check - cargo clippy --locked --workspace --all-targets -- -D warnings - cargo test --locked --workspace --all-targets: 566 passed, 3 ignored - cargo build --locked -p tsunagi-tray The inherited TSUNAGI_CONTROL_SOCKET was unset for Clippy and tests. Seven new GUI tests cover enlarged fonts, mixed online/offline rows, long names, large counters, narrow/wide layouts, scene clicks, traffic selection, stale samples, counter resets, listener recreation and history cleanup. The first enlarged-font regression exposed an override-font height mismatch; row sizing now resolves the actual selected font and the regression passes. A disposable fixture preview rendered successfully with software OpenGL on an isolated Xvfb display. Initial Xvfb attempts needed explicit xkbcommon and OpenGL runtime paths in the Nix environment. The preview never contacted an agent; its temporary source was removed. macOS, Windows, Wayland and live host TUN traffic were not exercised by this UI change.
213 lines
7.5 KiB
Rust
213 lines
7.5 KiB
Rust
//! The eframe application behind the window: the main view, the per-network
|
|
//! devices windows, and the agent worker.
|
|
//!
|
|
//! It runs in its own process, started by the tray when the user chooses Open
|
|
//! and gone when the window is closed. The tray, which has to outlive the
|
|
//! window, lives in the other process; see [`crate::tray`].
|
|
|
|
use std::time::Duration;
|
|
|
|
use eframe::egui;
|
|
|
|
use crate::about;
|
|
use crate::agent::AgentClient;
|
|
use crate::devices;
|
|
use crate::stats::Traffic;
|
|
use crate::ui::{self, UiState};
|
|
|
|
fn app_fonts() -> egui::FontDefinitions {
|
|
let mut fonts = egui::FontDefinitions::default();
|
|
egui_phosphor::add_to_fonts(&mut fonts, egui_phosphor::Variant::Regular);
|
|
fonts
|
|
}
|
|
|
|
/// The window's state.
|
|
pub(crate) struct App {
|
|
agent: AgentClient,
|
|
state: UiState,
|
|
/// Traffic rates derived from successive snapshots.
|
|
traffic: Traffic,
|
|
/// The snapshot generation last folded into `traffic`.
|
|
sampled: u64,
|
|
}
|
|
|
|
impl App {
|
|
/// Builds the app: resolves the socket and starts the worker.
|
|
pub(crate) fn new(
|
|
cc: &eframe::CreationContext<'_>,
|
|
runtime: tokio::runtime::Handle,
|
|
) -> Result<Self, String> {
|
|
let ctx = cc.egui_ctx.clone();
|
|
// Add the Phosphor icon glyphs to the font set so the icon buttons
|
|
// render instead of showing as tofu.
|
|
ctx.set_fonts(app_fonts());
|
|
|
|
let agent = AgentClient::spawn(&runtime, ctx);
|
|
Ok(Self {
|
|
agent,
|
|
state: UiState::default(),
|
|
traffic: Traffic::default(),
|
|
sampled: 0,
|
|
})
|
|
}
|
|
}
|
|
|
|
impl eframe::App for App {
|
|
fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
|
|
let snapshot = self.agent.snapshot();
|
|
if snapshot.generation != self.sampled
|
|
&& let (Some(Ok(report)), Some(at)) = (&snapshot.status, snapshot.at)
|
|
{
|
|
self.traffic.observe(report, at);
|
|
self.sampled = snapshot.generation;
|
|
}
|
|
|
|
ui::draw(ctx, &self.agent, &mut self.state, &snapshot, &self.traffic);
|
|
self.show_devices_windows(ctx, &snapshot);
|
|
self.show_vip_windows(ctx, &snapshot);
|
|
self.show_about_window(ctx, &snapshot);
|
|
|
|
// A secret the worker fetched for the clipboard: copy it here, on the
|
|
// UI thread that owns the clipboard, exactly once.
|
|
if let Some(secret) = self.agent.take_pending_copy() {
|
|
ctx.copy_text(secret);
|
|
}
|
|
|
|
// Keep ticking so fresh status is picked up.
|
|
ctx.request_repaint_after(Duration::from_millis(500));
|
|
}
|
|
}
|
|
|
|
impl App {
|
|
fn show_vip_windows(&mut self, ctx: &egui::Context, snapshot: &crate::agent::Snapshot) {
|
|
let Some(Ok(report)) = &snapshot.status else {
|
|
return;
|
|
};
|
|
let ids: Vec<_> = self.state.vip_windows.keys().cloned().collect();
|
|
for id in ids {
|
|
let Some(network) = report.networks.iter().find(|n| n.network_id == id) else {
|
|
self.state.vip_windows.remove(&id);
|
|
continue;
|
|
};
|
|
let Some(state) = self.state.vip_windows.get_mut(&id) else {
|
|
continue;
|
|
};
|
|
let builder = egui::ViewportBuilder::default()
|
|
.with_title(format!("tsunagi · VIP · {}", network.name))
|
|
.with_app_id(crate::icon::APP_ID)
|
|
.with_icon(crate::icon::window())
|
|
.with_inner_size([1280., 860.])
|
|
.with_min_inner_size([650., 400.]);
|
|
let keep = ctx.show_viewport_immediate(
|
|
egui::ViewportId::from_hash_of(("vip", &id)),
|
|
builder,
|
|
|vctx, _| {
|
|
let close = crate::vip::show(vctx, &self.agent, state, network, snapshot);
|
|
if close {
|
|
return false;
|
|
}
|
|
if vctx.input(|i| i.viewport().close_requested()) {
|
|
if state.dirty() {
|
|
state.request_close();
|
|
vctx.send_viewport_cmd(egui::ViewportCommand::CancelClose);
|
|
true
|
|
} else {
|
|
false
|
|
}
|
|
} else {
|
|
true
|
|
}
|
|
},
|
|
);
|
|
if !keep {
|
|
self.state.vip_windows.remove(&id);
|
|
}
|
|
}
|
|
}
|
|
/// Renders the About window while it is open.
|
|
fn show_about_window(&mut self, ctx: &egui::Context, snapshot: &crate::agent::Snapshot) {
|
|
if !self.state.about_open {
|
|
return;
|
|
}
|
|
let builder = egui::ViewportBuilder::default()
|
|
.with_title("About tsunagi")
|
|
.with_app_id(crate::icon::APP_ID)
|
|
.with_icon(crate::icon::window())
|
|
.with_inner_size([560.0, 520.0])
|
|
.with_min_inner_size([380.0, 280.0]);
|
|
let socket = self.agent.socket();
|
|
let keep = ctx.show_viewport_immediate(
|
|
egui::ViewportId::from_hash_of("about"),
|
|
builder,
|
|
|vctx, _class| {
|
|
about::show(vctx, &socket, snapshot);
|
|
!vctx.input(|i| i.viewport().close_requested())
|
|
},
|
|
);
|
|
if !keep {
|
|
self.state.about_open = false;
|
|
}
|
|
}
|
|
|
|
/// Renders one separate window per open network-devices view.
|
|
fn show_devices_windows(&mut self, ctx: &egui::Context, snapshot: &crate::agent::Snapshot) {
|
|
let Some(Ok(report)) = &snapshot.status else {
|
|
return;
|
|
};
|
|
let open: Vec<String> = self.state.open_devices.iter().cloned().collect();
|
|
for id in open {
|
|
let Some(network) = report.networks.iter().find(|n| n.network_id == id) else {
|
|
// The network is gone (left/forgotten); close its window.
|
|
self.state.open_devices.remove(&id);
|
|
continue;
|
|
};
|
|
let viewport_id = egui::ViewportId::from_hash_of(("devices", &id));
|
|
let builder = egui::ViewportBuilder::default()
|
|
.with_title(devices::title(network))
|
|
.with_app_id(crate::icon::APP_ID)
|
|
.with_icon(crate::icon::window())
|
|
.with_inner_size([1440.0, 640.0])
|
|
.with_min_inner_size([800.0, 400.0]);
|
|
let agent = &self.agent;
|
|
let traffic = &self.traffic;
|
|
// The window shares the single unit setting, so its toggle and the
|
|
// main window's stay in step.
|
|
let unit = &mut self.state.unit;
|
|
let confirm = &mut self.state.exit_confirm;
|
|
let forget_confirm = &mut self.state.forget_confirm;
|
|
let keep = ctx.show_viewport_immediate(viewport_id, builder, |vctx, _class| {
|
|
devices::show(
|
|
vctx,
|
|
agent,
|
|
unit,
|
|
(confirm, forget_confirm),
|
|
network,
|
|
&report.endpoint_id,
|
|
traffic,
|
|
);
|
|
!vctx.input(|i| i.viewport().close_requested())
|
|
});
|
|
if !keep {
|
|
self.state.open_devices.remove(&id);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn route_icons_have_an_embedded_font_in_the_app() {
|
|
let fonts = app_fonts();
|
|
assert!(fonts.font_data.contains_key("phosphor"));
|
|
assert!(
|
|
fonts
|
|
.families
|
|
.get(&egui::FontFamily::Proportional)
|
|
.is_some_and(|family| family.iter().any(|name| name == "phosphor"))
|
|
);
|
|
}
|
|
}
|