Version updates (#3626)

* Update some Labrinth dependencies

* Update some Labrinth dependencies

* Update some Labrinth dependencies

* Update zip in Labrinth

* Update itertools in Labrinth

* Update validator in labrinth

* Update thiserror in labrinth

* Update rust_decimal, redis, and deadpool-redis in labrinth

* Update totp-rs and spdx in labrinth

* Update maxminddb and tar in labrinth

* Update sentry and sentry-actix in labrinth

* Update image in labrinth

* Update lettre in labrinth

* Update derive-new and rust_iso3166 in labrinth

* Update async-stripe and json-patch in labrinth

* Update clap and iana-time-zone in labrinth

* Update labrinth to Rust 2024

* Cargo fmt

* Just do a full cargo update

* Update daedelus to Rust 2024

* Update daedelus_client to Rust 2024

* Set the formatting edition to 2024

* Fix formatting

IntelliJ messed up my formatting

Author: Gaming32

Cargo.lock

@@ -39,7 +39,7 @@ uuid = { version = "1.1", features = ["serde", "v4"] }
 tracing = "0.1.37"
 tracing-error = "0.2.0"
 
-dashmap = "6.0.1"
+dashmap = "6.1.0"
 paste = "1.0.15"
 enumset = { version = "1.1", features = ["serde"] }
 

apps/app/Cargo.toml

@@ -2,7 +2,7 @@
 name = "daedalus_client"
 version = "0.2.2"
 authors = ["Jai A <jai@modrinth.com>"]
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -15,25 +15,16 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde-xml-rs = "0.6.0"
 lazy_static = "1.4.0"
-thiserror = "1.0"
-reqwest = { version = "0.12.5", default-features = false, features = [
-    "stream",
-    "json",
-    "rustls-tls-native-roots",
-] }
+thiserror = "2.0"
+reqwest = { version = "0.12.15", default-features = false, features = ["stream", "json", "rustls-tls-native-roots"] }
 async_zip = { version = "0.0.17", features = ["full"] }
 chrono = { version = "0.4", features = ["serde"] }
 bytes = "1.6.0"
-rust-s3 = { version = "0.33.0", default-features = false, features = [
-    "fail-on-err",
-    "tags",
-    "tokio-rustls-tls",
-    "reqwest",
-] }
-dashmap = "5.5.3"
+rust-s3 = { version = "0.35.1", default-features = false, features = ["fail-on-err", "tags", "tokio-rustls-tls"] }
+dashmap = "6.1.0"
 sha1_smol = { version = "1.0.0", features = ["std"] }
 indexmap = { version = "2.2.6", features = ["serde"] }
-itertools = "0.13.0"
+itertools = "0.14.0"
 tracing-error = "0.2.0"
 
 tracing = "0.1"

apps/daedalus_client/Cargo.toml

@@ -12,7 +12,9 @@ pub enum ErrorKind {
     SerdeJSON(#[from] serde_json::Error),
     #[error("Error while deserializing XML: {0}")]
     SerdeXML(#[from] serde_xml_rs::Error),
-    #[error("Failed to validate file checksum at url {url} with hash {hash} after {tries} tries")]
+    #[error(
+        "Failed to validate file checksum at url {url} with hash {hash} after {tries} tries"
+    )]
     ChecksumFailure {
         hash: String,
         url: String,

apps/daedalus_client/src/error.rs

@@ -1,6 +1,6 @@
 use crate::util::{download_file, fetch_json, format_url};
-use crate::{insert_mirrored_artifact, Error, MirrorArtifact, UploadFile};
-use daedalus::modded::{Manifest, PartialVersionInfo, DUMMY_REPLACE_STRING};
+use crate::{Error, MirrorArtifact, UploadFile, insert_mirrored_artifact};
+use daedalus::modded::{DUMMY_REPLACE_STRING, Manifest, PartialVersionInfo};
 use dashmap::DashMap;
 use serde::Deserialize;
 use std::sync::Arc;
@@ -169,10 +169,11 @@ async fn fetch(
                         insert_mirrored_artifact(
                             &new_name,
                             None,
-                            vec![lib
-                                .url
-                                .clone()
-                                .unwrap_or_else(|| maven_url.to_string())],
+                            vec![
+                                lib.url
+                                    .clone()
+                                    .unwrap_or_else(|| maven_url.to_string()),
+                            ],
                             false,
                             mirror_artifacts,
                         )?;

apps/daedalus_client/src/fabric.rs

@@ -1,14 +1,14 @@
 use crate::util::{download_file, fetch_json, fetch_xml, format_url};
-use crate::{insert_mirrored_artifact, Error, MirrorArtifact, UploadFile};
+use crate::{Error, MirrorArtifact, UploadFile, insert_mirrored_artifact};
 use chrono::{DateTime, Utc};
 use daedalus::get_path_from_artifact;
 use daedalus::modded::PartialVersionInfo;
 use dashmap::DashMap;
 use futures::io::Cursor;
 use indexmap::IndexMap;
 use itertools::Itertools;
-use serde::de::DeserializeOwned;
 use serde::Deserialize;
+use serde::de::DeserializeOwned;
 use std::collections::HashMap;
 use std::sync::Arc;
 use tokio::sync::Semaphore;
@@ -589,14 +589,16 @@ async fn fetch(
                         mod_loader: &str,
                         version: &ForgeVersion,
                     ) -> Result<String, Error> {
-                        let extract_file =
-                            read_file(zip, &value[1..value.len()])
-                                .await?
-                                .ok_or_else(|| {
-                                    crate::ErrorKind::InvalidInput(format!(
+                        let extract_file = read_file(
+                            zip,
+                            &value[1..value.len()],
+                        )
+                        .await?
+                        .ok_or_else(|| {
+                            crate::ErrorKind::InvalidInput(format!(
                                 "Unable reading data key {key} at path {value}",
                             ))
-                                })?;
+                        })?;
 
                         let file_name = value.split('/').next_back()
                             .ok_or_else(|| {
@@ -622,10 +624,7 @@ async fn fetch(
 
                         let path = format!(
                             "com.modrinth.daedalus:{}-installer-extracts:{}:{}@{}",
-                            mod_loader,
-                            version.raw,
-                            file_name,
-                            ext
+                            mod_loader, version.raw, file_name, ext
                         );
 
                         upload_files.insert(
@@ -753,7 +752,8 @@ async fn fetch(
                 .rev()
                 .chunk_by(|x| x.game_version.clone())
                 .into_iter()
-                .map(|(game_version, loaders)| daedalus::modded::Version {
+                .map(|(game_version, loaders)| {
+                    daedalus::modded::Version {
                     id: game_version,
                     stable: true,
                     loaders: loaders
@@ -766,6 +766,7 @@ async fn fetch(
                             stable: false,
                         })
                         .collect(),
+                }
                 })
                 .collect(),
         };

apps/daedalus_client/src/forge.rs

@@ -1,13 +1,13 @@
 use crate::util::{
-    format_url, upload_file_to_bucket, upload_url_to_bucket_mirrors,
-    REQWEST_CLIENT,
+    REQWEST_CLIENT, format_url, upload_file_to_bucket,
+    upload_url_to_bucket_mirrors,
 };
 use daedalus::get_path_from_artifact;
 use dashmap::{DashMap, DashSet};
 use std::sync::Arc;
 use tokio::sync::Semaphore;
 use tracing_error::ErrorLayer;
-use tracing_subscriber::{fmt, prelude::*, EnvFilter};
+use tracing_subscriber::{EnvFilter, fmt, prelude::*};
 
 mod error;
 mod fabric;

apps/daedalus_client/src/main.rs

@@ -1,11 +1,11 @@
 use crate::util::fetch_json;
 use crate::{
-    util::download_file, util::format_url, util::sha1_async, Error,
-    MirrorArtifact, UploadFile,
+    Error, MirrorArtifact, UploadFile, util::download_file, util::format_url,
+    util::sha1_async,
 };
 use daedalus::minecraft::{
-    merge_partial_library, Library, PartialLibrary, VersionInfo,
-    VersionManifest, VERSION_MANIFEST_URL,
+    Library, PartialLibrary, VERSION_MANIFEST_URL, VersionInfo,
+    VersionManifest, merge_partial_library,
 };
 use dashmap::DashMap;
 use serde::Deserialize;

apps/daedalus_client/src/minecraft.rs

@@ -7,7 +7,7 @@ use std::sync::Arc;
 use tokio::sync::Semaphore;
 
 lazy_static::lazy_static! {
-    static ref BUCKET : Bucket = {
+    static ref BUCKET: Bucket = {
         let region = dotenvy::var("S3_REGION").unwrap();
         let b = Bucket::new(
             &dotenvy::var("S3_BUCKET_NAME").unwrap(),
@@ -31,9 +31,9 @@ lazy_static::lazy_static! {
         ).unwrap();
 
         if region == "path-style" {
-            b.with_path_style()
+            *b.with_path_style()
         } else {
-            b
+            *b
         }
     };
 }
@@ -203,7 +203,7 @@ pub async fn download_file(
                     inner: err,
                     item: url.to_string(),
                 }
-                .into())
+                .into());
             }
         }
     }

apps/daedalus_client/src/util.rs

@@ -2,7 +2,7 @@
 name = "labrinth"
 version = "2.7.0"
 authors = ["geometrically <jai@modrinth.com>"]
-edition = "2018"
+edition = "2024"
 license = "AGPL-3.0"
 
 # This seems redundant, but it's necessary for Docker to work
@@ -11,17 +11,17 @@ name = "labrinth"
 path = "src/main.rs"
 
 [dependencies]
-actix-web = "4.4.1"
+actix-web = "4.10.2"
 actix-rt = "2.9.0"
-actix-multipart = "0.6.1"
-actix-cors = "0.7.0"
+actix-multipart = "0.7.2"
+actix-cors = "0.7.1"
 actix-ws = "0.3.0"
 actix-files = "0.6.5"
-prometheus = "0.13.4"
+prometheus = "0.13.4" # Locked on 0.13 until actix updates to 0.14
 actix-web-prom = { version = "0.9.0", features = ["process"] }
 
 tracing = "0.1.41"
-tracing-actix-web = "0.7.16"
+tracing-actix-web = "0.7.18"
 console-subscriber = "0.4.1"
 
 tokio = { version = "1.35.1", features = ["sync", "rt-multi-thread"] }
@@ -30,14 +30,15 @@ tokio-stream = "0.1.14"
 futures = "0.3.30"
 futures-util = "0.3.30"
 async-trait = "0.1.70"
-dashmap = "5.4.0"
+dashmap = "6.1.0"
 lazy_static = "1.4.0"
 
-meilisearch-sdk = "0.27.1"
-rust-s3 = "0.33.0"
-reqwest = { version = "0.11.18", features = ["json", "multipart"] }
-hyper = { version = "0.14", features = ["full"] }
-hyper-tls = "0.5.0"
+meilisearch-sdk = "0.28.0"
+rust-s3 = { version = "0.35.1", default-features = false, features = ["fail-on-err", "tags", "tokio-rustls-tls"] }
+reqwest = { version = "0.12.15", features = ["json", "multipart"] }
+hyper = { version = "1.6", features = ["full"] }
+hyper-tls = "0.6.0"
+hyper-util = "0.1.11"
 
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -46,34 +47,34 @@ chrono = { version = "0.4.26", features = ["serde"] }
 yaserde = "0.12.0"
 yaserde_derive = "0.12.0"
 
-rand = "0.8.5"
-rand_chacha = "0.3.1"
+rand = "0.8.5" # Locked on 0.8 until argon2 updates to 0.9
+rand_chacha = "0.3.1" # Locked on 0.3 until we can update rand to 0.9
 bytes = "1.4.0"
-base64 = "0.21.7"
-sha1 = { version = "0.6.1", features = ["std"] }
-sha2 = "0.9.9"
-hmac = "0.11.0"
+base64 = "0.22.1"
+sha1 = { version = "0.10.6", features = ["std"] }
+sha2 = "0.10.9"
+hmac = "0.12.1"
 argon2 = { version = "0.5.0", features = ["std"] }
 murmur2 = "0.1.0"
 bitflags = "2.4.0"
 hex = "0.4.3"
-zxcvbn = "2.2.2"
+zxcvbn = "3.1.0"
 totp-rs = { version = "5.0.2", features = ["gen_secret"] }
 
 url = "2.4.0"
 urlencoding = "2.1.2"
 
-zip = "0.6.6"
+zip = "2.6.1"
 
-itertools = "0.12.0"
+itertools = "0.14.0"
 
-validator = { version = "0.16.1", features = ["derive", "phone"] }
+validator = { version = "0.20.0", features = ["derive"] }
 regex = "1.10.2"
 censor = "0.3.0"
 spdx = { version = "0.10.3", features = ["text"] }
 
 dotenvy = "0.15.7"
-thiserror = "1.0.56"
+thiserror = "2.0.12"
 either = "1.13"
 
 sqlx = { version = "0.8.2", features = [
@@ -89,39 +90,32 @@ rust_decimal = { version = "1.33.1", features = [
     "serde-with-float",
     "serde-with-str",
 ] }
-redis = { version = "0.27.5", features = ["tokio-comp", "ahash", "r2d2"] }
-deadpool-redis = "0.18.0"
-clickhouse = { version = "0.11.2", features = ["uuid", "time"] }
+redis = { version = "0.29.5", features = ["tokio-comp", "ahash", "r2d2"] } # Locked on 0.29 until deadpool-redis updates to 0.30
+deadpool-redis = "0.20.0"
+clickhouse = { version = "0.13.2", features = ["uuid", "time"] }
 uuid = { version = "1.2.2", features = ["v4", "fast-rng", "serde"] }
 
-maxminddb = "0.24.0"
+maxminddb = "0.26.0"
 flate2 = "1.0.25"
 tar = "0.4.38"
 
-sentry = { version = "0.34.0", default-features = false, features = [
-    "backtrace",
-    "contexts",
-    "debug-images",
-    "panic",
-    "rustls",
-    "reqwest",
-] }
-sentry-actix = "0.34.0"
+sentry = { version = "0.37.0", default-features = false, features = ["backtrace", "contexts", "debug-images", "panic", "rustls", "reqwest"] }
+sentry-actix = "0.37.0"
 
-image = "0.24.6"
+image = "0.25.6"
 color-thief = "0.2.2"
 webp = "0.3.0"
 
 woothee = "0.13.0"
 
 lettre = "0.11.3"
 
-derive-new = "0.6.0"
+derive-new = "0.7.0"
 rust_iso3166 = "0.1.11"
 
-async-stripe = { version = "0.39.1", features = ["runtime-tokio-hyper-rustls"] }
+async-stripe = { version = "0.41.0", features = ["runtime-tokio-hyper-rustls"] }
 rusty-money = "0.4.1"
-json-patch = "*"
+json-patch = "4.0.0"
 
 ariadne = { path = "../../packages/ariadne" }
 

apps/labrinth/Cargo.toml

@@ -1,9 +1,9 @@
 use crate::database;
+use crate::database::models::Collection;
 use crate::database::models::project_item::QueryProject;
 use crate::database::models::version_item::QueryVersion;
-use crate::database::models::Collection;
 use crate::database::redis::RedisPool;
-use crate::database::{models, Project, Version};
+use crate::database::{Project, Version, models};
 use crate::models::users::User;
 use crate::routes::ApiError;
 use itertools::Itertools;

apps/labrinth/src/auth/checks.rs

@@ -1,5 +1,5 @@
-use lettre::message::header::ContentType;
 use lettre::message::Mailbox;
+use lettre::message::header::ContentType;
 use lettre::transport::smtp::authentication::Credentials;
 use lettre::transport::smtp::client::{Tls, TlsParameters};
 use lettre::{Address, Message, SmtpTransport, Transport};

apps/labrinth/src/auth/email/mod.rs

@@ -15,8 +15,8 @@ pub use validate::{check_is_moderator_from_headers, get_user_from_headers};
 
 use crate::file_hosting::FileHostingError;
 use crate::models::error::ApiError;
-use actix_web::http::StatusCode;
 use actix_web::HttpResponse;
+use actix_web::http::StatusCode;
 use thiserror::Error;
 
 #[derive(Error, Debug)]