Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: improve cache purging process #1022

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: improve cache purging process #1022

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions packages/frontend/middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ const redis = new Redis({
token: process.env.UPSTASH_REDIS_REST_TOKEN!,
})

const THREE_DAYS_IN_MS = 3 * 24 * 60 * 60 * 1000
const THIRTY_DAYS_IN_MS = 30 * 24 * 60 * 60 * 1000
const REDIS_DATA_VERSION = '1'

interface RedisResponse {
value: string
timestamp: number
version: string // in case we want to purge all existing data and start fresh
}

async function isIPBlockedInRedis(ip: string, currentTime: number) {
Expand All @@ -27,9 +29,13 @@ async function isIPBlockedInRedis(ip: string, currentTime: number) {
let isIPBlocked = false
if (redisData) {
try {
const { value, timestamp } = redisData
// check if entry is valid and is not more than 3 days old
if (value === BLOCKED_IP_VALUE && currentTime - timestamp <= THREE_DAYS_IN_MS) {
const { value, timestamp, version = '' } = redisData
// check if entry is valid, version is correct and data is not more than 30 days old
if (
value === BLOCKED_IP_VALUE &&
version === REDIS_DATA_VERSION &&
currentTime - timestamp <= THIRTY_DAYS_IN_MS
) {
isIPBlocked = true
}
} catch (error) {
Expand Down Expand Up @@ -62,7 +68,7 @@ export async function middleware(request: NextRequest) {
const isIPFromVPN = await isVPN(ip)
if (isIPFromVPN && url.pathname !== '/blocked') {
try {
await redis.set(ip, { value: BLOCKED_IP_VALUE, timestamp: currentTime })
await redis.set(ip, { value: BLOCKED_IP_VALUE, timestamp: currentTime, version: REDIS_DATA_VERSION })
} catch (error) {
console.error('Failed to set data in Redis:', error)
}
Expand Down