mirror of
https://github.com/fluencelabs/rust-libp2p
synced 2025-06-26 08:11:39 +00:00
* Allow multiple connections per peer in libp2p-core. Instead of trying to enforce a single connection per peer, which involves quite a bit of additional complexity e.g. to prioritise simultaneously opened connections and can have other undesirable consequences [1], we now make multiple connections per peer a feature. The gist of these changes is as follows: The concept of a "node" with an implicit 1-1 correspondence to a connection has been replaced with the "first-class" concept of a "connection". The code from `src/nodes` has moved (with varying degrees of modification) to `src/connection`. A `HandledNode` has become a `Connection`, a `NodeHandler` a `ConnectionHandler`, the `CollectionStream` was the basis for the new `connection::Pool`, and so forth. Conceptually, a `Network` contains a `connection::Pool` which in turn internally employs the `connection::Manager` for handling the background `connection::manager::Task`s, one per connection, as before. These are all considered implementation details. On the public API, `Peer`s are managed as before through the `Network`, except now the API has changed with the shift of focus to (potentially multiple) connections per peer. The `NetworkEvent`s have accordingly also undergone changes. The Swarm APIs remain largely unchanged, except for the fact that `inject_replaced` is no longer called. It may now practically happen that multiple `ProtocolsHandler`s are associated with a single `NetworkBehaviour`, one per connection. If implementations of `NetworkBehaviour` rely somehow on communicating with exactly one `ProtocolsHandler`, this may cause issues, but it is unlikely. [1]: https://github.com/paritytech/substrate/issues/4272 * Fix intra-rustdoc links. * Update core/src/connection/pool.rs Co-Authored-By: Max Inden <mail@max-inden.de> * Address some review feedback and fix doc links. * Allow responses to be sent on the same connection. * Remove unnecessary remainders of inject_replaced. * Update swarm/src/behaviour.rs Co-Authored-By: Pierre Krieger <pierre.krieger1708@gmail.com> * Update swarm/src/lib.rs Co-Authored-By: Pierre Krieger <pierre.krieger1708@gmail.com> * Update core/src/connection/manager.rs Co-Authored-By: Pierre Krieger <pierre.krieger1708@gmail.com> * Update core/src/connection/manager.rs Co-Authored-By: Pierre Krieger <pierre.krieger1708@gmail.com> * Update core/src/connection/pool.rs Co-Authored-By: Pierre Krieger <pierre.krieger1708@gmail.com> * Incorporate more review feedback. * Move module declaration below imports. * Update core/src/connection/manager.rs Co-Authored-By: Toralf Wittner <tw@dtex.org> * Update core/src/connection/manager.rs Co-Authored-By: Toralf Wittner <tw@dtex.org> * Simplify as per review. * Fix rustoc link. * Add try_notify_handler and simplify. * Relocate DialingConnection and DialingAttempt. For better visibility constraints. * Small cleanup. * Small cleanup. More robust EstablishedConnectionIter. * Clarify semantics of `DialingPeer::connect`. * Don't call inject_disconnected on InvalidPeerId. To preserve the previous behavior and ensure calls to `inject_disconnected` are always paired with calls to `inject_connected`. * Provide public ConnectionId constructor. Mainly needed for testing purposes, e.g. in substrate. * Move the established connection limit check to the right place. * Clean up connection error handling. Separate connection errors into those occuring during connection setup or upon rejecting a newly established connection (the `PendingConnectionError`) and those errors occurring on previously established connections, i.e. for which a `ConnectionEstablished` event has been emitted by the connection pool earlier. * Revert change in log level and clarify an invariant. * Remove inject_replaced entirely. * Allow notifying all connection handlers. Thereby simplify by introducing a new enum `NotifyHandler`, used with a single constructor `NetworkBehaviourAction::NotifyHandler`. * Finishing touches. Small API simplifications and code deduplication. Some more useful debug logging. Co-authored-by: Max Inden <mail@max-inden.de> Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com> Co-authored-by: Toralf Wittner <tw@dtex.org>
128 lines
5.1 KiB
Rust
128 lines
5.1 KiB
Rust
// Copyright 2018 Parity Technologies (UK) Ltd.
|
|
//
|
|
// Permission is hereby granted, free of charge, to any person obtaining a
|
|
// copy of this software and associated documentation files (the "Software"),
|
|
// to deal in the Software without restriction, including without limitation
|
|
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
// and/or sell copies of the Software, and to permit persons to whom the
|
|
// Software is furnished to do so, subject to the following conditions:
|
|
//
|
|
// The above copyright notice and this permission notice shall be included in
|
|
// all copies or substantial portions of the Software.
|
|
//
|
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
// DEALINGS IN THE SOFTWARE.
|
|
|
|
use crate::PeerId;
|
|
use std::{task::Context, task::Poll};
|
|
use super::{Connected, SubstreamEndpoint};
|
|
|
|
/// The interface of a connection handler.
|
|
///
|
|
/// Each handler is responsible for a single connection.
|
|
pub trait ConnectionHandler {
|
|
/// The inbound type of events used to notify the handler through the `Network`.
|
|
///
|
|
/// See also [`EstablishedConnection::notify_handler`](super::EstablishedConnection::notify_handler)
|
|
/// and [`ConnectionHandler::inject_event`].
|
|
type InEvent;
|
|
/// The outbound type of events that the handler emits to the `Network`
|
|
/// through [`ConnectionHandler::poll`].
|
|
///
|
|
/// See also [`NetworkEvent::ConnectionEvent`](crate::network::NetworkEvent::ConnectionEvent).
|
|
type OutEvent;
|
|
/// The type of errors that the handler can produce when polled by the `Network`.
|
|
type Error;
|
|
/// The type of the substream containing the data.
|
|
type Substream;
|
|
/// Information about a substream. Can be sent to the handler through a `SubstreamEndpoint`,
|
|
/// and will be passed back in `inject_substream` or `inject_outbound_closed`.
|
|
type OutboundOpenInfo;
|
|
|
|
/// Sends a new substream to the handler.
|
|
///
|
|
/// The handler is responsible for upgrading the substream to whatever protocol it wants.
|
|
///
|
|
/// # Panic
|
|
///
|
|
/// Implementations are allowed to panic in the case of dialing if the `user_data` in
|
|
/// `endpoint` doesn't correspond to what was returned earlier when polling, or is used
|
|
/// multiple times.
|
|
fn inject_substream(&mut self, substream: Self::Substream, endpoint: SubstreamEndpoint<Self::OutboundOpenInfo>);
|
|
|
|
/// Notifies the handler of an event.
|
|
fn inject_event(&mut self, event: Self::InEvent);
|
|
|
|
/// Polls the handler for events.
|
|
///
|
|
/// Returning an error will close the connection to the remote.
|
|
fn poll(&mut self, cx: &mut Context)
|
|
-> Poll<Result<ConnectionHandlerEvent<Self::OutboundOpenInfo, Self::OutEvent>, Self::Error>>;
|
|
}
|
|
|
|
/// Prototype for a `ConnectionHandler`.
|
|
pub trait IntoConnectionHandler<TConnInfo = PeerId> {
|
|
/// The node handler.
|
|
type Handler: ConnectionHandler;
|
|
|
|
/// Builds the node handler.
|
|
///
|
|
/// The implementation is given a `Connected` value that holds information about
|
|
/// the newly established connection for which a handler should be created.
|
|
fn into_handler(self, connected: &Connected<TConnInfo>) -> Self::Handler;
|
|
}
|
|
|
|
impl<T, TConnInfo> IntoConnectionHandler<TConnInfo> for T
|
|
where
|
|
T: ConnectionHandler
|
|
{
|
|
type Handler = Self;
|
|
|
|
fn into_handler(self, _: &Connected<TConnInfo>) -> Self {
|
|
self
|
|
}
|
|
}
|
|
|
|
/// Event produced by a handler.
|
|
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
|
|
pub enum ConnectionHandlerEvent<TOutboundOpenInfo, TCustom> {
|
|
/// Require a new outbound substream to be opened with the remote.
|
|
OutboundSubstreamRequest(TOutboundOpenInfo),
|
|
|
|
/// Other event.
|
|
Custom(TCustom),
|
|
}
|
|
|
|
/// Event produced by a handler.
|
|
impl<TOutboundOpenInfo, TCustom> ConnectionHandlerEvent<TOutboundOpenInfo, TCustom> {
|
|
/// If this is `OutboundSubstreamRequest`, maps the content to something else.
|
|
pub fn map_outbound_open_info<F, I>(self, map: F) -> ConnectionHandlerEvent<I, TCustom>
|
|
where F: FnOnce(TOutboundOpenInfo) -> I
|
|
{
|
|
match self {
|
|
ConnectionHandlerEvent::OutboundSubstreamRequest(val) => {
|
|
ConnectionHandlerEvent::OutboundSubstreamRequest(map(val))
|
|
},
|
|
ConnectionHandlerEvent::Custom(val) => ConnectionHandlerEvent::Custom(val),
|
|
}
|
|
}
|
|
|
|
/// If this is `Custom`, maps the content to something else.
|
|
pub fn map_custom<F, I>(self, map: F) -> ConnectionHandlerEvent<TOutboundOpenInfo, I>
|
|
where F: FnOnce(TCustom) -> I
|
|
{
|
|
match self {
|
|
ConnectionHandlerEvent::OutboundSubstreamRequest(val) => {
|
|
ConnectionHandlerEvent::OutboundSubstreamRequest(val)
|
|
},
|
|
ConnectionHandlerEvent::Custom(val) => ConnectionHandlerEvent::Custom(map(val)),
|
|
}
|
|
}
|
|
}
|
|
|