Encapsulate and handle registration refresh logic in rendezvous::Behaviour. Make rendezvous config optional and remove defaults values.rendezvous-asb-refactor
rishflab
3 years ago
committed by
Daniel Karzel
parent
2bdfc58ed7
commit
b19123066d
@ -0,0 +1,155 @@
|
||||
use crate::rendezvous::XmrBtcNamespace;
|
||||
use anyhow::Result;
|
||||
use libp2p::core::connection::ConnectionId;
|
||||
use libp2p::identity::Keypair;
|
||||
use libp2p::multiaddr::Protocol;
|
||||
use libp2p::rendezvous::{Event, Namespace};
|
||||
use libp2p::swarm::{
|
||||
IntoProtocolsHandler, NetworkBehaviour, NetworkBehaviourAction, NetworkBehaviourEventProcess,
|
||||
PollParameters, ProtocolsHandler,
|
||||
};
|
||||
use libp2p::{Multiaddr, PeerId};
|
||||
use std::task::{Context, Poll};
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
/// A `NetworkBehaviour` that handles registration of the xmr-btc swap service with a rendezvous point
|
||||
pub struct Behaviour {
|
||||
rendezvous_behaviour: libp2p::rendezvous::Rendezvous,
|
||||
rendezvous_point_peer_id: PeerId,
|
||||
rendezvous_point_addr: Multiaddr,
|
||||
rendezvous_namespace: XmrBtcNamespace,
|
||||
rendezvous_reregister_timestamp: Option<Instant>,
|
||||
is_connected: bool,
|
||||
events: Vec<NetworkBehaviourAction<BehaviourInEvent, ()>>,
|
||||
}
|
||||
|
||||
impl Behaviour {
|
||||
pub fn new(
|
||||
keypair: Keypair,
|
||||
peer_id: PeerId,
|
||||
addr: Multiaddr,
|
||||
namespace: XmrBtcNamespace,
|
||||
) -> Self {
|
||||
Self {
|
||||
rendezvous_behaviour: libp2p::rendezvous::Rendezvous::new(
|
||||
keypair,
|
||||
libp2p::rendezvous::Config::default(),
|
||||
),
|
||||
rendezvous_point_peer_id: peer_id,
|
||||
rendezvous_point_addr: addr,
|
||||
rendezvous_namespace: namespace,
|
||||
rendezvous_reregister_timestamp: None,
|
||||
is_connected: false,
|
||||
events: vec![],
|
||||
}
|
||||
}
|
||||
|
||||
pub fn refresh_registration(&mut self) -> Result<()> {
|
||||
if self.is_connected {
|
||||
if let Some(rendezvous_reregister_timestamp) = self.rendezvous_reregister_timestamp {
|
||||
if Instant::now() > rendezvous_reregister_timestamp {
|
||||
self.rendezvous_behaviour.register(
|
||||
Namespace::new(self.rendezvous_namespace.to_string())
|
||||
.expect("our namespace to be a correct string"),
|
||||
self.rendezvous_point_peer_id,
|
||||
None,
|
||||
)?;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
let p2p_suffix = Protocol::P2p(self.rendezvous_point_peer_id.into());
|
||||
let address_with_p2p = if !self
|
||||
.rendezvous_point_addr
|
||||
.ends_with(&Multiaddr::empty().with(p2p_suffix.clone()))
|
||||
{
|
||||
self.rendezvous_point_addr.clone().with(p2p_suffix)
|
||||
} else {
|
||||
self.rendezvous_point_addr.clone()
|
||||
};
|
||||
self.events.push(NetworkBehaviourAction::DialAddress {
|
||||
address: address_with_p2p,
|
||||
})
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
type BehaviourInEvent =
|
||||
<<<libp2p::rendezvous::Rendezvous as NetworkBehaviour>::ProtocolsHandler as IntoProtocolsHandler>::Handler as ProtocolsHandler>::InEvent;
|
||||
|
||||
impl NetworkBehaviour for Behaviour {
|
||||
type ProtocolsHandler = <libp2p::rendezvous::Rendezvous as NetworkBehaviour>::ProtocolsHandler;
|
||||
type OutEvent = ();
|
||||
|
||||
fn new_handler(&mut self) -> Self::ProtocolsHandler {
|
||||
<libp2p::rendezvous::Rendezvous as NetworkBehaviour>::ProtocolsHandler::default()
|
||||
}
|
||||
|
||||
fn addresses_of_peer(&mut self, _peer_id: &PeerId) -> Vec<Multiaddr> {
|
||||
vec![]
|
||||
}
|
||||
|
||||
fn inject_connected(&mut self, peer_id: &PeerId) {
|
||||
if *peer_id == self.rendezvous_point_peer_id {
|
||||
self.is_connected = true;
|
||||
}
|
||||
}
|
||||
|
||||
fn inject_disconnected(&mut self, peer_id: &PeerId) {
|
||||
if *peer_id == self.rendezvous_point_peer_id {
|
||||
self.is_connected = false;
|
||||
}
|
||||
}
|
||||
|
||||
fn inject_event(
|
||||
&mut self,
|
||||
_peer_id: PeerId,
|
||||
_connection: ConnectionId,
|
||||
_event: <<libp2p::rendezvous::Rendezvous as NetworkBehaviour>::ProtocolsHandler as ProtocolsHandler>::OutEvent,
|
||||
) {
|
||||
}
|
||||
|
||||
fn poll(
|
||||
&mut self,
|
||||
_cx: &mut Context<'_>,
|
||||
_params: &mut impl PollParameters,
|
||||
) -> Poll<NetworkBehaviourAction<BehaviourInEvent, Self::OutEvent>> {
|
||||
if let Some(event) = self.events.pop() {
|
||||
return Poll::Ready(event);
|
||||
}
|
||||
Poll::Pending
|
||||
}
|
||||
}
|
||||
|
||||
impl NetworkBehaviourEventProcess<libp2p::rendezvous::Event> for Behaviour {
|
||||
fn inject_event(&mut self, event: Event) {
|
||||
match event {
|
||||
Event::RegisterFailed(error) => {
|
||||
tracing::error!(rendezvous_node=%self.rendezvous_point_peer_id, "Registration with rendezvous node failed: {:#}", error);
|
||||
}
|
||||
Event::RegistrationExpired(registration) => {
|
||||
tracing::warn!("Registation expired: {:?}", registration)
|
||||
}
|
||||
Event::Registered {
|
||||
rendezvous_node,
|
||||
ttl,
|
||||
namespace,
|
||||
} => {
|
||||
// TODO: this can most likely not happen at all, potentially remove these checks
|
||||
if rendezvous_node != self.rendezvous_point_peer_id {
|
||||
tracing::error!(peer_id=%rendezvous_node, "Ignoring message from unknown rendezvous node");
|
||||
}
|
||||
|
||||
// TODO: Consider implementing From for Namespace and XmrBtcNamespace
|
||||
if namespace.to_string() != self.rendezvous_namespace.to_string() {
|
||||
tracing::error!(peer_id=%rendezvous_node, %namespace, "Ignoring message from rendezvous node for unknown namespace");
|
||||
}
|
||||
|
||||
// record re-registration after half the ttl has expired
|
||||
self.rendezvous_reregister_timestamp =
|
||||
Some(Instant::now() + Duration::from_secs(ttl) / 2);
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in new issue