leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merging DHT and tracker streams

Browse source
This commit is contained in:
Igor Katson 2024-04-29 13:57:29 +01:00
parent 9f806d7adb
commit 7c83240a1a
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
4 changed files with 80 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/tracker_comms/src/tracker_comms.rs
View file

@ -77,6 +77,15 @@ enum SupportedTracker {
Http(Url),
}
impl std::fmt::Debug for SupportedTracker {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
SupportedTracker::Udp(u) => std::fmt::Display::fmt(u, f),
SupportedTracker::Http(u) => std::fmt::Display::fmt(u, f),
}
}
}
impl TrackerComms {
pub fn start(
info_hash: Id20,
@ -104,9 +113,12 @@ impl TrackerComms {
})
.collect::<Vec<_>>();
if trackers.is_empty() {
debug!(?info_hash, "trackers list is empty");
return None;
}
tracing::trace!(?trackers);
let (tx, mut rx) = tokio::sync::mpsc::channel::<SocketAddr>(16);
let s = async_stream::stream! {
@ -173,6 +185,7 @@ impl TrackerComms {
async fn task_single_tracker_monitor_http(&self, mut tracker_url: Url) -> anyhow::Result<()> {
let mut event = Some(tracker_comms_http::TrackerRequestEvent::Started);
trace!(url=?tracker_url, "starting monitor");
loop {
let stats = self.stats.get();
let request = tracker_comms_http::TrackerRequest {
@ -216,6 +229,7 @@ impl TrackerComms {
}
async fn tracker_one_request_http(&self, tracker_url: Url) -> anyhow::Result<u64> {
debug!(url = ?tracker_url, "calling tracker over http");
let response: reqwest::Response = reqwest::get(tracker_url).await?;
if !response.status().is_success() {
anyhow::bail!("tracker responded with {:?}", response.status());