Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 20 additions & 2 deletions middleware.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,38 @@ describe('middleware', () => {
expect(response.status).toBe(429);
});

it('returns too many requests error body when rate limit fails', async () => {
it('returns too many requests JSON body for non-streak route when rate limit fails', async () => {
vi.mocked(rateLimit).mockResolvedValue({
success: false,
limit: 60,
remaining: 0,
reset: 123456789,
});

const request = new NextRequest('http://localhost:3000/api/streak?user=octocat');
const request = new NextRequest('http://localhost:3000/api/github');
const response = await middleware(request);

await expect(response.json()).resolves.toEqual({
error: 'Too many requests',
});

expect(response.headers.get('Content-Type')).toContain('application/json');
});

it('returns SVG body for streak route when rate limit fails', async () => {
vi.mocked(rateLimit).mockResolvedValue({
success: false,
limit: 60,
remaining: 0,
reset: 123456789,
});

const request = new NextRequest('http://localhost:3000/api/streak?user=octocat');
const response = await middleware(request);

await expect(response.text()).resolves.toContain('<svg');
expect(response.status).toBe(429);
expect(response.headers.get('Content-Type')).toContain('image/svg+xml');
});

it('sets X-RateLimit-Limit header when rate limit succeeds', async () => {
Expand Down
39 changes: 33 additions & 6 deletions middleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@ import { NextResponse } from 'next/server';
import type { NextRequest } from 'next/server';
import { rateLimit } from './lib/rate-limit';

function generateRateLimitSVG() {
return `
<svg xmlns="http://www.w3.org/2000/svg" width="420" height="120" viewBox="0 0 420 120">
<rect width="420" height="120" rx="16" fill="#0f172a"/>
<text x="210" y="52" text-anchor="middle" fill="#f8fafc" font-family="Arial, sans-serif" font-size="20" font-weight="700">
Rate Limit Exceeded
</text>
<text x="210" y="82" text-anchor="middle" fill="#cbd5e1" font-family="Arial, sans-serif" font-size="14">
Please try again later
</text>
</svg>`;
}

/**
* Middleware to enforce rate limiting on specific API routes.
*
Expand All @@ -26,26 +39,40 @@ export async function middleware(request: NextRequest) {
// 60 requests per 60,000ms (1 minute)
const result = await rateLimit(ip, 60, 60000);

const rateLimitHeaders = {
'X-RateLimit-Limit': result.limit.toString(),
'X-RateLimit-Remaining': result.remaining.toString(),
'X-RateLimit-Reset': result.reset.toString(),
};

if (!result.success) {
if (request.nextUrl.pathname.startsWith('/api/streak')) {
return new NextResponse(generateRateLimitSVG(), {
status: 429,
headers: {
'Content-Type': 'image/svg+xml',
...rateLimitHeaders,
},
});
}

return NextResponse.json(
{ error: 'Too many requests' },
{
status: 429,
headers: {
'Content-Type': 'application/json',
'X-RateLimit-Limit': result.limit.toString(),
'X-RateLimit-Remaining': result.remaining.toString(),
'X-RateLimit-Reset': result.reset.toString(),
...rateLimitHeaders,
},
}
);
}

// Add rate limit headers to the response for successful requests
const response = NextResponse.next();
response.headers.set('X-RateLimit-Limit', result.limit.toString());
response.headers.set('X-RateLimit-Remaining', result.remaining.toString());
response.headers.set('X-RateLimit-Reset', result.reset.toString());
response.headers.set('X-RateLimit-Limit', rateLimitHeaders['X-RateLimit-Limit']);
response.headers.set('X-RateLimit-Remaining', rateLimitHeaders['X-RateLimit-Remaining']);
response.headers.set('X-RateLimit-Reset', rateLimitHeaders['X-RateLimit-Reset']);

return response;
}
Expand Down
Loading