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

package/dist/nodefony/service/servers/server-https.js

@@ -1,16 +1,14 @@
 import { asServersConfig, configuredServerPort } from "../../src/servers/kernelServers.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 { handleClientError } from "./clientError.js";
+import __decorate from "../../../_virtual/_@oxc-project_runtime@0.155.0/helpers/esm/decorate.js";
+import { handleClientError, handleSessionError } from "./clientError.js";
 import { createDrainTerminator } from "./serverShutdown.js";
 import { bindWithFallback, buildBindPlan } from "../../src/servers/portBinder.js";
-import __decorateParam from "../../../_virtual/_@oxc-project_runtime@0.153.0/helpers/esm/decorateParam.js";
-import { Module, Service, extend, inject, nodefonyError } from "nodefony";
+import __decorateParam from "../../../_virtual/_@oxc-project_runtime@0.155.0/helpers/esm/decorateParam.js";
+import { http2ServerLimits, setHttp2SessionTimeout } from "../../src/servers/http2Limits.js";
+import { Inject, Service, extend, nodefonyError } from "nodefony";
 import http2 from "node:http2";
 import https from "node:https";
-import { TLSSocket } from "node:tls";
-//#region nodefony/service/servers/server-https.ts
+// nodefony/service/servers/server-https.ts
 let ServerHttps = class ServerHttps extends Service {
 	httpKernel;
 	httpTerminator = null;
@@ -98,7 +96,6 @@ let ServerHttps = class ServerHttps extends Service {
 	createServerH2() {
 		return new Promise((resolve, reject) => {
 			try {
-				const h2Cfg = this.module.options.http2 ?? {};
 				const opt = extend({
 					allowHTTP1: true,
 					rejectUnauthorized: this.options.rejectUnauthorized,
@@ -106,23 +103,14 @@ let ServerHttps = class ServerHttps extends Service {
 					cert: this.httpKernel.serviceCerticats?.cert,
 					ca: this.httpKernel.serviceCerticats?.ca ? this.httpKernel.serviceCerticats.ca : void 0
 				});
-				if (h2Cfg.maxSessionMemory) opt.maxSessionMemory = h2Cfg.maxSessionMemory;
-				if (h2Cfg.maxConcurrentStreams) opt.settings = {
-					...opt.settings,
-					maxConcurrentStreams: h2Cfg.maxConcurrentStreams
-				};
+				Object.assign(opt, http2ServerLimits(this.module.options.http2));
 				this.server = http2.createSecureServer(opt);
 				this.httpTerminator = this.terminator();
-				if (this.options.timeout) this.server.setTimeout(this.options.timeout, () => {
+				setHttp2SessionTimeout(this.server, this.options.timeout, () => {
 					this.fire("onTimeout", this);
 				});
 				this.server.on("request", (request, response) => {
-					let alpnProtocol = false;
-					const sessionSocket = request.stream?.session?.socket;
-					if (sessionSocket instanceof TLSSocket) alpnProtocol = sessionSocket.alpnProtocol;
-					if (request.socket instanceof TLSSocket) alpnProtocol = request.socket.alpnProtocol;
-					if (alpnProtocol === "h2") this.httpKernel.onHttpRequest(request, response, "http2");
-					else this.httpKernel.onHttpRequest(request, response, "https");
+					this.httpKernel.onHttpRequest(request, response, this.type);
 				});
 				this.listenWithPolicy().then(() => resolve(this.server)).catch((e) => {
 					const error = e instanceof Error ? e : new Error(String(e));
@@ -139,7 +127,7 @@ let ServerHttps = class ServerHttps extends Service {
 					}
 				});
 				this.server.on("sessionError", (error) => {
-					this.log(error, "ERROR", "HTTP2 Server sessionError");
+					handleSessionError(error, (e) => this.log(e, "ERROR", "HTTP2 Server sessionError"));
 				});
 				this.server.on("streamError", (error) => {
 					this.log(error, "ERROR", "HTTP2 Server streamError");
@@ -157,6 +145,7 @@ let ServerHttps = class ServerHttps extends Service {
 	* `EADDRINUSE` de repli, qui ne sont pas des pannes).
 	*/
 	async listenWithPolicy() {
+		if (this.server === null) throw new Error("Server https not created");
 		const { address, shiftedFrom } = await bindWithFallback(this.server, this.domain, buildBindPlan("https", asServersConfig(this.module.kernel?.options.servers), this.module.kernel?.environment));
 		this.infos = address;
 		this.port = address.port;
@@ -197,7 +186,6 @@ let ServerHttps = class ServerHttps extends Service {
 		if (this.infos) this.log(`Server Listen on ${this.scheme}://${this.infos.address}:${this.infos.port} Family: ${this.infos.family} Protocol : ${this.protocol}`);
 	}
 };
-ServerHttps = __decorate([__decorateParam(1, inject("HttpKernel")), __decorateMetadata("design:paramtypes", [typeof Module === "undefined" ? Object : Module, typeof http_kernel_default === "undefined" ? Object : http_kernel_default])], ServerHttps);
+ServerHttps = __decorate([__decorateParam(1, Inject("HttpKernel"))], ServerHttps);
 var server_https_default = ServerHttps;
-//#endregion
 export { server_https_default as default };

package/dist/nodefony/service/servers/server-static.js

@@ -1,4 +1,5 @@
 import { normalizePrefix } from "../../src/proxy/rules.js";
+import { requestAuthority } from "../../src/context/transport.js";
 import { Service, extend } from "nodefony";
 import http from "node:http";
 import http2 from "node:http2";
@@ -8,7 +9,7 @@ import { join } from "node:path";
 import mime from "mime-types";
 import tls from "node:tls";
 import serveStatic from "serve-static";
-//#region nodefony/service/servers/server-static.ts
+// nodefony/service/servers/server-static.ts
 const defaultOptions = {
 	cacheControl: true,
 	maxAge: 345600
@@ -148,7 +149,7 @@ var Statics = class extends Service {
 			return scheme + "://" + host;
 		} else if (request instanceof http2.Http2ServerRequest) {
 			scheme = request.socket instanceof tls.TLSSocket ? "https" : "http";
-			host = request.headers[":authority"];
+			host = requestAuthority(request.headers);
 			return scheme + "://" + host;
 		}
 		throw new Error(`Bad request type`);
@@ -181,5 +182,4 @@ var Statics = class extends Service {
 		return Promise.resolve(response);
 	}
 };
-//#endregion
 export { Statics as default };

package/dist/nodefony/service/servers/server-websocket-secure.js

@@ -1,13 +1,11 @@
+import { startHeartbeat } from "./wsHeartbeat.js";
 import { asServersConfig, configuredServerPort } from "../../src/servers/kernelServers.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 { startHeartbeat, trackPong } from "./wsHeartbeat.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 { attachUpgradeDispatch } from "../../src/servers/upgradeDispatch.js";
-import { Module, Service, inject } from "nodefony";
+import { Inject, Service } from "nodefony";
 import Ws, { WebSocketServer } from "ws";
-//#region nodefony/service/servers/server-websocket-secure.ts
+// nodefony/service/servers/server-websocket-secure.ts
 let WebsocketSecure = class WebsocketSecure extends Service {
 	httpKernel;
 	module;
@@ -21,7 +19,7 @@ let WebsocketSecure = class WebsocketSecure extends Service {
 	family = null;
 	scheme = "wss";
 	address = null;
-	type = "websocket-secure";
+	type = "wss";
 	infos = null;
 	/** Timer keep-alive (UN par serveur). `null` si désactivé ou pas démarré. */
 	heartbeatTimer = null;
@@ -52,8 +50,9 @@ let WebsocketSecure = class WebsocketSecure extends Service {
 					noServer: true,
 					clientTracking: true
 				});
-				this.#detachUpgrade = attachUpgradeDispatch(serverHttps.server, this.server, () => this.httpKernel.reverseProxy, (req) => this.httpKernel.websocketUpgradeRefusal(req));
-				this.server.on("connection", this.onConnection.bind(this));
+				this.#detachUpgrade = attachUpgradeDispatch(serverHttps.server, this.server, () => this.httpKernel.reverseProxy, (req) => this.httpKernel.websocketUpgradeRefusal(req), (req, admission) => {
+					this.httpKernel.onWebsocketUpgrade(req, admission, this.type).catch(() => {});
+				});
 				this.heartbeatTimer = startHeartbeat(this.server, this.options);
 				this.kernel?.prependOnceListener("onTerminate", this.terminate.bind(this));
 				this.ready = true;
@@ -65,12 +64,6 @@ let WebsocketSecure = class WebsocketSecure extends Service {
 			}
 		});
 	}
-	onConnection(ws, req) {
-		trackPong(ws);
-		this.httpKernel.onWebsocketRequest(ws, req, this.type).catch(() => {
-			process.nextTick(() => {});
-		});
-	}
 	terminate() {
 		return new Promise((resolve, reject) => {
 			if (this.heartbeatTimer) {
@@ -107,7 +100,6 @@ let WebsocketSecure = class WebsocketSecure extends Service {
 		if (this.infos) this.log(`Server Listen on ${this.scheme}://${this.infos.address}:${this.infos.port} Family: ${this.infos.family} Protocol : ${this.protocol}`);
 	}
 };
-WebsocketSecure = __decorate([__decorateParam(1, inject("HttpKernel")), __decorateMetadata("design:paramtypes", [typeof Module === "undefined" ? Object : Module, typeof http_kernel_default === "undefined" ? Object : http_kernel_default])], WebsocketSecure);
+WebsocketSecure = __decorate([__decorateParam(1, Inject("HttpKernel"))], WebsocketSecure);
 var server_websocket_secure_default = WebsocketSecure;
-//#endregion
 export { server_websocket_secure_default as default };

package/dist/nodefony/service/servers/server-websocket.js

@@ -1,13 +1,11 @@
+import { startHeartbeat } from "./wsHeartbeat.js";
 import { asServersConfig, configuredServerPort } from "../../src/servers/kernelServers.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 { startHeartbeat, trackPong } from "./wsHeartbeat.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 { attachUpgradeDispatch } from "../../src/servers/upgradeDispatch.js";
-import { Module, Service, inject } from "nodefony";
+import { Inject, Service } from "nodefony";
 import Ws, { WebSocketServer } from "ws";
-//#region nodefony/service/servers/server-websocket.ts
+// nodefony/service/servers/server-websocket.ts
 let Websocket = class Websocket extends Service {
 	httpKernel;
 	module;
@@ -21,7 +19,7 @@ let Websocket = class Websocket extends Service {
 	family = null;
 	scheme = "ws";
 	address = null;
-	type = "websocket";
+	type = "ws";
 	infos = null;
 	/** Timer keep-alive (UN par serveur). `null` si désactivé ou pas démarré. */
 	heartbeatTimer = null;
@@ -52,8 +50,9 @@ let Websocket = class Websocket extends Service {
 					noServer: true,
 					clientTracking: true
 				});
-				this.#detachUpgrade = attachUpgradeDispatch(serverHttp.server, this.server, () => this.httpKernel.reverseProxy, (req) => this.httpKernel.websocketUpgradeRefusal(req));
-				this.server.on("connection", this.onConnection.bind(this));
+				this.#detachUpgrade = attachUpgradeDispatch(serverHttp.server, this.server, () => this.httpKernel.reverseProxy, (req) => this.httpKernel.websocketUpgradeRefusal(req), (req, admission) => {
+					this.httpKernel.onWebsocketUpgrade(req, admission, this.type).catch(() => {});
+				});
 				this.heartbeatTimer = startHeartbeat(this.server, this.options);
 				this.kernel?.prependOnceListener("onTerminate", this.terminate.bind(this));
 				this.ready = true;
@@ -65,12 +64,6 @@ let Websocket = class Websocket extends Service {
 			}
 		});
 	}
-	onConnection(ws, req) {
-		trackPong(ws);
-		this.httpKernel.onWebsocketRequest(ws, req, this.type).catch(() => {
-			process.nextTick(() => {});
-		});
-	}
 	terminate() {
 		return new Promise((resolve, reject) => {
 			if (this.heartbeatTimer) {
@@ -107,7 +100,6 @@ let Websocket = class Websocket extends Service {
 		if (this.infos) this.log(`Server Listen on ${this.scheme}://${this.infos.address}:${this.infos.port} Family: ${this.infos.family} Protocol : ${this.protocol}`);
 	}
 };
-Websocket = __decorate([__decorateParam(1, inject("HttpKernel")), __decorateMetadata("design:paramtypes", [typeof Module === "undefined" ? Object : Module, typeof http_kernel_default === "undefined" ? Object : http_kernel_default])], Websocket);
+Websocket = __decorate([__decorateParam(1, Inject("HttpKernel"))], Websocket);
 var server_websocket_default = Websocket;
-//#endregion
 export { server_websocket_default as default };

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

@@ -1,31 +1,91 @@
-import { createHttpTerminator } from "http-terminator";
-//#region nodefony/service/servers/serverShutdown.ts
+import http from "node:http";
+import https from "node:https";
+import tls from "node:tls";
+// nodefony/service/servers/serverShutdown.ts
 /**
-* Fabrique le terminator de drain graceful d'un serveur HTTP/HTTPS/HTTP2.
+* Fabrique l'arrêt gracieux d'un serveur HTTP/1.1, HTTPS, HTTP/2 sur TLS ou h2c.
 *
-* Au `terminate()` (shutdown SIGTERM/docker stop) : les requêtes in-flight se
-* terminent (header `connection: close` injecté sur les réponses en cours), les
-* sockets idle sont fermées immédiatement, et tout ce qui reste après
-* `shutdownTimeout` ms est détruit de force. Le terminator appelle lui-même
-* `server.close()` — ne pas le rappeler derrière.
+* Au `terminate()` (SIGTERM, `docker stop`), le serveur cesse d'accepter, puis :
+* - **HTTP/2** : chaque session reçoit un GOAWAY (`session.close()`) — les flux
+*   en vol se terminent, les nouveaux sont refusés, et le client sait qu'il doit
+*   rouvrir ailleurs au lieu de constater une coupure ;
+* - **HTTP/1.1** : la réponse en vol part avec `Connection: close`, la socket
+*   inactive est fermée tout de suite, une requête qui arrive encore sur une
+*   socket gardée ouverte reçoit aussi `Connection: close`.
+*
+* Ce qui reste après `shutdownTimeout` ms est détruit. `server.close()` est
+* appelé ici : ne pas le rappeler derrière.
 *
 * ⚠️ Les sockets WebSocket upgradées (sans réponse HTTP en cours) sont détruites
-* SANS frame Close par le terminator → les serveurs WS doivent fermer leurs
-* clients (close 1001) AVANT ce drain. Garanti par l'ordre des listeners
-* `onTerminate` : WS/WSS s'attachent en `prependOnceListener`, les serveurs
-* HTTP en `once`.
+* SANS frame Close → les serveurs WS doivent fermer leurs clients (close 1001)
+* AVANT ce drain. Garanti par l'ordre des listeners `onTerminate` : WS/WSS
+* s'attachent en `prependOnceListener`, les serveurs HTTP en `once`.
 *
-* @param server - serveur Node à drainer (créé, pas forcément listening)
+* @param server - serveur Node à drainer, créé AVANT son `listen` (le suivi des
+*   connexions commence ici)
 * @param shutdownTimeout - délai de drain en ms avant destruction forcée
-* @returns le terminator à invoquer au shutdown
+* @returns l'arrêt à invoquer au shutdown
 */
 function createDrainTerminator(server, shutdownTimeout) {
-	return createHttpTerminator({
-		server,
-		gracefulTerminationTimeout: shutdownTimeout ?? 5e3
+	const timeout = shutdownTimeout ?? 5e3;
+	const emitter = server;
+	const speaksHttp2 = !(server instanceof http.Server || server instanceof https.Server);
+	const overTls = server instanceof tls.Server;
+	const sockets = /* @__PURE__ */ new Set();
+	emitter.on("connection", (socket) => track(sockets, socket));
+	let http1Sockets = null;
+	if (!speaksHttp2) http1Sockets = overTls ? /* @__PURE__ */ new Set() : sockets;
+	else if (overTls) http1Sockets = /* @__PURE__ */ new Set();
+	if (overTls && http1Sockets !== null) {
+		const set = http1Sockets;
+		emitter.on("secureConnection", (socket) => {
+			if (socket.alpnProtocol !== "h2") track(set, socket);
+		});
+	}
+	let draining = false;
+	const sessions = speaksHttp2 ? /* @__PURE__ */ new Set() : null;
+	if (sessions !== null) emitter.on("session", (session) => {
+		if (draining) {
+			session.close();
+			return;
+		}
+		sessions.add(session);
+		session.once("close", () => sessions.delete(session));
+	});
+	let terminating = null;
+	const drain = () => new Promise((resolve) => {
+		draining = true;
+		const deadline = setTimeout(() => {
+			if (sessions !== null) for (const s of sessions) s.destroy();
+			for (const socket of sockets) socket.destroy();
+		}, timeout);
+		server.close(() => {
+			clearTimeout(deadline);
+			resolve();
+		});
+		if (sessions !== null) for (const s of sessions) s.close();
+		if (http1Sockets !== null) {
+			emitter.on("request", closeAfterResponse);
+			for (const socket of http1Sockets) {
+				const response = socket._httpMessage;
+				if (!response) socket.destroy();
+				else if (!response.headersSent) response.setHeader("connection", "close");
+			}
+		}
 	});
+	return { terminate() {
+		terminating ??= drain();
+		return terminating;
+	} };
+}
+function track(set, socket) {
+	set.add(socket);
+	socket.once("close", () => set.delete(socket));
+}
+/** Requête HTTP/1.1 reçue pendant le drain : la connexion ne survivra pas à sa réponse. */
+function closeAfterResponse(request, response) {
+	if (request.httpVersionMajor === 1 && !response.headersSent) response.setHeader("connection", "close");
 }
 /** Drain par défaut (ms) — même valeur que le défaut Zod `servers.*.shutdownTimeout`. */
 const DEFAULT_SHUTDOWN_TIMEOUT = 5e3;
-//#endregion
 export { DEFAULT_SHUTDOWN_TIMEOUT, createDrainTerminator };

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,13 @@
 import { buildMetaData } from "./metaData.js";
+import { protocolNameOf } from "./transport.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 +49,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;
@@ -148,13 +151,14 @@ 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;
+		this.serverType = serverType;
+		this.type = protocolNameOf(serverType);
 		this.set("context", this);
 		this.httpKernel = this.get("HttpKernel");
 		this.sessionService = this.get("sessions");
@@ -167,35 +171,24 @@ var Context = class extends Service {
 			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;
@@ -304,7 +297,7 @@ var Context = class extends Service {
 		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 (!msgid) msgid = this.serverType;
 		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);
 	}
@@ -334,13 +327,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);
@@ -394,7 +387,7 @@ var Context = class extends Service {
 			} else line += `${p.name}=…`;
 			i++;
 		}
-		this.log(`TRACE phases [Σ ${total.toFixed(2)}ms] ${line}`, "DEBUG", `${this.type} TIMING`);
+		this.log(`TRACE phases [Σ ${total.toFixed(2)}ms] ${line}`, "DEBUG", `${this.serverType} TIMING`);
 	}
 	addRequestCookie(cookie) {
 		if (cookie instanceof Cookie) return this.cookies[cookie.name] = cookie;
@@ -453,5 +446,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 };