Rename RedisClient.ts to RedisClientHolder.ts

Author: aacic

server/src/app.middlewares.js

@@ -12,27 +12,23 @@ import { decode as urlJsonDecode } from '#shared/urljson.js'
 import jsonwebtoken from 'jsonwebtoken'
 import session from 'express-session'
 import connectRedis from 'connect-redis'
-import { createClient } from 'redis'
+import RedisClientHolder from '#src/redis/RedisClientHolder'
 
 const basepath = serverconfig.basepath || ''
 
 export function setAppMiddlewares(app) {
 	if (serverconfig.redis) {
 		const RedisStore = connectRedis(session)
+
+		const redisClientHolder = RedisClientHolder.getInstance(serverconfig.redis.url)
 		// Create a Redis client
-		const redisClient = createClient({
-			url: serverconfig.redis.url,
-			legacyMode: true // Required if using connect-redis
-		})
+		const redisClient = redisClientHolder.getClient()
 
 		// Configure session middleware with Redis store
 		const redisStore = new RedisStore({
 			client: redisClient
 		})
 
-		redisClient.connect().catch(console.error)
-		redisClient.on('connect', () => console.log('Connected to Redis'))
-
 		app.use(
 			session({
 				store: redisStore,

server/src/redis/RedisClient.ts server/src/redis/RedisClientHolder.tsserver/src/redis/RedisClient.ts renamed to server/src/redis/RedisClientHolder.ts

@@ -1,12 +1,19 @@
 import { createClient } from 'redis'
 import type { RedisClientType } from 'redis'
 
-export default class RedisClient {
-	private static instance: RedisClient | null = null
-	private client: RedisClientType
+export default class RedisClientHolder {
+	private static instance: RedisClientHolder | null = null
+	private readonly client: RedisClientType
+
+	public getClient(): RedisClientType {
+		return this.client
+	}
 
 	private constructor(redisUrl: string) {
-		this.client = createClient({ url: redisUrl })
+		this.client = createClient({
+			url: redisUrl,
+			legacyMode: true // Required if using connect-redis
+		})
 
 		this.client.on('error', (err: any) => {
 			console.error('Redis Client Error:', err)
@@ -23,11 +30,11 @@ export default class RedisClient {
 		this.client.connect()
 	}
 
-	public static getInstance(redisUrl: string): RedisClient {
-		if (!RedisClient.instance) {
-			RedisClient.instance = new RedisClient(redisUrl)
+	public static getInstance(redisUrl: string): RedisClientHolder {
+		if (!RedisClientHolder.instance) {
+			RedisClientHolder.instance = new RedisClientHolder(redisUrl)
 		}
-		return RedisClient.instance
+		return RedisClientHolder.instance
 	}
 
 	public async set(key: string, value: string): Promise<void> {

server/src/wsisessions/SessionManager.ts

@@ -1,4 +1,4 @@
-import RedisClient from '../redis/RedisClient.ts'
+import RedisClientHolder from '../redis/RedisClientHolder.ts'
 
 export class SessionData {
 	public imageSessionId: string
@@ -12,10 +12,10 @@ export class SessionData {
 
 export default class SessionManager {
 	private static instance: SessionManager
-	private redisClient: RedisClient
+	private redisClient: RedisClientHolder
 
 	private constructor(redisUrl: string) {
-		this.redisClient = RedisClient.getInstance(redisUrl)
+		this.redisClient = RedisClientHolder.getInstance(redisUrl)
 	}
 
 	public static getInstance(redisUrl: string): SessionManager {