Skip to content

📈 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!

fix captcha billing and analytics edge cases

Blue Mousef11868ceceb2
diff --git a/backend/apps/cloud/src/analytics/analytics.service.ts b/backend/apps/cloud/src/analytics/analytics.service.ts
index d0d96b925..70882e163 100644
--- a/backend/apps/cloud/src/analytics/analytics.service.ts
+++ b/backend/apps/cloud/src/analytics/analytics.service.ts
@@ -4435,7 +4435,7 @@ export class AnalyticsService {
SELECT
countIf(captcha_event = 'generate') as generated,
countIf(captcha_event = 'pass') as passed,
- round(if(generated = 0, 0, passed / generated * 100), 2) as passRate,
+ 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
@@ -4484,7 +4484,10 @@ export class AnalyticsService {
return {
generated: Number(row.generated || 0),
- passRate: Number(row.passRate || 0),
+ passRate:
+ row.passRate === null || row.passRate === undefined
+ ? null
+ : Number(row.passRate),
solveP50: Number(row.solveP50 || 0),
solveP75: Number(row.solveP75 || 0),
solveP95: Number(row.solveP95 || 0),
diff --git a/backend/apps/cloud/src/project/project.controller.ts b/backend/apps/cloud/src/project/project.controller.ts
index 9204298f6..ab2b12475 100644
--- a/backend/apps/cloud/src/project/project.controller.ts
+++ b/backend/apps/cloud/src/project/project.controller.ts
@@ -117,6 +117,7 @@ import { PendingInvitationType } from '../pending-invitation/pending-invitation.
import { PlanCode } from '../user/entities/user.entity'
const PROJECTS_MAXIMUM = 50
+const ORIGINS_ITEMS_MAXIMUM = 1000
const BLACKLIST_ITEMS_MAXIMUM = 1000
const isValidShareDTO = (share: ShareDTO): boolean => {
@@ -1779,12 +1780,17 @@ export class ProjectController {
}
if (projectDTO.origins !== undefined) {
- const safeOrigins = Array.isArray(projectDTO.origins)
- ? projectDTO.origins.slice(0, PROJECTS_MAXIMUM)
- : []
+ if (
+ Array.isArray(projectDTO.origins) &&
+ projectDTO.origins.length > ORIGINS_ITEMS_MAXIMUM
+ ) {
+ throw new BadRequestException('origins is too large')
+ }
project.origins =
- safeOrigins.length > 0 ? (_map(safeOrigins, _trim) as string[]) : []
+ Array.isArray(projectDTO.origins) && projectDTO.origins.length > 0
+ ? (_map(projectDTO.origins, _trim) as string[])
+ : []
}
if (projectDTO.ipBlacklist !== undefined) {
diff --git a/backend/apps/cloud/src/project/project.service.ts b/backend/apps/cloud/src/project/project.service.ts
index 1ec374e11..beffa5434 100644
--- a/backend/apps/cloud/src/project/project.service.ts
+++ b/backend/apps/cloud/src/project/project.service.ts
@@ -95,6 +95,9 @@ const DEFAULT_USAGE_INFO = {
errors: 0,
}
+const CAPTCHA_PASS_CONDITION =
+ "type = 'captcha' AND if(indexOf(`meta.key`, 'captcha_event') = 0, 'pass', arrayElement(`meta.value`, indexOf(`meta.key`, 'captcha_event'))) = 'pass'"
+
export const deleteProjectRedis = async (id: string) => {
const key = getRedisProjectKey(id)
@@ -819,7 +822,7 @@ export class ProjectService {
SELECT
countIf(type = 'pageview') AS pageviews,
countIf(type = 'custom_event') AS customEvents,
- countIf(type = 'captcha') AS captcha,
+ countIf(${CAPTCHA_PASS_CONDITION}) AS captcha,
countIf(type = 'error') AS errors
FROM events
WHERE created BETWEEN {monthStart:String} AND {monthEnd:String}
@@ -906,7 +909,7 @@ export class ProjectService {
SELECT
countIf(type = 'pageview') AS traffic,
countIf(type = 'custom_event') AS customEvents,
- countIf(type = 'captcha') AS captcha,
+ countIf(${CAPTCHA_PASS_CONDITION}) AS captcha,
countIf(type = 'error') AS errors
FROM events
WHERE pid IN ({pids:Array(FixedString(12))})
diff --git a/backend/apps/cloud/src/task-manager/task-manager.service.ts b/backend/apps/cloud/src/task-manager/task-manager.service.ts
index e4b4cb4a7..89763ec08 100644
--- a/backend/apps/cloud/src/task-manager/task-manager.service.ts
+++ b/backend/apps/cloud/src/task-manager/task-manager.service.ts
@@ -118,6 +118,8 @@ const CHUNK_SIZE = 5000
const REPORTS_USERS_CONCURRENCY = 3
const REPORTS_PROJECTS_CONCURRENCY = 5
const NO_EVENTS_REMINDER_DELAY_DAYS = 2
+const CAPTCHA_PASS_CONDITION =
+ "type = 'captcha' AND if(indexOf(`meta.key`, 'captcha_event') = 0, 'pass', arrayElement(`meta.value`, indexOf(`meta.key`, 'captcha_event'))) = 'pass'"
const TELEGRAM_MARKDOWN_URL_KEYS = new Set(['dashboard_url', 'errors_url'])
const mapLimit = async <T, R>(
@@ -148,7 +150,9 @@ const generatePlanUsageQueryForUser = (): string => {
// Counts every billable event kind (pageview, custom_event, error, captcha)
// in a single scan over the unified events table.
return `
- SELECT {uid:String} AS id, count(*) AS "count"
+ SELECT
+ {uid:String} AS id,
+ countIf(type IN ('pageview', 'custom_event', 'error') OR (${CAPTCHA_PASS_CONDITION})) AS "count"
FROM events
WHERE pid IN ({pids:Array(FixedString(12))})
AND type IN ('pageview', 'custom_event', 'error', 'captcha')
@@ -602,7 +606,7 @@ export class TaskManagerService {
for (let i = 0; i < pids.length; i += CHUNK_SIZE) {
const pidChunk = pids.slice(i, i + CHUNK_SIZE)
const query = `
- SELECT count() AS totalEvents
+ SELECT countIf(type IN ('pageview', 'custom_event', 'error', 'performance') OR (${CAPTCHA_PASS_CONDITION})) AS totalEvents
FROM events
WHERE pid IN ({pids:Array(FixedString(12))})
AND type IN ('pageview', 'custom_event', 'error', 'captcha', 'performance')
diff --git a/backend/apps/community/src/analytics/analytics.service.ts b/backend/apps/community/src/analytics/analytics.service.ts
index cb2111783..72584f985 100644
--- a/backend/apps/community/src/analytics/analytics.service.ts
+++ b/backend/apps/community/src/analytics/analytics.service.ts
@@ -4254,7 +4254,7 @@ export class AnalyticsService {
SELECT
countIf(captcha_event = 'generate') as generated,
countIf(captcha_event = 'pass') as passed,
- round(if(generated = 0, 0, passed / generated * 100), 2) as passRate,
+ 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
@@ -4303,7 +4303,10 @@ export class AnalyticsService {
return {
generated: Number(row.generated || 0),
- passRate: Number(row.passRate || 0),
+ passRate:
+ row.passRate === null || row.passRate === undefined
+ ? null
+ : Number(row.passRate),
solveP50: Number(row.solveP50 || 0),
solveP75: Number(row.solveP75 || 0),
solveP95: Number(row.solveP95 || 0),
diff --git a/web/app/api/api.server.ts b/web/app/api/api.server.ts
index 7e0192103..1f4e38f2f 100644
--- a/web/app/api/api.server.ts
+++ b/web/app/api/api.server.ts
@@ -1651,7 +1651,7 @@ interface CaptchaChartData {
interface CaptchaSummaryData {
generated: number
- passRate: number
+ passRate: number | null
solveP50: number
solveP75: number
solveP95: number
diff --git a/web/app/pages/Project/tabs/Captcha/CaptchaView.tsx b/web/app/pages/Project/tabs/Captcha/CaptchaView.tsx
index fc8b30761..90f88a901 100644
--- a/web/app/pages/Project/tabs/Captcha/CaptchaView.tsx
+++ b/web/app/pages/Project/tabs/Captcha/CaptchaView.tsx
@@ -269,8 +269,18 @@ const CaptchaView = ({ projectId }: CaptchaViewProps) => {
const hasExistingData = chartData !== null || !_isEmpty(panelsData.types)
const formatNumber = (value: number, type: 'main' | 'badge') =>
`${type === 'badge' && value > 0 ? '+' : ''}${nFormatter(value, 1)}`
- const formatPercent = (value: number, type: 'main' | 'badge') =>
- `${type === 'badge' && value > 0 ? '+' : ''}${Number(value || 0).toFixed(1)}%`
+ const isFiniteNumber = (value: unknown): value is number =>
+ typeof value === 'number' && Number.isFinite(value)
+ const formatPercent = (
+ value: number | null | undefined,
+ type: 'main' | 'badge',
+ ) => {
+ if (!isFiniteNumber(value)) {
+ return 'N/A'
+ }
+
+ return `${type === 'badge' && value > 0 ? '+' : ''}${value.toFixed(1)}%`
+ }
const formatSeconds = (value?: number) =>
value ? `${Number(value).toFixed(2)}s` : 'N/A'
const formatSecondsChange = (value: number) =>
@@ -308,9 +318,12 @@ const CaptchaView = ({ projectId }: CaptchaViewProps) => {
},
{
label: t('project.captchaAnalytics.passRate'),
- value: summaryData.passRate || 0,
+ value: summaryData.passRate,
change: summaryCompareData
- ? (summaryData.passRate || 0) - (summaryCompareData.passRate || 0)
+ ? isFiniteNumber(summaryData.passRate) &&
+ isFiniteNumber(summaryCompareData.passRate)
+ ? summaryData.passRate - summaryCompareData.passRate
+ : undefined
: undefined,
goodChangeDirection: 'down' as const,
valueMapper: formatPercent,