Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions mm2src/mm2_net/src/event_streaming/sse_handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,13 @@ pub async fn handle_sse(request: Request<Body>, ctx_h: u32) -> Response<Body> {
return handle_internal_error("Event streaming is disabled".to_string()).await;
};

let client_id = match request.uri().query().and_then(|query| {
query
.split('&')
.find(|param| param.starts_with("id="))
.map(|id_param| id_param.trim_start_matches("id=").parse::<u64>())
}) {
Some(Ok(id)) => id,
let client_id = request
.uri()
.query()
.and_then(|q| q.split('&').find_map(|p| p.strip_prefix("id=")))
.and_then(|v| v.parse::<u64>().ok())
// Default to zero when client ID isn't passed, most of the cases we will have a single user/client.
_ => 0,
};
.unwrap_or(0);

let event_stream_manager = ctx.event_stream_manager.clone();
let Ok(mut rx) = event_stream_manager.new_client(client_id) else {
Expand Down
Loading