📈 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
(untested) added CAPTCHA log data endpoint
Blue Mouse2d49fce18794
diff --git a/src/analytics/analytics.controller.ts b/src/analytics/analytics.controller.tsindex a7ae70e77..0eb3cbcc1 100644--- a/src/analytics/analytics.controller.ts+++ b/src/analytics/analytics.controller.ts@@ -260,6 +260,7 @@ export class AnalyticsController {async getData(@Query() data: AnalyticsGET_DTO,@CurrentUserId() uid: string,+ isCaptcha: boolean = false,): Promise<any> {const {pid,@@ -286,11 +287,12 @@ export class AnalyticsController {let queryCustoms =`SELECT ev, count() FROM customEV WHERE pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String} GROUP BY ev`- let subQuery = `FROM analytics WHERE pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String}`+ // TODO: Refactor+ let subQuery = `FROM ${isCaptcha ? 'captcha' : 'analytics'} WHERE pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String}`let customEVFilterApplied = false// @ts-ignore- if (filtersParams?.ev) {+ if (filtersParams?.ev && !isCaptcha) {customEVFilterApplied = true// @ts-ignorequeryCustoms = `SELECT ev, count() FROM customEV WHERE ${filtersParams.ev_exclusive ? 'NOT' : ''} ev = {ev:String} AND pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String} GROUP BY ev`@@ -403,11 +405,7 @@ export class AnalyticsController {paramsData,timezone,customEVFilterApplied,- )-- const customs = await this.analyticsService.processCustomEV(- queryCustoms,- paramsData,+ isCaptcha,)let appliedFilters = filters@@ -418,6 +416,18 @@ export class AnalyticsController {} catch { }}+ if (isCaptcha) {+ return {+ ...result,+ appliedFilters,+ }+ }++ const customs = await this.analyticsService.processCustomEV(+ queryCustoms,+ paramsData,+ )+return {...result,customs,@@ -574,6 +584,15 @@ export class AnalyticsController {}}+ @Get('/captcha')+ @Auth([], true, true)+ async getCaptchaData(+ @Query() data: AnalyticsGET_DTO,+ @CurrentUserId() uid: string,+ ): Promise<any> {+ return await this.getData(data, uid, true)+ }+@Get('/birdseye')@Auth([], true, true)// returns overall short statistics per projectdiff --git a/src/analytics/analytics.service.ts b/src/analytics/analytics.service.tsindex 894e812cd..bf7e5a56f 100644--- a/src/analytics/analytics.service.ts+++ b/src/analytics/analytics.service.ts@@ -56,16 +56,11 @@ export const getSessionDurationKey = (hash: string, pid: string) =>`sd:${hash}:${pid}`export const cols = [- 'cc',- 'pg',- 'lc',- 'br',- 'os',- 'dv',- 'ref',- 'so',- 'me',- 'ca',+ 'cc', 'pg', 'lc', 'br', 'os', 'dv', 'ref', 'so', 'me', 'ca',+]++export const captchaColumns = [+ 'cc', 'br', 'os', 'dv',]export const perfCols = ['cc', 'pg', 'dv', 'br']@@ -341,6 +336,7 @@ export class AnalyticsService {// returns SQL filters query in a format like 'AND col=value AND ...'getFiltersQuery(filters: string): GetFiltersQuery {+ // TODO: Use captchaColumns for validation of CAPTCHA filterslet parsed = []let query = ''let params = {}@@ -484,6 +480,7 @@ export class AnalyticsService {paramsData: object,timezone: string,customEVFilterApplied: boolean,+ isCaptcha: boolean,): Promise<object | void> {const params = {}@@ -593,7 +590,7 @@ export class AnalyticsService {query += ' UNION ALL '}- query += `select ${i} index, unique, count(), avg(sdur) from analytics where pid = {pid:FixedString(12)} and created between '${xM[i]+ query += `select ${i} index, unique, count(), avg(sdur) from ${isCaptcha ? 'captcha' : 'analytics'} where pid = {pid:FixedString(12)} and created between '${xM[i]}' and '${xM[1 + i]}' ${filtersQuery} group by unique`}