diff --git a/Cargo.lock b/Cargo.lock index 4752764ce5..c188ef5ce1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -840,11 +840,14 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" dependencies = [ + "brotli 3.5.0", "flate2", "futures-core", "memchr", "pin-project-lite", "tokio", + "zstd 0.13.1", + "zstd-safe 7.1.0", ] [[package]] @@ -5345,6 +5348,7 @@ dependencies = [ "hyper 1.6.0", "hyper-util", "rustls 0.23.13", + "rustls-native-certs", "rustls-pki-types", "tokio", "tokio-rustls", @@ -9653,6 +9657,7 @@ dependencies = [ "pin-project-lite", "quinn", "rustls 0.23.13", + "rustls-native-certs", "rustls-pemfile 2.1.2", "rustls-pki-types", "serde", @@ -9663,6 +9668,7 @@ dependencies = [ "tokio", "tokio-native-tls", "tokio-rustls", + "tokio-socks", "tokio-util", "tower 0.5.2", "tower-service", @@ -9990,6 +9996,19 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-native-certs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.2", + "rustls-pki-types", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -12176,9 +12195,9 @@ dependencies = [ [[package]] name = "tauri-plugin" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4190775d6ff73fe66d9af44c012739a2659720efd9c0e1e56a918678038699d" +checksum = "37a5ebe6a610d1b78a94650896e6f7c9796323f408800cef436e0fa0539de601" dependencies = [ "anyhow", "glob", @@ -12217,8 +12236,6 @@ dependencies = [ [[package]] name = "tauri-plugin-http" version = "2.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40dcd6c922a1885e1f0bcebc6768fec6e005bd4b9001c5d90a2f5d4cab297729" dependencies = [ "bytes 1.10.0", "cookie_store", @@ -12234,6 +12251,7 @@ dependencies = [ "tauri-plugin-fs", "thiserror 2.0.12", "tokio", + "tracing", "url", "urlpattern", ] @@ -12350,9 +12368,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f037e66c7638cc0a2213f61566932b9a06882b8346486579c90e4b019bac447" +checksum = "b2900399c239a471bcff7f15c4399eb1a8c4fe511ba2853e07c996d771a5e0a4" dependencies = [ "anyhow", "brotli 7.0.0", @@ -12835,6 +12853,18 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-socks" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" +dependencies = [ + "either", + "futures-util", + "thiserror 1.0.63", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.16" diff --git a/Cargo.toml b/Cargo.toml index 9aa8a00a82..0a3169544a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -118,6 +118,7 @@ members = [ "crates/vendor/candle/candle-transformers", "crates/vendor/candle/tensor-tools", "crates/vendor/limitation", + "crates/vendor/tauri-plugin-http", # NB(bt,2023-12-12): Newrelic keeps breaking with upgrades. Kill for now. #"crates/vendor/newrelic-telemetry-sdk-rust", @@ -173,6 +174,7 @@ serde_derive = "1.0.219" serde_json = "1.0.140" serde_yaml = "0.9.1" sha3 = "0.10.8" +tauri = { version = "2.4.1", features = ["unstable"] } thiserror = "2.0.12" toml = "0.8.20" url = { version = "2.5.4", features = ["serde"] } diff --git a/crates/desktop/tauri-artcraft/Cargo.toml b/crates/desktop/tauri-artcraft/Cargo.toml index bf7f46dd58..b098d553ea 100644 --- a/crates/desktop/tauri-artcraft/Cargo.toml +++ b/crates/desktop/tauri-artcraft/Cargo.toml @@ -53,14 +53,16 @@ serde = { workspace = true } serde_derive = { workspace = true } serde_json = { workspace = true } serde_yaml = { workspace = true } -tauri = { version = "2.4.1", features = ["unstable"] } -tauri-plugin-http = "2.0.0" +tauri = { workspace = true } tauri-plugin-log = "2.3.1" tempdir = "0.3.7" tempfile = "3.18.0" tokio = { version = "1.42", features = ["rt", "rt-multi-thread", "fs"] } tokio-util = { version = "0.7", features = ["codec"] } +# NB: We need to vendor this in so that we can access the cookies inside via the private API +tauri-plugin-http = { path = "../../vendor/tauri-plugin-http" } + # NB: The version of the `discord-rich-presence` crate (0.2.5) last published has non-Send/Sync error # types and can't do threading. We need to wait for a new version to unpin from Git. discord-rich-presence = { git = "https://github.com/vionya/discord-rich-presence" } diff --git a/crates/vendor/tauri-plugin-http/Cargo.toml b/crates/vendor/tauri-plugin-http/Cargo.toml index 353f72a399..ad8ac8e2c1 100644 --- a/crates/vendor/tauri-plugin-http/Cargo.toml +++ b/crates/vendor/tauri-plugin-http/Cargo.toml @@ -1,12 +1,17 @@ +# NB(bt): We've made some changes to the packages and directives. +# The original values are commented out. + [package] name = "tauri-plugin-http" version = "2.4.3" description = "Access an HTTP client written in Rust." -edition = { workspace = true } -authors = { workspace = true } -license = { workspace = true } -rust-version = { workspace = true } -repository = { workspace = true } +#edition = { workspace = true } +edition = "2021" +#authors = { workspace = true } +#license = { workspace = true } +#rust-version = { workspace = true } +rust-version = "1.77.2" +#repository = { workspace = true } links = "tauri-plugin-http" [package.metadata.docs.rs] @@ -21,8 +26,10 @@ android = { level = "full", notes = "" } ios = { level = "full", notes = "" } [build-dependencies] -tauri-plugin = { workspace = true, features = ["build"] } -schemars = { workspace = true } +#tauri-plugin = { workspace = true, features = ["build"] } +tauri-plugin = { version = "2.2.0", features = ["build"] } +#schemars = { workspace = true } +schemars = { version = "0.8" } serde = { workspace = true } url = { workspace = true } urlpattern = "0.3" @@ -34,7 +41,8 @@ serde_json = { workspace = true } tauri = { workspace = true } thiserror = { workspace = true } tokio = { version = "1", features = ["sync", "macros"] } -tauri-plugin-fs = { path = "../fs", version = "2.2.1" } +#tauri-plugin-fs = { path = "../fs", version = "2.2.1" } +tauri-plugin-fs = { version = "2.2.1" } urlpattern = "0.3" regex = "1" http = "1" @@ -43,7 +51,8 @@ url = { workspace = true } data-url = "0.3" cookie_store = { version = "0.21.1", optional = true, features = ["serde"] } bytes = { version = "1.9", optional = true } -tracing = { workspace = true, optional = true } +#tracing = { workspace = true, optional = true } +tracing = { version = "0.1", optional = true } [features] default = [