🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
improve device detection more
Bill Yang0efdbc852145
diff --git a/server/src/actions/pageviewQueue.ts b/server/src/actions/pageviewQueue.tsindex 3d4bbd2e6..c283c83fd 100644--- a/server/src/actions/pageviewQueue.ts+++ b/server/src/actions/pageviewQueue.ts@@ -60,14 +60,13 @@ class PageviewQueue {querystring: pv.querystring || "",page_title: pv.page_title || "",referrer: pv.referrer || "",- browser: pv.ua.browser.name,- operating_system: pv.ua.os.name,+ browser: pv.ua.browser.name || "",+ operating_system: pv.ua.os.name || "",language: pv.language || "",screen_width: pv.screenWidth || 0,screen_height: pv.screenHeight || 0,- device_type: getDeviceType(pv.ua),+ device_type: getDeviceType(pv.screenWidth, pv.screenHeight, pv.ua),country: geoData[pv.ipAddress]?.data?.countryIso || "",- // countryIso: geoData[pv.ip]?.data?.countryIso || null,}));console.info("bulk insert: ", processedPageviews.length);diff --git a/server/src/actions/trackPageView.ts b/server/src/actions/trackPageView.tsindex 2d63ff74e..1564cc565 100644--- a/server/src/actions/trackPageView.ts+++ b/server/src/actions/trackPageView.ts@@ -2,8 +2,6 @@ import { FastifyRequest } from "fastify";import { TrackingPayload } from "../types";import { getUserId, getDeviceType, getIpAddress } from "../utils";import crypto from "crypto";-import clickhouse from "../db/clickhouse/clickhouse";-import { DateTime } from "luxon";import { sql } from "../db/postgres/postgres";import UAParser, { UAParser as userAgentParser } from "ua-parser-js";@@ -83,7 +81,11 @@ const updateSession = async (pageviews: 1,entry_page: pageview.pathname || "",// exit_page: pageview.pathname,- device_type: getDeviceType(pageview.ua),+ device_type: getDeviceType(+ pageview.screenWidth,+ pageview.screenHeight,+ pageview.ua+ ),screen_width: pageview.screenWidth || 0,screen_height: pageview.screenHeight || 0,browser: pageview.ua.browser.name || "",diff --git a/server/src/utils.ts b/server/src/utils.tsindex 218b83c92..af3ef5602 100644--- a/server/src/utils.ts+++ b/server/src/utils.ts@@ -102,8 +102,13 @@ export const otherOS = new Set(["DragonFly",]);-export function getDeviceType(ua: UAParser.IResult): string {+export function getDeviceType(+ screenWidth: number,+ screenHeight: number,+ ua: UAParser.IResult+): string {if (ua.device) {+ console.info(ua.device.type);if (ua.device.type === "mobile") {return "Mobile";} else if (ua.device.type === "tablet") {@@ -129,9 +134,16 @@ export function getDeviceType(ua: UAParser.IResult): string {return "TV";} else if (ua.os.name && gamingOS.has(ua.os.name)) {return "Console";- } else {- return "Other";}++ const largerDimension = Math.max(screenWidth, screenHeight);+ const smallerDimension = Math.min(screenWidth, screenHeight);+ if (largerDimension > 1024) {+ return "Desktop";+ } else if (largerDimension > 768 && smallerDimension > 1024) {+ return "Tablet";+ }+ return "Mobile";}// Helper function to get IP address