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!

code refactoring

Blue Moused6d11a509a94
diff --git a/backend/apps/cloud/src/analytics/analytics.service.ts b/backend/apps/cloud/src/analytics/analytics.service.ts
index ba3dbd7b9..29baf43fd 100644
--- a/backend/apps/cloud/src/analytics/analytics.service.ts
+++ b/backend/apps/cloud/src/analytics/analytics.service.ts
@@ -4338,12 +4338,22 @@ export class AnalyticsService {
const amountEntry = processedMetadata.find(m => m.key === 'amount')
const currencyEntry = processedMetadata.find(m => m.key === 'currency')
+ let amount: number | undefined
+
+ if (amountEntry) {
+ const parsedAmount = parseFloat(amountEntry.value)
+
+ if (Number.isFinite(parsedAmount) && parsedAmount >= 0) {
+ amount = parsedAmount
+ }
+ }
+
return {
...page,
metadata: processedMetadata.filter(
m => m.key !== 'amount' && m.key !== 'currency',
),
- amount: amountEntry ? parseFloat(amountEntry.value) : undefined,
+ amount,
currency: currencyEntry ? currencyEntry.value : undefined,
}
}
diff --git a/backend/apps/cloud/src/experiment/experiment.controller.ts b/backend/apps/cloud/src/experiment/experiment.controller.ts
index 25a1f69c3..f663b628d 100644
--- a/backend/apps/cloud/src/experiment/experiment.controller.ts
+++ b/backend/apps/cloud/src/experiment/experiment.controller.ts
@@ -923,7 +923,6 @@ export class ExperimentController {
e.pid = {pid:FixedString(12)}
AND e.experimentId = {experimentId:String}
AND e.created BETWEEN {groupFrom:String} AND {groupTo:String}
- AND c.profileId IS NOT NULL
AND c.created BETWEEN {groupFrom:String} AND {groupTo:String}
AND c.created >= e.created
AND ${matchCondition}
@@ -1006,10 +1005,16 @@ export class ExperimentController {
const totalExposures = _sum(variantResults.map(v => v.exposures))
const totalConversions = _sum(variantResults.map(v => v.conversions))
- const highestProbVariant = variantResults.reduce((a, b) =>
- a.probabilityOfBeingBest > b.probabilityOfBeingBest ? a : b,
- )
- const hasWinner = highestProbVariant.probabilityOfBeingBest >= 95
+
+ let highestProbVariant: VariantResultDto | null = null
+ let hasWinner = false
+
+ if (variantResults.length > 0) {
+ highestProbVariant = variantResults.reduce((a, b) =>
+ a.probabilityOfBeingBest > b.probabilityOfBeingBest ? a : b,
+ )
+ hasWinner = highestProbVariant.probabilityOfBeingBest >= 95
+ }
let chart:
| { x: string[]; winProbability: Record<string, number[]> }
@@ -1036,7 +1041,8 @@ export class ExperimentController {
totalExposures,
totalConversions,
hasWinner,
- winnerKey: hasWinner ? highestProbVariant.key : null,
+ winnerKey:
+ hasWinner && highestProbVariant ? highestProbVariant.key : null,
confidenceLevel: 95,
chart,
timeBucket: allowedTimeBucketForPeriodAll,
@@ -1164,7 +1170,6 @@ export class ExperimentController {
e.pid = {pid:FixedString(12)}
AND e.experimentId = {experimentId:String}
AND e.created BETWEEN {groupFrom:String} AND {groupTo:String}
- AND c.profileId IS NOT NULL
AND c.created BETWEEN {groupFrom:String} AND {groupTo:String}
AND c.created >= e.created
AND ${matchCondition}
diff --git a/backend/apps/cloud/src/goal/entity/goal.entity.ts b/backend/apps/cloud/src/goal/entity/goal.entity.ts
index 4778ba033..342c8d21d 100644
--- a/backend/apps/cloud/src/goal/entity/goal.entity.ts
+++ b/backend/apps/cloud/src/goal/entity/goal.entity.ts
@@ -17,7 +17,6 @@ export enum GoalType {
export enum GoalMatchType {
EXACT = 'exact',
CONTAINS = 'contains',
- REGEX = 'regex',
}
export interface MetadataFilter {
diff --git a/backend/apps/cloud/src/goal/goal.service.ts b/backend/apps/cloud/src/goal/goal.service.ts
index 5f7b15da5..e5d9e317e 100644
--- a/backend/apps/cloud/src/goal/goal.service.ts
+++ b/backend/apps/cloud/src/goal/goal.service.ts
@@ -1,6 +1,13 @@
import { Injectable } from '@nestjs/common'
import { InjectRepository } from '@nestjs/typeorm'
-import { FindManyOptions, FindOneOptions, Repository, ILike } from 'typeorm'
+import {
+ FindManyOptions,
+ FindOneOptions,
+ Repository,
+ ILike,
+ UpdateResult,
+ DeleteResult,
+} from 'typeorm'
import { Pagination, PaginationOptionsInterface } from '../common/pagination'
import { Goal } from './entity/goal.entity'
@@ -26,15 +33,16 @@ export class GoalService {
? Math.min(Math.max(options.skip, 0), 50_000)
: 0
- let finalWhere: FindManyOptions<Goal>['where'] = where
+ const normalizedWhere = Array.isArray(where) ? where : [where ?? {}]
+ let finalWhere: FindManyOptions<Goal>['where'] = normalizedWhere
if (search && search.trim()) {
const searchPattern = `%${search.trim()}%`
// Use array of where conditions for OR with the base where conditions
- finalWhere = [
- { ...where, name: ILike(searchPattern) },
- { ...where, value: ILike(searchPattern) },
- ]
+ finalWhere = normalizedWhere.flatMap(condition => [
+ { ...condition, name: ILike(searchPattern) },
+ { ...condition, value: ILike(searchPattern) },
+ ])
}
const [results, total] = await this.goalsRepository.findAndCount({
@@ -83,11 +91,11 @@ export class GoalService {
return this.goalsRepository.save(goalData)
}
- async update(id: string, goalData: Partial<Goal>): Promise<any> {
+ async update(id: string, goalData: Partial<Goal>): Promise<UpdateResult> {
return this.goalsRepository.update(id, goalData)
}
- async delete(id: string): Promise<any> {
+ async delete(id: string): Promise<DeleteResult> {
return this.goalsRepository.delete(id)
}
}
diff --git a/backend/apps/cloud/src/integrations/discord/discord.service.ts b/backend/apps/cloud/src/integrations/discord/discord.service.ts
index 838f61233..22f48c4d7 100644
--- a/backend/apps/cloud/src/integrations/discord/discord.service.ts
+++ b/backend/apps/cloud/src/integrations/discord/discord.service.ts
@@ -19,7 +19,7 @@ export class DiscordService extends WebhookAbcService {
const host = url.hostname.toLowerCase()
if (
url.protocol !== 'https:' ||
- host !== 'discord.com' ||
+ (host !== 'discord.com' && !host.endsWith('.discord.com')) ||
!url.pathname.startsWith('/api/webhooks/')
) {
this.logger.warn('Refusing to send Discord webhook: invalid URL')
diff --git a/backend/apps/cloud/src/revenue/adapters/paddle.adapter.ts b/backend/apps/cloud/src/revenue/adapters/paddle.adapter.ts
index 78d2006b1..b588a83b0 100644
--- a/backend/apps/cloud/src/revenue/adapters/paddle.adapter.ts
+++ b/backend/apps/cloud/src/revenue/adapters/paddle.adapter.ts
@@ -78,6 +78,7 @@ interface PaddleListResponse<T> {
@Injectable()
export class PaddleAdapter {
private readonly baseUrl = 'https://api.paddle.com'
+ private readonly PADDLE_REQUEST_TIMEOUT = 20000
constructor(
private readonly logger: AppLoggerService,
@@ -85,9 +86,18 @@ export class PaddleAdapter {
private readonly currencyService: CurrencyService,
) {}
- async validateApiKey(apiKey: string): Promise<boolean> {
+ async validateApiKey(
+ apiKey: string,
+ timeoutMs = this.PADDLE_REQUEST_TIMEOUT,
+ ): Promise<boolean> {
+ const controller = new AbortController()
+ const timeout = setTimeout(() => {
+ controller.abort()
+ }, timeoutMs)
+
try {
const response = await fetch(`${this.baseUrl}/event-types`, {
+ signal: controller.signal,
headers: {
Authorization: `Bearer ${apiKey}`,
'Content-Type': 'application/json',
@@ -96,8 +106,14 @@ export class PaddleAdapter {
return response.ok
} catch (error) {
- this.logger.error({ error }, 'Failed to validate Paddle API key')
+ if (error.name === 'AbortError') {
+ this.logger.error('Paddle API request timed out')
+ } else {
+ this.logger.error({ error }, 'Failed to validate Paddle API key')
+ }
return false
+ } finally {
+ clearTimeout(timeout)
}
}
@@ -179,15 +195,34 @@ export class PaddleAdapter {
params.append('after', cursor)
}
- const response = await fetch(
- `${this.baseUrl}/transactions?${params.toString()}`,
- {
- headers: {
- Authorization: `Bearer ${apiKey}`,
- 'Content-Type': 'application/json',
+ const controller = new AbortController()
+ const timeout = setTimeout(() => {
+ controller.abort()
+ }, this.PADDLE_REQUEST_TIMEOUT)
+
+ let response: Response
+ try {
+ response = await fetch(
+ `${this.baseUrl}/transactions?${params.toString()}`,
+ {
+ signal: controller.signal,
+ headers: {
+ Authorization: `Bearer ${apiKey}`,
+ 'Content-Type': 'application/json',
+ },
},
- },
- )
+ )
+ } catch (error) {
+ if (error.name === 'AbortError') {
+ this.logger.error(
+ 'Paddle API request timed out fetching transactions',
+ )
+ throw new Error('Paddle API request timed out')
+ }
+ throw error
+ } finally {
+ clearTimeout(timeout)
+ }
if (!response.ok) {
const errorText = await response.text()
@@ -237,15 +272,32 @@ export class PaddleAdapter {
params.append('after', cursor)
}
- const response = await fetch(
- `${this.baseUrl}/adjustments?${params.toString()}`,
- {
- headers: {
- Authorization: `Bearer ${apiKey}`,
- 'Content-Type': 'application/json',
+ const controller = new AbortController()
+ const timeout = setTimeout(() => {
+ controller.abort()
+ }, this.PADDLE_REQUEST_TIMEOUT)
+
+ let response: Response
+ try {
+ response = await fetch(
+ `${this.baseUrl}/adjustments?${params.toString()}`,
+ {
+ signal: controller.signal,
+ headers: {
+ Authorization: `Bearer ${apiKey}`,
+ 'Content-Type': 'application/json',
+ },
},
- },
- )
+ )
+ } catch (error) {
+ if (error.name === 'AbortError') {
+ this.logger.error('Paddle API request timed out fetching adjustments')
+ throw new Error('Paddle API request timed out')
+ }
+ throw error
+ } finally {
+ clearTimeout(timeout)
+ }
if (!response.ok) {
const errorText = await response.text()
diff --git a/backend/apps/cloud/src/revenue/dto/connect-paddle.dto.ts b/backend/apps/cloud/src/revenue/dto/update-revenue-currency.dto.ts
similarity index 100%
rename from backend/apps/cloud/src/revenue/dto/connect-paddle.dto.ts
rename to backend/apps/cloud/src/revenue/dto/update-revenue-currency.dto.ts
diff --git a/backend/apps/cloud/src/revenue/revenue.controller.ts b/backend/apps/cloud/src/revenue/revenue.controller.ts
index 83a4b4ca6..83467c863 100644
--- a/backend/apps/cloud/src/revenue/revenue.controller.ts
+++ b/backend/apps/cloud/src/revenue/revenue.controller.ts
@@ -25,7 +25,7 @@ import { CurrentUserId } from '../auth/decorators/current-user-id.decorator'
import { RevenueService } from './revenue.service'
import { PaddleAdapter } from './adapters/paddle.adapter'
import { StripeAdapter } from './adapters/stripe.adapter'
-import { UpdateRevenueCurrencyDto } from './dto/connect-paddle.dto'
+import { UpdateRevenueCurrencyDto } from './dto/update-revenue-currency.dto'
import { ConnectRevenueDto } from './dto/connect-revenue.dto'
import { GetRevenueDto, GetRevenueTransactionsDto } from './dto/get-revenue.dto'
import {
diff --git a/backend/apps/cloud/src/user/dto/update-user.dto.ts b/backend/apps/cloud/src/user/dto/update-user.dto.ts
index dc6025031..830a4e0ea 100644
--- a/backend/apps/cloud/src/user/dto/update-user.dto.ts
+++ b/backend/apps/cloud/src/user/dto/update-user.dto.ts
@@ -33,7 +33,7 @@ export class UpdateUserProfileDTO {
@ApiProperty({ required: false, nullable: true })
@Matches(
- /^https:\/\/discord\.com\/api\/webhooks\/\d{17,20}\/[a-zA-Z0-9_-]+$/,
+ /^https:\/\/(?:[a-zA-Z0-9-]+\.)*discord\.com\/api\/webhooks\/\d{17,20}\/[a-zA-Z0-9_-]+$/,
{
message: 'Invalid Discord Webhook URL',
},
diff --git a/backend/apps/community/src/goal/entity/goal.entity.ts b/backend/apps/community/src/goal/entity/goal.entity.ts
index da63701a1..90de27315 100644
--- a/backend/apps/community/src/goal/entity/goal.entity.ts
+++ b/backend/apps/community/src/goal/entity/goal.entity.ts
@@ -6,7 +6,6 @@ export enum GoalType {
export enum GoalMatchType {
EXACT = 'exact',
CONTAINS = 'contains',
- REGEX = 'regex',
}
export interface MetadataFilter {