@nodefony/http 10.0.0-beta.3 → 10.0.0-beta.5

package/dist/nodefony/service/servers/wsHeartbeat.js

@@ -1,5 +1,5 @@
 import Ws from "ws";
-//#region nodefony/service/servers/wsHeartbeat.ts
+// nodefony/service/servers/wsHeartbeat.ts
 /**
 * Arme le suivi keep-alive d'UNE connexion : initialise l'horodatage de vie et
 * attache l'unique listener `pong` qui le rafraîchit.
@@ -76,5 +76,4 @@ const startHeartbeat = (server, options) => {
 	timer.unref();
 	return timer;
 };
-//#endregion
 export { heartbeatTick, startHeartbeat, trackPong };

package/dist/nodefony/service/sessions/sessions-service.js

@@ -1,14 +1,12 @@
 import { SESSION_FACETS } from "../../src/session/storage/sessionFilters.js";
-import __decorateMetadata from "../../../_virtual/_@oxc-project_runtime@0.153.0/helpers/esm/decorateMetadata.js";
-import __decorate from "../../../_virtual/_@oxc-project_runtime@0.153.0/helpers/esm/decorate.js";
-import http_kernel_default from "../http-kernel.js";
-import __decorateParam from "../../../_virtual/_@oxc-project_runtime@0.153.0/helpers/esm/decorateParam.js";
+import __decorate from "../../../_virtual/_@oxc-project_runtime@0.155.0/helpers/esm/decorate.js";
+import __decorateParam from "../../../_virtual/_@oxc-project_runtime@0.155.0/helpers/esm/decorateParam.js";
 import Session from "../../src/session/session.js";
 import MemorySessionStorage from "../../src/session/storage/MemorySessionStorage.js";
 import RevocationGuardStorage from "../../src/session/storage/RevocationGuardStorage.js";
-import { AUTO_STORE, EMPTY_INFRA, GcScheduler, Module, Nodefony, RequestContext, Service, countFacets, extend, inject, injectable, readStoreConnector, readStoreLocation, resolveAutoStore, runNeedsExternalServices } from "nodefony";
+import { AUTO_STORE, EMPTY_INFRA, GcScheduler, Inject, Nodefony, RequestContext, Service, countFacets, extend, injectable, readStoreConnector, readStoreLocation, resolveAutoStore, storeConnectivity } from "nodefony";
 import { createHash, createHmac } from "node:crypto";
-//#region nodefony/service/sessions/sessions-service.ts
+// nodefony/service/sessions/sessions-service.ts
 var _SessionsService;
 /**
 * Convertit un timestamp de session (`Date` en mémoire, **string ISO** après
@@ -143,7 +141,7 @@ let SessionsService = class SessionsService extends Service {
 		const configured = storeName;
 		let reason = `store explicitement configuré ("${configured}")`;
 		if (storeName === AUTO_STORE) {
-			const auto = resolveAutoStore("session", this.kernel?.infra ?? EMPTY_INFRA, _SessionsService.storageHandlers(), "memory", runNeedsExternalServices(this.kernel));
+			const auto = resolveAutoStore("session", this.kernel?.infra ?? EMPTY_INFRA, _SessionsService.storageHandlers(), "memory", storeConnectivity(this.kernel));
 			storeName = auto.store;
 			reason = auto.reason;
 			this.log(`session.store "auto" → "${storeName}" (${auto.reason})`, "INFO");
@@ -219,7 +217,7 @@ let SessionsService = class SessionsService extends Service {
 					return resolve(context.session);
 				}
 			}
-			let inst = null;
+			let inst;
 			try {
 				context.sessionStarting = true;
 				inst = this.createSession(this.defaultSessionName);
@@ -598,12 +596,7 @@ let SessionsService = class SessionsService extends Service {
 		this.get("auditService")?.record(event);
 	}
 };
-SessionsService = _SessionsService = __decorate([
-	injectable(),
-	__decorateParam(1, inject("HttpKernel")),
-	__decorateMetadata("design:paramtypes", [typeof Module === "undefined" ? Object : Module, typeof http_kernel_default === "undefined" ? Object : http_kernel_default])
-], SessionsService);
+SessionsService = _SessionsService = __decorate([injectable(), __decorateParam(1, Inject("HttpKernel"))], SessionsService);
 SessionsService.registerStorage("memory", MemorySessionStorage);
 var sessions_service_default = SessionsService;
-//#endregion
 export { computeSessionRef, sessions_service_default as default, toSessionSummary };

package/dist/nodefony/service/trace.js

@@ -1,5 +1,5 @@
 import { randomFillSync } from "node:crypto";
-//#region nodefony/service/trace.ts
+// nodefony/service/trace.ts
 /**
 * W3C Trace Context — parse + generate `traceparent` headers (P2.7).
 *
@@ -69,5 +69,4 @@ function resolveTraceparent(header) {
 	const hex = randomHex(24);
 	return `00-${hex.slice(0, 32)}-${hex.slice(32)}-01`;
 }
-//#endregion
 export { parseTraceparent, resolveTraceparent };

package/dist/nodefony/service/upload/upload-service.js

@@ -1,12 +1,10 @@
-import __decorateMetadata from "../../../_virtual/_@oxc-project_runtime@0.153.0/helpers/esm/decorateMetadata.js";
-import __decorate from "../../../_virtual/_@oxc-project_runtime@0.153.0/helpers/esm/decorate.js";
-import http_kernel_default from "../http-kernel.js";
-import __decorateParam from "../../../_virtual/_@oxc-project_runtime@0.153.0/helpers/esm/decorateParam.js";
-import { Cli, FileClass, Module, Service, inject } from "nodefony";
+import __decorate from "../../../_virtual/_@oxc-project_runtime@0.155.0/helpers/esm/decorate.js";
+import __decorateParam from "../../../_virtual/_@oxc-project_runtime@0.155.0/helpers/esm/decorateParam.js";
+import { Cli, FileClass, Inject, Service } from "nodefony";
 import fs from "node:fs";
 import fsp from "node:fs/promises";
 import path from "node:path";
-//#region nodefony/service/upload/upload-service.ts
+// nodefony/service/upload/upload-service.ts
 /** Test d'existence non bloquant (`fsp.access`) — remplace `existsSync`. */
 const existsAsync = async (p) => {
 	try {
@@ -58,7 +56,7 @@ let upload = class upload extends Service {
 		throw new Error(`Syslog not ready`);
 	}
 };
-upload = __decorate([__decorateParam(1, inject("HttpKernel")), __decorateMetadata("design:paramtypes", [typeof Module === "undefined" ? Object : Module, typeof http_kernel_default === "undefined" ? Object : http_kernel_default])], upload);
+upload = __decorate([__decorateParam(1, Inject("HttpKernel"))], upload);
 var UploadedFile = class UploadedFile extends FileClass {
 	parsedFile;
 	size;
@@ -168,5 +166,4 @@ var UploadedFile = class UploadedFile extends FileClass {
 	}
 };
 var upload_service_default = upload;
-//#endregion
 export { UploadedFile, upload_service_default as default, upload };

package/dist/nodefony/service/x509.js

@@ -1,6 +1,6 @@
 import { isIPv4, isIPv6 } from "node:net";
 import { createHash, sign } from "node:crypto";
-//#region nodefony/service/x509.ts
+// nodefony/service/x509.ts
 /**
 * Fabrique et lecture de certificats X.509 par `node:crypto` seul — aucune
 * dépendance tierce.
@@ -320,5 +320,4 @@ async function createSelfSignedCertificate(spec) {
 	const signature = await signAsync(spec.hash, tbs, spec.privateKey);
 	return toPem(sequence(tbs, algorithm, bitString(signature)));
 }
-//#endregion
 export { SHA1_WITH_RSA_OID, createSelfSignedCertificate, distinguishedNameField, ipAddressBytes, parseSubjectAltName, signatureAlgorithmName, signatureAlgorithmOid };

package/dist/nodefony/src/assets/collectAssets.js

@@ -1,6 +1,6 @@
 import { stripTrailingSlashes } from "nodefony";
 import { join } from "node:path";
-//#region nodefony/src/assets/collectAssets.ts
+// nodefony/src/assets/collectAssets.ts
 /** Normalise un préfixe en segment de chemin (`/_assets/x/` → `_assets/x`). */
 const prefixToSegment = (prefix) => stripTrailingSlashes(prefix.replace(/^\/+/, ""));
 /**
@@ -30,5 +30,4 @@ function planAssetPublish(sources, outDir) {
 	}
 	return plan;
 }
-//#endregion
 export { planAssetPublish };

package/dist/nodefony/src/assets/prebuiltUi.js

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
-//#region nodefony/src/assets/prebuiltUi.ts
+// nodefony/src/assets/prebuiltUi.ts
 /**
 * Résout le mode de livraison de l'UI embarquée d'un module.
 *
@@ -121,5 +121,4 @@ var PrebuiltUi = class {
 		return this.template.replaceAll("<script", `<script nonce="${nonce}"`);
 	}
 };
-//#endregion
 export { PrebuiltUi, resolveUiDelivery };

package/dist/nodefony/src/context/Context.js

@@ -1,18 +1,14 @@
 import { buildMetaData } from "./metaData.js";
+import { protocolNameOf } from "./transport.js";
+import { resolveTimingMode } from "./timingMode.js";
 import Cookie, { cookiesParser } from "../cookies/cookie.js";
 import { RequestContext, Service, logColor } from "nodefony";
 import { randomFillSync, randomUUID } from "node:crypto";
 import { performance } from "node:perf_hooks";
 import { AsyncResource } from "node:async_hooks";
-//#region nodefony/src/context/Context.ts
+// nodefony/src/context/Context.ts
 const colorLogEvent = () => logColor.cyanBgBlack("EVENT CONTEXT");
 const PERF_PROBE_SUB = process.env.NF_PERF_PROBE === "1";
-const EVENT_SEVERITY = {
-	onRequest: "INFO",
-	onSend: "INFO",
-	onConnect: "INFO",
-	onClose: "INFO"
-};
 let lifecycleEventLogging = null;
 /**
 * Bascule runtime du gate des logs d'events lifecycle. Réservé HORS hot path :
@@ -54,7 +50,15 @@ var Context = class extends Service {
 	requested = false;
 	sessionStarting = false;
 	domain = "";
+	/** Famille traitée (`network.protocol.name` d'OpenTelemetry) — union ouverte. */
 	type;
+	/** Serveur qui a reçu la requête — choisit la configuration par serveur. */
+	serverType;
+	/**
+	* Protocole du saut local (registre IANA ALPN) — union ouverte. Une connexion
+	* WebSocket naît d'un upgrade HTTP/1.1 ; `HttpContext` le constate sur la requête.
+	*/
+	alpnProtocol = "http/1.1";
 	server;
 	httpKernel;
 	request = null;
@@ -103,6 +107,12 @@ var Context = class extends Service {
 	router = this.get("router");
 	resolver = null;
 	/**
+	* Module qui signe les lignes de CETTE requête : la ligne d'accès et les
+	* lignes du contrôleur. `null` = le module de la route (sans route : le
+	* journal du noyau). Un contrôleur le change : `this.context.logModule = "billing"`.
+	*/
+	logModule = null;
+	/**
 	* Intent de session de la route courante (posé par le Resolver depuis
 	* `@UseSession` / paramètre `@Session`). Pilote le point d'activation unique
 	* (HTTP + WS). `null` = aucune session sauf cookie existant (reprise L1).
@@ -134,8 +144,20 @@ var Context = class extends Service {
 	profilerQueries = null;
 	profiling = false;
 	securityTrace = null;
+	/**
+	* Message du canal `nodefony.http.request` pour CETTE requête, ou `null` si
+	* personne n'écoutait à son début (le cas par défaut : un champ, aucune
+	* allocation). Posé par `openRequestTrace`, remis à `null` par
+	* `closeRequestTrace` — c'est ce `null` qui rend la fin idempotente.
+	*
+	* @internal
+	*/
+	requestTrace = null;
 	_timingEnabled = false;
 	_timingVerbose = false;
+	_clockEnabled = false;
+	_clockStartMs = 0;
+	_durationMs = null;
 	phases = EMPTY_PHASES;
 	_phaseIndex = null;
 	_afterResponseFns = null;
@@ -148,54 +170,48 @@ var Context = class extends Service {
 	};
 	scheme;
 	webSocketState = null;
-	constructor(container, type) {
-		super(type, container);
+	constructor(container, serverType) {
+		super(serverType, container);
 		if (PERF_PROBE_SUB) {
 			const p = globalThis.__nfPerfProbe;
 			if (p && p.t0 !== 0n) p.svcNs += Number(process.hrtime.bigint() - p.t0);
 		}
-		this.type = type;
+		const timing = this.kernel?.options.timing;
+		const timingSection = typeof timing === "object" && timing !== null ? timing : null;
+		const mode = resolveTimingMode(timingSection !== null && "enabled" in timingSection ? timingSection.enabled : void 0, this.kernel?.environment);
+		if (mode !== "off") {
+			this._clockEnabled = true;
+			this._clockStartMs = performance.now();
+		}
+		if (mode === "phases") {
+			this._timingEnabled = true;
+			this.phases = [];
+			this._timingVerbose = timingSection !== null && "verbose" in timingSection && timingSection.verbose === true;
+		}
+		this.serverType = serverType;
+		this.type = protocolNameOf(serverType);
 		this.set("context", this);
 		this.httpKernel = this.get("HttpKernel");
 		this.sessionService = this.get("sessions");
 		this.setMetaData();
-		const explicit = (this.kernel?.options)?.timing?.enabled;
-		if (typeof explicit === "boolean") this._timingEnabled = explicit;
-		else this._timingEnabled = this.kernel?.environment !== "production";
-		if (this._timingEnabled) {
-			this.phases = [];
-			const verbose = (this.kernel?.options)?.timing?.verbose;
-			this._timingVerbose = verbose === true;
-		}
-		this.scheme = "https";
-		switch (this.type) {
+		this.scheme = serverType;
+		switch (serverType) {
 			case "http": {
-				this.scheme = "http";
 				const server = this.get("server-http");
 				this.server = server?.server;
 				break;
 			}
-			case "http2":
 			case "https": {
-				this.scheme = "https";
 				const server = this.get("server-https");
 				this.server = server?.server;
 				break;
 			}
-			case "http3": {
-				this.scheme = "https";
-				const server = this.get("server-http3");
-				this.server = server?.server ?? null;
-				break;
-			}
-			case "websocket": {
-				this.scheme = "ws";
+			case "ws": {
 				const server = this.get("server-websocket");
 				this.server = server?.server;
 				break;
 			}
-			case "websocket-secure": {
-				this.scheme = "wss";
+			case "wss": {
 				const server = this.get("server-websocket-secure");
 				this.server = server?.server;
 				break;
@@ -252,6 +268,24 @@ var Context = class extends Service {
 		p.endMs = performance.now();
 		p.durationMs = p.endMs - p.startMs;
 	}
+	/**
+	* Arrête l'horloge de la requête et rend sa durée, en millisecondes.
+	*
+	* La durée court de la construction du contexte au PREMIER appel : le
+	* démontage HTTP (`close` de la réponse, dernier octet remis — la mesure
+	* d'OpenTelemetry et du `$request_time` de nginx), la ligne d'accès pour un
+	* handshake WebSocket. Les appels suivants rendent la même valeur : journal
+	* d'accès, profiler et trace verbose lisent UNE durée, jamais trois.
+	*
+	* Active par défaut dans tous les environnements, production comprise :
+	* seul `timing.enabled: false` la coupe (cf `resolveTimingMode`).
+	*
+	* @returns la durée, ou `null` si `timing.enabled` vaut `false`
+	*/
+	stopClock() {
+		if (!this._clockEnabled) return null;
+		return this._durationMs ??= performance.now() - this._clockStartMs;
+	}
 	onAfterResponse(fn) {
 		const boundFn = AsyncResource.bind(fn);
 		if (this._afterResponseFired) {
@@ -303,10 +337,10 @@ var Context = class extends Service {
 	_abortIfPending(reason) {
 		if (this._abortController && !this._abortController.signal.aborted) this._abortController.abort(new Error(reason ?? "Context aborted"));
 	}
-	log(pci, severity, msgid, msg) {
-		if (!msgid) msgid = this.type;
-		if (this.requestId && RequestContext.getRequestId() === void 0) return RequestContext.run({ requestId: this.requestId }, () => super.log(pci, severity, msgid, msg));
-		return super.log(pci, severity, msgid, msg);
+	log(pci, severity, msgid, msg, moduleName) {
+		if (!msgid) msgid = this.serverType;
+		if (this.requestId && RequestContext.getRequestId() === void 0) return RequestContext.run({ requestId: this.requestId }, () => super.log(pci, severity, msgid, msg, moduleName));
+		return super.log(pci, severity, msgid, msg, moduleName);
 	}
 	/**
 	* Confie au contexte le magasin `RequestContext` de son unité de travail
@@ -334,13 +368,13 @@ var Context = class extends Service {
 	}
 	/**
 	* Log d'un event du cycle de vie — gate boot-time (V2.1) : en production le
-	* Pdu n'est PAS construit (return avant toute allocation). Hors prod, jalon
-	* notable → INFO (EVENT_SEVERITY), event technique → DEBUG.
+	* Pdu n'est PAS construit (return avant toute allocation). Hors prod : DEBUG,
+	* pour le Suivi de requête de Studio — la ligne `req` porte le bilan.
 	*/
 	logEvent(event) {
 		lifecycleEventLogging ??= this.kernel?.environment !== "production";
 		if (!lifecycleEventLogging) return;
-		this.log(`${colorLogEvent()} ${event}`, EVENT_SEVERITY[event] || "DEBUG");
+		this.log(`${colorLogEvent()} ${event}`, "DEBUG");
 	}
 	fire(event, ...args) {
 		this.logEvent(event);
@@ -366,7 +400,7 @@ var Context = class extends Service {
 			if (!logger) return;
 			if (logger.shouldSample && !logger.shouldSample(this, err)) return;
 			const entry = logger.renderHttp(this, err);
-			return this.log(entry.text, entry.severity, entry.msgid);
+			return this.log(entry.text, entry.severity, entry.msgid, void 0, this.logModule ?? this.resolver?.route?.module?.name);
 		} catch {
 			return;
 		}
@@ -394,7 +428,9 @@ var Context = class extends Service {
 			} else line += `${p.name}=…`;
 			i++;
 		}
-		this.log(`TRACE phases [Σ ${total.toFixed(2)}ms] ${line}`, "DEBUG", `${this.type} TIMING`);
+		const duration = this.stopClock();
+		const head = duration === null ? "" : `total ${duration.toFixed(2)}ms · `;
+		this.log(`TRACE phases [${head}Σ ${total.toFixed(2)}ms] ${line}`, "DEBUG", `${this.serverType} TIMING`);
 	}
 	addRequestCookie(cookie) {
 		if (cookie instanceof Cookie) return this.cookies[cookie.name] = cookie;
@@ -453,5 +489,4 @@ var Context = class extends Service {
 	setContextJson(_encoding = "utf-8") {}
 	setContextHtml(_encoding = "utf-8") {}
 };
-//#endregion
 export { Context as default, nextCspNonce, setLifecycleEventLogging };

package/dist/nodefony/src/context/domainMatcher.js

@@ -1,5 +1,5 @@
 import { escapeRegExp } from "nodefony";
-//#region nodefony/src/context/domainMatcher.ts
+// nodefony/src/context/domainMatcher.ts
 /**
 * Matching de domaine (`Host`) — fonctions PURES, politique UNIQUE partagée par
 * les deux étages de Nodefony :
@@ -135,5 +135,4 @@ function isDomainAllowed(regAlias, domain) {
 	for (const reg of regAlias) if (reg.test(domain)) return true;
 	return false;
 }
-//#endregion
 export { compileDomainPattern, compileDomainPatterns, compileTrustedHosts, hostnameOf, isDomainAllowed, resolveTrustedHostNames };

package/dist/nodefony/src/context/forwarded.js

@@ -1,6 +1,6 @@
 import { extractClientIp, resolveFromRight } from "./trustProxy.js";
 import { isIPv4 } from "node:net";
-//#region nodefony/src/context/forwarded.ts
+// nodefony/src/context/forwarded.ts
 /**
 * Découpe une chaîne sur `sep` au **niveau supérieur uniquement**, en respectant
 * les `quoted-string` RFC 9110 §5.6.4 (`value = token / quoted-string`, RFC 7239 §4) : un
@@ -181,5 +181,4 @@ function resolveForwarded(headers, socketAddress, checker) {
 function hasForwardingHeaders(headers) {
 	return Boolean(headers.forwarded || headers["x-forwarded-for"] || headers["x-forwarded-proto"] || headers["x-forwarded-scheme"] || headers["x-forwarded-host"]);
 }
-//#endregion
 export { forwardedNodeIp, hasForwardingHeaders, parseForwarded, resolveForwarded };

package/dist/nodefony/src/context/http/HttpContext.js

@@ -1,5 +1,6 @@
 import HttpError from "../../errors/httpError.js";
 import { responseEnded } from "../responseEnded.js";
+import { alpnProtocolOf } from "../transport.js";
 import Cookie from "../../cookies/cookie.js";
 import Context from "../Context.js";
 import { sanitizeRequestId } from "../requestId.js";
@@ -11,7 +12,7 @@ import { describeSessionStoreFailure } from "../../session/sessionStoreFailure.j
 import { openSseStream } from "./SseStream.js";
 import { finallyMaybe, isPromise, thenMaybe, typeOf } from "nodefony";
 import url, { URL } from "node:url";
-//#region nodefony/src/context/http/HttpContext.ts
+// nodefony/src/context/http/HttpContext.ts
 /**
 * Même URL (chemin, requête, hôte) sous un autre schéma et un autre port.
 * `port` absent → port par défaut du schéma (omis de l'URL).
@@ -55,15 +56,21 @@ var HttpContext = class extends Context {
 	activeSocket = null;
 	isRedirect = false;
 	sended = false;
+	/**
+	* Requête relayée par le proxy inverse : la politique de ligne d'accès de
+	* son montage. `null` = servie par l'application (cas de toute requête).
+	*/
+	relayAccessLog = null;
 	request;
 	response;
 	uploadService;
-	constructor(container, request, response, type) {
-		super(container, type);
+	constructor(container, request, response, serverType) {
+		super(container, serverType);
+		this.alpnProtocol = alpnProtocolOf(request);
 		this.uploadService = this.get("upload");
 		const perfSub = PERF_PROBE_SUB ? globalThis.__nfPerfProbe : void 0;
 		if (perfSub && perfSub.t0 !== 0n) perfSub.uploadNs += Number(process.hrtime.bigint() - perfSub.t0);
-		if (this.type === "http2") {
+		if (this.alpnProtocol === "h2" || this.alpnProtocol === "h2c") {
 			this.request = new Http2Request(request, this);
 			this.response = new Http2Response(response, this);
 		} else {
@@ -124,7 +131,8 @@ var HttpContext = class extends Context {
 	_onTimeout() {
 		if (this.listenerCount("onTimeout")) this.fire("onTimeout", this);
 		this._abortIfPending("Request timeout");
-		let error = null;
+		this.httpKernel?.warnUnsentResponse(this);
+		let error;
 		if (this.response.stream) error = new HttpError("Gateway Timeout", 504, this);
 		else error = new HttpError("Request Timeout", 408, this);
 		this.httpKernel?.onError(error, this);
@@ -180,6 +188,21 @@ var HttpContext = class extends Context {
 		}
 	}
 	/**
+	* Ligne d'accès — pour une requête RELAYÉE, avec le statut que l'amont a
+	* réellement rendu (le relais écrit la réponse brute, pas celle du
+	* contexte) ; un montage `accessLog: "errors"` ne l'écrit qu'en échec.
+	*
+	* @param httpError - l'erreur de la requête, s'il y en a une
+	*/
+	logRequest(httpError) {
+		if (this.relayAccessLog !== null) {
+			const raw = this.response.response;
+			if (raw !== null) this.response.statusCode = raw.statusCode;
+			if (this.relayAccessLog === "errors" && this.response.statusCode < 400 && !httpError && !this.error) return;
+		}
+		return super.logRequest(httpError);
+	}
+	/**
 	* Nettoie le contexte, et le DÉTACHE de sa socket h1 : la connexion
 	* persistante survit à la requête, et l'entrée de `socketActiveContext`
 	* retiendrait sinon tout le contexte jusqu'à sa fermeture. Seule l'entrée qui
@@ -414,5 +437,4 @@ var HttpContext = class extends Context {
 		this.response.setContentType("html", encoding);
 	}
 };
-//#endregion
 export { HttpContext as default, switchUrlScheme };

package/dist/nodefony/src/context/http/Request.js

@@ -1,9 +1,9 @@
 import HttpError from "../../errors/httpError.js";
 import { hasForwardingHeaders, resolveForwarded } from "../forwarded.js";
 import { hostnameOf } from "../domainMatcher.js";
-import { Parser, ParserJson, ParserQs, ParserXml, acceptParser } from "./parser.js";
+import { Parser, ParserJson, ParserQs, ParserRaw, ParserXml, acceptParser } from "./parser.js";
 import { isCanonicalAuthority, splitTarget } from "./urlFastPath.js";
-import { RequestContext, extend, useConfig } from "nodefony";
+import { RequestContext, useConfig } from "nodefony";
 import { createHash, randomUUID } from "node:crypto";
 import { URL } from "node:url";
 import fs from "node:fs";
@@ -12,7 +12,7 @@ import os from "node:os";
 import path from "node:path";
 import QS from "qs";
 import { Busboy } from "@fastify/busboy";
-//#region nodefony/src/context/http/Request.ts
+// nodefony/src/context/http/Request.ts
 const reg = /(.*)[[][\]]$/u;
 /**
 * Supprime un fichier temporaire d'upload sans jamais faire échouer le nettoyage :
@@ -34,6 +34,7 @@ const CHARSET_ALIASES = {
 	"utf-16le": "utf16le"
 };
 const QUOTE_TRIM = /^["']|["']$/gu;
+const NO_FILES = Object.freeze([]);
 const parse = {
 	POST: true,
 	PUT: true,
@@ -104,7 +105,7 @@ var HttpRequest = class {
 		let u = this.#url;
 		if (u === null) {
 			u = this.getUrl(this.sUrl);
-			u.query = this.queryGet;
+			u.query = this.query;
 			this.#url = u;
 		}
 		return u;
@@ -113,24 +114,28 @@ var HttpRequest = class {
 		this.#url = u;
 	}
 	parser = null;
-	queryPost = {};
-	queryGet = {};
-	queryFile = [];
-	query = {};
 	/**
-	* Le CORPS de la requête, parsé — nom universel de l'écosystème (Express,
-	* Fastify, NestJS), alias de {@link queryPost}.
-	*
-	* Ne pas confondre avec {@link query}, qui FUSIONNE la query string et le
-	* corps : `body` ne rend jamais un paramètre d'URL. Le data plane admin
-	* expose déjà cette sémantique (`IAdminRequest.body`) ; ce getter la rend
-	* disponible partout.
+	* Le CORPS de la requête, parsé (JSON, urlencoded, XML, champs multipart) —
+	* nom universel de l'écosystème (Express, Fastify, NestJS) et celui
+	* d'`IAdminRequest.body`. Jamais un paramètre d'URL : ceux-là sont dans
+	* {@link query}, et les deux ne fusionnent pas.
+	*/
+	body = {};
+	/** Fichiers reçus, alloués au PREMIER fichier seulement (cf {@link files}). */
+	#uploads = null;
+	/**
+	* Les fichiers reçus dans un corps multipart, déjà écrits dans le répertoire
+	* temporaire — lus par `@UploadedFile()` / `@UploadedFiles()`. Les champs
+	* texte du même corps sont dans {@link body}.
 	*
-	* Getter (aucune allocation) : `queryPost` reste la source unique.
+	* Lecture seule : une requête sans upload rend un vide partagé et gelé,
+	* aucune allocation.
 	*/
-	get body() {
-		return this.queryPost;
+	get files() {
+		return this.#uploads ?? NO_FILES;
 	}
+	/** Les paramètres d'URL, seuls — jamais un champ du corps ({@link body}). */
+	query = {};
 	queryStringOptions;
 	charset = "utf8";
 	uploadOption = {};
@@ -185,7 +190,6 @@ var HttpRequest = class {
 		if (this.search) query = QS.parse(this.search.slice(1), this.queryStringOptions ?? {});
 		else query = {};
 		if (this.#url !== null) this.#url.query = query;
-		this.queryGet = query;
 		this.query = query;
 		if (PERF_PROBE_SUB) perfMark("reqQueryNs");
 		this.contentType = this.getContentType(this.request);
@@ -201,11 +205,11 @@ var HttpRequest = class {
 	* remplace le `once("onRequestEnd")` du ctor qui allouait 1 onceWrapper +
 	* 1 closure à CHAQUE requête.
 	*
-	* Il porte le CORPS (`queryPost`), pas la fusion `query` : un seul sens de
+	* Il porte le CORPS (`body`), jamais les paramètres d'URL : un seul sens de
 	* `body` dans tout le framework, celui de l'écosystème et d'`IAdminRequest`.
 	*/
 	fireRequestEnd() {
-		this.request.body = this.queryPost;
+		this.request.body = this.body;
 		if (this.context.listenerCount("onRequestEnd") === 0) return false;
 		return this.context.fireAsync("onRequestEnd", this);
 	}
@@ -315,7 +319,7 @@ var HttpRequest = class {
 					await this.fireRequestEnd();
 					return BODY_DONE;
 				}
-				this.parser = new Parser(this);
+				this.parser = new ParserRaw(this);
 				return this.parser;
 		}
 	}
@@ -362,8 +366,7 @@ var HttpRequest = class {
 			return this.parser;
 		}
 		const { fields, files } = await this.streamMultipart(bb);
-		this.queryPost = fields;
-		this.query = extend({}, this.query, this.queryPost);
+		this.body = fields;
 		for (const pf of files) await this.createFileUpload(pf.field, pf.file);
 		this.context.requestEnded = true;
 		await this.fireRequestEnd();
@@ -478,7 +481,7 @@ var HttpRequest = class {
 	}
 	accepts(Type) {
 		let parts = [];
-		let subtype = "*";
+		let subtype;
 		let type = "*";
 		if (Type) parts = Type.split("/");
 		switch (parts.length) {
@@ -496,7 +499,7 @@ var HttpRequest = class {
 	}
 	async createFileUpload(name, file) {
 		const fileUpload = await this.context.uploadService?.createUploadFile(file, name);
-		if (fileUpload) this.queryFile.push(fileUpload);
+		if (fileUpload) (this.#uploads ??= []).push(fileUpload);
 		return fileUpload;
 	}
 	getMethod() {
@@ -561,7 +564,9 @@ var HttpRequest = class {
 	/**
 	* Scheme effectif côté client : `Forwarded`/`X-Forwarded-*` résolu de façon
 	* canonique (this.forwarded, gated proxy de confiance) ; sinon le transport
-	* réel. HTTP/2 remplace la lecture du socket par le pseudo-header `:scheme`.
+	* réel. Vaut pour HTTP/2 aussi : le pseudo-en-tête `:scheme` vient du client
+	* (RFC 9113 §8.3.1) et n'est jamais cru — sur h2c, `:scheme: https` ferait
+	* passer une connexion claire pour chiffrée.
 	*/
 	resolveScheme(request) {
 		if (this.forwarded?.proto) return this.forwarded.proto;
@@ -589,9 +594,8 @@ var HttpRequest = class {
 		return new URL(sUrl, baseUrl);
 	}
 	log(pci, severity, msgid, msg) {
-		if (!msgid) msgid = `${this.context.type} REQUEST `;
+		if (!msgid) msgid = `${this.context.serverType} REQUEST `;
 		return this.context.log(pci, severity, msgid, msg);
 	}
 };
-//#endregion
 export { HttpRequest as default };