removing dev branch, many changes

veilid-core/src/veilid_api/serialize_helpers/mod.rs

@@ -0,0 +1,14 @@
+mod rkyv_enum_set;
+mod rkyv_range_set_blaze;
+pub mod serialize_arc;
+mod serialize_json;
+pub mod serialize_range_set_blaze;
+mod veilid_rkyv;
+
+use super::*;
+use core::fmt::Debug;
+
+pub use rkyv_enum_set::*;
+pub use rkyv_range_set_blaze::*;
+pub use serialize_json::*;
+pub use veilid_rkyv::*;

veilid-core/src/veilid_api/serialize_helpers/rkyv_enum_set.rs

@@ -0,0 +1,53 @@
+use super::*;
+
+pub struct RkyvEnumSet;
+
+impl<T> rkyv::with::ArchiveWith<EnumSet<T>> for RkyvEnumSet
+where
+    T: EnumSetType + EnumSetTypeWithRepr,
+    <T as EnumSetTypeWithRepr>::Repr: rkyv::Archive,
+{
+    type Archived = rkyv::Archived<<T as EnumSetTypeWithRepr>::Repr>;
+    type Resolver = rkyv::Resolver<<T as EnumSetTypeWithRepr>::Repr>;
+
+    #[inline]
+    unsafe fn resolve_with(
+        field: &EnumSet<T>,
+        pos: usize,
+        resolver: Self::Resolver,
+        out: *mut Self::Archived,
+    ) {
+        let r = field.as_repr();
+        r.resolve(pos, resolver, out);
+    }
+}
+
+impl<T, S> rkyv::with::SerializeWith<EnumSet<T>, S> for RkyvEnumSet
+where
+    S: rkyv::Fallible + ?Sized,
+    T: EnumSetType + EnumSetTypeWithRepr,
+    <T as EnumSetTypeWithRepr>::Repr: rkyv::Serialize<S>,
+{
+    fn serialize_with(field: &EnumSet<T>, serializer: &mut S) -> Result<Self::Resolver, S::Error> {
+        let r = field.as_repr();
+        r.serialize(serializer)
+    }
+}
+
+impl<T, D>
+    rkyv::with::DeserializeWith<rkyv::Archived<<T as EnumSetTypeWithRepr>::Repr>, EnumSet<T>, D>
+    for RkyvEnumSet
+where
+    D: rkyv::Fallible + ?Sized,
+    T: EnumSetType + EnumSetTypeWithRepr,
+    <T as EnumSetTypeWithRepr>::Repr: rkyv::Archive,
+    rkyv::Archived<<T as EnumSetTypeWithRepr>::Repr>:
+        rkyv::Deserialize<<T as EnumSetTypeWithRepr>::Repr, D>,
+{
+    fn deserialize_with(
+        field: &rkyv::Archived<<T as EnumSetTypeWithRepr>::Repr>,
+        deserializer: &mut D,
+    ) -> Result<EnumSet<T>, D::Error> {
+        Ok(EnumSet::<T>::from_repr(field.deserialize(deserializer)?))
+    }
+}

veilid-core/src/veilid_api/serialize_helpers/rkyv_range_set_blaze.rs

