fix: various smaller bugfixes

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

Author: explodingcamera

scripts/deploy-demo.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+cd "$(dirname "$0")" && cd ..
+cargo zigbuild --release --target x86_64-unknown-linux-musl
+rsync -avzP target/x86_64-unknown-linux-musl/release/liwan pegasus:~/.local/bin/liwan

src/web/mod.rs

@@ -52,11 +52,11 @@ fn save_spec() -> Result<()> {
 }
 
 pub fn create_router(app: Liwan, events: Sender<Event>) -> impl IntoEndpoint {
-    let handle_events =
-        event_service().with(Cors::new().allow_origin("*").allow_method("POST").allow_credentials(false));
+    let handle_events = event_service().with(Cors::new().allow_method("POST").allow_credentials(false));
 
     let serve_script = EmbeddedFileEndpoint::<Script>::new("script.min.js")
-        .with(Cors::new().allow_origin("*").allow_method("GET").allow_credentials(false));
+        .with(Cors::new().allow_method("GET").allow_credentials(false))
+        .with(SetHeader::new().appending("Content-Type", "application/javascript"));
 
     let headers = SetHeader::new()
         .appending("X-Frame-Options", "DENY")

src/web/routes/dashboard.rs

@@ -4,6 +4,7 @@ use crate::utils::validate::{self, can_access_project};
 use crate::web::session::SessionUser;
 use crate::web::webext::{http_bail, ApiResult, PoemErrExt};
 
+use maxminddb::geoip2::city;
 use poem::http::StatusCode;
 use poem::web::Data;
 use poem_openapi::param::Path;
@@ -169,6 +170,7 @@ impl DashboardAPI {
                         .split_at_checked(2)
                         .map(|(a, b)| (Some(a.to_string()), Some(b.to_string())))
                         .unwrap_or((None, None));
+                    let city = city.filter(|city| !city.is_empty());
                     data.push(DimensionTableRow { dimension_value: key, value, display_name: city, icon: country });
                 }
                 _ => {

src/web/routes/event.rs

@@ -12,6 +12,7 @@ use poem::web::{headers, Data, RealIp, TypedHeader};
 use poem_openapi::payload::Json;
 use poem_openapi::{Object, OpenApi};
 use std::cell::RefCell;
+use std::net::{IpAddr, Ipv4Addr};
 use std::str::FromStr;
 
 #[derive(Object)]
@@ -66,13 +67,15 @@ impl EventApi {
         };
 
         let (country, city) = match (&app.geoip, ip) {
-            (Some(geoip), Some(ip)) => match geoip.lookup(&ip) {
+            (Some(geoip), Some(ip)) => match geoip.lookup(&IpAddr::V4(Ipv4Addr::new(46, 114, 18, 156))) {
                 Ok(lookup) => (lookup.country_code, lookup.city),
                 Err(_) => (None, None),
             },
             _ => (None, None),
         };
 
+        tracing::error!("country: {:?}, city: {:?}", country, city);
+
         let event = Event {
             visitor_id,
             referrer,

tracker/script.d.ts

@@ -24,6 +24,13 @@ declare module "script" {
          * Required in server-side environments.
          */
         endpoint?: string;
+        /**
+         * The entity that the event is associated with.
+         *
+         * If not provided, the `data-entity` attribute will be used.
+         * Required for custom events.
+         */
+        entity?: string;
     };
     /**
      * Sends an event to the Liwan API.

tracker/script.min.js

@@ -48,14 +48,15 @@ let entity: string | null = null;
 let referrer: string | null = null;
 
 if (typeof document !== "undefined") {
-	scriptEl = document.currentScript as HTMLScriptElement;
+	scriptEl = document.querySelector(`script[src^="${import.meta.url}"]`);
 	endpoint = scriptEl?.getAttribute("data-api") || (scriptEl && `${new URL(scriptEl.src).origin}/api/event`);
 	entity = scriptEl?.getAttribute("data-entity") || null;
 	referrer = document.referrer;
 }
 
 const LOCALHOST_REGEX = /^localhost$|^127(\.[0-9]+){0,2}\.[0-9]+$|^\[::1?\]$/;
-const ignoreEvent = (reason: string) => console.info(`[liwan]: ignoring event: ${reason}`);
+const log = (message: string) => console.info(`[liwan]: ${message}`);
+const ignore = (reason: string) => log(`Ignoring event: ${reason}`);
 
 /**
  * Sends an event to the Liwan API.
@@ -80,10 +81,9 @@ const ignoreEvent = (reason: string) => console.info(`[liwan]: ignoring event: $
 export async function event(name = "pageview", options?: EventOptions) {
 	if (typeof window === "undefined" && !options?.endpoint)
 		return Promise.reject(new Error("endpoint is required in server-side environments"));
-	if (typeof localStorage !== "undefined" && localStorage.getItem("disable-liwan"))
-		return ignoreEvent("localStorage flag");
-	if (LOCALHOST_REGEX.test(location.hostname) || location.protocol === "file:") return ignoreEvent("localhost");
-	if (!endpoint && !options?.endpoint) return ignoreEvent("no endpoint");
+	if (typeof localStorage !== "undefined" && localStorage.getItem("disable-liwan")) return ignore("localStorage flag");
+	if (LOCALHOST_REGEX.test(location.hostname) || location.protocol === "file:") return ignore("localhost");
+	if (!endpoint && !options?.endpoint) return ignore("no endpoint");
 
 	// biome-ignore lint/style/noNonNullAssertion: we know that endpoint is not null
 	return fetch((options?.endpoint || endpoint)!, {
@@ -96,7 +96,7 @@ export async function event(name = "pageview", options?: EventOptions) {
 			url: options?.url || `${location.origin}${location.pathname}`,
 		}),
 	}).then((response) => {
-		if (!response.ok) console.error("[liwan]: failed to send event: ", response);
+		if (!response.ok) log(`Failed to send event: ${response.statusText}`);
 		return { status: response.status };
 	});
 }

tracker/script.ts

@@ -239,7 +239,7 @@ const dimensionLabels: Record<Dimension, (value: DimensionTableRow) => React.Rea
 		<>
 			{countryCodeToFlag(value.icon || "XX")}
 			&nbsp;
-			{value.displayName ?? value.dimensionValue ?? "Unknown"}
+			{value.displayName ?? "Unknown"}
 		</>
 	),
 	referrer: (value) => (

web/src/components/dimensions/index.tsx

@@ -201,7 +201,7 @@ export const ProjectOverview = ({
 							title="Total Views"
 							value={stats?.stats.totalViews}
 							prevValue={stats?.statsPrev.totalViews}
-							metric={metric}
+							metric={"views"}
 							onSelect={() => setMetric("views")}
 							selected={metric === "views"}
 						/>
@@ -210,23 +210,23 @@ export const ProjectOverview = ({
 							title="Total Sessions"
 							value={stats?.stats.totalSessions}
 							prevValue={stats?.statsPrev.totalSessions}
-							metric={metric}
+							metric={"sessions"}
 							onSelect={() => setMetric("sessions")}
 							selected={metric === "sessions"}
 						/>
 						<Stat
 							title="Unique Visitors"
 							value={stats?.stats.uniqueVisitors}
 							prevValue={stats?.statsPrev.uniqueVisitors}
-							metric={metric}
+							metric={"unique_visitors"}
 							onSelect={() => setMetric("unique_visitors")}
 							selected={metric === "unique_visitors"}
 						/>
 						<Stat
 							title="Avg. Views Per Session"
 							value={stats?.stats.avgViewsPerSession}
 							prevValue={stats?.statsPrev.avgViewsPerSession}
-							metric={metric}
+							metric={"avg_views_per_session"}
 							onSelect={() => setMetric("avg_views_per_session")}
 							selected={metric === "avg_views_per_session"}
 						/>