TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump cargo.lock and deps, add zstd compression to reqwest client

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-08-20 17:45:27 -04:00 • committed by Jason Volk
parent e0fd84149d
commit edd42974e5
7 changed files with 62 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
Cargo.lock generated
View file

@ -1834,7 +1834,7 @@ dependencies = [
"socket2",
"widestring",
"windows-sys 0.48.0",
"winreg 0.50.0",
"winreg",
]
[[package]]
@ -2883,9 +2883,9 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
[[package]]
name = "reqwest"
version = "0.12.5"
version = "0.12.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
dependencies = [
"async-compression",
"base64 0.22.1",
@ -2927,7 +2927,7 @@ dependencies = [
"wasm-bindgen-futures",
"web-sys",
"webpki-roots",
"winreg 0.52.0",
"windows-registry",
]
[[package]]
@ -3872,6 +3872,9 @@ name = "sync_wrapper"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
dependencies = [
"futures-core",
]
[[package]]
name = "tendril"
@ -4724,6 +4727,36 @@ dependencies = [
"windows-targets 0.52.6",
]
[[package]]
name = "windows-registry"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
dependencies = [
"windows-result",
"windows-strings",
"windows-targets 0.52.6",
]
[[package]]
name = "windows-result"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
dependencies = [
"windows-targets 0.52.6",
]
[[package]]
name = "windows-strings"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
dependencies = [
"windows-result",
"windows-targets 0.52.6",
]
[[package]]
name = "windows-sys"
version = "0.48.0"
@ -4891,16 +4924,6 @@ dependencies = [
"windows-sys 0.48.0",
]
[[package]]
name = "winreg"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
dependencies = [
"cfg-if",
"windows-sys 0.48.0",
]
[[package]]
name = "xml5ever"
version = "0.18.1"

2
Cargo.toml
View file

@ -129,7 +129,7 @@ features = [
]
[workspace.dependencies.reqwest]
version = "0.12.4"
version = "0.12.7"
default-features = false
features = [
"rustls-tls-native-roots",

3
src/api/Cargo.toml
View file

@ -25,6 +25,9 @@ release_max_log_level = [
"log/max_level_trace",
"log/release_max_level_info",
]
zstd_compression = [
"reqwest/zstd",
]
gzip_compression = [
"reqwest/gzip",
]

4
src/core/Cargo.toml
View file

@ -46,7 +46,9 @@ gzip_compression = [
brotli_compression = [
"reqwest/brotli",
]
zstd_compression =[]
zstd_compression = [
"reqwest/zstd",
]
perf_measurements = []
sentry_telemetry = []

1
src/main/Cargo.toml
View file

@ -129,6 +129,7 @@ tokio_console = [
"tokio/tracing",
]
zstd_compression = [
"conduit-api/zstd_compression",
"conduit-core/zstd_compression",
"conduit-database/zstd_compression",
"conduit-router/zstd_compression",

3
src/service/Cargo.toml
View file

@ -29,6 +29,9 @@ element_hacks = []
gzip_compression = [
"reqwest/gzip",
]
zstd_compression = [
"reqwest/zstd",
]
release_max_log_level = [
"tracing/max_level_trace",
"tracing/release_max_level_info",

14
src/service/client/mod.rs
View file

@ -123,6 +123,15 @@ fn base(config: &Config) -> Result<reqwest::ClientBuilder> {
};
};
#[cfg(feature = "zstd_compression")]
{
builder = if config.zstd_compression {
builder.zstd(true)
} else {
builder.zstd(false).no_brotli()
};
};
#[cfg(not(feature = "gzip_compression"))]
{
builder = builder.no_gzip();
@ -133,6 +142,11 @@ fn base(config: &Config) -> Result<reqwest::ClientBuilder> {
builder = builder.no_brotli();
};
#[cfg(not(feature = "zstd_compression"))]
{
builder = builder.no_zstd();
};
if let Some(proxy) = config.proxy.to_proxy()? {
Ok(builder.proxy(proxy))
} else {