-
Notifications
You must be signed in to change notification settings - Fork 951
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add an example showcasing how to implement a custom network behavior and access streams #4983
Closed
Closed
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
b0adcca
init example
eserilev 1f43a65
framework of escape hatch example
eserilev 288a7a9
poll next
eserilev c40db59
returning a stream
eserilev fb9e629
implementing behaviour and connection handler
eserilev 35f8ad9
open_stream
eserilev ed74d04
mpsc channel
eserilev 2dba61b
update mpsc
eserilev aef8c2f
update mpsc
eserilev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
[package] | ||
name = "escape-hatch" | ||
version = "0.1.0" | ||
edition = "2021" | ||
publish = false | ||
license = "MIT" | ||
|
||
[package.metadata.release] | ||
release = false | ||
|
||
[dependencies] | ||
async-std = { version = "1.12", features = ["attributes"] } | ||
async-trait = "0.1" | ||
futures = "0.3.29" | ||
futures-timer = "3.0.2" | ||
libp2p = { path = "../../libp2p", features = [ "async-std", "dns", "kad", "mdns", "noise", "macros", "tcp", "yamux"] } | ||
libp2p-core = { workspace = true } | ||
rand = "0.8" | ||
tokio = { version = "1.33", features = ["macros", "net", "rt", "signal"] } | ||
tracing = "0.1.37" | ||
tracing-subscriber = { version = "0.3", features = ["env-filter"] } | ||
void = "1.0" | ||
|
||
[lints] | ||
workspace = true |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
use libp2p::swarm::{ConnectionHandler, SubstreamProtocol, ConnectionHandlerEvent}; | ||
use libp2p::StreamProtocol; | ||
use libp2p_core::upgrade::ReadyUpgrade; | ||
use std::task::Context; | ||
use std::{task::Poll, time::Duration}; | ||
use void::Void; | ||
|
||
use crate::{Config, Error, PROTOCOL_NAME}; | ||
|
||
pub struct Connection { | ||
config: Config, | ||
} | ||
|
||
impl Connection { | ||
pub fn new(config: Config) -> Self { | ||
Self { config } | ||
} | ||
} | ||
|
||
impl ConnectionHandler for Connection { | ||
type FromBehaviour = Void; | ||
|
||
type ToBehaviour = Result<Duration, Error>; | ||
|
||
type InboundProtocol = ReadyUpgrade<StreamProtocol>; | ||
|
||
type OutboundProtocol = ReadyUpgrade<StreamProtocol>; | ||
|
||
type InboundOpenInfo = (); | ||
|
||
type OutboundOpenInfo = (); | ||
|
||
fn listen_protocol( | ||
&self, | ||
) -> libp2p::swarm::SubstreamProtocol<Self::InboundProtocol, Self::InboundOpenInfo> { | ||
SubstreamProtocol::new(ReadyUpgrade::new(PROTOCOL_NAME), ()) | ||
} | ||
|
||
fn on_behaviour_event(&mut self, _: Void) {} | ||
|
||
fn poll( | ||
&mut self, | ||
cx: &mut Context<'_>, | ||
) -> Poll< | ||
libp2p::swarm::ConnectionHandlerEvent< | ||
Self::OutboundProtocol, | ||
Self::OutboundOpenInfo, | ||
Self::ToBehaviour, | ||
>, | ||
> { | ||
let protocol = self.listen_protocol(); | ||
return Poll::Ready(ConnectionHandlerEvent::OutboundSubstreamRequest { | ||
protocol, | ||
}); | ||
} | ||
|
||
fn on_connection_event( | ||
&mut self, | ||
event: libp2p::swarm::handler::ConnectionEvent< | ||
Self::InboundProtocol, | ||
Self::OutboundProtocol, | ||
Self::InboundOpenInfo, | ||
Self::OutboundOpenInfo, | ||
>, | ||
) { | ||
todo!() | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,173 @@ | ||
use futures::channel::oneshot; | ||
use handler::Connection; | ||
use libp2p::swarm::{ | ||
ConnectionDenied, ConnectionId, FromSwarm, SubstreamProtocol, THandler, THandlerOutEvent, | ||
ToSwarm, | ||
}; | ||
use libp2p::{swarm::NetworkBehaviour, tcp::tokio::TcpStream, PeerId, Stream, StreamProtocol}; | ||
use libp2p_core::upgrade::ReadyUpgrade; | ||
use libp2p_core::{Endpoint, Multiaddr}; | ||
use std::task::Context; | ||
use std::{collections::VecDeque, io, task::Poll, time::Duration}; | ||
use std::sync::mpsc; | ||
|
||
mod handler; | ||
|
||
pub const PROTOCOL_NAME: StreamProtocol = StreamProtocol::new("/ipfs/ping/1.0.0"); | ||
|
||
#[derive(Debug)] | ||
pub enum Error { | ||
NotConnected(PeerId), | ||
UnsupportedProtocol, | ||
Io(io::Error), | ||
} | ||
|
||
/// Event generated by the `Ping` network behaviour. | ||
#[derive(Debug)] | ||
pub struct Event { | ||
/// The peer ID of the remote. | ||
pub peer: PeerId, | ||
/// The connection the ping was executed on. | ||
pub connection: ConnectionId, | ||
/// The result of an inbound or outbound ping. | ||
pub result: Result<Duration, Error>, | ||
} | ||
|
||
/// A behaviour that manages requests to open new streams which are directly handed to the user. | ||
pub struct Behaviour { | ||
/// Config | ||
config: Config, | ||
/// Queue of events to yield to the swarm. | ||
events: VecDeque<Event>, | ||
/// Protocol | ||
protocol: StreamProtocol, | ||
} | ||
|
||
#[derive(Debug, Clone)] | ||
pub struct Config { | ||
/// The timeout of an outbound ping. | ||
timeout: Duration, | ||
/// The duration between outbound pings. | ||
interval: Duration, | ||
} | ||
|
||
struct StreamMessage { | ||
peer_id: PeerId, // Assuming PeerId is a type representing a peer | ||
response_channel: oneshot::Sender<Result<Stream, Error>>, // For sending back the result | ||
} | ||
|
||
pub struct IncomingStreams { | ||
/// Queue of events to yield to the swarm. | ||
events: VecDeque<Event>, | ||
} | ||
|
||
/// A control acts as a "remote" that allows users to request streams without interacting with the `Swarm` directly. | ||
|
||
pub struct Control { | ||
sender: mpsc::Sender<StreamMessage>, | ||
receiver: mpsc::Receiver<StreamMessage> | ||
} | ||
|
||
impl IncomingStreams { | ||
pub async fn next(&mut self) -> (PeerId, Stream) { | ||
if let Some(e) = self.events.pop_back() { | ||
} else { | ||
} | ||
|
||
todo!() | ||
} | ||
|
||
pub fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<(PeerId, Stream)> { | ||
todo!() | ||
} | ||
} | ||
|
||
impl Behaviour { | ||
pub fn new(protocol: StreamProtocol) -> (Self, Control, IncomingStreams) { | ||
let (sender, receiver) = mpsc::channel::<StreamMessage>(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
let behaviour = Self { | ||
config: Config { | ||
timeout: Duration::from_secs(1), | ||
interval: Duration::from_secs(1), | ||
}, | ||
events: VecDeque::new(), | ||
protocol, | ||
}; | ||
|
||
( | ||
behaviour, | ||
Control { | ||
sender, | ||
receiver | ||
}, | ||
IncomingStreams { | ||
events: VecDeque::new(), | ||
}, | ||
) | ||
} | ||
} | ||
|
||
impl Control { | ||
pub async fn open_stream(&self, peer_id: PeerId) -> Result<Stream, Error> { | ||
let (response_tx, response_rx) = oneshot::channel(); | ||
let message = StreamMessage { | ||
peer_id, | ||
response_channel: response_tx, | ||
}; | ||
// Send the message to NetworkBehaviour | ||
self.sender.send(message).expect("Failed to send message"); | ||
response_rx.await.expect("Failed to receive response") | ||
} | ||
} | ||
|
||
impl NetworkBehaviour for Behaviour { | ||
type ConnectionHandler = Connection; | ||
|
||
type ToSwarm = Event; | ||
|
||
fn handle_established_inbound_connection( | ||
&mut self, | ||
_: ConnectionId, | ||
_: PeerId, | ||
_: &Multiaddr, | ||
_: &Multiaddr, | ||
) -> Result<THandler<Self>, ConnectionDenied> { | ||
Ok(Connection::new(self.config.clone())) | ||
} | ||
|
||
fn handle_established_outbound_connection( | ||
&mut self, | ||
_: ConnectionId, | ||
_: PeerId, | ||
_: &Multiaddr, | ||
_: Endpoint, | ||
) -> Result<THandler<Self>, ConnectionDenied> { | ||
Ok(Connection::new(self.config.clone())) | ||
} | ||
|
||
fn on_swarm_event(&mut self, _event: FromSwarm) {} | ||
|
||
fn on_connection_handler_event( | ||
&mut self, | ||
peer: PeerId, | ||
connection: ConnectionId, | ||
result: THandlerOutEvent<Self>, | ||
) { | ||
self.events.push_front(Event { | ||
peer, | ||
connection, | ||
result, | ||
}) | ||
} | ||
|
||
fn poll( | ||
&mut self, | ||
cx: &mut Context<'_>, | ||
) -> Poll<libp2p::swarm::ToSwarm<Self::ToSwarm, libp2p::swarm::THandlerInEvent<Self>>> { | ||
if let Some(e) = self.events.pop_back() { | ||
Poll::Ready(ToSwarm::GenerateEvent(e)) | ||
} else { | ||
Poll::Pending | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
use escape_hatch::Behaviour; | ||
use futures::prelude::*; | ||
use futures::StreamExt; | ||
use libp2p::StreamProtocol; | ||
use libp2p_core::{ | ||
multiaddr::multiaddr, | ||
transport::{memory::MemoryTransport, ListenerId, Transport}, | ||
}; | ||
use rand::{thread_rng, Rng}; | ||
|
||
#[tokio::main] | ||
async fn main() { | ||
let stream_protocol = StreamProtocol::new("/escape-hatch/"); | ||
let (behaviour, control, incoming_stream) = Behaviour::new(stream_protocol); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Similar to
Control::open_stream
, this needs to listen on anmpsc::Receiver
where thempsc::Sender
lives inBehaviour
. Any inbound streams from theConnectionHandler
need to be sent this one.