Skip to content

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

Add os and browser versions

Bill Yange7350a79b347
diff --git a/server/src/actions/trackPageView.ts b/server/src/actions/trackPageView.ts
index abf36ece1..4cac8c22e 100644
--- a/server/src/actions/trackPageView.ts
+++ b/server/src/actions/trackPageView.ts
@@ -17,43 +17,6 @@ type TotalPayload = TrackingPayload & {
ipAddress: string;
};
-// const insertPageview = async (pageview: TotalPayload) => {
-// try {
-// const formattedTimestamp = DateTime.fromISO(pageview.timestamp).toFormat(
-// "yyyy-MM-dd HH:mm:ss"
-// );
-// await clickhouse.insert({
-// table: "pageviews",
-// values: [
-// {
-// timestamp: formattedTimestamp,
-// session_id: pageview.sessionId,
-// user_id: pageview.userId,
-// hostname: pageview.hostname || "",
-// pathname: pageview.pathname || "",
-// querystring: pageview.querystring || "",
-// page_title: pageview.page_title || "",
-// referrer: pageview.referrer || "",
-// browser: pageview.ua.browser.name,
-// operating_system: pageview.ua.os.name,
-// language: pageview.language || "",
-// screen_width: pageview.screenWidth || 0,
-// screen_height: pageview.screenHeight || 0,
-// device_type: getDeviceType(
-// pageview.screenWidth,
-// pageview.screenHeight
-// ),
-// },
-// ],
-// format: "JSONEachRow",
-// });
-// return true;
-// } catch (error) {
-// console.error("Error inserting pageview:", error);
-// return false;
-// }
-// };
-
const getExistingSession = async (userId: string): Promise<Pageview | null> => {
const [existingSession] = await sql<Pageview[]>`
SELECT * FROM active_sessions WHERE user_id = ${userId}
@@ -89,7 +52,9 @@ const updateSession = async (
screen_width: pageview.screenWidth || 0,
screen_height: pageview.screenHeight || 0,
browser: pageview.ua.browser.name || "",
+ browser_version: pageview.ua.browser.major || "",
operating_system: pageview.ua.os.name || "",
+ operating_system_version: pageview.ua.os.version || "",
language: pageview.language || "",
referrer: pageview.referrer || "",
};
@@ -116,11 +81,6 @@ export async function trackPageView(
sessionId: existingSession?.session_id || crypto.randomUUID(),
};
- console.info(
- userAgentParser(userAgent).browser,
- userAgentParser(userAgent).os
- );
-
pageviewQueue.add(payload);
// insertPageview(payload);
updateSession(payload, existingSession);
diff --git a/server/src/db/clickhouse/clickhouse.ts b/server/src/db/clickhouse/clickhouse.ts
index 43a8e23ec..e4a849421 100644
--- a/server/src/db/clickhouse/clickhouse.ts
+++ b/server/src/db/clickhouse/clickhouse.ts
@@ -20,7 +20,9 @@ export const initializeClickhouse = async () => {
page_title String,
referrer String,
browser LowCardinality(String),
+ browser_version LowCardinality(String),
operating_system LowCardinality(String),
+ operating_system_version LowCardinality(String),
language LowCardinality(String),
country LowCardinality(String),
screen_width UInt16,