diff --git a/src/middleware/rateLimit.js b/src/middleware/rateLimit.js new file mode 100644 index 0000000..1c7ae80 --- /dev/null +++ b/src/middleware/rateLimit.js @@ -0,0 +1,18 @@ +// Fixed-window rate limiter. Windows start at multiples of windowMs. +export function createRateLimiter({ limit, windowMs, now = Date.now }) { + let currentWindow = -1; + let counts = new Map(); + + return function allow(key) { + const window = Math.floor(now() / windowMs); + if (window !== currentWindow) { + // Counts from earlier windows are irrelevant; drop them so keys don't accumulate. + currentWindow = window; + counts = new Map(); + } + 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..cd8f72f 100644 --- a/src/routes/notes.js +++ b/src/routes/notes.js @@ -1,8 +1,25 @@ 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; + +// Invalid or missing values fall back to the default; pageSize is capped at MAX_PAGE_SIZE. +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 { 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': (req) => ({ status: 200, body: listPage(req) }), '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..bbd60ee 100644 --- a/tests/api.test.js +++ b/tests/api.test.js @@ -18,8 +18,34 @@ test('notes need a valid token', () => { test('lists only my notes, newest first', () => { 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.items[0].title, 'Car service'); +}); + +test('GET /notes paginates with defaults', () => { + const res = as('u1', { method: 'GET', path: '/notes' }); + assert.equal(res.body.page, 1); + assert.equal(res.body.pageSize, 5); + assert.equal(res.body.items.length, 5); +}); + +test('GET /notes returns later and partial pages', () => { + const all = as('u1', { method: 'GET', path: '/notes', query: { pageSize: '50' } }).body.items; + assert.equal(all.length, 8); + const p2 = as('u1', { method: 'GET', path: '/notes', query: { page: '2' } }).body; + assert.equal(p2.page, 2); + assert.equal(p2.items.length, 3); + assert.deepEqual(p2.items.map((n) => n.id), all.slice(5).map((n) => n.id)); + const beyond = as('u1', { method: 'GET', path: '/notes', query: { page: '9' } }).body; + assert.deepEqual(beyond.items, []); + assert.equal(beyond.total, 8); +}); + +test('GET /notes caps pageSize and ignores invalid values', () => { + assert.equal(as('u1', { method: 'GET', path: '/notes', query: { pageSize: '500' } }).body.pageSize, 50); + const bad = as('u1', { method: 'GET', path: '/notes', query: { page: '-1', pageSize: 'abc' } }).body; + assert.equal(bad.page, 1); + assert.equal(bad.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..175413b --- /dev/null +++ b/tests/format.test.js @@ -0,0 +1,14 @@ +import { test } from 'node:test'; +import assert from 'node:assert/strict'; +import { formatDate, noteSummary } 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'); +}); + +test('noteSummary reports the correct created month', () => { + const note = { id: 1, title: 't', body: 'b', tags: [], createdAt: Date.UTC(2026, 2, 15) }; + assert.equal(noteSummary(note).created, '2026-03-15'); +}); diff --git a/tests/rateLimit.test.js b/tests/rateLimit.test.js new file mode 100644 index 0000000..dff3e47 --- /dev/null +++ b/tests/rateLimit.test.js @@ -0,0 +1,61 @@ +import { test } from 'node:test'; +import assert from 'node:assert/strict'; +import { createRateLimiter } from '../src/middleware/rateLimit.js'; + +function setup(limit = 2, windowMs = 1000) { + const clock = { t: 0 }; + const allow = createRateLimiter({ limit, windowMs, now: () => clock.t }); + return { clock, allow }; +} + +test('allows up to limit calls then rejects', () => { + const { allow } = setup(2); + assert.equal(allow('a'), true); + assert.equal(allow('a'), true); + assert.equal(allow('a'), false); + assert.equal(allow('a'), false); +}); + +test('keys are counted independently', () => { + const { allow } = setup(1); + assert.equal(allow('a'), true); + assert.equal(allow('b'), true); + assert.equal(allow('a'), false); + assert.equal(allow('b'), false); +}); + +test('counts reset when the next window starts', () => { + const { clock, allow } = setup(1); + assert.equal(allow('a'), true); + clock.t = 999; + assert.equal(allow('a'), false); + clock.t = 1000; + assert.equal(allow('a'), true); + assert.equal(allow('a'), false); +}); + +test('windows are aligned to multiples of windowMs, not the first call', () => { + const { clock, allow } = setup(1); + clock.t = 900; + assert.equal(allow('a'), true); + clock.t = 1000; // only 100ms later, but a new window + assert.equal(allow('a'), true); +}); + +test('a skipped window does not carry over old counts', () => { + const { clock, allow } = setup(1); + assert.equal(allow('a'), true); + clock.t = 5500; + assert.equal(allow('a'), true); + assert.equal(allow('a'), false); +}); + +test('limit of 0 rejects everything', () => { + const { allow } = setup(0); + assert.equal(allow('a'), false); +}); + +test('defaults to Date.now', () => { + const allow = createRateLimiter({ limit: 1, windowMs: 60 * 60 * 1000 }); + assert.equal(allow('a'), true); +});