Refactor the dashboard

crates/hyperqueue/Cargo.toml

@@ -57,8 +57,8 @@ itertools = "0.13.0"
 lru = "0.12"
 
 # Dashboard
-ratatui = { version = "0.26", default-features = false, features = ["termion"], optional = true }
-termion = { version = "1.5", optional = true }
+ratatui = { version = "0.28", default-features = false, features = ["crossterm"], optional = true }
+crossterm = { version = "0.28", features = ["event-stream"], optional = true }
 unicode-width = { version = "0.1.5", optional = true }
 
 # Tako
@@ -79,7 +79,7 @@ zero-worker = []
 # Use the jemalloc allocator
 jemalloc = ["jemallocator"]
 # Enable the dashboard
-dashboard = ["dep:ratatui", "dep:termion", "dep:unicode-width"]
+dashboard = ["dep:ratatui", "dep:crossterm", "dep:unicode-width"]
 
 [[bench]]
 name = "benchmark"

crates/hyperqueue/src/bin/hq.rs

@@ -293,13 +293,30 @@ async fn command_worker_address(
 }
 
 #[cfg(feature = "dashboard")]
-///Starts the hq Dashboard
+/// Starts the hq dashboard
 async fn command_dashboard_start(
     gsettings: &GlobalSettings,
-    _opts: hyperqueue::common::cli::DashboardOpts,
+    opts: hyperqueue::common::cli::DashboardOpts,
 ) -> anyhow::Result<()> {
+    use hyperqueue::common::cli::DashboardCommand;
     use hyperqueue::dashboard::start_ui_loop;
-    start_ui_loop(gsettings).await?;
+    use hyperqueue::server::event::log::JournalReader;
+    use hyperqueue::server::event::Event;
+
+    match opts.subcmd.unwrap_or_default() {
+        DashboardCommand::Replay { journal, stream } => {
+            println!("Loading journal {}", journal.display());
+            let mut journal = JournalReader::open(&journal)?;
+            let events: Vec<Event> = journal.collect::<Result<_, _>>()?;
+            println!("Loaded {} events", events.len());
+
+            start_ui_loop(gsettings, events, stream).await?;
+        }
+        DashboardCommand::Stream => {
+            start_ui_loop(gsettings, vec![], true).await?;
+        }
+    }
+
     Ok(())
 }
 

crates/hyperqueue/src/common/cli.rs

@@ -180,11 +180,6 @@ pub struct RootOptions {
     pub subcmd: SubCommand,
 }
 
-/// HyperQueue Dashboard
-#[allow(clippy::large_enum_variant)]
-#[derive(Parser)]
-pub struct DashboardOpts {}
-
 #[allow(clippy::large_enum_variant)]
 #[derive(Parser)]
 pub enum SubCommand {
@@ -212,6 +207,28 @@ pub enum SubCommand {
     GenerateCompletion(GenerateCompletionOpts),
 }
 
+/// HyperQueue Dashboard
+#[derive(Parser)]
+pub struct DashboardOpts {
+    #[clap(subcommand)]
+    pub subcmd: Option<DashboardCommand>,
+}
+
+#[derive(Parser, Default)]
+pub enum DashboardCommand {
+    /// Stream events from a server.
+    #[default]
+    Stream,
+    /// Replay events from a recorded journal file.
+    Replay {
+        /// Path to a journal file created via `hq server start --journal=<path>`.
+        journal: PathBuf,
+        /// Also stream new events from a server after replaying events from the journal.
+        #[clap(long)]
+        stream: bool,
+    },
+}
+
 // Worker CLI options
 
 #[derive(Parser)]