Move supervisor to agama-manager project

Author: joseivanlopez

rust/Cargo.lock

@@ -5,6 +5,7 @@ members = [
     "agama-l10n",
     "agama-lib",
     "agama-locale-data",
+    "agama-manager",
     "agama-network",
     "agama-server",
     "agama-utils",

rust/Cargo.toml

@@ -21,7 +21,7 @@
 mod base_http_client;
 pub use base_http_client::{BaseHTTPClient, BaseHTTPClientError};
 
-mod event;
+pub mod event;
 pub use event::{Event, EventPayload};
 
 mod websocket;

rust/agama-lib/src/http.rs

@@ -38,6 +38,10 @@ use agama_l10n as l10n;
 use agama_utils::{issue, progress};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
+use tokio::sync::broadcast;
+
+pub type Sender = broadcast::Sender<Event>;
+pub type Receiver = broadcast::Receiver<Event>;
 
 /// Agama event.
 ///

rust/agama-lib/src/http/event.rs

@@ -0,0 +1,24 @@
+[package]
+name = "agama-manager"
+version = "0.1.0"
+rust-version.workspace = true
+edition.workspace = true
+
+[dependencies]
+agama-lib = { path = "../agama-lib" }
+agama-utils = { path = "../agama-utils" }
+agama-l10n = { path = "../agama-l10n" }
+thiserror = "2.0.12"
+serde = { version = "1.0.210", features = ["derive"] }
+tokio = { version = "1.40.0", features = ["macros", "rt-multi-thread", "sync"] }
+tokio-stream = "0.1.16"
+async-trait = "0.1.83"
+serde_json = "1.0.128"
+utoipa = { version = "5.2.0", features = ["axum_extras", "uuid"] }
+strum = { version = "0.27.2", features = ["derive"] }
+tracing = "0.1.40"
+zbus = { version = "5", default-features = false, features = ["tokio"] }
+merge-struct = "0.1.0"
+
+[dev-dependencies]
+tokio-test = "0.4.4"

rust/agama-manager/Cargo.toml

@@ -18,8 +18,7 @@
 // To contact SUSE LLC about this file by physical or electronic mail, you may
 // find current contact information at www.suse.com.
 
-use crate::web::EventsSender;
-use agama_lib::http::{Event, EventPayload};
+use agama_lib::http;
 use std::pin::Pin;
 use tokio::sync::mpsc;
 use tokio_stream::{wrappers::UnboundedReceiverStream, Stream, StreamExt, StreamMap};
@@ -30,12 +29,12 @@ use tokio_stream::{wrappers::UnboundedReceiverStream, Stream, StreamExt, StreamM
 /// `agama_l10n::Event`) and has to be converted to the [Event
 /// struct](agama_lib::http::Event).
 pub struct EventsListener {
-    inner: StreamMap<&'static str, Pin<Box<dyn Stream<Item = Event> + Send>>>,
-    sender: EventsSender,
+    inner: StreamMap<&'static str, Pin<Box<dyn Stream<Item = http::Event> + Send>>>,
+    sender: http::event::Sender,
 }
 
 impl EventsListener {
-    pub fn new(sender: EventsSender) -> Self {
+    pub fn new(sender: http::event::Sender) -> Self {
         EventsListener {
             inner: StreamMap::new(),
             sender,
@@ -47,10 +46,10 @@ impl EventsListener {
         name: &'static str,
         channel: mpsc::UnboundedReceiver<T>,
     ) where
-        EventPayload: From<T>,
+        http::EventPayload: From<T>,
     {
-        let stream =
-            UnboundedReceiverStream::new(channel).map(|e| Event::new(EventPayload::from(e)));
+        let stream = UnboundedReceiverStream::new(channel)
+            .map(|e| http::Event::new(http::EventPayload::from(e)));
         self.inner.insert(name, Box::pin(stream));
     }
 

rust/agama-server/src/supervisor.rs rust/agama-manager/src/lib.rsrust/agama-server/src/supervisor.rs renamed to rust/agama-manager/src/lib.rs

@@ -18,14 +18,13 @@
 // To contact SUSE LLC about this file by physical or electronic mail, you may
 // find current contact information at www.suse.com.
 
-use std::collections::HashMap;
-
-use crate::supervisor::{
+use crate::{
     l10n, proposal::Proposal, scope::ConfigScope, scope::Scope, service, system_info::SystemInfo,
 };
 use agama_lib::{install_settings::InstallSettings, issue::Issue};
 use agama_utils::{actor::Message, progress::Progress};
 use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
 
 /// Gets the installation status.
 pub struct GetStatus;

…/agama-server/src/supervisor/listener.rs rust/agama-manager/src/listener.rsrust/agama-server/src/supervisor/listener.rs renamed to rust/agama-manager/src/listener.rs rust/agama-server/src/supervisor/listener.rs renamed to rust/agama-manager/src/listener.rs

@@ -18,7 +18,7 @@
 // To contact SUSE LLC about this file by physical or electronic mail, you may
 // find current contact information at www.suse.com.
 
-use crate::supervisor::l10n;
+use crate::l10n;
 use serde::Serialize;
 
 #[derive(Clone, Debug, Serialize)]

…t/agama-server/src/supervisor/message.rs rust/agama-manager/src/message.rsrust/agama-server/src/supervisor/message.rs renamed to rust/agama-manager/src/message.rs rust/agama-server/src/supervisor/message.rs renamed to rust/agama-manager/src/message.rs

@@ -18,7 +18,7 @@
 // To contact SUSE LLC about this file by physical or electronic mail, you may
 // find current contact information at www.suse.com.
 
-use crate::supervisor::l10n;
+use crate::l10n;
 use serde::{Deserialize, Serialize};
 
 #[derive(