-
Notifications
You must be signed in to change notification settings - Fork 15
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.
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
refactor client ws handler #86
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| pub mod client_handler; | ||
| pub mod connect_session; | ||
| pub mod drop_sessions; | ||
| pub mod get_pending_request; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,259 @@ | ||
| use crate::{ | ||
| errors::NightlyError, | ||
| state::{ClientSockets, ClientToSessions, ModifySession, SendToClient, Sessions}, | ||
| structs::{ | ||
| client_messages::{ | ||
| client_initialize::ClientInitializeResponse, | ||
| client_messages::{ClientToServer, ServerToClient}, | ||
| drop_sessions::DropSessionsResponse, | ||
| get_sessions::GetSessionsResponse, | ||
| }, | ||
| common::ErrorMessage, | ||
| }, | ||
| ws::client_handler::methods::{ | ||
| disconnect_sessions::disconnect_client_sessions, get_info::process_get_info, | ||
| get_pending_requests::process_get_pending_requests, | ||
| process_connect::process_client_connect, | ||
| process_new_payload_reply::process_new_payload_event_reply, | ||
| }, | ||
| }; | ||
| use axum::{ | ||
| extract::{ | ||
| ws::{Message, WebSocket}, | ||
| ConnectInfo, State, WebSocketUpgrade, | ||
| }, | ||
| response::Response, | ||
| }; | ||
| use futures::StreamExt; | ||
| use log::{debug, info, warn}; | ||
| use std::net::SocketAddr; | ||
| use tokio::sync::RwLock; | ||
|
|
||
| pub async fn on_new_client_connection( | ||
| ConnectInfo(ip): ConnectInfo<SocketAddr>, | ||
| State(sessions): State<Sessions>, | ||
| State(client_sockets): State<ClientSockets>, | ||
| State(client_to_sessions): State<ClientToSessions>, | ||
| ws: WebSocketUpgrade, | ||
| ) -> Response { | ||
| let ip = ip.clone().to_string().clone(); | ||
| ws.on_upgrade(move |socket| async move { | ||
| debug!("OPEN client connection from {}", ip); | ||
| client_handler(socket, sessions, client_sockets, client_to_sessions).await; | ||
| debug!("CLOSE client connection from {}", ip); | ||
| }) | ||
| } | ||
|
|
||
| pub async fn client_handler( | ||
| socket: WebSocket, | ||
| sessions: Sessions, | ||
| client_sockets: ClientSockets, | ||
| client_to_sessions: ClientToSessions, | ||
| ) { | ||
| let (sender, mut receiver) = socket.split(); | ||
| let sessions = sessions.clone(); | ||
| // Handle the new app connection here | ||
| // Wait for initialize message | ||
| let client_id: String = loop { | ||
| // If stream is closed, or message is not received, return | ||
| let msg = match receiver.next().await { | ||
| Some(Ok(msg)) => msg, | ||
| Some(Err(_)) | None => { | ||
| return; | ||
| } | ||
| }; | ||
|
|
||
| let app_msg = match msg { | ||
| Message::Text(data) => match serde_json::from_str::<ClientToServer>(&data) { | ||
| Ok(app_msg) => app_msg, | ||
| Err(_) => continue, | ||
| }, | ||
| Message::Close(None) | Message::Close(Some(_)) => { | ||
| return; | ||
| } | ||
| _ => continue, | ||
| }; | ||
|
|
||
| match app_msg { | ||
| ClientToServer::ClientInitializeRequest(connect_request) => { | ||
| // Insert client socket | ||
| { | ||
| let mut client_sockets_write = client_sockets.write().await; | ||
| client_sockets_write | ||
| .insert(connect_request.client_id.clone(), RwLock::new(sender)); | ||
| } | ||
| // Send response | ||
| let client_msg = | ||
| ServerToClient::ClientInitializeResponse(ClientInitializeResponse { | ||
| response_id: connect_request.response_id, | ||
| }); | ||
| client_sockets | ||
| .send_to_client(connect_request.client_id.clone(), client_msg) | ||
| .await | ||
| .unwrap_or_default(); | ||
| break connect_request.client_id; | ||
| } | ||
| _ => { | ||
| continue; | ||
| } | ||
| } | ||
| }; | ||
| info!("Client connected: {}", client_id); | ||
|
|
||
| // Main loop request handler | ||
| loop { | ||
| let msg = match receiver.next().await { | ||
| Some(Ok(msg)) => msg, | ||
| Some(Err(_)) | None => { | ||
| // Disconnect all user sessions | ||
| if let Err(err) = disconnect_client_sessions( | ||
| client_id.clone(), | ||
| &sessions, | ||
| &client_to_sessions, | ||
| None, | ||
| ) | ||
| .await | ||
| { | ||
| warn!("Error disconnecting session: {}", err); | ||
| } | ||
|
|
||
| // Remove client socket | ||
| client_sockets | ||
| .close_client_socket(client_id.clone()) | ||
| .await | ||
| .unwrap_or_default(); | ||
|
|
||
| return; | ||
| } | ||
| }; | ||
|
|
||
| let app_msg = match msg { | ||
| Message::Text(data) => match serde_json::from_str::<ClientToServer>(&data) { | ||
| Ok(app_msg) => app_msg, | ||
| Err(_) => continue, | ||
| }, | ||
| Message::Close(None) | Message::Close(Some(_)) => { | ||
| // Disconnect all user sessions | ||
| if let Err(err) = disconnect_client_sessions( | ||
| client_id.clone(), | ||
| &sessions, | ||
| &client_to_sessions, | ||
| None, | ||
| ) | ||
| .await | ||
| { | ||
| warn!("Error disconnecting session: {}", err); | ||
| } | ||
| // Remove client socket | ||
| client_sockets | ||
| .close_client_socket(client_id.clone()) | ||
| .await | ||
| .unwrap_or_default(); | ||
|
|
||
| return; | ||
| } | ||
| _ => continue, | ||
| }; | ||
| info!("Client {} new msg {:?}", client_id, app_msg); | ||
|
|
||
| match app_msg { | ||
| ClientToServer::ConnectRequest(connect_request) => { | ||
| if let Err(err) = process_client_connect( | ||
| &client_id, | ||
| &sessions, | ||
| &client_sockets, | ||
| &client_to_sessions, | ||
| connect_request, | ||
| ) | ||
| .await | ||
| { | ||
| warn!("Error processing connect request: {}", err); | ||
| } | ||
| } | ||
| ClientToServer::NewPayloadEventReply(new_payload_event_reply) => { | ||
| if let Err(err) = process_new_payload_event_reply( | ||
| &client_id, | ||
| &sessions, | ||
| &client_sockets, | ||
| new_payload_event_reply, | ||
| ) | ||
| .await | ||
| { | ||
| warn!("Error processing new payload event reply: {}", err); | ||
| } | ||
| } | ||
| ClientToServer::GetInfoRequest(get_info_request) => { | ||
| if let Err(err) = | ||
| process_get_info(&client_id, &sessions, &client_sockets, get_info_request).await | ||
| { | ||
| warn!("Error processing get info request: {}", err); | ||
| } | ||
| } | ||
| ClientToServer::GetPendingRequestsRequest(get_pending_requests_request) => { | ||
| if let Err(err) = process_get_pending_requests( | ||
| &client_id, | ||
| &sessions, | ||
| &client_sockets, | ||
| get_pending_requests_request, | ||
| ) | ||
| .await | ||
| { | ||
| warn!("Error processing get pending requests request: {}", err); | ||
| } | ||
| } | ||
| ClientToServer::GetSessionsRequest(get_sessions_request) => { | ||
| let sessions = client_to_sessions.get_sessions(client_id.clone()).await; | ||
| let response = ServerToClient::GetSessionsResponse(GetSessionsResponse { | ||
| sessions, | ||
| response_id: get_sessions_request.response_id, | ||
| }); | ||
| client_sockets | ||
| .send_to_client(client_id.clone(), response) | ||
| .await | ||
| .unwrap_or_default(); | ||
| } | ||
| ClientToServer::DropSessionsRequest(drop_sessions_request) => { | ||
| match disconnect_client_sessions( | ||
| client_id.clone(), | ||
| &sessions, | ||
| &client_to_sessions, | ||
| Some(&drop_sessions_request.sessions), | ||
| ) | ||
| .await | ||
| { | ||
| Ok(dropped_sessions) => { | ||
| let response = ServerToClient::DropSessionsResponse(DropSessionsResponse { | ||
| dropped_sessions, | ||
| response_id: drop_sessions_request.response_id, | ||
| }); | ||
| client_sockets | ||
| .send_to_client(client_id.clone(), response) | ||
| .await | ||
| .unwrap_or_default(); | ||
| } | ||
| Err(err) => { | ||
| let error = ServerToClient::ErrorMessage(ErrorMessage { | ||
| response_id: drop_sessions_request.response_id, | ||
| error: err.to_string(), | ||
| }); | ||
| client_sockets | ||
| .send_to_client(client_id.clone(), error) | ||
| .await | ||
| .unwrap_or_default(); | ||
| } | ||
| } | ||
| } | ||
| ClientToServer::ClientInitializeRequest(_) => { | ||
| let error = ServerToClient::ErrorMessage(ErrorMessage { | ||
| response_id: "".to_string(), | ||
| error: NightlyError::ClientAlreadyInitialized.to_string(), | ||
| }); | ||
| client_sockets | ||
| .send_to_client(client_id.clone(), error) | ||
| .await | ||
| .unwrap_or_default(); | ||
| } | ||
| } | ||
| info!("Client {} msg handled", client_id); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove