Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Revert "remove postgres collect"
Brian Cao6bb61d7a53fe
diff --git a/lib/session.js b/lib/session.jsindex f44985962..d635f75a5 100644--- a/lib/session.js+++ b/lib/session.js@@ -1,13 +1,14 @@+import { parseToken } from 'next-basics';+import { validate } from 'uuid';import { uuid } from 'lib/crypto';import redis, { DELETED } from 'lib/redis';import { getClientInfo, getJsonBody } from 'lib/request';-import { parseToken } from 'next-basics';-import { getWebsiteByUuid } from 'queries';-import { validate } from 'uuid';+import { createSession, getSessionByUuid, getWebsiteByUuid } from 'queries';export async function getSession(req) {const { payload } = getJsonBody(req);const hasRedis = process.env.REDIS_URL;+ const hasClickhouse = process.env.CLICKHOUSE_URL;if (!payload) {throw new Error('Invalid request');@@ -52,17 +53,49 @@ export async function getSession(req) {let sessionId = null;let session = null;- session = {- session_id: sessionId,- session_uuid,- hostname,- browser,- os,- screen,- language,- country,- device,- };+ if (!hasClickhouse) {+ // Check if session exists+ if (hasRedis) {+ sessionId = Number(await redis.client.get(`session:${session_uuid}`));+ }++ // Check database if does not exists in Redis+ if (!sessionId) {+ session = await getSessionByUuid(session_uuid);+ sessionId = session ? session.session_id : null;+ }++ if (!sessionId) {+ try {+ session = await createSession(websiteId, {+ session_uuid,+ hostname,+ browser,+ os,+ screen,+ language,+ country,+ device,+ });+ } catch (e) {+ if (!e.message.toLowerCase().includes('unique constraint')) {+ throw e;+ }+ }+ }+ } else {+ session = {+ session_id: sessionId,+ session_uuid,+ hostname,+ browser,+ os,+ screen,+ language,+ country,+ device,+ };+ }return {website_id: websiteId,