@nodefony/http 10.0.0-alpha.9 → 10.0.0-beta.2

package/dist/nodefony/service/pretty-request-logger.js

@@ -1,6 +1,5 @@
-import { severityFromStatus } from "./audit-logger.js";
+import { computeDurationMs, severityFromStatus } from "./audit-logger.js";
 import { logColor } from "nodefony";
-import { performance } from "node:perf_hooks";
 //#region nodefony/service/pretty-request-logger.ts
 /**
 * Pretty single-line logger for dev (P3.2) — the biggest gain for humans.
@@ -28,7 +27,7 @@ var PrettyRequestLogger = class {
 		const method = ctx.method ?? "?";
 		const duration = computeDurationMs(ctx.phases);
 		return {
-			text: `${logColor.cyan(method.padEnd(4))} ${colorizeStatus(status)} ${ctx.url} ${logColor.blackBright(formatDuration(duration))} ${logColor.blackBright(ctx.remoteAddress ?? "-")} ${logColor.magenta(`[${shortId(ctx.requestId)}]`)}` + (err ? ` ${logColor.red(err.message)}` : ""),
+			text: `${logColor.cyan(method.padEnd(4))} ${colorizeStatus(status)} ${ctx.url} ${logColor.blackBright(formatDuration(duration))} ${logColor.blackBright(ctx.remoteAddress ?? "-")} ` + logColor.magenta(`[${shortId(ctx.requestId)}]`) + (err ? ` ${logColor.red(err.message)}` : ""),
 			severity: severityFromStatus(status),
 			msgid: "req"
 		};
@@ -39,7 +38,7 @@ var PrettyRequestLogger = class {
 		const duration = computeDurationMs(ctx.phases);
 		const proto = acceptedProtocol ? `[${acceptedProtocol}]` : "";
 		return {
-			text: `${logColor.cyan("WS  ")} ${colorizeStatus(status)} ${ctx.url} ${logColor.blackBright(proto)} ${logColor.blackBright(formatDuration(duration))} ${logColor.blackBright(ctx.remoteAddress ?? "-")} ${logColor.magenta(`[${shortId(ctx.requestId)}]`)}` + (error ? ` ${logColor.red(error.message)}` : ""),
+			text: `${logColor.cyan("WS  ")} ${colorizeStatus(status)} ${ctx.url} ${logColor.blackBright(proto)} ${logColor.blackBright(formatDuration(duration))} ${logColor.blackBright(ctx.remoteAddress ?? "-")} ` + logColor.magenta(`[${shortId(ctx.requestId)}]`) + (error ? ` ${logColor.red(error.message)}` : ""),
 			severity: error ? "ERROR" : "INFO",
 			msgid: "req"
 		};
@@ -62,11 +61,5 @@ function formatDuration(ms) {
 function shortId(id) {
 	return id.length > 8 ? id.slice(0, 8) : id;
 }
-function computeDurationMs(phases) {
-	if (!phases.length) return null;
-	const first = phases[0];
-	if (typeof first.startMs !== "number") return null;
-	return performance.now() - first.startMs;
-}
 //#endregion
 export { PrettyRequestLogger as default };

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

@@ -12,8 +12,8 @@
 * @param socket - flux client brut (l'event `clientError` fournit un `Duplex`).
 */
 function handleClientError(error, socket) {
-	if (error?.code === "ECONNRESET" || !socket.writable) return;
-	const statusLine = error?.code === "HPE_HEADER_OVERFLOW" ? "431 Request Header Fields Too Large" : "400 Bad Request";
+	if (error.code === "ECONNRESET" || !socket.writable) return;
+	const statusLine = error.code === "HPE_HEADER_OVERFLOW" ? "431 Request Header Fields Too Large" : "400 Bad Request";
 	socket.end(`HTTP/1.1 ${statusLine}\r\nConnection: close\r\n\r\n`);
 }
 //#endregion

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

