Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
perf(backend:redis): lazy-load Redis when configured.
johaven2cb7d4e974bf
diff --git a/backend/src/common/functions.ts b/backend/src/common/functions.tsindex 6d613edb..6560f674 100755--- a/backend/src/common/functions.ts+++ b/backend/src/common/functions.ts@@ -13,10 +13,6 @@ const DUMMY_PASSWORD_HASH = '$2a$10$tjgA0v/cGe.vAfAJgNHpZeNrIdMxu82i0kGEjbtYkaVUexport const regexpEscape = /[.*+?^${}()|[\]\\]/g-export async function loadOptionalModule(moduleName: string): Promise<any> {- return await import(moduleName)-}-export async function sleep(ms: number): Promise<void> {await setTimeout(ms)}diff --git a/backend/src/infrastructure/cache/adapters/redis-cache.adapter.ts b/backend/src/infrastructure/cache/adapters/redis-cache.adapter.tsindex d207addc..e64609c4 100644--- a/backend/src/infrastructure/cache/adapters/redis-cache.adapter.ts+++ b/backend/src/infrastructure/cache/adapters/redis-cache.adapter.ts@@ -1,5 +1,5 @@import { Injectable, Logger } from '@nestjs/common'-import { createClient, type RedisClientOptions, type RedisClientType } from 'redis'+import type { RedisClientOptions, RedisClientType } from 'redis'import { createCacheKeySlug } from '../../../common/shared'import { configuration } from '../../../configuration/config.environment'import { INFRASTRUCTURE_CONNECTION_RETRY_DELAY, INFRASTRUCTURE_DEPENDENCY } from '../../availability/availability.constants'@@ -13,18 +13,19 @@ export class RedisCacheAdapter implements Cache {defaultTTL: number = configuration.cache.ttlinfiniteExpiration = -1private readonly logger = new Logger(Cache.name.toUpperCase())- private readonly client: RedisClientType+ private client: RedisClientTypeprivate readonly redactedRedisUrl = redactRedisUrl(configuration.cache.redis)constructor(private readonly availability: Availability) {this.availability.register(INFRASTRUCTURE_DEPENDENCY.CACHE)+ }++ async onModuleInit(): Promise<void> {+ const { createClient } = await import('redis')this.client = createClient({url: configuration.cache.redis,socket: { noDelay: true, reconnectStrategy: this.reconnectStrategy }} satisfies RedisClientOptions)- }-- async onModuleInit(): Promise<void> {this.client.on('error', (e: Error) => {this.availability.setAvailable(INFRASTRUCTURE_DEPENDENCY.CACHE, this.client.isReady)this.logger.error(e.message || e)diff --git a/backend/src/infrastructure/websocket/adapters/redis.adapter.ts b/backend/src/infrastructure/websocket/adapters/redis.adapter.tsindex 03898562..fd99eae6 100644--- a/backend/src/infrastructure/websocket/adapters/redis.adapter.ts+++ b/backend/src/infrastructure/websocket/adapters/redis.adapter.ts@@ -1,10 +1,9 @@import { Logger } from '@nestjs/common'-import { NestFastifyApplication } from '@nestjs/platform-fastify'+import type { NestFastifyApplication } from '@nestjs/platform-fastify'import { IoAdapter } from '@nestjs/platform-socket.io'import type { createAdapter as createRedisAdapter } from '@socket.io/redis-adapter'import type { RedisClientType } from 'redis'-import { ServerOptions } from 'socket.io'-import { loadOptionalModule } from '../../../common/functions'+import type { ServerOptions } from 'socket.io'import { INFRASTRUCTURE_CONNECTION_RETRY_DELAY, INFRASTRUCTURE_DEPENDENCY } from '../../availability/availability.constants'import { Availability } from '../../availability/availability.service'import { connectionErrorMessage, isRetryableConnectionError, redactRedisUrl } from '../../utils'@@ -34,8 +33,8 @@ export class RedisAdapter extends IoAdapter {async connect(redisUrl: WebSocketConfig['redis']): Promise<void> {const redactedRedisUrl = redactRedisUrl(redisUrl)- const { createAdapter } = await loadOptionalModule('@socket.io/redis-adapter')- const { createClient } = await loadOptionalModule('redis')+ const { createAdapter } = await import('@socket.io/redis-adapter')+ const { createClient } = await import('redis')const pubClient = createClient({ url: redisUrl, socket: { noDelay: true, reconnectStrategy: this.reconnectStrategy } })const subClient = pubClient.duplicate()this.pubClient = pubClient