feat: body is sent as bytes instead of str slice

saskenuba · saskenuba · commit 09ac22cb6837 · 2024-02-29T14:41:39.000-03:00
Signed-off-by: Martin &lt;martin@hotmail.com.br&gt;
diff --git a/src/infrastructure/server_impl/request.rs b/src/infrastructure/server_impl/request.rs
@@ -6,5 +6,5 @@ pub struct Request<'a> {
     pub method: Method,
     pub headers: EnumMap<Header, &'a str>,
     pub resource: &'a str,
-    pub body: Option<&'a str>,
+    pub body: Option<&'a [u8]>,
 }
diff --git a/src/infrastructure/server_impl/server.rs b/src/infrastructure/server_impl/server.rs
@@ -107,13 +107,13 @@ fn to_str(str_like: &[u8]) -> &str {
     unsafe { std::str::from_utf8_unchecked(str_like) }
 }
 
-fn parse_body(body: &[u8]) -> Option<&str> {
+fn parse_body(body: &[u8]) -> Option<&[u8]> {
     if body.is_empty() || body.first() == Some(&b'\0') {
         return None;
     }
 
     let body_content = memchr(b'\0', body).map(|idx| &body[..idx]).unwrap_or(body);
-    Some(to_str(body_content))
+    Some(body_content)
 }
 
 /// Returns a [Request]
@@ -128,10 +128,11 @@ pub fn parse_http(request: &[u8]) -> AnyResult<Request> {
 
     let method = Method::from_str(req.method.unwrap()).unwrap();
     let resource = req.path.unwrap();
+
     let headers = req
         .headers
         .iter()
-        .map(|c| (Header::from_str(c.name).unwrap(), to_str(c.value)))
+        .filter_map(|c| Header::from_str(c.name).ok().map(|h| (h, to_str(c.value))))
         .collect::<EnumMap<_, _>>();
 
     let body = match body {
@@ -162,7 +163,7 @@ mod tests {
             request.headers[Header::CONTENT_TYPE],
             "text/html; charset=ISO-8859-4"
         );
-        assert_eq!(request.body, Some(r#"{"json_key": 10}"#));
+        assert_eq!(to_str(request.body.unwrap()), r#"{"json_key": 10}"#);
     }
 
     #[test]

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ pub struct Request<'a> {`
`6`	`6`	`pub method: Method,`
`7`	`7`	`pub headers: EnumMap<Header, &'a str>,`
`8`	`8`	`pub resource: &'a str,`
`9`		`- pub body: Option<&'a str>,`
	`9`	`+ pub body: Option<&'a [u8]>,`
`10`	`10`	`}`