chore: update maxminddb

Signed-off-by: Henry Gressmann <[email protected]>

Author: explodingcamera

Cargo.lock

@@ -70,7 +70,7 @@ r2d2={version="0.8", default-features=false}
 r2d2_sqlite="0.31"
 refinery={version="0.9", default-features=false}
 refinery-core={version="0.9", default-features=false}
-maxminddb={version="0.26", optional=true, features=["simdutf8"]}
+maxminddb={version="0.27", optional=true, features=["simdutf8"]}
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 tikv-jemallocator="0.6"

Cargo.toml

@@ -1,5 +1,5 @@
 {
-	"$schema": "https://biomejs.dev/schemas/2.2.4/schema.json",
+	"$schema": "./web/node_modules/@biomejs/biome/configuration_schema.json",
 	"assist": {
 		"enabled": true,
 		"actions": {

biome.json

@@ -24,12 +24,11 @@ pub struct LookupResult {
     pub country_code: Option<String>,
 }
 
-#[derive(Clone)]
 pub struct LiwanGeoIP {
     pool: SqlitePool,
-    reader: Arc<ArcSwapOption<maxminddb::Reader<Vec<u8>>>>,
+    reader: ArcSwapOption<maxminddb::Reader<Vec<u8>>>,
 
-    downloading: Arc<AtomicBool>,
+    downloading: AtomicBool,
     geoip: crate::config::GeoIpConfig,
     path: PathBuf,
 }
@@ -61,7 +60,7 @@ impl LiwanGeoIP {
             maxminddb::Reader::open_readfile(path.clone()).expect("Failed to open GeoIP database file").into()
         });
 
-        Ok(Self { geoip, pool, reader: ArcSwapOption::new(reader).into(), path, downloading: Default::default() })
+        Ok(Self { geoip, pool, reader: ArcSwapOption::new(reader), path, downloading: Default::default() })
     }
 
     fn is_enabled(&self) -> bool {
@@ -72,7 +71,7 @@ impl LiwanGeoIP {
         Self {
             geoip: Default::default(),
             pool,
-            reader: ArcSwapOption::new(None).into(),
+            reader: ArcSwapOption::new(None),
             downloading: Default::default(),
             path: PathBuf::new(),
         }
@@ -84,11 +83,9 @@ impl LiwanGeoIP {
             return Ok(Default::default());
         };
 
-        let lookup =
-            reader.lookup::<maxminddb::geoip2::City>(*ip)?.ok_or_else(|| anyhow!("No data found for IP address"))?;
-
-        let city = lookup.city.and_then(|city| city.names.and_then(|names| names.get("en").map(|s| (*s).to_string())));
-        let country_code = lookup.country.and_then(|country| country.iso_code.map(ToString::to_string));
+        let lookup = reader.lookup(*ip)?.decode::<maxminddb::geoip2::City>().context("failed to decode data")?;
+        let city = lookup.as_ref().and_then(|lookup| lookup.city.names.english.map(|v| v.to_string()));
+        let country_code = lookup.and_then(|lookup| lookup.country.iso_code.map(|v| v.to_string()));
         Ok(LookupResult { city, country_code })
     }
 
@@ -154,7 +151,7 @@ impl LiwanGeoIP {
     }
 }
 
-pub fn keep_updated(geoip: LiwanGeoIP) {
+pub fn keep_updated(geoip: Arc<LiwanGeoIP>) {
     if !geoip.is_enabled() {
         return;
     }
@@ -230,11 +227,11 @@ async fn download_maxmind_db(edition: &str, account_id: &str, license_key: &str)
             entry.set_allow_external_symlinks(false);
             entry.set_preserve_permissions(false);
 
-            return Ok(entry
+            return entry
                 .unpack_in(folder)
                 .await
                 .context("Failed to unpack entry")?
-                .ok_or_else(|| anyhow!("Failed to unpack entry"))?);
+                .ok_or_else(|| anyhow!("Failed to unpack entry"));
         }
     }
 }

src/app/core/geoip.rs

@@ -25,7 +25,7 @@ pub struct Liwan {
     pub onboarding: core::onboarding::LiwanOnboarding,
     pub entities: core::entities::LiwanEntities,
     pub projects: core::projects::LiwanProjects,
-    pub geoip: core::geoip::LiwanGeoIP,
+    pub geoip: Arc<core::geoip::LiwanGeoIP>,
 
     pub config: Config,
 }
@@ -57,7 +57,7 @@ impl Liwan {
 
         Ok(Self {
             #[cfg(feature = "geoip")]
-            geoip: core::geoip::LiwanGeoIP::try_new(config.clone(), conn_app.clone())?,
+            geoip: core::geoip::LiwanGeoIP::try_new(config.clone(), conn_app.clone())?.into(),
 
             events: LiwanEvents::try_new(conn_events.clone(), conn_app.clone())?,
             onboarding: LiwanOnboarding::try_new(&conn_app)?,
@@ -79,7 +79,7 @@ impl Liwan {
 
         Ok(Self {
             #[cfg(feature = "geoip")]
-            geoip: core::geoip::LiwanGeoIP::try_new(config.clone(), conn_app.clone())?,
+            geoip: core::geoip::LiwanGeoIP::try_new(config.clone(), conn_app.clone())?.into(),
 
             events: LiwanEvents::try_new(conn_events.clone(), conn_app.clone())?,
             onboarding: LiwanOnboarding::try_new(&conn_app)?,