1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
use futures::stream::{BoxStream, Stream, StreamExt};
use std::{net::SocketAddr, pin::Pin, task::Poll};
use super::protocol::tunnel::{from_quinn_endpoint, BoxedTunnel, QuinnTunnel, TunnelSide};
use std::fmt::Debug;
use std::hash::Hash;
use std::sync::{Arc, TryLockError};
use std::task::Context;
use tokio_stream::StreamMap;
pub struct QuinnListenEndpoint<Session: quinn::crypto::Session> {
bind_addr: SocketAddr,
quinn_config: quinn::generic::ServerConfig<Session>,
endpoint: quinn::generic::Endpoint<Session>,
incoming: BoxStream<'static, quinn::generic::NewConnection<Session>>,
}
impl<Session: quinn::crypto::Session + 'static> QuinnListenEndpoint<Session> {
pub fn bind(
bind_addr: SocketAddr,
quinn_config: quinn::generic::ServerConfig<Session>,
) -> Result<Self, quinn::EndpointError> {
let mut builder = quinn::generic::Endpoint::builder();
builder.listen(quinn_config.clone());
let (endpoint, incoming) = builder.bind(&bind_addr)?;
let incoming = incoming
.filter_map(|connecting| async move { connecting.await.ok() })
.boxed();
Ok(Self {
bind_addr,
quinn_config,
endpoint,
incoming,
})
}
}
impl<Session> Stream for QuinnListenEndpoint<Session>
where
Session: quinn::crypto::Session + Send + 'static,
Self: Send + Unpin,
{
type Item = QuinnTunnel<Session>;
fn poll_next(
mut self: std::pin::Pin<&mut Self>,
cx: &mut std::task::Context<'_>,
) -> std::task::Poll<Option<Self::Item>> {
let res = futures::ready!(Stream::poll_next(Pin::new(&mut self.incoming), cx));
match res {
None => Poll::Ready(None),
Some(new_connection) => {
let tunnel = from_quinn_endpoint(new_connection, TunnelSide::Listen);
Poll::Ready(Some(tunnel))
}
}
}
}
pub struct NamedBoxedStream<Id, StreamItem> {
id: Id,
stream: BoxStream<'static, StreamItem>,
}
impl<Id, StreamItem> NamedBoxedStream<Id, StreamItem> {
pub fn new<TStream>(id: Id, stream: TStream) -> Self
where
TStream: Stream<Item = StreamItem> + Send + Sync + 'static,
{
Self::new_pre_boxed(id, stream.boxed())
}
pub fn new_pre_boxed(id: Id, stream: BoxStream<'static, StreamItem>) -> Self {
Self { id, stream }
}
}
impl<Id, StreamItem> Stream for NamedBoxedStream<Id, StreamItem>
where
Id: Unpin,
{
type Item = StreamItem;
fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
Stream::poll_next(Pin::new(&mut self.stream), cx)
}
fn size_hint(&self) -> (usize, Option<usize>) {
self.stream.size_hint()
}
}
impl<Id, StreamItem> std::fmt::Debug for NamedBoxedStream<Id, StreamItem>
where
Id: Debug,
{
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.debug_struct(stringify!(DynamicConnection))
.field("id", &self.id)
.finish_non_exhaustive()
}
}
pub type DynamicConnectionSet<Id, TunnelType = BoxedTunnel<'static>> =
DynamicStreamSet<Id, TunnelType>;
pub struct DynamicStreamSet<Id, TStream> {
streams: Arc<std::sync::Mutex<StreamMap<Id, NamedBoxedStream<Id, TStream>>>>,
}
pub struct DynamicStreamSetHandle<Id, TStream> {
streams: Arc<std::sync::Mutex<StreamMap<Id, NamedBoxedStream<Id, TStream>>>>,
}
impl<Id, StreamItem> DynamicStreamSet<Id, StreamItem> {
pub fn new() -> Self {
Self {
streams: Arc::new(std::sync::Mutex::new(StreamMap::new())),
}
}
pub fn attach(
&self,
source: NamedBoxedStream<Id, StreamItem>,
) -> Option<NamedBoxedStream<Id, StreamItem>>
where
Id: Clone + Hash + Eq,
{
let mut streams = self.streams.lock().expect("Mutex poisoned");
streams.insert(source.id.clone(), source)
}
pub fn attach_stream(
&self,
id: Id,
source: BoxStream<'static, StreamItem>,
) -> Option<NamedBoxedStream<Id, StreamItem>>
where
Id: Clone + Hash + Eq,
{
let endpoint = NamedBoxedStream::new_pre_boxed(id.clone(), source);
self.attach(endpoint)
}
pub fn detach(&self, id: &Id) -> Option<NamedBoxedStream<Id, StreamItem>>
where
Id: Hash + Eq,
{
let mut streams = self.streams.lock().expect("Mutex poisoned");
streams.remove(id)
}
pub fn handle(&self) -> DynamicStreamSetHandle<Id, StreamItem> {
DynamicStreamSetHandle {
streams: self.streams.clone(),
}
}
pub fn into_handle(self) -> DynamicStreamSetHandle<Id, StreamItem> {
DynamicStreamSetHandle {
streams: self.streams,
}
}
fn poll_next(
streams: &std::sync::Mutex<StreamMap<Id, NamedBoxedStream<Id, StreamItem>>>,
cx: &mut Context<'_>,
) -> Poll<Option<(Id, StreamItem)>>
where
Id: Clone + Unpin,
{
let mut streams = match streams.try_lock() {
Ok(s) => s,
Err(TryLockError::WouldBlock) => {
cx.waker().wake_by_ref();
return Poll::Pending;
}
Err(TryLockError::Poisoned(poison)) => Err(poison).expect("Lock poisoned"),
};
Stream::poll_next(Pin::new(&mut *streams), cx)
}
}
impl<Id, StreamItem> Stream for DynamicStreamSet<Id, StreamItem>
where
Id: Clone + Unpin,
{
type Item = (Id, StreamItem);
fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
Self::poll_next(&*self.streams, cx)
}
}
impl<Id, StreamItem> Stream for DynamicStreamSetHandle<Id, StreamItem>
where
Id: Clone + Unpin,
{
type Item = (Id, StreamItem);
fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
DynamicStreamSet::poll_next(&*self.streams, cx)
}
}
#[cfg(test)]
mod tests {
use super::{DynamicStreamSet, NamedBoxedStream};
use crate::common::protocol::tunnel::BoxedTunnel;
use futures::task::Context;
use futures::{future, stream, FutureExt, Stream, StreamExt};
use std::collections::HashSet;
use std::iter::FromIterator;
use std::pin::Pin;
#[tokio::test]
async fn add_and_remove() {
let set = DynamicStreamSet::<u32, char>::new();
let a = stream::iter(vec!['a']).boxed();
let b = stream::iter(vec!['b']).boxed();
let c = stream::iter(vec!['c']).boxed();
assert!(set.attach_stream(1u32, a).is_none(), "Must attach to blank");
assert!(
set.attach_stream(2u32, b).is_none(),
"Must attach to non-blank with new key"
);
let mut replaced_b = set
.attach_stream(2u32, c)
.expect("Must overwrite keys and return an old one");
let mut detached_a = set.detach(&1u32).expect("Must detach fresh keys by ID");
let mut detached_c = set.detach(&2u32).expect("Must detach replaced keys by ID");
assert_eq!(detached_a.id, 1u32);
assert_eq!(
detached_a.stream.next().await.expect("Must have item"),
'a',
"Fresh-key stream identity mismatch"
);
assert_eq!(replaced_b.id, 2u32);
assert_eq!(
replaced_b.stream.next().await.expect("Must have item"),
'b',
"Replaced stream identity mismatch"
);
assert_eq!(detached_c.id, 2u32);
assert_eq!(
detached_c.stream.next().await.expect("Must have item"),
'c',
"Replacement stream identity mismatch"
);
}
#[tokio::test]
async fn poll_contents() {
let set = DynamicStreamSet::<u32, char>::new();
let a = stream::iter(vec!['a']).boxed();
let b = stream::iter(vec!['b']).boxed();
let c = stream::iter(vec!['c']).boxed();
assert!(set.attach_stream(1u32, a).is_none(), "Must attach to blank");
assert!(
set.attach_stream(2u32, b).is_none(),
"Must attach to non-blank with new key"
);
set
.attach_stream(2u32, c)
.expect("Must replace existing keys");
let results = set.collect::<HashSet<_>>().await;
assert_eq!(
results,
HashSet::from_iter(vec![(1, 'a'), (2, 'c')].into_iter())
);
}
#[tokio::test]
async fn end_of_stream_removal() {
use std::sync::Arc;
let set = Arc::new(DynamicStreamSet::<u32, i32>::new());
let a = stream::iter(vec![1, 2, 3]).boxed();
assert!(set.attach_stream(1u32, a).is_none(), "Must attach to blank");
let collected = set.handle().collect::<Vec<_>>().await;
assert_eq!(collected.as_slice(), &[(1, 1), (1, 2), (1, 3)]);
assert!(
set.detach(&1u32).is_none(),
"Must have already detached if polled to empty"
);
}
}