Addresses 8 issues from the Journal architecture audit: 1. DB indexes on routes.ownerId + activities.ownerId. Listing queries on these tables were full table scans; adds composite indexes matching the order-by columns (updatedAt/startedAt/createdAt). 2. Zod validation on /api/auth/register body. Previously the action destructured request.json() with zero schema validation. 3. N+1 GeoJSON batch fetch collapsed to a single ANY($1::text[]) query in both routes.server and activities.server. 4. Webhook envelope validation in /api/sync/webhook/:provider. 5. AbortSignal.timeout(30s) on all external fetches (Komoot, Wahoo) via a new fetchWithTimeout helper in lib/http.server.ts. 6. .limit(100) on listPublicRoutesForOwner / listPublicActivitiesForOwner. 9. Welcome email moved off fire-and-forget onto a pg-boss job with retryLimit: 3 (send-welcome-email). 10. process.env.ORIGIN ?? "http://localhost:3000" centralized into lib/config.server.ts::getOrigin() across 14 call sites. Issues 7 (centralized apiError/auth guards across 60+ route files) and 8 (split .server.ts boundaries across 20+ route files) intentionally deferred — both are pure refactors that would balloon this PR past reviewability and warrant their own focused PRs. Tests added: - lib/config.server.test.ts (2 cases) - lib/http.server.test.ts (3 cases — timeout abort, success passthrough, caller-signal composition) - routes/api.sync.webhook.$provider.test.ts (6 cases) - routes/api.auth.register.test.ts (7 cases — schema rejection paths + the new welcome-email enqueue assertion) Full repo: pnpm typecheck, pnpm lint, pnpm test all green. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
45 lines
1.7 KiB
TypeScript
45 lines
1.7 KiB
TypeScript
import { describe, it, expect, vi, afterEach } from "vitest";
|
|
import { fetchWithTimeout } from "./http.server.ts";
|
|
|
|
const originalFetch = globalThis.fetch;
|
|
|
|
afterEach(() => {
|
|
globalThis.fetch = originalFetch;
|
|
vi.restoreAllMocks();
|
|
});
|
|
|
|
describe("fetchWithTimeout", () => {
|
|
it("aborts when the request exceeds the timeout", async () => {
|
|
// Mock fetch to honor the AbortSignal but never resolve otherwise.
|
|
globalThis.fetch = vi.fn((_input: RequestInfo | URL, init?: RequestInit) => {
|
|
return new Promise((_resolve, reject) => {
|
|
init?.signal?.addEventListener("abort", () => {
|
|
reject(new DOMException("aborted", "AbortError"));
|
|
});
|
|
});
|
|
}) as typeof fetch;
|
|
|
|
await expect(fetchWithTimeout("https://example.test", {}, 25)).rejects.toThrow();
|
|
});
|
|
|
|
it("forwards the response when the call returns in time", async () => {
|
|
globalThis.fetch = vi.fn(async () => new Response("ok", { status: 200 })) as typeof fetch;
|
|
const resp = await fetchWithTimeout("https://example.test", {}, 1000);
|
|
expect(resp.status).toBe(200);
|
|
expect(await resp.text()).toBe("ok");
|
|
});
|
|
|
|
it("respects a caller-supplied abort signal alongside the timeout", async () => {
|
|
const controller = new AbortController();
|
|
globalThis.fetch = vi.fn((_input: RequestInfo | URL, init?: RequestInit) => {
|
|
return new Promise((_resolve, reject) => {
|
|
init?.signal?.addEventListener("abort", () => {
|
|
reject(new DOMException("aborted", "AbortError"));
|
|
});
|
|
});
|
|
}) as typeof fetch;
|
|
const p = fetchWithTimeout("https://example.test", { signal: controller.signal }, 60_000);
|
|
controller.abort();
|
|
await expect(p).rejects.toThrow();
|
|
});
|
|
});
|