feat: update remaining dependencies

Author: jacobtread

Cargo.lock

@@ -41,42 +41,42 @@ embeddy = "0.1"
 # Password hashing
 argon2 = { version = "0.5", features = ["std"] }
 
-base64ct = { version = "1.5", features = ["alloc"] }
+base64ct = { version = "1.6", features = ["alloc"] }
 flate2 = { version = "1", features = ["zlib"], default-features = false }
 ring = "0.17"
 
 # Library for obtaining the local IP address of the device
-local-ip-address = "0.5"
+local-ip-address = "0.6"
 
 # Error handling and transforming
 thiserror = "1"
 
 # Email validation
-email_address = "0.2.4"
+email_address = "0.2.9"
 
 # Codec utils for encoding and decoding packets
 tokio-util = { version = "0.7", features = ["codec"] }
 
 # Hyper for connection upgrades
-hyper = "1.4"
-hyper-util = { version = "0.1.7", features = ["tokio"] }
-tower = { version = "0.4", features = ["util"] }
+hyper = "1.6"
+hyper-util = { version = "0.1.10", features = ["tokio"] }
+tower = { version = "0.5.2", features = ["util"] }
 
-bitflags = { version = "2.3.1", features = ["serde"] }
+bitflags = { version = "2.8.0", features = ["serde"] }
 tdf = { version = "0.4" }
 bytes = "1.4.0"
 
 indoc = "2"
-parking_lot = "0.12.1"
+parking_lot = "0.12.3"
 
 # Const safe HashMaps (Can be replaced with std HashMap after https://github.com/rust-lang/rust/issues/102575 is resolved)
