AtHeartEngineer/universal-connectivity
1
0
Fork 0
mirror of https://github.com/vacp2p/universal-connectivity.git synced 2026-01-10 07:38:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix connectivity issues (#63)

Browse Source 
Co-authored-by: chad <chad.nehemiah94@gmail.com>
This commit is contained in:
Prithvi Shahi
2023-04-26 12:25:09 -07:00
committed by GitHub
parent b136592f51
commit 4a309e5fa3
3 changed files with 754 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1171
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
packages/frontend/src/pages/index.tsx
View File

@@ -16,7 +16,7 @@ export default function Home() {
const [maddr, setMultiaddr] = useState('')
useEffect(() => {
const peerConnectedCB = (evt: CustomEvent<Connection>) => {
const peerConnectedCB = (evt: any) => {
const connection = evt.detail
setPeerStats({ ...peerStats, peerIds: [...peerStats.peerIds, connection.remotePeer], connections: [...peerStats.connections, connection], connected: true })
}

24
rust-peer/src/main.rs
View File

@@ -18,7 +18,7 @@ use libp2p_quic as quic;
use libp2p_webrtc as webrtc;
use libp2p_webrtc::tokio::Certificate;
use log::{debug, error, info, warn};
use std::net::{IpAddr, Ipv6Addr};
use std::net::{IpAddr, Ipv4Addr};
use std::path::Path;
use std::{
borrow::Cow,
@@ -62,11 +62,11 @@ async fn main() -> Result<()> {
let mut swarm = create_swarm(local_key, webrtc_cert)?;
let address_webrtc = Multiaddr::from(Ipv6Addr::UNSPECIFIED)
let address_webrtc = Multiaddr::from(Ipv4Addr::UNSPECIFIED)
.with(Protocol::Udp(PORT_WEBRTC))
.with(Protocol::WebRTCDirect);
let address_quic = Multiaddr::from(Ipv6Addr::UNSPECIFIED)
let address_quic = Multiaddr::from(Ipv4Addr::UNSPECIFIED)
.with(Protocol::Udp(PORT_QUIC))
.with(Protocol::QuicV1);
@@ -108,20 +108,8 @@ async fn main() -> Result<()> {
match select(swarm.next(), &mut tick).await {
Either::Left((event, _)) => match event.unwrap() {
SwarmEvent::NewListenAddr { address, .. } => {
// closure shortcut to sift through address response
let mut add_addr = |address: Multiaddr| {
let p2p_address = address.with(Protocol::P2p((*swarm.local_peer_id()).into()));
info!("Listen p2p address: {p2p_address:?}");
swarm.add_external_address(p2p_address, AddressScore::Infinite);
};
// Only add globally available IPv6 addresses to the external addresses list.
if let Protocol::Ip6(ip6) = address.iter().next().unwrap() {
if !ip6.is_loopback() && !ip6.is_unspecified() {
add_addr(address.clone());
}
} else {
add_addr(address.clone());
}
let p2p_address = address.with(Protocol::P2p((*swarm.local_peer_id()).into()));
info!("Listen p2p address: {p2p_address:?}");
}
SwarmEvent::ConnectionEstablished { peer_id, .. } => {
info!("Connected to {peer_id}");
@@ -196,7 +184,7 @@ async fn main() -> Result<()> {
// swarm.behaviour_mut().kademlia.add_address(&peer_id, addr);
let webrtc_address = addr
.with(Protocol::WebRTCDirect)
.with(Protocol::WebRTC)
.with(Protocol::P2p(peer_id.into()));
swarm