preserving tcp connection

This commit is contained in:
2026-08-16 20:00:02 +02:00
parent 673eed4e80
commit 1dfc7b90dc
3 changed files with 204 additions and 73 deletions
+105 -37
View File
@@ -1,10 +1,10 @@
use shared::{AudioStreamInfo, ResponseStatus, TcpRequest, TcpRequestData, TcpResponse};
use std::sync::Arc;
use std::{collections::HashMap, net::SocketAddr};
use tokio::io::AsyncWriteExt;
use tokio::io::{AsyncReadExt, AsyncWriteExt};
use tokio::{
net::{TcpListener, UdpSocket},
sync::RwLock,
sync::{RwLock, broadcast},
};
struct Client {
@@ -13,15 +13,24 @@ struct Client {
audio_streams: Option<Vec<AudioStreamInfo>>,
}
#[derive(Clone, Debug)]
enum ServerEvent {
NewStream(u32),
UserConnected(u32),
UserDisconnected(u32),
ClosedStream(u32),
}
type State = Arc<RwLock<HashMap<u32, Client>>>;
#[tokio::main]
async fn main() {
let listen_address = "0.0.0.0:8080";
let (global_event_tx, _) = broadcast::channel::<ServerEvent>(16);
let state: State = Arc::new(RwLock::new(HashMap::new()));
let tcp_state = state.clone();
let udp_state = state.clone();
let tcp_listener = TcpListener::bind(listen_address)
@@ -67,42 +76,101 @@ async fn main() {
let (mut tcp_stream, tcp_address) =
tcp_listener.accept().await.expect("failed to accept tcp");
tcp_stream.readable().await.expect("idk");
let mut tcp_buf = [0; 4096];
let tcp_state = state.clone();
match tcp_stream.try_read(&mut tcp_buf) {
Ok(n) => match serde_json::from_slice::<TcpRequest>(&tcp_buf[0..n]) {
Ok(request) => match request.data {
TcpRequestData::NewConnection => {
let client_id = next_client_id;
next_client_id += 1;
tcp_state.write().await.insert(
client_id,
Client {
tcp_addr: tcp_address,
udp_addr: None,
audio_streams: None,
let global_event_tx_clone = global_event_tx.clone();
let mut global_event_rx = global_event_tx.subscribe();
tokio::spawn(async move {
let mut current_client_id: u32 = 0;
let mut tcp_buf = [0; 4096];
loop {
tokio::select! {
socket_result = tcp_stream.read(&mut tcp_buf) => {
match socket_result {
Ok(0) => {
let _ = global_event_tx_clone.send(ServerEvent::UserDisconnected(current_client_id));
println!("client disconnected: {}", tcp_address);
break;
}
Ok(n) => match serde_json::from_slice::<TcpRequest>(&tcp_buf[0..n]) {
Ok(request) => match request.data {
TcpRequestData::NewConnection => {
current_client_id = next_client_id;
next_client_id += 1;
tcp_state.write().await.insert(
current_client_id,
Client {
tcp_addr: tcp_address,
udp_addr: None,
audio_streams: None,
},
);
let _ = global_event_tx_clone.send(ServerEvent::UserConnected(current_client_id));
println!("new client: {}, from: {}", current_client_id, tcp_address);
let _ = tcp_stream
.write_all(
serde_json::to_string(&TcpResponse {
status: ResponseStatus::Ok,
data: shared::TcpResponseData::NewConnection {
client_id: current_client_id,
},
})
.expect("failed to parse response json TcpRequestData::NewConnection")
.as_bytes(),
)
.await;
}
_ => eprintln!("i dont support other requests yet"),
},
Err(e) => eprintln!("failed to parse tcp packet: {}", e),
},
);
println!("new client: {}, from: {}", client_id, tcp_address);
let _ = tcp_stream
.write_all(
serde_json::to_string(&TcpResponse {
status: ResponseStatus::Ok,
data: shared::TcpResponseData::NewConnection {
client_id: client_id,
},
})
.expect("failed to parse response json")
.as_bytes(),
)
.await;
Err(e) => eprintln!("failed to receive tcp packet: {}", e),
}
}
_ => eprintln!("i dont support other requests yet"),
},
Err(e) => eprintln!("failed to parse tcp packet: {}", e),
},
Err(e) => eprintln!("failed to receive tcp packet: {}", e),
}
event_result = global_event_rx.recv() => {
match event_result {
Ok(event) => {
match event {
ServerEvent::UserConnected(new_user_id) => {
let _ = tcp_stream
.write_all(
serde_json::to_string(&TcpResponse {
status: ResponseStatus::Ok,
data: shared::TcpResponseData::UserConnected {
user_id: new_user_id
},
})
.expect("failed to parse response json ServerEvent::UserConnected")
.as_bytes(),
)
.await;
}
ServerEvent::UserDisconnected(user_id) => {
let _ = tcp_stream
.write_all(
serde_json::to_string(&TcpResponse {
status: ResponseStatus::Ok,
data: shared::TcpResponseData::UserDisconnected {
user_id: user_id
},
})
.expect("failed to parse response json ServerEvent::UserConnected")
.as_bytes(),
)
.await;
}
_ => {
println!("lkdahjsf");
}
}
}
Err(e) => eprintln!("error: {}", e),
}
}
}
}
});
}
}