cargo fmt

This commit is contained in:
guochao 2024-06-04 12:14:44 +08:00
parent 55dc7c8005
commit 4eb92eb1aa
Signed by: guochao
GPG Key ID: 79F7306D2AA32FC3
2 changed files with 16 additions and 10 deletions

View File

@ -31,7 +31,7 @@ impl Default for Subcommand {
Subcommand::Serve {
listen_address: "127.0.0.1".into(),
listen_port: 3000,
redis_addr: String::from("redis://127.0.0.1")
redis_addr: String::from("redis://127.0.0.1"),
}
}
}
@ -52,9 +52,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
.to_socket_addrs()?
.collect();
let service = chat_signaling_server::web::routes::make_service(Some(chat_signaling_server::web::routes::Config{
redis_addr,
}))?;
let service = chat_signaling_server::web::routes::make_service(Some(
chat_signaling_server::web::routes::Config { redis_addr },
))?;
let mut futures =
futures::stream::FuturesUnordered::from_iter(addrs.iter().map(|addr| async {

View File

@ -69,7 +69,8 @@ pub async fn send_message_to_peers(
let room: String = message.room;
match inner_message {
signaling::signaling_message::Message::Bootstrap(()) => { // client may need a name, bootstrap all the information here.
signaling::signaling_message::Message::Bootstrap(()) => {
// client may need a name, bootstrap all the information here.
if message.sender != "" {
name = message.sender.to_string();
} else {
@ -85,7 +86,8 @@ pub async fn send_message_to_peers(
closing_rx.clone(),
));
}
signaling::signaling_message::Message::DiscoverRequest(()) => { // client broadcast discover to room
signaling::signaling_message::Message::DiscoverRequest(()) => {
// client broadcast discover to room
let peers: usize = match redis
.publish(format!("chatchat:{room}:discover"), name.clone())
.await
@ -98,7 +100,8 @@ pub async fn send_message_to_peers(
};
tracing::info!(peers, room, sender = name, "broadcasting discover");
}
signaling::signaling_message::Message::DiscoverResponse(()) => { // client received broadcast from others. responde to it: please connect to me. also it should prepare peer connection before send this message.
signaling::signaling_message::Message::DiscoverResponse(()) => {
// client received broadcast from others. responde to it: please connect to me. also it should prepare peer connection before send this message.
let receiver = message.receiver.unwrap();
let peers: usize = match redis
.publish(format!("chatchat:{room}:discover:{receiver}"), name.clone())
@ -112,7 +115,8 @@ pub async fn send_message_to_peers(
};
tracing::info!(peers, room, sender = name, receiver, "reply to discover");
}
signaling::signaling_message::Message::SessionOffer(sdp) => { // client received conenct to me message. creating offer.
signaling::signaling_message::Message::SessionOffer(sdp) => {
// client received conenct to me message. creating offer.
let msg = serde_json::to_string(&sdp).unwrap();
let receiver = message.receiver.unwrap();
let peers: usize = match redis
@ -128,7 +132,8 @@ pub async fn send_message_to_peers(
tracing::info!(peers, room, sender = name, receiver, "offering")
}
signaling::signaling_message::Message::SessionAnswer(sdp) => { // answer to offer
signaling::signaling_message::Message::SessionAnswer(sdp) => {
// answer to offer
let msg = serde_json::to_string(&sdp).unwrap();
let receiver = message.receiver.unwrap();
let peers: usize = match redis
@ -143,7 +148,8 @@ pub async fn send_message_to_peers(
};
tracing::info!(peers, room, sender = name, receiver, "answering")
}
signaling::signaling_message::Message::IceCandidate(candidate) => { // trickle ice
signaling::signaling_message::Message::IceCandidate(candidate) => {
// trickle ice
let msg = serde_json::to_string(&candidate).unwrap();
let receiver = message.receiver.unwrap();
let peers: usize = match redis