From c5ba580045a8eed05714a0db94b55e566ca78e35 Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Mon, 21 Apr 2025 18:12:32 +0200 Subject: [PATCH] update & upgrade deps --- Cargo.lock | 118 +++++++++++++++++++++++-------------- Cargo.toml | 9 +-- src/admin/station/typst.rs | 13 ++-- 3 files changed, 84 insertions(+), 56 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6cf3383..56949ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -691,9 +691,9 @@ checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" [[package]] name = "der" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" dependencies = [ "const-oid", "pem-rfc7468", @@ -978,7 +978,7 @@ dependencies = [ "memmap2", "slotmap", "tinyvec", - "ttf-parser 0.24.1", + "ttf-parser", ] [[package]] @@ -2331,9 +2331,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] @@ -2418,13 +2418,12 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" +checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.3", - "zerocopy", ] [[package]] @@ -2696,7 +2695,7 @@ dependencies = [ "futures-util", "http", "mime", - "rand 0.9.0", + "rand 0.9.1", "thiserror 2.0.12", ] @@ -2744,6 +2743,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "rustls-pki-types" version = "1.11.0" @@ -2778,7 +2786,7 @@ dependencies = [ "core_maths", "log", "smallvec", - "ttf-parser 0.24.1", + "ttf-parser", "unicode-bidi-mirroring", "unicode-ccc", "unicode-properties", @@ -3040,9 +3048,9 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e22987355fbf8cfb813a0cf8cd97b1b4ec834b94dbd759a9e8679d41fabe83" +checksum = "f3c3a85280daca669cfd3bcb68a337882a8bc57ec882f72c5d13a430613a738e" dependencies = [ "sqlx-core", "sqlx-macros", @@ -3053,9 +3061,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55c4720d7d4cd3d5b00f61d03751c685ad09c33ae8290c8a2c11335e0604300b" +checksum = "f743f2a3cea30a58cd479013f75550e879009e3a02f616f18ca699335aa248c3" dependencies = [ "base64", "bytes", @@ -3090,9 +3098,9 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175147fcb75f353ac7675509bc58abb2cb291caf0fd24a3623b8f7e3eb0a754b" +checksum = "7f4200e0fde19834956d4252347c12a083bdcb237d7a1a1446bffd8768417dce" dependencies = [ "proc-macro2", "quote", @@ -3103,9 +3111,9 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cde983058e53bfa75998e1982086c5efe3c370f3250bf0357e344fa3352e32b" +checksum = "882ceaa29cade31beca7129b6beeb05737f44f82dbe2a9806ecea5a7093d00b7" dependencies = [ "dotenvy", "either", @@ -3129,9 +3137,9 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "847d2e5393a4f39e47e4f36cab419709bc2b83cbe4223c60e86e1471655be333" +checksum = "0afdd3aa7a629683c2d750c2df343025545087081ab5942593a5288855b1b7a7" dependencies = [ "atoi", "base64", @@ -3172,9 +3180,9 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc35947a541b9e0a2e3d85da444f1c4137c13040267141b208395a0d0ca4659f" +checksum = "a0bedbe1bbb5e2615ef347a5e9d8cd7680fb63e77d9dafc0f29be15e53f1ebe6" dependencies = [ "atoi", "base64", @@ -3210,9 +3218,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c48291dac4e5ed32da0927a0b981788be65674aeb62666d19873ab4289febde" +checksum = "c26083e9a520e8eb87a06b12347679b142dc2ea29e6e409f805644a7a979a5bc" dependencies = [ "atoi", "chrono", @@ -3262,12 +3270,11 @@ dependencies = [ "axum-login", "axum-test", "chrono", - "comemo", "dotenv", "futures", "maud", "password-auth", - "rand 0.9.0", + "rand 0.9.1", "rust-i18n", "serde", "sqlx", @@ -3277,13 +3284,11 @@ dependencies = [ "tokio", "tower-sessions", "tower-sessions-sqlx-store-chrono", - "tracing", "tracing-subscriber", - "ttf-parser 0.25.1", "typst", "typst-kit", "typst-pdf", - "ureq", + "ureq 3.0.11", "zune-inflate", ] @@ -3370,7 +3375,7 @@ dependencies = [ "siphasher", "subsetter", "tiny-skia", - "ttf-parser 0.24.1", + "ttf-parser", "usvg", ] @@ -3864,12 +3869,6 @@ dependencies = [ "core_maths", ] -[[package]] -name = "ttf-parser" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31" - [[package]] name = "two-face" version = "0.4.3" @@ -3975,7 +3974,7 @@ dependencies = [ "typst-syntax", "typst-timing", "typst-utils", - "ureq", + "ureq 2.12.1", ] [[package]] @@ -3997,7 +3996,7 @@ dependencies = [ "kurbo", "rustybuzz", "smallvec", - "ttf-parser 0.24.1", + "ttf-parser", "typst-assets", "typst-library", "typst-macros", @@ -4055,7 +4054,7 @@ dependencies = [ "syntect", "time", "toml", - "ttf-parser 0.24.1", + "ttf-parser", "two-face", "typed-arena", "typst-assets", @@ -4101,7 +4100,7 @@ dependencies = [ "serde", "subsetter", "svg2pdf", - "ttf-parser 0.24.1", + "ttf-parser", "typst-assets", "typst-library", "typst-macros", @@ -4140,7 +4139,7 @@ dependencies = [ "ecow", "flate2", "image", - "ttf-parser 0.24.1", + "ttf-parser", "typst-library", "typst-macros", "typst-timing", @@ -4303,14 +4302,41 @@ dependencies = [ "log", "native-tls", "once_cell", - "rustls", - "rustls-pki-types", "serde", "serde_json", "url", +] + +[[package]] +name = "ureq" +version = "3.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7a3e9af6113ecd57b8c63d3cd76a385b2e3881365f1f489e54f49801d0c83ea" +dependencies = [ + "base64", + "flate2", + "log", + "percent-encoding", + "rustls", + "rustls-pemfile", + "rustls-pki-types", + "ureq-proto", + "utf-8", "webpki-roots", ] +[[package]] +name = "ureq-proto" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fadf18427d33828c311234884b7ba2afb57143e6e7e69fda7ee883b624661e36" +dependencies = [ + "base64", + "http", + "httparse", + "log", +] + [[package]] name = "url" version = "2.5.4" @@ -4356,6 +4382,12 @@ dependencies = [ "xmlwriter", ] +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + [[package]] name = "utf16_iter" version = "1.0.5" diff --git a/Cargo.toml b/Cargo.toml index 64b1ec3..548156a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,6 @@ serde = "1.0" sqlx = { version = "0.8", features = ["sqlite", "runtime-tokio-rustls", "macros", "chrono"] } tokio = { version = "1.44", features = ["macros", "rt-multi-thread"] } tower-sessions = "0.14" -tracing = "0.1" rust-i18n = "3" thiserror = "2.0" async-trait = "0.1" @@ -24,18 +23,16 @@ futures = "0.3" rand = "0.9" argon2 = "0.5" typst = "0.13" -comemo = "0.4.0" # Fetching and unzipping packages zune-inflate = { version = "0.2", default-features = false, features = [ "gzip", "std", ] } tar = "0.4" -ureq = "2.9" +ureq = "3.0" time = "0.3" -ttf-parser = "0.25" -typst-kit = "0.13.1" -typst-pdf = "0.13.1" +typst-kit = "0.13" +typst-pdf = "0.13" [dev-dependencies] diff --git a/src/admin/station/typst.rs b/src/admin/station/typst.rs index 8b7ce49..b9158da 100644 --- a/src/admin/station/typst.rs +++ b/src/admin/station/typst.rs @@ -56,7 +56,7 @@ impl TypstWrapperWorld { cache_directory: std::env::var_os("CACHE_DIRECTORY") .map(|os_path| os_path.into()) .unwrap_or(std::env::temp_dir()), - http: ureq::Agent::new(), + http: ureq::Agent::new_with_defaults(), files: Arc::new(Mutex::new(HashMap::new())), } } @@ -131,7 +131,7 @@ impl TypstWrapperWorld { package.namespace, package.name, package.version, ); - let response = retry(|| { + let mut response = retry(|| { let response = self .http .get(&url) @@ -139,7 +139,7 @@ impl TypstWrapperWorld { .map_err(|error| eco_format!("{error}"))?; let status = response.status(); - if !http_successful(status) { + if !http_successful(status.into()) { return Err(eco_format!( "response returned unsuccessful status code {status}", )); @@ -149,10 +149,9 @@ impl TypstWrapperWorld { }) .map_err(|error| PackageError::NetworkFailed(Some(error)))?; - let mut compressed_archive = Vec::new(); - response - .into_reader() - .read_to_end(&mut compressed_archive) + let compressed_archive = response + .body_mut() + .read_to_vec() .map_err(|error| PackageError::NetworkFailed(Some(eco_format!("{error}"))))?; let raw_archive = zune_inflate::DeflateDecoder::new(&compressed_archive) .decode_gzip() -- 2.47.2