Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Test (#429)

Bill Yang8dd72a8e958e
diff --git a/server/src/services/replay/trackingUtils.ts b/server/src/services/replay/trackingUtils.ts
index bcc6d665e..9c9cb20e4 100644
--- a/server/src/services/replay/trackingUtils.ts
+++ b/server/src/services/replay/trackingUtils.ts
@@ -64,11 +64,11 @@ export async function parseTrackingData(
}
return {
- browser: ua.browser.name || "Unknown",
+ browser: ua.browser.name || "",
browserVersion: ua.browser.major || "",
- operatingSystem: ua.os.name || "Unknown",
+ operatingSystem: ua.os.name || "",
operatingSystemVersion: ua.os.version || "",
- deviceType: getDeviceType(screenWidth, screenHeight, ua) || "desktop",
+ deviceType: getDeviceType(screenWidth, screenHeight, ua),
country: countryCode,
region: countryCode && regionCode ? countryCode + "-" + regionCode : "",
city: city || "",
diff --git a/server/src/utils.ts b/server/src/utils.ts
index 082b08a87..1e3d24c90 100644
--- a/server/src/utils.ts
+++ b/server/src/utils.ts
@@ -1,40 +1,125 @@
import { siteConfig } from "./lib/siteConfig.js";
import * as psl from "psl";
+const desktopOS = new Set([
+ "AIX",
+ "macOS",
+ "Windows",
+ "Linux",
+ "FreeBSD",
+ "OpenBSD",
+ "NetBSD",
+ "DragonFly",
+ "Solaris",
+ "Unix",
+ "HP-UX",
+ "QNX",
+ "BeOS",
+ "Haiku",
+ "OS/2",
+ "ArcaOS",
+ "OpenVMS",
+ "RISC OS",
+ "Plan9",
+ "Hurd",
+ "GNU",
+ "Minix",
+ "SerenityOS",
+ "GhostBSD",
+ "PC-BSD",
+ "Arch",
+ "CentOS",
+ "Debian",
+ "Deepin",
+ "elementary OS",
+ "Fedora",
+ "Gentoo",
+ "Knoppix",
+ "Kubuntu",
+ "Linpus",
+ "Linspire",
+ "Mageia",
+ "Mandriva",
+ "Manjaro",
+ "Mint",
+ "PCLinuxOS",
+ "RedHat",
+ "Sabayon",
+ "Slackware",
+ "SUSE",
+ "Ubuntu",
+ "Xubuntu",
+ "VectorLinux",
+ "Zenwalk",
+ "Chrome OS",
+ "Android-x86",
+ "Fuchsia",
+]);
+
+const mobileOS = new Set([
+ "Android",
+ "iOS",
+ "watchOS",
+ "Windows Phone",
+ "Windows Mobile",
+ "Windows CE",
+ "BlackBerry",
+ "Symbian",
+ "Palm",
+ "Bada",
+ "Firefox OS",
+ "KaiOS",
+ "MeeGo",
+ "Maemo",
+ "Sailfish",
+ "Tizen",
+ "WebOS",
+ "HarmonyOS",
+ "OpenHarmony",
+ "RIM Tablet OS",
+ "Series40",
+ "Ubuntu Touch",
+ "Joli",
+]);
+
+const tvOS = new Set([
+ "Chromecast",
+ "Chromecast Android",
+ "Chromecast Fuchsia",
+ "Chromecast Linux",
+ "Chromecast SmartSpeaker",
+ "NetTV",
+]);
+
+const gamingOS = new Set(["PlayStation", "Xbox", "Nintendo"]);
+
+const embeddedOS = new Set([
+ "Windows IoT",
+ "Contiki",
+ "Raspbian",
+ "Morph OS",
+ "Pico",
+ "NetRange",
+]);
+
export function getDeviceType(
screenWidth: number,
screenHeight: number,
ua: UAParser.IResult
): string {
- // if (ua.device) {
- // if (ua.device.type === "mobile") {
- // return "Mobile";
- // } else if (ua.device.type === "tablet") {
- // return "Tablet";
- // } else if (ua.device.type === "console") {
- // return "Console";
- // } else if (ua.device.type === "smarttv") {
- // return "TV";
- // } else if (ua.device.type === "wearable") {
- // return "Wearable";
- // } else if (ua.device.type === "embedded") {
- // return "Embedded";
- // } else if (ua.device.type === "xr") {
- // return "XR";
- // }
- // }
-
- // if (ua.os.name) {
- // if (desktopOS.has(ua.os.name)) {
- // return "Desktop";
- // } else if (mobileOS.has(ua.os.name)) {
- // return "Mobile";
- // } else if (tvOS.has(ua.os.name)) {
- // return "TV";
- // } else if (gamingOS.has(ua.os.name)) {
- // return "Console";
- // }
- // }
+ if (ua.os.name) {
+ if (desktopOS.has(ua.os.name)) {
+ return "Desktop";
+ } else if (mobileOS.has(ua.os.name)) {
+ return "Mobile";
+ } else if (tvOS.has(ua.os.name)) {
+ return "TV";
+ } else if (gamingOS.has(ua.os.name)) {
+ return "Console";
+ } else if (embeddedOS.has(ua.os.name)) {
+ return "Embedded";
+ }
+ }
const largerDimension = Math.max(screenWidth, screenHeight);
const smallerDimension = Math.min(screenWidth, screenHeight);