Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(server): return err on WS handshake err #1288

Merged
merged 1 commit into from
Feb 12, 2024
Merged

fix(server): return err on WS handshake err #1288

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions server/src/transport/ws.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,14 @@ where

match server.receive_request(&req) {
Ok(response) => {
let upgraded = match hyper::upgrade::on(req).await {
Ok(u) => u,
Err(e) => {
tracing::debug!(target: LOG_TARGET, "WS upgrade handshake failed: {}", e);
return Err(hyper::Response::new(hyper::Body::from(format!("WS upgrade handshake failed {e}"))));
}
};

let (tx, rx) = mpsc::channel::<String>(server_cfg.message_buffer_capacity as usize);
let sink = MethodSink::new(tx);

Expand All @@ -440,14 +448,6 @@ where
let rpc_service = rpc_middleware.service(rpc_service);

let fut = async move {
let upgraded = match hyper::upgrade::on(req).await {
Ok(u) => u,
Err(e) => {
tracing::debug!(target: LOG_TARGET, "WS upgrade handshake failed: {}", e);
return;
}
};

let stream = BufReader::new(BufWriter::new(upgraded.compat()));
let mut ws_builder = server.into_builder(stream);
ws_builder.set_max_message_size(server_cfg.max_response_body_size as usize);
Expand All @@ -472,7 +472,7 @@ where
}
Err(e) => {
tracing::debug!(target: LOG_TARGET, "WS upgrade handshake failed: {}", e);
Err(hyper::Response::new(hyper::Body::from(format!("Could not upgrade connection: {e}"))))
Err(hyper::Response::new(hyper::Body::from(format!("WS upgrade handshake failed: {e}"))))
}
}
}