elysia 2.0.0-beta.14 → 2.0.0-beta.16

package/dist/adapter/bun/index.d.ts

@@ -1,7 +1,10 @@
+import { BunHTMLBundlelike } from "../../types.js";
 import { AnyElysia } from "../../base.js";
 import { ElysiaAdapterOptions } from "../types.js";
 //#region src/adapter/bun/index.d.ts
-declare function collectStaticRoutes(app: AnyElysia): Record<string, Record<string, Response>> | undefined;
+declare const isHTMLBundle: (value: unknown) => value is BunHTMLBundlelike;
+declare function collectHTMLBundleRoutes(app: AnyElysia): Record<string, Record<string, BunHTMLBundlelike>> | undefined;
+declare function collectStaticRoutes(app: AnyElysia): Record<string, Record<string, Response | BunHTMLBundlelike>> | undefined;
 declare const BunAdapter: ElysiaAdapterOptions<void>;
 //#endregion
-export { BunAdapter, collectStaticRoutes };
+export { BunAdapter, collectHTMLBundleRoutes, collectStaticRoutes, isHTMLBundle };

package/dist/adapter/bun/index.js

@@ -21,29 +21,11 @@ const unavailableFetch = () => new Response(null, {
 	headers: { connection: "close" },
 	status: 503
 });
-function reloadServer(server, serve) {
-	try {
-		server.reload(serve);
-	} catch (error) {
-		if (!serve.routes) throw error;
-		delete serve.routes;
-		console.warn("[Elysia] Native static promotion was skipped:", error);
-		try {
-			server.reload(serve);
-		} catch (fallbackError) {
-			console.error("[Elysia] Failed to reload Bun server:", fallbackError);
-			throw fallbackError;
-		}
-	}
-}
 function releaseLifecycle(app, ext, createdExt, stop, registerCleanup) {
 	if (ext.stop === stop) delete ext.stop;
 	if (ext.cleanupEpoch === registerCleanup) delete ext.cleanupEpoch;
 	if (createdExt && app["~ext"] === ext && !Object.keys(ext).length) app["~ext"] = void 0;
 }
-function clearAppServer(app, server) {
-	if (app.server === server) app.server = void 0;
-}
 async function waitForServerRequests(server, abandoned) {
 	while (server.pendingRequests && !abandoned()) await Bun.sleep(1);
 }
@@ -68,17 +50,6 @@ async function settleServerWebSockets(lifecycle, errors) {
 	} while (lifecycle.sockets.size);
 	return true;
 }