@@ -1,10 +1,11 @@
-import __decorateMetadata from "../../../_virtual/_@oxc-project_runtime@0.151.0/helpers/esm/decorateMetadata.js";
-import __decorate from "../../../_virtual/_@oxc-project_runtime@0.151.0/helpers/esm/decorate.js";
+import { asServersConfig, configuredServerPort } from "../../src/servers/kernelServers.js";
+import __decorateMetadata from "../../../_virtual/_@oxc-project_runtime@0.152.0/helpers/esm/decorateMetadata.js";
+import __decorate from "../../../_virtual/_@oxc-project_runtime@0.152.0/helpers/esm/decorate.js";
 import http_kernel_default from "../http-kernel.js";
 import { handleClientError } from "./clientError.js";
 import { createDrainTerminator } from "./serverShutdown.js";
 import { bindWithFallback, buildBindPlan } from "../../src/servers/portBinder.js";
-import __decorateParam from "../../../_virtual/_@oxc-project_runtime@0.151.0/helpers/esm/decorateParam.js";
+import __decorateParam from "../../../_virtual/_@oxc-project_runtime@0.152.0/helpers/esm/decorateParam.js";
 import { Module, Service, extend, inject, nodefonyError } from "nodefony";
 import http from "node:http";
 //#region nodefony/service/servers/server-http.ts
