diff --git a/Cargo.lock b/Cargo.lock index 07c4c30c10..a701788931 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -249,7 +249,7 @@ dependencies = [ "futures-timer", "futures-util", "handlebars", - "http 1.1.0", + "http 1.2.0", "indexmap 2.7.1", "lru", "mime", @@ -514,7 +514,7 @@ checksum = "52ddb91585253ccc85be3f2e0d5635529efdeadaf8a1da3230b433d3bbe43648" dependencies = [ "base64 0.22.1", "bytes", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", "http-serde 2.1.1", "query_map", @@ -545,7 +545,7 @@ dependencies = [ "rustversion", "serde", "sync_wrapper 0.1.2", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", ] @@ -997,7 +997,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" dependencies = [ "lazy_static", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -1837,7 +1837,7 @@ dependencies = [ "derive_more", "eventsource-stream", "futures", - "reqwest 0.12.9", + "reqwest 0.12.12", "reqwest-eventsource", "serde", "serde_json", @@ -2244,9 +2244,9 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes", "fnv", @@ -2271,7 +2271,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.1.0", + "http 1.2.0", ] [[package]] @@ -2282,7 +2282,7 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", "pin-project-lite", ] @@ -2297,7 +2297,22 @@ dependencies = [ "bincode", "cacache 12.0.0", "http 0.2.12", - "http-cache-semantics", + "http-cache-semantics 1.0.2", + "httpdate", + "serde", + "url", +] + +[[package]] +name = "http-cache" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e883defacf53960c7717d9e928dc8667be9501d9f54e6a8b7703d7a30320e9c" +dependencies = [ + "async-trait", + "bincode", + "http 1.2.0", + "http-cache-semantics 2.1.0", "httpdate", "moka", "serde", @@ -2306,19 +2321,18 @@ dependencies = [ [[package]] name = "http-cache-reqwest" -version = "0.13.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8285341ce7e709c56a0f259ff1c789c70edfbaa88acd69d27e4d63980b92dc" +checksum = "e076afd9d376f09073b515ce95071b29393687d98ed521948edb899195595ddf" dependencies = [ "anyhow", "async-trait", - "http 0.2.12", - "http-cache", - "http-cache-semantics", - "reqwest 0.11.27", - "reqwest-middleware", + "http 1.2.0", + "http-cache 0.20.1", + "http-cache-semantics 2.1.0", + "reqwest 0.12.12", + "reqwest-middleware 0.4.0", "serde", - "task-local-extensions", "url", ] @@ -2335,6 +2349,18 @@ dependencies = [ "time", ] +[[package]] +name = "http-cache-semantics" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92baf25cf0b8c9246baecf3a444546360a97b569168fdf92563ee6a47829920c" +dependencies = [ + "http 1.2.0", + "http-serde 2.1.1", + "serde", + "time", +] + [[package]] name = "http-serde" version = "1.1.3" @@ -2351,7 +2377,7 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f056c8559e3757392c8d091e796416e4649d8e49e88b8d76df6c002f05027fd" dependencies = [ - "http 1.1.0", + "http 1.2.0", "serde", ] @@ -2428,7 +2454,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", "httparse", "itoa", @@ -2476,7 +2502,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", - "http 1.1.0", + "http 1.2.0", "hyper 1.5.1", "hyper-util", "rustls 0.23.22", @@ -2508,7 +2534,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", "hyper 1.5.1", "pin-project-lite", @@ -2877,7 +2903,7 @@ dependencies = [ "encoding_rs", "futures", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", "http-body-util", "hyper 1.5.1", @@ -2902,7 +2928,7 @@ dependencies = [ "base64 0.22.1", "bytes", "futures", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", "http-body-util", "http-serde 2.1.1", @@ -2915,7 +2941,7 @@ dependencies = [ "serde_path_to_error", "tokio", "tokio-stream", - "tower", + "tower 0.4.13", "tower-layer", "tracing", ] @@ -2929,13 +2955,13 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", "http-body-util", "hyper 1.5.1", "hyper-util", "tokio", - "tower", + "tower 0.4.13", "tower-service", "tracing", "tracing-subscriber", @@ -3006,7 +3032,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -3379,7 +3405,7 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http 1.1.0", + "http 1.2.0", "httparse", "memchr", "mime", @@ -4695,15 +4721,15 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.9" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" +checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" dependencies = [ "base64 0.22.1", "bytes", "futures-core", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", "http-body-util", "hyper 1.5.1", @@ -4727,6 +4753,7 @@ dependencies = [ "tokio", "tokio-rustls 0.26.0", "tokio-util", + "tower 0.5.2", "tower-service", "url", "wasm-bindgen", @@ -4749,7 +4776,7 @@ dependencies = [ "mime", "nom", "pin-project-lite", - "reqwest 0.12.9", + "reqwest 0.12.12", "thiserror 1.0.69", ] @@ -4768,6 +4795,21 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "reqwest-middleware" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1ccd3b55e711f91a9885a2fa6fbbb2e39db1776420b062efc058c6410f7e5e3" +dependencies = [ + "anyhow", + "async-trait", + "http 1.2.0", + "reqwest 0.12.12", + "serde", + "thiserror 1.0.69", + "tower-service", +] + [[package]] name = "resource" version = "0.5.0" @@ -5641,7 +5683,7 @@ dependencies = [ "htpasswd-verify", "http 0.2.12", "http-cache-reqwest", - "http-cache-semantics", + "http-cache-semantics 1.0.2", "httpmock", "hyper 0.14.32", "hyper-rustls 0.25.0", @@ -5683,7 +5725,7 @@ dependencies = [ "rand", "regex", "reqwest 0.11.27", - "reqwest-middleware", + "reqwest-middleware 0.2.5", "resource", "rquickjs", "rustls 0.23.22", @@ -5798,9 +5840,9 @@ version = "0.1.0" dependencies = [ "async-trait", "http 0.2.12", - "http-cache", + "http-cache 0.18.0", "http-cache-reqwest", - "http-cache-semantics", + "http-cache-semantics 1.0.2", "moka", "reqwest 0.11.27", "serde", @@ -5903,7 +5945,7 @@ dependencies = [ "tonic-build 0.11.0", "tonic-reflection", "tonic-tracing-opentelemetry", - "tower", + "tower 0.4.13", "tracing", "tracing-opentelemetry", "tracing-subscriber", @@ -5916,7 +5958,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d32dc2612dd67fdbe214cd396b388a386974d57daf732f00c2562b3b2421778d" dependencies = [ "derive_setters", - "http 1.1.0", + "http 1.2.0", "regex", "serde", "serde_json", @@ -6296,7 +6338,7 @@ dependencies = [ "tokio", "tokio-rustls 0.25.0", "tokio-stream", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -6310,7 +6352,7 @@ checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ "base64 0.22.1", "bytes", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", "http-body-util", "percent-encoding", @@ -6374,7 +6416,7 @@ dependencies = [ "opentelemetry 0.23.0", "pin-project-lite", "tonic 0.11.0", - "tower", + "tower 0.4.13", "tracing", "tracing-opentelemetry", ] @@ -6410,6 +6452,21 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 1.0.2", + "tokio", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.3" @@ -6917,7 +6974,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -7313,7 +7370,7 @@ dependencies = [ "chrono", "futures-channel", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", "js-sys", "matchit", diff --git a/Cargo.toml b/Cargo.toml index 44c4abf11c..48931450ec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ tailcall-valid = "0.1.1" # one needs to add default feature tag if it is something IO related or might conflict with WASM mimalloc = { version = "0.1.41", default-features = false, optional = true } -http-cache-reqwest = { version = "0.13.0", features = [ +http-cache-reqwest = { version = "0.15.0", features = [ "manager-moka", ], default-features = false, optional = true } moka = { version = "0.12.7", default-features = false, features = [ diff --git a/tailcall-http-cache/Cargo.toml b/tailcall-http-cache/Cargo.toml index 7427caa3bc..658de56ac3 100644 --- a/tailcall-http-cache/Cargo.toml +++ b/tailcall-http-cache/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies] -http-cache-reqwest = { version = "0.13.0", default-features = false, features = ["manager-moka"] } +http-cache-reqwest = { version = "0.15.0", default-features = false, features = ["manager-moka"] } moka = { version = "0.12.7", default-features = false, features = [ "future", ]}