Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

Store patch browser version for GameVault browser

Blue Mouse433cc5899508
diff --git a/backend/apps/production/src/analytics/analytics.controller.ts b/backend/apps/production/src/analytics/analytics.controller.ts
index b09988d48..0584bb425 100644
--- a/backend/apps/production/src/analytics/analytics.controller.ts
+++ b/backend/apps/production/src/analytics/analytics.controller.ts
@@ -1107,11 +1107,12 @@ export class AnalyticsController {
const ua = UAParser(userAgent, extensions)
const dv = ua.device.type || 'desktop'
const br = ua.browser.name
- const brv = this.analyticsService.extractMajorMinorVersion(
+ const brv = this.analyticsService.extractSoftwareVersion(
ua.browser.version,
+ ua.browser.name,
)
const os = ua.os.name
- const osv = this.analyticsService.extractMajorMinorVersion(ua.os.version)
+ const osv = this.analyticsService.extractSoftwareVersion(ua.os.version)
const { name, message, lineno, colno, filename } = errorDTO
@@ -1211,11 +1212,12 @@ export class AnalyticsController {
const ua = UAParser(userAgent, extensions)
const dv = ua.device.type || 'desktop'
const br = ua.browser.name
- const brv = this.analyticsService.extractMajorMinorVersion(
+ const brv = this.analyticsService.extractSoftwareVersion(
ua.browser.version,
+ ua.browser.name,
)
const os = ua.os.name
- const osv = this.analyticsService.extractMajorMinorVersion(ua.os.version)
+ const osv = this.analyticsService.extractSoftwareVersion(ua.os.version)
const [, psid] = await this.analyticsService.isUnique(
eventsDTO.pid,
@@ -1313,11 +1315,12 @@ export class AnalyticsController {
const ua = UAParser(userAgent, extensions)
const dv = ua.device.type || 'desktop'
const br = ua.browser.name
- const brv = this.analyticsService.extractMajorMinorVersion(
+ const brv = this.analyticsService.extractSoftwareVersion(
ua.browser.version,
+ ua.browser.name,
)
const os = ua.os.name
- const osv = this.analyticsService.extractMajorMinorVersion(ua.os.version)
+ const osv = this.analyticsService.extractSoftwareVersion(ua.os.version)
const transformed = trafficTransformer(
psid,
@@ -1444,11 +1447,12 @@ export class AnalyticsController {
const ua = UAParser(userAgent, extensions)
const dv = ua.device.type || 'desktop'
const br = ua.browser.name
- const brv = this.analyticsService.extractMajorMinorVersion(
+ const brv = this.analyticsService.extractSoftwareVersion(
ua.browser.version,
+ ua.browser.name,
)
const os = ua.os.name
- const osv = this.analyticsService.extractMajorMinorVersion(ua.os.version)
+ const osv = this.analyticsService.extractSoftwareVersion(ua.os.version)
const transformed = trafficTransformer(
psid,
diff --git a/backend/apps/production/src/analytics/analytics.service.ts b/backend/apps/production/src/analytics/analytics.service.ts
index a3a097dd2..acf0fb3d0 100644
--- a/backend/apps/production/src/analytics/analytics.service.ts
+++ b/backend/apps/production/src/analytics/analytics.service.ts
@@ -111,6 +111,8 @@ dayjs.extend(isSameOrBefore)
const getSessionDurationKey = (psid: string, pid: string) => `sd:${psid}:${pid}`
+const SOFTWARE_WITH_PATCH_VERSION = ['GameVault']
+
const GMT_0_TIMEZONES = [
'Atlantic/Azores',
'Etc/GMT',
@@ -2931,13 +2933,20 @@ export class AnalyticsService {
})
}
- extractMajorMinorVersion(version: string | null): string | null {
+ extractSoftwareVersion(
+ version: string | null,
+ software?: string | null,
+ ): string | null {
if (!version) return null
- const [major, minor = '0'] = version.split('.')
+ const [major, minor = '0', patch = '0'] = version.split('.')
if (!major) return null
+ if (software && SOFTWARE_WITH_PATCH_VERSION.includes(software)) {
+ return `${major}.${minor}.${patch}`
+ }
+
return `${major}.${minor}`
}
diff --git a/backend/apps/selfhosted/src/analytics/analytics.controller.ts b/backend/apps/selfhosted/src/analytics/analytics.controller.ts
index 59f5c59b7..aefde9dbc 100644
--- a/backend/apps/selfhosted/src/analytics/analytics.controller.ts
+++ b/backend/apps/selfhosted/src/analytics/analytics.controller.ts
@@ -927,11 +927,12 @@ export class AnalyticsController {
const ua = UAParser(userAgent, extensions)
const dv = ua.device.type || 'desktop'
const br = ua.browser.name
- const brv = this.analyticsService.extractMajorMinorVersion(
+ const brv = this.analyticsService.extractSoftwareVersion(
ua.browser.version,
+ ua.browser.name,
)
const os = ua.os.name
- const osv = this.analyticsService.extractMajorMinorVersion(ua.os.version)
+ const osv = this.analyticsService.extractSoftwareVersion(ua.os.version)
const { city, region, country } = getGeoDetails(ip, eventsDTO.tz)
@@ -1031,11 +1032,12 @@ export class AnalyticsController {
const ua = UAParser(userAgent, extensions)
const dv = ua.device.type || 'desktop'
const br = ua.browser.name
- const brv = this.analyticsService.extractMajorMinorVersion(
+ const brv = this.analyticsService.extractSoftwareVersion(
ua.browser.version,
+ ua.browser.name,
)
const os = ua.os.name
- const osv = this.analyticsService.extractMajorMinorVersion(ua.os.version)
+ const osv = this.analyticsService.extractSoftwareVersion(ua.os.version)
const transformed = trafficTransformer(
psid,
@@ -1160,11 +1162,12 @@ export class AnalyticsController {
const ua = UAParser(userAgent, extensions)
const dv = ua.device.type || 'desktop'
const br = ua.browser.name
- const brv = this.analyticsService.extractMajorMinorVersion(
+ const brv = this.analyticsService.extractSoftwareVersion(
ua.browser.version,
+ ua.browser.name,
)
const os = ua.os.name
- const osv = this.analyticsService.extractMajorMinorVersion(ua.os.version)
+ const osv = this.analyticsService.extractSoftwareVersion(ua.os.version)
const { city, region, country } = getGeoDetails(ip, null)
@@ -1451,11 +1454,12 @@ export class AnalyticsController {
const ua = UAParser(userAgent, extensions)
const dv = ua.device.type || 'desktop'
const br = ua.browser.name
- const brv = this.analyticsService.extractMajorMinorVersion(
+ const brv = this.analyticsService.extractSoftwareVersion(
ua.browser.version,
+ ua.browser.name,
)
const os = ua.os.name
- const osv = this.analyticsService.extractMajorMinorVersion(ua.os.version)
+ const osv = this.analyticsService.extractSoftwareVersion(ua.os.version)
const { name, message, lineno, colno, filename } = errorDTO
diff --git a/backend/apps/selfhosted/src/analytics/analytics.service.ts b/backend/apps/selfhosted/src/analytics/analytics.service.ts
index b8a259f44..b74af8b50 100644
--- a/backend/apps/selfhosted/src/analytics/analytics.service.ts
+++ b/backend/apps/selfhosted/src/analytics/analytics.service.ts
@@ -100,6 +100,8 @@ dayjs.extend(isSameOrBefore)
const getSessionDurationKey = (psid: string, pid: string) => `sd:${psid}:${pid}`
+const SOFTWARE_WITH_PATCH_VERSION = ['GameVault']
+
const GMT_0_TIMEZONES = [
'Atlantic/Azores',
'Etc/GMT',
@@ -2527,13 +2529,20 @@ export class AnalyticsService {
})
}
- extractMajorMinorVersion(version: string | null): string | null {
+ extractSoftwareVersion(
+ version: string | null,
+ software?: string | null,
+ ): string | null {
if (!version) return null
- const [major, minor = '0'] = version.split('.')
+ const [major, minor = '0', patch = '0'] = version.split('.')
if (!major) return null
+ if (software && SOFTWARE_WITH_PATCH_VERSION.includes(software)) {
+ return `${major}.${minor}.${patch}`
+ }
+
return `${major}.${minor}`
}