Merge pull request #270 from mxinden/wss

feat: add (secure) websocket support

Author: mxinden

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.12.1] - unreleased
+### Added
+- Support websocket.
+  See [PR 270].
+
+[PR 270]: https://github.com/mxinden/rust-libp2p-server/pull/270
+
 ## [0.8.0]
 ### Changed
 - Remove mplex support.

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-server"
-version = "0.12.0"
+version = "0.12.1"
 authors = ["Max Inden <mail@max-inden.de>"]
 edition = "2021"
 description = "A rust-libp2p server binary."
@@ -13,7 +13,7 @@ base64 = "0.21"
 env_logger = "0.10.0"
 futures = "0.3.27"
 futures-timer = "3"
-libp2p = { git = "https://github.com/libp2p/rust-libp2p", version = "0.52.1", default-features = false, features = ["autonat", "dns", "async-std", "noise", "tcp", "yamux", "identify", "kad", "ping", "relay", "metrics", "rsa", "macros"] }
+libp2p = { git = "https://github.com/libp2p/rust-libp2p", version = "0.52.1", default-features = false, features = ["autonat", "dns", "async-std", "noise", "tcp", "yamux", "identify", "kad", "ping", "relay", "metrics", "rsa", "macros", "websocket"] }
 libp2p-quic = { git = "https://github.com/libp2p/rust-libp2p", version = "0.9.0-alpha", default-features = false, features = ["async-std"] }
 log = "0.4"
 prometheus-client = "0.21.2"

Cargo.toml

@@ -4,6 +4,7 @@ use futures::future::Either;
 use futures::stream::StreamExt;
 use futures_timer::Delay;
 use libp2p::core::muxing::StreamMuxerBox;
+use libp2p::core::transport::OrTransport;
 use libp2p::core::upgrade;
 use libp2p::dns;
 use libp2p::identify;
@@ -95,16 +96,33 @@ fn main() -> Result<(), Box<dyn Error>> {
             libp2p_quic::async_std::Transport::new(config)
         };
 
-        block_on(dns::DnsConfig::system(
+        let tcp_and_quic = block_on(dns::DnsConfig::system(
             libp2p::core::transport::OrTransport::new(quic_transport, tcp_transport),
         ))
         .unwrap()
         .map(|either_output, _| match either_output {
             Either::Left((peer_id, muxer)) => (peer_id, StreamMuxerBox::new(muxer)),
             Either::Right((peer_id, muxer)) => (peer_id, StreamMuxerBox::new(muxer)),
         })
-        .map_err(|err| io::Error::new(io::ErrorKind::Other, err))
-        .boxed()
+        .map_err(|err| io::Error::new(io::ErrorKind::Other, err));
+
+        let websocket = libp2p::websocket::WsConfig::new(
+            block_on(libp2p::dns::DnsConfig::system(
+                libp2p::tcp::async_io::Transport::new(libp2p::tcp::Config::default()),
+            ))
+            .unwrap(),
+        )
+        .upgrade(upgrade::Version::V1)
+        .authenticate(noise::Config::new(&local_keypair)?)
+        .multiplex(yamux::Config::default())
+        .timeout(Duration::from_secs(20));
+
+        OrTransport::new(websocket, tcp_and_quic)
+            .map(|either_output, _| match either_output {
+                Either::Left((peer_id, muxer)) => (peer_id, StreamMuxerBox::new(muxer)),
+                Either::Right((peer_id, muxer)) => (peer_id, StreamMuxerBox::new(muxer)),
+            })
+            .boxed()
     };
 
     let behaviour = behaviour::Behaviour::new(