fix Nightly CI

Author: Guest0x0

examples/tcp_ping_pong/main.mbt

@@ -36,9 +36,9 @@ async fn server(println : Printer) -> Unit {
           while conn.read(buf) is n && n > 0 {
             @async.sleep(10)
             let msg = buf.unsafe_reinterpret_as_bytes()[0:n]
-            println("server received: \{msg}")
-            let reply = b"pong"
-            conn.write(reply)
+            println("server received: \{@encoding/utf8.decode(msg)}")
+            let reply = "pong"
+            conn.write_string(reply, encoding=UTF8)
             println("server sent: \{reply}")
             if msg == b"exit" {
               println("server initiate terminate")
@@ -60,20 +60,21 @@ async fn server(println : Printer) -> Unit {
 }
 
 ///|
-async fn client(println : Printer, id : Int, msg : Bytes) -> Unit {
+async fn client(println : Printer, id : Int, msg : String) -> Unit {
   let conn = @socket.TCP::connect(@socket.Addr::parse("127.0.0.1:\{port}"))
   defer conn.close()
   // The sleep here is used to make test result stable and portable,
   // because this message is in race condition
   // with server side "received connection" message
   @async.sleep(10)
   println("client \{id}: connection established")
-  conn.write(msg)
+  conn.write_string(msg, encoding=UTF8)
   println("client \{id} sent: \{msg}")
   let buf = FixedArray::make(1024, b'0')
   if conn.read(buf) is n && n > 0 {
     @async.sleep(10)
     let msg = buf.unsafe_reinterpret_as_bytes()[0:n]
+    let msg = @encoding/utf8.decode(msg)
     println("client \{id} received: \{msg}")
   } else {
     println("client \{id}: connection closed by peer")
@@ -87,12 +88,12 @@ pub async fn main_prog(println : Printer) -> Unit {
     root.spawn_bg(fn() {
       @async.with_task_group(fn(ctx) {
         for i in 0..<6 {
-          let msg = if i % 3 == 1 { b"pong" } else { b"ping" }
+          let msg = if i % 3 == 1 { "pong" } else { "ping" }
           ctx.spawn_bg(() => client(println, i, msg))
           @async.sleep(100)
         }
       })
-      root.spawn_bg(() => client(println, 6, b"exit"))
+      root.spawn_bg(() => client(println, 6, "exit"))
     })
   }) catch {
     ServerTerminate => ()

examples/tcp_ping_pong/main_test.mbt

@@ -26,53 +26,53 @@ async test "main" {
     content=(
       #|received new connection
       #|client 0: connection established
-      #|client 0 sent: b"\x70\x69\x6e\x67"
-      #|server received: b"\x70\x69\x6e\x67"
-      #|server sent: b"\x70\x6f\x6e\x67"
-      #|client 0 received: b"\x70\x6f\x6e\x67"
+      #|client 0 sent: ping
+      #|server received: ping
+      #|server sent: pong
+      #|client 0 received: pong
       #|server: connection closed by peer
       #|received new connection
       #|client 1: connection established
-      #|client 1 sent: b"\x70\x6f\x6e\x67"
-      #|server received: b"\x70\x6f\x6e\x67"
-      #|server sent: b"\x70\x6f\x6e\x67"
-      #|client 1 received: b"\x70\x6f\x6e\x67"
+      #|client 1 sent: pong
+      #|server received: pong
+      #|server sent: pong
+      #|client 1 received: pong
       #|server: connection closed by peer
       #|received new connection
       #|client 2: connection established
-      #|client 2 sent: b"\x70\x69\x6e\x67"
-      #|server received: b"\x70\x69\x6e\x67"
-      #|server sent: b"\x70\x6f\x6e\x67"
-      #|client 2 received: b"\x70\x6f\x6e\x67"
+      #|client 2 sent: ping
+      #|server received: ping
+      #|server sent: pong
+      #|client 2 received: pong
       #|server: connection closed by peer
       #|received new connection
       #|client 3: connection established
-      #|client 3 sent: b"\x70\x69\x6e\x67"
-      #|server received: b"\x70\x69\x6e\x67"
-      #|server sent: b"\x70\x6f\x6e\x67"
-      #|client 3 received: b"\x70\x6f\x6e\x67"
+      #|client 3 sent: ping
+      #|server received: ping
+      #|server sent: pong
+      #|client 3 received: pong
       #|server: connection closed by peer
       #|received new connection
       #|client 4: connection established
-      #|client 4 sent: b"\x70\x6f\x6e\x67"
-      #|server received: b"\x70\x6f\x6e\x67"
-      #|server sent: b"\x70\x6f\x6e\x67"
-      #|client 4 received: b"\x70\x6f\x6e\x67"
+      #|client 4 sent: pong
+      #|server received: pong
+      #|server sent: pong
+      #|client 4 received: pong
       #|server: connection closed by peer
       #|received new connection
       #|client 5: connection established
-      #|client 5 sent: b"\x70\x69\x6e\x67"
-      #|server received: b"\x70\x69\x6e\x67"
-      #|server sent: b"\x70\x6f\x6e\x67"
-      #|client 5 received: b"\x70\x6f\x6e\x67"
+      #|client 5 sent: ping
+      #|server received: ping
+      #|server sent: pong
+      #|client 5 received: pong
       #|server: connection closed by peer
       #|received new connection
       #|client 6: connection established
-      #|client 6 sent: b"\x65\x78\x69\x74"
-      #|server received: b"\x65\x78\x69\x74"
-      #|server sent: b"\x70\x6f\x6e\x67"
+      #|client 6 sent: exit
+      #|server received: exit
+      #|server sent: pong
       #|server initiate terminate
-      #|client 6 received: b"\x70\x6f\x6e\x67"
+      #|client 6 received: pong
       #|server terminate: Cancelled
       #|Ok(())
     ),

examples/tcp_ping_pong/moon.pkg.json

@@ -1,7 +1,8 @@
 {
   "import": [
     "moonbitlang/async",
-    "moonbitlang/async/socket"
+    "moonbitlang/async/socket",
+    "moonbitlang/async/io"
   ],
   "is-main": true
 }

examples/udp_ping_pong/main.mbt

@@ -32,9 +32,9 @@ async fn server(println : Printer) -> Unit {
       group.spawn_bg(fn() {
         @async.sleep(10)
         let msg = buf.unsafe_reinterpret_as_bytes()[0:n]
-        println("server received: \{msg}")
-        let reply = b"pong"
-        server_sock.sendto(reply, addr)
+        println("server received: \{@encoding/utf8.decode(msg)}")
+        let reply = "pong"
+        server_sock.sendto(@encoding/utf8.encode(reply), addr)
         println("server sent: \{reply}")
         if msg == b"exit" {
           println("server initiate terminate")
@@ -53,17 +53,17 @@ async fn server(println : Printer) -> Unit {
 }
 
 ///|
-async fn client(println : Printer, id : Int, msg : Bytes) -> Unit {
+async fn client(println : Printer, id : Int, msg : String) -> Unit {
   let conn = @socket.UDP::new()
   defer conn.close()
   conn.connect(@socket.Addr::parse("127.0.0.1:\{port}"))
-  conn.send(msg)
+  conn.send(@encoding/utf8.encode(msg))
   println("client \{id} sent: \{msg}")
   let buf = FixedArray::make(1024, b'0')
   if conn.recv(buf) is n && n > 0 {
     @async.sleep(10)
     let msg = buf.unsafe_reinterpret_as_bytes()[0:n]
-    println("client \{id} received: \{msg}")
+    println("client \{id} received: \{@encoding/utf8.decode(msg)}")
     conn.close()
   } else {
     println("client \{id}: connection closed by peer")
@@ -77,12 +77,12 @@ pub async fn main_prog(println : Printer) -> Unit {
     root.spawn_bg(fn() {
       @async.with_task_group(fn(ctx) {
         for i in 0..<6 {
-          let msg = if i % 3 == 1 { b"pong" } else { b"ping" }
+          let msg = if i % 3 == 1 { "pong" } else { "ping" }
           ctx.spawn_bg(() => client(println, i, msg))
           @async.sleep(100)
         }
       })
-      root.spawn_bg(() => client(println, 6, b"exit"))
+      root.spawn_bg(() => client(println, 6, "exit"))
     })
   }) catch {
     ServerTerminate => ()

examples/udp_ping_pong/main_test.mbt

@@ -24,33 +24,33 @@ async test "main" {
   inspect(
     log.to_string(),
     content=(
-      #|client 0 sent: b"\x70\x69\x6e\x67"
-      #|server received: b"\x70\x69\x6e\x67"
-      #|server sent: b"\x70\x6f\x6e\x67"
-      #|client 0 received: b"\x70\x6f\x6e\x67"
-      #|client 1 sent: b"\x70\x6f\x6e\x67"
-      #|server received: b"\x70\x6f\x6e\x67"
-      #|server sent: b"\x70\x6f\x6e\x67"
-      #|client 1 received: b"\x70\x6f\x6e\x67"
-      #|client 2 sent: b"\x70\x69\x6e\x67"
-      #|server received: b"\x70\x69\x6e\x67"
-      #|server sent: b"\x70\x6f\x6e\x67"
-      #|client 2 received: b"\x70\x6f\x6e\x67"
-      #|client 3 sent: b"\x70\x69\x6e\x67"
-      #|server received: b"\x70\x69\x6e\x67"
-      #|server sent: b"\x70\x6f\x6e\x67"
-      #|client 3 received: b"\x70\x6f\x6e\x67"
-      #|client 4 sent: b"\x70\x6f\x6e\x67"
-      #|server received: b"\x70\x6f\x6e\x67"
-      #|server sent: b"\x70\x6f\x6e\x67"
-      #|client 4 received: b"\x70\x6f\x6e\x67"
-      #|client 5 sent: b"\x70\x69\x6e\x67"
-      #|server received: b"\x70\x69\x6e\x67"
-      #|server sent: b"\x70\x6f\x6e\x67"
-      #|client 5 received: b"\x70\x6f\x6e\x67"
-      #|client 6 sent: b"\x65\x78\x69\x74"
-      #|server received: b"\x65\x78\x69\x74"
-      #|server sent: b"\x70\x6f\x6e\x67"
+      #|client 0 sent: ping
+      #|server received: ping
+      #|server sent: pong
+      #|client 0 received: pong
+      #|client 1 sent: pong
+      #|server received: pong
+      #|server sent: pong
+      #|client 1 received: pong
+      #|client 2 sent: ping
+      #|server received: ping
+      #|server sent: pong
+      #|client 2 received: pong
+      #|client 3 sent: ping
+      #|server received: ping
+      #|server sent: pong
+      #|client 3 received: pong
+      #|client 4 sent: pong
+      #|server received: pong
+      #|server sent: pong
+      #|client 4 received: pong
+      #|client 5 sent: ping
+      #|server received: ping
+      #|server sent: pong
+      #|client 5 received: pong
+      #|client 6 sent: exit
+      #|server received: exit
+      #|server sent: pong
       #|server initiate terminate
       #|server terminate: ServerTerminate
       #|Ok(())

src/http/utils.mbt

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 ///|
-fn parse_int(src : @bytes.View, base~ : Int) -> Int? {
+fn parse_int(src : BytesView, base~ : Int) -> Int? {
   for i = 0, acc = 0; i < src.length(); {
     match src[i] {
       '0'..='9' as c => {

src/internal/bytes_util/util.mbt

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 ///|
-pub fn ascii_to_string(ascii : @bytes.View) -> String {
+pub fn ascii_to_string(ascii : BytesView) -> String {
   let builder = StringBuilder::new()
   for byte in ascii {
     match byte {

src/io/buffered_reader.mbt

@@ -164,7 +164,7 @@ pub async fn[R : Reader] BufferedReader::op_as_view(
   self : Self[R],
   start? : Int = 0,
   end~ : Int,
-) -> @bytes.View {
+) -> BytesView {
   guard start < end
   self.ensure(end)
   self.buf.unsafe_reinterpret_as_bytes()[self.start + start:self.start + end]

src/io/buffered_reader_test.mbt

@@ -36,19 +36,21 @@ async test "BufferedReader::read" {
     let reader = @io.BufferedReader::new(r)
     let buf = FixedArray::make(6, b'0')
     while reader.read(buf) is n && n > 0 {
-      log.write_string("received: \{buf.unsafe_reinterpret_as_bytes()[0:n]}\n")
+      let data = buf.unsafe_reinterpret_as_bytes()[0:n]
+      let data = @encoding/utf8.decode(data)
+      log.write_string("received: \{data}\n")
     }
     log.write_string("buffered reader closed\n")
   })
   inspect(
     log.to_string(),
     content=(
       #|writing 4 bytes of data
-      #|received: b"\x61\x62\x63\x64"
+      #|received: abcd
       #|writing 4 bytes of data
-      #|received: b"\x65\x66\x67\x68"
+      #|received: efgh
       #|writing 4 bytes of data
-      #|received: b"\x69\x6a\x6b\x6c"
+      #|received: ijkl
       #|buffered reader closed
       #|
     ),
@@ -65,6 +67,7 @@ async test "BufferedReader::read_exactly" {
     let reader = @io.BufferedReader::new(r)
     for {
       let data = reader.read_exactly(6)
+      let data = @encoding/utf8.decode(data)
       log.write_string("received: \{data}\n")
     }
   }) catch {
@@ -75,9 +78,9 @@ async test "BufferedReader::read_exactly" {
     content=(
       #|writing 4 bytes of data
       #|writing 4 bytes of data
-      #|received: b"\x61\x62\x63\x64\x65\x66"
+      #|received: abcdef
       #|writing 4 bytes of data
-      #|received: b"\x67\x68\x69\x6a\x6b\x6c"
+      #|received: ghijkl
       #|ReaderClosed
     ),
   )
@@ -128,27 +131,31 @@ async test "BufferedReader::op_as_view" {
       root.spawn_bg(() => writer(log, w))
       defer r.close()
       let reader = @io.BufferedReader::new(r)
-      log.write_string("reader[0:6]: \{reader[0:6]}\n")
+      let slice = @encoding/utf8.decode(reader[0:6])
+      log.write_string("reader[0:6]: \{slice}\n")
       // should be idempotent
-      log.write_string("reader[0:6]: \{reader[0:6]}\n")
+      let slice = @encoding/utf8.decode(reader[0:6])
+      log.write_string("reader[0:6]: \{slice}\n")
       log.write_string("reader.drop(4)\n")
       reader.drop(4)
-      log.write_string("reader[0:6]: \{reader[0:6]}\n")
+      let slice = @encoding/utf8.decode(reader[0:6])
+      log.write_string("reader[0:6]: \{slice}\n")
       log.write_string("reader.drop(4)\n")
       reader.drop(4)
-      log.write_string("reader[0:6]: \{reader[0:6]}\n")
+      let slice = @encoding/utf8.decode(reader[0:6])
+      log.write_string("reader[0:6]: \{slice}\n")
     }),
   )
   inspect(
     log.to_string(),
     content=(
       #|writing 4 bytes of data
       #|writing 4 bytes of data
-      #|reader[0:6]: b"\x61\x62\x63\x64\x65\x66"
-      #|reader[0:6]: b"\x61\x62\x63\x64\x65\x66"
+      #|reader[0:6]: abcdef
+      #|reader[0:6]: abcdef
       #|reader.drop(4)
       #|writing 4 bytes of data
-      #|reader[0:6]: b"\x65\x66\x67\x68\x69\x6a"
+      #|reader[0:6]: efghij
       #|reader.drop(4)
       #|Err(ReaderClosed)
     ),

src/io/buffered_writer_test.mbt

@@ -70,7 +70,9 @@ async test "BufferedWriter::write_reader" {
       let buf = FixedArray::make(1024, b'0')
       while r1.read(buf) is n && n > 0 {
         @async.sleep(10)
-        log.write_string("received \{buf.unsafe_reinterpret_as_bytes()[:n]}\n")
+        let data = buf.unsafe_reinterpret_as_bytes()[:n]
+        let data = @encoding/utf8.decode(data)
+        log.write_string("received \{data}\n")
       }
     })
     root.spawn_bg(fn() {
@@ -90,9 +92,9 @@ async test "BufferedWriter::write_reader" {
     content=(
       #|sending 4 bytes
       #|sending 4 bytes
-      #|received b"\x61\x62\x63\x64\x65\x66"
+      #|received abcdef
       #|sending 4 bytes
-      #|received b"\x67\x68\x69\x6a\x6b\x6c"
+      #|received ghijkl
       #|
     ),
   )