@@ -0,0 +1,73 @@
+use super::*;
+
+use range_set_blaze::*;
+
+pub struct RkyvRangeSetBlaze;
+
+impl<T> rkyv::with::ArchiveWith<RangeSetBlaze<T>> for RkyvRangeSetBlaze
+where
+    T: rkyv::Archive + Integer,
+{
+    type Archived = rkyv::Archived<Vec<T>>;
+    type Resolver = rkyv::Resolver<Vec<T>>;
+
+    #[inline]
+    unsafe fn resolve_with(
+        field: &RangeSetBlaze<T>,
+        pos: usize,
+        resolver: Self::Resolver,
+        out: *mut Self::Archived,
+    ) {
+        let mut r = Vec::<T>::with_capacity(field.ranges_len() * 2);
+        for range in field.ranges() {
+            r.push(*range.start());
+            r.push(*range.end());
+        }
+        r.resolve(pos, resolver, out);
+    }
+}
+
+impl<T, S> rkyv::with::SerializeWith<RangeSetBlaze<T>, S> for RkyvRangeSetBlaze
+where
+    S: rkyv::Fallible + ?Sized,
+    Vec<T>: rkyv::Serialize<S>,
+    T: rkyv::Archive + Integer,
+{
+    fn serialize_with(
+        field: &RangeSetBlaze<T>,
+        serializer: &mut S,
+    ) -> Result<Self::Resolver, S::Error> {
+        let mut r = Vec::<T>::with_capacity(field.ranges_len() * 2);
+        for range in field.ranges() {
+            r.push(*range.start());
+            r.push(*range.end());
+        }
+        r.serialize(serializer)
+    }
+}
+
+impl<T, D> rkyv::with::DeserializeWith<rkyv::Archived<Vec<T>>, RangeSetBlaze<T>, D>
+    for RkyvRangeSetBlaze
+where
+    D: rkyv::Fallible + ?Sized,
+    T: rkyv::Archive + Integer,
+    rkyv::Archived<T>: rkyv::Deserialize<T, D>,
+    D::Error: From<String>,
+{
+    fn deserialize_with(
+        field: &rkyv::Archived<Vec<T>>,
+        deserializer: &mut D,
+    ) -> Result<RangeSetBlaze<T>, D::Error> {
+        let mut out = RangeSetBlaze::<T>::new();
+        if field.len() % 2 == 1 {
+            return Err("invalid range set length".to_owned().into());
+        }
+        let f = field.as_slice();
+        for i in 0..field.len() / 2 {
+            let l: T = f[i * 2].deserialize(deserializer)?;
+            let u: T = f[i * 2 + 1].deserialize(deserializer)?;
+            out.ranges_insert(l..=u);
+        }
+        Ok(out)
+    }
+}

veilid-core/src/veilid_api/serialize_helpers/serialize_arc.rs

@@ -0,0 +1,12 @@
+use alloc::sync::Arc;
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+pub fn serialize<T: Serialize, S: Serializer>(v: &Arc<T>, s: S) -> Result<S::Ok, S::Error> {
+    T::serialize(v.as_ref(), s)
+}
+
+pub fn deserialize<'de, T: Deserialize<'de>, D: Deserializer<'de>>(
+    d: D,
+) -> Result<Arc<T>, D::Error> {
+    Ok(Arc::new(T::deserialize(d)?))
+}

veilid-core/src/veilid_api/serialize_helpers/serialize_json.rs

