Merge branch 'Main' into poll-incoming

changelog-h3-quinn.md

@@ -1,3 +1,8 @@
+### v0.0.7 (2024-07-01)
+* Consolidate quic trait redundancy
+* make types Sync
+* new tracing feature
+
 ### v0.0.6 (2024-05-20)
 * use quinn 0.11
 

changelog-h3.md

@@ -1,3 +1,9 @@
+### v0.0.6 (2024-07-01)
+* Consolidate quic trait redundancy
+* start qpack streams 
+* send grease stream in the background
+* new tracing feature
+
 ### v0.0.5 (2024-05-20)
 * add `poll_recv_data()` for server
 * use 2021 edition

h3-quinn/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "h3-quinn"
-version = "0.0.6"
+version = "0.0.7"
 rust-version = "1.66"
 authors = ["Jean-Christophe BEGUE <[email protected]>"]
 edition = "2021"
@@ -13,7 +13,7 @@ categories = ["network-programming", "web-programming"]
 license = "MIT"
 
 [dependencies]
-h3 = { version = "0.0.5", path = "../h3" }
+h3 = { version = "0.0.6", path = "../h3" }
 bytes = "1"
 quinn = { version = "0.11", default-features = false, features = [
     "futures-io",

h3-quinn/src/lib.rs

@@ -17,10 +17,10 @@ use bytes::{Buf, Bytes, BytesMut};
 use futures::{
     ready,
     stream::{self, select, BoxStream, Select},
-    StreamExt,
+    Stream, StreamExt,
 };
 pub use quinn::{self, Endpoint, OpenBi, OpenUni, VarInt, WriteError};
-use quinn::{ApplicationClose, ClosedStream, ReadDatagram};
+use quinn::{AcceptBi, AcceptUni, ApplicationClose, ClosedStream, ReadDatagram};
 
 use h3::{
     ext::Datagram,
@@ -31,6 +31,9 @@ use tokio_util::sync::ReusableBoxFuture;
 #[cfg(feature = "tracing")]
 use tracing::instrument;
 
+/// BoxStream with Sync trait
+type BoxStreamSync<'a, T> = Pin<Box<dyn Stream<Item = T> + Sync + Send + 'a>>;
+
 /// A QUIC connection backed by Quinn
 ///
 /// Implements a [`quic::Connection`] backed by a [`quinn::Connection`].
@@ -39,15 +42,15 @@ where
     B: Buf,
 {
     conn: quinn::Connection,
-    opening_bi: Option<BoxStream<'static, <OpenBi<'static> as Future>::Output>>,
-    opening_uni: Option<BoxStream<'static, <OpenUni<'static> as Future>::Output>>,
-    datagrams: BoxStream<'static, <ReadDatagram<'static> as Future>::Output>,
+    opening_bi: Option<BoxStreamSync<'static, <OpenBi<'static> as Future>::Output>>,
+    opening_uni: Option<BoxStreamSync<'static, <OpenUni<'static> as Future>::Output>>,
+    datagrams: BoxStreamSync<'static, <ReadDatagram<'static> as Future>::Output>,
     incoming: Select<
-        BoxStream<
+        BoxStreamSync<
             'static,
             Result<IncomingStreamType<BidiStream<B>, RecvStream, B>, quinn::ConnectionError>,
         >,
-        BoxStream<
+        BoxStreamSync<
             'static,
             Result<IncomingStreamType<BidiStream<B>, RecvStream, B>, quinn::ConnectionError>,
         >,
@@ -312,8 +315,8 @@ where
 /// [`quinn::OpenBi`], [`quinn::OpenUni`].
 pub struct OpenStreams {
     conn: quinn::Connection,
-    opening_bi: Option<BoxStream<'static, <OpenBi<'static> as Future>::Output>>,
-    opening_uni: Option<BoxStream<'static, <OpenUni<'static> as Future>::Output>>,
+    opening_bi: Option<BoxStreamSync<'static, <OpenBi<'static> as Future>::Output>>,
+    opening_uni: Option<BoxStreamSync<'static, <OpenUni<'static> as Future>::Output>>,
 }
 
 impl<B> quic::OpenStreams<B> for OpenStreams

h3-webtransport/Cargo.toml

@@ -14,6 +14,6 @@ tracing = "0.1.37"
 tokio = { version = "1.28", default_features = false }
 
 [dependencies.h3]
-version = "0.0.5"
+version = "0.0.6"
 path = "../h3"
 features = ["i-implement-a-third-party-backend-and-opt-into-breaking-changes"]

h3/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "h3"
-version = "0.0.5"
+version = "0.0.6"
 rust-version = "1.63"
 authors = [
     "Sean McArthur <[email protected]>",