upgrade: moon 0.9.3+67df401b9

Author: oboard

cors/moon.pkg

@@ -1,3 +1,7 @@
 import {
   "oboard/mocket",
 }
+
+// Suppress warning 20 from MoonBit's generated native test driver.
+
+warnings = "-20"

dispatch.mbt

@@ -17,7 +17,7 @@ pub async fn dispatch_http(
   }
   let responder = mocket.execute_middlewares(event, handler)
   responder.options(event.res)
-  let buf = @buffer.new()
+  let buf = Buffer()
   responder.output(buf)
   event.res.raw_body = buf.to_bytes()
   event.res

index.mbt

@@ -53,7 +53,7 @@ pub(all) enum SameSiteOption {
 } derive(Eq)
 
 ///|
-pub impl Show for SameSiteOption with output(self, logger) -> Unit {
+pub impl Show for SameSiteOption with fn output(self, logger) -> Unit {
   match self {
     Lax => logger.write_string("Lax")
     Strict => logger.write_string("Strict")
@@ -62,7 +62,7 @@ pub impl Show for SameSiteOption with output(self, logger) -> Unit {
 }
 
 ///|
-pub impl ToJson for SameSiteOption with to_json(self : SameSiteOption) -> Json {
+pub impl ToJson for SameSiteOption with fn to_json(self : SameSiteOption) -> Json {
   match self {
     Lax => "lax"
     Strict => "strict"
@@ -83,7 +83,7 @@ pub(all) struct CookieItem {
 } derive(Eq)
 
 ///|
-pub impl Show for CookieItem with output(self, logger) -> Unit {
+pub impl Show for CookieItem with fn output(self, logger) -> Unit {
   logger.write_string(self.name)
   logger.write_char('=')
   logger.write_string(self.value)
@@ -112,8 +112,8 @@ pub impl Show for CookieItem with output(self, logger) -> Unit {
 }
 
 ///|
-pub impl Show for CookieItem with to_string(self : CookieItem) -> String {
-  let buf = @buffer.new()
+pub impl Show for CookieItem with fn to_string(self : CookieItem) -> String {
+  let buf = StringBuilder::new()
   self.output(buf)
   buf.to_string()
 }

js/moon.pkg

@@ -3,6 +3,10 @@ import {
   "moonbitlang/core/test",
 }
 
+// Suppress warning 20 from MoonBit's generated native test driver.
+
+warnings = "-20"
+
 options(
   targets: {
     "async.mbt": [ "js" ],

mocket.js.mbt

@@ -33,6 +33,16 @@ extern "js" fn HttpRequestInternal::on(
   handler : (@js.Value) -> Unit,
 ) -> Unit = "(s, event, handler) => s.on(event, handler)"
 
+///|
+#borrow(data)
+extern "js" fn node_body_chunk_to_bytes(data : @js.Value) -> Bytes =
+  #| (data) => {
+  #|   if (data instanceof Uint8Array) {
+  #|     return new Uint8Array(data);
+  #|   }
+  #|   return new TextEncoder().encode(String(data));
+  #| }
+
 ///|
 #borrow(self)
 extern "js" fn HttpRequestInternal::headers(
@@ -329,10 +339,12 @@ pub fn listen_ffi(mocket : Mocket, address : String) -> Unit {
     async_run(() => {
       // 如果是 post，先等待 data 事件
       if event.req.http_method == "POST" {
-        let buffer = @buffer.new()
+        let buffer = Buffer()
         (try? suspend(fn(res, _) {
-          req.on("data", data => buffer.write_string(data.to_string()))
-          req.on("end", _ => res(buffer.to_string()))
+          req.on("data", data => {
+            buffer.write_bytes(node_body_chunk_to_bytes(data))
+          })
+          req.on("end", _ => res(()))
         }))
         |> ignore
         event.req.raw_body = buffer.to_bytes()
@@ -358,7 +370,7 @@ pub fn listen_ffi(mocket : Mocket, address : String) -> Unit {
           headers_obj
         },
       )
-      let buf = @buffer.new()
+      let buf = Buffer()
       responder.output(buf)
       event.res.raw_body = buf.to_bytes()
       res.end(@js.Value::cast_from(event.res.raw_body))
@@ -446,14 +458,14 @@ pub fn __ws_emit_js_port(
   }
   let peer = WebSocketPeer::{ connection_id, subscribed_channels: [] }
   match event_type {
-    "open" => handler(WebSocketEvent::Open(peer))
+    "open" => handler(Open(peer))
     "message" => {
       let msg = @utf8.decode(payload) catch { _ => "" }
-      handler(WebSocketEvent::Message(peer, Text(msg)))
+      handler(Message(peer, Text(msg)))
     }
-    "binary" => handler(WebSocketEvent::Message(peer, Binary(payload)))
-    "ping" => handler(WebSocketEvent::Message(peer, Ping))
-    "close" => handler(WebSocketEvent::Close(peer))
+    "binary" => handler(Message(peer, Binary(payload)))
+    "ping" => handler(Message(peer, Ping))
+    "close" => handler(Close(peer))
     _ => ()
   }
 }

moon.mod

@@ -0,0 +1,20 @@
+name = "oboard/mocket"
+
+version = "0.7.4"
+
+import {
+  "moonbitlang/async@0.19.1",
+  "moonbitlang/x@0.4.43",
+}
+
+readme = "README.md"
+
+repository = "https://github.com/oboard/mocket"
+
+license = "Apache-2.0"
+
+keywords = [ "http", "server" ]
+
+description = "A web framework for MoonBit."
+
+preferred_target = "native"

moon.mod.json

@@ -304,7 +304,7 @@ pub type WebSocketHandler = (WebSocketEvent) -> Unit
 
 // Traits
 pub(open) trait BodyReader {
-  from_request(HttpRequest) -> Self raise
+  fn from_request(HttpRequest) -> Self raise
 }
 pub impl BodyReader for String
 pub impl BodyReader for FixedArray[Byte]
@@ -313,8 +313,8 @@ pub impl BodyReader for Array[Byte]
 pub impl BodyReader for Json
 
 pub(open) trait Responder {
-  options(Self, HttpResponse) -> Unit
-  output(Self, @buffer.Buffer) -> Unit
+  fn options(Self, HttpResponse) -> Unit
+  fn output(Self, @buffer.Buffer) -> Unit
 }
 pub impl Responder for String
 pub impl Responder for Bytes
@@ -323,11 +323,11 @@ pub impl Responder for &ToJson
 pub impl Responder for StringView
 
 pub(open) trait ServeStaticProvider {
-  get_meta(Self, String) -> StaticAssetMeta?
-  get_contents(Self, String) -> &Responder
-  get_type(Self, String) -> String?
-  get_encodings(Self) -> Map[String, String]
-  get_index_names(Self) -> Array[String]
-  get_fallthrough(Self) -> Bool
+  fn get_meta(Self, String) -> StaticAssetMeta?
+  fn get_contents(Self, String) -> &Responder
+  fn get_type(Self, String) -> String?
+  fn get_encodings(Self) -> Map[String, String]
+  fn get_index_names(Self) -> Array[String]
+  fn get_fallthrough(Self) -> Bool
 }
 

pkg.generated.mbti

@@ -36,7 +36,7 @@ pub fn HttpResponse::body(
   self : HttpResponse,
   body : &Responder,
 ) -> HttpResponse {
-  let buf = @buffer.new()
+  let buf = Buffer()
   body.output(buf)
   self.raw_body = buf.to_bytes()
   self

response.mbt

@@ -2,3 +2,7 @@ import {
   "oboard/mocket",
   "moonbitlang/x/fs",
 }
+
+// Suppress warning 20 from MoonBit's generated native test driver.
+
+warnings = "-20"