Merge pull request #4 from oboard/feat/websocket

Feat/websocket

Author: oboard

AGENTS.md

@@ -0,0 +1,51 @@
+# Project Agents.md Guide
+
+This is a [MoonBit](https://docs.moonbitlang.com) project.
+
+## Project Structure
+
+- MoonBit packages are organized per directory, for each directory, there is a
+  `moon.pkg.json` file listing its dependencies. Each package has its files and
+  blackbox test files (common, ending in `_test.mbt`) and whitebox test files
+  (ending in `_wbtest.mbt`).
+
+- In the toplevel directory, this is a `moon.mod.json` file listing about the
+  module and some meta information.
+
+## Coding convention
+
+- MoonBit code is organized in block style, each block is separated by `///|`,
+  the order of each block is irrelevant. In some refactorings, you can process
+  block by block independently.
+
+- Try to keep deprecated blocks in file called `deprecated.mbt` in each
+  directory.
+
+## Tooling
+
+- `moon fmt` is used to format your code properly.
+
+- `moon info` is used to update the generated interface of the package, each
+  package has a generated interface file `.mbti`, it is a brief formal
+  description of the package. If nothing in `.mbti` changes, this means your
+  change does not bring the visible changes to the external package users, it is
+  typically a safe refactoring.
+
+- In the last step, run `moon info && moon fmt` to update the interface and
+  format the code. Check the diffs of `.mbti` file to see if the changes are
+  expected.
+
+- Run `moon test` to check the test is passed. MoonBit supports snapshot
+  testing, so when your changes indeed change the behavior of the code, you
+  should run `moon test --update` to update the snapshot.
+
+- You can run `moon check` to check the code is linted correctly.
+
+- When writing tests, you are encouraged to use `inspect` and run
+  `moon test --update` to update the snapshots, only use assertions like
+  `assert_eq` when you are in some loops where each snapshot may vary. You can
+  use `moon coverage analyze > uncovered.log` to see which parts of your code
+  are not covered by tests.
+
+- agent-todo.md has some small tasks that are easy for AI to pick up, agent is
+  welcome to finish the tasks and check the box when you are done

moon.mod.json

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

src/async.mbt

@@ -1,5 +1,5 @@
 ///|
-pub fn run(f : async () -> Unit noraise) -> Unit = "%async.run"
+pub fn async_run(f : async () -> Unit noraise) -> Unit = "%async.run"
 
 ///|
 /// `suspend` 会中断当前协程的运行。

src/body_reader.mbt

@@ -11,19 +11,89 @@ fn read_body(
   body_bytes : BytesView,
 ) -> HttpBody raise BodyError {
   let content_type = req_headers.get("Content-Type")
-  match content_type {
-    Some([.. "application/json", ..]) => {
-      let json = @encoding/utf8.decode(body_bytes) catch {
-        _ => raise BodyError::InvalidJsonCharset
+  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))
+        _ => Bytes(body_bytes)
       }
-      Json(@json.parse(json) catch { _ => raise BodyError::InvalidJson })
     }
-    Some([.. "text/plain", ..] | [.. "text/html", ..]) =>
-      Text(
-        @encoding/utf8.decode(body_bytes) catch {
-          _ => raise BodyError::InvalidText
-        },
-      )
-    _ => Bytes(body_bytes)
   }
+  Bytes(body_bytes)
+}
+
+///|
+priv struct ContentType {
+  media_type : StringView
+  subtype : StringView
+  params : Map[StringView, StringView]
+} derive(Show)
+
+///|
+fn parse_content_type(s : String) -> ContentType? {
+  let parts = s.split(";").to_array()
+  if parts.is_empty() {
+    None
+  } else {
+    let main_part_str = parts[0].trim_space()
+    let media_type_parts = main_part_str.split("/").to_array()
+    if media_type_parts.length() != 2 {
+      None
+    } else {
+      let media_type = media_type_parts[0].trim_space()
+      let subtype = media_type_parts[1].trim_space()
+      let params = {}
+      for i in 1..<parts.length() {
+        let param_part = parts[i].trim_space()
+        let eq_index = param_part.find("=")
+        try {
+          match eq_index {
+            Some(idx) => {
+              let key = param_part[0:idx].trim_space()
+              let value = param_part[idx + 1:].trim_space()
+              params[key] = value
+            }
+            None => () // Ignore malformed parameters
+          }
+        } catch {
+          _ => ()
+        }
+      }
+      Some({ media_type, subtype, params })
+    }
+  }
+}
+
+///|
+test "parse_content_type" {
+  inspect(
+    parse_content_type("application/json; charset=utf-8"),
+    content=(
+      #|Some({media_type: "application", subtype: "json", params: {"charset": "utf-8"}})
+    ),
+  )
+}
+
+///|
+test "parse_form_data" {
+  inspect(
+    parse_form_data(b"name=John+Doe&age=30"),
+    content=(
+      #|{"name": "John Doe", "age": "30"}
+    ),
+  )
 }

src/example/main.mbt src/examples/route/main.mbtsrc/example/main.mbt renamed to src/examples/route/main.mbt

@@ -1,5 +1,5 @@
 // Generated using `moon info`, DON'T EDIT IT
-package "oboard/mocket/example"
+package "oboard/mocket/examples/route"
 
 // Values
 

src/example/moon.pkg.json src/examples/route/moon.pkg.jsonsrc/example/moon.pkg.json renamed to src/examples/route/moon.pkg.json

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

src/example/pkg.generated.mbti src/examples/route/pkg.generated.mbtisrc/example/pkg.generated.mbti renamed to src/examples/route/pkg.generated.mbti

@@ -0,0 +1,13 @@
+// Generated using `moon info`, DON'T EDIT IT
+package "oboard/mocket/examples/websocket"
+
+// Values
+
+// Errors
+
+// Types and methods
+
+// Type aliases
+
+// Traits
+

src/examples/websocket/moon.pkg.json

@@ -0,0 +1,18 @@
+///|
+fn main {
+  let app = @mocket.new(logger=@mocket.new_logger())
+  app.ws("/ws", event => match event {
+    Open(peer) => println("WS open: " + peer.to_string())
+    Message(peer, body) => {
+      let msg = match body {
+        Text(s) => s.to_string()
+        _ => ""
+      }
+      println("WS message: " + msg)
+      peer.send(msg)
+    }
+    Close(peer) => println("WS close: " + peer.to_string())
+  })
+  println("WebSocket echo server listening on ws://localhost:8080/ws")
+  app.serve(port=8080)
+}