From dbd89cdd10aa2c1552af782126b5a0c7191cd8be Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sat, 21 Feb 2026 04:08:25 +0700 Subject: [PATCH] consolidate reqwest usage --- Cargo.lock | 95 ++++++++++++------- Cargo.toml | 2 +- .../artcraft/storyteller_client/Cargo.toml | 2 +- .../thumbnail_generator/Cargo.toml | 2 +- crates/desktop/artcraft/Cargo.toml | 2 +- .../service/job/seedance2_pro_job/Cargo.toml | 2 +- crates/vendor/tauri-plugin-http/Cargo.toml | 2 +- 7 files changed, 67 insertions(+), 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 344a2340d8..05cbfa24c7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -722,7 +722,7 @@ dependencies = [ "os_info", "primitives", "rand 0.9.2", - "reqwest 0.12.23", + "reqwest 0.12.28", "serde", "serde_derive", "serde_json", @@ -2532,6 +2532,24 @@ dependencies = [ "url", ] +[[package]] +name = "cookie_store" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b2c103cf610ec6cae3da84a766285b42fd16aad564758459e6ecf128c75206" +dependencies = [ + "cookie 0.18.1", + "document-features", + "idna 1.0.3", + "log", + "publicsuffix", + "serde", + "serde_derive", + "serde_json", + "time", + "url", +] + [[package]] name = "cookies" version = "0.0.1" @@ -3111,6 +3129,16 @@ dependencies = [ "serde", ] +[[package]] +name = "deranged" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc3dc5ad92c2e2d1c193bbbbdf2ea477cb81331de4f3103f267ca18368b988c4" +dependencies = [ + "powerfmt", + "serde_core", +] + [[package]] name = "derivative" version = "2.2.0" @@ -4104,7 +4132,7 @@ dependencies = [ "image", "log", "percent-encoding-rfc3986", - "reqwest 0.12.23", + "reqwest 0.12.28", "serde", "serde_json", "smart-default 0.7.1", @@ -4131,7 +4159,7 @@ dependencies = [ "file_to_base64_url", "futures 0.3.31", "log", - "reqwest 0.12.23", + "reqwest 0.12.28", "serde", "test_data", "testing", @@ -4621,7 +4649,7 @@ version = "0.1.0" dependencies = [ "cargo-manifest", "percent-encoding", - "reqwest 0.12.23", + "reqwest 0.12.28", "serde", "serde_json", "tokio", @@ -4849,7 +4877,7 @@ dependencies = [ "coarsetime", "errors", "jwt-simple", - "reqwest 0.12.23", + "reqwest 0.12.28", "serde", "serde_derive", "serde_json", @@ -5911,7 +5939,7 @@ dependencies = [ "rand 0.8.5", "redis_common", "redis_schema", - "reqwest 0.12.23", + "reqwest 0.12.28", "serde", "serde_derive", "serde_json", @@ -7471,9 +7499,9 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050" [[package]] name = "num-derive" @@ -7978,7 +8006,7 @@ dependencies = [ "log", "once_cell", "rand 0.9.2", - "reqwest 0.12.23", + "reqwest 0.12.28", "serde", "serde_derive", "serde_json", @@ -9584,15 +9612,14 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.23" +version = "0.12.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb" +checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ - "async-compression", "base64 0.22.1", "bytes", "cookie 0.18.1", - "cookie_store 0.21.1", + "cookie_store 0.22.1", "encoding_rs", "futures-channel", "futures-core", @@ -9836,7 +9863,7 @@ dependencies = [ "log", "once_cell", "rand 0.9.2", - "reqwest 0.12.23", + "reqwest 0.12.28", "serde", "serde_derive", "serde_json", @@ -9916,7 +9943,7 @@ dependencies = [ "minidom", "percent-encoding", "quick-xml 0.36.2", - "reqwest 0.12.23", + "reqwest 0.12.28", "serde", "serde_derive", "serde_json", @@ -10353,7 +10380,7 @@ dependencies = [ "jobs_common", "log", "mysql_queries", - "reqwest 0.12.23", + "reqwest 0.12.28", "seedance2pro", "serde", "serde_derive", @@ -11479,7 +11506,7 @@ dependencies = [ "redis_common", "redis_schema", "regex", - "reqwest 0.12.23", + "reqwest 0.12.28", "resend-rs", "reusable_types", "rust-s3", @@ -11529,7 +11556,7 @@ dependencies = [ "idempotency", "log", "mimetypes", - "reqwest 0.12.23", + "reqwest 0.12.28", "serde", "serde_derive", "serde_json", @@ -12043,7 +12070,7 @@ dependencies = [ "percent-encoding", "plist", "raw-window-handle", - "reqwest 0.12.23", + "reqwest 0.12.28", "serde", "serde_json", "serde_repr", @@ -12194,7 +12221,7 @@ dependencies = [ "data-url", "http 1.3.1", "regex", - "reqwest 0.12.23", + "reqwest 0.12.28", "schemars", "serde", "serde_json", @@ -12261,7 +12288,7 @@ dependencies = [ "futures-util", "log", "read-progress-stream", - "reqwest 0.12.23", + "reqwest 0.12.28", "serde", "serde_json", "tauri", @@ -12509,7 +12536,7 @@ version = "0.1.0" dependencies = [ "easyenv", "log", - "reqwest 0.12.23", + "reqwest 0.12.28", "serde_json", "workspace-build-acceleration", ] @@ -12538,32 +12565,32 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" dependencies = [ - "deranged", + "deranged 0.5.6", "itoa 1.0.11", "libc", "num-conv", "num_threads", "powerfmt", - "serde", + "serde_core", "time-core", "time-macros", ] [[package]] name = "time-core" -version = "0.1.2" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" dependencies = [ "num-conv", "time-core", @@ -13111,7 +13138,7 @@ dependencies = [ "memory_caching", "mysql_queries", "r2d2_redis", - "reqwest 0.12.23", + "reqwest 0.12.28", "serde", "serde_derive", "serde_json", @@ -13471,7 +13498,7 @@ dependencies = [ "actix-web", "mime_guess", "regex", - "reqwest 0.12.23", + "reqwest 0.12.28", "rust-embed", "serde", "serde_json", @@ -13962,7 +13989,7 @@ dependencies = [ "errors", "log", "once_cell", - "reqwest 0.12.23", + "reqwest 0.12.28", "rss", "scraper 0.17.1", "serde", @@ -14818,7 +14845,7 @@ dependencies = [ "core-foundation-sys", "crossbeam-utils", "crypto-common 0.1.6", - "deranged", + "deranged 0.3.11", "derive_more 0.99.17", "digest 0.10.7", "either", diff --git a/Cargo.toml b/Cargo.toml index 1b984a7493..b5446e2ca3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -279,7 +279,7 @@ r2d2 = "0.8.10" rand = "0.9.1" redis = { version = "1.0.2", features = ["r2d2", "tokio-rustls-comp", "tokio-comp", "cluster-async", "aio"] } regex = "1.12.2" -reqwest = { version = "0.12.23", default-features = false, features = [ "charset", "http2", "system-proxy", "json", "cookies", "rustls-tls" ] } +reqwest = { version = "0.12.28", default-features = false, features = [ "charset", "http2", "system-proxy", "json", "cookies", "rustls-tls", "gzip", "multipart" ] } reqwest-websocket = { version = "0.5.0" } serde = { version = "1.0.219", features = ["derive"] } serde_derive = "1.0.219" diff --git a/crates/api_clients/artcraft/storyteller_client/Cargo.toml b/crates/api_clients/artcraft/storyteller_client/Cargo.toml index fdcfc9af0a..dceb15b43f 100644 --- a/crates/api_clients/artcraft/storyteller_client/Cargo.toml +++ b/crates/api_clients/artcraft/storyteller_client/Cargo.toml @@ -37,7 +37,7 @@ anyhow.workspace = true chrono.workspace = true cookie.workspace = true log.workspace = true -reqwest = { workspace = true, features = ["multipart", "gzip"] } +reqwest.workspace = true url.workspace = true # Serialization diff --git a/crates/api_clients/thumbnail_generator/Cargo.toml b/crates/api_clients/thumbnail_generator/Cargo.toml index 4ffaa50502..5405fc9e4d 100644 --- a/crates/api_clients/thumbnail_generator/Cargo.toml +++ b/crates/api_clients/thumbnail_generator/Cargo.toml @@ -15,5 +15,5 @@ workspace-build-acceleration.workspace = true # External easyenv = { path = "../../lib/easyenv" } log.workspace = true -reqwest = { version = "0.12.4", default-features = false, features = [ "charset", "http2", "system-proxy", "rustls-tls" ] } +reqwest.workspace = true serde_json.workspace = true diff --git a/crates/desktop/artcraft/Cargo.toml b/crates/desktop/artcraft/Cargo.toml index e1a7b2c4bb..66763d674a 100644 --- a/crates/desktop/artcraft/Cargo.toml +++ b/crates/desktop/artcraft/Cargo.toml @@ -62,7 +62,7 @@ log.workspace = true once_cell.workspace = true os_info = { version = "3.12.0", default-features = false } rand.workspace = true -reqwest = { workspace = true, features = ["multipart", "stream"], default-features = false } # NB(bt,2025-03-10): default-features = false on Windows while I debug openssl / rustls +reqwest.workspace = true serde.workspace = true serde_derive.workspace = true serde_json.workspace = true diff --git a/crates/service/job/seedance2_pro_job/Cargo.toml b/crates/service/job/seedance2_pro_job/Cargo.toml index ada7bd8a08..1525b912b8 100644 --- a/crates/service/job/seedance2_pro_job/Cargo.toml +++ b/crates/service/job/seedance2_pro_job/Cargo.toml @@ -46,7 +46,7 @@ sqlx = { version = "0.7.4", features = [ "mysql", "runtime-tokio-rustls", "chron tokio = { version = "1.40.0", features = ["macros", "sync"] } # HTTP Client -reqwest = { version = "0.12.4", default-features = false, features = ["charset", "http2", "system-proxy", "rustls-tls"] } +reqwest.workspace = true # HTTP Server actix-web.workspace = true diff --git a/crates/vendor/tauri-plugin-http/Cargo.toml b/crates/vendor/tauri-plugin-http/Cargo.toml index 3eeafff3b4..0d66081b10 100644 --- a/crates/vendor/tauri-plugin-http/Cargo.toml +++ b/crates/vendor/tauri-plugin-http/Cargo.toml @@ -46,7 +46,7 @@ tauri-plugin-fs = { workspace = true } urlpattern = "0.3" regex = "1" http = "1" -reqwest = { version = "0.12", default-features = false } +reqwest.workspace = true url = { workspace = true } data-url = "0.3" cookie_store = { version = "0.21.1", optional = true, features = ["serde"] }