British-Information-Technologies
/
ChatKit-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Grpc-manager #22

Merged
michael-bailey merged 28 commits from grpc-manager into master 2024-05-30 19:42:42 +00:00
Conversation 0 Commits 28 Files Changed 108 +21 -27
2 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 787dfcd022 - Show all commits

23
server/src/network/json/json_listener.rs
View File

@ -1,10 +1,5 @@
use async_trait::async_trait;
use tokio::{
net::TcpListener,
select,
sync::mpsc::UnboundedSender,
task::JoinHandle,
};
use tokio::{net::TcpListener, sync::mpsc::UnboundedSender, task::JoinHandle};
use crate::{
network::{ConnectionType, NetworkListener},
@ -36,16 +31,18 @@ impl NetworkListener for JSONListener {
async fn run(&self) {
loop {
println!("[JSONListener] waiting for connection");
let accept_protobuf = self.listener.accept();
let accept_protobuf = self.listener.accept().await;
let msg = select! {
Ok((stream, addr)) = accept_protobuf => {
println!("[JSONListener] accepted connection");
ServerMessages::NewConnection(ConnectionType::JsonConnection(stream, addr))
}
let Ok((stream, addr)) = accept_protobuf else {
println!("[JSONListener] accept failed");
continue;
};
let msg = ServerMessages::NewConnection(ConnectionType::JsonConnection(
stream, addr,
));
println!("[JSONListener] passing message to server");
self.sender.send(msg).unwrap();
_ = self.sender.send(msg);
}
}

25
server/src/network/protobuf/protobuf_listener.rs
View File

@ -1,10 +1,5 @@
use async_trait::async_trait;
use tokio::{
net::TcpListener,
select,
sync::mpsc::UnboundedSender,
task::JoinHandle,
};
use tokio::{net::TcpListener, sync::mpsc::UnboundedSender, task::JoinHandle};
use crate::{
network::{ConnectionType, NetworkListener},
@ -37,16 +32,18 @@ impl NetworkListener for ProtobufListener {
async fn run(&self) {
loop {
println!("[ProtobufListener] waiting for connection");
let accept_protobuf = self.protobuf_listener.accept();
let msg = select! {
Ok((stream, addr)) = accept_protobuf => {
println!("[ProtobufListener] accepted connection");
ServerMessages::NewConnection(ConnectionType::ProtobufConnection(stream, addr))
}
let accept_protobuf = self.protobuf_listener.accept().await;
let Ok((stream, addr)) = accept_protobuf else {
println!("[ProtobufListener] accept failed");
continue;
};
let msg = ServerMessages::NewConnection(
ConnectionType::ProtobufConnection(stream, addr),
);
println!("[ProtobufListener] passing message to server");
self.sender.send(msg).unwrap();
_ = self.sender.send(msg);
}
}