mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-03 21:07:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

change recv/poll_recv api

Browse source
This commit is contained in:
Nikolay Kim 2021-12-22 02:13:02 +06:00
parent 2e7547948e
commit fd97208a01
17 changed files with 119 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ntex-io/src/dispatcher.rs
View file

@ -221,21 +221,21 @@ where
Poll::Ready(()) => {
// decode incoming bytes if buffer is ready
match io.poll_recv(&slf.shared.codec, cx) {
Poll::Ready(Some(Ok(el))) => {
Poll::Ready(Ok(Some(el))) => {
slf.update_keepalive();
DispatchItem::Item(el)
}
Poll::Ready(Some(Err(Either::Left(err)))) => {
Poll::Ready(Err(Either::Left(err))) => {
slf.st.set(DispatcherState::Stop);
slf.unregister_keepalive();
DispatchItem::DecoderError(err)
}
Poll::Ready(Some(Err(Either::Right(err)))) => {
Poll::Ready(Err(Either::Right(err))) => {
slf.st.set(DispatcherState::Stop);
slf.unregister_keepalive();
DispatchItem::Disconnect(Some(err))
}
Poll::Ready(None) => {
Poll::Ready(Ok(None)) => {
DispatchItem::Disconnect(None)
}
Poll::Pending => {

104
ntex-io/src/io.rs
View file

@ -410,7 +410,7 @@ impl<F> Io<F> {
pub async fn recv<U>(
&self,
codec: &U,
) -> Option<Result<U::Item, Either<U::Error, io::Error>>>
) -> Result<Option<U::Item>, Either<U::Error, io::Error>>
where
U: Decoder,
{
@ -418,8 +418,8 @@ impl<F> Io<F> {
}
#[inline]
/// Wake read task and instruct to read more data
pub async fn read_ready(&self) -> Option<io::Result<()>> {
/// Wait until read becomes ready.
pub async fn read_ready(&self) -> io::Result<Option<()>> {
poll_fn(|cx| self.poll_read_ready(cx)).await
}
@ -442,8 +442,8 @@ impl<F> Io<F> {
/// Encode item, send to a peer
pub async fn send<U>(
&self,
item: U::Item,
codec: &U,
item: U::Item,
) -> Result<(), Either<U::Error, io::Error>>
where
U: Encoder,
@ -470,22 +470,31 @@ impl<F> Io<F> {
}
#[inline]
/// Shut down connection
/// Shut down io stream
pub async fn shutdown(&self) -> Result<(), io::Error> {
poll_fn(|cx| self.poll_shutdown(cx)).await
}
#[inline]
/// Wake read task and instruct to read more data
/// Polls for read readiness.
///
/// Read task is awake only if back-pressure is enabled
/// otherwise it is already awake. Buffer read status gets clean up.
pub fn poll_read_ready(&self, cx: &mut Context<'_>) -> Poll<Option<io::Result<()>>> {
/// If the io stream is not currently ready for reading,
/// this method will store a clone of the Waker from the provided Context.
/// When the io stream becomes ready for reading, Waker::wake will be called on the waker.
///
/// Return value
/// The function returns:
///
/// `Poll::Pending` if the io stream is not ready for reading.
/// `Poll::Ready(Ok(Some(()))))` if the io stream is ready for reading.
/// `Poll::Ready(Ok(None))` if io stream is disconnected
/// `Some(Poll::Ready(Err(e)))` if an error is encountered.
pub fn poll_read_ready(&self, cx: &mut Context<'_>) -> Poll<io::Result<Option<()>>> {
if !self.0 .0.is_io_open() {
if let Some(err) = self.0 .0.error.take() {
Poll::Ready(Some(Err(err)))
Poll::Ready(Err(err))
} else {
Poll::Ready(None)
Poll::Ready(Ok(None))
}
} else {
self.0 .0.dispatch_task.register(cx.waker());
@ -498,7 +507,7 @@ impl<F> Io<F> {
self.0 .0.read_task.wake();
self.0 .0.flags.set(flags);
if ready {
Poll::Ready(Some(Ok(())))
Poll::Ready(Ok(Some(())))
} else {
Poll::Pending
}
@ -507,7 +516,7 @@ impl<F> Io<F> {
flags.remove(Flags::RD_READY);
self.0 .0.flags.set(flags);
self.0 .0.read_task.wake();
Poll::Ready(Some(Ok(())))
Poll::Ready(Ok(Some(())))
} else {
Poll::Pending
}
@ -523,18 +532,18 @@ impl<F> Io<F> {
&self,
codec: &U,
cx: &mut Context<'_>,
) -> Poll<Option<Result<U::Item, Either<U::Error, io::Error>>>>
) -> Poll<Result<Option<U::Item>, Either<U::Error, io::Error>>>
where
U: Decoder,
{
match self.decode(codec) {
Ok(Some(el)) => Poll::Ready(Some(Ok(el))),
Ok(Some(el)) => Poll::Ready(Ok(Some(el))),
Ok(None) => match self.poll_read_ready(cx) {
Poll::Pending | Poll::Ready(Some(Ok(()))) => Poll::Pending,
Poll::Ready(Some(Err(e))) => Poll::Ready(Some(Err(Either::Right(e)))),
Poll::Ready(None) => Poll::Ready(None),
Poll::Pending | Poll::Ready(Ok(Some(()))) => Poll::Pending,
Poll::Ready(Err(e)) => Poll::Ready(Err(Either::Right(e))),
Poll::Ready(Ok(None)) => Poll::Ready(Ok(None)),
},
Err(err) => Poll::Ready(Some(Err(Either::Left(err)))),
Err(err) => Poll::Ready(Err(Either::Left(err))),
}
}
@ -602,7 +611,7 @@ impl<F> Io<F> {
}
#[inline]
/// Shut down connection
/// Shut down io stream
pub fn poll_shutdown(&self, cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
let flags = self.flags();
@ -621,61 +630,6 @@ impl<F> Io<F> {
}
}
}
#[doc(hidden)]
#[deprecated]
#[inline]
pub async fn next<U>(
&self,
codec: &U,
) -> Option<Result<U::Item, Either<U::Error, io::Error>>>
where
U: Decoder,
{
self.recv(codec).await
}
#[doc(hidden)]
#[deprecated]
#[inline]
pub async fn write_ready(&self, full: bool) -> Result<(), io::Error> {
poll_fn(|cx| self.poll_flush(cx, full)).await
}
#[doc(hidden)]
#[deprecated]
#[inline]
pub fn poll_write_ready(
&self,
cx: &mut Context<'_>,
full: bool,
) -> Poll<io::Result<()>> {
self.poll_flush(cx, full)
}
#[doc(hidden)]
#[deprecated]
#[inline]
#[allow(clippy::type_complexity)]
pub fn poll_read_next<U>(
&self,
codec: &U,
cx: &mut Context<'_>,
) -> Poll<Option<Result<U::Item, Either<U::Error, io::Error>>>>
where
U: Decoder,
{
self.poll_recv(codec, cx)
}
#[doc(hidden)]
#[deprecated]
#[inline]
pub fn enable_write_backpressure(&self, cx: &mut Context<'_>) {
log::trace!("enable write back-pressure for dispatcher");
self.0 .0.insert_flags(Flags::WR_BACKPRESSURE);
self.0 .0.dispatch_task.register(cx.waker());
}
}
impl<F> Drop for Io<F> {

12
ntex-io/src/ioref.rs
View file

@ -321,7 +321,7 @@ mod tests {
client.read_error(io::Error::new(io::ErrorKind::Other, "err"));
let msg = state.recv(&BytesCodec).await;
assert!(msg.unwrap().is_err());
assert!(msg.is_err());
assert!(state.flags().contains(Flags::IO_ERR));
assert!(state.flags().contains(Flags::DSP_STOP));
@ -332,7 +332,7 @@ mod tests {
client.read_error(io::Error::new(io::ErrorKind::Other, "err"));
let res = poll_fn(|cx| Poll::Ready(state.poll_recv(&BytesCodec, cx))).await;
if let Poll::Ready(msg) = res {
assert!(msg.unwrap().is_err());
assert!(msg.is_err());
assert!(state.flags().contains(Flags::IO_ERR));
assert!(state.flags().contains(Flags::DSP_STOP));
}
@ -341,14 +341,14 @@ mod tests {
client.remote_buffer_cap(1024);
let state = Io::new(server);
state
.send(Bytes::from_static(b"test"), &BytesCodec)
.send(&BytesCodec, Bytes::from_static(b"test"))
.await
.unwrap();
let buf = client.read().await.unwrap();
assert_eq!(buf, Bytes::from_static(b"test"));
client.write_error(io::Error::new(io::ErrorKind::Other, "err"));
let res = state.send(Bytes::from_static(b"test"), &BytesCodec).await;
let res = state.send(&BytesCodec, Bytes::from_static(b"test")).await;
assert!(res.is_err());
assert!(state.flags().contains(Flags::IO_ERR));
assert!(state.flags().contains(Flags::DSP_STOP));
@ -492,7 +492,7 @@ mod tests {
assert_eq!(msg, Bytes::from_static(BIN));
state
.send(Bytes::from_static(b"test"), &BytesCodec)
.send(&BytesCodec, Bytes::from_static(b"test"))
.await
.unwrap();
let buf = client.read().await.unwrap();
@ -523,7 +523,7 @@ mod tests {
assert_eq!(msg, Bytes::from_static(BIN));
state
.send(Bytes::from_static(b"test"), &BytesCodec)
.send(&BytesCodec, Bytes::from_static(b"test"))
.await
.unwrap();
let buf = client.read().await.unwrap();

18
ntex-io/src/tokio_impl.rs
View file

@ -2,7 +2,7 @@ use std::task::{Context, Poll};
use std::{any, cell::RefCell, cmp, future::Future, io, mem, pin::Pin, rc::Rc};
use ntex_bytes::{Buf, BufMut, BytesMut};
use ntex_util::time::{sleep, Sleep};
use ntex_util::{ready, time::sleep, time::Sleep};
use tok_io::io::{AsyncRead, AsyncWrite, ReadBuf};
use tok_io::net::TcpStream;
@ -362,10 +362,10 @@ impl<F: Filter> AsyncRead for Io<F> {
});
if len == 0 {
match self.poll_read_ready(cx) {
Poll::Pending | Poll::Ready(Some(Ok(()))) => Poll::Pending,
Poll::Ready(Some(Err(e))) => Poll::Ready(Err(e)),
Poll::Ready(None) => Poll::Ready(Ok(())),
match ready!(self.poll_read_ready(cx)) {
Ok(Some(())) => Poll::Pending,
Ok(None) => Poll::Ready(Ok(())),
Err(e) => Poll::Ready(Err(e)),
}
} else {
Poll::Ready(Ok(()))
@ -407,10 +407,10 @@ impl AsyncRead for IoBoxed {
});
if len == 0 {
match self.poll_read_ready(cx) {
Poll::Pending | Poll::Ready(Some(Ok(()))) => Poll::Pending,
Poll::Ready(Some(Err(e))) => Poll::Ready(Err(e)),
Poll::Ready(None) => Poll::Ready(Ok(())),
match ready!(self.poll_read_ready(cx)) {
Ok(Some(())) => Poll::Pending,
Err(e) => Poll::Ready(Err(e)),
Ok(None) => Poll::Ready(Ok(())),
}
} else {
Poll::Ready(Ok(()))

5
ntex-tls/examples/client.rs
View file

@ -20,13 +20,14 @@ async fn main() -> io::Result<()> {
let io = connector.connect("127.0.0.1:8443").await.unwrap();
println!("Connected to ssl server");
let result = io
.send(Bytes::from_static(b"hello"), &codec::BytesCodec)
.send(&codec::BytesCodec, Bytes::from_static(b"hello"))
.await
.map_err(Either::into_inner)?;
let resp = io
.next(&codec::BytesCodec)
.recv(&codec::BytesCodec)
.await
.map_err(|e| e.into_inner())?
.ok_or_else(|| io::Error::new(io::ErrorKind::Other, "disconnected"))?;
println!("disconnecting");

12
ntex-tls/examples/rustls-server.rs
View file

@ -41,25 +41,25 @@ async fn main() -> io::Result<()> {
println!("New client is connected");
io.send(
ntex_bytes::Bytes::from_static(b"Welcome!\n"),
&codec::BytesCodec,
ntex_bytes::Bytes::from_static(b"Welcome!\n"),
)
.await
.map_err(Either::into_inner)?;
loop {
match io.next(&codec::BytesCodec).await {
Some(Ok(msg)) => {
match io.recv(&codec::BytesCodec).await {
Ok(Some(msg)) => {
println!("Got message: {:?}", msg);
io.send(msg.freeze(), &codec::BytesCodec)
io.send(&codec::BytesCodec, msg.freeze())
.await
.map_err(Either::into_inner)?;
}
Some(Err(e)) => {
Err(e) => {
println!("Got error: {:?}", e);
break;
}
None => break,
Ok(None) => break,
}
}
println!("Client is disconnected");

10
ntex-tls/examples/server.rs
View file

@ -29,18 +29,18 @@ async fn main() -> io::Result<()> {
.and_then(fn_service(|io: Io<_>| async move {
println!("New client is connected");
loop {
match io.next(&codec::BytesCodec).await {
Some(Ok(msg)) => {
match io.recv(&codec::BytesCodec).await {
Ok(Some(msg)) => {
println!("Got message: {:?}", msg);
io.send(msg.freeze(), &codec::BytesCodec)
io.send(&codec::BytesCodec, msg.freeze())
.await
.map_err(Either::into_inner)?;
}
Some(Err(e)) => {
Err(e) => {
println!("Got error: {:?}", e);
break;
}
None => break,
Ok(None) => break,
}
}
println!("Client is disconnected");

4
ntex-tls/src/openssl/mod.rs
View file

@ -341,10 +341,10 @@ fn handle_result<T, F>(
Err(e) => match e.code() {
ssl::ErrorCode::WANT_READ => {
match ready!(io.poll_read_ready(cx)) {
None => Err::<_, Box<dyn Error>>(
Ok(None) => Err::<_, Box<dyn Error>>(
io::Error::new(io::ErrorKind::Other, "disconnected").into(),
),
Some(Err(err)) => Err(err.into()),
Err(err) => Err(err.into()),
_ => Ok(()),
}?;
Poll::Pending

9
ntex-tls/src/rustls/client.rs
View file

@ -251,11 +251,11 @@ impl<F: Filter> TlsClientFilter<F> {
};
if result.is_ok() && wants_read {
poll_fn(|cx| match ready!(io.poll_read_ready(cx)) {
None => Poll::Ready(Err(io::Error::new(
Ok(None) => Poll::Ready(Err(io::Error::new(
io::ErrorKind::Other,
"disconnected",
))),
Some(Err(e)) => Poll::Ready(Err(e)),
Err(e) => Poll::Ready(Err(e)),
_ => Poll::Ready(Ok(())),
})
.await?;
@ -265,13 +265,12 @@ impl<F: Filter> TlsClientFilter<F> {
Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
poll_fn(|cx| {
let read_ready = if wants_read {
match ready!(io.poll_read_ready(cx)) {
match ready!(io.poll_read_ready(cx))? {
Some(_) => Ok(true),
None => Err(io::Error::new(
io::ErrorKind::Other,
"disconnected",
)),
Some(Err(e)) => Err(e),
Some(Ok(_)) => Ok(true),
}?
} else {
true

10
ntex-tls/src/rustls/server.rs
View file

@ -251,12 +251,11 @@ impl<F: Filter> TlsServerFilter<F> {
};
if result.is_ok() && wants_read {
poll_fn(|cx| {
match ready!(io.poll_read_ready(cx)) {
match ready!(io.poll_read_ready(cx))? {
Some(_) => Ok(()),
None => {
Err(io::Error::new(io::ErrorKind::Other, "disconnected"))
}
Some(Err(e)) => Err(e),
_ => Ok(()),
}?;
Poll::Ready(Ok::<_, io::Error>(()))
})
@ -267,13 +266,12 @@ impl<F: Filter> TlsServerFilter<F> {
Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
poll_fn(|cx| {
let read_ready = if wants_read {
match ready!(io.poll_read_ready(cx)) {
match ready!(io.poll_read_ready(cx))? {
Some(_) => Ok(true),
None => Err(io::Error::new(
io::ErrorKind::Other,
"disconnected",
)),
Some(Err(e)) => Err(e),
Some(Ok(_)) => Ok(true),
}?
} else {
true

11
ntex/src/http/client/h1proto.rs
View file

@ -59,7 +59,7 @@ where
// send request
let codec = h1::ClientCodec::default();
io.send((head, body.size()).into(), &codec).await?;
io.send(&codec, (head, body.size()).into()).await?;
log::trace!("http1 request has been sent");
@ -74,8 +74,7 @@ where
log::trace!("reading http1 response");
// read response and init read body
let head = if let Some(result) = io.recv(&codec).await {
let result = result?;
let head = if let Some(result) = io.recv(&codec).await? {
log::trace!(
"http1 response is received, type: {:?}, response: {:#?}",
codec.message_type(),
@ -105,11 +104,11 @@ pub(super) async fn open_tunnel(
) -> Result<(ResponseHead, IoBoxed, h1::ClientCodec), SendRequestError> {
// create Framed and send request
let codec = h1::ClientCodec::default();
io.send((head, BodySize::None).into(), &codec).await?;
io.send(&codec, (head, BodySize::None).into()).await?;
// read response
if let Some(head) = io.recv(&codec).await {
Ok((head?, io, codec))
if let Some(head) = io.recv(&codec).await? {
Ok((head, io, codec))
} else {
Err(SendRequestError::from(ConnectError::Disconnected))
}

26
ntex/src/http/h1/dispatcher.rs
View file

@ -285,7 +285,7 @@ where
// decode incoming bytes stream
match io.poll_recv(&this.inner.codec, cx) {
Poll::Ready(Some(Ok((mut req, pl)))) => {
Poll::Ready(Ok(Some((mut req, pl)))) => {
log::trace!(
"http message is received: {:?} and payload {:?}",
req,
@ -350,7 +350,13 @@ where
);
}
}
Poll::Ready(Some(Err(Either::Left(err)))) => {
Poll::Ready(Ok(None)) => {
// peer is gone
log::trace!("peer is gone");
let e = DispatchError::Disconnect(None);
set_error!(this, e);
}
Poll::Ready(Err(Either::Left(err))) => {
// Malformed requests, respond with 400
log::trace!("malformed request: {:?}", err);
let (res, body) =
@ -358,18 +364,12 @@ where
this.inner.error = Some(DispatchError::Parse(err));
*this.st = this.inner.send_response(res, body.into_body());
}
Poll::Ready(Some(Err(Either::Right(err)))) => {
Poll::Ready(Err(Either::Right(err))) => {
log::trace!("peer is gone with {:?}", err);
// peer is gone
let e = DispatchError::Disconnect(Some(err));
set_error!(this, e);
}
Poll::Ready(None) => {
log::trace!("peer is gone");
// peer is gone
let e = DispatchError::Disconnect(None);
set_error!(this, e);
}
Poll::Pending => {
log::trace!("not enough data to decode http message");
return Poll::Pending;
@ -612,11 +612,11 @@ where
loop {
let res = io.poll_recv(&payload.0, cx);
match res {
Poll::Ready(Some(Ok(PayloadItem::Chunk(chunk)))) => {
Poll::Ready(Ok(Some(PayloadItem::Chunk(chunk)))) => {
updated = true;
payload.1.feed_data(chunk);
}
Poll::Ready(Some(Ok(PayloadItem::Eof))) => {
Poll::Ready(Ok(Some(PayloadItem::Eof))) => {
payload.1.feed_eof();
self.payload = None;
if !updated {
@ -624,12 +624,12 @@ where
}
break;
}
Poll::Ready(None) => {
Poll::Ready(Ok(None)) => {
payload.1.set_error(PayloadError::EncodingCorrupted);
self.payload = None;
return Poll::Ready(Err(ParseError::Incomplete.into()));
}
Poll::Ready(Some(Err(e))) => {
Poll::Ready(Err(e)) => {
payload.1.set_error(PayloadError::EncodingCorrupted);
self.payload = None;
return Poll::Ready(Err(match e {

12
ntex/tests/connect.rs
View file

@ -12,7 +12,7 @@ use ntex::util::Bytes;
async fn test_string() {
let srv = test_server(|| {
fn_service(|io: Io| async move {
io.send(Bytes::from_static(b"test"), &BytesCodec)
io.send(&BytesCodec, Bytes::from_static(b"test"))
.await
.unwrap();
Ok::<_, io::Error>(())
@ -30,7 +30,7 @@ async fn test_string() {
async fn test_rustls_string() {
let srv = test_server(|| {
fn_service(|io: Io| async move {
io.send(Bytes::from_static(b"test"), &BytesCodec)
io.send(&BytesCodec, Bytes::from_static(b"test"))
.await
.unwrap();
Ok::<_, io::Error>(())
@ -47,7 +47,7 @@ async fn test_rustls_string() {
async fn test_static_str() {
let srv = test_server(|| {
fn_service(|io: Io| async move {
io.send(Bytes::from_static(b"test"), &BytesCodec)
io.send(&BytesCodec, Bytes::from_static(b"test"))
.await
.unwrap();
Ok::<_, io::Error>(())
@ -69,7 +69,7 @@ async fn test_static_str() {
async fn test_new_service() {
let srv = test_server(|| {
fn_service(|io: Io| async move {
io.send(Bytes::from_static(b"test"), &BytesCodec)
io.send(&BytesCodec, Bytes::from_static(b"test"))
.await
.unwrap();
Ok::<_, io::Error>(())
@ -89,7 +89,7 @@ async fn test_uri() {
let srv = test_server(|| {
fn_service(|io: Io| async move {
io.send(Bytes::from_static(b"test"), &BytesCodec)
io.send(&BytesCodec, Bytes::from_static(b"test"))
.await
.unwrap();
Ok::<_, io::Error>(())
@ -111,7 +111,7 @@ async fn test_rustls_uri() {
let srv = test_server(|| {
fn_service(|io: Io| async move {
io.send(Bytes::from_static(b"test"), &BytesCodec)
io.send(&BytesCodec, Bytes::from_static(b"test"))
.await
.unwrap();
Ok::<_, io::Error>(())

8
ntex/tests/http_awc_ws.rs
View file

@ -54,27 +54,27 @@ async fn test_simple() {
// client service
let (_, io, codec) = srv.ws().await.unwrap().into_inner();
io.send(ws::Message::Text(ByteString::from_static("text")), &codec)
io.send(&codec, ws::Message::Text(ByteString::from_static("text")))
.await
.unwrap();
let item = io.recv(&codec).await.unwrap().unwrap();
assert_eq!(item, ws::Frame::Text(Bytes::from_static(b"text")));
io.send(ws::Message::Binary("text".into()), &codec)
io.send(&codec, ws::Message::Binary("text".into()))
.await
.unwrap();
let item = io.recv(&codec).await.unwrap().unwrap();
assert_eq!(item, ws::Frame::Binary(Bytes::from_static(b"text")));
io.send(ws::Message::Ping("text".into()), &codec)
io.send(&codec, ws::Message::Ping("text".into()))
.await
.unwrap();
let item = io.recv(&codec).await.unwrap().unwrap();
assert_eq!(item, ws::Frame::Pong("text".to_string().into()));
io.send(
ws::Message::Close(Some(ws::CloseCode::Normal.into())),
&codec,
ws::Message::Close(Some(ws::CloseCode::Normal.into())),
)
.await
.unwrap();

28
ntex/tests/http_ws.rs
View file

@ -97,7 +97,7 @@ async fn test_simple() {
assert_eq!(conn.response().status(), StatusCode::SWITCHING_PROTOCOLS);
let (_, io, codec) = conn.into_inner();
io.send(ws::Message::Text(ByteString::from_static("text")), &codec)
io.send(&codec, ws::Message::Text(ByteString::from_static("text")))
.await
.unwrap();
let item = io.recv(&codec).await;
@ -106,7 +106,7 @@ async fn test_simple() {
ws::Frame::Text(Bytes::from_static(b"text"))
);
io.send(ws::Message::Binary("text".into()), &codec)
io.send(&codec, ws::Message::Binary("text".into()))
.await
.unwrap();
let item = io.recv(&codec).await;
@ -115,7 +115,7 @@ async fn test_simple() {
ws::Frame::Binary(Bytes::from_static(&b"text"[..]))
);
io.send(ws::Message::Ping("text".into()), &codec)
io.send(&codec, ws::Message::Ping("text".into()))
.await
.unwrap();
let item = io.recv(&codec).await;
@ -125,8 +125,8 @@ async fn test_simple() {
);
io.send(
ws::Message::Continuation(ws::Item::FirstText("text".into())),
&codec,
ws::Message::Continuation(ws::Item::FirstText("text".into())),
)
.await
.unwrap();
@ -138,22 +138,22 @@ async fn test_simple() {
assert!(io
.send(
&codec,
ws::Message::Continuation(ws::Item::FirstText("text".into())),
&codec
)
.await
.is_err());
assert!(io
.send(
&codec,
ws::Message::Continuation(ws::Item::FirstBinary("text".into())),
&codec
)
.await
.is_err());
io.send(
ws::Message::Continuation(ws::Item::Continue("text".into())),
&codec,
ws::Message::Continuation(ws::Item::Continue("text".into())),
)
.await
.unwrap();
@ -164,8 +164,8 @@ async fn test_simple() {
);
io.send(
ws::Message::Continuation(ws::Item::Last("text".into())),
&codec,
ws::Message::Continuation(ws::Item::Last("text".into())),
)
.await
.unwrap();
@ -177,23 +177,23 @@ async fn test_simple() {
assert!(io
.send(
&codec,
ws::Message::Continuation(ws::Item::Continue("text".into())),
&codec
)
.await
.is_err());
assert!(io
.send(
&codec,
ws::Message::Continuation(ws::Item::Last("text".into())),
&codec
)
.await
.is_err());
io.send(
ws::Message::Continuation(ws::Item::FirstBinary(Bytes::from_static(b"bin"))),
&codec,
ws::Message::Continuation(ws::Item::FirstBinary(Bytes::from_static(b"bin"))),
)
.await
.unwrap();
@ -204,8 +204,8 @@ async fn test_simple() {
);
io.send(
ws::Message::Continuation(ws::Item::Continue("text".into())),
&codec,
ws::Message::Continuation(ws::Item::Continue("text".into())),
)
.await
.unwrap();
@ -216,8 +216,8 @@ async fn test_simple() {
);
io.send(
ws::Message::Continuation(ws::Item::Last("text".into())),
&codec,
ws::Message::Continuation(ws::Item::Last("text".into())),
)
.await
.unwrap();
@ -228,8 +228,8 @@ async fn test_simple() {
);
io.send(
ws::Message::Close(Some(ws::CloseCode::Normal.into())),
&codec,
ws::Message::Close(Some(ws::CloseCode::Normal.into())),
)
.await
.unwrap();

2
ntex/tests/server.rs
View file

@ -77,7 +77,7 @@ fn test_run() {
.disable_signals()
.bind("test", addr, move |_| {
fn_service(|io: Io| async move {
io.send(Bytes::from_static(b"test"), &BytesCodec)
io.send(&BytesCodec, Bytes::from_static(b"test"))
.await
.unwrap();
Ok::<_, ()>(())

8
ntex/tests/web_ws.rs
View file

@ -38,27 +38,27 @@ async fn web_ws() {
// client service
let (_, io, codec) = srv.ws().await.unwrap().into_inner();
io.send(ws::Message::Text(ByteString::from_static("text")), &codec)
io.send(&codec, ws::Message::Text(ByteString::from_static("text")))
.await
.unwrap();
let item = io.recv(&codec).await.unwrap().unwrap();
assert_eq!(item, ws::Frame::Text(Bytes::from_static(b"text")));
io.send(ws::Message::Binary("text".into()), &codec)
io.send(&codec, ws::Message::Binary("text".into()))
.await
.unwrap();
let item = io.recv(&codec).await.unwrap().unwrap();
assert_eq!(item, ws::Frame::Binary(Bytes::from_static(b"text")));
io.send(ws::Message::Ping("text".into()), &codec)
io.send(&codec, ws::Message::Ping("text".into()))
.await
.unwrap();
let item = io.recv(&codec).await.unwrap().unwrap();
assert_eq!(item, ws::Frame::Pong("text".to_string().into()));
io.send(
ws::Message::Close(Some(ws::CloseCode::Normal.into())),
&codec,
ws::Message::Close(Some(ws::CloseCode::Normal.into())),
)
.await
.unwrap();