YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-03-31 17:55:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

aquatic_ws: in handlers, collect out messages in Vec for sending

Browse source
This commit is contained in:
Joakim Frostegård 2021-11-01 19:20:49 +01:00
parent 24bfaf67c0
commit 786642f486
1 changed files with 42 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

64
aquatic_ws/src/lib/handlers.rs
View file

@ -82,41 +82,45 @@ async fn handle_request_stream<S>(
})()
}));
let mut out_messages = Vec::new();
while let Some((meta, in_message)) = stream.next().await {
match in_message {
InMessage::AnnounceRequest(request) => {
handle_announce_request(
InMessage::AnnounceRequest(request) => handle_announce_request(
&config,
&mut rng,
&mut torrents.borrow_mut(),
&out_message_senders,
&mut out_messages,
peer_valid_until.borrow().to_owned(),
meta,
request,
)
.await;
}
InMessage::ScrapeRequest(request) => {
handle_scrape_request(
),
InMessage::ScrapeRequest(request) => handle_scrape_request(
&config,
&mut torrents.borrow_mut(),
&out_message_senders,
&mut out_messages,
meta,
request,
)
.await;
}
),
};
for (meta, out_message) in out_messages.drain(..) {
if let Err(err) =
out_message_senders.try_send_to(meta.out_message_consumer_id.0, (meta, out_message))
{
::log::error!("failed sending out_message to socket worker: {:?}", err)
}
}
yield_if_needed().await;
}
}
pub async fn handle_announce_request(
pub fn handle_announce_request(
config: &Config,
rng: &mut impl Rng,
torrent_maps: &mut TorrentMaps,
out_message_senders: &Rc<Senders<(ConnectionMeta, OutMessage)>>,
out_messages: &mut Vec<(ConnectionMeta, OutMessage)>,
valid_until: ValidUntil,
request_sender_meta: ConnectionMeta,
request: AnnounceRequest,
@ -206,15 +210,12 @@ pub async fn handle_announce_request(
offer_id: offer.offer_id,
};
out_message_senders.try_send_to(
offer_receiver.connection_meta.out_message_consumer_id.0,
(
out_messages.push((
offer_receiver.connection_meta,
OutMessage::Offer(middleman_offer),
),
);
));
::log::trace!(
"sent middleman offer to {:?}",
"sending middleman offer to {:?}",
offer_receiver.connection_meta
);
}
@ -233,15 +234,12 @@ pub async fn handle_announce_request(
offer_id,
};
out_message_senders.try_send_to(
answer_receiver.connection_meta.out_message_consumer_id.0,
(
out_messages.push((
answer_receiver.connection_meta,
OutMessage::Answer(middleman_answer),
),
);
));
::log::trace!(
"sent middleman answer to {:?}",
"sending middleman answer to {:?}",
answer_receiver.connection_meta
);
}
@ -255,16 +253,13 @@ pub async fn handle_announce_request(
announce_interval: config.protocol.peer_announce_interval,
});
out_message_senders.send_to(
request_sender_meta.out_message_consumer_id.0,
(request_sender_meta, out_message),
);
out_messages.push((request_sender_meta, out_message));
}
pub async fn handle_scrape_request(
pub fn handle_scrape_request(
config: &Config,
torrent_maps: &mut TorrentMaps,
out_message_senders: &Rc<Senders<(ConnectionMeta, OutMessage)>>,
out_messages: &mut Vec<(ConnectionMeta, OutMessage)>,
meta: ConnectionMeta,
request: ScrapeRequest,
) {
@ -301,8 +296,5 @@ pub async fn handle_scrape_request(
}
}
out_message_senders.try_send_to(
meta.out_message_consumer_id.0,
(meta, OutMessage::ScrapeResponse(out_message)),
);
out_messages.push((meta, OutMessage::ScrapeResponse(out_message)));
}