📈 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
fix: Proper CAPTCHA generation rate calculation
Blue Mouse169fd1a8b8ca
diff --git a/backend/apps/cloud/src/analytics/analytics.controller.ts b/backend/apps/cloud/src/analytics/analytics.controller.tsindex c16f6dcdf..dd608effc 100644--- a/backend/apps/cloud/src/analytics/analytics.controller.ts+++ b/backend/apps/cloud/src/analytics/analytics.controller.ts@@ -326,6 +326,7 @@ export class AnalyticsController {paramsData,safeTimezone,mode,+ period,)} else {result = await this.analyticsService.groupByTimeBucket(diff --git a/backend/apps/cloud/src/analytics/analytics.service.ts b/backend/apps/cloud/src/analytics/analytics.service.tsindex ae1085823..0be1d4e41 100644--- a/backend/apps/cloud/src/analytics/analytics.service.ts+++ b/backend/apps/cloud/src/analytics/analytics.service.ts@@ -4064,7 +4064,7 @@ export class AnalyticsService {const baseQuery = `SELECT${selector},- countIf(captcha_event = 'generate') as generated,+ greatest(countIf(captcha_event = 'generate'), countIf(captcha_event = 'pass')) as generated,countIf(captcha_event = 'pass') as passed,countIf(captcha_event = 'verify_fail') as failed,countIf(captcha_event = 'validation_fail') as validationFailed,@@ -4522,8 +4522,13 @@ export class AnalyticsService {const index = x.indexOf(dateString)if (index !== -1) {- generated[index] = Number(result[row].generated || 0)- passed[index] = Number(result[row].passed || 0)+ const passedCount = Number(result[row].passed || 0)++ generated[index] = Math.max(+ Number(result[row].generated || 0),+ passedCount,+ )+ passed[index] = passedCountfailed[index] = Number(result[row].failed || 0)validationFailed[index] = Number(result[row].validationFailed || 0)replayed[index] = Number(result[row].replayed || 0)@@ -4558,9 +4563,8 @@ export class AnalyticsService {${CAPTCHA_EVENT_SQL} as captcha_event,${CAPTCHA_SOLVE_MS_SQL} as solve_msSELECT- countIf(captcha_event = 'generate') as generated,+ greatest(countIf(captcha_event = 'generate'), countIf(captcha_event = 'pass')) as generated,countIf(captcha_event = 'pass') as passed,- if(generated = 0, NULL, round(passed / generated * 100, 2)) as passRate,round(quantileExactIf(0.5)(solve_ms, captcha_event = 'pass' AND solve_ms > 0) / 1000, 2) as solveP50,round(quantileExactIf(0.75)(solve_ms, captcha_event = 'pass' AND solve_ms > 0) / 1000, 2) as solveP75,round(quantileExactIf(0.95)(solve_ms, captcha_event = 'pass' AND solve_ms > 0) / 1000, 2) as solveP95@@ -4606,13 +4610,13 @@ export class AnalyticsService {])const row = summary.data?.[0] || {}+ const passed = Number(row.passed || 0)+ const generated = Math.max(Number(row.generated || 0), passed)return {- generated: Number(row.generated || 0),- passRate:- row.passRate === null || row.passRate === undefined- ? null- : Number(row.passRate),+ generated,+ passed,+ passRate: generated === 0 ? null : _round((passed / generated) * 100, 2),solveP50: Number(row.solveP50 || 0),solveP75: Number(row.solveP75 || 0),solveP95: Number(row.solveP95 || 0),@@ -4630,10 +4634,12 @@ export class AnalyticsService {paramsData: any,safeTimezone: string,mode: ChartRenderMode,+ period: string,): Promise<object | void> {let params: unknown = {}let chart: unknown = {}let summary: unknown = {}+ let previousSummary: unknown = nullconst promises = [// Getting params@@ -4687,12 +4693,38 @@ export class AnalyticsService {})(),]+ if (period !== 'all') {+ promises.push(+ (async () => {+ const { groupFrom, groupTo } = paramsData.params+ const periodSubtracted = dayjs+ .utc(groupFrom)+ .subtract(+ Math.abs(+ dayjs.utc(groupFrom).diff(dayjs.utc(groupTo), 'minutes'),+ ),+ 'minutes',+ )+ .format('YYYY-MM-DD HH:mm:ss')++ previousSummary = await this.getCaptchaSummary(filtersQuery, {+ params: {+ ...paramsData.params,+ groupFrom: periodSubtracted,+ groupTo: groupFrom,+ },+ })+ })(),+ )+ }+await Promise.all(promises)return Promise.resolve({params,chart,summary,+ previousSummary,})}diff --git a/backend/apps/community/src/analytics/analytics.controller.ts b/backend/apps/community/src/analytics/analytics.controller.tsindex 297cc89c9..80d35a8fd 100644--- a/backend/apps/community/src/analytics/analytics.controller.ts+++ b/backend/apps/community/src/analytics/analytics.controller.ts@@ -303,6 +303,7 @@ export class AnalyticsController {paramsData,safeTimezone,mode,+ period,)} else {result = await this.analyticsService.groupByTimeBucket(diff --git a/backend/apps/community/src/analytics/analytics.service.ts b/backend/apps/community/src/analytics/analytics.service.tsindex 7cbb8d25e..65d90f9fa 100644--- a/backend/apps/community/src/analytics/analytics.service.ts+++ b/backend/apps/community/src/analytics/analytics.service.ts@@ -4288,7 +4288,7 @@ export class AnalyticsService {const baseQuery = `SELECT${selector},- countIf(captcha_event = 'generate') as generated,+ greatest(countIf(captcha_event = 'generate'), countIf(captcha_event = 'pass')) as generated,countIf(captcha_event = 'pass') as passed,countIf(captcha_event = 'verify_fail') as failed,countIf(captcha_event = 'validation_fail') as validationFailed,@@ -4337,8 +4337,13 @@ export class AnalyticsService {const index = x.indexOf(dateString)if (index !== -1) {- generated[index] = Number(result[row].generated || 0)- passed[index] = Number(result[row].passed || 0)+ const passedCount = Number(result[row].passed || 0)++ generated[index] = Math.max(+ Number(result[row].generated || 0),+ passedCount,+ )+ passed[index] = passedCountfailed[index] = Number(result[row].failed || 0)validationFailed[index] = Number(result[row].validationFailed || 0)replayed[index] = Number(result[row].replayed || 0)@@ -4373,9 +4378,8 @@ export class AnalyticsService {${CAPTCHA_EVENT_SQL} as captcha_event,${CAPTCHA_SOLVE_MS_SQL} as solve_msSELECT- countIf(captcha_event = 'generate') as generated,+ greatest(countIf(captcha_event = 'generate'), countIf(captcha_event = 'pass')) as generated,countIf(captcha_event = 'pass') as passed,- if(generated = 0, NULL, round(passed / generated * 100, 2)) as passRate,round(quantileExactIf(0.5)(solve_ms, captcha_event = 'pass' AND solve_ms > 0) / 1000, 2) as solveP50,round(quantileExactIf(0.75)(solve_ms, captcha_event = 'pass' AND solve_ms > 0) / 1000, 2) as solveP75,round(quantileExactIf(0.95)(solve_ms, captcha_event = 'pass' AND solve_ms > 0) / 1000, 2) as solveP95@@ -4421,13 +4425,13 @@ export class AnalyticsService {])const row = summary.data?.[0] || {}+ const passed = Number(row.passed || 0)+ const generated = Math.max(Number(row.generated || 0), passed)return {- generated: Number(row.generated || 0),- passRate:- row.passRate === null || row.passRate === undefined- ? null- : Number(row.passRate),+ generated,+ passed,+ passRate: generated === 0 ? null : _round((passed / generated) * 100, 2),solveP50: Number(row.solveP50 || 0),solveP75: Number(row.solveP75 || 0),solveP95: Number(row.solveP95 || 0),@@ -4445,10 +4449,12 @@ export class AnalyticsService {paramsData: any,safeTimezone: string,mode: ChartRenderMode,+ period: string,): Promise<object | void> {let params: unknown = {}let chart: unknown = {}let summary: unknown = {}+ let previousSummary: unknown = nullconst promises = [// Getting params@@ -4502,12 +4508,38 @@ export class AnalyticsService {})(),]+ if (period !== 'all') {+ promises.push(+ (async () => {+ const { groupFrom, groupTo } = paramsData.params+ const periodSubtracted = dayjs+ .utc(groupFrom)+ .subtract(+ Math.abs(+ dayjs.utc(groupFrom).diff(dayjs.utc(groupTo), 'minutes'),+ ),+ 'minutes',+ )+ .format('YYYY-MM-DD HH:mm:ss')++ previousSummary = await this.getCaptchaSummary(filtersQuery, {+ params: {+ ...paramsData.params,+ groupFrom: periodSubtracted,+ groupTo: groupFrom,+ },+ })+ })(),+ )+ }+await Promise.all(promises)return Promise.resolve({params,chart,summary,+ previousSummary,})}diff --git a/web/app/api/api.server.ts b/web/app/api/api.server.tsindex 8d13a12c5..258dc8bb5 100644--- a/web/app/api/api.server.ts+++ b/web/app/api/api.server.ts@@ -1690,6 +1690,7 @@ interface CaptchaChartData {interface CaptchaSummaryData {generated: number+ passed: numberpassRate: number | nullsolveP50: numbersolveP75: number@@ -1702,6 +1703,7 @@ export interface CaptchaDataResponse {params: Record<string, CaptchaPanelData[]>chart?: CaptchaChartDatasummary?: CaptchaSummaryData+ previousSummary?: CaptchaSummaryData | null}export async function getCaptchaDataServer(diff --git a/web/app/pages/Project/View/Panels.tsx b/web/app/pages/Project/View/Panels.tsxindex 34c00cbdf..0e83a1783 100644--- a/web/app/pages/Project/View/Panels.tsx+++ b/web/app/pages/Project/View/Panels.tsx@@ -234,7 +234,7 @@ const PanelContainer = ({<span className='ml-1.5 flex items-center'>{tooltip}</span>) : null}</Text>- <div className='scrollbar-thin flex items-center gap-2.5 overflow-x-auto'>+ <div className='flex scrollbar-thin items-center gap-2.5 overflow-x-auto'>{tabs && onTabChange ? (<>{tabs.map((tab, index) => {@@ -1681,7 +1681,7 @@ const CombinedMetadataPanel = ({>{title}</Text>- <div className='scrollbar-thin flex items-center gap-2.5 overflow-x-auto'>+ <div className='flex scrollbar-thin items-center gap-2.5 overflow-x-auto'>{modeTabs.map((tab) => (<buttonkey={tab.id}@@ -1982,7 +1982,7 @@ const DetailsTable = ({</div><divref={parentRef}- className='scrollbar-thin max-h-[500px] overflow-x-auto overflow-y-auto'+ className='max-h-[500px] scrollbar-thin overflow-x-auto overflow-y-auto'><div className='min-w-[640px]'><div@@ -2104,7 +2104,7 @@ const DetailsTable = ({<div className='flex min-w-0 items-center py-1 pl-2 text-left'><spanclassName={cx(- 'scrollbar-thin hover-always-overflow flex min-w-0 items-center whitespace-nowrap',+ 'hover-always-overflow flex min-w-0 scrollbar-thin items-center whitespace-nowrap',{capitalize,},@@ -2112,7 +2112,7 @@ const DetailsTable = ({>{linkContent ? (<a- className='scrollbar-thin hover-always-overflow whitespace-nowrap text-blue-600 hover:underline dark:text-blue-500'+ className='hover-always-overflow scrollbar-thin whitespace-nowrap text-blue-600 hover:underline dark:text-blue-500'href={rowData as string}target='_blank'rel='noopener noreferrer nofollow'@@ -2397,7 +2397,7 @@ const Panel = ({{linkContent ? (<aclassName={cx(- 'scrollbar-thin hover-always-overflow flex items-center text-sm whitespace-nowrap text-blue-600 hover:underline dark:text-blue-500',+ 'hover-always-overflow flex scrollbar-thin items-center text-sm whitespace-nowrap text-blue-600 hover:underline dark:text-blue-500',{capitalize,},@@ -2412,7 +2412,7 @@ const Panel = ({) : (<spanclassName={cx(- 'scrollbar-thin hover-always-overflow flex items-center text-sm whitespace-nowrap text-gray-900 dark:text-gray-100',+ 'hover-always-overflow flex scrollbar-thin items-center text-sm whitespace-nowrap text-gray-900 dark:text-gray-100',{capitalize,},diff --git a/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx b/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsxindex df664ff6c..dc332294b 100644--- a/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx+++ b/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx@@ -84,7 +84,7 @@ const LiveVisitorsDropdown = () => {<divid='live-visitors-dropdown'className={cn(- 'scrollbar-thin absolute top-full right-0 z-40 mt-1 max-w-[calc(100vw-1rem)] origin-top-right transform cursor-auto overflow-hidden rounded-md border border-black/10 bg-white text-xs text-gray-900 shadow-md transition duration-150 ease-out outline-none max-sm:fixed max-sm:top-20 max-sm:right-2 max-sm:left-2 max-sm:w-auto max-sm:max-w-none sm:w-[250px] dark:border-slate-700/50 dark:bg-slate-950 dark:text-gray-50',+ 'absolute top-full right-0 z-40 mt-1 max-w-[calc(100vw-1rem)] origin-top-right transform cursor-auto scrollbar-thin overflow-hidden rounded-md border border-black/10 bg-white text-xs text-gray-900 shadow-md transition duration-150 ease-out outline-none max-sm:fixed max-sm:top-20 max-sm:right-2 max-sm:left-2 max-sm:w-auto max-sm:max-w-none sm:w-[250px] dark:border-slate-700/50 dark:bg-slate-950 dark:text-gray-50',liveInfo.length === 0 || isLoading ? 'min-w-[200px]' : 'min-w-0',isDropdownVisible? 'pointer-events-auto translate-y-0 scale-100 opacity-100'@@ -106,7 +106,7 @@ const LiveVisitorsDropdown = () => {<XIcon className='h-4 w-4 cursor-pointer rounded-md text-gray-900 dark:text-gray-50' /></button></div>- <div className='scrollbar-thin max-h-72 overflow-y-auto px-1.5 max-sm:max-h-[calc(100dvh-7rem)] sm:max-h-80'>+ <div className='max-h-72 scrollbar-thin overflow-y-auto px-1.5 max-sm:max-h-[calc(100dvh-7rem)] sm:max-h-80'>{isLoading ? (<Text as='p' size='xs' className='flex items-center py-2'><Spin className='ml-0' />diff --git a/web/app/pages/Project/tabs/Captcha/CaptchaView.tsx b/web/app/pages/Project/tabs/Captcha/CaptchaView.tsxindex 90f88a901..9cc44e99c 100644--- a/web/app/pages/Project/tabs/Captcha/CaptchaView.tsx+++ b/web/app/pages/Project/tabs/Captcha/CaptchaView.tsx@@ -90,8 +90,14 @@ const CaptchaView = ({ projectId }: CaptchaViewProps) => {const { theme } = useTheme()const { project } = useCurrentProject()const { captchaRefreshTrigger } = useContext(RefreshTriggersContext)- const { period, timeBucket, dateRange, timeFormat, size } =- useContext(ViewProjectContext)+ const {+ period,+ timeBucket,+ dateRange,+ timeFormat,+ size,+ activePeriodCompare,+ } = useContext(ViewProjectContext)const [searchParams] = useSearchParams()const isEmbedded = searchParams.get('embedded') === 'true'const isMountedRef = useRef(true)@@ -178,10 +184,12 @@ const CaptchaView = ({ projectId }: CaptchaViewProps) => {const compareTo = searchParams.get('compareTo') || ''const compareEnabled =searchParams.get('compare') === 'true' && compareFrom && compareTo+ const shouldFetchCustomCompare =+ compareEnabled && activePeriodCompare !== 'previous'const [data, compareData] = await Promise.all([captchaProxy.fetchCaptcha(projectId, requestParams),- compareEnabled+ shouldFetchCustomCompare? captchaProxy.fetchCaptcha(projectId, {...requestParams,period: '',@@ -203,7 +211,7 @@ const CaptchaView = ({ projectId }: CaptchaViewProps) => {return}- const { params, chart, summary } = data+ const { params, chart, summary, previousSummary } = dataif (chart && chart.x) {setChartData(chart)@@ -221,7 +229,11 @@ const CaptchaView = ({ projectId }: CaptchaViewProps) => {setIsPanelsDataEmpty(!hasData)setSummaryData(summary || null)- setSummaryCompareData(compareData?.summary || null)+ setSummaryCompareData(+ shouldFetchCustomCompare+ ? compareData?.summary || null+ : previousSummary || null,+ )setAnalyticsLoading(false)setDataLoading(false)} catch (reason) {@@ -239,7 +251,7 @@ const CaptchaView = ({ projectId }: CaptchaViewProps) => {useEffect(() => {loadCaptcha()// eslint-disable-next-line react-hooks/exhaustive-deps- }, [filters, dateRange, period, timeBucket, projectId])+ }, [filters, dateRange, period, timeBucket, projectId, activePeriodCompare])// Refresh captcha data when refresh button is clickeduseEffect(() => {@@ -316,6 +328,15 @@ const CaptchaView = ({ projectId }: CaptchaViewProps) => {goodChangeDirection: 'down' as const,valueMapper: formatNumber,},+ {+ label: t('project.captchaAnalytics.passed'),+ value: summaryData.passed || 0,+ change: summaryCompareData+ ? (summaryData.passed || 0) - (summaryCompareData.passed || 0)+ : undefined,+ goodChangeDirection: 'down' as const,+ valueMapper: formatNumber,+ },{label: t('project.captchaAnalytics.passRate'),value: summaryData.passRate,diff --git a/web/app/pages/Project/tabs/Traffic/PageLinkRow.tsx b/web/app/pages/Project/tabs/Traffic/PageLinkRow.tsxindex ce971dbc1..38626e6fe 100644--- a/web/app/pages/Project/tabs/Traffic/PageLinkRow.tsx+++ b/web/app/pages/Project/tabs/Traffic/PageLinkRow.tsx@@ -29,7 +29,7 @@ const PageLinkRow = ({ pagePath, websiteUrl }: PageLinkRowProps) => {}return (- <div className='scrollbar-thin hover-always-overflow flex min-w-0 items-center'>+ <div className='hover-always-overflow flex min-w-0 scrollbar-thin items-center'><span className='truncate text-sm text-gray-900 dark:text-gray-100'>{pagePath}</span>diff --git a/web/app/pages/Project/tabs/Traffic/RefRow.tsx b/web/app/pages/Project/tabs/Traffic/RefRow.tsxindex 8e6b72221..3630066c3 100644--- a/web/app/pages/Project/tabs/Traffic/RefRow.tsx+++ b/web/app/pages/Project/tabs/Traffic/RefRow.tsx@@ -31,7 +31,7 @@ const RefRow = ({ rowName }: { rowName: string | null }) => {if (rowName === null) {return (- <div className='scrollbar-thin hover-always-overflow flex items-center'>+ <div className='hover-always-overflow flex scrollbar-thin items-center'><LinkIcon className='float-left mr-1.5 size-5' /><span className='italic'>{t('project.directNone')}</span></div>@@ -39,7 +39,7 @@ const RefRow = ({ rowName }: { rowName: string | null }) => {}return (- <div className='scrollbar-thin hover-always-overflow flex min-w-0 items-center'>+ <div className='hover-always-overflow flex min-w-0 scrollbar-thin items-center'>{faviconHost ? (<imgclassName='float-left mr-1.5 size-5'