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!

lint

Blue Mousecaf691675955
diff --git a/backend/apps/cloud/src/revenue/currency.service.ts b/backend/apps/cloud/src/revenue/currency.service.ts
index 77edc734d..f136dd405 100644
--- a/backend/apps/cloud/src/revenue/currency.service.ts
+++ b/backend/apps/cloud/src/revenue/currency.service.ts
@@ -60,7 +60,10 @@ export class CurrencyService {
return amountInUsd / toRateInUsd
}
- private async getRates(): Promise<Record<string, Record<string, number>> | null> {
+ private async getRates(): Promise<Record<
+ string,
+ Record<string, number>
+ > | null> {
try {
const cached = await redis.get(this.CACHE_KEY)
if (cached) {
diff --git a/backend/apps/cloud/src/revenue/dto/connect-paddle.dto.ts b/backend/apps/cloud/src/revenue/dto/connect-paddle.dto.ts
index 1772a0003..b00d4909e 100644
--- a/backend/apps/cloud/src/revenue/dto/connect-paddle.dto.ts
+++ b/backend/apps/cloud/src/revenue/dto/connect-paddle.dto.ts
@@ -1,34 +1,5 @@
import { ApiProperty } from '@nestjs/swagger'
-import {
- IsNotEmpty,
- IsString,
- IsOptional,
- Length,
- Matches,
-} from 'class-validator'
-
-export class ConnectPaddleDto {
- @ApiProperty({
- description: 'Paddle API key (pdl_live_*)',
- example: 'pdl_live_xxxxxxxxxxxxxxxx',
- })
- @IsNotEmpty()
- @IsString()
- @Matches(/^pdl_live_/, {
- message: 'Invalid Paddle API key format. Key should start with pdl_live_',
- })
- apiKey: string
-
- @ApiProperty({
- description: 'Currency code for revenue reporting (ISO 4217)',
- example: 'USD',
- default: 'USD',
- })
- @IsOptional()
- @IsString()
- @Length(3, 3)
- currency?: string
-}
+import { IsNotEmpty, IsString, Length } from 'class-validator'
export class UpdateRevenueCurrencyDto {
@ApiProperty({
diff --git a/backend/apps/cloud/src/revenue/dto/connect-revenue.dto.ts b/backend/apps/cloud/src/revenue/dto/connect-revenue.dto.ts
index f1ff3e4bc..2f2c0ded0 100644
--- a/backend/apps/cloud/src/revenue/dto/connect-revenue.dto.ts
+++ b/backend/apps/cloud/src/revenue/dto/connect-revenue.dto.ts
@@ -1,7 +1,7 @@
import { ApiProperty } from '@nestjs/swagger'
import { IsNotEmpty, IsOptional, IsString, Length, IsIn } from 'class-validator'
-export type RevenueProviderDto = 'stripe' | 'paddle'
+type RevenueProviderDto = 'stripe' | 'paddle'
export class ConnectRevenueDto {
@ApiProperty({
diff --git a/backend/apps/cloud/src/revenue/dto/payment-log.dto.ts b/backend/apps/cloud/src/revenue/dto/payment-log.dto.ts
deleted file mode 100644
index 64a1e178a..000000000
--- a/backend/apps/cloud/src/revenue/dto/payment-log.dto.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'
-import { IsNotEmpty, IsString, IsOptional, IsNumber } from 'class-validator'
-
-export class LogPaymentDto {
- @ApiProperty({ description: 'Project ID' })
- @IsNotEmpty()
- @IsString()
- pid: string
-
- @ApiPropertyOptional({ description: 'Profile ID for attribution' })
- @IsOptional()
- @IsString()
- profileId?: string
-
- @ApiPropertyOptional({ description: 'Session ID for attribution' })
- @IsOptional()
- @IsString()
- sessionId?: string
-
- @ApiPropertyOptional({ description: 'Transaction ID' })
- @IsOptional()
- @IsString()
- transactionId?: string
-
- @ApiPropertyOptional({ description: 'Payment amount' })
- @IsOptional()
- @IsNumber()
- amount?: number
-
- @ApiPropertyOptional({ description: 'Currency code' })
- @IsOptional()
- @IsString()
- currency?: string
-
- @ApiPropertyOptional({ description: 'Additional metadata' })
- @IsOptional()
- metadata?: Record<string, string | number | boolean>
-}
diff --git a/backend/apps/cloud/src/revenue/interfaces/revenue.interface.ts b/backend/apps/cloud/src/revenue/interfaces/revenue.interface.ts
index 690f759bd..e9789977d 100644
--- a/backend/apps/cloud/src/revenue/interfaces/revenue.interface.ts
+++ b/backend/apps/cloud/src/revenue/interfaces/revenue.interface.ts
@@ -35,33 +35,6 @@ export interface RevenueTransaction {
syncedAt: Date
}
-export interface RevenueStats {
- totalRevenue: number
- salesCount: number
- refundsCount: number
- refundsAmount: number
- averageOrderValue: number
- currency: string
-}
-
-export interface RevenueChartData {
- x: string[]
- revenue: number[]
- salesCount: number[]
- refundsAmount: number[]
-}
-
-export interface RevenueBreakdown {
- bySource: { name: string; revenue: number; count: number }[]
- byCountry: { name: string; revenue: number; count: number }[]
- byProduct: { name: string; revenue: number; count: number }[]
-}
-
-export interface PaddleApiKey {
- permissions: string[]
- createdAt: Date
-}
-
export const PADDLE_REQUIRED_PERMISSIONS = [
'transaction.read',
'subscription.read',
@@ -70,9 +43,6 @@ export const PADDLE_REQUIRED_PERMISSIONS = [
'price.read',
]
-// TODO: Change to vendors.paddle.com when merging to main
-export const PADDLE_API_KEY_CREATE_URL = `https://sandbox-vendors.paddle.com/authentication-v2`
-
// Stripe restricted key permissions (rak_*) that we request
export const STRIPE_REQUIRED_PERMISSIONS = [
'rak_charge_read',
diff --git a/backend/apps/cloud/src/revenue/revenue.controller.ts b/backend/apps/cloud/src/revenue/revenue.controller.ts
index 5bc169562..306f8cea8 100644
--- a/backend/apps/cloud/src/revenue/revenue.controller.ts
+++ b/backend/apps/cloud/src/revenue/revenue.controller.ts
@@ -215,7 +215,10 @@ export class RevenueController {
}
}
} catch (error) {
- this.logger.error({ error, pid }, 'Failed to trigger re-sync after currency update')
+ this.logger.error(
+ { error, pid },
+ 'Failed to trigger re-sync after currency update',
+ )
// Don't throw here, as currency was updated successfully
}
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 53494f47e..e098bdb72 100644
--- a/backend/apps/cloud/src/task-manager/task-manager.service.ts
+++ b/backend/apps/cloud/src/task-manager/task-manager.service.ts
@@ -1924,65 +1924,65 @@ export class TaskManagerService {
await mapLimit(users, REPORTS_USERS_CONCURRENCY, async user => {
const { id, projects } = user
- if (_isEmpty(projects) || _isNull(projects)) {
- return
- }
-
- const pids = _map(projects, p => p.id)
- const queryParams = {
- pids,
- nineWeeksAgo,
- now,
- }
+ try {
+ if (_isEmpty(projects) || _isNull(projects)) {
+ return
+ }
- // No need to check for performance activity because it's not tracked without tracking analytics
- const queryAnalytics = `SELECT count() FROM analytics WHERE pid IN ({pids:Array(FixedString(12))}) AND created BETWEEN {nineWeeksAgo:String} AND {now:String}`
- const queryCaptcha = `SELECT count() FROM captcha WHERE pid IN ({pids:Array(FixedString(12))}) AND created BETWEEN {nineWeeksAgo:String} AND {now:String}`
- const queryCustomEvents = `SELECT count() FROM customEV WHERE pid IN ({pids:Array(FixedString(12))}) AND created BETWEEN {nineWeeksAgo:String} AND {now:String}`
+ const pids = _map(projects, p => p.id)
+ const queryParams = {
+ pids,
+ nineWeeksAgo,
+ now,
+ }
- const { data: analyticsResult } = await clickhouse
- .query({
- query: queryAnalytics,
- query_params: queryParams,
- })
- .then(resultSet => resultSet.json<{ 'count()': number }>())
+ // No need to check for performance activity because it's not tracked without tracking analytics
+ const queryAnalytics = `SELECT count() FROM analytics WHERE pid IN ({pids:Array(FixedString(12))}) AND created BETWEEN {nineWeeksAgo:String} AND {now:String}`
+ const queryCaptcha = `SELECT count() FROM captcha WHERE pid IN ({pids:Array(FixedString(12))}) AND created BETWEEN {nineWeeksAgo:String} AND {now:String}`
+ const queryCustomEvents = `SELECT count() FROM customEV WHERE pid IN ({pids:Array(FixedString(12))}) AND created BETWEEN {nineWeeksAgo:String} AND {now:String}`
- if (analyticsResult[0]['count()'] > 0) {
- return
- }
+ const { data: analyticsResult } = await clickhouse
+ .query({
+ query: queryAnalytics,
+ query_params: queryParams,
+ })
+ .then(resultSet => resultSet.json<{ 'count()': number }>())
- const { data: captchaResult } = await clickhouse
- .query({
- query: queryCaptcha,
- query_params: queryParams,
- })
- .then(resultSet => resultSet.json<{ 'count()': number }>())
+ if (analyticsResult[0]['count()'] > 0) {
+ return
+ }
- if (captchaResult[0]['count()'] > 0) {
- return
- }
+ const { data: captchaResult } = await clickhouse
+ .query({
+ query: queryCaptcha,
+ query_params: queryParams,
+ })
+ .then(resultSet => resultSet.json<{ 'count()': number }>())
- const { data: customEventsResult } = await clickhouse
- .query({
- query: queryCustomEvents,
- query_params: queryParams,
- })
- .then(resultSet => resultSet.json<{ 'count()': number }>())
+ if (captchaResult[0]['count()'] > 0) {
+ return
+ }
- if (customEventsResult[0]['count()'] > 0) {
- return
- }
+ const { data: customEventsResult } = await clickhouse
+ .query({
+ query: queryCustomEvents,
+ query_params: queryParams,
+ })
+ .then(resultSet => resultSet.json<{ 'count()': number }>())
- await this.userService.update(id, {
- reportFrequency: ReportFrequency.NEVER,
- })
- })
+ if (customEventsResult[0]['count()'] > 0) {
+ return
+ }
- await Promise.allSettled(promises).catch(reason => {
- this.logger.error(
- '[CRON WORKER](disableReportsForInactiveUsers) Error occured:',
- reason,
- )
+ await this.userService.update(id, {
+ reportFrequency: ReportFrequency.NEVER,
+ })
+ } catch (reason) {
+ this.logger.error(
+ '[CRON WORKER](disableReportsForInactiveUsers) Error occured:',
+ reason,
+ )
+ }
})
}
diff --git a/backend/package-lock.json b/backend/package-lock.json
index f43cb4b74..5c7b9a650 100644
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -70,6 +70,7 @@
"rimraf": "^6.1.2",
"rxjs": "^7.8.2",
"sns-payload-validator": "^2.1.0",
+ "socket.io": "^4.8.1",
"telegraf": "^4.16.3",
"typeorm": "^0.3.27",
"validator": "^13.15.23",
diff --git a/backend/package.json b/backend/package.json
index 4b1f14019..f95504bf6 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -90,6 +90,7 @@
"rimraf": "^6.1.2",
"rxjs": "^7.8.2",
"sns-payload-validator": "^2.1.0",
+ "socket.io": "^4.8.1",
"telegraf": "^4.16.3",
"typeorm": "^0.3.27",
"validator": "^13.15.23",