chore: update, remove cache

Signed-off-by: Henry <mail@henrygressmann.de>

Author: explodingcamera

Cargo.lock

@@ -27,7 +27,7 @@ hex={version="0.4"}
 bs58="0.5"
 serde={version="1.0", features=["derive"]}
 serde_json={version="1.0"}
-md-5={version="0.10"}
+md-5={version="0.11.0-rc.5"}
 async-compression={version="0.4", default-features=false, features=["gzip", "tokio"]}
 tokio-tar={package="astral-tokio-tar", version="0.5"}
 blake3={version="1.8"}
@@ -41,8 +41,7 @@ zstd={version="0.13", default-features=false}
 # general
 argh={version="0.1", default-features=false, features=["help"]}
 anyhow={version="1.0"}
-rand_core={version="0.10"}
-rand={version="0.9", default-features=false, features=["std", "thread_rng"]}
+rand={version="0.10.0-rc.9", default-features=false, features=["std", "thread_rng"]}
 chrono={version="0.4", default-features=false, features=["std", "now", "serde"]}
 figment={version="0.10", features=["toml", "env"]}
 tracing={version="0.1", default-features=false, features=["std"]}

Cargo.toml

@@ -3,7 +3,6 @@ pub mod events;
 pub mod onboarding;
 pub mod projects;
 pub mod reports;
-mod reports_cached;
 pub mod sessions;
 pub mod users;
 

src/app/core.rs

@@ -3,7 +3,7 @@ use std::sync::Arc;
 use anyhow::{Result, bail};
 use arc_swap::ArcSwap;
 use chrono::{DateTime, Utc};
-use password_hash::try_generate_salt;
+use rand::distr::{SampleString, StandardUniform};
 use std::sync::mpsc::Receiver;
 
 use crate::app::models::{Event, event_params};
@@ -13,12 +13,12 @@ use crate::app::{DuckDBPool, EVENT_BATCH_INTERVAL, SqlitePool};
 pub struct LiwanEvents {
     duckdb: DuckDBPool,
     sqlite: SqlitePool,
-    daily_salt: Arc<ArcSwap<([u8; 16], DateTime<Utc>)>>,
+    daily_salt: Arc<ArcSwap<(String, DateTime<Utc>)>>,
 }
 
 impl LiwanEvents {
     pub fn try_new(duckdb: DuckDBPool, sqlite: SqlitePool) -> Result<Self> {
-        let daily_salt: ([u8; 16], DateTime<Utc>) = {
+        let daily_salt: (String, DateTime<Utc>) = {
             tracing::debug!("Loading daily salt");
             sqlite.get()?.query_row("select salt, updated_at from salts where id = 1", [], |row| {
                 Ok((row.get(0)?, row.get(1)?))
@@ -28,13 +28,13 @@ impl LiwanEvents {
     }
 
     /// Get the daily salt, generating a new one if the current one is older than 24 hours
-    pub fn get_salt(&self) -> Result<[u8; 16]> {
+    pub fn get_salt(&self) -> Result<String> {
         let (salt, updated_at) = &**self.daily_salt.load();
 
         // if the salt is older than 24 hours, replace it with a new one (utils::generate_salt)
         if (Utc::now() - updated_at) > chrono::Duration::hours(24) {
             tracing::debug!("Daily salt expired, generating a new one");
-            let new_salt = try_generate_salt()?;
+            let new_salt = StandardUniform.sample_string(&mut rand::rng(), 16);
             let now = Utc::now();
             let conn = self.sqlite.get()?;
             conn.execute("update salts set salt = ?, updated_at = ? where id = 1", rusqlite::params![&new_salt, now])?;

src/app/core/events.rs

@@ -1,6 +1,6 @@
 #![allow(dead_code)]
 
-use std::io::{self};
+use std::io::{self, Read};
 use std::net::IpAddr;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
@@ -233,8 +233,17 @@ fn file_md5(path: &Path) -> Result<String> {
     let file = std::fs::File::open(path)?;
     let mut reader = std::io::BufReader::new(file);
     let mut hasher = md5::Md5::new();
-    std::io::copy(&mut reader, &mut hasher)?;
-    Ok(format!("{:x}", hasher.finalize()))
+
+    let mut buffer = [0u8; 8192];
+    loop {
+        let n = reader.read(&mut buffer)?;
+        if n == 0 {
+            break;
+        }
+        hasher.update(&buffer[..n]);
+    }
+
+    Ok(hex::encode(hasher.finalize()))
 }
 
 async fn download_maxmind_db(edition: &str, account_id: &str, license_key: &str) -> Result<PathBuf> {

src/app/core/geoip.rs

@@ -9,8 +9,6 @@ use duckdb::params_from_iter;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-pub use super::reports_cached::*;
-
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, Hash, PartialEq, Eq)]
 pub struct DateRange {
     pub start: DateTime<Utc>,