Merge pull request #5 from oboard:reflactor/http-body

Reflactor/http-body

Author: oboard

moon.mod.json

@@ -1,6 +1,6 @@
 {
   "name": "oboard/mocket",
-  "version": "0.5.8",
+  "version": "0.6.0",
   "deps": {
     "illusory0x0/native": "0.2.1",
     "moonbitlang/x": "0.4.34",

src/body_reader.mbt src/content_type.mbtsrc/body_reader.mbt renamed to src/content_type.mbt

@@ -1,51 +1,3 @@
-///|
-pub suberror BodyError {
-  InvalidJsonCharset
-  InvalidJson
-  InvalidText
-}
-
-///|
-fn read_body(
-  req_headers : Map[StringView, StringView],
-  body_bytes : BytesView,
-) -> HttpBody raise BodyError {
-  let content_type = req_headers.get("Content-Type")
-  if content_type is Some(content_type) {
-    let content_type = parse_content_type(content_type)
-    if content_type is Some(content_type) {
-      return match content_type {
-        { subtype: "json", .. } => {
-          let json = @encoding/utf8.decode(body_bytes) catch {
-            _ => raise BodyError::InvalidJsonCharset
-          }
-          Json(@json.parse(json) catch { _ => raise BodyError::InvalidJson })
-        }
-        { media_type: "text", .. } =>
-          Text(
-            @encoding/utf8.decode(body_bytes) catch {
-              _ => raise BodyError::InvalidText
-            },
-          )
-        { subtype: "x-www-form-urlencoded", .. } =>
-          Form(parse_form_data(body_bytes))
-        { subtype: "form-data" | "multipart", params, .. } => {
-          let boundary = match params.get("boundary") {
-            Some(b) => Some(b)
-            None => params.get("BOUNDARY")
-          }
-          match boundary {
-            Some(b) => Multipart(parse_multipart(body_bytes, b.to_string()))
-            None => Bytes(body_bytes)
-          }
-        }
-        _ => Bytes(body_bytes)
-      }
-    }
-  }
-  Bytes(body_bytes)
-}
-
 ///|
 priv struct ContentType {
   media_type : StringView

src/cors/cors.mbt

@@ -66,7 +66,7 @@ pub fn handle_cors(
       max_age~,
     )
     // 对于预检请求，直接返回空响应，不调用next()
-    @mocket.Empty
+    @mocket.HttpResponse::new(OK).to_responder()
   } else {
     append_cors_headers(
       event,

src/cors/pkg.generated.mbti

@@ -10,7 +10,7 @@ fn append_cors_headers(@mocket.MocketEvent, origin? : String, methods? : String,
 
 fn append_cors_preflight_headers(@mocket.MocketEvent, origin? : String, methods? : String, allow_headers? : String, credentials? : Bool, max_age? : Int) -> Unit
 
-fn handle_cors(origin? : String, methods? : String, allow_headers? : String, expose_headers? : String, credentials? : Bool, max_age? : Int) -> async (@mocket.MocketEvent, async () -> @mocket.HttpBody noraise) -> @mocket.HttpBody noraise
+fn handle_cors(origin? : String, methods? : String, allow_headers? : String, expose_headers? : String, credentials? : Bool, max_age? : Int) -> async (@mocket.MocketEvent, async () -> &@mocket.Responder noraise) -> &@mocket.Responder noraise
 
 fn is_preflight_request(@mocket.MocketEvent) -> Bool
 

src/examples/cookie/main.mbt

@@ -4,9 +4,9 @@ fn main {
   app.get("/", e => {
     e.res.set_cookie("session_id", "12345", max_age=3600)
     if e.req.get_cookie("session_id") is Some(session_id) {
-      Text(session_id.value)
+      session_id.value
     } else {
-      Text("No session_id")
+      "No session_id"
     }
   })
 

src/examples/responder/main.mbt

@@ -0,0 +1,65 @@
+///|
+using @mocket {type HttpResponse}
+
+///|
+struct Person {
+  name : String
+  age : Int
+} derive(ToJson, FromJson)
+
+///|
+impl @mocket.BodyReader for Person with from_request(req) -> Person raise {
+  @json.from_json(req.body())
+}
+
+///|
+fn main {
+  let app = @mocket.new()
+
+  // Text Response
+  app
+  ..get("/", _event => "⚡️ Tadaa!")
+
+  // Object Response
+  ..get("/json", _event => { name: "oboard", age: 21 }.to_json())
+
+  // JSON Request
+  // curl --location 'localhost:4000/json' \
+  // --header 'Content-Type: application/json' \
+  // --data '{
+  //     "name": "oboard",
+  //     "age": 21
+  // }'
+  ..post("/json", event => try {
+    let person : Person = event.req.body()
+    HttpResponse::new(OK).body(
+      "Hello, \{person.name}. You are \{person.age} years old.",
+    )
+  } catch {
+    _ => HttpResponse::new(BadRequest).body("Invalid JSON")
+  })
+
+  // Echo Server
+  ..post("/echo", e => e.req)
+
+  // 404 Page
+  ..get("/404", _ => HttpResponse::new(NotFound).body(
+    @mocket.html(
+      (
+        #|<html>
+        #|<body>
+        #|  <h1>404</h1>
+        #|</body>
+        #|</html>
+      ),
+    ),
+  ))
+
+  // Print Server URL
+  for path in app.mappings.keys() {
+    println("\{path.0} http://localhost:4000\{path.1}")
+  }
+
+  // Serve
+  app.serve(port=4000)
+}

src/examples/responder/moon.pkg.json

@@ -0,0 +1,4 @@
+{
+  "is-main": true,
+  "import": ["oboard/mocket"]
+}

src/examples/responder/pkg.generated.mbti

@@ -0,0 +1,20 @@
+// Generated using `moon info`, DON'T EDIT IT
+package "oboard/mocket/examples/responder"
+
+import(
+  "moonbitlang/core/json"
+)
+
+// Values
+
+// Errors
+
+// Types and methods
+type Person
+impl ToJson for Person
+impl @json.FromJson for Person
+
+// Type aliases
+
+// Traits
+

src/examples/route/main.mbt

@@ -1,20 +1,17 @@
 ///|
 fn main {
-  let app = @mocket.new(logger=@mocket.new_production_logger())
+  let app = @mocket.new()
 
   // Register global middleware
   app
-  ..use_middleware((event, next) => {
-    println("📝 Request: \{event.req.http_method} \{event.req.url}")
-    next()
-  })
+  ..use_middleware(logger_middleware)
   ..use_middleware(@cors.handle_cors())
 
   // Text Response
-  ..get("/", _event => Text("⚡️ Tadaa!"))
+  ..get("/", _event => "⚡️ Tadaa!")
 
   // Hello World
-  ..on("GET", "/hello", _ => Text("Hello world!"))
+  ..on("GET", "/hello", _ => "Hello world!")
   ..group("/api", group => {
     // 添加组级中间件
     group.use_middleware((event, next) => {
@@ -23,61 +20,54 @@ fn main {
       )
       next()
     })
-    group.get("/hello", _ => Text("Hello world!"))
-    group.get("/json", _ => Json({
-      "name": "John Doe",
-      "age": 30,
-      "city": "New York",
-    }))
+    group.get("/hello", _ => "Hello world!")
+    group.get("/json", _ => (
+      { "name": "John Doe", "age": 30, "city": "New York" } : Json))
   })
 
   // JSON Response
-  ..get("/json", _event => Json({
-    "name": "John Doe",
-    "age": 30,
-    "city": "New York",
-  }))
+  ..get("/json", _event => (
+    { "name": "John Doe", "age": 30, "city": "New York" } : Json))
 
   // Async Response
   ..get("/async_data", async fn(_event) noraise {
-    Json({ "name": "John Doe", "age": 30, "city": "New York" })
+    ({ "name": "John Doe", "age": 30, "city": "New York" } : Json)
   })
 
   // Dynamic Routes
   // /hello2/World = Hello, World!
   ..get("/hello/:name", event => {
     let name = event.params.get("name").unwrap_or("World")
-    Text("Hello, \{name}!")
+    "Hello, \{name}!"
   })
   // /hello2/World = Hello, World!
   ..get("/hello2/*", event => {
     let name = event.params.get("_").unwrap_or("World")
-    Text("Hello, \{name}!")
+    "Hello, \{name}!"
   })
 
   // Wildcard Routes
   // /hello3/World/World = Hello, World/World!
   ..get("/hello3/**", event => {
     let name = event.params.get("_").unwrap_or("World")
-    Text("Hello, \{name}!")
+    "Hello, \{name}!"
   })
 
   // Echo Server
-  ..post("/echo", e => e.req.body)
+  ..post("/echo", e => e.req)
 
   // 404 Page
-  ..get("/404", e => {
-    e.res.status_code = 404
-    HTML(
+  ..get("/404", _ => @mocket.HttpResponse::new(NotFound).body(
+    @mocket.html(
       (
         #|<html>
         #|<body>
         #|  <h1>404</h1>
         #|</body>
         #|</html>
       ),
-    )
-  })
+    ),
+  ))
 
   // Print Server URL
   for path in app.mappings.keys() {
@@ -87,3 +77,15 @@ fn main {
   // Serve
   app.serve(port=4000)
 }
+
+///|
+pub async fn logger_middleware(
+  event : @mocket.MocketEvent,
+  next : async () -> &@mocket.Responder noraise,
+) -> &@mocket.Responder noraise {
+  let start_time = @env.now()
+  let res = next()
+  let duration = @env.now() - start_time
+  println("\{event.req.http_method} \{event.req.url} - \{duration}ms")
+  res
+}

src/examples/route/pkg.generated.mbti

@@ -1,7 +1,12 @@
 // Generated using `moon info`, DON'T EDIT IT
 package "oboard/mocket/examples/route"
 
+import(
+  "oboard/mocket"
+)
+
 // Values
+async fn logger_middleware(@mocket.MocketEvent, async () -> &@mocket.Responder noraise) -> &@mocket.Responder noraise
 
 // Errors