diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml index a7feeac7..d0663746 100644 --- a/transports/websocket/Cargo.toml +++ b/transports/websocket/Cargo.toml @@ -17,7 +17,7 @@ libp2p-core = { version = "0.30.0", path = "../../core", default-features = fals log = "0.4.8" quicksink = "0.1" rw-stream-sink = "0.2.0" -soketto = { version = "0.4.1", features = ["deflate"] } +soketto = { version = "0.7.0", features = ["deflate"] } url = "2.1" webpki-roots = "0.21" diff --git a/transports/websocket/src/framed.rs b/transports/websocket/src/framed.rs index 52635ec5..02529036 100644 --- a/transports/websocket/src/framed.rs +++ b/transports/websocket/src/framed.rs @@ -205,13 +205,13 @@ where .receive_request() .map_err(|e| Error::Handshake(Box::new(e))) .await?; - request.into_key() + request.key() }; trace!("accepting websocket handshake request from {}", remote2); let response = handshake::server::Response::Accept { - key: &ws_key, + key: ws_key, protocol: None, }; @@ -583,6 +583,7 @@ where Ok(soketto::Incoming::Pong(pong)) => { Some((Ok(IncomingData::Pong(Vec::from(pong))), (data, receiver))) } + Ok(soketto::Incoming::Closed(_)) => None, Err(connection::Error::Closed) => None, Err(e) => Some((Err(e), (data, receiver))), }