visilog

client/src/utils/visitorTracking.js

@@ -30,10 +30,44 @@ function getOrCreateVisitorId() {
   }
 }
 
+/**
+ * A generic function to send any tracking event to the server.
+ * This aligns with the server's `/api/track` endpoint and Pydantic model.
+ * @param {string} eventType - The type of event (e.g., 'page_view', 'file_upload_start').
+ * @param {object} eventData - A dictionary of additional data related to the event.
+ */
+export async function trackEvent(eventType, eventData = {}) {
+  if (typeof window === "undefined") return;
+
+  const clientId = getOrCreateVisitorId();
+  if (!clientId) return;
+
+  const payload = {
+    client_id: clientId,
+    event_type: eventType,
+    event_data: eventData,
+  };
+
+  // This is a "fire-and-forget" request. We don't wait for the response,
+  // and we use `keepalive` to ensure the request is sent even if the user
+  // is navigating away from the page.
+  try {
+    fetch(getApiUrl("/api/track"), {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(payload),
+      keepalive: true,
+    });
+  } catch (error) {
+    console.warn("Could not send tracking event to server:", error);
+  }
+}
+
 /**
  * Records a single page visit per session to the server.
- * This function now constructs a payload that matches the server's `VisitData` model
- * and sends it to the correct `/api/track-visit` endpoint.
+ * This now uses the generic `trackEvent` function.
  */
 export async function recordVisit() {
   if (typeof window === "undefined") return;
@@ -48,30 +82,14 @@ export async function recordVisit() {
     // If sessionStorage fails, proceed anyway but might record multiple visits.
   }
 
-  const visitorId = getOrCreateVisitorId();
-  if (!visitorId) return;
-
-  // Asynchronously get location but don't block the main tracking event.
+  // Get location data to include in the event
   const location = await getCoarseLocation();
 
-  const payload = {
-    visitorId: visitorId,
+  trackEvent('page_view', {
     path: `${window.location.pathname}${window.location.search}${window.location.hash}`,
-    ts: new Date().toISOString(),
+    referrer: document.referrer,
     location: location,
-    // model and username are not available in this general context, so they will be null.
-  };
-
-  try {
-    fetch(getApiUrl("/api/track-visit"), {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(payload),
-      keepalive: true, // Good for fire-and-forget
-    });
-  } catch (error) {
-    console.warn("Could not send visit data to server:", error);
-  }
+  });
 }
 
 /**