Fix Redis lazy connect race condition causing 500 on first request

Author: MansiVisuals

src/lib/rate-limit.ts

@@ -56,11 +56,6 @@ function getIdentifier(request: NextRequest, prefix: string = '', customKey?: st
 
 async function getRateLimitEntry(identifier: string): Promise<RateLimitEntry | null> {
   const redis = getRedis()
-  
-  if (redis.status !== 'ready') {
-    await redis.connect()
-  }
-  
   const data = await redis.get(identifier)
   if (!data) return null
 
@@ -78,22 +73,12 @@ async function setRateLimitEntry(
   ttlMs: number
 ): Promise<void> {
   const redis = getRedis()
-  
-  if (redis.status !== 'ready') {
-    await redis.connect()
-  }
-  
   const ttlSeconds = Math.ceil(ttlMs / 1000)
   await redis.setex(identifier, ttlSeconds, JSON.stringify(entry))
 }
 
 async function deleteRateLimitEntry(identifier: string): Promise<void> {
   const redis = getRedis()
-  
-  if (redis.status !== 'ready') {
-    await redis.connect()
-  }
-  
   await redis.del(identifier)
 }
 
@@ -300,10 +285,6 @@ export async function getRateLimitedEntries(): Promise<Array<{
   try {
     const redis = getRedis()
 
-    if (redis.status !== 'ready') {
-      await redis.connect()
-    }
-
     // Use SCAN instead of KEYS to avoid blocking Redis on large datasets
     const lockedEntries: Array<{
       key: string
@@ -359,11 +340,6 @@ export async function getRateLimitedEntries(): Promise<Array<{
 export async function clearRateLimitByKey(key: string): Promise<number> {
   try {
     const redis = getRedis()
-
-    if (redis.status !== 'ready') {
-      await redis.connect()
-    }
-
     const deleted = await redis.del(key)
     if (deleted === 0) {
       logWarn(`Rate limit key not found in Redis: ${key}`)
@@ -387,10 +363,6 @@ export async function clearAllRateLimits(): Promise<number> {
   try {
     const redis = getRedis()
 
-    if (redis.status !== 'ready') {
-      await redis.connect()
-    }
-
     let clearedCount = 0
     let cursor = '0'
 

src/lib/redis.ts

@@ -35,7 +35,6 @@ export function getRedis(): IORedis {
     password: process.env.REDIS_PASSWORD,
     maxRetriesPerRequest: 3,
     enableReadyCheck: true,
-    lazyConnect: true,
     retryStrategy: (times) => {
       if (times > 3) {
         logError('Redis connection failed after 3 retries')

src/lib/token-revocation.ts

@@ -31,10 +31,6 @@ import { logWarn } from './logging'
 export async function revokeToken(token: string, expiresIn: number): Promise<void> {
   const redis = getRedis()
 
-  if (redis.status !== 'ready') {
-    await redis.connect()
-  }
-
   // Use the token signature (last part) as the key to save space
   // Format: blacklist:token:{signature}
   const tokenParts = token.split('.')
@@ -63,9 +59,6 @@ export async function revokeToken(token: string, expiresIn: number): Promise<voi
 export async function isTokenRevoked(token: string): Promise<boolean> {
   const redis = getRedis()
 
-  if (redis.status !== 'ready') {
-    await redis.connect()
-  }
 
   const tokenParts = token.split('.')
   const signature = tokenParts[tokenParts.length - 1]
@@ -90,9 +83,6 @@ export async function isTokenRevoked(token: string): Promise<boolean> {
 export async function revokeAllUserTokens(userId: string): Promise<void> {
   const redis = getRedis()
 
-  if (redis.status !== 'ready') {
-    await redis.connect()
-  }
 
   // Store a flag that user's session is invalidated
   // This can be checked before validating any token
@@ -116,9 +106,6 @@ export async function revokeAllUserTokens(userId: string): Promise<void> {
 export async function isUserTokensRevoked(userId: string, tokenIssuedAt?: number): Promise<boolean> {
   const redis = getRedis()
 
-  if (redis.status !== 'ready') {
-    await redis.connect()
-  }
 
   const key = `blacklist:user:${userId}`
   const revocationTimestamp = await redis.get(key)
@@ -149,9 +136,6 @@ export async function isUserTokensRevoked(userId: string, tokenIssuedAt?: number
 export async function clearUserRevocation(userId: string): Promise<void> {
   const redis = getRedis()
 
-  if (redis.status !== 'ready') {
-    await redis.connect()
-  }
 
   const key = `blacklist:user:${userId}`
   await redis.del(key)