Un rafraîchissement (F5) sur /admin/monitoring affichait le JSON brut de
l'API au lieu de la page — même chose à craindre pour tout futur /admin/*
GET sans segment supplémentaire.
Cause : `server.mountRouter("/admin", adminRouter)` (app.ts) montait
l'API admin exactement sous /admin, la même racine que les pages
/admin/* d'apps/web, servies depuis la même origine/le même process en
prod (image Docker unique). Express matche par chemin, sans égard au
Accept — `GET /admin/monitoring` (route API) et la page du même nom
étaient en conflit direct ; l'API gagnait systématiquement (montée
avant serveStaticFrontend), donc chaque F5 sur cette page recevait le
JSON de l'API plutôt que index.html.
Seule /admin/monitoring collidait réellement aujourd'hui (seul
sous-routeur admin à répondre GET sur sa racine bare) mais le
mécanisme touche toute future route admin nommée comme sa page — d'où
un correctif structurel plutôt qu'un renommage ponctuel.
Correctif : l'API admin est montée sous /admin/api (app.ts), jamais
bare /admin. Toute la surface admin bouge en conséquence
(auth/metrics/monitoring/tech-steps/catalog) ; les pages front
(/admin/monitoring, /admin/catalogue, /admin/corrections...) sont
inchangées, seul admin-client.ts change de base URL. Mis à jour en
cohérence : commentaires JSDoc citant les routes (apps/api + apps/web +
packages/shared), specs/backend-architecture.md,
specs/batch-cooking-modele.md, les intercepts Cypress (globs + un
matcher regex qui avait échappé au premier passage) et les chemins
supertest du suite Mocha admin-*.test.ts.
Simplifie au passage admin-monitoring.cy.ts : le contournement
resourceType ajouté en #32 pour cette même collision n'a plus lieu
d'être une fois les chemins distincts (retour à un intercept déclaratif
simple) — le bug Cypress/Chrome qu'il avait mis au jour reste noté en
commentaire pour référence future.
Vérifié : pnpm lint clean ; build api+web clean ; suite e2e complète
28/28 fichiers, 116/116 tests verts (dont les 16 tests admin-*).
Suite Mocha apps/api non exécutable cette session (Postgres/Docker
injoignable) — chemins mis à jour mécaniquement en cohérence avec le
nouveau mount point, à faire tourner en CI/à la prochaine session avec
accès DB.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
110 lines
5.8 KiB
TypeScript
110 lines
5.8 KiB
TypeScript
import { errorHandlerService } from "@batch-cooking/error-tools";
|
|
import { createErrorMiddleware, ExpressServer } from "@batch-cooking/express-tools";
|
|
import { ErrorCode } from "@batch-cooking/shared";
|
|
import type { Express, Request, Response } from "express";
|
|
import { env } from "./config/env.js";
|
|
import { errorLogger } from "./middlewares/error-logger.js";
|
|
import { requestLogger } from "./middlewares/request-logger.js";
|
|
import { adminRouter } from "./modules/admin/admin.routes.js";
|
|
import { authRouter } from "./modules/auth/auth.routes.js";
|
|
import { cookingSessionRouter } from "./modules/cooking-session/cooking-session.routes.js";
|
|
import { houseRouter } from "./modules/house/house.routes.js";
|
|
import { techStepWorkerRouter } from "./modules/internal/tech-step-worker.routes.js";
|
|
import { planningRouter } from "./modules/planning/planning.routes.js";
|
|
import { preferencesRouter } from "./modules/preferences/preferences.routes.js";
|
|
import { profileRouter } from "./modules/profile/profile.routes.js";
|
|
import { recipeRouter } from "./modules/recipe/recipe.routes.js";
|
|
import { referenceRouter } from "./modules/reference/reference.routes.js";
|
|
import { shoppingListRouter } from "./modules/shopping-list/shopping-list.routes.js";
|
|
import { sourcesRouter } from "./modules/sources/sources.routes.js";
|
|
|
|
/**
|
|
* Builds the API's `ExpressServer`: standard middleware, routes, and the
|
|
* final error handler, in that order. Returns the `ExpressServer` wrapper
|
|
* (not just the raw Express app) so `server.ts` can call `.listen()` on
|
|
* it — {@link createApp} below is the thinner entry point that exposes
|
|
* just the raw `Express` instance, for test tooling (supertest) that
|
|
* expects one.
|
|
*/
|
|
export function createServer(): ExpressServer {
|
|
const server = new ExpressServer();
|
|
// First middleware registered, before even setupCore's own (CORS/JSON
|
|
// body parsing/cookies) — it only reads `req`/`res`, so it doesn't need
|
|
// to run after them, and mounting it first means it wraps the *whole*
|
|
// pipeline (its "finish" listener still fires for a request that never
|
|
// makes it past CORS/body-parsing, not just ones that reach a route).
|
|
server.addMiddleware(requestLogger);
|
|
// One allowed origin: the app (`CORS_ORIGIN`). The admin surface
|
|
// (`/admin/*`) is served by this same API and consumed by `apps/web`'s
|
|
// own `/admin/*` routes — same origin as the rest of the app, so no
|
|
// extra CORS entry.
|
|
server.setupCore({ corsOrigin: env.CORS_ORIGIN });
|
|
|
|
server.addRoute("get", "/health", (_req: Request, res: Response) => {
|
|
res.status(200).json({ status: "ok" });
|
|
});
|
|
|
|
server.mountRouter("/auth", authRouter);
|
|
// Admin application surface — its own auth (`requireAdmin`, distinct
|
|
// cookie/secret), never the end-user session. Mounted at `/admin/api`,
|
|
// *not* bare `/admin`: apps/web's own admin pages live at `/admin/*` too
|
|
// (`/admin/monitoring`, `/admin/login`...), and this API is served from
|
|
// the same origin/process as that frontend (see `serveStaticFrontend`
|
|
// below). A bare `/admin` mount put `GET /admin/monitoring` (API) and the
|
|
// page route `/admin/monitoring` in direct conflict — Express matches by
|
|
// path alone, so a hard navigation/refresh on that page was answered by
|
|
// this router's own handler (raw JSON) instead of falling through to the
|
|
// SPA's `index.html`. The `/api` segment guarantees no current or future
|
|
// admin page path can ever collide with an admin API path again.
|
|
server.mountRouter("/admin/api", adminRouter);
|
|
server.mountRouter("/house", houseRouter);
|
|
// Not user-facing — `services/tech-step-llm-worker` only, guarded by
|
|
// `requireInternalWorker` on every route within (see that router's own
|
|
// doc comment), never `requireAuth`. Mounted alongside the other routers
|
|
// rather than nested under one of them since it isn't scoped to a single
|
|
// recipe/step the way `recipeRouter`'s own correction routes are.
|
|
server.mountRouter("/internal/tech-steps", techStepWorkerRouter);
|
|
server.mountRouter("/planning", planningRouter);
|
|
server.mountRouter("/preferences", preferencesRouter);
|
|
server.mountRouter("/profile", profileRouter);
|
|
server.mountRouter("/recipes", recipeRouter);
|
|
server.mountRouter("/reference", referenceRouter);
|
|
server.mountRouter("/shopping-list", shoppingListRouter);
|
|
server.mountRouter("/cooking-session", cookingSessionRouter);
|
|
server.mountRouter("/sources", sourcesRouter);
|
|
|
|
// Serves the built frontend (production Docker image only — see
|
|
// FRONTEND_DIST_DIR's doc comment in config/env.ts). Must come after
|
|
// every API route above (so they always win) and before the catch-all
|
|
// 404 below (so unmatched GETs fall through to the SPA's index.html
|
|
// instead of a JSON 404).
|
|
if (env.FRONTEND_DIST_DIR) {
|
|
server.serveStaticFrontend(env.FRONTEND_DIST_DIR);
|
|
}
|
|
|
|
// No route matched — same shape as every other error response, via the
|
|
// shared ErrorCode contract, so clients never special-case 404s.
|
|
server.addMiddleware((_req: Request, res: Response) => {
|
|
res.status(404).json({ code: ErrorCode.NOT_FOUND, message: "Not found" });
|
|
});
|
|
|
|
// Two error-handling middlewares in a row (Express runs them in
|
|
// registration order, same as regular middleware) — errorLogger logs the
|
|
// error, then hands it on (`next(err)`) to the real one: all the "what
|
|
// status/body does this error map to" logic lives in ErrorHandlerService,
|
|
// from @batch-cooking/error-tools — this stays a thin adapter.
|
|
server.setErrorHandler(errorLogger);
|
|
server.setErrorHandler(createErrorMiddleware(errorHandlerService));
|
|
|
|
return server;
|
|
}
|
|
|
|
/**
|
|
* Builds a fresh Express application instance (no shared mutable state
|
|
* between calls — used both indirectly by the real server entrypoint
|
|
* (`server.ts`, via {@link createServer}) and directly by tests, which
|
|
* each get their own app via supertest).
|
|
*/
|
|
export function createApp(): Express {
|
|
return createServer().instance;
|
|
}
|