Skip to content

add (de)serialization methods for blob & SendError #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ alloy = { version = "0.8.1", features = [
"rpc-types",
] }
anyhow = "1.0"
base64 = "0.22.1"
bincode = "1.3.3"
color-eyre = { version = "0.6", features = ["capture-spantrace"], optional = true }
http = "1.0.0"
Expand Down
98 changes: 98 additions & 0 deletions src/types/lazy_load_blob.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
use std::fmt;
use std::marker::PhantomData;

use base64::{engine::general_purpose::STANDARD as BASE64, Engine as _};
use serde::de::{self, Visitor};
use serde::{Deserialize, Deserializer, Serialize, Serializer};

pub use crate::LazyLoadBlob;

/// `LazyLoadBlob` is defined in the wit bindings, but constructors and methods here.
Expand Down Expand Up @@ -42,3 +49,94 @@ impl std::cmp::PartialEq for LazyLoadBlob {
self.mime == other.mime && self.bytes == other.bytes
}
}

impl Serialize for LazyLoadBlob {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
// Create a struct with 2 fields
use serde::ser::SerializeStruct;
let mut state = serializer.serialize_struct("LazyLoadBlob", 2)?;

// Serialize mime normally (serde handles Option automatically)
state.serialize_field("mime", &self.mime)?;

let base64_data = BASE64.encode(&self.bytes);
state.serialize_field("bytes", &base64_data)?;

state.end()
}
}

// Custom visitor for deserialization
struct LazyLoadBlobVisitor {
marker: PhantomData<fn() -> LazyLoadBlob>,
}

impl LazyLoadBlobVisitor {
fn new() -> Self {
LazyLoadBlobVisitor {
marker: PhantomData,
}
}
}

impl<'de> Visitor<'de> for LazyLoadBlobVisitor {
type Value = LazyLoadBlob;

fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
formatter.write_str("a struct with mime and bytes fields")
}

fn visit_map<M>(self, mut map: M) -> Result<Self::Value, M::Error>
where
M: de::MapAccess<'de>,
{
let mut mime = None;
let mut bytes_base64 = None;

// Extract each field from the map
while let Some(key) = map.next_key::<String>()? {
match key.as_str() {
"mime" => {
if mime.is_some() {
return Err(de::Error::duplicate_field("mime"));
}
mime = map.next_value()?;
}
"bytes" => {
if bytes_base64.is_some() {
return Err(de::Error::duplicate_field("bytes"));
}
bytes_base64 = Some(map.next_value::<String>()?);
}
_ => {
// Skip unknown fields
let _ = map.next_value::<de::IgnoredAny>()?;
}
}
}

let bytes_base64 = bytes_base64.ok_or_else(|| de::Error::missing_field("bytes"))?;

let bytes = BASE64
.decode(bytes_base64.as_bytes())
.map_err(|err| de::Error::custom(format!("Invalid base64: {}", err)))?;

Ok(LazyLoadBlob { mime, bytes })
}
}

impl<'de> Deserialize<'de> for LazyLoadBlob {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: Deserializer<'de>,
{
deserializer.deserialize_struct(
"LazyLoadBlob",
&["mime", "bytes"],
LazyLoadBlobVisitor::new(),
)
}
}
2 changes: 1 addition & 1 deletion src/types/send_error.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::{Address, LazyLoadBlob, Message, _wit_message_to_message};
use serde::{Deserialize, Serialize};

#[derive(Debug, Clone)]
#[derive(Debug, Clone, Deserialize, Serialize)]
pub struct SendError {
pub kind: SendErrorKind,
pub target: Address,
Expand Down