Refactor h1 dispatcher (#38)

* refactor h1 dispatcher

* Rename FrameReadTask/FramedWriteTask to ReadTask/WriteTask

* Make Encoder and Decoder methods immutable

ntex-codec/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.3.0] - 2021-01-23
+
+* Make Encoder and Decoder methods immutable
+
 ## [0.2.2] - 2021-01-21
 
 * Flush underlying io stream

ntex-codec/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-codec"
-version = "0.2.2"
+version = "0.3.0-b.1"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Utilities for encoding and decoding frames"
 keywords = ["network", "framework", "async", "futures"]
@@ -18,12 +18,12 @@ path = "src/lib.rs"
 [dependencies]
 bitflags = "1.2.1"
 bytes = "0.5.6"
-either = "1.5.3"
+either = "1.6.1"
 futures-core = "0.3.12"
 futures-sink = "0.3.12"
 log = "0.4"
 tokio = { version = "0.2.6", default-features=false }
 
 [dev-dependencies]
-ntex = "0.2.0-b.2"
+ntex = "0.2.0-b.3"
 futures = "0.3.12"

ntex-codec/src/bcodec.rs

@@ -14,7 +14,7 @@ impl Encoder for BytesCodec {
     type Error = io::Error;
 
     #[inline]
-    fn encode(&mut self, item: Bytes, dst: &mut BytesMut) -> Result<(), Self::Error> {
+    fn encode(&self, item: Bytes, dst: &mut BytesMut) -> Result<(), Self::Error> {
         dst.extend_from_slice(item.bytes());
         Ok(())
     }
@@ -24,7 +24,7 @@ impl Decoder for BytesCodec {
     type Item = BytesMut;
     type Error = io::Error;
 
-    fn decode(&mut self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
+    fn decode(&self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
         if src.is_empty() {
             Ok(None)
         } else {

ntex-codec/src/decoder.rs

@@ -1,4 +1,5 @@
 use bytes::BytesMut;
+use std::rc::Rc;
 
 /// Decoding of frames via buffers.
 pub trait Decoder {
@@ -13,7 +14,7 @@ pub trait Decoder {
     type Error: std::fmt::Debug;
 
     /// Attempts to decode a frame from the provided buffer of bytes.
-    fn decode(&mut self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error>;
+    fn decode(&self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error>;
 
     /// A default method available to be called when there are no more bytes
     /// available to be read from the underlying I/O.
@@ -22,13 +23,26 @@ pub trait Decoder {
     /// `Ok(None)` is returned while there is unconsumed data in `buf`.
     /// Typically this doesn't need to be implemented unless the framing
     /// protocol differs near the end of the stream.
-    fn decode_eof(
-        &mut self,
-        buf: &mut BytesMut,
-    ) -> Result<Option<Self::Item>, Self::Error> {
+    fn decode_eof(&self, buf: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
         match self.decode(buf)? {
             Some(frame) => Ok(Some(frame)),
             None => Ok(None),
         }
     }
 }
+
+impl<T> Decoder for Rc<T>
+where
+    T: Decoder,
+{
+    type Item = T::Item;
+    type Error = T::Error;
+
+    fn decode(&self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
+        (**self).decode(src)
+    }
+
+    fn decode_eof(&self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
+        (**self).decode_eof(src)
+    }
+}

ntex-codec/src/encoder.rs

@@ -1,4 +1,5 @@
 use bytes::BytesMut;
+use std::rc::Rc;
 
 /// Trait of helper objects to write out messages as bytes.
 pub trait Encoder {
@@ -9,9 +10,17 @@ pub trait Encoder {
     type Error: std::fmt::Debug;
 
     /// Encodes a frame into the buffer provided.
-    fn encode(
-        &mut self,
-        item: Self::Item,
-        dst: &mut BytesMut,
-    ) -> Result<(), Self::Error>;
+    fn encode(&self, item: Self::Item, dst: &mut BytesMut) -> Result<(), Self::Error>;
+}
+
+impl<T> Encoder for Rc<T>
+where
+    T: Encoder,
+{
+    type Item = T::Item;
+    type Error = T::Error;
+
+    fn encode(&self, item: Self::Item, dst: &mut BytesMut) -> Result<(), Self::Error> {
+        (**self).encode(item, dst)
+    }
 }