Rename RecvError::StopDispatcher to RecvError::Stop

ntex-io/CHANGES.md

@@ -2,6 +2,8 @@
 
 ## [0.1.0-b.6] - 2021-12-26
 
+* Rename `RecvError::StopDispatcher` to `RecvError::Stop`
+
 * Better error information for .poll_recv() method.
 
 * Remove redundant Io::poll_write_backpressure() method.
@@ -10,6 +12,8 @@
 
 * Fix read filters ordering
 
+* Fix read filter root buffer
+
 ## [0.1.0-b.5] - 2021-12-24
 
 * Use new ntex-service traits

ntex-io/src/dispatcher.rs

@@ -226,7 +226,7 @@ where
                                     slf.st.set(DispatcherState::Stop);
                                     DispatchItem::KeepAliveTimeout
                                 }
-                                Err(RecvError::StopDispatcher) => {
+                                Err(RecvError::Stop) => {
                                     log::trace!("dispatcher is instructed to stop");
                                     slf.st.set(DispatcherState::Stop);
                                     continue;

ntex-io/src/filter.rs

@@ -98,7 +98,7 @@ impl Filter for Base {
 
     #[inline]
     fn get_read_buf(&self) -> Option<BytesMut> {
-        None
+        self.0 .0.read_buf.take()
     }
 
     #[inline]

ntex-io/src/io.rs

@@ -426,7 +426,7 @@ impl<F> Io<F> {
                     io::ErrorKind::Other,
                     "Keep-alive",
                 ))),
-                Err(RecvError::StopDispatcher) => Err(Either::Right(io::Error::new(
+                Err(RecvError::Stop) => Err(Either::Right(io::Error::new(
                     io::ErrorKind::Other,
                     "Dispatcher stopped",
                 ))),
@@ -558,7 +558,7 @@ impl<F> Io<F> {
             Ok(None) => {
                 let flags = self.flags();
                 if flags.contains(Flags::DSP_STOP) {
-                    Poll::Ready(Err(RecvError::StopDispatcher))
+                    Poll::Ready(Err(RecvError::Stop))
                 } else if flags.contains(Flags::DSP_KEEPALIVE) {
                     Poll::Ready(Err(RecvError::KeepAlive))
                 } else if flags.contains(Flags::WR_BACKPRESSURE) {

ntex-io/src/ioref.rs

@@ -324,6 +324,27 @@ mod tests {
         assert!(state.flags().contains(Flags::IO_SHUTDOWN));
     }
 
+    #[ntex::test]
+    async fn read_readiness() {
+        let (client, server) = IoTest::create();
+        client.remote_buffer_cap(1024);
+
+        let io = Io::new(server);
+        assert!(lazy(|cx| io.poll_read_ready(cx)).await.is_pending());
+
+        client.write(TEXT);
+        assert_eq!(io.read_ready().await.unwrap(), Some(()));
+        assert!(lazy(|cx| io.poll_read_ready(cx)).await.is_pending());
+
+        let item = io.with_read_buf(|buffer| buffer.clone());
+        assert_eq!(item, Bytes::from_static(BIN));
+
+        client.write(TEXT);
+        sleep(Millis(50)).await;
+        assert!(lazy(|cx| io.poll_read_ready(cx)).await.is_ready());
+        assert!(lazy(|cx| io.poll_read_ready(cx)).await.is_pending());
+    }
+
     #[ntex::test]
     async fn on_disconnect() {
         let (client, server) = IoTest::create();

ntex-io/src/lib.rs

@@ -103,8 +103,8 @@ pub enum RecvError<U: Decoder> {
     KeepAlive,
     /// Write backpressure is enabled
     WriteBackpressure,
-    /// Dispatcher marked stopped
-    StopDispatcher,
+    /// Stop io stream handling
+    Stop,
     /// Unrecoverable frame decoding errors
     Decoder(U::Error),
     /// Peer is disconnected