feat: use the HTTP + WebSocket API in all commands

rust/agama-cli/src/auth.rs

@@ -24,7 +24,7 @@ use url::Url;
 
 use crate::auth_tokens_file::AuthTokensFile;
 use crate::error::CliError;
-use agama_lib::base_http_client::BaseHTTPClient;
+use agama_lib::http::BaseHTTPClient;
 use inquire::Password;
 use std::collections::HashMap;
 use std::io::{self, IsTerminal};

rust/agama-cli/src/commands.rs

@@ -125,4 +125,14 @@ pub enum Commands {
         #[clap(default_value = "reboot")]
         method: Option<FinishMethod>,
     },
+
+    /// Monitors the Agama service.
+    Monitor,
+
+    /// Display Agama events.
+    Events {
+        /// Display the events in a more human-readable way.
+        #[arg(short, long)]
+        pretty: bool,
+    },
 }

rust/agama-cli/src/config.rs

@@ -24,16 +24,17 @@ use std::{
     process::Command,
 };
 
-use crate::show_progress;
 use agama_lib::{
-    base_http_client::BaseHTTPClient, context::InstallationContext,
-    install_settings::InstallSettings, Store as SettingsStore,
+    context::InstallationContext, http::BaseHTTPClient, install_settings::InstallSettings,
+    monitor::MonitorClient, Store as SettingsStore,
 };
 use anyhow::anyhow;
 use clap::Subcommand;
 use std::io::Write;
 use tempfile::Builder;
 
+use crate::show_progress;
+
 const DEFAULT_EDITOR: &str = "/usr/bin/vi";
 
 #[derive(Subcommand, Debug)]
@@ -62,7 +63,11 @@ pub enum ConfigCommands {
     },
 }
 
-pub async fn run(http_client: BaseHTTPClient, subcommand: ConfigCommands) -> anyhow::Result<()> {
+pub async fn run(
+    http_client: BaseHTTPClient,
+    monitor: MonitorClient,
+    subcommand: ConfigCommands,
+) -> anyhow::Result<()> {
     let store = SettingsStore::new(http_client).await?;
 
     match subcommand {
@@ -78,7 +83,7 @@ pub async fn run(http_client: BaseHTTPClient, subcommand: ConfigCommands) -> any
             stdin.read_to_string(&mut contents)?;
             let result = InstallSettings::from_json(&contents, &InstallationContext::from_env()?)?;
             tokio::spawn(async move {
-                show_progress().await.unwrap();
+                show_progress(monitor, true).await;
             });
             store.store(&result).await?;
             Ok(())
@@ -90,7 +95,7 @@ pub async fn run(http_client: BaseHTTPClient, subcommand: ConfigCommands) -> any
                 .unwrap_or(DEFAULT_EDITOR.to_string());
             let result = edit(&model, &editor)?;
             tokio::spawn(async move {
-                show_progress().await.unwrap();
+                show_progress(monitor, true).await;
             });
             store.store(&result).await?;
             Ok(())

rust/agama-cli/src/events.rs

@@ -0,0 +1,38 @@
+// Copyright (c) [2024] SUSE LLC
+//
+// All Rights Reserved.
+//
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 2 of the License, or (at your option)
+// any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+// more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, contact SUSE LLC.
+//
+// To contact SUSE LLC about this file by physical or electronic mail, you may
+// find current contact information at www.suse.com.
+
+use agama_lib::http::WebSocketClient;
+
+/// Main entry point called from Agama CLI main loop
+pub async fn run(mut ws_client: WebSocketClient, pretty: bool) -> anyhow::Result<()> {
+    loop {
+        let event = ws_client.receive().await?;
+        let conversion = if pretty {
+            serde_json::to_string_pretty(&event)
+        } else {
+            serde_json::to_string(&event)
+        };
+
+        match conversion {
+            Ok(event_json) => println!("{}", event_json),
+            Err(_) => eprintln!("Could not serialize {:?}", &event),
+        }
+    }
+}