diff --git a/src/middleware/rateLimit.js b/src/middleware/rateLimit.js new file mode 100644 index 0000000..c734f4c --- /dev/null +++ b/src/middleware/rateLimit.js @@ -0,0 +1,19 @@ +// Fixed-window rate limiter: at most `limit` calls per key in each window of +// `windowMs`, with windows starting at multiples of windowMs. +export function createRateLimiter({ limit, windowMs, now = Date.now }) { + const counts = new Map(); + let currentWindow = null; + + return function allow(key) { + const window = Math.floor(now() / windowMs); + if (window !== currentWindow) { + // A new window began, so counts from earlier windows are no longer needed. + counts.clear(); + currentWindow = window; + } + const count = counts.get(key) ?? 0; + if (count >= limit) return false; + counts.set(key, count + 1); + return true; + }; +} diff --git a/src/routes/notes.js b/src/routes/notes.js index 8248dc1..c94b330 100644 --- a/src/routes/notes.js +++ b/src/routes/notes.js @@ -1,8 +1,28 @@ import { createNote, deleteNote, getNote, listNotes, updateNote } from '../services/notes.js'; import { noteSummary } from '../utils/format.js'; +const DEFAULT_PAGE_SIZE = 5; +const MAX_PAGE_SIZE = 50; + +// Parses a positive integer query param, falling back to the default when missing or invalid. +function positiveInt(value, fallback) { + const n = Number.parseInt(value, 10); + return Number.isInteger(n) && n >= 1 ? n : fallback; +} + +function listPage(req) { + const page = positiveInt(req.query?.page, 1); + const pageSize = Math.min(positiveInt(req.query?.pageSize, DEFAULT_PAGE_SIZE), MAX_PAGE_SIZE); + const notes = listNotes(req.user.id); + const start = (page - 1) * pageSize; + return { + status: 200, + body: { items: notes.slice(start, start + pageSize).map(noteSummary), page, pageSize, total: notes.length }, + }; +} + export const notesRoutes = { - 'GET /notes': (req) => ({ status: 200, body: listNotes(req.user.id).map(noteSummary) }), + 'GET /notes': listPage, 'GET /notes/:id': (req) => { const note = getNote(req.user.id, req.params.id); return note ? { status: 200, body: note } : { status: 404, body: { error: 'not found' } }; diff --git a/src/utils/format.js b/src/utils/format.js index 24a3a09..4c90f41 100644 --- a/src/utils/format.js +++ b/src/utils/format.js @@ -3,7 +3,7 @@ // Dates are shown as YYYY-MM-DD in UTC. export function formatDate(ms) { const d = new Date(ms); - const month = String(d.getUTCMonth()).padStart(2, '0'); + const month = String(d.getUTCMonth() + 1).padStart(2, '0'); const day = String(d.getUTCDate()).padStart(2, '0'); return `${d.getUTCFullYear()}-${month}-${day}`; } diff --git a/tests/api.test.js b/tests/api.test.js index 32d499e..9254ec0 100644 --- a/tests/api.test.js +++ b/tests/api.test.js @@ -15,11 +15,34 @@ test('notes need a valid token', () => { assert.equal(handle({ method: 'GET', path: '/notes', headers: {} }).status, 401); }); -test('lists only my notes, newest first', () => { +test('lists only my notes, newest first, paginated', () => { const res = as('u1', { method: 'GET', path: '/notes' }); assert.equal(res.status, 200); - assert.equal(res.body.length, 8); - assert.equal(res.body[0].title, 'Car service'); + assert.equal(res.body.total, 8); + assert.equal(res.body.page, 1); + assert.equal(res.body.pageSize, 5); + assert.equal(res.body.items.length, 5); + assert.equal(res.body.items[0].title, 'Car service'); +}); + +test('pagination returns later pages without overlap', () => { + const p1 = as('u1', { method: 'GET', path: '/notes', query: { page: '1', pageSize: '5' } }); + const p2 = as('u1', { method: 'GET', path: '/notes', query: { page: '2', pageSize: '5' } }); + assert.equal(p2.body.items.length, 3); + const ids = [...p1.body.items, ...p2.body.items].map((n) => n.id); + assert.equal(new Set(ids).size, 8); + const p3 = as('u1', { method: 'GET', path: '/notes', query: { page: '3' } }); + assert.deepEqual(p3.body.items, []); + assert.equal(p3.body.total, 8); +}); + +test('pageSize is capped at 50 and bad values fall back to defaults', () => { + const big = as('u1', { method: 'GET', path: '/notes', query: { pageSize: '500' } }); + assert.equal(big.body.pageSize, 50); + assert.equal(big.body.items.length, 8); + const bad = as('u1', { method: 'GET', path: '/notes', query: { page: '0', pageSize: 'abc' } }); + assert.equal(bad.body.page, 1); + assert.equal(bad.body.pageSize, 5); }); test('creates and deletes a note', () => { diff --git a/tests/format.test.js b/tests/format.test.js new file mode 100644 index 0000000..e255dec --- /dev/null +++ b/tests/format.test.js @@ -0,0 +1,9 @@ +import { test } from 'node:test'; +import assert from 'node:assert/strict'; +import { formatDate } from '../src/utils/format.js'; + +test('formatDate uses 1-based months', () => { + assert.equal(formatDate(Date.UTC(2026, 2, 15)), '2026-03-15'); + assert.equal(formatDate(Date.UTC(2026, 0, 1)), '2026-01-01'); + assert.equal(formatDate(Date.UTC(2026, 11, 31)), '2026-12-31'); +}); diff --git a/tests/rateLimit.test.js b/tests/rateLimit.test.js new file mode 100644 index 0000000..aa06295 --- /dev/null +++ b/tests/rateLimit.test.js @@ -0,0 +1,50 @@ +import { test } from 'node:test'; +import assert from 'node:assert/strict'; +import { createRateLimiter } from '../src/middleware/rateLimit.js'; + +function setup(limit = 3, windowMs = 1000) { + const clock = { t: 0 }; + const allow = createRateLimiter({ limit, windowMs, now: () => clock.t }); + return { clock, allow }; +} + +test('allows up to limit calls then blocks', () => { + const { allow } = setup(); + assert.deepEqual([1, 2, 3, 4, 5].map(() => allow('a')), [true, true, true, false, false]); +}); + +test('keys are counted independently', () => { + const { allow } = setup(1); + assert.equal(allow('a'), true); + assert.equal(allow('a'), false); + assert.equal(allow('b'), true); +}); + +test('counts reset when the next window starts', () => { + const { clock, allow } = setup(2, 1000); + clock.t = 999; + assert.equal(allow('a'), true); + assert.equal(allow('a'), true); + assert.equal(allow('a'), false); + clock.t = 1000; + assert.equal(allow('a'), true); +}); + +test('windows are aligned to multiples of windowMs, not first call', () => { + const { clock, allow } = setup(1, 1000); + clock.t = 1900; + assert.equal(allow('a'), true); + clock.t = 1999; + assert.equal(allow('a'), false); + clock.t = 2000; + assert.equal(allow('a'), true); +}); + +test('blocked calls stay blocked for the rest of the window', () => { + const { clock, allow } = setup(1, 1000); + assert.equal(allow('a'), true); + clock.t = 500; + assert.equal(allow('a'), false); + clock.t = 999; + assert.equal(allow('a'), false); +});