📈 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
(improvement) Architecture (#228)
Andrii Romasiun646840477168
diff --git a/.env.example b/.env.exampleindex f454919b7..00fb50372 100644--- a/.env.example+++ b/.env.example@@ -89,5 +89,9 @@ CLOUDFLARE_PROXY_ENABLED=falsePAYPAL_CLIENT_ID=PAYPAL_CLIENT_SECRET=+# Load balancing+IS_MASTER_NODE=true+# GenericEMAIL_ACTION_ENCRYPTION_KEY=+diff --git a/apps/production/src/analytics/analytics.controller.ts b/apps/production/src/analytics/analytics.controller.tsindex 293dd1eb0..eb7f9fc4f 100644--- a/apps/production/src/analytics/analytics.controller.ts+++ b/apps/production/src/analytics/analytics.controller.ts@@ -42,7 +42,6 @@ import {validPeriods,getLowestPossibleTimeBucket,} from './analytics.service'-import { TaskManagerService } from '../task-manager/task-manager.service'import { CurrentUserId } from '../auth/decorators/current-user-id.decorator'import { DEFAULT_TIMEZONE } from '../user/entities/user.entity'import { RolesGuard } from '../auth/guards/roles.guard'@@ -294,7 +293,6 @@ export class AnalyticsController {constructor(private readonly analyticsService: AnalyticsService,private readonly logger: AppLoggerService,- private readonly taskManagerService: TaskManagerService,) {}@Get()@@ -1011,7 +1009,7 @@ export class AnalyticsController {}}- return this.taskManagerService.getGeneralStats()+ return this.analyticsService.getGeneralStats()}@Get('hb')diff --git a/apps/production/src/analytics/analytics.module.ts b/apps/production/src/analytics/analytics.module.tsindex b9d46551a..603932cc4 100644--- a/apps/production/src/analytics/analytics.module.ts+++ b/apps/production/src/analytics/analytics.module.ts@@ -5,15 +5,9 @@ import { AnalyticsController } from './analytics.controller'import { UserModule } from '../user/user.module'import { AppLoggerModule } from '../logger/logger.module'import { ProjectModule } from '../project/project.module'-import { TaskManagerModule } from '../task-manager/task-manager.module'@Module({- imports: [- forwardRef(() => UserModule),- TaskManagerModule,- AppLoggerModule,- ProjectModule,- ],+ imports: [forwardRef(() => UserModule), AppLoggerModule, ProjectModule],providers: [AnalyticsService],exports: [AnalyticsService],controllers: [AnalyticsController],diff --git a/apps/production/src/analytics/analytics.service.ts b/apps/production/src/analytics/analytics.service.tsindex 5f47255c8..e0f301325 100644--- a/apps/production/src/analytics/analytics.service.ts+++ b/apps/production/src/analytics/analytics.service.ts@@ -51,6 +51,9 @@ import {PERFORMANCE_COLUMNS,MIN_PAGES_IN_FUNNEL,MAX_PAGES_IN_FUNNEL,+ REDIS_USERS_COUNT_KEY,+ REDIS_PROJECTS_COUNT_KEY,+ REDIS_EVENTS_COUNT_KEY,} from '../common/constants'import {calculateRelativePercentage,@@ -60,6 +63,7 @@ import {import { PageviewsDTO } from './dto/pageviews.dto'import { EventsDTO } from './dto/events.dto'import { ProjectService } from '../project/project.service'+import { UserService } from '../user/user.service'import { Project } from '../project/entity/project.entity'import { ChartRenderMode, TimeBucketType } from './dto/getData.dto'import { GetCustomEventMetadata } from './dto/get-custom-event-meta.dto'@@ -341,7 +345,10 @@ const isValidOrigin = (origins: string[], origin: string) => {@Injectable()export class AnalyticsService {- constructor(private readonly projectService: ProjectService) {}+ constructor(+ private readonly projectService: ProjectService,+ private readonly userService: UserService,+ ) {}async checkProjectAccess(pid: string,@@ -2934,4 +2941,29 @@ export class AnalyticsService {)}}++ async getGeneralStats(): Promise<any> {+ const trafficQuery = 'SELECT count(*) FROM analytics'+ const customEVQuery = 'SELECT count(*) FROM customEV'+ const performanceQuery = 'SELECT count(*) FROM performance'+ const captchaQuery = 'SELECT count(*) FROM captcha'++ const users = await this.userService.count()+ const projects = await this.projectService.count()+ const events =+ (await clickhouse.query(trafficQuery).toPromise())[0]['count()'] ++ (await clickhouse.query(customEVQuery).toPromise())[0]['count()'] ++ (await clickhouse.query(performanceQuery).toPromise())[0]['count()'] ++ (await clickhouse.query(captchaQuery).toPromise())[0]['count()']++ await redis.set(REDIS_USERS_COUNT_KEY, users, 'EX', 630)+ await redis.set(REDIS_PROJECTS_COUNT_KEY, projects, 'EX', 630)+ await redis.set(REDIS_EVENTS_COUNT_KEY, events, 'EX', 630)++ return {+ users,+ projects,+ events,+ }+ }}diff --git a/apps/production/src/app.module.ts b/apps/production/src/app.module.tsindex a8572d89b..7d54bbd7e 100644--- a/apps/production/src/app.module.ts+++ b/apps/production/src/app.module.ts@@ -60,7 +60,6 @@ const modules = [I18nModule.forRootAsync(getI18nConfig()),ScheduleModule.forRoot(),NestjsFormDataModule.config({ isGlobal: true }),- TaskManagerModule,BlogModule,UserModule,MailerModule,@@ -81,6 +80,7 @@ const modules = [imports: [...modules,...(process.env.ENABLE_INTEGRATIONS === 'true' ? [IntegrationsModule] : []),+ ...(process.env.IS_MASTER_NODE === 'true' ? [TaskManagerModule] : []),],})export class AppModule {}diff --git a/apps/production/src/task-manager/task-manager.service.ts b/apps/production/src/task-manager/task-manager.service.tsindex 357537efa..683e6ce06 100644--- a/apps/production/src/task-manager/task-manager.service.ts+++ b/apps/production/src/task-manager/task-manager.service.ts@@ -48,9 +48,6 @@ import {REDIS_LOG_DATA_CACHE_KEY,REDIS_LOG_CUSTOM_CACHE_KEY,REDIS_SESSION_SALT_KEY,- REDIS_USERS_COUNT_KEY,- REDIS_PROJECTS_COUNT_KEY,- REDIS_EVENTS_COUNT_KEY,REDIS_LOG_PERF_CACHE_KEY,SEND_WARNING_AT_PERC,PROJECT_INVITE_EXPIRE,@@ -791,29 +788,8 @@ export class TaskManagerService {}@Cron(CronExpression.EVERY_10_MINUTES)- async getGeneralStats(): Promise<object> {- const trafficQuery = 'SELECT count(*) FROM analytics'- const customEVQuery = 'SELECT count(*) FROM customEV'- const performanceQuery = 'SELECT count(*) FROM performance'- const captchaQuery = 'SELECT count(*) FROM captcha'-- const users = await this.userService.count()- const projects = await this.projectService.count()- const events =- (await clickhouse.query(trafficQuery).toPromise())[0]['count()'] +- (await clickhouse.query(customEVQuery).toPromise())[0]['count()'] +- (await clickhouse.query(performanceQuery).toPromise())[0]['count()'] +- (await clickhouse.query(captchaQuery).toPromise())[0]['count()']-- await redis.set(REDIS_USERS_COUNT_KEY, users, 'EX', 630)- await redis.set(REDIS_PROJECTS_COUNT_KEY, projects, 'EX', 630)- await redis.set(REDIS_EVENTS_COUNT_KEY, events, 'EX', 630)-- return {- users,- projects,- events,- }+ async getGeneralStats(): Promise<any> {+ return this.analyticsService.getGeneralStats()}@Cron(CronExpression.EVERY_MINUTE)diff --git a/apps/selfhosted/src/analytics/analytics.module.ts b/apps/selfhosted/src/analytics/analytics.module.tsindex b9d46551a..9d2e0d8e3 100644--- a/apps/selfhosted/src/analytics/analytics.module.ts+++ b/apps/selfhosted/src/analytics/analytics.module.ts@@ -1,19 +1,12 @@-import { Module, forwardRef } from '@nestjs/common'+import { Module } from '@nestjs/common'import { AnalyticsService } from './analytics.service'import { AnalyticsController } from './analytics.controller'-import { UserModule } from '../user/user.module'import { AppLoggerModule } from '../logger/logger.module'import { ProjectModule } from '../project/project.module'-import { TaskManagerModule } from '../task-manager/task-manager.module'@Module({- imports: [- forwardRef(() => UserModule),- TaskManagerModule,- AppLoggerModule,- ProjectModule,- ],+ imports: [AppLoggerModule, ProjectModule],providers: [AnalyticsService],exports: [AnalyticsService],controllers: [AnalyticsController],