-hashbrown = { version = "0.14.3", default-features = false, features = [
+hashbrown = { version = "0.15.2", default-features = false, features = [
     "allocator-api2",
     "inline-more",
 ] }
 
 uuid = { version = "^1", features = ["v4", "serde", "fast-rng"] }
-rand = "0.8"
+rand = "0.9"
 
 # SeaORM 
 [dependencies.sea-orm]
@@ -132,10 +132,6 @@ version = "0.4"
 default-features = false
 features = ["std", "serde"]
 
-[dev-dependencies]
-# Random numbers for seeding
-rand = "0.8"
-
 [profile.release]
 strip = true
 lto = true

Cargo.toml

@@ -1,5 +1,5 @@
 use chrono::Local;
-use rand::{distributions::Uniform, Rng};
+use rand::{distr::Uniform, Rng};
 use sea_orm::{
     ActiveModelTrait,
     ActiveValue::{NotSet, Set},
@@ -115,14 +115,14 @@ pub async fn seed() {
 
     let current_time = Local::now().naive_local();
 
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
 
     // Random sample used for role data
-    let role_sample = Uniform::new_inclusive(0, 3);
+    let role_sample = Uniform::new_inclusive(0, 3).unwrap();
     // Class level sample
-    let level_sample = Uniform::new_inclusive(0, 20);
+    let level_sample = Uniform::new_inclusive(0, 20).unwrap();
     // Random sample used for gaw groups
-    let gaw_sample = Uniform::new_inclusive(5000, 10099);
+    let gaw_sample = Uniform::new_inclusive(5000, 10099).unwrap();
 
     const INVENTORY_LENGTH: usize = 671;
 
@@ -156,8 +156,13 @@ pub async fn seed() {
 
         // Set the player leaderboard data
         try_join!(
-            LeaderboardData::set(&db, LeaderboardType::N7Rating, model.id, rng.gen()),
-            LeaderboardData::set(&db, LeaderboardType::ChallengePoints, model.id, rng.gen())
+            LeaderboardData::set(&db, LeaderboardType::N7Rating, model.id, rng.random()),
+            LeaderboardData::set(
+                &db,
+                LeaderboardType::ChallengePoints,
+                model.id,
+                rng.random()
+            )
         )
         .unwrap();
 
@@ -183,16 +188,16 @@ pub async fn seed() {
             let mut inventory: String = String::with_capacity(INVENTORY_LENGTH * 2);
             for _ in 0..INVENTORY_LENGTH {
                 // Generate a random value for the inventory item
-                let value: u8 = rng.gen();
+                let value: u8 = rng.random();
 
                 // Store the value as a 2 char hex value
                 write!(&mut inventory, "{value:2x}").unwrap();
             }
 
-            let credits: u32 = rng.gen();
-            let credits_spent: u32 = rng.gen();
-            let games_played: u32 = rng.gen();
-            let seconds_played: u32 = rng.gen();
+            let credits: u32 = rng.random();
+            let credits_spent: u32 = rng.random();
+            let games_played: u32 = rng.random();
+            let seconds_played: u32 = rng.random();
 
             // Generate the player base data
             let base_data = format!(
@@ -205,7 +210,7 @@ pub async fn seed() {
         // Set the player class data for each class
         for (index, class_name) in CLASS_NAMES.iter().enumerate() {
             let level: u32 = rng.sample(level_sample);
-            let xp: f32 = rng.gen();
+            let xp: f32 = rng.random();
 
             let key = format!("class{}", index + 1);
             let value = format!("20;4;{class_name};{level};{xp:.4};0");
@@ -217,7 +222,7 @@ pub async fn seed() {
             let mut completion = String::from("22");
 
             for _ in 0..746 {
-                let value: u8 = rng.gen();
+                let value: u8 = rng.random();
                 write!(&mut completion, ",{value}").unwrap();
             }
 
@@ -229,7 +234,7 @@ pub async fn seed() {
             let mut completion = String::from("22");
 
             for _ in 0..221 {
-                let value: u8 = rng.gen();
+                let value: u8 = rng.random();
                 write!(&mut completion, ",{value}").unwrap();
             }
 
@@ -241,7 +246,7 @@ pub async fn seed() {
             let mut value = String::new();
 
             for _ in 0..250 {
-                let rand: u32 = rng.gen();
+                let rand: u32 = rng.random();
                 write!(&mut value, "{rand},").unwrap();
             }
 
@@ -255,7 +260,7 @@ pub async fn seed() {
             let mut value = String::new();
 
             for _ in 0..250 {
-                let rand: u32 = rng.gen();
+                let rand: u32 = rng.random();
                 write!(&mut value, "{rand},").unwrap();
             }
 
@@ -269,7 +274,7 @@ pub async fn seed() {
             let mut value = String::new();
 
             for _ in 0..245 {
-                let rand: u32 = rng.gen();
+                let rand: u32 = rng.random();
                 write!(&mut value, "{rand},").unwrap();
             }
 
@@ -283,7 +288,7 @@ pub async fn seed() {
             let mut progress = String::from("22");
 
             for _ in 0..745 {
-                let value: u32 = rng.gen();
+                let value: u32 = rng.random();
                 write!(&mut progress, ",{value}").unwrap();
             }
             player_data.push(("Progress".to_string(), progress));

src/database/seed.rs

@@ -8,7 +8,7 @@ use crate::utils::signing::SigningKey;
 use crate::utils::types::PlayerID;
 use base64ct::{Base64UrlUnpadded, Encoding};
 use parking_lot::Mutex;
-use rand::distributions::Distribution;
+use rand::distr::Distribution;
 use rand::rngs::StdRng;
 use rand::{Rng, SeedableRng};
 use std::collections::HashMap;
@@ -57,7 +57,7 @@ struct LoginCodePart;
 impl Distribution<char> for LoginCodePart {
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> char {
         let chars = b"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-        let idx = rng.gen_range(0..chars.len());
+        let idx = rng.random_range(0..chars.len());
         chars[idx] as char
     }
 }
@@ -80,7 +80,7 @@ impl Sessions {
     /// Creates a new login code for the provider player, returns the
     /// login code storing the data so it can be exchanged
     pub fn create_login_code(&self, player_id: PlayerID) -> Result<LoginCode, ()> {
-        let rng = StdRng::from_entropy();
+        let rng = StdRng::from_os_rng();
 
         let code: LoginCode = rng
             .sample_iter(&LoginCodePart)

src/services/sessions.rs

@@ -331,7 +331,7 @@ pub async fn handle_create_account(
         GlobalError::System
     })?;
 
-    let mut rng = StdRng::from_entropy();
+    let mut rng = StdRng::from_os_rng();
     let display_name: String;
 
     loop {

src/session/routes/auth.rs

@@ -1,4 +1,4 @@
-use rand::{rngs::StdRng, seq::SliceRandom, Rng};
+use rand::{rngs::StdRng, seq::IndexedRandom, Rng};
 
 /// Code for generating random names for accounts that weren't provided
 /// display names (Accounts created in-game)
@@ -2126,7 +2126,7 @@ pub fn generate_random_name(rng: &mut StdRng) -> String {
     let noun = NOUNS.choose(rng).unwrap();
 
     // Random number suffix for extra randomness
-    let random_suffix = rng.gen_range(1..10000);
+    let random_suffix = rng.random_range(1..10000);
 
     format!("{}-{}-{:04}", adj, noun, random_suffix)
 }