@@ -0,0 +1,112 @@
+use super::*;
+
+// Don't trace these functions as they are used in the transfer of API logs, which will recurse!
+
+// #[instrument(level = "trace", ret, err)]
+pub fn deserialize_json<'a, T: de::Deserialize<'a> + Debug>(arg: &'a str) -> VeilidAPIResult<T> {
+    serde_json::from_str(arg).map_err(|e| VeilidAPIError::ParseError {
+        message: e.to_string(),
+        value: format!(
+            "deserialize_json:\n---\n{}\n---\n to type {}",
+            arg,
+            std::any::type_name::<T>()
+        ),
+    })
+}
+
+// #[instrument(level = "trace", ret, err)]
+pub fn deserialize_opt_json<T: de::DeserializeOwned + Debug>(
+    arg: Option<String>,
+) -> VeilidAPIResult<T> {
+    let arg = arg.as_ref().ok_or_else(|| VeilidAPIError::ParseError {
+        message: "invalid null string".to_owned(),
+        value: format!(
+            "deserialize_json_opt: null to type {}",
+            std::any::type_name::<T>()
+        ),
+    })?;
+    deserialize_json(arg)
+}
+
+// #[instrument(level = "trace", ret)]
+pub fn serialize_json<T: Serialize + Debug>(val: T) -> String {
+    match serde_json::to_string(&val) {
+        Ok(v) => v,
+        Err(e) => {
+            panic!("failed to serialize json value: {}\nval={:?}", e, val);
+        }
+    }
+}
+
+pub mod json_as_base64 {
+    use data_encoding::BASE64URL_NOPAD;
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+    pub fn serialize<S: Serializer>(v: &Vec<u8>, s: S) -> Result<S::Ok, S::Error> {
+        let base64 = BASE64URL_NOPAD.encode(v);
+        String::serialize(&base64, s)
+    }
+
+    pub fn deserialize<'de, D: Deserializer<'de>>(d: D) -> Result<Vec<u8>, D::Error> {
+        let base64 = String::deserialize(d)?;
+        BASE64URL_NOPAD
+            .decode(base64.as_bytes())
+            .map_err(|e| serde::de::Error::custom(e))
+    }
+}
+
+pub mod json_as_string {
+    use std::fmt::Display;
+    use std::str::FromStr;
+
+    use serde::{de, Deserialize, Deserializer, Serializer};
+
+    pub fn serialize<T, S>(value: &T, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        T: Display,
+        S: Serializer,
+    {
+        serializer.collect_str(value)
+    }
+
+    pub fn deserialize<'de, T, D>(deserializer: D) -> Result<T, D::Error>
+    where
+        T: FromStr,
+        T::Err: Display,
+        D: Deserializer<'de>,
+    {
+        String::deserialize(deserializer)?
+            .parse()
+            .map_err(de::Error::custom)
+    }
+}
+
+pub mod opt_json_as_string {
+    use std::fmt::Display;
+    use std::str::FromStr;
+
+    use serde::{de, Deserialize, Deserializer, Serializer};
+
+    pub fn serialize<T, S>(value: &Option<T>, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        T: Display,
+        S: Serializer,
+    {
+        match value {
+            Some(v) => serializer.collect_str(v),
+            None => serializer.serialize_none(),
+        }
+    }
+
+    pub fn deserialize<'de, T, D>(deserializer: D) -> Result<Option<T>, D::Error>
+    where
+        T: FromStr,
+        T::Err: Display,
+        D: Deserializer<'de>,
+    {
+        match Option::<String>::deserialize(deserializer)? {
+            None => Ok(None),
+            Some(v) => Ok(Some(v.parse::<T>().map_err(de::Error::custom)?)),
+        }
+    }
+}

veilid-core/src/veilid_api/serialize_helpers/serialize_range_set_blaze.rs

@@ -0,0 +1,60 @@
+use core::fmt;
+use core::marker::PhantomData;
+use range_set_blaze::*;
+use serde::{
+    de::SeqAccess, de::Visitor, ser::SerializeSeq, Deserialize, Deserializer, Serialize, Serializer,
+};
+
+pub fn serialize<T: Integer + Serialize, S: Serializer>(
+    v: &RangeSetBlaze<T>,
+    s: S,
+) -> Result<S::Ok, S::Error> {
+    let cnt = v.ranges_len() * 2;
+    let mut seq = s.serialize_seq(Some(cnt))?;
+    for range in v.ranges() {
+        seq.serialize_element(range.start())?;
+        seq.serialize_element(range.end())?;
+    }
+    seq.end()
+}
+
+pub fn deserialize<'de, T: Integer + Deserialize<'de>, D: Deserializer<'de>>(
+    d: D,
+) -> Result<RangeSetBlaze<T>, D::Error> {
+    struct RangeSetBlazeVisitor<T> {
+        marker: PhantomData<T>,
+    }
+
+    impl<'de, T> Visitor<'de> for RangeSetBlazeVisitor<T>
+    where
+        T: Deserialize<'de> + Integer,
+    {
+        type Value = RangeSetBlaze<T>;
+
+        fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+            formatter.write_str("a RangeSetBlaze")
+        }
+
+        fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+        where
+            A: SeqAccess<'de>,
+        {
+            let mut values = RangeSetBlaze::<T>::new();
+
+            while let Some(start) = seq.next_element()? {
+                let Some(end) = seq.next_element()? else {
+                    break;
+                };
+                values.ranges_insert(start..=end);
+            }
+
+            Ok(values)
+        }
+    }
+
+    let visitor = RangeSetBlazeVisitor {
+        marker: PhantomData,
+    };
+
+    d.deserialize_seq(visitor)
+}

veilid-core/src/veilid_api/serialize_helpers/veilid_rkyv.rs

