Merge branch 'main' into feat-async-channel

Author: rklaehn

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "quic-rpc"
-version = "0.10.2"
+version = "0.11.0"
 edition = "2021"
 authors = ["Rüdiger Klaehn <rklaehn@protonmail.com>"]
 keywords = ["api", "protocol", "network", "rpc"]
@@ -87,4 +87,4 @@ name = "modularize"
 required-features = ["flume-transport"]
 
 [workspace]
-members = ["examples/split/types", "examples/split/server", "examples/split/client"]
+members = ["examples/split/types", "examples/split/server", "examples/split/client", "quic-rpc-derive"]

Cargo.toml

@@ -60,7 +60,7 @@ async fn main() -> anyhow::Result<()> {
     let server = RpcServer::new(server);
     let handle = tokio::task::spawn(async move {
         for _ in 0..1 {
-            let (req, chan) = server.accept().await?;
+            let (req, chan) = server.accept().await?.read_first().await?;
             match req {
                 IoRequest::Write(req) => chan.rpc_map_err(req, fs, Fs::write).await,
             }?

examples/errors.rs

@@ -34,7 +34,10 @@ async fn main() -> Result<()> {
 async fn run_server<C: ServiceEndpoint<AppService>>(server_conn: C, handler: app::Handler) {
     let server = RpcServer::new(server_conn);
     loop {
-        match server.accept().await {
+        let Ok(accepting) = server.accept().await else {
+            continue;
+        };
+        match accepting.read_first().await {
             Err(err) => warn!(?err, "server accept failed"),
             Ok((req, chan)) => {
                 let handler = handler.clone();

examples/modularize.rs

@@ -168,7 +168,7 @@ async fn main() -> anyhow::Result<()> {
         let s = server;
         let store = Store;
         loop {
-            let (req, chan) = s.accept().await?;
+            let (req, chan) = s.accept().await?.read_first().await?;
             use StoreRequest::*;
             let store = store.clone();
             #[rustfmt::skip]
@@ -239,15 +239,15 @@ async fn _main_unsugared() -> anyhow::Result<()> {
     }
     let (server, client) = flume::connection::<Service>(1);
     let to_string_service = tokio::spawn(async move {
-        let (mut send, mut recv) = server.accept_bi().await?;
+        let (mut send, mut recv) = server.accept().await?;
         while let Some(item) = recv.next().await {
             let item = item?;
             println!("server got: {item:?}");
             send.send(item.to_string()).await?;
         }
         anyhow::Ok(())
     });
-    let (mut send, mut recv) = client.open_bi().await?;
+    let (mut send, mut recv) = client.open().await?;
     let print_result_service = tokio::spawn(async move {
         while let Some(item) = recv.next().await {
             let item = item?;

examples/store.rs

@@ -0,0 +1,24 @@
+[package]
+name = "quic-rpc-derive"
+version = "0.11.0"
+edition = "2021"
+authors = ["Rüdiger Klaehn <rklaehn@protonmail.com>"]
+keywords = ["api", "protocol", "network", "rpc", "macro"]
+categories = ["network-programming"]
+license = "Apache-2.0/MIT"
+repository = "https://github.com/n0-computer/quic-rpc"
+description = "Macros for quic-rpc"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+syn = { version = "1.0", features = ["full"] }
+quote = "1.0"
+proc-macro2 = "1.0"
+quic-rpc = { version = "0.11", path = ".." }
+
+[dev-dependencies]
+derive_more = "1.0.0-beta.6"
+serde = { version = "1.0.203", features = ["serde_derive"] }
+trybuild = "1.0.96"