websocket添加account

server/src/controller/websocket_controller.rs

@@ -4,16 +4,18 @@ use axum::extract::ws::WebSocketUpgrade;
 use axum::extract::ConnectInfo;
 use axum::response::IntoResponse;
 use axum_extra::{headers, TypedHeader};
+use library::context::Context;
 use macros::ws;
 
 use crate::service::websocket_service;
 
 #[ws("/ws")]
 pub async fn websocket_handler(
+    context: Context,
     ws: WebSocketUpgrade,
     user_agent: Option<TypedHeader<headers::UserAgent>>,
     ConnectInfo(addr): ConnectInfo<SocketAddr>
 ) -> impl IntoResponse {
         tracing::info!("`{:?}` at {:?} connected.", user_agent, addr);
-        ws.on_upgrade(move |socket| websocket_service::handle_socket(socket, addr))
+        ws.on_upgrade(move |socket| websocket_service::handle_socket(socket, addr, context))
 }

server/src/service/websocket_service.rs

@@ -4,9 +4,12 @@ use std::ops::ControlFlow;
 use axum::extract::ws::{Message, WebSocket};
 use futures::stream::{SplitSink, SplitStream};
 use futures::{SinkExt, StreamExt};
+use library::context::Context;
 
 /// Actual websocket statemachine (one will be spawned per connection)
-pub async fn handle_socket(socket: WebSocket, _who: SocketAddr) {
+pub async fn handle_socket(socket: WebSocket, _who: SocketAddr, context: Context) {
+    let account = context.get_account().unwrap();
+    tracing::info!("`{:?}` at {:?} connected, user is {:?}", account, _who, account.username);
     let (sender, receiver) = socket.split();
 
     tokio::spawn(write(sender));