feat: add body reader and improve request handling

- Implement req_body_len function to get request body length
- Add body_reader module for centralized body parsing
- Update HttpBody types to use string.View and bytes.View
- Refactor request handling in both JS and native implementations
- Improve error handling for invalid request bodies

Author: oboard

moon.mod.json

@@ -1,6 +1,6 @@
 {
   "name": "oboard/mocket",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "deps": {
     "yj-qin/regexp": "0.3.6",
     "illusory0x0/native": "0.2.1",

src/body_reader.mbt

@@ -0,0 +1,29 @@
+///|
+pub suberror BodyError {
+  InvalidJsonCharset
+  InvalidJson
+  InvalidText
+}
+
+///|
+fn read_body(
+  req_headers : Map[String, String],
+  body_bytes : @moonbitlang/core/bytes.View,
+) -> HttpBody raise BodyError {
+  let content_type = req_headers.get("Content-Type")
+  match content_type {
+    Some([.. "application/json", ..]) => {
+      let json = @encoding.decoder(UTF8).decode(body_bytes) catch {
+        _ => raise BodyError::InvalidJsonCharset
+      }
+      Json(@json.parse(json) catch { _ => raise BodyError::InvalidJson })
+    }
+    Some([.. "text/plain", ..] | [.. "text/html", ..]) =>
+      Text(
+        @encoding.decoder(UTF8).decode(body_bytes) catch {
+          _ => raise BodyError::InvalidText
+        },
+      )
+    _ => Bytes(body_bytes)
+  }
+}

src/index.mbt

@@ -1,9 +1,9 @@
 ///|
 pub(all) enum HttpBody {
   Json(Json)
-  Text(String)
-  HTML(String)
-  Bytes(Bytes)
+  Text(@moonbitlang/core/string.View)
+  HTML(@moonbitlang/core/string.View)
+  Bytes(@moonbitlang/core/bytes.View)
   Empty
 }
 
@@ -55,7 +55,7 @@ pub struct HttpRequest {
 ///|
 pub(all) struct HttpResponse {
   mut status_code : Int
-  headers : Map[String, String]
+  headers : Map[@moonbitlang/core/string.View, @moonbitlang/core/string.View]
   // body : Body
 }
 

src/mocket.js.mbt

@@ -94,7 +94,6 @@ pub fn serve_ffi(mocket : Mocket, port~ : Int) -> Unit {
         res: { status_code: 200, headers: {} },
         params,
       }
-      let content_type = event.req.headers.get("Content-Type")
       run(fn() {
         // 如果是 post，先等待 data 事件
         if event.req.http_method == "POST" {
@@ -104,16 +103,12 @@ pub fn serve_ffi(mocket : Mocket, port~ : Int) -> Unit {
             req.on("end", _ => res(buffer.to_string()))
           }))
           |> ignore
-          match content_type {
-            Some("application/json") =>
-              event.req.body = Json(
-                @json.parse(buffer.to_string()) catch {
-                  _ => {}
-                },
-              )
-            Some("text/html") => event.req.body = HTML(buffer.to_string())
-            Some("text/plain") => event.req.body = Text(buffer.to_string())
-            _ => event.req.body = Bytes(buffer.to_bytes())
+          event.req.body = read_body(string_headers, buffer.to_bytes()) catch {
+            _ => {
+              res.write_head(400, @js.Object::new().to_value())
+              res.end(@js.Value::cast_from("Invalid body"))
+              return
+            }
           }
         }
 

src/mocket.native.mbt

@@ -51,6 +51,12 @@ pub extern "c" fn HttpRequestInternal::on_complete(
 #owned(self)
 extern "c" fn HttpRequestInternal::body(self : HttpRequestInternal) -> Bytes = "req_body"
 
+///|
+#owned(self)
+extern "c" fn HttpRequestInternal::req_body_len(
+  self : HttpRequestInternal,
+) -> Int = "req_body_len"
+
 ///|
 #owned(self, body)
 extern "c" fn HttpResponseInternal::end(
@@ -127,21 +133,19 @@ fn handle_request_native(
   // res.status(200)
   // res.end(to_cstr("{\"status\":\"ok\"}"))
 
-  let headers = from_cstr(req.headers())
-  println(headers)
-  let string_headers = {}
-  // guard (req.headers()) is Ok(Object(headers)) else {
-  //   res.status(400)
-  //   res.end(to_cstr("Invalid headers"))
-  //   return
-  // }
-
-  // 批量转换 headers，减少单个处理的开销
-  // headers.each(fn(key, value) {
-  //   if value is String(v) {
-  //     string_headers.set(key, v)
-  //   }
-  // })
+  let headers_str = from_cstr(req.headers())
+  let req_headers = headers_str
+    .split("\n")
+    .map(fn(pair) {
+      if pair.length() > 0 && pair.split(": ").to_array() is [key, value] {
+        (key.to_string(), value.to_string())
+      } else {
+        ("", "")
+      }
+    })
+    .filter(fn(pair) { pair.0.length() > 0 })
+    .to_array()
+    |> Map::from_array
   let (params, handler) = match mocket.find_route(http_method, path) {
     Some((h, p)) => (p, h)
     _ => {
@@ -151,43 +155,19 @@ fn handle_request_native(
     }
   }
   let event = {
-    req: { http_method, url, body: Empty, headers: string_headers },
+    req: { http_method, url, body: Empty, headers: req_headers },
     res: { status_code: 200, headers: {} },
     params,
   }
   if http_method == "POST" {
-    let body_bytes = req.body()
-    let content_type = Some("text/plain") // req.headers().get("Content-Type")
-    let body = match content_type {
-      Some("application/json") => {
-        let json = @encoding.decoder(UTF8).decode(body_bytes) catch {
-          _ => {
-            res.status(400)
-            res.end(to_cstr("Invalid JSON charset"))
-            return
-          }
-        }
-        Json(
-          @json.parse(json) catch {
-            _ => {
-              res.status(400)
-              res.end(to_cstr("Invalid JSON"))
-              return
-            }
-          },
-        )
+    let req_body_len = req.req_body_len()
+    let body_bytes = req.body()[0:req_body_len]
+    let body = read_body(req_headers, body_bytes) catch {
+      _ => {
+        res.status(400)
+        res.end(to_cstr("Invalid body"))
+        return
       }
-      Some("text/plain" | "text/html") =>
-        Text(
-          @encoding.decoder(UTF8).decode(body_bytes) catch {
-            _ => {
-              res.status(400)
-              res.end(to_cstr("Invalid text charset"))
-              return
-            }
-          },
-        )
-      _ => Bytes(body_bytes)
     }
     event.req.body = body
   }
@@ -212,12 +192,12 @@ fn handle_request_native(
       res.set_header(to_cstr(key), to_cstr(value))
     })
     if body is Bytes(bytes) {
-      res.end_bytes(bytes)
+      res.end_bytes(bytes.to_bytes())
     } else {
       res.end(
         match body {
-          HTML(s) => to_cstr(s)
-          Text(s) => to_cstr(s)
+          HTML(s) => to_cstr(s.to_string())
+          Text(s) => to_cstr(s.to_string())
           Json(j) => to_cstr(j.stringify())
           _ => to_cstr("")
         },
@@ -227,8 +207,8 @@ fn handle_request_native(
 }
 
 ///|
-fn to_cstr(s : String) -> @native.CStr {
-  let bytes = @encoding.encode(UTF8, s)
+fn[T : Show] to_cstr(s : T) -> @native.CStr {
+  let bytes = @encoding.encode(UTF8, s.to_string())
   let utf8_ptr = @native.unsafe_coerce(bytes)
   utf8_ptr
 }

src/mocket.stub.c

@@ -156,6 +156,15 @@ uint8_t *req_body(request_t *req)
   return NULL;
 }
 
+size_t req_body_len(request_t *req)
+{
+  if (req && req->hm)
+  {
+    return req->hm->body.len;
+  }
+  return 0;
+}
+
 // Set response header (wrapper for res_set_header)
 void res_set_header_line(response_t *res, const char *header_line)
 {

src/pkg.generated.mbti

@@ -3,6 +3,8 @@ package "oboard/mocket"
 
 import(
   "moonbitlang/core/builtin"
+  "moonbitlang/core/bytes"
+  "moonbitlang/core/string"
   "oboard/mocket/js"
 )
 
@@ -24,6 +26,12 @@ fn serve_ffi(Mocket, port~ : Int) -> Unit
 async fn[T, E : Error] suspend(((T) -> Unit, (E) -> Unit) -> Unit) -> T raise E
 
 // Errors
+pub suberror BodyError {
+  InvalidJsonCharset
+  InvalidJson
+  InvalidText
+}
+
 pub suberror ExecError
 impl Show for ExecError
 
@@ -36,9 +44,9 @@ impl Show for NetworkError
 // Types and methods
 pub(all) enum HttpBody {
   Json(Json)
-  Text(String)
-  HTML(String)
-  Bytes(Bytes)
+  Text(@string.View)
+  HTML(@string.View)
+  Bytes(@bytes.View)
   Empty
 }
 
@@ -62,7 +70,7 @@ fn HttpRequestInternal::url(Self) -> String
 
 pub(all) struct HttpResponse {
   mut status_code : Int
-  headers : Map[String, String]
+  headers : Map[@string.View, @string.View]
 }
 
 #external