move cmd off of grpc

server/src/http/api/panels.rs

@@ -4,6 +4,7 @@ use crate::panels::PanelService;
 use actix_web::{delete, get, post, put, web, Responder};
 use serde::Deserialize;
 use std::sync::Arc;
+use uuid::Uuid;
 
 #[derive(Deserialize)]
 struct CreateParam {
@@ -13,7 +14,7 @@ struct CreateParam {
 
 #[derive(Deserialize)]
 struct IdParam {
-    id: String,
+    id: Uuid,
 }
 
 #[post("/panel")]
@@ -22,7 +23,7 @@ pub(super) async fn new(
     data: web::Json<CreateParam>,
 ) -> Result<impl Responder, HttpServerResultError> {
     let uuid = panels.create(&data.name, &data.data).await?;
-    Ok(web::Json(uuid.value))
+    Ok(web::Json(uuid))
 }
 
 #[get("/panel")]
@@ -38,12 +39,10 @@ pub(super) async fn get_one(
     panels: web::Data<Arc<PanelService>>,
     path: web::Path<IdParam>,
 ) -> Result<impl Responder, HttpServerResultError> {
-    let result = panels.read(path.id.clone().into()).await?;
+    let result = panels.read(path.id).await?;
     match result {
         Some(result) => Ok(web::Json(result)),
-        None => Err(HttpServerResultError::PanelUuidNotFound {
-            uuid: path.id.clone(),
-        }),
+        None => Err(HttpServerResultError::PanelUuidNotFound { uuid: path.id }),
     }
 }
 
@@ -53,7 +52,7 @@ pub(super) async fn set(
     path: web::Path<IdParam>,
     data: web::Json<PanelUpdate>,
 ) -> Result<impl Responder, HttpServerResultError> {
-    panels.update(path.id.clone().into(), data.0).await?;
+    panels.update(path.id, data.0).await?;
     Ok(web::Json(()))
 }
 
@@ -62,6 +61,6 @@ pub(super) async fn delete(
     panels: web::Data<Arc<PanelService>>,
     path: web::Path<IdParam>,
 ) -> Result<impl Responder, HttpServerResultError> {
-    panels.delete(path.id.clone().into()).await?;
+    panels.delete(path.id).await?;
     Ok(web::Json(()))
 }

server/src/http/backend/connection.rs

@@ -1,3 +1,5 @@
+use crate::command::command_handle::CommandHandle;
+use crate::command::service::CommandManagementService;
 use crate::telemetry::management_service::TelemetryManagementService;
 use actix_ws::{AggregatedMessage, ProtocolError, Session};
 use anyhow::bail;
@@ -10,18 +12,26 @@ use uuid::Uuid;
 pub(super) struct BackendConnection {
     session: Session,
     tlm_management: Arc<TelemetryManagementService>,
+    cmd_management: Arc<CommandManagementService>,
     tx: Sender<ResponseMessage>,
+    commands: Vec<CommandHandle>,
     pub rx: Receiver<ResponseMessage>,
     pub should_close: bool,
 }
 
 impl BackendConnection {
-    pub fn new(session: Session, tlm_management: Arc<TelemetryManagementService>) -> Self {
+    pub fn new(
+        session: Session,
+        tlm_management: Arc<TelemetryManagementService>,
+        cmd_management: Arc<CommandManagementService>,
+    ) -> Self {
         let (tx, rx) = tokio::sync::mpsc::channel::<ResponseMessage>(128);
         Self {
             session,
             tlm_management,
+            cmd_management,
             tx,
+            commands: vec![],
             rx,
             should_close: false,
         }
@@ -41,6 +51,21 @@ impl BackendConnection {
             RequestMessagePayload::TelemetryEntry(tlm_entry) => {
                 self.tlm_management.add_tlm_item(tlm_entry)?;
             }
+            RequestMessagePayload::GenericCallbackError(_) => todo!(),
+            RequestMessagePayload::CommandDefinition(def) => {
+                let cmd = self
+                    .cmd_management
+                    .register_command(msg.uuid, def, self.tx.clone())?;
+                self.commands.push(cmd);
+            }
+            RequestMessagePayload::CommandResponse(response) => match msg.response {
+                None => bail!("Command Response Payload Must Respond to a Command"),
+                Some(uuid) => {
+                    self.cmd_management
+                        .handle_command_response(uuid, response)
+                        .await?;
+                }
+            },
         }
         Ok(())
     }
@@ -78,6 +103,15 @@ impl BackendConnection {
 
     pub async fn cleanup(mut self) {
         self.rx.close();
-        let _ = self.session.close(None).await;
+        // Clone here to prevent conflict with the Drop trait
+        let _ = self.session.clone().close(None).await;
+    }
+}
+
+impl Drop for BackendConnection {
+    fn drop(&mut self) {
+        for command in self.commands.drain(..) {
+            self.cmd_management.unregister(command);
+        }
     }
 }

server/src/http/backend/mod.rs

@@ -1,5 +1,6 @@
 mod connection;
 
+use crate::command::service::CommandManagementService;
 use crate::http::backend::connection::BackendConnection;
 use crate::telemetry::management_service::TelemetryManagementService;
 use actix_web::{rt, web, HttpRequest, HttpResponse};
@@ -14,6 +15,7 @@ async fn backend_connect(
     stream: web::Payload,
     cancel_token: web::Data<CancellationToken>,
     telemetry_management_service: web::Data<Arc<TelemetryManagementService>>,
+    command_management_service: web::Data<Arc<CommandManagementService>>,
 ) -> Result<HttpResponse, actix_web::Error> {
     trace!("backend_connect");
     let (res, session, stream) = actix_ws::handle(&req, stream)?;
@@ -25,9 +27,10 @@ async fn backend_connect(
 
     let cancel_token = cancel_token.get_ref().clone();
     let tlm_management = telemetry_management_service.get_ref().clone();
+    let cmd_management = command_management_service.get_ref().clone();
 
     rt::spawn(async move {
-        let mut connection = BackendConnection::new(session, tlm_management);
+        let mut connection = BackendConnection::new(session, tlm_management, cmd_management);
         while !connection.should_close {
             let result = select! {
                 _ = cancel_token.cancelled() => {

server/src/http/error.rs

@@ -20,7 +20,7 @@ pub enum HttpServerResultError {
     #[error("Internal Error")]
     InternalError(#[from] anyhow::Error),
     #[error("Panel Uuid Not Found: {uuid}")]
-    PanelUuidNotFound { uuid: String },
+    PanelUuidNotFound { uuid: Uuid },
     #[error(transparent)]
     Command(#[from] crate::command::error::Error),
 }