Add IP geolocation support to analytics collector (#9632)

Signed-off-by: Alexander Platov <[email protected]>

Author: SasLord

common/config/rush/pnpm-lock.yaml

@@ -79,13 +79,30 @@ function getDeviceType (type: string | undefined | null): string {
 
 export function collectEventMetadata (properties: Record<string, any> = {}): Record<string, any> {
   const trackingParams = getUrlTrackingParams()
-  const referrer = document.referrer === '' ? '$direct' : document.referrer
+
+  const referrer = (() => {
+    if (document.referrer === '') return '$direct'
+
+    try {
+      const currentDomain = window.location.hostname
+      const referrerDomain = new URL(document.referrer).hostname
+
+      if (currentDomain === referrerDomain) return '$direct'
+
+      return document.referrer
+    } catch {
+      return document.referrer
+    }
+  })()
   const referringDomain = referrer !== '$direct' ? new URL(referrer).hostname : '$direct'
 
   const now = new Date()
   const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone
   const timezoneOffset = -now.getTimezoneOffset()
 
+  const browserLanguage = navigator.language !== '' ? navigator.language : 'en-US'
+  const browserLanguagePrefix = browserLanguage.split('-')[0] !== '' ? browserLanguage.split('-')[0] : 'en'
+
   return {
     ...properties,
     $timestamp: new Date().toISOString(),
@@ -110,6 +127,8 @@ export function collectEventMetadata (properties: Record<string, any> = {}): Rec
     title: document.title,
     $timezone: timezone,
     $timezone_offset: timezoneOffset,
+    $browser_language: browserLanguage,
+    $browser_language_prefix: browserLanguagePrefix,
     ...trackingParams
   }
 }

packages/analytics-providers/src/utils.ts

@@ -427,7 +427,7 @@ export async function connect (title: string): Promise<Client | undefined> {
   }
 
   Analytics.setUser(data.social_id, data)
-  Analytics.setWorkspace(workspace.name, guestRole)
+  Analytics.setWorkspace(workspace.url, guestRole)
   Analytics.handleEvent(WorkbenchEvents.Connect)
   console.log('Logged in with account: ', me)
   setCurrentAccount(me)

plugins/workbench-resources/src/connect.ts

@@ -3,5 +3,15 @@ WORKDIR /usr/src/app
 
 COPY bundle/bundle.js ./
 
+# Create geodb directory and optionally copy MaxMind databases
+RUN mkdir -p /usr/src/geodb
+# Copy entire geodb directory
+COPY geodb/ /usr/src/geodb/
+
+# Log what databases are available
+RUN echo "GeoIP databases status:" && \
+    (ls -la /usr/src/geodb/*.mmdb 2>/dev/null && echo "MaxMind databases found") || \
+    echo "No MaxMind databases found - geolocation will be disabled"
+
 EXPOSE 4007
 CMD [ "node", "bundle.js" ]

services/analytics-collector/pod-analytics-collector/Dockerfile

@@ -34,6 +34,7 @@
     "@tsconfig/node16": "^1.0.4",
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.13",
+    "@types/maxmind": "^2.0.5",
     "@types/node": "^22.15.29",
     "@typescript-eslint/eslint-plugin": "^6.11.0",
     "@typescript-eslint/parser": "^6.11.0",
@@ -63,6 +64,7 @@
     "@hcengineering/server-token": "^0.6.11",
     "cors": "^2.8.5",
     "dotenv": "~16.0.0",
-    "express": "^4.21.2"
+    "express": "^4.21.2",
+    "maxmind": "^4.3.6"
   }
 }