@@ -27,13 +28,12 @@ let ServerHttp = class ServerHttp extends Service {
 		super("server-http", module.container, module.notificationsCenter, module.options.http);
 		this.httpKernel = httpKernel;
 		this.module = module;
-		this.active = !!module.kernel?.options.servers.http;
+		this.active = !!asServersConfig(module.kernel?.options.servers)?.http;
 		this.port = this.setPort();
 		this.domain = this.module.kernel?.domain;
 	}
 	setPort() {
-		if (this.module.kernel?.options.servers?.http) return this.module.kernel?.options.servers?.http?.port || 0;
-		return 0;
+		return configuredServerPort(asServersConfig(this.module.kernel?.options.servers), "http") ?? 0;
 	}
 	createServer() {
 		return new Promise((resolve, reject) => {
@@ -42,23 +42,19 @@ let ServerHttp = class ServerHttp extends Service {
 				const opt = extend({ requestTimeout: this.options.requestTimeout });
 				this.server = http.createServer(opt);
 				this.httpTerminator = createDrainTerminator(this.server, this.options.shutdownTimeout);
-				if (this.options.maxHeadersCount) {
-					if (this.server) this.server.maxHeadersCount = this.options.maxHeadersCount;
-				}
+				if (this.options.maxHeadersCount) this.server.maxHeadersCount = this.options.maxHeadersCount;
 				if (this.options.timeout) {
-					if (this.server) {
-						this.server.setTimeout(this.options.timeout, () => {
-							this.fire("onTimeout", this);
-						});
-						this.server.timeout = this.options.timeout;
-					}
+					this.server.setTimeout(this.options.timeout, () => {
+						this.fire("onTimeout", this);
+					});
+					this.server.timeout = this.options.timeout;
 				}
-				if (this.options.keepAliveTimeout) {
-					if (this.server) this.server.keepAliveTimeout = this.options.keepAliveTimeout;
-				}
-				this.server.on("request", (request, response) => this.httpKernel?.onHttpRequest(request, response, this.type).catch(() => {}));
+				if (this.options.keepAliveTimeout) this.server.keepAliveTimeout = this.options.keepAliveTimeout;
+				this.server.on("request", (request, response) => {
+					this.httpKernel.onHttpRequest(request, response, this.type);
+				});
 				this.module.fire("onCreateServer", this.type, this);
-				bindWithFallback(this.server, this.domain, buildBindPlan("http", this.module.kernel?.options.servers, this.module.kernel?.environment)).then(({ address, shiftedFrom }) => {
+				bindWithFallback(this.server, this.domain, buildBindPlan("http", asServersConfig(this.module.kernel?.options.servers), this.module.kernel?.environment)).then(({ address, shiftedFrom }) => {
 					this.infos = address;
 					this.port = address.port;
 					this.address = address.address;
@@ -68,7 +64,8 @@ let ServerHttp = class ServerHttp extends Service {
 					this.module.fire("onServersReady", this.type, this);
 					this.attachErrorHandler();
 					resolve(this.server);
-				}).catch((error) => {
+				}).catch((e) => {
+					const error = e instanceof Error ? e : new Error(String(e));
 					this.reportBindError(error);
 					reject(error);
 				});
@@ -87,7 +84,7 @@ let ServerHttp = class ServerHttp extends Service {
 				});
 			} catch (e) {
 				this.log(e, "CRITIC");
-				return reject(e);
+				return reject(e instanceof Error ? e : new Error(String(e)));
 			}
 		});
 	}
@@ -120,10 +117,13 @@ let ServerHttp = class ServerHttp extends Service {
 				this.log(`Port ${this.port} déjà occupé (domaine ${this.domain}) — le serveur HTTP ne peut pas écouter. Libérer le port, en choisir un autre (servers.http.port), ou autoriser le repli automatique (servers.portPolicy = "auto", défaut en développement).`, "ERROR");
 				this.log(myError, "CRITIC");
 				break;
+			case void 0:
 			default: this.log(myError, "CRITIC");
 		}
 		this.server?.close();
-		setTimeout(() => this.kernel?.terminate(1), 1e3);
+		setTimeout(() => {
+			this.kernel?.terminate(1);
+		}, 1e3);
 	}
 	showBanner() {
 		if (this.infos) this.log(`Server Listen on ${this.scheme}://${this.infos.address}:${this.infos.port} Family: ${this.infos.family} Protocol : ${this.protocol}`);

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

@@ -1,10 +1,11 @@
-import __decorateMetadata from "../../../_virtual/_@oxc-project_runtime@0.151.0/helpers/esm/decorateMetadata.js";
-import __decorate from "../../../_virtual/_@oxc-project_runtime@0.151.0/helpers/esm/decorate.js";
+import { asServersConfig, configuredServerPort } from "../../src/servers/kernelServers.js";
+import __decorateMetadata from "../../../_virtual/_@oxc-project_runtime@0.152.0/helpers/esm/decorateMetadata.js";
+import __decorate from "../../../_virtual/_@oxc-project_runtime@0.152.0/helpers/esm/decorate.js";
 import http_kernel_default from "../http-kernel.js";
 import { handleClientError } from "./clientError.js";
 import { createDrainTerminator } from "./serverShutdown.js";
 import { bindWithFallback, buildBindPlan } from "../../src/servers/portBinder.js";
-import __decorateParam from "../../../_virtual/_@oxc-project_runtime@0.151.0/helpers/esm/decorateParam.js";
+import __decorateParam from "../../../_virtual/_@oxc-project_runtime@0.152.0/helpers/esm/decorateParam.js";
 import { Module, Service, extend, inject, nodefonyError } from "nodefony";
 import http2 from "node:http2";
 import https from "node:https";
@@ -29,7 +30,7 @@ let ServerHttps = class ServerHttps extends Service {
 		super("server-https", module.container, module.notificationsCenter, module.options.https);
 		this.httpKernel = httpKernel;
 		this.module = module;
-		this.active = !!this.kernel?.options.servers.https;
+		this.active = !!asServersConfig(this.kernel?.options.servers)?.https;
 		this.port = this.setPort();
 		this.domain = this.kernel?.domain;
 	}
@@ -38,45 +39,42 @@ let ServerHttps = class ServerHttps extends Service {
 		throw new Error(`Server not found`);
 	}
 	setPort() {
-		if (this.kernel?.options.servers?.https) return this.kernel?.options.servers?.https?.port || 0;
-		return 0;
+		return configuredServerPort(asServersConfig(this.kernel?.options.servers), "https") ?? 0;
 	}
 	createServer() {
 		return new Promise((resolve, reject) => {
 			try {
 				if (!this.active) return reject(/* @__PURE__ */ new Error(`Server https is not allowed in config file `));
-				this.protocol = this.kernel?.options.servers.https.protocol;
+				const httpsCfg = asServersConfig(this.kernel?.options.servers)?.https;
+				const protocol = httpsCfg ? httpsCfg.protocol : void 0;
+				if (protocol) this.protocol = protocol;
 				if (this.protocol === "2.0") return resolve(this.createServerH2());
 				const opt = extend({
 					requestTimeout: this.options.requestTimeout,
 					rejectUnauthorized: this.options.rejectUnauthorized,
-					key: this.httpKernel?.serviceCerticats?.key,
-					cert: this.httpKernel?.serviceCerticats?.cert,
-					ca: this.httpKernel?.serviceCerticats?.ca ? this.httpKernel?.serviceCerticats?.ca : void 0
+					key: this.httpKernel.serviceCerticats?.key,
+					cert: this.httpKernel.serviceCerticats?.cert,
+					ca: this.httpKernel.serviceCerticats?.ca ? this.httpKernel.serviceCerticats.ca : void 0
 				});
-				this.server = https.createServer(opt);
+				const server = https.createServer(opt);
+				this.server = server;
 				this.httpTerminator = this.terminator();
 				if (this.options.timeout) {
-					if (this.server) {
-						this.server.setTimeout(this.options.timeout, () => {
-							this.fire("onTimeout", this);
-						});
-						this.server.timeout = this.options.timeout;
-					}
-				}
-				if (this.options.maxHeadersCount) {
-					if (this.server) this.server.maxHeadersCount = this.options.maxHeadersCount;
-				}
-				if (this.options.keepAliveTimeout) {
-					if (this.server) this.server.keepAliveTimeout = this.options.keepAliveTimeout;
+					server.setTimeout(this.options.timeout, () => {
+						this.fire("onTimeout", this);
+					});
+					server.timeout = this.options.timeout;
 				}
+				if (this.options.maxHeadersCount) server.maxHeadersCount = this.options.maxHeadersCount;
+				if (this.options.keepAliveTimeout) server.keepAliveTimeout = this.options.keepAliveTimeout;
 				this.module.fire("onCreateServer", this.type, this);
-				this.listenWithPolicy().then(() => resolve(this.server)).catch((error) => {
+				this.listenWithPolicy().then(() => resolve(this.server)).catch((e) => {
+					const error = e instanceof Error ? e : new Error(String(e));
 					this.reportBindError(error);
 					reject(error);
 				});
 				this.server.on("request", (request, response) => {
-					this.httpKernel?.onHttpRequest(request, response, this.type).catch(() => {});
+					this.httpKernel.onHttpRequest(request, response, this.type);
 				});
 				this.kernel?.once("onTerminate", async () => {
 					if (!this.server) return;
@@ -93,20 +91,20 @@ let ServerHttps = class ServerHttps extends Service {
 				});
 			} catch (e) {
 				this.log(e, "CRITIC");
-				return reject(e);
+				return reject(e instanceof Error ? e : new Error(String(e)));
 			}
 		});
 	}
 	createServerH2() {
 		return new Promise((resolve, reject) => {
 			try {
-				const h2Cfg = (this.module?.options)?.http2 ?? {};
+				const h2Cfg = this.module.options.http2 ?? {};
 				const opt = extend({
 					allowHTTP1: true,
 					rejectUnauthorized: this.options.rejectUnauthorized,
-					key: this.httpKernel?.serviceCerticats?.key,
-					cert: this.httpKernel?.serviceCerticats?.cert,
-					ca: this.httpKernel?.serviceCerticats?.ca ? this.httpKernel?.serviceCerticats?.ca : void 0
+					key: this.httpKernel.serviceCerticats?.key,
+					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 = {
@@ -120,16 +118,14 @@ let ServerHttps = class ServerHttps extends Service {
 				});
 				this.server.on("request", (request, response) => {
 					let alpnProtocol = false;
-					if (request && request.stream && request.stream.session?.socket) {
-						if (request.stream.session.socket instanceof TLSSocket) alpnProtocol = request.stream.session.socket.alpnProtocol;
-					}
-					if (request.socket) {
-						if (request.socket instanceof TLSSocket) alpnProtocol = request.socket.alpnProtocol;
-					}
-					if (alpnProtocol === "h2") return this.httpKernel?.onHttpRequest(request, response, "http2").catch(() => {});
-					else return this.httpKernel?.onHttpRequest(request, response, "https").catch(() => {});
+					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.listenWithPolicy().then(() => resolve(this.server)).catch((error) => {
+				this.listenWithPolicy().then(() => resolve(this.server)).catch((e) => {
+					const error = e instanceof Error ? e : new Error(String(e));
 					this.reportBindError(error);
 					reject(error);
 				});
@@ -149,7 +145,7 @@ let ServerHttps = class ServerHttps extends Service {
 					this.log(error, "ERROR", "HTTP2 Server streamError");
 				});
 			} catch (e) {
-				return reject(e);
+				return reject(e instanceof Error ? e : new Error(String(e)));
 			}
 		});
 	}
@@ -161,7 +157,7 @@ let ServerHttps = class ServerHttps extends Service {
 	* `EADDRINUSE` de repli, qui ne sont pas des pannes).
 	*/
 	async listenWithPolicy() {
-		const { address, shiftedFrom } = await bindWithFallback(this.server, this.domain, buildBindPlan("https", this.module.kernel?.options.servers, this.module.kernel?.environment));
+		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;
 		this.address = address.address;
@@ -189,10 +185,13 @@ let ServerHttps = class ServerHttps extends Service {
 				this.log(`Port ${this.port} déjà occupé (domaine ${this.domain}) — le serveur HTTPS ne peut pas écouter. Libérer le port, en choisir un autre (servers.https.port), ou autoriser le repli automatique (servers.portPolicy = "auto", défaut en développement).`, "ERROR");
 				this.log(myError, "CRITIC");
 				break;
+			case void 0:
 			default: this.log(myError, "CRITIC");
 		}
 		this.server?.close();
-		setTimeout(() => this.kernel?.terminate(1), 1e3);
+		setTimeout(() => {
+			this.kernel?.terminate(1);
+		}, 1e3);
 	}
 	showBanner() {
 		if (this.infos) this.log(`Server Listen on ${this.scheme}://${this.infos.address}:${this.infos.port} Family: ${this.infos.family} Protocol : ${this.protocol}`);

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

@@ -1,6 +1,6 @@
 import { Service, extend } from "nodefony";
-import { URL } from "node:url";
 import http from "node:http";
+import { URL } from "node:url";
 import { existsSync } from "node:fs";
 import { join } from "node:path";
 import mime from "mime-types";
@@ -25,7 +25,7 @@ var Statics = class extends Service {
 	enabled = true;
 	defaultOptions = defaultOptions;
 	constructor(module) {
-		const container = module.container || void 0;
+		const container = module.container ?? void 0;
 		const options = module.options.statics || {};
 		let event;
 		if (container) event = container.get("notificationsCenter");
@@ -68,10 +68,9 @@ var Statics = class extends Service {
 		if (!modules) return;
 		const frontend = this.container?.get("frontend");
 		const frontManaged = frontend?.listEntries ? new Set(frontend.listEntries().map((e) => e.moduleName)) : null;
-		for (const name in modules) {
-			const mod = modules[name];
-			if (!mod || mod.isApp) continue;
-			const cfg = mod.options?.publicMount;
+		for (const mod of Object.values(modules)) {
+			if (mod.isApp) continue;
+			const cfg = mod.options.publicMount;
 			if (cfg === false) continue;
 			if (cfg == null && frontManaged?.has(mod.name)) continue;
 			const dir = join(mod.path, cfg?.dir || "public");
@@ -82,10 +81,10 @@ var Statics = class extends Service {
 	}
 	initStaticFiles() {
 		for (const staticRoot in this.options) {
-			let Path = this.options[staticRoot].path;
-			Path = this.kernel?.checkPath(Path);
+			const root = this.options[staticRoot];
+			const Path = this.kernel?.checkPath(root.path);
 			let setHeaders = null;
-			const opt = this.options[staticRoot].options || {};
+			const opt = root.options ?? {};
 			if (opt.setHeaders) {
 				if (typeof opt.setHeaders === "function") {
 					setHeaders = opt.setHeaders;
@@ -97,7 +96,7 @@ var Statics = class extends Service {
 				this.fire("onServeStatic", res, path, staticRoot, this);
 			};
 			if (setHeaders) this.on("onServeStatic", setHeaders);
-			this.addDirectory(Path, opt);
+			this.addDirectory(Path ?? "", opt);
 		}
 	}
 	/**
@@ -147,11 +146,11 @@ var Statics = class extends Service {
 	getUrl(request) {
 		let scheme, host;
 		if (request instanceof http.IncomingMessage) {
-			scheme = request.connection instanceof tls.TLSSocket && request.connection.encrypted ? "https" : "http";
+			scheme = request.socket instanceof tls.TLSSocket ? "https" : "http";
 			host = request.headers.host;
 			return scheme + "://" + host;
 		} else if (request instanceof http2.Http2ServerRequest) {
-			scheme = request.socket instanceof tls.TLSSocket && request.socket.encrypted ? "https" : "http";
+			scheme = request.socket instanceof tls.TLSSocket ? "https" : "http";
 			host = request.headers[":authority"];
 			return scheme + "://" + host;
 		}
@@ -172,18 +171,15 @@ var Statics = class extends Service {
 					request.url = raw;
 				} catch (e) {
 					request.url = raw;
-					return Promise.reject(e);
+					throw e;
 				}
 				break;
 			}
 		}
-		for (const server in this.servers) try {
-			let ele = this.servers[server];
+		for (const ele of Object.values(this.servers)) {
 			await this.getStatic(ele, request, response);
 			const type = mime.lookup(pathname);
 			response.setHeader("Content-Type", type);
-		} catch (e) {
-			return Promise.reject(e);
 		}
 		return Promise.resolve(response);
 	}

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

@@ -1,7 +1,8 @@
-import __decorateMetadata from "../../../_virtual/_@oxc-project_runtime@0.151.0/helpers/esm/decorateMetadata.js";
-import __decorate from "../../../_virtual/_@oxc-project_runtime@0.151.0/helpers/esm/decorate.js";
+import { asServersConfig, configuredServerPort } from "../../src/servers/kernelServers.js";
+import __decorateMetadata from "../../../_virtual/_@oxc-project_runtime@0.152.0/helpers/esm/decorateMetadata.js";
+import __decorate from "../../../_virtual/_@oxc-project_runtime@0.152.0/helpers/esm/decorate.js";
 import http_kernel_default from "../http-kernel.js";
-import __decorateParam from "../../../_virtual/_@oxc-project_runtime@0.151.0/helpers/esm/decorateParam.js";
+import __decorateParam from "../../../_virtual/_@oxc-project_runtime@0.152.0/helpers/esm/decorateParam.js";
 import { startHeartbeat, trackPong } from "./wsHeartbeat.js";
 import { Module, Service, inject } from "nodefony";
 import Ws, { WebSocketServer } from "ws";
@@ -30,13 +31,13 @@ let WebsocketSecure = class WebsocketSecure extends Service {
 		this.ready = false;
 	}
 	setPort() {
-		if (this.kernel?.options.servers?.https) return this.kernel?.options.servers?.https?.port || 0;
-		return 0;
+		return configuredServerPort(asServersConfig(this.kernel?.options.servers), "https") ?? 0;
 	}
 	async createServer(serverHttps) {
 		return new Promise((resolve, reject) => {
 			try {
-				this.infos = serverHttps.server.address();
+				const address = serverHttps.server.address();
+				this.infos = typeof address === "object" ? address : null;
 				if (this.infos) {
 					this.port = this.infos.port;
 					this.address = this.infos.address;
@@ -44,19 +45,19 @@ let WebsocketSecure = class WebsocketSecure extends Service {
 					this.protocol = serverHttps.protocol;
 				}
 				this.server = new WebSocketServer({
-					...this.options ?? {},
+					...this.options,
 					server: serverHttps.server,
 					clientTracking: true
 				});
 				this.server.on("connection", this.onConnection.bind(this));
 				this.heartbeatTimer = startHeartbeat(this.server, this.options);
 				this.kernel?.prependOnceListener("onTerminate", this.terminate.bind(this));
-				if (this.server) this.ready = true;
+				this.ready = true;
 				this.module.fire("onServersReady", this.type, this);
 				return resolve(this.server);
 			} catch (e) {
 				this.log(e, "ERROR");
-				return reject(e);
+				return reject(e instanceof Error ? e : new Error(String(e)));
 			}
 		});
 	}
@@ -86,7 +87,7 @@ let WebsocketSecure = class WebsocketSecure extends Service {
 						this.log(` SHUTDOWN WEBSOCKET Server is listening on DOMAIN : ${this.domain}    PORT : ${this.port}`, "INFO");
 						return resolve(true);
 					} catch (e) {
-						return reject(e);
+						return reject(e instanceof Error ? e : new Error(String(e)));
 					}
 				}, 300);
 				return;

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

@@ -1,7 +1,8 @@
-import __decorateMetadata from "../../../_virtual/_@oxc-project_runtime@0.151.0/helpers/esm/decorateMetadata.js";
-import __decorate from "../../../_virtual/_@oxc-project_runtime@0.151.0/helpers/esm/decorate.js";
+import { asServersConfig, configuredServerPort } from "../../src/servers/kernelServers.js";
+import __decorateMetadata from "../../../_virtual/_@oxc-project_runtime@0.152.0/helpers/esm/decorateMetadata.js";
+import __decorate from "../../../_virtual/_@oxc-project_runtime@0.152.0/helpers/esm/decorate.js";
 import http_kernel_default from "../http-kernel.js";
-import __decorateParam from "../../../_virtual/_@oxc-project_runtime@0.151.0/helpers/esm/decorateParam.js";
+import __decorateParam from "../../../_virtual/_@oxc-project_runtime@0.152.0/helpers/esm/decorateParam.js";
 import { startHeartbeat, trackPong } from "./wsHeartbeat.js";
 import { Module, Service, inject } from "nodefony";
 import Ws, { WebSocketServer } from "ws";
@@ -30,13 +31,13 @@ let Websocket = class Websocket extends Service {
 		this.ready = false;
 	}
 	setPort() {
-		if (this.kernel?.options.servers?.http) return this.kernel?.options.servers?.http?.port || 0;
-		return 0;
+		return configuredServerPort(asServersConfig(this.kernel?.options.servers), "http") ?? 0;
 	}
 	async createServer(serverHttp) {
 		return new Promise((resolve, reject) => {
 			try {
-				this.infos = serverHttp.server.address();
+				const address = serverHttp.server.address();
+				this.infos = typeof address === "object" ? address : null;
 				if (this.infos) {
 					this.port = this.infos.port;
 					this.address = this.infos.address;
@@ -44,19 +45,19 @@ let Websocket = class Websocket extends Service {
 					this.protocol = serverHttp.protocol;
 				}
 				this.server = new WebSocketServer({
-					...this.options ?? {},
+					...this.options,
 					server: serverHttp.server,
 					clientTracking: true
 				});
 				this.server.on("connection", this.onConnection.bind(this));
 				this.heartbeatTimer = startHeartbeat(this.server, this.options);
 				this.kernel?.prependOnceListener("onTerminate", this.terminate.bind(this));
-				if (this.server) this.ready = true;
+				this.ready = true;
 				this.module.fire("onServersReady", this.type, this);
 				return resolve(this.server);
 			} catch (e) {
 				this.log(e, "ERROR");
-				return reject(e);
+				return reject(e instanceof Error ? e : new Error(String(e)));
 			}
 		});
 	}
@@ -86,7 +87,7 @@ let Websocket = class Websocket extends Service {
 						this.log(` SHUTDOWN WEBSOCKET Server is listening on DOMAIN : ${this.domain}    PORT : ${this.port}`, "INFO");
 						return resolve(true);
 					} catch (e) {
-						return reject(e);
+						return reject(e instanceof Error ? e : new Error(String(e)));
 					}
 				}, 300);
 				return;

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

@@ -46,7 +46,7 @@ const startHeartbeat = (server, options) => {
 		for (const client of server.clients) {
 			if (client.readyState !== Ws.OPEN) continue;
 			const sock = client;
-			if (sock._nfLastPong === void 0) sock._nfLastPong = now;
+			sock._nfLastPong ??= now;
 			if ((sock._nfPingedAt ?? 0) > sock._nfLastPong) {
 				if (now - sock._nfPingedAt > grace) client.terminate();
 				continue;
@@ -57,7 +57,7 @@ const startHeartbeat = (server, options) => {
 			}
 		}
 	}, Math.max(250, grace > 0 ? Math.min(interval, grace) : interval));
-	timer.unref?.();
+	timer.unref();
 	return timer;
 };
 //#endregion

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

@@ -1,8 +1,8 @@
 import { SESSION_FACETS } from "../../src/session/storage/sessionFilters.js";
-import __decorateMetadata from "../../../_virtual/_@oxc-project_runtime@0.151.0/helpers/esm/decorateMetadata.js";
-import __decorate from "../../../_virtual/_@oxc-project_runtime@0.151.0/helpers/esm/decorate.js";
+import __decorateMetadata from "../../../_virtual/_@oxc-project_runtime@0.152.0/helpers/esm/decorateMetadata.js";
+import __decorate from "../../../_virtual/_@oxc-project_runtime@0.152.0/helpers/esm/decorate.js";
 import http_kernel_default from "../http-kernel.js";
-import __decorateParam from "../../../_virtual/_@oxc-project_runtime@0.151.0/helpers/esm/decorateParam.js";
+import __decorateParam from "../../../_virtual/_@oxc-project_runtime@0.152.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";
@@ -106,7 +106,8 @@ let SessionsService = class SessionsService extends Service {
 	}
 	/** Storage enregistré pour un store, ou `undefined`. */
 	static getStorage(name) {
-		return _SessionsService.storages.get(String(name ?? "").toLowerCase());
+		const key = name;
+		return _SessionsService.storages.get((key ?? "").toLowerCase());
 	}
 	/** Noms des handlers de session enregistrés. */
 	static storageHandlers() {
@@ -177,8 +178,9 @@ let SessionsService = class SessionsService extends Service {
 				connector: readStoreConnector(innerStorage)
 			});
 			await storage.open();
+			const gcIntervalS = this.options.gcIntervalS;
 			this.gcScheduler = new GcScheduler({
-				intervalS: Number(this.options.gcIntervalS ?? 600),
+				intervalS: Number(gcIntervalS ?? 600),
 				jitter: this.options.gcJitter !== false,
 				run: () => this.runGc(),
 				onError: (e) => this.log(e, "WARNING", "SESSION-GC")
@@ -203,8 +205,11 @@ let SessionsService = class SessionsService extends Service {
 					return;
 				}
 				context.once("onSessionStart", (session, error) => {
-					if (session) return resolve(session);
-					return reject(error || /* @__PURE__ */ new Error("Bad Session"));
+					if (session) {
+						resolve(session);
+						return;
+					}
+					reject(error ?? /* @__PURE__ */ new Error("Bad Session"));
 				});
 				return;
 			}
@@ -221,27 +226,29 @@ let SessionsService = class SessionsService extends Service {
 				inst.readOnly = readOnly === true;
 			} catch (e) {
 				context.fire("onSessionStart", null, e);
-				return reject(e);
+				return reject(e instanceof Error ? e : new Error(String(e)));
 			}
 			inst.start(context).then((session) => {
 				try {
 					context.session = session;
 					const method = context.method;
 					const request = context.request;
-					if (method !== "WEBSOCKET" && request && request.request) request.request.session = session;
+					if (method !== "WEBSOCKET" && request?.request) request.request.session = session;
 					context.sessionStarting = false;
 					if (context.cleaned) return reject(/* @__PURE__ */ new Error("context already cleaned"));
 					context.fire("onSessionStart", session, null);
 					return resolve(session);
 				} catch (e) {
-					if (context.cleaned) return reject(e);
+					const error = e instanceof Error ? e : new Error(String(e));
+					if (context.cleaned) return reject(error);
 					context.fire("onSessionStart", null, e);
-					return reject(e);
+					return reject(error);
 				}
 			}).catch((err) => {
-				if (context.cleaned) return reject(err);
+				const error = err instanceof Error ? err : new Error(String(err));
+				if (context.cleaned) return reject(error);
 				context.fire("onSessionStart", null, err);
-				return reject(err);
+				return reject(error);
 			});
 		});
 	}
@@ -253,8 +260,8 @@ let SessionsService = class SessionsService extends Service {
 		return session;
 	}
 	createSession(name, options) {
-		options = extend({}, this.options, options);
-		return new Session(name, options, this);
+		const merged = extend({}, this.options, options);
+		return new Session(name, merged, this);
 	}
 	setSessionStrategy(strategy) {
 		this.sessionStrategy = strategy;