Skip to content

Overhaul stats: Simplify how the AnnounceHandler persist number of downloads in tracker-core package #1531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
josecelano merged 10 commits into from
May 26, 2025
Merged

Overhaul stats: Simplify how the AnnounceHandler persist number of downloads in tracker-core package #1531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3a23a38
fix: tracing message
josecelano May 21, 2025
7e933f9
feat: [#1524] listens to torrent-repository events in the tracker-cor…
josecelano May 21, 2025
8968757
refactor: extract method JobManger::push_opt
josecelano May 21, 2025
e90585a
refactor: [#1524] move total downloads udpate from announce command t…
josecelano May 21, 2025
f3d3495
refactor: [#1524] remove duplciate code for tracker core container
josecelano May 26, 2025
b05bccd
refactor: [#1524] integration tests in tracker-core
josecelano May 26, 2025
ab2f52d
fix: [#1524] test (move to integration test)
josecelano May 26, 2025
28603fe
refactor: [#1524] extract TestEnv for integration tests in tracker-core
josecelano May 26, 2025
8c31549
refactor: [#1524] rename methods
josecelano May 26, 2025
67d177b
refactor: [#1524] command/query separation
josecelano May 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/axum-http-tracker-server/src/environment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ pub struct Environment<S> {

impl<S> Environment<S> {
/// Add a torrent to the tracker
pub async fn add_torrent_peer(&self, info_hash: &InfoHash, peer: &peer::Peer) -> bool {
pub async fn add_torrent_peer(&self, info_hash: &InfoHash, peer: &peer::Peer) {
self.container
.tracker_core_container
.in_memory_torrent_repository
.upsert_peer(info_hash, peer, None)
.await
.handle_announcement(info_hash, peer, None)
.await;
}
}

Expand Down
6 changes: 3 additions & 3 deletions packages/axum-rest-tracker-api-server/src/environment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ where
S: std::fmt::Debug + std::fmt::Display,
{
/// Add a torrent to the tracker
pub async fn add_torrent_peer(&self, info_hash: &InfoHash, peer: &peer::Peer) -> bool {
pub async fn add_torrent_peer(&self, info_hash: &InfoHash, peer: &peer::Peer) {
self.container
.tracker_core_container
.in_memory_torrent_repository
.upsert_peer(info_hash, peer, None)
.await
.handle_announcement(info_hash, peer, None)
.await;
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/http-tracker-core/src/services/announce.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ impl AnnounceService {

let announce_data = self
.announce_handler
.announce(
.handle_announcement(
&announce_request.info_hash,
&mut peer,
&remote_client_addr.ip(),
Expand Down
6 changes: 3 additions & 3 deletions packages/http-tracker-core/src/services/scrape.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ impl ScrapeService {
let scrape_data = if self.authentication_is_required() && !self.is_authenticated(maybe_key).await {
ScrapeData::zeroed(&scrape_request.info_hashes)
} else {
self.scrape_handler.scrape(&scrape_request.info_hashes).await?
self.scrape_handler.handle_scrape(&scrape_request.info_hashes).await?
};

let remote_client_addr = resolve_remote_client_addr(&self.core_config.net.on_reverse_proxy.into(), client_ip_sources)?;
Expand Down Expand Up @@ -291,7 +291,7 @@ mod tests {
let original_peer_ip = peer.ip();
container
.announce_handler
.announce(&info_hash, &mut peer, &original_peer_ip, &PeersWanted::AsManyAsPossible)
.handle_announcement(&info_hash, &mut peer, &original_peer_ip, &PeersWanted::AsManyAsPossible)
.await
.unwrap();

Expand Down Expand Up @@ -482,7 +482,7 @@ mod tests {
let original_peer_ip = peer.ip();
container
.announce_handler
.announce(&info_hash, &mut peer, &original_peer_ip, &PeersWanted::AsManyAsPossible)
.handle_announcement(&info_hash, &mut peer, &original_peer_ip, &PeersWanted::AsManyAsPossible)
.await
.unwrap();

Expand Down
Loading