Added high-level abstraction for some PUS services

Introduced high-level abstractions for targetable requests in general.

- PUS Service 3 (HK) abstraction for targetable HK requests
- PUS Service 8 (Action) abstraction for targetable action requests

satrs-example/src/requests.rs

@@ -1,15 +1,16 @@
+use std::collections::HashMap;
+use std::sync::mpsc;
+
 use derive_new::new;
+use satrs::action::ActionRequest;
 use satrs::hk::HkRequest;
 use satrs::mode::ModeRequest;
+use satrs::pus::action::PusActionRequestRouter;
+use satrs::pus::hk::PusHkRequestRouter;
 use satrs::pus::verification::{TcStateAccepted, VerificationToken};
-use satrs_example::TargetIdWithApid;
-
-#[allow(dead_code)]
-#[derive(Clone, Eq, PartialEq, Debug)]
-pub enum ActionRequest {
-    CmdWithU32Id((u32, Vec<u8>)),
-    CmdWithStringId((String, Vec<u8>)),
-}
+use satrs::pus::GenericRoutingError;
+use satrs::queue::GenericSendError;
+use satrs::TargetId;
 
 #[allow(dead_code)]
 #[derive(Clone, Eq, PartialEq, Debug)]
@@ -22,7 +23,7 @@ pub enum Request {
 
 #[derive(Clone, Eq, PartialEq, Debug, new)]
 pub struct TargetedRequest {
-    pub(crate) target_id_with_apid: TargetIdWithApid,
+    pub(crate) target_id: TargetId,
     pub(crate) request: Request,
 }
 
@@ -34,7 +35,7 @@ pub struct RequestWithToken {
 
 impl RequestWithToken {
     pub fn new(
-        target_id: TargetIdWithApid,
+        target_id: TargetId,
         request: Request,
         token: VerificationToken<TcStateAccepted>,
     ) -> Self {
@@ -44,3 +45,50 @@ impl RequestWithToken {
         }
     }
 }
+
+#[derive(Default, Clone)]
+pub struct GenericRequestRouter(pub HashMap<TargetId, mpsc::Sender<RequestWithToken>>);
+
+impl PusHkRequestRouter for GenericRequestRouter {
+    type Error = GenericRoutingError;
+
+    fn route(
+        &self,
+        target_id: TargetId,
+        hk_request: HkRequest,
+        token: VerificationToken<TcStateAccepted>,
+    ) -> Result<(), Self::Error> {
+        if let Some(sender) = self.0.get(&target_id) {
+            sender
+                .send(RequestWithToken::new(
+                    target_id,
+                    Request::Hk(hk_request),
+                    token,
+                ))
+                .map_err(|_| GenericRoutingError::SendError(GenericSendError::RxDisconnected))?;
+        }
+        Ok(())
+    }
+}
+
+impl PusActionRequestRouter for GenericRequestRouter {
+    type Error = GenericRoutingError;
+
+    fn route(
+        &self,
+        target_id: TargetId,
+        action_request: ActionRequest,
+        token: VerificationToken<TcStateAccepted>,
+    ) -> Result<(), Self::Error> {
+        if let Some(sender) = self.0.get(&target_id) {
+            sender
+                .send(RequestWithToken::new(
+                    target_id,
+                    Request::Action(action_request),
+                    token,
+                ))
+                .map_err(|_| GenericRoutingError::SendError(GenericSendError::RxDisconnected))?;
+        }
+        Ok(())
+    }
+}