fix safe_io blocking issue and use latest monoio version

Author: ihciah

example/Cargo.toml

@@ -4,12 +4,12 @@ name = "monoio-tls-example"
 version = "0.1.0"
 
 [dependencies]
-monoio = {version = "0.0.7", path = "../../monoio/monoio"}
+monoio = {version = "0.0.8"}
 rustls = {version = "0.20", features = ["tls12"]}
 rustls-pemfile = "1"
 webpki-roots = "0.22"
 
-monoio-rustls = {version = "0.0.3", path = "../monoio-rustls", features = ["tls12"]}
+monoio-rustls = {version = "0.0.4", path = "../monoio-rustls", features = ["tls12"]}
 
 [[bin]]
 name = "server"

monoio-rustls/Cargo.toml

@@ -8,23 +8,23 @@ license = "MIT/Apache-2.0"
 name = "monoio-rustls"
 readme = "README.md"
 repository = "https://github.com/monoio-rs/monoio-tls"
-version = "0.0.3"
+version = "0.0.4"
 
 [dependencies]
 bytes = {version = "1"}
-monoio = {version = "0.0.7", default-features = false}
+monoio = {version = "0.0.8", default-features = false, features = ["bytes"]}
 rustls = {version = "0.20", default-features = false}
 thiserror = {version = "1"}
 
 [features]
 dangerous_configuration = ["rustls/dangerous_configuration"]
-default = ["logging", "tls12", "unsafe_io"]
+default = ["logging", "tls12"]
 logging = ["rustls/logging"]
 tls12 = ["rustls/tls12"]
 # Once unsafe_io is enabled, you may not drop the future before it returns ready.
 # It saves one buffer copy than disabled.
 unsafe_io = []
 
 [dev-dependencies]
-monoio = "0.0.7"
+monoio = {version = "0.0.8", features = ["bytes"]}
 webpki-roots = "0.22"

monoio-rustls/src/lib.rs

@@ -1,3 +1,4 @@
+#![allow(stable_features)]
 #![feature(generic_associated_types)]
 #![feature(type_alias_impl_trait)]
 

monoio-rustls/src/safe_io.rs

@@ -1,7 +1,7 @@
 use std::io;
 
 use bytes::{Buf, BufMut, BytesMut};
-use monoio::io::{AsyncReadRent, AsyncWriteRent};
+use monoio::io::{AsyncReadRent, AsyncWriteRent, AsyncWriteRentExt};
 
 const BUFFER_SIZE: usize = 16 * 1024;
 
@@ -75,7 +75,7 @@ impl SafeWrite {
 
         // buffer is not empty now. write it.
         let buffer = self.buffer.take().expect("buffer ownership expected");
-        let (result, buffer) = io.write(buffer).await;
+        let (result, buffer) = io.write_all(buffer).await;
         self.buffer = Some(buffer);
         let written_len = result?;
         unsafe { self.buffer.as_mut().unwrap_unchecked().advance(written_len) };
@@ -102,6 +102,10 @@ impl io::Write for SafeWrite {
     }
 
     fn flush(&mut self) -> io::Result<()> {
+        let buffer = self.buffer.as_mut().expect("buffer mut expected");
+        if !buffer.is_empty() {
+            return Err(io::ErrorKind::WouldBlock.into());
+        }
         Ok(())
     }
 }