chore: update dependencies

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

Author: explodingcamera

Cargo.lock

@@ -16,7 +16,7 @@ path="src/main.rs"
 
 [dependencies]
 # async/concurrency
-arc-swap="1.8"
+arc-swap="1.9"
 tokio={version="1.50", default-features=false, features=["macros", "rt-multi-thread", "signal"]}
 tokio-util={version="0.7", features=["io"]}
 futures-lite={version="2.6", default-features=false, features=["alloc"]}
@@ -29,9 +29,9 @@ serde={version="1.0", features=["derive"]}
 serde_json={version="1.0"}
 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"}
+tokio-tar={package="astral-tokio-tar", version="0.6"}
 blake3={version="1.8"}
-argon2={version="0.6.0-rc.7", features=[]}
+argon2={version="0.6.0-rc.8", features=[]}
 password-hash={version="0.6.0", features=[
     "rand_core",
     "getrandom",
@@ -68,7 +68,7 @@ tower-http={version="0.6", default-features=false, features=[
     "set-header",
 ]}
 tower_governor={version="0.8", default-features=false, features=["axum"]}
-aide={version="0.16.0-alpha.2", default-features=false, features=[
+aide={version="0.16.0-alpha.3", default-features=false, features=[
     "axum",
     "axum-json",
     "axum-matched-path",
@@ -82,13 +82,13 @@ rust-embed={version="8.11", features=["mime-guess"]}
 reqwest={version="0.13", default-features=false, features=["json", "stream", "charset", "rustls"]}
 
 # database
-duckdb={version="1.10500", features=["buildtime_bindgen", "chrono", "bundled", "r2d2"]}
+duckdb={version="1.10501", features=["buildtime_bindgen", "chrono", "bundled", "r2d2"]}
 rusqlite={version="0.39", features=["bundled", "modern_sqlite", "chrono"]}
 r2d2={version="0.8", default-features=false}
 refinery={version="0.9", default-features=false}
 refinery-core={version="0.9", default-features=false}
 maxminddb={version="0.27", optional=true, features=["simdutf8"]}
-mimalloc={version="0.1"}
+mimalloc={version="0.1", features=["v3"]}
 
 [dev-dependencies]
 figment={version="*", features=["test"]}

Cargo.toml

@@ -1,13 +1,10 @@
-#![allow(dead_code)]
-
 use std::io::{self, Read};
 use std::net::IpAddr;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::time::Duration;
 
-use crate::app::SqlitePool;
 use anyhow::{Context, Result, anyhow};
 use arc_swap::ArcSwapOption;
 use futures_lite::StreamExt;
@@ -26,21 +23,19 @@ pub struct LookupResult {
 }
 
 pub struct LiwanGeoIP {
-    pool: SqlitePool,
     reader: ArcSwapOption<maxminddb::Reader<Vec<u8>>>,
-
     downloading: AtomicBool,
     geoip: crate::config::GeoIpConfig,
     path: PathBuf,
 }
 
 impl LiwanGeoIP {
-    pub fn try_new(config: crate::config::Config, pool: SqlitePool) -> Result<Self> {
+    pub fn try_new(config: crate::config::Config) -> Result<Self> {
         let geoip = config.geoip;
         if geoip.maxmind_account_id.is_none() && geoip.maxmind_license_key.is_none() && geoip.maxmind_db_path.is_none()
         {
             tracing::trace!("GeoIP support disabled, skipping...");
-            return Ok(Self::noop(pool));
+            return Ok(Self::noop());
         }
 
         let edition = &geoip.maxmind_edition;
@@ -61,13 +56,12 @@ impl LiwanGeoIP {
             maxminddb::Reader::open_readfile(path.clone()).expect("Failed to open GeoIP database file").into()
         });
 
-        Ok(Self { geoip, pool, reader: ArcSwapOption::new(reader), path, downloading: Default::default() })
+        Ok(Self { geoip, reader: ArcSwapOption::new(reader), path, downloading: Default::default() })
     }
 
-    fn noop(pool: SqlitePool) -> Self {
+    fn noop() -> Self {
         Self {
             geoip: Default::default(),
-            pool,
             reader: ArcSwapOption::new(None),
             downloading: Default::default(),
             path: PathBuf::new(),

data/licenses-cargo.json

@@ -25,6 +25,8 @@ pub struct Liwan {
     pub onboarding: core::onboarding::LiwanOnboarding,
     pub entities: core::entities::LiwanEntities,
     pub projects: core::projects::LiwanProjects,
+
+    #[cfg(feature = "geoip")]
     pub geoip: Arc<core::geoip::LiwanGeoIP>,
 
     pub config: Config,
@@ -59,7 +61,7 @@ impl Liwan {
 
         Ok(Self {
             #[cfg(feature = "geoip")]
-            geoip: core::geoip::LiwanGeoIP::try_new(config.clone(), conn_app.clone())?.into(),
+            geoip: core::geoip::LiwanGeoIP::try_new(config.clone())?.into(),
 
             events: LiwanEvents::try_new(conn_events.clone(), conn_app.clone())?,
             onboarding: LiwanOnboarding::try_new(&conn_app)?,
@@ -81,7 +83,7 @@ impl Liwan {
 
         Ok(Self {
             #[cfg(feature = "geoip")]
-            geoip: core::geoip::LiwanGeoIP::try_new(config.clone(), conn_app.clone())?.into(),
+            geoip: core::geoip::LiwanGeoIP::try_new(config.clone())?.into(),
 
             events: LiwanEvents::try_new(conn_events.clone(), conn_app.clone())?,
             onboarding: LiwanOnboarding::try_new(&conn_app)?,
@@ -101,6 +103,7 @@ impl Liwan {
     }
 
     pub fn run_background_tasks(&self) {
+        #[cfg(feature = "geoip")]
         tokio::task::spawn(core::geoip::keep_updated(self.geoip.clone()));
     }
 

data/licenses-npm.json

@@ -97,11 +97,16 @@ fn process_event(
         Some(ip) => hash_ip(&ip, user_agent.as_str(), &app.events.get_salt()?, &event.entity_id),
         None => visitor_id(),
     };
+
+    #[cfg(feature = "geoip")]
     let (country, city) = ip
         .and_then(|ip| app.geoip.lookup(&ip).ok())
         .map(|lookup| (lookup.country_code, lookup.city))
         .unwrap_or((None, None));
 
+    #[cfg(not(feature = "geoip"))]
+    let (country, city) = (None, None);
+
     let path = url.path().to_string();
     let path = if path.len() > 1 && path.ends_with('/') { path.trim_end_matches('/').to_string() } else { path };
     let fqdn = url.host().unwrap_or_default().to_string();

src/app/core/geoip.rs

@@ -1,5 +1,3 @@
-#![allow(clippy::result_large_err)]
-
 use std::convert::Infallible;
 use std::fmt::Display;
 use std::marker::PhantomData;