📈 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
web: refactor account limit enforcement to use effective entitlements
Blue Mousef984b494e378
diff --git a/admin/src/billing/pricing.ts b/admin/src/billing/pricing.tsindex ecab32fe9..bd48c5bf0 100644--- a/admin/src/billing/pricing.ts+++ b/admin/src/billing/pricing.ts@@ -64,6 +64,7 @@ export const planEntitlements = {} as constconst sessionReplayQuotas: Partial<Record<PlanCode, number>> = {+ [PlanCode.freelancer]: 5000,[PlanCode['100k']]: 5000,[PlanCode['200k']]: 10000,[PlanCode['500k']]: 25000,@@ -78,8 +79,11 @@ const sessionReplayQuotas: Partial<Record<PlanCode, number>> = {[PlanCode['50m']]: 2500000,}-const numberValue = (source: Record<string, unknown> | null, key: string) =>- source && typeof source[key] === 'number' ? (source[key] as number) : null+const numberValue = (source: Record<string, unknown> | null, key: string) => {+ const value = source?.[key]++ return typeof value === 'number' && Number.isFinite(value) ? value : null+}export const getEffectivePlanType = (user: User): PlanType | null => {if (user.planType) return user.planType@@ -91,9 +95,11 @@ export const getEffectiveLimits = (user: User) => {const planType = getEffectivePlanType(user) || PlanType.standardconst entitlements = planEntitlements[planType]const addonWebsites =- numberValue(user.addonOverrides, 'websites') ||- numberValue(user.addonOverrides, 'additionalWebsites') ||+ numberValue(user.addonOverrides, 'websites') ??+ numberValue(user.addonOverrides, 'additionalWebsites') ??0+ const addonSessionReplays =+ numberValue(user.addonOverrides, 'sessionReplays') ?? 0const websiteOverride = numberValue(user.entitlementOverrides, 'websites')const apiOverride = numberValue(user.entitlementOverrides,@@ -103,11 +109,24 @@ export const getEffectiveLimits = (user: User) => {user.entitlementOverrides,'sessionReplaysIncluded',)+ const teamMembersOverride = numberValue(+ user.entitlementOverrides,+ 'teamMembers',+ )+ const organisationsOverride = numberValue(+ user.entitlementOverrides,+ 'organisations',+ )const replayQuota =replayOverride ??(entitlements.sessionReplaysIncluded === 'byEventTier'? sessionReplayQuotas[user.planCode] || 0: entitlements.sessionReplaysIncluded)+ const effectiveReplayQuota =+ typeof replayQuota === 'number'+ ? replayQuota + addonSessionReplays+ : replayQuota+ const includedSessionReplays = replayQuotaconst websites =websiteOverride ??(typeof entitlements.websites === 'number'@@ -118,14 +137,33 @@ export const getEffectiveLimits = (user: User) => {(typeof entitlements.apiRateLimitPerHour === 'number'? entitlements.apiRateLimitPerHour: user.maxApiKeyRequestsPerHour)+ const teamMembers =+ teamMembersOverride ??+ (typeof entitlements.teamMembers === 'number'+ ? entitlements.teamMembers+ : 'custom')+ const organisations =+ organisationsOverride ??+ (typeof entitlements.organisations === 'number'+ ? entitlements.organisations+ : 'custom')return {planType,eventBucket: eventBuckets[user.planCode] || 0,+ includedWebsites: websites,websitesIncluded:typeof websites === 'number' ? websites + addonWebsites : websites,+ effectiveProjectLimit:+ typeof websites === 'number' ? websites + addonWebsites : websites,+ maxProjects:+ typeof websites === 'number' ? websites + addonWebsites : websites,purchasedWebsiteAddons: addonWebsites,- replayQuota,+ includedSessionReplays,+ replayQuota: effectiveReplayQuota,+ purchasedSessionReplayAddons: addonSessionReplays,apiRateLimitPerHour,+ teamMembers,+ organisations,}}diff --git a/admin/src/commands/LimitsCommand.tsx b/admin/src/commands/LimitsCommand.tsxindex e83848a43..b8645f4a6 100644--- a/admin/src/commands/LimitsCommand.tsx+++ b/admin/src/commands/LimitsCommand.tsx@@ -3,6 +3,7 @@ import { Box, Text, useInput } from 'ink'import SelectInput from 'ink-select-input'import { Spinner } from '../components/Spinner.js'import { AppDataSource, User, Project, OrganisationMember } from '../db/mysql.js'+import { getEffectiveLimits } from '../billing/pricing.js'interface LimitsCommandProps {onBack: () => void@@ -13,6 +14,7 @@ type Mode = 'list' | 'detail'interface UserWithLimits extends User {projectCount: numberusagePercent: number+ effectiveProjectLimit: number | 'custom'}export function LimitsCommand({ onBack }: LimitsCommandProps) {@@ -59,13 +61,23 @@ export function LimitsCommand({ onBack }: LimitsCommandProps) {.getMany()const usersApproaching: UserWithLimits[] = (usersWithCounts as (User & { projectCount: number })[])- .map(user => ({- ...user,- projectCount: user.projectCount || 0,- usagePercent: user.maxProjects > 0- ? Math.round((user.projectCount / user.maxProjects) * 100)- : 0,- }))+ .map(user => {+ const effectiveLimits = getEffectiveLimits(user)+ const effectiveProjectLimit = effectiveLimits.effectiveProjectLimit++ return {+ ...user,+ projectCount: user.projectCount || 0,+ effectiveProjectLimit,+ usagePercent:+ typeof effectiveProjectLimit === 'number' &&+ effectiveProjectLimit > 0+ ? Math.round(+ (user.projectCount / effectiveProjectLimit) * 100,+ )+ : 0,+ }+ }).filter(user => user.usagePercent >= threshold).sort((a, b) => b.usagePercent - a.usagePercent).slice(0, 50)@@ -133,7 +145,7 @@ export function LimitsCommand({ onBack }: LimitsCommandProps) {<Text><Text color="cyan">Projects:</Text>{' '}<Text color={userWithLimits && userWithLimits.usagePercent >= 90 ? 'red' : 'yellow'} bold>- {userWithLimits?.projectCount || 0} / {selectedUser.maxProjects}+ {userWithLimits?.projectCount || 0} / {userWithLimits?.effectiveProjectLimit ?? selectedUser.maxProjects}</Text><Text color="gray"> ({userWithLimits?.usagePercent || 0}%)</Text></Text>@@ -165,7 +177,7 @@ export function LimitsCommand({ onBack }: LimitsCommandProps) {const userItems = users.map(user => {const color = user.usagePercent >= 100 ? 'red' : user.usagePercent >= 90 ? 'yellow' : 'white'return {- label: `${user.email} (${user.planCode}) - ${user.projectCount}/${user.maxProjects} projects (${user.usagePercent}%)`,+ label: `${user.email} (${user.planCode}) - ${user.projectCount}/${user.effectiveProjectLimit} projects (${user.usagePercent}%)`,value: user.id,}})diff --git a/admin/src/commands/ProjectsCommand.tsx b/admin/src/commands/ProjectsCommand.tsxindex b76e2701f..a0b7cb5aa 100644--- a/admin/src/commands/ProjectsCommand.tsx+++ b/admin/src/commands/ProjectsCommand.tsx@@ -213,7 +213,7 @@ export function ProjectsCommand({ onBack, initialProject, showListOnBack = true<Text><Text color="cyan">Plan:</Text> {selectedAdmin.planCode}</Text><Text><Text color="cyan">Created:</Text> {new Date(selectedAdmin.created).toLocaleString()}</Text><Text><Text color="cyan">2FA Enabled:</Text> {selectedAdmin.isTwoFactorAuthenticationEnabled ? 'Yes' : 'No'}</Text>- <Text><Text color="cyan">Max Projects:</Text> {selectedAdmin.maxProjects}</Text>+ <Text><Text color="cyan">Legacy Max Projects:</Text> {selectedAdmin.maxProjects}</Text></Box>{adminProjects.length > 0 && (diff --git a/admin/src/commands/UsersCommand.tsx b/admin/src/commands/UsersCommand.tsxindex df510f473..02db8984a 100644--- a/admin/src/commands/UsersCommand.tsx+++ b/admin/src/commands/UsersCommand.tsx@@ -458,13 +458,16 @@ export function UsersCommand({ onBack, initialUser, showListOnBack = true }: Use</Text><Text><Text color="cyan">Event Bucket:</Text> {effectiveLimits.eventBucket}</Text><Text><Text color="cyan">Plan Type:</Text> {selectedUser.planType || `${effectiveLimits.planType} fallback`}</Text>- <Text><Text color="cyan">Websites Included:</Text> {effectiveLimits.websitesIncluded}</Text>+ <Text><Text color="cyan">Websites Included:</Text> {effectiveLimits.includedWebsites}</Text><Text><Text color="cyan">Purchased Website Add-ons:</Text> {effectiveLimits.purchasedWebsiteAddons}</Text>+ <Text><Text color="cyan">Effective Project Limit:</Text> {effectiveLimits.effectiveProjectLimit}</Text><Text><Text color="cyan">Replay Quota:</Text> {effectiveLimits.replayQuota}</Text><Text><Text color="cyan">API Rate Limit:</Text> {effectiveLimits.apiRateLimitPerHour}/hour</Text>+ <Text><Text color="cyan">Team Members:</Text> {effectiveLimits.teamMembers}</Text>+ <Text><Text color="cyan">Organisations:</Text> {effectiveLimits.organisations}</Text><Text><Text color="cyan">Created:</Text> {new Date(selectedUser.created).toLocaleString()}</Text><Text><Text color="cyan">2FA Enabled:</Text> {selectedUser.isTwoFactorAuthenticationEnabled ? 'Yes' : 'No'}</Text>- <Text><Text color="cyan">Max Projects:</Text> {selectedUser.maxProjects}</Text>+ <Text><Text color="cyan">Legacy Max Projects:</Text> {selectedUser.maxProjects}</Text><Text><Text color="cyan">API Key:</Text> {selectedUser.apiKey ? 'Set' : 'Not set'}</Text>{selectedUser.dashboardBlockReason && (<Text>diff --git a/admin/src/entities/user.entity.ts b/admin/src/entities/user.entity.tsindex c5619c482..1c7b4124a 100644--- a/admin/src/entities/user.entity.ts+++ b/admin/src/entities/user.entity.ts@@ -86,7 +86,7 @@ export class User {@Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })updated: Date- @Column('int', { default: 50 })+ @Column('int', { default: 10 })maxProjects: number@Column('int', { default: 300 })diff --git a/web/app/lib/models/User.ts b/web/app/lib/models/User.tsindex cec386990..989b8a5ec 100644--- a/web/app/lib/models/User.ts+++ b/web/app/lib/models/User.ts@@ -116,10 +116,17 @@ export interface User {registeredWithGithub: booleanmaxEventsCount: numbermaxProjects: number+ includedWebsites: number+ effectiveProjectLimit: numbermaxApiKeyRequestsPerHour: number+ apiRateLimitPerHour: number+ includedSessionReplays: number | stringsessionReplaysIncluded: number | stringpurchasedWebsiteAddons: numberpurchasedSessionReplayAddons: number+ sessionReplayRetentionDays: number+ teamMembers: number | 'custom'+ organisations: number | 'custom'websiteAddon?: WebsiteAddon | nullsessionReplayAddon?: SessionReplayAddon | nulltierCurrency: 'USD' | 'EUR' | 'GBP' | nulldiff --git a/web/app/pages/Project/Settings/ProjectSettings.tsx b/web/app/pages/Project/Settings/ProjectSettings.tsxindex 54b67dbcc..96e83d5d6 100644--- a/web/app/pages/Project/Settings/ProjectSettings.tsx+++ b/web/app/pages/Project/Settings/ProjectSettings.tsx@@ -618,15 +618,8 @@ const ProjectSettings = () => {)const sessionReplayMaxRetentionDays = useMemo(() => {- const override = user?.entitlementOverrides?.sessionReplayRetentionDays- if (typeof override === 'number') {- return override- }- if (user?.effectivePlanType === 'enterprise') {- return 1825- }- return 30- }, [user?.effectivePlanType, user?.entitlementOverrides])+ return user?.sessionReplayRetentionDays || 30+ }, [user?.sessionReplayRetentionDays])const activeTab = useMemo<SettingsTab>(() => {const tab = searchParams.get('tab') as SettingsTabdiff --git a/web/app/pages/UserSettings/UserSettings.tsx b/web/app/pages/UserSettings/UserSettings.tsxindex 5c65c4624..5d5092e02 100644--- a/web/app/pages/UserSettings/UserSettings.tsx+++ b/web/app/pages/UserSettings/UserSettings.tsx@@ -334,7 +334,9 @@ const UserSettings = () => {subCancelURL,maxEventsCount = 0,maxProjects = 0,+ includedWebsites,maxApiKeyRequestsPerHour = 0,+ includedSessionReplays,sessionReplaysIncluded = 0,purchasedWebsiteAddons = 0,purchasedSessionReplayAddons = 0,@@ -690,6 +692,7 @@ const UserSettings = () => {: nullconst includedWebsiteLimit =currentWebsiteAddonPreview?.includedWebsites ??+ includedWebsites ??Math.max(0, (maxProjects || 0) - activeWebsiteAddonQuantity)const displayedWebsiteLimit = maxProjectsconst displayedProjectsUsage =@@ -802,9 +805,8 @@ const UserSettings = () => {: nullconst includedSessionReplayLimit =currentSessionReplayAddonPreview?.includedSessionReplays ??- (typeof sessionReplaysIncluded === 'number'- ? Math.max(0, sessionReplaysIncluded - activeSessionReplayAddonQuantity)- : sessionReplaysIncluded)+ includedSessionReplays ??+ sessionReplaysIncludedconst displayedSessionReplayLimit =currentSessionReplayAddonPreview?.totalSessionReplays ??sessionReplaysIncluded