feat: store city location

Author: izadoesdev

apps/basket/src/routes/basket.ts

@@ -268,7 +268,7 @@ async function insertTrackEvent(
 		return;
 	}
 
-	const { anonymizedIP, country, region } = await getGeo(ip);
+	const { anonymizedIP, country, region, city } = await getGeo(ip);
 	const {
 		browserName,
 		browserVersion,
@@ -322,7 +322,7 @@ async function insertTrackEvent(
 		device_model: deviceModel || "",
 		country: country || "",
 		region: region || "",
-		city: "",
+		city: city || "",
 
 		screen_resolution: trackData.screen_resolution,
 		viewport_size: trackData.viewport_size,
@@ -425,7 +425,7 @@ async function logBlockedTraffic(
 				VALIDATION_LIMITS.STRING_MAX_LENGTH,
 			) || "";
 
-		const { anonymizedIP, country, region } = await getGeo(ip);
+		const { anonymizedIP, country, region, city } = await getGeo(ip);
 		const { browserName, browserVersion, osName, osVersion, deviceType } =
 			parseUserAgent(userAgent);
 
@@ -468,6 +468,7 @@ async function logBlockedTraffic(
 
 			country: country || "",
 			region: region || "",
+			city: city || "",
 			browser_name: browserName || "",
 			browser_version: browserVersion || "",
 			os_name: osName || "",

apps/basket/src/utils/ip-geo.ts

@@ -1,7 +1,5 @@
-import type { City } from "@maxmind/geoip2-node";
 import { Reader, AddressNotFoundError, BadMethodCallError } from "@maxmind/geoip2-node";
-import { readFile } from "node:fs/promises";
-import path from "node:path";
+import type { City } from "@maxmind/geoip2-node";
 import { createHash } from 'node:crypto';
 
 interface GeoIPReader extends Reader {
@@ -92,7 +90,7 @@ function isValidIp(ip: string): boolean {
 
 export async function getGeoLocation(ip: string) {
   if (!ip || ignore.includes(ip) || !isValidIp(ip)) {
-    return { country: undefined, region: undefined };
+    return { country: undefined, region: undefined, city: undefined };
   }
 
   // Lazy load database on first use
@@ -101,39 +99,41 @@ export async function getGeoLocation(ip: string) {
       await loadDatabase();
     } catch (error) {
       console.error("Failed to load database for IP lookup:", error);
-      return { country: undefined, region: undefined };
+      return { country: undefined, region: undefined, city: undefined };
     }
   }
 
   if (!reader) {
-    return { country: undefined, region: undefined };
+    return { country: undefined, region: undefined, city: undefined };
   }
 
   try {
     const response = reader.city(ip);
 
-    // Extract region data
+    // Extract region and city data
     const region = response.subdivisions?.[0]?.names?.en;
+    const city = response.city?.names?.en;
 
     return {
       country: response.country?.names?.en,
       region: region,
+      city: city,
     };
   } catch (error) {
     // Handle AddressNotFoundError specifically (IP not in database)
     if (error instanceof AddressNotFoundError) {
-      return { country: undefined, region: undefined };
+      return { country: undefined, region: undefined, city: undefined };
     }
 
     // Handle BadMethodCallError (wrong database type)
     if (error instanceof BadMethodCallError) {
       console.error("Database type mismatch - using city() method with ipinfo database");
-      return { country: undefined, region: undefined };
+      return { country: undefined, region: undefined, city: undefined };
     }
 
     // Handle other errors
     console.error("Error looking up IP:", ip, error);
-    return { country: undefined, region: undefined };
+    return { country: undefined, region: undefined, city: undefined };
   }
 }
 
@@ -173,6 +173,7 @@ export async function getGeo(ip: string) {
     anonymizedIP: anonymizeIp(ip),
     country: geo.country,
     region: geo.region,
+    city: geo.city,
   };
 }
 

packages/db/src/clickhouse/schema.ts

@@ -431,6 +431,7 @@ export interface BlockedTraffic {
   bot_name?: string;
   country?: string;
   region?: string;
+  city?: string;
   browser_name?: string;
   browser_version?: string;
   os_name?: string;
@@ -449,19 +450,19 @@ export interface AnalyticsEvent {
   anonymous_id: string;
   time: number;
   session_id: string;
-  
+
   // New fields
   event_type?: 'track' | 'error' | 'web_vitals';
   event_id?: string;
   session_start_time?: number;
   timestamp?: number;
-  
+
   // Page context
   referrer?: string;
   url: string;
   path: string;
   title?: string;
-  
+
   // Server enrichment
   ip: string;
   user_agent: string;
@@ -475,18 +476,18 @@ export interface AnalyticsEvent {
   country?: string;
   region?: string;
   city?: string;
-  
+
   // User context
   screen_resolution?: string;
   viewport_size?: string;
   language?: string;
   timezone?: string;
-  
+
   // Connection info
   connection_type?: string;
   rtt?: number;
   downlink?: number;
-  
+
   // Engagement metrics
   time_on_page?: number;
   scroll_depth?: number;
@@ -496,14 +497,14 @@ export interface AnalyticsEvent {
   is_bounce: number;
   has_exit_intent?: number;
   page_size?: number;
-  
+
   // UTM parameters
   utm_source?: string;
   utm_medium?: string;
   utm_campaign?: string;
   utm_term?: string;
   utm_content?: string;
-  
+
   // Performance metrics
   load_time?: number;
   dom_ready_time?: number;
@@ -514,32 +515,32 @@ export interface AnalyticsEvent {
   render_time?: number;
   redirect_time?: number;
   domain_lookup_time?: number;
-  
+
   // Web Vitals
   fcp?: number;
   lcp?: number;
   cls?: number;
   fid?: number;
   inp?: number;
-  
+
   // Link tracking
   href?: string;
   text?: string;
-  
+
   // Custom event value
   value?: string;
-  
+
   // Error tracking
   error_message?: string;
   error_filename?: string;
   error_lineno?: number;
   error_colno?: number;
   error_stack?: string;
   error_type?: string;
-  
+
   // Legacy properties
   properties: string;
-  
+
   // Metadata
   created_at: number;
 }
@@ -550,13 +551,13 @@ export interface AnalyticsEvent {
 export async function initClickHouseSchema() {
   try {
     console.info('Initializing ClickHouse schema...');
-    
+
     // Create the analytics database
     await clickHouse.command({
       query: CREATE_DATABASE,
     });
     console.info(`Created database: ${ANALYTICS_DATABASE}`);
-    
+
     // Create tables
     const tables = [
       { name: 'events', query: CREATE_EVENTS_TABLE },
@@ -567,14 +568,14 @@ export async function initClickHouseSchema() {
       { name: 'stripe_refunds', query: CREATE_STRIPE_REFUNDS_TABLE },
       { name: 'blocked_traffic', query: CREATE_BLOCKED_TRAFFIC_TABLE },
     ];
-    
+
     for (const table of tables) {
       await clickHouse.command({
         query: table.query,
       });
       console.info(`Created table: ${ANALYTICS_DATABASE}.${table.name}`);
     }
-    
+
     console.info('ClickHouse schema initialization completed successfully');
     return {
       success: true,