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!

some improvements

Blue Mouseefa11248efd2
diff --git a/src/project/project.controller.ts b/src/project/project.controller.ts
index 7d5fec03b..702389ec9 100644
--- a/src/project/project.controller.ts
+++ b/src/project/project.controller.ts
@@ -23,7 +23,7 @@ import * as _size from 'lodash/size'
import * as _includes from 'lodash/includes'
import * as _omit from 'lodash/omit'
-import { ProjectService, processProjectUser } from './project.service'
+import { ProjectService, processProjectUser, deleteProjectRedis } from './project.service'
import { UserType, ACCOUNT_PLANS, PlanCode } from '../user/entities/user.entity'
import { ActionTokenType } from '../action-tokens/action-token.entity'
import { ActionTokensService } from '../action-tokens/action-tokens.service'
@@ -42,9 +42,7 @@ import { ShareDTO } from './dto/share.dto'
import { ShareUpdateDTO } from './dto/share-update.dto'
import { AppLoggerService } from '../logger/logger.service'
import {
- redis,
isValidPID,
- getRedisProjectKey,
clickhouse,
isSelfhosted,
PROJECT_INVITE_EXPIRE,
@@ -58,31 +56,6 @@ import {
import { JwtAccessTokenGuard } from 'src/auth/guards'
import { Auth, Public } from 'src/auth/decorators'
-// const updateProjectRedis = async (id: string, project: Project) => {
-// const key = getRedisProjectKey(id)
-
-// try {
-// await redis.set(
-// key,
-// JSON.stringify(project),
-// 'EX',
-// redisProjectCacheTimeout,
-// )
-// } catch {
-// await redis.del(key)
-// }
-// }
-
-export const deleteProjectRedis = async (id: string) => {
- const key = getRedisProjectKey(id)
-
- try {
- await redis.del(key)
- } catch (e) {
- console.error(`Error deleting project ${id} from redis: ${e}`)
- }
-}
-
const PROJECTS_MAXIMUM = ACCOUNT_PLANS[PlanCode.free].maxProjects
const isValidShareDTO = (share: ShareDTO): boolean => {
diff --git a/src/project/project.service.ts b/src/project/project.service.ts
index 525b9e316..4fb2c157c 100644
--- a/src/project/project.service.ts
+++ b/src/project/project.service.ts
@@ -28,6 +28,7 @@ import { Project } from './entity/project.entity'
import { ProjectShare } from './entity/project-share.entity'
import { ProjectDTO } from './dto/project.dto'
import { UserType } from '../user/entities/user.entity'
+import { UserService } from 'src/user/user.service'
import { Role } from '../project/entity/project-share.entity'
import {
isValidPID,
@@ -38,10 +39,40 @@ import {
isSelfhosted,
IP_REGEX,
ORIGINS_REGEX,
+ getRedisProjectKey,
} from '../common/constants'
dayjs.extend(utc)
+// const updateProjectRedis = async (id: string, project: Project) => {
+// const key = getRedisProjectKey(id)
+
+// try {
+// await redis.set(
+// key,
+// JSON.stringify(project),
+// 'EX',
+// redisProjectCacheTimeout,
+// )
+// } catch {
+// await redis.del(key)
+// }
+// }
+
+export const deleteProjectRedis = async (id: string) => {
+ const key = getRedisProjectKey(id)
+
+ try {
+ await redis.del(key)
+ } catch (e) {
+ console.error(`Error deleting project ${id} from redis: ${e}`)
+ }
+}
+
+export const deleteProjectsRedis = async (ids: string[]) => {
+ await Promise.all(_map(ids, deleteProjectRedis))
+}
+
export const processProjectUser = (project: Project): Project => {
const { share } = project
@@ -71,7 +102,8 @@ export class ProjectService {
private projectsRepository: Repository<Project>,
@InjectRepository(ProjectShare)
private projectShareRepository: Repository<ProjectShare>,
- ) {}
+ private userService: UserService,
+ ) { }
async paginate(
options: PaginationOptionsInterface,
@@ -368,4 +400,28 @@ export class ProjectService {
// @ts-ignore
return count
}
+
+ async clearProjectsRedisCache(uid: string): Promise<void> {
+ const projects = await this.findWhere({
+ admin: uid,
+ })
+
+ if (_isEmpty(projects)) {
+ return
+ }
+
+ const pids = _map(projects, 'id')
+
+ await deleteProjectsRedis(pids)
+ }
+
+ async clearProjectsRedisCacheByEmail(email: string): Promise<void> {
+ const user = await this.userService.findOneWhere({ email })
+
+ if (!user) {
+ return
+ }
+
+ await this.clearProjectsRedisCache(user.id)
+ }
}
diff --git a/src/task-manager/task-manager.service.ts b/src/task-manager/task-manager.service.ts
index 7ddb57a6c..90ada0254 100644
--- a/src/task-manager/task-manager.service.ts
+++ b/src/task-manager/task-manager.service.ts
@@ -402,6 +402,7 @@ export class TaskManagerService {
nextBillDate: null,
billingFrequency: BillingFrequency.Monthly,
})
+ await this.projectService.clearProjectsRedisCache(user.id)
}
}
}
@@ -433,21 +434,28 @@ export class TaskManagerService {
@Cron(CronExpression.EVERY_2_HOURS)
async trialEnd(): Promise<void> {
const users = await this.userService.find({
- where: {
+ where: [{
planCode: PlanCode.trial,
trialEndDate: LessThan(new Date()),
- }
+ },
+ {
+ planCode: PlanCode.trial,
+ trialEndDate: IsNull(),
+ }]
})
for (let i = 0; i < _size(users); ++i) {
- await this.userService.update(users[i].id, {
+ const { id, email } = users[i]
+
+ await this.userService.update(id, {
planCode: PlanCode.none,
trialEndDate: null,
})
await this.mailerService.sendEmail(
- users[i].email,
+ email,
LetterTemplate.TrialExpired,
)
+ await this.projectService.clearProjectsRedisCache(id)
}
}
diff --git a/src/user/user.controller.ts b/src/user/user.controller.ts
index 97ef7e45b..c42d26405 100644
--- a/src/user/user.controller.ts
+++ b/src/user/user.controller.ts
@@ -30,8 +30,7 @@ import * as _omit from 'lodash/omit'
import { v4 as uuidv4 } from 'uuid'
import { UserService } from './user.service'
-import { ProjectService } from '../project/project.service'
-import { deleteProjectRedis } from '../project/project.controller'
+import { ProjectService, deleteProjectRedis } from '../project/project.service'
import {
User,
UserType,
diff --git a/src/webhook/webhook.controller.ts b/src/webhook/webhook.controller.ts
index 8a08b1b90..b43a23db9 100644
--- a/src/webhook/webhook.controller.ts
+++ b/src/webhook/webhook.controller.ts
@@ -18,6 +18,7 @@ import {
} from '../user/entities/user.entity'
import { UserService } from '../user/user.service'
import { AppLoggerService } from '../logger/logger.service'
+import { ProjectService } from 'src/project/project.service'
import { WebhookService } from './webhook.service'
import { SelfhostedGuard } from '../common/guards/selfhosted.guard'
@@ -30,6 +31,7 @@ export class WebhookController {
private readonly logger: AppLoggerService,
private readonly userService: UserService,
private readonly webhookService: WebhookService,
+ private readonly projectService: ProjectService,
) {}
@UseGuards(SelfhostedGuard)
@@ -102,8 +104,10 @@ export class WebhookController {
if (uid) {
await this.userService.update(uid, updateParams)
+ await this.projectService.clearProjectsRedisCache(uid)
} else {
await this.userService.updateByEmail(email, updateParams)
+ await this.projectService.clearProjectsRedisCacheByEmail(email)
}
break
diff --git a/src/webhook/webhook.module.ts b/src/webhook/webhook.module.ts
index 554b611fb..81b898047 100644
--- a/src/webhook/webhook.module.ts
+++ b/src/webhook/webhook.module.ts
@@ -2,11 +2,12 @@ import { Module, forwardRef } from '@nestjs/common'
import { WebhookController } from './webhook.controller'
import { UserModule } from '../user/user.module'
+import { ProjectModule } from 'src/project/project.module'
import { AppLoggerModule } from '../logger/logger.module'
import { WebhookService } from './webhook.service'
@Module({
- imports: [forwardRef(() => UserModule), AppLoggerModule],
+ imports: [forwardRef(() => UserModule), ProjectModule, AppLoggerModule],
providers: [WebhookService],
exports: [WebhookService],
controllers: [WebhookController],