📈 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!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
Session duration calculation fixes
Blue Mouse9579682d7217
diff --git a/backend/apps/cloud/src/analytics/analytics.service.ts b/backend/apps/cloud/src/analytics/analytics.service.tsindex 17ca64072..53d053f55 100644--- a/backend/apps/cloud/src/analytics/analytics.service.ts+++ b/backend/apps/cloud/src/analytics/analytics.service.ts@@ -1246,11 +1246,10 @@ export class AnalyticsService {try {const query = `- SELECT firstSeen- FROM sessions FINAL+ SELECT minOrNull(firstSeen) AS firstSeen+ FROM sessionsWHERE psid = {psid:UInt64}AND pid = {pid:FixedString(12)}- LIMIT 1`const { data } = await clickhouse@@ -1260,7 +1259,7 @@ export class AnalyticsService {}).then(resultSet =>resultSet.json<{- firstSeen: string+ firstSeen: string | null}>(),)@@ -1278,7 +1277,6 @@ export class AnalyticsService {lastSeen: now,},],- clickhouse_settings: { async_insert: 1 },})} catch (error) {console.error('Failed to record session:', error)@@ -1324,11 +1322,10 @@ export class AnalyticsService {): Promise<number | null> {try {const query = `- SELECT dateDiff('second', firstSeen, lastSeen) as duration- FROM sessions FINAL+ SELECT dateDiff('second', min(firstSeen), max(lastSeen)) as duration+ FROM sessionsWHERE psid = {psid:UInt64}AND pid = {pid:FixedString(12)}- LIMIT 1`const { data } = await clickhouse@@ -1840,9 +1837,15 @@ export class AnalyticsService {${filtersQuery}),duration_avg AS (- SELECT avg(dateDiff('second', firstSeen, lastSeen)) as sdur- FROM sessions FINAL- WHERE pid = {pid:FixedString(12)}+ SELECT avgOrNull(duration) as sdur+ FROM (+ SELECT+ psid,+ dateDiff('second', min(firstSeen), max(lastSeen)) as duration+ FROM sessions+ WHERE pid = {pid:FixedString(12)}+ GROUP BY psid+ ))SELECTanalytics_counts.*,@@ -1863,9 +1866,15 @@ export class AnalyticsService {${filtersQuery}),duration_avg AS (- SELECT avg(dateDiff('second', firstSeen, lastSeen)) as sdur- FROM sessions FINAL- WHERE pid = {pid:FixedString(12)}+ SELECT avgOrNull(duration) as sdur+ FROM (+ SELECT+ psid,+ dateDiff('second', min(firstSeen), max(lastSeen)) as duration+ FROM sessions+ WHERE pid = {pid:FixedString(12)}+ GROUP BY psid+ ))SELECTanalytics_counts.*,@@ -1962,15 +1971,22 @@ export class AnalyticsService {${filtersQuery}),duration_avg AS (- SELECT avg(dateDiff('second', firstSeen, lastSeen)) as sdur- FROM sessions FINAL- WHERE pid = {pid:FixedString(12)}- AND psid IN (- SELECT DISTINCT psid- FROM analytics+ SELECT avgOrNull(duration) as sdur+ FROM (+ SELECT+ psid,+ dateDiff('second', min(firstSeen), max(lastSeen)) as duration+ FROM sessionsWHERE pid = {pid:FixedString(12)}- AND created BETWEEN {groupFromUTC:String} AND {groupToUTC:String}- ${filtersQuery}+ AND psid IN (+ SELECT DISTINCT psid+ FROM analytics+ WHERE pid = {pid:FixedString(12)}+ AND psid IS NOT NULL+ AND created BETWEEN {groupFromUTC:String} AND {groupToUTC:String}+ ${filtersQuery}+ )+ GROUP BY psid))SELECT@@ -1993,15 +2009,22 @@ export class AnalyticsService {${filtersQuery}),duration_avg AS (- SELECT avg(dateDiff('second', firstSeen, lastSeen)) as sdur- FROM sessions FINAL- WHERE pid = {pid:FixedString(12)}- AND psid IN (- SELECT DISTINCT psid- FROM analytics+ SELECT avgOrNull(duration) as sdur+ FROM (+ SELECT+ psid,+ dateDiff('second', min(firstSeen), max(lastSeen)) as duration+ FROM sessionsWHERE pid = {pid:FixedString(12)}- AND created BETWEEN {periodSubtracted:String} AND {groupFromUTC:String}- ${filtersQuery}+ AND psid IN (+ SELECT DISTINCT psid+ FROM analytics+ WHERE pid = {pid:FixedString(12)}+ AND psid IS NOT NULL+ AND created BETWEEN {periodSubtracted:String} AND {groupFromUTC:String}+ ${filtersQuery}+ )+ GROUP BY psid))SELECT@@ -2025,15 +2048,22 @@ export class AnalyticsService {${filtersQuery}),duration_avg AS (- SELECT avg(dateDiff('second', firstSeen, lastSeen)) as sdur- FROM sessions FINAL- WHERE pid = {pid:FixedString(12)}- AND psid IN (- SELECT DISTINCT psid- FROM customEV+ SELECT avgOrNull(duration) as sdur+ FROM (+ SELECT+ psid,+ dateDiff('second', min(firstSeen), max(lastSeen)) as duration+ FROM sessionsWHERE pid = {pid:FixedString(12)}- AND created BETWEEN {groupFromUTC:String} AND {groupToUTC:String}- ${filtersQuery}+ AND psid IN (+ SELECT DISTINCT psid+ FROM customEV+ WHERE pid = {pid:FixedString(12)}+ AND psid IS NOT NULL+ AND created BETWEEN {groupFromUTC:String} AND {groupToUTC:String}+ ${filtersQuery}+ )+ GROUP BY psid))SELECT@@ -2055,15 +2085,22 @@ export class AnalyticsService {${filtersQuery}),duration_avg AS (- SELECT avg(dateDiff('second', firstSeen, lastSeen)) as sdur- FROM sessions FINAL- WHERE pid = {pid:FixedString(12)}- AND psid IN (- SELECT DISTINCT psid- FROM customEV+ SELECT avgOrNull(duration) as sdur+ FROM (+ SELECT+ psid,+ dateDiff('second', min(firstSeen), max(lastSeen)) as duration+ FROM sessionsWHERE pid = {pid:FixedString(12)}- AND created BETWEEN {periodSubtracted:String} AND {groupFromUTC:String}- ${filtersQuery}+ AND psid IN (+ SELECT DISTINCT psid+ FROM customEV+ WHERE pid = {pid:FixedString(12)}+ AND psid IS NOT NULL+ AND created BETWEEN {periodSubtracted:String} AND {groupFromUTC:String}+ ${filtersQuery}+ )+ GROUP BY psid))SELECT@@ -2902,9 +2939,10 @@ export class AnalyticsService {SELECTpid,psid,- dateDiff('second', firstSeen, lastSeen) as duration- FROM sessions FINAL+ dateDiff('second', min(firstSeen), max(lastSeen)) as duration+ FROM sessionsWHERE pid = {pid:FixedString(12)}+ GROUP BY pid, psid) as sessions_dataON subquery.pid = sessions_data.pidAND subquery.psid = sessions_data.psid@@ -4486,12 +4524,17 @@ export class AnalyticsService {const querySessionDuration = `SELECT- avg(dateDiff('second', firstSeen, lastSeen)) as duration- FROM sessions FINAL- WHERE- pid = {pid:FixedString(12)}- AND psid IS NOT NULL- AND toString(psid) = {psid:String}+ dateDiff('second', firstSeen, lastSeen) as duration,+ lastSeen+ FROM (+ SELECT+ minOrNull(firstSeen) AS firstSeen,+ maxOrNull(lastSeen) AS lastSeen+ FROM sessions+ WHERE+ pid = {pid:FixedString(12)}+ AND psid = toUInt64OrNull({psid:String})+ )`const paramsData = {@@ -4519,17 +4562,48 @@ export class AnalyticsService {.then(({ data }) => data))[0] as any- const { duration = 0 } =- (- await clickhouse- .query({- query: querySessionDuration,- query_params: paramsData.params,- })- .then(resultSet =>- resultSet.json<{ duration: number }>().then(({ data }) => data),- )- )[0] || {}+ let duration: number = 0++ const { data: durationRows } = await clickhouse+ .query({+ query: querySessionDuration,+ query_params: paramsData.params,+ })+ .then(resultSet =>+ resultSet.json<{+ duration: number | null+ lastSeen: string | null+ }>(),+ )++ const fromSessionsTable = durationRows[0]?.duration ?? null+ const lastSeen = durationRows[0]?.lastSeen ?? null+ if (typeof fromSessionsTable === 'number' && fromSessionsTable > 0) {+ duration = fromSessionsTable+ }++ // If sessions table exists but `firstSeen` was historically broken (e.g. firstSeen == lastSeen),+ // we can still approximate using the first recorded event time + the session's lastSeen (which+ // may include heartbeat updates and thus be later than the last pageflow event).+ if (!duration && lastSeen && Array.isArray(pages) && pages.length >= 1) {+ const first = dayjs(pages[0].created)+ const diffSeconds = dayjs(lastSeen).diff(first, 'second')+ if (diffSeconds > 0) {+ duration = diffSeconds+ }+ }++ // Last resort: if we have at least 2 events in the pageflow, compute duration+ // from the time between the first and last events. This prevents "N/A" durations+ // when the sessions table doesn't have usable data.+ if (!duration && Array.isArray(pages) && pages.length >= 2) {+ const first = dayjs(pages[0].created)+ const last = dayjs(pages[pages.length - 1].created)+ const diffSeconds = last.diff(first, 'second')+ if (diffSeconds > 0) {+ duration = diffSeconds+ }+ }if (!details) {const querySessionDetailsBackup = `@@ -4711,9 +4785,9 @@ export class AnalyticsService {SELECTCAST(psid, 'String') AS psidCasted,pid,- avg(dateDiff('second', firstSeen, lastSeen)) as avg_duration,- any(profileId) as profileId- FROM sessions FINAL+ dateDiff('second', min(firstSeen), max(lastSeen)) as avg_duration,+ argMax(profileId, lastSeen) as profileId+ FROM sessionsWHERE pid = {pid:FixedString(12)}GROUP BY psidCasted, pid),@@ -5238,8 +5312,8 @@ export class AnalyticsService {SELECTCAST(psid, 'String') AS psidCasted,pid,- avg(dateDiff('second', firstSeen, lastSeen)) as avg_duration- FROM sessions FINAL+ dateDiff('second', min(firstSeen), max(lastSeen)) as avg_duration+ FROM sessionsWHERE pid = {pid:FixedString(12)}AND profileId = {profileId:String}GROUP BY psidCasted, piddiff --git a/backend/apps/community/src/analytics/analytics.service.ts b/backend/apps/community/src/analytics/analytics.service.tsindex a7536f823..066a03702 100644--- a/backend/apps/community/src/analytics/analytics.service.ts+++ b/backend/apps/community/src/analytics/analytics.service.ts@@ -1253,11 +1253,10 @@ export class AnalyticsService {try {const query = `- SELECT firstSeen- FROM sessions FINAL+ SELECT minOrNull(firstSeen) AS firstSeen+ FROM sessionsWHERE psid = {psid:UInt64}AND pid = {pid:FixedString(12)}- LIMIT 1`const { data } = await clickhouse@@ -1267,7 +1266,7 @@ export class AnalyticsService {}).then(resultSet =>resultSet.json<{- firstSeen: string+ firstSeen: string | null}>(),)@@ -1285,7 +1284,6 @@ export class AnalyticsService {lastSeen: now,},],- clickhouse_settings: { async_insert: 1 },})} catch (error) {this.logger.error('Failed to record session:', error)@@ -1512,9 +1510,15 @@ export class AnalyticsService {${filtersQuery}),duration_avg AS (- SELECT avg(dateDiff('second', firstSeen, lastSeen)) as sdur- FROM sessions FINAL- WHERE pid = {pid:FixedString(12)}+ SELECT avgOrNull(duration) as sdur+ FROM (+ SELECT+ psid,+ dateDiff('second', min(firstSeen), max(lastSeen)) as duration+ FROM sessions+ WHERE pid = {pid:FixedString(12)}+ GROUP BY psid+ ))SELECTanalytics_counts.*,@@ -1535,9 +1539,15 @@ export class AnalyticsService {${filtersQuery}),duration_avg AS (- SELECT avg(dateDiff('second', firstSeen, lastSeen)) as sdur- FROM sessions FINAL- WHERE pid = {pid:FixedString(12)}+ SELECT avgOrNull(duration) as sdur+ FROM (+ SELECT+ psid,+ dateDiff('second', min(firstSeen), max(lastSeen)) as duration+ FROM sessions+ WHERE pid = {pid:FixedString(12)}+ GROUP BY psid+ ))SELECTanalytics_counts.*,@@ -1634,15 +1644,22 @@ export class AnalyticsService {${filtersQuery}),duration_avg AS (- SELECT avg(dateDiff('second', firstSeen, lastSeen)) as sdur- FROM sessions FINAL- WHERE pid = {pid:FixedString(12)}- AND psid IN (- SELECT DISTINCT psid- FROM analytics+ SELECT avgOrNull(duration) as sdur+ FROM (+ SELECT+ psid,+ dateDiff('second', min(firstSeen), max(lastSeen)) as duration+ FROM sessionsWHERE pid = {pid:FixedString(12)}- AND created BETWEEN {groupFromUTC:String} AND {groupToUTC:String}- ${filtersQuery}+ AND psid IN (+ SELECT DISTINCT psid+ FROM analytics+ WHERE pid = {pid:FixedString(12)}+ AND psid IS NOT NULL+ AND created BETWEEN {groupFromUTC:String} AND {groupToUTC:String}+ ${filtersQuery}+ )+ GROUP BY psid))SELECT@@ -1665,15 +1682,22 @@ export class AnalyticsService {${filtersQuery}),duration_avg AS (- SELECT avg(dateDiff('second', firstSeen, lastSeen)) as sdur- FROM sessions FINAL- WHERE pid = {pid:FixedString(12)}- AND psid IN (- SELECT DISTINCT psid- FROM analytics+ SELECT avgOrNull(duration) as sdur+ FROM (+ SELECT+ psid,+ dateDiff('second', min(firstSeen), max(lastSeen)) as duration+ FROM sessionsWHERE pid = {pid:FixedString(12)}- AND created BETWEEN {periodSubtracted:String} AND {groupFromUTC:String}- ${filtersQuery}+ AND psid IN (+ SELECT DISTINCT psid+ FROM analytics+ WHERE pid = {pid:FixedString(12)}+ AND psid IS NOT NULL+ AND created BETWEEN {periodSubtracted:String} AND {groupFromUTC:String}+ ${filtersQuery}+ )+ GROUP BY psid))SELECT@@ -1697,15 +1721,22 @@ export class AnalyticsService {${filtersQuery}),duration_avg AS (- SELECT avg(dateDiff('second', firstSeen, lastSeen)) as sdur- FROM sessions FINAL- WHERE pid = {pid:FixedString(12)}- AND psid IN (- SELECT DISTINCT psid- FROM customEV+ SELECT avgOrNull(duration) as sdur+ FROM (+ SELECT+ psid,+ dateDiff('second', min(firstSeen), max(lastSeen)) as duration+ FROM sessionsWHERE pid = {pid:FixedString(12)}- AND created BETWEEN {groupFromUTC:String} AND {groupToUTC:String}- ${filtersQuery}+ AND psid IN (+ SELECT DISTINCT psid+ FROM customEV+ WHERE pid = {pid:FixedString(12)}+ AND psid IS NOT NULL+ AND created BETWEEN {groupFromUTC:String} AND {groupToUTC:String}+ ${filtersQuery}+ )+ GROUP BY psid))SELECT@@ -1727,15 +1758,22 @@ export class AnalyticsService {${filtersQuery}),duration_avg AS (- SELECT avg(dateDiff('second', firstSeen, lastSeen)) as sdur- FROM sessions FINAL- WHERE pid = {pid:FixedString(12)}- AND psid IN (- SELECT DISTINCT psid- FROM customEV+ SELECT avgOrNull(duration) as sdur+ FROM (+ SELECT+ psid,+ dateDiff('second', min(firstSeen), max(lastSeen)) as duration+ FROM sessionsWHERE pid = {pid:FixedString(12)}- AND created BETWEEN {periodSubtracted:String} AND {groupFromUTC:String}- ${filtersQuery}+ AND psid IN (+ SELECT DISTINCT psid+ FROM customEV+ WHERE pid = {pid:FixedString(12)}+ AND psid IS NOT NULL+ AND created BETWEEN {periodSubtracted:String} AND {groupFromUTC:String}+ ${filtersQuery}+ )+ GROUP BY psid))SELECT@@ -2513,9 +2551,10 @@ export class AnalyticsService {SELECTpid,psid,- dateDiff('second', firstSeen, lastSeen) as duration- FROM sessions FINAL+ dateDiff('second', min(firstSeen), max(lastSeen)) as duration+ FROM sessionsWHERE pid = {pid:FixedString(12)}+ GROUP BY pid, psid) as sessions_dataON subquery.pid = sessions_data.pidAND subquery.psid = sessions_data.psid@@ -3903,11 +3942,17 @@ export class AnalyticsService {const querySessionDuration = `SELECT- avg(dateDiff('second', firstSeen, lastSeen)) as duration- FROM sessions FINAL- WHERE- pid = {pid:FixedString(12)}- AND CAST(psid, 'String') = {psid:String}+ dateDiff('second', firstSeen, lastSeen) as duration,+ lastSeen+ FROM (+ SELECT+ minOrNull(firstSeen) AS firstSeen,+ maxOrNull(lastSeen) AS lastSeen+ FROM sessions+ WHERE+ pid = {pid:FixedString(12)}+ AND psid = toUInt64OrNull({psid:String})+ )`const paramsData = {@@ -3935,17 +3980,42 @@ export class AnalyticsService {.then(({ data }) => data))[0] as any- const { duration = 0 } =- (- await clickhouse- .query({- query: querySessionDuration,- query_params: paramsData.params,- })- .then(resultSet =>- resultSet.json<{ duration: number }>().then(({ data }) => data),- )- )[0] || {}+ let duration: number = 0++ const { data: durationRows } = await clickhouse+ .query({+ query: querySessionDuration,+ query_params: paramsData.params,+ })+ .then(resultSet =>+ resultSet.json<{+ duration: number | null+ lastSeen: string | null+ }>(),+ )++ const fromSessionsTable = durationRows[0]?.duration ?? null+ const lastSeen = durationRows[0]?.lastSeen ?? null+ if (typeof fromSessionsTable === 'number' && fromSessionsTable > 0) {+ duration = fromSessionsTable+ }++ if (!duration && lastSeen && Array.isArray(pages) && pages.length >= 1) {+ const first = dayjs(pages[0].created)+ const diffSeconds = dayjs(lastSeen).diff(first, 'second')+ if (diffSeconds > 0) {+ duration = diffSeconds+ }+ }++ if (!duration && Array.isArray(pages) && pages.length >= 2) {+ const first = dayjs(pages[0].created)+ const last = dayjs(pages[pages.length - 1].created)+ const diffSeconds = last.diff(first, 'second')+ if (diffSeconds > 0) {+ duration = diffSeconds+ }+ }if (!details) {const querySessionDetailsBackup = `@@ -4106,9 +4176,9 @@ export class AnalyticsService {SELECTCAST(psid, 'String') AS psidCasted,pid,- avg(dateDiff('second', firstSeen, lastSeen)) as avg_duration,- any(profileId) as profileId- FROM sessions FINAL+ dateDiff('second', min(firstSeen), max(lastSeen)) as avg_duration,+ argMax(profileId, lastSeen) as profileId+ FROM sessionsWHERE pid = {pid:FixedString(12)}GROUP BY psidCasted, pid),diff --git a/web/app/pages/Project/tabs/Sessions/Pageflow.tsx b/web/app/pages/Project/tabs/Sessions/Pageflow.tsxindex b023a2eb3..95c81dd5c 100644--- a/web/app/pages/Project/tabs/Sessions/Pageflow.tsx+++ b/web/app/pages/Project/tabs/Sessions/Pageflow.tsx@@ -370,7 +370,13 @@ export const Pageflow = ({ pages, timeFormat, zoomedTimeRange, sdur = 0, website})const isLastEvent = index === filteredPages.length - 1- const timeDuration = !isLastEvent ? timeBetweenEvents[index] : null+ // For the last event, show the remaining time (sdur - time between first and last event)+ // as "time spent on the last event" under the last item rather than under "End of session".+ const timeDuration = !isLastEvent+ ? timeBetweenEvents[index]+ : timeAfterLastEvent > 0+ ? timeAfterLastEvent+ : nullreturn (<PageflowItem@@ -410,22 +416,6 @@ export const Pageflow = ({ pages, timeFormat, zoomedTimeRange, sdur = 0, website{t('project.endOfSession')}</div></div>- {/* Time after last event (only if sdur > 0) */}- {timeAfterLastEvent > 0 ? (- <div className='mt-1 flex items-center text-xs text-gray-500 dark:text-gray-400'>- <svg- className='mr-1 h-3 w-3'- fill='none'- stroke='currentColor'- viewBox='0 0 24 24'- xmlns='http://www.w3.org/2000/svg'- >- <circle cx='12' cy='12' r='10' strokeWidth='2' />- <polyline points='12 6 12 12 16 14' strokeWidth='2' strokeLinecap='round' />- </svg>- {formatDuration(timeAfterLastEvent)}- </div>- ) : null}</div></div></div>