7878}
7979
8080#[ cfg( feature = "quic" ) ]
81- pub async fn with_quic < T , Fut > (
82- f : impl FnOnce ( quinn:: Connection , quinn:: Connection ) -> Fut ,
81+ pub async fn with_quic_endpoints < T , Fut > (
82+ f : impl FnOnce ( std :: net :: SocketAddr , quinn:: Endpoint , quinn:: Endpoint ) -> Fut ,
8383) -> anyhow:: Result < T >
8484where
8585 Fut : core:: future:: Future < Output = anyhow:: Result < T > > ,
@@ -91,12 +91,20 @@ where
9191 use rcgen:: { generate_simple_self_signed, CertifiedKey } ;
9292 use rustls:: pki_types:: { CertificateDer , PrivatePkcs8KeyDer } ;
9393 use rustls:: version:: TLS13 ;
94- use tokio:: try_join;
94+
95+ let mut clt_ep = quinn:: Endpoint :: client ( ( Ipv6Addr :: LOCALHOST , 0 ) . into ( ) )
96+ . context ( "failed to create client endpoint" ) ?;
97+
98+ let srv_sock = std:: net:: UdpSocket :: bind ( ( Ipv6Addr :: LOCALHOST , 0 ) )
99+ . context ( "failed to open a UDP socket" ) ?;
100+ let srv_addr = srv_sock
101+ . local_addr ( )
102+ . context ( "failed to query server address" ) ?;
95103
96104 let CertifiedKey {
97105 cert : srv_crt,
98106 key_pair : srv_key,
99- } = generate_simple_self_signed ( [ "server.wrpc " . to_string ( ) ] )
107+ } = generate_simple_self_signed ( [ "localhost " . to_string ( ) ] )
100108 . context ( "failed to generate server certificate" ) ?;
101109 let CertifiedKey {
102110 cert : clt_crt,
@@ -123,15 +131,7 @@ where
123131 )
124132 . expect ( "failed to create server config" ) ;
125133
126- let mut clt_ep = quinn:: Endpoint :: client ( ( Ipv6Addr :: LOCALHOST , 0 ) . into ( ) )
127- . context ( "failed to create client endpoint" ) ?;
128134 clt_ep. set_default_client_config ( ClientConfig :: new ( Arc :: new ( clt_cnf) ) ) ;
129-
130- let srv_sock = std:: net:: UdpSocket :: bind ( ( Ipv6Addr :: LOCALHOST , 0 ) )
131- . context ( "failed to open a UDP socket" ) ?;
132- let srv_addr = srv_sock
133- . local_addr ( )
134- . context ( "failed to query server address" ) ?;
135135 let srv_ep = quinn:: Endpoint :: new (
136136 EndpointConfig :: default ( ) ,
137137 Some ( srv_cnf) ,
@@ -140,20 +140,64 @@ where
140140 )
141141 . context ( "failed to create server endpoint" ) ?;
142142
143- let ( clt, srv) = try_join ! (
144- async move {
145- let conn = clt_ep
146- . connect( srv_addr, "server.wrpc" )
147- . context( "failed to connect to server" ) ?;
148- conn. await . context( "failed to establish client connection" )
149- } ,
150- async move {
151- let conn = srv_ep
152- . accept( )
153- . await
154- . context( "failed to accept connection" ) ?;
155- conn. await . context( "failed to establish server connection" )
156- }
157- ) ?;
158- f ( clt, srv) . await . context ( "closure failed" )
143+ f ( srv_addr, clt_ep, srv_ep) . await . context ( "closure failed" )
144+ }
145+
146+ #[ cfg( feature = "quic" ) ]
147+ pub async fn with_quic < T , Fut > (
148+ f : impl FnOnce ( quinn:: Connection , quinn:: Connection ) -> Fut ,
149+ ) -> anyhow:: Result < T >
150+ where
151+ Fut : core:: future:: Future < Output = anyhow:: Result < T > > ,
152+ {
153+ with_quic_endpoints ( |addr, clt, srv| async move {
154+ let ( clt, srv) = tokio:: try_join!(
155+ async move {
156+ let conn = clt
157+ . connect( addr, "localhost" )
158+ . context( "failed to connect to server" ) ?;
159+ conn. await . context( "failed to establish client connection" )
160+ } ,
161+ async move {
162+ let conn = srv. accept( ) . await . context( "failed to accept connection" ) ?;
163+ conn. await . context( "failed to establish server connection" )
164+ }
165+ ) ?;
166+ f ( clt, srv) . await . context ( "closure failed" )
167+ } )
168+ . await
169+ }
170+
171+ #[ cfg( feature = "web-transport" ) ]
172+ pub async fn with_web_transport < T , Fut > (
173+ f : impl FnOnce ( web_transport_quinn:: Session , web_transport_quinn:: Session ) -> Fut ,
174+ ) -> anyhow:: Result < T >
175+ where
176+ Fut : core:: future:: Future < Output = anyhow:: Result < T > > ,
177+ {
178+ with_quic_endpoints ( |addr, clt, srv| async move {
179+ let url = url:: Url :: parse ( & format ! ( "https://localhost:{}" , addr. port( ) ) )
180+ . context ( "failed to construct URL" ) ?;
181+ let ( clt, srv) = tokio:: try_join!(
182+ async move {
183+ web_transport_quinn:: connect( & clt, & url)
184+ . await
185+ . context( "failed to connect to server" )
186+ } ,
187+ async move {
188+ let conn = srv. accept( ) . await . context( "failed to accept connection" ) ?;
189+ let conn = conn
190+ . await
191+ . context( "failed to establish server connection" ) ?;
192+ let req = web_transport_quinn:: accept( conn)
193+ . await
194+ . context( "failed to accept connection" ) ?;
195+ req. ok( )
196+ . await
197+ . context( "failed to establish server connection" )
198+ }
199+ ) ?;
200+ f ( clt, srv) . await . context ( "closure failed" )
201+ } )
202+ . await
159203}
0 commit comments