Skip to content
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.

6 changes: 4 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ anyhow = { workspace = true, optional = true }
futures-buffered ={ version = "0.2.9", optional = true }
# for AbortOnDropHandle
n0-future = { workspace = true, optional = true }
futures-util = { workspace = true, optional = true }

[target.'cfg(not(all(target_family = "wasm", target_os = "unknown")))'.dependencies]
quinn = { workspace = true, optional = true, features = ["runtime-tokio"] }
Expand All @@ -64,7 +65,8 @@ rpc = ["dep:quinn", "dep:postcard", "dep:anyhow", "dep:smallvec", "dep:tracing",
quinn_endpoint_setup = ["rpc", "dep:rustls", "dep:rcgen", "dep:anyhow", "dep:futures-buffered", "quinn/rustls-ring"]
# pick up parent span when creating channel messages
message_spans = []
default = ["rpc", "quinn_endpoint_setup", "message_spans"]
stream = ["dep:futures-util"]
default = ["rpc", "quinn_endpoint_setup", "message_spans", "stream"]

[workspace]
members = ["irpc-derive", "irpc-iroh"]
Expand All @@ -86,4 +88,4 @@ n0-future = { version = "0.1.2", default-features = false }
tracing-subscriber = { version = "0.3.19" }
iroh = { version = "0.34" }
quinn = { package = "iroh-quinn", version = "0.13.0", default-features = false }

futures-util = { version = "0.3", features = ["sink"] }
2 changes: 2 additions & 0 deletions irpc-derive/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ pub fn rpc_requests(attr: TokenStream, item: TokenStream) -> TokenStream {
.iter()
.map(|(variant_name, inner_type)| {
quote! {
#[allow(missing_docs)]
#variant_name(::irpc::WithChannels<#inner_type, #service_name>)
}
})
Expand All @@ -311,6 +312,7 @@ pub fn rpc_requests(attr: TokenStream, item: TokenStream) -> TokenStream {

// Create the message enum definition
let message_enum = quote! {
#[allow(missing_docs)]
#[derive(Debug)]
pub enum #message_enum_name {
#(#message_variants),*
Expand Down
21 changes: 21 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,17 @@ pub mod channel {
Sender::Boxed(x) => x.is_rpc(),
}
}

#[cfg(feature = "stream")]
pub fn into_sink(self) -> impl n0_future::Sink<T, Error = SendError> + Send + 'static
where
T: RpcMessage,
{
futures_util::sink::unfold(self, |mut sink, value| async move {
sink.send(value).await?;
Ok(sink)
})
}
}

impl<T> From<tokio::sync::mpsc::Sender<T>> for Sender<T> {
Expand Down Expand Up @@ -489,6 +500,16 @@ pub mod channel {
Self::Boxed(rx) => Ok(rx.recv().await?),
}
}

#[cfg(feature = "stream")]
pub fn into_stream(
self,
) -> impl n0_future::Stream<Item = std::result::Result<T, RecvError>> + Send + 'static
{
n0_future::stream::unfold(self, |mut recv| async move {
recv.recv().await.transpose().map(|msg| (msg, recv))
})
}
}

impl<T> From<tokio::sync::mpsc::Receiver<T>> for Receiver<T> {
Expand Down