wip: begin to reorganize messages/routes modules

Author: cilki

sandpolis-agent/src/agent/mod.rs

@@ -1,17 +1,5 @@
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize)]
-pub struct UninstallRequest;
-
-#[derive(Serialize, Deserialize)]
-pub enum UninstallResponse {}
-
-#[derive(Serialize, Deserialize)]
-pub struct UpdateRequest;
-
-#[derive(Serialize, Deserialize)]
-pub enum UpdateResponse {}
-
 /// Request that the boot agent be started.
 #[derive(Serialize, Deserialize)]
 pub struct LaunchBootAgentRequest {

sandpolis-agent/src/messages.rs sandpolis-agent/src/bootagent.rssandpolis-agent/src/messages.rs renamed to sandpolis-agent/src/bootagent.rs

@@ -5,13 +5,8 @@
 use anyhow::Result;
 use sandpolis_database::DatabaseLayer;
 
+pub mod bootagent;
 pub mod config;
-
-#[cfg(feature = "agent")]
-pub mod agent;
-
-pub mod messages;
-
 pub mod uefi;
 
 #[derive(Default)]

sandpolis-agent/src/lib.rs

@@ -4,6 +4,12 @@ use axum::extract;
 use axum::extract::State;
 use sandpolis_network::RequestResult;
 
+#[derive(Serialize, Deserialize)]
+pub struct UninstallRequest;
+
+#[derive(Serialize, Deserialize)]
+pub enum UninstallResponse {}
+
 /// Uninstall the agent.
 #[axum_macros::debug_handler]
 pub async fn uninstall(
@@ -12,12 +18,3 @@ pub async fn uninstall(
 ) -> RequestResult<UninstallResponse> {
     todo!()
 }
-
-/// Update the agent.
-#[axum_macros::debug_handler]
-pub async fn update(
-    state: State<AgentLayer>,
-    extract::Json(request): extract::Json<UpdateRequest>,
-) -> RequestResult<UpdateResponse> {
-    todo!()
-}

sandpolis-agent/src/agent/routes.rs sandpolis-agent/src/uninstall.rssandpolis-agent/src/agent/routes.rs renamed to sandpolis-agent/src/uninstall.rs

@@ -0,0 +1,20 @@
+use crate::AgentLayer;
+use crate::messages::{UninstallRequest, UninstallResponse, UpdateRequest, UpdateResponse};
+use axum::extract;
+use axum::extract::State;
+use sandpolis_network::RequestResult;
+
+#[derive(Serialize, Deserialize)]
+pub struct UpdateRequest;
+
+#[derive(Serialize, Deserialize)]
+pub enum UpdateResponse {}
+
+/// Update the agent.
+#[axum_macros::debug_handler]
+pub async fn update(
+    state: State<AgentLayer>,
+    extract::Json(request): extract::Json<UpdateRequest>,
+) -> RequestResult<UpdateResponse> {
+    todo!()
+}

sandpolis-agent/src/update.rs

@@ -1,9 +1,7 @@
 use anyhow::Result;
 
-pub(crate) mod messages;
-
-#[cfg(feature = "agent")]
-pub mod agent;
+pub mod screenshot;
+pub mod session;
 
 #[cfg(feature = "client")]
 pub mod client;