summaryrefslogtreecommitdiff
path: root/src/codec
diff options
context:
space:
mode:
Diffstat (limited to 'src/codec')
-rw-r--r--src/codec/decode.rs60
-rw-r--r--src/codec/encode.rs58
-rw-r--r--src/codec/error.rs13
3 files changed, 112 insertions, 19 deletions
diff --git a/src/codec/decode.rs b/src/codec/decode.rs
index 1059811..3e03a84 100644
--- a/src/codec/decode.rs
+++ b/src/codec/decode.rs
@@ -1,11 +1,11 @@
use std::{io::Read, sync::Arc};
-use crate::DEFAULT_BUFFER_LEN;
+use crate::{DEFAULT_BUFFER_LEN, context::Context};
macro_rules! impl_decode {
($type: ty) => {
impl Decode for $type {
- fn decode(reader: &mut dyn Read) -> crate::codec::error::Result<Self>
+ fn decode(reader: &mut dyn Read, _: &dyn Context) -> crate::codec::error::Result<Self>
where
Self: Sized,
{
@@ -19,13 +19,13 @@ macro_rules! impl_decode {
}
pub trait Decode {
- fn decode(reader: &mut dyn Read) -> crate::codec::error::Result<Self>
+ fn decode(reader: &mut dyn Read, ctx: &dyn Context) -> crate::codec::error::Result<Self>
where
Self: Sized;
}
impl Decode for bool {
- fn decode(reader: &mut dyn Read) -> crate::codec::error::Result<Self>
+ fn decode(reader: &mut dyn Read, _: &dyn Context) -> crate::codec::error::Result<Self>
where
Self: Sized,
{
@@ -35,8 +35,48 @@ impl Decode for bool {
}
}
+impl<T: Decode> Decode for Option<T> {
+ fn decode(reader: &mut dyn Read, ctx: &dyn Context) -> crate::codec::error::Result<Self>
+ where
+ Self: Sized,
+ {
+ let tag = u8::decode(reader, ctx)?;
+ if tag == 0 {
+ Ok(None)
+ } else {
+ Ok(Some(T::decode(reader, ctx)?))
+ }
+ }
+}
+
+impl<T: Decode> Decode for Vec<T> {
+ fn decode(reader: &mut dyn Read, ctx: &dyn Context) -> crate::codec::error::Result<Self>
+ where
+ Self: Sized,
+ {
+ let len = usize::decode(reader, ctx)?;
+ let mut vec = Vec::with_capacity(len);
+ for _ in 0..len {
+ vec.push(T::decode(reader, ctx)?);
+ }
+ Ok(vec)
+ }
+}
+
+impl Decode for String {
+ fn decode(reader: &mut dyn Read, _: &dyn Context) -> crate::codec::error::Result<Self>
+ where
+ Self: Sized,
+ {
+ // assume reader is limited
+ let mut bytes: Vec<u8> = Vec::new();
+ reader.read_to_end(&mut bytes)?;
+ Ok(String::from_utf8_lossy(&bytes).to_string())
+ }
+}
+
impl Decode for Arc<[u8]> {
- fn decode(reader: &mut dyn Read) -> crate::codec::error::Result<Self> {
+ fn decode(reader: &mut dyn Read, _: &dyn Context) -> crate::codec::error::Result<Self> {
let mut buf = Vec::with_capacity(DEFAULT_BUFFER_LEN);
reader.read_to_end(&mut buf)?;
Ok(Arc::<[u8]>::from(buf.into_boxed_slice()))
@@ -44,7 +84,7 @@ impl Decode for Arc<[u8]> {
}
impl<const S: usize> Decode for [u8; S] {
- fn decode(reader: &mut dyn Read) -> crate::codec::error::Result<Self>
+ fn decode(reader: &mut dyn Read, _: &dyn Context) -> crate::codec::error::Result<Self>
where
Self: Sized,
{
@@ -69,22 +109,22 @@ impl_decode!(i128);
impl_decode!(isize);
impl Decode for f64 {
- fn decode(reader: &mut dyn Read) -> crate::codec::error::Result<Self>
+ fn decode(reader: &mut dyn Read, ctx: &dyn Context) -> crate::codec::error::Result<Self>
where
Self: Sized,
{
- let bits = u64::decode(reader)?;
+ let bits = u64::decode(reader, ctx)?;
let value = f64::from_bits(bits);
Ok(value)
}
}
impl Decode for f32 {
- fn decode(reader: &mut dyn Read) -> crate::codec::error::Result<Self>
+ fn decode(reader: &mut dyn Read, ctx: &dyn Context) -> crate::codec::error::Result<Self>
where
Self: Sized,
{
- let bits = u32::decode(reader)?;
+ let bits = u32::decode(reader, ctx)?;
let value = f32::from_bits(bits);
Ok(value)
}
diff --git a/src/codec/encode.rs b/src/codec/encode.rs
index a40f551..70d9d5c 100644
--- a/src/codec/encode.rs
+++ b/src/codec/encode.rs
@@ -1,10 +1,10 @@
-use crate::codec::error::Error;
+use crate::{codec::error::Error, context::Context};
use std::{io::Write, sync::Arc};
macro_rules! impl_encode {
($t: ty) => {
impl Encode for $t {
- fn encode(self, buffer: &mut dyn Write) -> Result<usize, Error> {
+ fn encode(&self, buffer: &mut dyn Write, _: &dyn Context) -> Result<usize, Error> {
let size = buffer.write(&self.to_be_bytes())?;
Ok(size)
}
@@ -13,26 +13,57 @@ macro_rules! impl_encode {
}
pub trait Encode {
- fn encode(self, buffer: &mut dyn Write) -> Result<usize, Error>;
+ fn encode(&self, buffer: &mut dyn Write, ctx: &dyn Context) -> Result<usize, Error>;
}
impl Encode for bool {
- fn encode(self, buffer: &mut dyn Write) -> Result<usize, Error> {
- let size = buffer.write(&[self as u8])?;
+ fn encode(&self, buffer: &mut dyn Write, _: &dyn Context) -> Result<usize, Error> {
+ let size = buffer.write(&[*self as u8])?;
Ok(size)
}
}
+impl<T: Encode> Encode for Option<T> {
+ fn encode(&self, buffer: &mut dyn Write, ctx: &dyn Context) -> Result<usize, Error> {
+ match self {
+ Some(val) => {
+ let mut size = 1u8.encode(buffer, ctx)?;
+ size += val.encode(buffer, ctx)?;
+ Ok(size)
+ }
+ None => 0u8.encode(buffer, ctx),
+ }
+ }
+}
+
+impl<T: Encode> Encode for Vec<T> {
+ fn encode(&self, buffer: &mut dyn Write, ctx: &dyn Context) -> Result<usize, Error> {
+ let mut size = self.len().encode(buffer, ctx)?;
+ for item in self {
+ size += item.encode(buffer, ctx)?;
+ }
+ Ok(size)
+ }
+}
+
+impl Encode for String {
+ fn encode(&self, buffer: &mut dyn Write, _: &dyn Context) -> Result<usize, Error> {
+ let utf8 = self.as_bytes();
+ buffer.write_all(utf8)?;
+ Ok(utf8.len())
+ }
+}
+
impl Encode for Arc<[u8]> {
- fn encode(self, buffer: &mut dyn Write) -> Result<usize, Error> {
- let len = buffer.write(&self)?;
+ fn encode(&self, buffer: &mut dyn Write, _: &dyn Context) -> Result<usize, Error> {
+ let len = buffer.write(self)?;
Ok(len)
}
}
impl<const S: usize> Encode for [u8; S] {
- fn encode(self, buffer: &mut dyn Write) -> Result<usize, Error> {
- let len = buffer.write(&self)?;
+ fn encode(&self, buffer: &mut dyn Write, _ctx: &dyn Context) -> Result<usize, Error> {
+ let len = buffer.write(self)?;
Ok(len)
}
}
@@ -53,3 +84,12 @@ impl_encode!(isize);
impl_encode!(f32);
impl_encode!(f64);
+
+impl<T> Encode for T
+where
+ T: AsRef<dyn Encode>,
+{
+ fn encode(&self, buffer: &mut dyn Write, ctx: &dyn Context) -> Result<usize, Error> {
+ self.as_ref().encode(buffer, ctx)
+ }
+}
diff --git a/src/codec/error.rs b/src/codec/error.rs
index 6639c98..6037a9a 100644
--- a/src/codec/error.rs
+++ b/src/codec/error.rs
@@ -3,6 +3,7 @@ use std::fmt::Display;
#[derive(Debug)]
pub enum Error {
IoError(std::io::Error),
+ Custom(String),
}
impl std::error::Error for Error {}
@@ -20,3 +21,15 @@ impl From<std::io::Error> for Error {
Self::IoError(value)
}
}
+
+impl From<String> for Error {
+ fn from(value: String) -> Self {
+ Self::Custom(value)
+ }
+}
+
+impl From<&str> for Error {
+ fn from(value: &str) -> Self {
+ Self::Custom(value.to_string())
+ }
+}
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-16 02:29:13 +0000