fix: improve Rust quality and expose more things through Adaptors

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "prosa-hyper"
-version = "0.3.1"
+version = "0.3.0"
 authors = ["Jérémy HERGAULT <jeremy.hergault@worldline.com>", "Anthony THOMAS <anthony.thomas@worldline.com>", "Julien TERUEL <julien.teruel@worldline.com>", "Rene-Louis EYMARD <rene-louis.eymard@worldline.com>"]
 description = "ProSA Hyper processor for HTTP client/server"
 homepage = "https://worldline.com/"
@@ -44,6 +44,7 @@ url = { version = "2", features = ["serde"] }
 opentelemetry = { version = "0.31", features = ["metrics", "trace", "logs"] }
 
 hyper = { version = "1", features = ["full"] }
+http = "1"
 http-body-util = "0.1"
 hyper-util = { version = "0.1", features = ["full"] }
 

examples/client.rs

@@ -16,6 +16,7 @@ use prosa::core::service::ServiceError;
 use prosa::core::settings::settings;
 use prosa::inj::adaptor::InjAdaptor;
 use prosa::inj::proc::{InjProc, InjSettings};
+use prosa_hyper::PRODUCT_VERSION_HEADER;
 use prosa_hyper::client::adaptor::HyperClientAdaptor;
 use prosa_hyper::client::proc::{HyperClientProc, HyperClientSettings};
 use prosa_utils::config::tracing::TelemetryFilter;
@@ -65,10 +66,7 @@ where
 
         Request::builder()
             .uri(uri.as_str())
-            .header(
-                "User-Agent",
-                <HyperDemoAdaptor as HyperClientAdaptor<M>>::USER_AGENT_HEADER,
-            )
+            .header("User-Agent", PRODUCT_VERSION_HEADER)
             .body(BoxBody::new(Empty::<Bytes>::new()))
             .map_err(|e| ServiceError::ProtocolError(format!("Failed to build request: {}", e)))
     }

examples/server.rs

@@ -16,9 +16,9 @@ use prosa::core::settings::settings;
 use prosa::stub::adaptor::StubParotAdaptor;
 use prosa::stub::proc::StubSettings;
 use prosa::{core::main::MainProc, stub::proc::StubProc};
-use prosa_hyper::HyperResp;
 use prosa_hyper::server::adaptor::HyperServerAdaptor;
 use prosa_hyper::server::proc::{HyperServerProc, HyperServerSettings};
+use prosa_hyper::{HttpError, HyperResp, PRODUCT_VERSION_HEADER};
 use prosa_utils::config::tracing::TelemetryFilter;
 use prosa_utils::msg::simple_string_tvf::SimpleStringTvf;
 use serde::{Deserialize, Serialize};
@@ -52,51 +52,44 @@ where
         req: Request<hyper::body::Incoming>,
     ) -> crate::HyperResp<M> {
         match req.uri().path() {
-            "/" => HyperResp::HttpResp(
-                Response::builder()
-                    .header(
-                        "Server",
-                        <HyperDemoAdaptor as HyperServerAdaptor<M>>::SERVER_HEADER,
-                    )
-                    .body(BoxBody::new(Full::new(Bytes::from(format!(
-                        "{} - Home of {}",
-                        if req.version() == hyper::Version::HTTP_2 {
-                            "H2"
-                        } else {
-                            "HTTP/1.1"
-                        },
-                        self.prosa_name,
-                    )))))
-                    .unwrap(),
-            ),
+            "/" => Response::builder()
+                .header("Server", PRODUCT_VERSION_HEADER)
+                .body(BoxBody::new(Full::new(Bytes::from(format!(
+                    "{} - Home of {}",
+                    if req.version() == hyper::Version::HTTP_2 {
+                        "H2"
+                    } else {
+                        "HTTP/1.1"
+                    },
+                    self.prosa_name,
+                )))))
+                .into(),
             "/test" => {
                 let mut tvf_req = M::default();
                 tvf_req.put_string(1, req.method().to_string());
                 tvf_req.put_string(2, "/test");
                 HyperResp::SrvReq(String::from("SRV_TEST"), tvf_req)
             }
-            _ => HyperResp::HttpResp(
-                Response::builder()
-                    .status(404)
-                    .header(
-                        "Server",
-                        <HyperDemoAdaptor as HyperServerAdaptor<M>>::SERVER_HEADER,
-                    )
-                    .body(BoxBody::new(Full::new(Bytes::from("Not Found"))))
-                    .unwrap(),
-            ),
+            _ => Response::builder()
+                .status(404)
+                .header("Server", PRODUCT_VERSION_HEADER)
+                .body(BoxBody::new(Full::new(Bytes::from("Not Found"))))
+                .into(),
         }
     }
 
-    fn process_srv_response(&self, resp: M) -> Response<BoxBody<Bytes, Infallible>> {
+    fn process_srv_response(
+        &self,
+        resp: M,
+    ) -> Result<Response<BoxBody<Bytes, Infallible>>, HttpError> {
         let body = resp
             .get_string(10)
             .unwrap_or(Cow::Owned(String::from("empty body")));
         Response::builder()
             .body(BoxBody::new(Full::new(Bytes::from(format!(
                 "Body: {body}\nTvfResp: {resp:?}"
             )))))
-            .unwrap()
+            .map_err(|e| e.into())
     }
 }
 

src/client/adaptor.rs

@@ -30,16 +30,6 @@ where
         + prosa::core::msg::Tvf
         + std::default::Default,
 {
-    /// User-Agent header value sent by the client
-    #[cfg(target_family = "unix")]
-    const USER_AGENT_HEADER: &'static str =
-        concat!("ProSA-Hyper/", env!("CARGO_PKG_VERSION"), " (Unix)");
-    #[cfg(target_family = "windows")]
-    const USER_AGENT_HEADER: &'static str =
-        concat!("ProSA-Hyper/", env!("CARGO_PKG_VERSION"), " (Windows)");
-    #[cfg(all(not(target_family = "unix"), not(target_family = "windows")))]
-    const USER_AGENT_HEADER: &'static str = concat!("ProSA-Hyper/", env!("CARGO_PKG_VERSION"));
-
     /// Create a new adaptor
     fn new(proc: &HyperClientProc<M>) -> Result<Self, Box<dyn ProcError + Send + Sync>>
     where