Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[breaking] rqbit download: make it a lot simpler (fixes #402) #403

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
merged 6 commits into from
Jun 15, 2025
Merged

[breaking] rqbit download: make it a lot simpler (fixes #402) #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
92d3753
[breaking] rqbit download: make it a lot simpler and ephemeral (fixes…
ikatson Jun 12, 2025
30eb842
Comments
ikatson Jun 15, 2025
a31ae55
saving
ikatson Jun 15, 2025
f7c0430
Use dualstack socket for HTTP API. Remove default value for rqbit dow…
ikatson Jun 15, 2025
12de380
Listen port: remove CLI default, and make it separate for server and …
ikatson Jun 15, 2025
45eabdb
revert HTTP API listen default to 127.0.0.1
ikatson Jun 15, 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
24 changes: 20 additions & 4 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.

2 changes: 1 addition & 1 deletion crates/dht/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ librqbit-core = { path = "../librqbit_core", default-features = false, version =
chrono = { version = "0.4.31", features = ["serde"] }
tokio-util = "0.7.10"
bytes = "1.7.1"
librqbit-dualstack-sockets = "0.1.1"
librqbit-dualstack-sockets = "0.3.1"

[dev-dependencies]
tracing-subscriber = "0.3"
2 changes: 1 addition & 1 deletion crates/librqbit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ intervaltree = "0.2.7"
async-compression = { version = "0.4.18", features = ["tokio", "gzip"] }
librqbit-utp = { version = "0.4.0", features = ["export-metrics"] }
axum-extra = { version = "0.10.1", features = ["query"] }
librqbit-dualstack-sockets = { version = "0.1.1" }
librqbit-dualstack-sockets = { version = "0.3.1", features = ["axum"] }

[target.'cfg(windows)'.dependencies]
windows = { version = "0.61.1", features = [
Expand Down
13 changes: 6 additions & 7 deletions crates/librqbit/src/http_api/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ use base64::Engine;
use futures::FutureExt;
use futures::future::BoxFuture;
use http::{HeaderMap, StatusCode};
use std::net::SocketAddr;
use librqbit_dualstack_sockets::TcpListener;
use std::sync::Arc;
use tokio::net::TcpListener;
use tower_http::trace::{DefaultOnFailure, DefaultOnResponse, OnFailure};
use tracing::{Span, debug, error_span, info};

Expand Down Expand Up @@ -166,11 +165,11 @@ impl HttpApi {
.make_span_with(|req: &Request| {
let method = req.method();
let uri = req.uri();
if let Some(ConnectInfo(addr)) =
req.extensions().get::<ConnectInfo<SocketAddr>>()
if let Some(ConnectInfo(addr)) = req
.extensions()
.get::<ConnectInfo<librqbit_dualstack_sockets::WrappedSocketAddr>>()
{
let addr = SocketAddr::new(addr.ip().to_canonical(), addr.port());
error_span!("request", %method, %uri, %addr)
error_span!("request", %method, %uri, addr=%addr.0)
} else {
error_span!("request", %method, %uri)
}
Expand All @@ -191,7 +190,7 @@ impl HttpApi {
}
}),
)
.into_make_service_with_connect_info::<SocketAddr>();
.into_make_service_with_connect_info::<librqbit_dualstack_sockets::WrappedSocketAddr>();

async move {
axum::serve(listener, app)
Expand Down
1 change: 1 addition & 0 deletions crates/rqbit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ signal-hook = "0.3.17"
tokio-util = "0.7.11"
gethostname = "1"
url = "2"
librqbit-dualstack-sockets = "0.3.1"

[dev-dependencies]
futures = { version = "0.3" }
Loading