refactor: enhance header collection and parsing with increased C buffer and StringView adoption.

Author: oboard

moon.mod.json

@@ -1,6 +1,6 @@
 {
   "name": "oboard/mocket",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "deps": {
     "illusory0x0/native": "0.2.1",
     "moonbitlang/x": "0.4.34",
@@ -9,11 +9,8 @@
   "readme": "README.md",
   "repository": "https://github.com/oboard/mocket",
   "license": "Apache-2.0",
-  "keywords": [
-    "http",
-    "server"
-  ],
+  "keywords": ["http", "server"],
   "description": "A web framework for MoonBit.",
   "source": "src",
   "preferred-target": "native"
-}
+}

src/body_reader.mbt

@@ -7,7 +7,7 @@ pub suberror BodyError {
 
 ///|
 fn read_body(
-  req_headers : Map[String, String],
+  req_headers : Map[StringView, StringView],
   body_bytes : BytesView,
 ) -> HttpBody raise BodyError {
   let content_type = req_headers.get("Content-Type")
@@ -54,7 +54,7 @@ priv struct ContentType {
 } derive(Show)
 
 ///|
-fn parse_content_type(s : String) -> ContentType? {
+fn parse_content_type(s : StringView) -> ContentType? {
   let parts = s.split(";").to_array()
   if parts.is_empty() {
     None

src/cookie.mbt

@@ -52,9 +52,9 @@ pub fn cookie_to_string(cookie : Array[CookieItem]) -> String {
 ///|
 
 ///|
-pub fn parse_cookie(cookie : String) -> Map[String, CookieItem] {
+pub fn parse_cookie(cookie : StringView) -> Map[String, CookieItem] {
   let res = Map::new()
-  let mut view = cookie[:]
+  let mut view = cookie
   let mut last_cookie_name = ""
   while view.length() > 0 {
     // Skip whitespace using lexmatch

src/index.mbt

@@ -81,7 +81,7 @@ pub fn new(
 pub(all) struct HttpRequest {
   http_method : String
   url : String
-  headers : Map[String, String]
+  headers : Map[StringView, StringView]
   mut body : HttpBody
 }
 

src/mocket.native.mbt

@@ -162,18 +162,26 @@ fn handle_request_native(
   // res.end(to_cstr("{\"status\":\"ok\"}"))
 
   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 {
-        ("", "")
+  let req_headers = Map::new()
+  headers_str
+  .split("\n")
+  .each(fn(line) {
+    let line = line.trim_space()
+    if line == "" {
+      return
+    }
+    try {
+      if line.find(":") is Some(idx) {
+        let key = line[0:idx].trim_space()
+        let value = line[idx + 1:].trim_space()
+        if key != "" {
+          req_headers.set(key, value)
+        }
       }
-    })
-    .filter(fn(pair) { pair.0.length() > 0 })
-    .to_array()
-    |> Map::from_array
+    } catch {
+      _ => ()
+    }
+  })
   let (params, handler) = match mocket.find_route(http_method, path) {
     Some((h, p)) => (p, h)
     _ => {

src/mocket.stub.c

@@ -258,17 +258,25 @@ const char *req_headers(request_t *req)
 {
   if (req && req->hm)
   {
-    static char headers_buf[1024];
+    static char headers_buf[4096];
     headers_buf[0] = '\0';
-
-    // Extract some common headers
-    struct mg_str *content_type = mg_http_get_header(req->hm, "Content-Type");
-    if (content_type)
-    {
-      strncat(headers_buf, "Content-Type: ", sizeof(headers_buf) - strlen(headers_buf) - 1);
-      strncat(headers_buf, content_type->buf,
-              content_type->len < (sizeof(headers_buf) - strlen(headers_buf) - 1) ? content_type->len : (sizeof(headers_buf) - strlen(headers_buf) - 1));
-      strncat(headers_buf, "\r\n", sizeof(headers_buf) - strlen(headers_buf) - 1);
+    size_t buf_len = 0;
+    size_t buf_cap = sizeof(headers_buf);
+
+    for (int i = 0; i < MG_MAX_HTTP_HEADERS; i++) {
+      struct mg_http_header *h = &req->hm->headers[i];
+      if (h->name.len == 0) break;
+
+      // Check if we have enough space: name.len + 2 (": ") + value.len + 2 ("\r\n") + 1 (null terminator)
+      size_t needed = h->name.len + 2 + h->value.len + 2 + 1;
+      if (buf_len + needed > buf_cap) break;
+
+      strncat(headers_buf, h->name.buf, h->name.len);
+      strcat(headers_buf, ": ");
+      strncat(headers_buf, h->value.buf, h->value.len);
+      strcat(headers_buf, "\r\n");
+      
+      buf_len += needed - 1; // -1 because null terminator is overwritten/handled by strcat
     }
 
     return headers_buf;