From e9758b32fda86456c47412f8e6f9493c1377f380 Mon Sep 17 00:00:00 2001 From: glihm Date: Thu, 29 Aug 2024 08:19:42 -0600 Subject: [PATCH] fix: remove tls for ws --- crates/torii/libp2p/src/server/mod.rs | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/crates/torii/libp2p/src/server/mod.rs b/crates/torii/libp2p/src/server/mod.rs index 3b38d8ce53..da8e7742e5 100644 --- a/crates/torii/libp2p/src/server/mod.rs +++ b/crates/torii/libp2p/src/server/mod.rs @@ -1,6 +1,5 @@ use std::collections::hash_map::DefaultHasher; use std::hash::{Hash, Hasher}; -use std::io::Read; use std::net::Ipv4Addr; use std::path::Path; use std::str::FromStr; @@ -95,21 +94,13 @@ impl Relay

{ }) .expect("Failed to create WebRTC transport") .with_other_transport(|key| { - let mut transport = websocket::WsConfig::new( + let transport = websocket::WsConfig::new( dns::tokio::Transport::system(tcp::tokio::Transport::new( tcp::Config::default(), )) .unwrap(), ); - let rcgen_cert = - rcgen::generate_simple_self_signed(vec!["localhost".to_string()]).unwrap(); - let priv_key = websocket::tls::PrivateKey::new(rcgen_cert.key_pair.serialize_der()); - let bytes: Result, _> = rcgen_cert.cert.der().bytes().collect(); - let cert = websocket::tls::Certificate::new(bytes.unwrap()); - transport - .set_tls_config(websocket::tls::Config::new(priv_key, vec![cert]).unwrap()); - transport .upgrade(Version::V1) .authenticate(noise::Config::new(key).unwrap()) @@ -168,10 +159,10 @@ impl Relay

{ .with(Protocol::WebRTCDirect); swarm.listen_on(listen_addr_webrtc.clone())?; - // WSS + // WS let listen_addr_wss = Multiaddr::from(Ipv4Addr::UNSPECIFIED) .with(Protocol::Tcp(port_websocket)) - .with(Protocol::Wss("/".to_string().into())); + .with(Protocol::Ws("/".to_string().into())); swarm.listen_on(listen_addr_wss.clone())?; // Clients will send their messages to the "message" topic