-const closeServerIdle = (server, errors) => {
-	const close = server.closeIdleConnections;
-	if (!close) return true;
-	try {
-		close.call(server);
-		return true;
-	} catch (error) {
-		errors.push(error);
-		return false;
-	}
-};
 /**
 * ! This may looks like it would cause race condition, but it is not
 * Bun is single-threaded and synchronous, so the `finally` block will
@@ -97,12 +68,20 @@ const withOrigin = (fetch) => (request, server) => {
 	}
 };
 const isNativeStaticMethod = (method) => method === "GET" || method === "POST" || method === "PUT" || method === "DELETE" || method === "PATCH" || method === "HEAD" || method === "OPTIONS";
+const isHTMLBundle = (value) => typeof value === "object" && value !== null && typeof value.index === "string";
+function collectHTMLBundleRoutes(app) {
+	let routes;
+	for (const [method, path, handler] of app["~routes"]) {
+		if (!isNativeStaticMethod(method) || !isHTMLBundle(handler) || path.indexOf(":") !== -1 || path.indexOf("*") !== -1) continue;
+		((routes ??= require_utils.nullObject())[path] ??= require_utils.nullObject())[method] = handler;
+	}
+	return routes;
+}
 function collectStaticRoutes(app) {
-	if (app["~config"]?.nativeStaticResponse === false) return;
 	app.fetch;
 	const frozenRoot = require_generation.frozenRootOf(app);
 	const fetchLevelHook = require_utils.flattenChain(frozenRoot["~hookChain"]);
-	if (fetchLevelHook?.request?.length || fetchLevelHook?.trace?.length || frozenRoot["~ext"]?.hoc?.length) return;
+	const promoteResponses = app["~config"]?.nativeStaticResponse !== false && !fetchLevelHook?.request?.length && !fetchLevelHook?.trace?.length && !frozenRoot["~ext"]?.hoc?.length;
 	const table = app["~generation"]?.routeTable ?? app["~routeTable"];
 	const length = table?.length ?? 0;
 	if (!table || !length) return;
@@ -111,7 +90,7 @@ function collectStaticRoutes(app) {
 	for (let i = 0; i < length; i++) {
 		if (!isNativeStaticMethod(methods[i]) || (flags[i] & require_route_table.RouteFlag.Dynamic) !== 0) continue;
 		const h = handlers[i];
-		if (typeof h !== "function" && !(h instanceof Error) && !(h instanceof Promise)) {
+		if (isHTMLBundle(h) || promoteResponses && typeof h !== "function" && !(h instanceof Error) && !(h instanceof Promise)) {
 			hasCandidate = true;
 			break;
 		}
@@ -146,8 +125,10 @@ function collectStaticRoutes(app) {
 		const path = paths[i];
 		if (pathsByMethod.get(path) !== i) continue;
 		const h = handlers[i];
-		if (typeof h === "function" || h instanceof Error || h instanceof Promise) continue;
-		const value = require_compile_handler_index.buildNativeStaticResponse(require_route_table.routeRow(table, i), app);
+		let value;
+		if (isHTMLBundle(h)) value = h;
+		else if (!promoteResponses || typeof h === "function" || h instanceof Error || h instanceof Promise) continue;
+		else value = require_compile_handler_index.buildNativeStaticResponse(require_route_table.routeRow(table, i), app);
 		if (!value) continue;
 		const needsEncode = (routeFlags & require_route_table.RouteFlag.Encode) !== 0;
 		add(method, path, value, needsEncode);
@@ -185,10 +166,11 @@ const BunAdapter = require_adapter_index.createAdapter({
 			..._config,
 			..._options
 		} : _options;
-		const server = app.server = Bun.serve(serve.routes || serve.error ? {
+		const htmlRoutes = collectHTMLBundleRoutes(app);
+		const server = app.server = Bun.serve(serve.routes || serve.error || htmlRoutes ? {
 			...serve,
 			error: unavailableFetch,
-			routes: {}
+			routes: htmlRoutes ?? {}
 		} : serve);
 		let live;
 		let cancelled = false;
@@ -329,7 +311,13 @@ const BunAdapter = require_adapter_index.createAdapter({
 			}
 			let idleClosed = true;
 			if (idleRequired) {
-				idleClosed = closeServerIdle(server, errors);
+				const closeIdle = server.closeIdleConnections;
+				if (closeIdle) try {
+					closeIdle.call(server);
+				} catch (error) {
+					errors.push(error);
+					idleClosed = false;
+				}
 				if (idleClosed && !gateFailure) idleRequired = false;
 			}
 			const safe = socketsSettled && stopped && idleClosed && (!gateFailure || forceDone);
@@ -368,7 +356,7 @@ const BunAdapter = require_adapter_index.createAdapter({
 			}
 			cancelled = true;
 			requestReady.resolve();
-			clearAppServer(app, server);
+			if (app.server === server) app.server = void 0;
 			let outcome;
 			if (shutdownAttempt) {
 				if (closeActiveConnections === true && !forceDone) {
@@ -423,6 +411,11 @@ const BunAdapter = require_adapter_index.createAdapter({
 										(cleanupFailures ??= []).push(error);
 									}
 								}
+								try {
+									await require_utils.disposeDecorators(app);
+								} catch (error) {
+									(cleanupFailures ??= []).push(error);
+								}
 							}
 							cleanupCompleted = true;
 							epochCleanup.length = 0;
@@ -457,7 +450,19 @@ const BunAdapter = require_adapter_index.createAdapter({
 				published = true;
 				if (built.websocket) serve.websocket = built.websocket;
 				if (built.routes) serve.routes = built.routes;
-				reloadServer(server, serve);
+				try {
+					server.reload(serve);
+				} catch (error) {
+					if (!serve.routes) throw error;
+					delete serve.routes;
+					console.warn("[Elysia] Native static promotion was skipped:", error);
+					try {
+						server.reload(serve);
+					} catch (fallbackError) {
+						console.error("[Elysia] Failed to reload Bun server:", fallbackError);
+						throw fallbackError;
+					}
+				}
 				if (callback) callback(server);
 			} catch (error) {
 				startupFailure ??= { error };
@@ -490,4 +495,6 @@ const BunAdapter = require_adapter_index.createAdapter({
 
 //#endregion
 exports.BunAdapter = BunAdapter;
-exports.collectStaticRoutes = collectStaticRoutes;
+exports.collectHTMLBundleRoutes = collectHTMLBundleRoutes;
+exports.collectStaticRoutes = collectStaticRoutes;
+exports.isHTMLBundle = isHTMLBundle;

package/dist/adapter/bun/index.mjs

@@ -1,5 +1,5 @@
 import { createAdapter } from "../index.mjs";
-import { flattenChain, getLoosePath, isSocketQuiet, nullObject, throwLifecycleErrors } from "../../utils.mjs";
+import { disposeDecorators, flattenChain, getLoosePath, isSocketQuiet, nullObject, throwLifecycleErrors } from "../../utils.mjs";
 import { WebStandardAdapter } from "../web-standard/index.mjs";
 import { frozenRootOf, resolvedWsOf } from "../../generation.mjs";
 import { origin } from "../origin.mjs";
@@ -20,29 +20,11 @@ const unavailableFetch = () => new Response(null, {
 	headers: { connection: "close" },
 	status: 503
 });
-function reloadServer(server, serve) {
-	try {
-		server.reload(serve);
-	} catch (error) {
-		if (!serve.routes) throw error;
-		delete serve.routes;
-		console.warn("[Elysia] Native static promotion was skipped:", error);
-		try {
-			server.reload(serve);
-		} catch (fallbackError) {
-			console.error("[Elysia] Failed to reload Bun server:", fallbackError);
-			throw fallbackError;
-		}
-	}
-}
 function releaseLifecycle(app, ext, createdExt, stop, registerCleanup) {
 	if (ext.stop === stop) delete ext.stop;
 	if (ext.cleanupEpoch === registerCleanup) delete ext.cleanupEpoch;
 	if (createdExt && app["~ext"] === ext && !Object.keys(ext).length) app["~ext"] = void 0;
 }
-function clearAppServer(app, server) {
-	if (app.server === server) app.server = void 0;
-}
 async function waitForServerRequests(server, abandoned) {
 	while (server.pendingRequests && !abandoned()) await Bun.sleep(1);
 }
@@ -67,17 +49,6 @@ async function settleServerWebSockets(lifecycle, errors) {
 	} while (lifecycle.sockets.size);
 	return true;
 }
-const closeServerIdle = (server, errors) => {
-	const close = server.closeIdleConnections;
-	if (!close) return true;
-	try {
-		close.call(server);
-		return true;
-	} catch (error) {
-		errors.push(error);
-		return false;
-	}
-};
 /**
 * ! This may looks like it would cause race condition, but it is not
 * Bun is single-threaded and synchronous, so the `finally` block will
@@ -96,12 +67,20 @@ const withOrigin = (fetch) => (request, server) => {
 	}
 };
 const isNativeStaticMethod = (method) => method === "GET" || method === "POST" || method === "PUT" || method === "DELETE" || method === "PATCH" || method === "HEAD" || method === "OPTIONS";
+const isHTMLBundle = (value) => typeof value === "object" && value !== null && typeof value.index === "string";
+function collectHTMLBundleRoutes(app) {
+	let routes;
+	for (const [method, path, handler] of app["~routes"]) {
+		if (!isNativeStaticMethod(method) || !isHTMLBundle(handler) || path.indexOf(":") !== -1 || path.indexOf("*") !== -1) continue;
+		((routes ??= nullObject())[path] ??= nullObject())[method] = handler;
+	}
+	return routes;
+}
 function collectStaticRoutes(app) {
-	if (app["~config"]?.nativeStaticResponse === false) return;
 	app.fetch;
 	const frozenRoot = frozenRootOf(app);
 	const fetchLevelHook = flattenChain(frozenRoot["~hookChain"]);
-	if (fetchLevelHook?.request?.length || fetchLevelHook?.trace?.length || frozenRoot["~ext"]?.hoc?.length) return;
+	const promoteResponses = app["~config"]?.nativeStaticResponse !== false && !fetchLevelHook?.request?.length && !fetchLevelHook?.trace?.length && !frozenRoot["~ext"]?.hoc?.length;
 	const table = app["~generation"]?.routeTable ?? app["~routeTable"];
 	const length = table?.length ?? 0;
 	if (!table || !length) return;
@@ -110,7 +89,7 @@ function collectStaticRoutes(app) {
 	for (let i = 0; i < length; i++) {
 		if (!isNativeStaticMethod(methods[i]) || (flags[i] & RouteFlag.Dynamic) !== 0) continue;
 		const h = handlers[i];
-		if (typeof h !== "function" && !(h instanceof Error) && !(h instanceof Promise)) {
+		if (isHTMLBundle(h) || promoteResponses && typeof h !== "function" && !(h instanceof Error) && !(h instanceof Promise)) {
 			hasCandidate = true;
 			break;
 		}
@@ -145,8 +124,10 @@ function collectStaticRoutes(app) {
 		const path = paths[i];
 		if (pathsByMethod.get(path) !== i) continue;
 		const h = handlers[i];
-		if (typeof h === "function" || h instanceof Error || h instanceof Promise) continue;
-		const value = buildNativeStaticResponse(routeRow(table, i), app);
+		let value;
+		if (isHTMLBundle(h)) value = h;
+		else if (!promoteResponses || typeof h === "function" || h instanceof Error || h instanceof Promise) continue;
+		else value = buildNativeStaticResponse(routeRow(table, i), app);
 		if (!value) continue;
 		const needsEncode = (routeFlags & RouteFlag.Encode) !== 0;
 		add(method, path, value, needsEncode);
@@ -184,10 +165,11 @@ const BunAdapter = createAdapter({
 			..._config,
 			..._options
 		} : _options;
-		const server = app.server = Bun.serve(serve.routes || serve.error ? {
+		const htmlRoutes = collectHTMLBundleRoutes(app);
+		const server = app.server = Bun.serve(serve.routes || serve.error || htmlRoutes ? {
 			...serve,
 			error: unavailableFetch,
-			routes: {}
+			routes: htmlRoutes ?? {}
 		} : serve);
 		let live;
 		let cancelled = false;
@@ -328,7 +310,13 @@ const BunAdapter = createAdapter({
 			}
 			let idleClosed = true;
 			if (idleRequired) {
-				idleClosed = closeServerIdle(server, errors);
+				const closeIdle = server.closeIdleConnections;
+				if (closeIdle) try {
+					closeIdle.call(server);
+				} catch (error) {
+					errors.push(error);
+					idleClosed = false;
+				}
 				if (idleClosed && !gateFailure) idleRequired = false;
 			}
 			const safe = socketsSettled && stopped && idleClosed && (!gateFailure || forceDone);
@@ -367,7 +355,7 @@ const BunAdapter = createAdapter({
 			}
 			cancelled = true;
 			requestReady.resolve();
-			clearAppServer(app, server);
+			if (app.server === server) app.server = void 0;
 			let outcome;
 			if (shutdownAttempt) {
 				if (closeActiveConnections === true && !forceDone) {
@@ -422,6 +410,11 @@ const BunAdapter = createAdapter({
 										(cleanupFailures ??= []).push(error);
 									}
 								}
+								try {
+									await disposeDecorators(app);
+								} catch (error) {
+									(cleanupFailures ??= []).push(error);
+								}
 							}
 							cleanupCompleted = true;
 							epochCleanup.length = 0;
@@ -456,7 +449,19 @@ const BunAdapter = createAdapter({
 				published = true;
 				if (built.websocket) serve.websocket = built.websocket;
 				if (built.routes) serve.routes = built.routes;
-				reloadServer(server, serve);
+				try {
+					server.reload(serve);
+				} catch (error) {
+					if (!serve.routes) throw error;
+					delete serve.routes;
+					console.warn("[Elysia] Native static promotion was skipped:", error);
+					try {
+						server.reload(serve);
+					} catch (fallbackError) {
+						console.error("[Elysia] Failed to reload Bun server:", fallbackError);
+						throw fallbackError;
+					}
+				}
 				if (callback) callback(server);
 			} catch (error) {
 				startupFailure ??= { error };
@@ -488,4 +493,4 @@ const BunAdapter = createAdapter({
 });
 
 //#endregion
-export { BunAdapter, collectStaticRoutes };
+export { BunAdapter, collectHTMLBundleRoutes, collectStaticRoutes, isHTMLBundle };

package/dist/adapter/utils.js

@@ -124,25 +124,6 @@ function responseToSetHeaders(response, set) {
 	if (set.headers["content-encoding"]) delete set.headers["content-encoding"];
 	return set;
 }
-function enqueueBinaryChunk(controller, chunk) {
-	if (chunk instanceof Blob) return chunk.arrayBuffer().then((buffer) => {
-		controller.enqueue(new Uint8Array(buffer));
-		return true;
-	});
-	if (chunk instanceof Uint8Array) {
-		controller.enqueue(chunk);
-		return true;
-	}
-	if (chunk instanceof ArrayBuffer) {
-		controller.enqueue(new Uint8Array(chunk));
-		return true;
-	}
-	if (ArrayBuffer.isView(chunk)) {
-		controller.enqueue(new Uint8Array(chunk.buffer, chunk.byteOffset, chunk.byteLength));
-		return true;
-	}
-	return false;
-}
 function createStreamHandler({ mapResponse, mapCompactResponse }) {
 	return async (generator, set, request, skipFormat, owned = false) => {
 		if (request === null) return void 0;
@@ -253,7 +234,21 @@ function createStreamHandler({ mapResponse, mapCompactResponse }) {
 				controller.enqueue(encodeChunk(value.toSSE()));
 				return;
 			}
-			const p = enqueueBinaryChunk(controller, value);
+			let p;
+			if (value instanceof Blob) p = value.arrayBuffer().then((buffer) => {
+				controller.enqueue(new Uint8Array(buffer));
+				return true;
+			});
+			else if (value instanceof Uint8Array) {
+				controller.enqueue(value);
+				p = true;
+			} else if (value instanceof ArrayBuffer) {
+				controller.enqueue(new Uint8Array(value));
+				p = true;
+			} else if (ArrayBuffer.isView(value)) {
+				controller.enqueue(new Uint8Array(value.buffer, value.byteOffset, value.byteLength));
+				p = true;
+			} else p = false;
 			if (p !== false) return void await p;
 			if (typeof value === "object") try {
 				controller.enqueue(encodeChunk(format(JSON.stringify(value))));
@@ -540,7 +535,7 @@ function tee(source, branches = 2, cap = 64, capBytes = 1 << 22) {
 			wakeAll();
 		}
 	})();
-	const makeBranch = (me) => ({
+	const makeBranch = (me) => Object.assign(Object.create(null), {
 		[Symbol.asyncIterator]() {
 			return this;
 		},

package/dist/adapter/utils.mjs

@@ -123,25 +123,6 @@ function responseToSetHeaders(response, set) {
 	if (set.headers["content-encoding"]) delete set.headers["content-encoding"];
 	return set;
 }
-function enqueueBinaryChunk(controller, chunk) {
-	if (chunk instanceof Blob) return chunk.arrayBuffer().then((buffer) => {
-		controller.enqueue(new Uint8Array(buffer));
-		return true;
-	});
-	if (chunk instanceof Uint8Array) {
-		controller.enqueue(chunk);
-		return true;
-	}
-	if (chunk instanceof ArrayBuffer) {
-		controller.enqueue(new Uint8Array(chunk));
-		return true;
-	}
-	if (ArrayBuffer.isView(chunk)) {
-		controller.enqueue(new Uint8Array(chunk.buffer, chunk.byteOffset, chunk.byteLength));
-		return true;
-	}
-	return false;
-}
 function createStreamHandler({ mapResponse, mapCompactResponse }) {
 	return async (generator, set, request, skipFormat, owned = false) => {
 		if (request === null) return void 0;
@@ -252,7 +233,21 @@ function createStreamHandler({ mapResponse, mapCompactResponse }) {
 				controller.enqueue(encodeChunk(value.toSSE()));
 				return;
 			}
-			const p = enqueueBinaryChunk(controller, value);
+			let p;
+			if (value instanceof Blob) p = value.arrayBuffer().then((buffer) => {
+				controller.enqueue(new Uint8Array(buffer));
+				return true;
+			});
+			else if (value instanceof Uint8Array) {
+				controller.enqueue(value);
+				p = true;
+			} else if (value instanceof ArrayBuffer) {
+				controller.enqueue(new Uint8Array(value));
+				p = true;
+			} else if (ArrayBuffer.isView(value)) {
+				controller.enqueue(new Uint8Array(value.buffer, value.byteOffset, value.byteLength));
+				p = true;
+			} else p = false;
 			if (p !== false) return void await p;
 			if (typeof value === "object") try {
 				controller.enqueue(encodeChunk(format(JSON.stringify(value))));
@@ -539,7 +534,7 @@ function tee(source, branches = 2, cap = 64, capBytes = 1 << 22) {
 			wakeAll();
 		}
 	})();
-	const makeBranch = (me) => ({
+	const makeBranch = (me) => Object.assign(Object.create(null), {
 		[Symbol.asyncIterator]() {
 			return this;
 		},

package/dist/base.d.ts

@@ -50,6 +50,14 @@ declare class Elysia<const in out BasePath extends string = '', const in out Sco
     hoc?: WrapFn<any>[];
     setup?: GracefulHandler<any>[];
     cleanup?: GracefulHandler<any>[];
+    /**
+     * Accepted `.decorate()` values implementing an explicit disposer, in
+     * registration order.
+     *
+     * Recorded at registration so the original reference survives a
+     * `.use()` clone, a same-name merge and a later override
+     */
+    disposable?: unknown[];
     cleanupEpoch?: (handler: GracefulHandler<any> | GracefulHandler<any>[]) => boolean;
     stop?: (closeActiveConnections?: boolean, failure?: {
       error: unknown;