|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] |
|
|
|
|
|
pub mod error; |
|
|
pub mod framed; |
|
|
mod quicksink; |
|
|
pub mod tls; |
|
|
|
|
|
use error::Error; |
|
|
use framed::{Connection, Incoming}; |
|
|
use futures::{future::BoxFuture, prelude::*, ready}; |
|
|
use libp2p_core::{ |
|
|
connection::ConnectedPoint, |
|
|
multiaddr::Multiaddr, |
|
|
transport::{map::MapFuture, DialOpts, ListenerId, TransportError, TransportEvent}, |
|
|
Transport, |
|
|
}; |
|
|
use rw_stream_sink::RwStreamSink; |
|
|
use std::{ |
|
|
io, |
|
|
pin::Pin, |
|
|
task::{Context, Poll}, |
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#[derive(Debug)] |
|
|
pub struct WsConfig<T: Transport> |
|
|
where |
|
|
T: Transport, |
|
|
T::Output: AsyncRead + AsyncWrite + Send + Unpin + 'static, |
|
|
{ |
|
|
transport: libp2p_core::transport::map::Map<framed::WsConfig<T>, WrapperFn<T::Output>>, |
|
|
} |
|
|
|
|
|
impl<T: Transport> WsConfig<T> |
|
|
where |
|
|
T: Transport + Send + Unpin + 'static, |
|
|
T::Error: Send + 'static, |
|
|
T::Dial: Send + 'static, |
|
|
T::ListenerUpgrade: Send + 'static, |
|
|
T::Output: AsyncRead + AsyncWrite + Send + Unpin + 'static, |
|
|
{ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pub fn new(transport: T) -> Self { |
|
|
Self { |
|
|
transport: framed::WsConfig::new(transport) |
|
|
.map(wrap_connection as WrapperFn<T::Output>), |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
pub fn max_redirects(&self) -> u8 { |
|
|
self.transport.inner().max_redirects() |
|
|
} |
|
|
|
|
|
|
|
|
pub fn set_max_redirects(&mut self, max: u8) -> &mut Self { |
|
|
self.transport.inner_mut().set_max_redirects(max); |
|
|
self |
|
|
} |
|
|
|
|
|
|
|
|
pub fn max_data_size(&self) -> usize { |
|
|
self.transport.inner().max_data_size() |
|
|
} |
|
|
|
|
|
|
|
|
pub fn set_max_data_size(&mut self, size: usize) -> &mut Self { |
|
|
self.transport.inner_mut().set_max_data_size(size); |
|
|
self |
|
|
} |
|
|
|
|
|
|
|
|
pub fn set_tls_config(&mut self, c: tls::Config) -> &mut Self { |
|
|
self.transport.inner_mut().set_tls_config(c); |
|
|
self |
|
|
} |
|
|
} |
|
|
|
|
|
impl<T> Transport for WsConfig<T> |
|
|
where |
|
|
T: Transport + Send + Unpin + 'static, |
|
|
T::Error: Send + 'static, |
|
|
T::Dial: Send + 'static, |
|
|
T::ListenerUpgrade: Send + 'static, |
|
|
T::Output: AsyncRead + AsyncWrite + Unpin + Send + 'static, |
|
|
{ |
|
|
type Output = RwStreamSink<BytesConnection<T::Output>>; |
|
|
type Error = Error<T::Error>; |
|
|
type ListenerUpgrade = MapFuture<InnerFuture<T::Output, T::Error>, WrapperFn<T::Output>>; |
|
|
type Dial = MapFuture<InnerFuture<T::Output, T::Error>, WrapperFn<T::Output>>; |
|
|
|
|
|
fn listen_on( |
|
|
&mut self, |
|
|
id: ListenerId, |
|
|
addr: Multiaddr, |
|
|
) -> Result<(), TransportError<Self::Error>> { |
|
|
self.transport.listen_on(id, addr) |
|
|
} |
|
|
|
|
|
fn remove_listener(&mut self, id: ListenerId) -> bool { |
|
|
self.transport.remove_listener(id) |
|
|
} |
|
|
|
|
|
fn dial( |
|
|
&mut self, |
|
|
addr: Multiaddr, |
|
|
opts: DialOpts, |
|
|
) -> Result<Self::Dial, TransportError<Self::Error>> { |
|
|
self.transport.dial(addr, opts) |
|
|
} |
|
|
|
|
|
fn poll( |
|
|
mut self: Pin<&mut Self>, |
|
|
cx: &mut Context<'_>, |
|
|
) -> Poll<TransportEvent<Self::ListenerUpgrade, Self::Error>> { |
|
|
Pin::new(&mut self.transport).poll(cx) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
pub type InnerFuture<T, E> = BoxFuture<'static, Result<Connection<T>, Error<E>>>; |
|
|
|
|
|
|
|
|
pub type WrapperFn<T> = fn(Connection<T>, ConnectedPoint) -> RwStreamSink<BytesConnection<T>>; |
|
|
|
|
|
|
|
|
|
|
|
fn wrap_connection<T>(c: Connection<T>, _: ConnectedPoint) -> RwStreamSink<BytesConnection<T>> |
|
|
where |
|
|
T: AsyncRead + AsyncWrite + Send + Unpin + 'static, |
|
|
{ |
|
|
RwStreamSink::new(BytesConnection(c)) |
|
|
} |
|
|
|
|
|
|
|
|
#[derive(Debug)] |
|
|
pub struct BytesConnection<T>(Connection<T>); |
|
|
|
|
|
impl<T> Stream for BytesConnection<T> |
|
|
where |
|
|
T: AsyncRead + AsyncWrite + Send + Unpin + 'static, |
|
|
{ |
|
|
type Item = io::Result<Vec<u8>>; |
|
|
|
|
|
fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> { |
|
|
loop { |
|
|
if let Some(item) = ready!(self.0.try_poll_next_unpin(cx)?) { |
|
|
if let Incoming::Data(payload) = item { |
|
|
return Poll::Ready(Some(Ok(payload.into_bytes()))); |
|
|
} |
|
|
} else { |
|
|
return Poll::Ready(None); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
impl<T> Sink<Vec<u8>> for BytesConnection<T> |
|
|
where |
|
|
T: AsyncRead + AsyncWrite + Send + Unpin + 'static, |
|
|
{ |
|
|
type Error = io::Error; |
|
|
|
|
|
fn poll_ready(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> { |
|
|
Pin::new(&mut self.0).poll_ready(cx) |
|
|
} |
|
|
|
|
|
fn start_send(mut self: Pin<&mut Self>, item: Vec<u8>) -> io::Result<()> { |
|
|
Pin::new(&mut self.0).start_send(framed::OutgoingData::Binary(item)) |
|
|
} |
|
|
|
|
|
fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> { |
|
|
Pin::new(&mut self.0).poll_flush(cx) |
|
|
} |
|
|
|
|
|
fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> { |
|
|
Pin::new(&mut self.0).poll_close(cx) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
#[cfg(test)] |
|
|
mod tests { |
|
|
use super::WsConfig; |
|
|
use futures::prelude::*; |
|
|
use libp2p_core::{ |
|
|
multiaddr::Protocol, |
|
|
transport::{DialOpts, ListenerId, PortUse}, |
|
|
Endpoint, Multiaddr, Transport, |
|
|
}; |
|
|
use libp2p_identity::PeerId; |
|
|
use libp2p_tcp as tcp; |
|
|
|
|
|
#[test] |
|
|
fn dialer_connects_to_listener_ipv4() { |
|
|
let a = "/ip4/127.0.0.1/tcp/0/ws".parse().unwrap(); |
|
|
futures::executor::block_on(connect(a)) |
|
|
} |
|
|
|
|
|
#[test] |
|
|
fn dialer_connects_to_listener_ipv6() { |
|
|
let a = "/ip6/::1/tcp/0/ws".parse().unwrap(); |
|
|
futures::executor::block_on(connect(a)) |
|
|
} |
|
|
|
|
|
fn new_ws_config() -> WsConfig<tcp::async_io::Transport> { |
|
|
WsConfig::new(tcp::async_io::Transport::new(tcp::Config::default())) |
|
|
} |
|
|
|
|
|
async fn connect(listen_addr: Multiaddr) { |
|
|
let mut ws_config = new_ws_config().boxed(); |
|
|
ws_config |
|
|
.listen_on(ListenerId::next(), listen_addr) |
|
|
.expect("listener"); |
|
|
|
|
|
let addr = ws_config |
|
|
.next() |
|
|
.await |
|
|
.expect("no error") |
|
|
.into_new_address() |
|
|
.expect("listen address"); |
|
|
|
|
|
assert_eq!(Some(Protocol::Ws("/".into())), addr.iter().nth(2)); |
|
|
assert_ne!(Some(Protocol::Tcp(0)), addr.iter().nth(1)); |
|
|
|
|
|
let inbound = async move { |
|
|
let (conn, _addr) = ws_config |
|
|
.select_next_some() |
|
|
.map(|ev| ev.into_incoming()) |
|
|
.await |
|
|
.unwrap(); |
|
|
conn.await |
|
|
}; |
|
|
|
|
|
let outbound = new_ws_config() |
|
|
.boxed() |
|
|
.dial( |
|
|
addr.with(Protocol::P2p(PeerId::random())), |
|
|
DialOpts { |
|
|
role: Endpoint::Dialer, |
|
|
port_use: PortUse::New, |
|
|
}, |
|
|
) |
|
|
.unwrap(); |
|
|
|
|
|
let (a, b) = futures::join!(inbound, outbound); |
|
|
a.and(b).unwrap(); |
|
|
} |
|
|
} |
|
|
|