Improve shutdown behavior

- Flush messages to data channel when closing connection
- Show cursor in admin interface only on shutdown (fixes #36)
- Shutdown when trying to open admin interface in invalid context (fixes #35)

Author: EpicEric

CHANGELOG.md

@@ -5,10 +5,13 @@
 ### Fixed
 
 - Improve logic for SSH exec commands.
+- Flush messages to data channel when closing connection.
+- Show cursor in admin interface only on shutdown.
 
 ### Changed
 
 - Update dependencies.
+- **BREAKING**: Shutdown when trying to open admin interface in invalid context.
 
 ## 0.4.0 (2025-02-11)
 

Cargo.lock

@@ -22,6 +22,7 @@ chrono = "0.4.39"
 clap = { version = "4.5.30", features = ["derive", "string"] }
 crossterm = "0.28.1"
 dashmap = "6.1.0"
+enumflags2 = "0.7.11"
 env_logger = "0.11.6"
 hickory-resolver = "0.24.4"
 http = "1.2.0"

Cargo.toml

@@ -10,7 +10,7 @@ use human_bytes::human_bytes;
 use itertools::Itertools;
 use ratatui::{
     buffer::Buffer,
-    layout::{Constraint, Flex, Layout, Margin, Rect},
+    layout::{Constraint, Flex, Layout, Margin, Position, Rect},
     prelude::CrosstermBackend,
     style::{Color, Modifier, Style, Stylize},
     symbols::border,
@@ -140,6 +140,8 @@ enum AdminPrompt {
 struct AdminState {
     // Reference to the server for collecting data and interacting with user keys.
     server: Arc<SandholeServer>,
+    // Whether data should be rendered to the terminal.
+    enabled: bool,
     // Whether this is rendered in a pseudo-terminal or not.
     is_pty: bool,
     // Currently selected tab.
@@ -568,6 +570,7 @@ impl AdminInterface {
             terminal: Terminal::with_options(backend, options).unwrap(),
             state: AdminState {
                 server,
+                enabled: true,
                 tab: TabData { tabs, current: 0 },
                 is_pty: false,
                 table_state: Default::default(),
@@ -582,14 +585,17 @@ impl AdminInterface {
                 {
                     let mut interface = interface.lock().unwrap();
                     let AdminTerminal { terminal, state } = interface.deref_mut();
-                    terminal
-                        .draw(|frame| {
-                            // Render the terminal
-                            state.render(frame.area(), frame.buffer_mut());
-                            // Update the cursor position (avoids cursor from disappearing on disconnect)
-                            frame.set_cursor_position((0, 0));
-                        })
-                        .unwrap();
+                    if state.enabled {
+                        if terminal
+                            .draw(|frame| {
+                                // Render the terminal
+                                state.render(frame.area(), frame.buffer_mut());
+                            })
+                            .is_err()
+                        {
+                            break;
+                        }
+                    }
                 }
                 // Wait one second or for an user-generated event to refresh the interface
                 tokio::select! {
@@ -906,4 +912,13 @@ impl AdminInterface {
             let _ = self.change_notifier.send(());
         }
     }
+
+    // Disable updates to the terminal for shutdown
+    pub(crate) fn disable(&mut self) {
+        let mut interface = self.interface.lock().unwrap();
+        let _ = interface.terminal.show_cursor();
+        let _ = interface.terminal.set_cursor_position(Position::ORIGIN);
+        let _ = interface.terminal.flush();
+        interface.state.enabled = false;
+    }
 }