@@ -0,0 +1,151 @@
+use super::*;
+use rkyv::ser::Serializer;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+pub struct VeilidRkyvSerializer<S> {
+    inner: S,
+}
+
+impl<S> VeilidRkyvSerializer<S> {
+    pub fn into_inner(self) -> S {
+        self.inner
+    }
+}
+
+impl<S: rkyv::Fallible> rkyv::Fallible for VeilidRkyvSerializer<S> {
+    type Error = VeilidRkyvError<S::Error>;
+}
+
+impl<S: rkyv::ser::ScratchSpace> rkyv::ser::ScratchSpace for VeilidRkyvSerializer<S> {
+    unsafe fn push_scratch(
+        &mut self,
+        layout: core::alloc::Layout,
+    ) -> Result<core::ptr::NonNull<[u8]>, Self::Error> {
+        self.inner
+            .push_scratch(layout)
+            .map_err(VeilidRkyvError::Inner)
+    }
+    unsafe fn pop_scratch(
+        &mut self,
+        ptr: core::ptr::NonNull<u8>,
+        layout: core::alloc::Layout,
+    ) -> Result<(), Self::Error> {
+        self.inner
+            .pop_scratch(ptr, layout)
+            .map_err(VeilidRkyvError::Inner)
+    }
+}
+
+impl<S: rkyv::ser::Serializer> rkyv::ser::Serializer for VeilidRkyvSerializer<S> {
+    #[inline]
+    fn pos(&self) -> usize {
+        self.inner.pos()
+    }
+
+    #[inline]
+    fn write(&mut self, bytes: &[u8]) -> Result<(), Self::Error> {
+        self.inner.write(bytes).map_err(VeilidRkyvError::Inner)
+    }
+}
+
+impl<S: Default> Default for VeilidRkyvSerializer<S> {
+    fn default() -> Self {
+        Self {
+            inner: S::default(),
+        }
+    }
+}
+
+pub type DefaultVeilidRkyvSerializer =
+    VeilidRkyvSerializer<rkyv::ser::serializers::AllocSerializer<1024>>;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#[derive(Debug, Default)]
+pub struct VeilidSharedDeserializeMap {
+    inner: SharedDeserializeMap,
+}
+
+impl VeilidSharedDeserializeMap {
+    #[inline]
+    pub fn new() -> Self {
+        Self {
+            inner: SharedDeserializeMap::new(),
+        }
+    }
+}
+impl rkyv::Fallible for VeilidSharedDeserializeMap {
+    type Error = VeilidRkyvError<rkyv::de::deserializers::SharedDeserializeMapError>;
+}
+
+impl rkyv::de::SharedDeserializeRegistry for VeilidSharedDeserializeMap {
+    fn get_shared_ptr(&mut self, ptr: *const u8) -> Option<&dyn rkyv::de::SharedPointer> {
+        self.inner.get_shared_ptr(ptr)
+    }
+
+    fn add_shared_ptr(
+        &mut self,
+        ptr: *const u8,
+        shared: Box<dyn rkyv::de::SharedPointer>,
+    ) -> Result<(), Self::Error> {
+        self.inner
+            .add_shared_ptr(ptr, shared)
+            .map_err(VeilidRkyvError::Inner)
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#[derive(Debug)]
+pub enum VeilidRkyvError<E> {
+    Inner(E),
+    StringError(String),
+}
+
+impl<E: Debug> From<String> for VeilidRkyvError<E> {
+    fn from(s: String) -> Self {
+        Self::StringError(s)
+    }
+}
+
+impl<E: Debug + fmt::Display> fmt::Display for VeilidRkyvError<E> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            VeilidRkyvError::Inner(e) => write!(f, "Inner: {}", e),
+            VeilidRkyvError::StringError(s) => write!(f, "StringError: {}", s),
+        }
+    }
+}
+
+impl<E: Debug + fmt::Display> std::error::Error for VeilidRkyvError<E> {}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+pub fn to_rkyv<T>(value: &T) -> VeilidAPIResult<Vec<u8>>
+where
+    T: RkyvSerialize<DefaultVeilidRkyvSerializer>,
+{
+    let mut serializer = DefaultVeilidRkyvSerializer::default();
+    serializer
+        .serialize_value(value)
+        .map_err(|e| VeilidAPIError::generic(format!("failed to serialize object: {}", e)))?;
+    Ok(serializer
+        .into_inner()
+        .into_serializer()
+        .into_inner()
+        .to_vec())
+}
+
+pub fn from_rkyv<T>(bytes: Vec<u8>) -> VeilidAPIResult<T>
+where
+    T: RkyvArchive,
+    <T as RkyvArchive>::Archived:
+        for<'t> CheckBytes<rkyv::validation::validators::DefaultValidator<'t>>,
+    <T as RkyvArchive>::Archived: RkyvDeserialize<T, VeilidSharedDeserializeMap>,
+{
+    rkyv::check_archived_root::<T>(&bytes)
+        .map_err(|e| VeilidAPIError::generic(format!("checkbytes failed: {}", e)))?
+        .deserialize(&mut VeilidSharedDeserializeMap::default())
+        .map_err(|e| VeilidAPIError::generic(format!("failed to deserialize: {}", e)))
+}