fix: configuration issues

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

Author: explodingcamera

.github/workflows/container.yaml

@@ -40,6 +40,7 @@ jobs:
             type=semver,pattern={{version}},value=${{ steps.semver.outputs.SEMVER_VERSION }}
             type=semver,pattern={{major}}.{{minor}},value=${{ steps.semver.outputs.SEMVER_VERSION }}
             type=semver,pattern={{major}},value=${{ steps.semver.outputs.SEMVER_VERSION }}
+            type=edge,branch=main
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:

src/app/core/geoip.rs

@@ -142,7 +142,8 @@ impl LiwanGeoIP {
             let reader = maxminddb::Reader::open_readfile(self.path.clone())?;
             *self.reader.write().unwrap() = Some(reader);
 
-            tracing::info!(path = ?self.path, "GeoIP database updated successfully");
+            let path = std::fs::canonicalize(&self.path)?;
+            tracing::info!(path = ?path, "GeoIP database updated successfully");
         }
 
         self.downloading.store(false, Ordering::Release);
@@ -234,6 +235,5 @@ async fn download_maxmind_db(edition: &str, account_id: &str, license_key: &str)
         }
     }
 
-    tracing::info!(file = ?file, "GeoIP database downloaded successfully");
     Ok(file)
 }

src/config.rs

@@ -40,6 +40,10 @@ pub struct Config {
     pub geoip: Option<GeoIpConfig>,
 }
 
+pub fn default_maxmind_edition() -> Option<String> {
+    Some("GeoLite2-City".to_string())
+}
+
 impl Default for Config {
     fn default() -> Self {
         Self { base_url: default_base(), port: default_port(), data_dir: default_data_dir(), geoip: None }
@@ -49,11 +53,33 @@ impl Default for Config {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct GeoIpConfig {
     pub maxmind_db_path: Option<String>,
+    #[serde(deserialize_with = "deserialize_option_string_from_number")]
     pub maxmind_account_id: Option<String>,
     pub maxmind_license_key: Option<String>,
+    #[serde(default = "default_maxmind_edition")]
     pub maxmind_edition: Option<String>,
 }
 
+pub fn deserialize_option_string_from_number<'de, D>(deserializer: D) -> Result<Option<String>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    #[derive(Deserialize)]
+    #[serde(untagged)]
+    enum StringOrNumber {
+        String(String),
+        Number(i64),
+        Float(f64),
+    }
+
+    match Option::<StringOrNumber>::deserialize(deserializer)? {
+        Some(StringOrNumber::String(s)) => Ok(Some(s)),
+        Some(StringOrNumber::Number(i)) => Ok(Some(i.to_string())),
+        Some(StringOrNumber::Float(f)) => Ok(Some(f.to_string())),
+        None => Ok(None),
+    }
+}
+
 pub static DEFAULT_CONFIG: &str = include_str!("../config.example.toml");
 
 impl Config {
@@ -81,7 +107,7 @@ impl Config {
             .merge(Env::raw().filter_map(|key| match key {
                 k if !k.starts_with("LIWAN_") => None,
                 k if k.starts_with("LIWAN_MAXMIND_") => Some(format!("geoip.maxmind_{}", &k[14..]).into()),
-                k => Some(k[6..].as_str().to_lowercase().replace("_", ".").into()),
+                k => Some(k[6..].as_str().to_lowercase().into()),
             }))
             .extract()?;
 
@@ -159,6 +185,39 @@ mod test {
         });
     }
 
+    #[test]
+    fn test_default_geoip() {
+        Jail::expect_with(|jail| {
+            jail.create_file(
+                "liwan3.config.toml",
+                r#"
+                base_url = "http://localhost:8081"
+                data_dir = "./liwan-test-data"
+                [geoip]
+                maxmind_db_path = "test2"
+            "#,
+            )?;
+
+            let config = Config::load(Some("liwan3.config.toml".into())).expect("failed to load config");
+            assert_eq!(config.geoip.unwrap().maxmind_edition, Some("GeoLite2-City".to_string()));
+            Ok(())
+        });
+    }
+
+    #[test]
+    fn test_env() {
+        Jail::expect_with(|jail| {
+            jail.set_env("LIWAN_DATA_DIR", "/data");
+            jail.set_env("LIWAN_BASE_URL", "https://example.com");
+            jail.set_env("LIWAN_MAXMIND_ACCOUNT_ID", 123);
+            let config = Config::load(None).expect("failed to load config");
+            assert_eq!(config.data_dir, "/data");
+            assert_eq!(config.base_url, "https://example.com");
+            assert_eq!(config.geoip.unwrap().maxmind_account_id, Some("123".to_string()));
+            Ok(())
+        });
+    }
+
     #[test]
     fn test_no_config() {
         Jail::expect_with(|_jail| {

tracker/README.md

@@ -74,7 +74,7 @@ export type EventOptions = {
  * @throws If {@link EventOptions.endpoint} is not provided in server-side environments.
  */
 export function event(
-  name?: string,
+  name?: string, // = "pageview"
   options?: EventOptions
 ): Promise<void | {
   status: number;

tracker/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "liwan-tracker",
-	"version": "0.1.0-beta.1",
+	"version": "0.1.0-beta.2",
 	"homepage": "https://liwan.dev",
 	"repository": {
 		"type": "git",