elysia 2.0.0-beta.15 → 2.0.0-beta.17

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

@@ -1,9 +1,23 @@
+import { isHTMLBundle } from "../../utils.js";
 import { BunHTMLBundlelike } from "../../types.js";
 import { AnyElysia } from "../../base.js";
 import { ElysiaAdapterOptions } from "../types.js";
 //#region src/adapter/bun/index.d.ts
-declare const isHTMLBundle: (value: unknown) => value is BunHTMLBundlelike;
+type NativeRoutes = Record<string, Record<string, unknown>>;
+/**
+ * HTML bundles served by Bun's native router.
+ *
+ * A `:param` / `*` bundle (SPA fallback) matches before `fetch`, so with a
+ * `handoff` every other route of that method is registered natively too,
+ * handing off to `fetch`: Bun's specificity (exact > param > wildcard) then
+ * picks the Elysia route, and only unmatched paths reach the bundle (Elysia's
+ * own router leaves these bundles out, see `#buildRouterUnsafe`).
+ *
+ * All or nothing: when any route cannot be expressed in Bun's router, dynamic
+ * bundles are not served natively at all, since that route would be shadowed.
+ */
+declare function collectHTMLBundleRoutes(app: AnyElysia, handoff?: (request: Request, server: unknown) => unknown, routes?: NativeRoutes): NativeRoutes | undefined;
 declare function collectStaticRoutes(app: AnyElysia): Record<string, Record<string, Response | BunHTMLBundlelike>> | undefined;
 declare const BunAdapter: ElysiaAdapterOptions<void>;
 //#endregion
-export { BunAdapter, collectStaticRoutes, isHTMLBundle };
+export { BunAdapter, collectHTMLBundleRoutes, collectStaticRoutes, isHTMLBundle };

package/dist/adapter/bun/index.js

@@ -1,6 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_adapter_index = require('../index.js');
 const require_utils = require('../../utils.js');
+const require_type_bridge = require('../../type/bridge.js');
+const require_universal_is_production = require('../../universal/is-production.js');
 const require_adapter_web_standard_index = require('../web-standard/index.js');
 const require_generation = require('../../generation.js');
 const require_adapter_origin = require('../origin.js');
@@ -68,7 +70,83 @@ 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 expandOptional(path) {
+	const at = path.indexOf("?");
+	if (at === -1) return [path];
+	const start = path.lastIndexOf("/", at);
+	const rest = path.slice(at + 1);
+	return [...expandOptional(path.slice(0, start) + rest), ...expandOptional(path.slice(0, at) + rest)].map((variant) => variant || "/");
+}
+function isNativePath(path) {
+	const names = /* @__PURE__ */ new Set();
+	const segments = path.split("/");
+	for (let i = 0; i < segments.length; i++) {
+		const segment = segments[i];
+		if (segment.indexOf("*") !== -1) {
+			if (segment !== "*" || i !== segments.length - 1) return false;
+		} else if (segment.indexOf(":") !== -1) {
+			if (!/^:[A-Za-z_$][\w$]*$/.test(segment)) return false;
+			if (names.has(segment)) return false;
+			names.add(segment);
+		}
+	}
+	return true;
+}
+/**
+* HTML bundles served by Bun's native router.
+*
+* A `:param` / `*` bundle (SPA fallback) matches before `fetch`, so with a
+* `handoff` every other route of that method is registered natively too,
+* handing off to `fetch`: Bun's specificity (exact > param > wildcard) then
+* picks the Elysia route, and only unmatched paths reach the bundle (Elysia's
+* own router leaves these bundles out, see `#buildRouterUnsafe`).
+*
+* All or nothing: when any route cannot be expressed in Bun's router, dynamic
+* bundles are not served natively at all, since that route would be shadowed.
+*/
+function collectHTMLBundleRoutes(app, handoff, routes) {
+	let dynamic;
+	let bundles;
+	for (const route of app["~routes"]) {
+		const [method, path, handler] = route;
+		if (!isNativeStaticMethod(method) || !require_utils.isHTMLBundle(handler)) continue;
+		if (path.indexOf(":") !== -1 || path.indexOf("*") !== -1) {
+			if (!handoff) continue;
+			(dynamic ??= /* @__PURE__ */ new Set()).add(method);
+			(bundles ??= []).push([
+				method,
+				path,
+				handler
+			]);
+		} else ((routes ??= require_utils.nullObject())[path] ??= require_utils.nullObject())[method] = handler;
+		if (!require_universal_is_production.isProduction() && (route[4] || route[5] || route[6])) console.warn(`[Elysia] ${method} ${path} is an HTML bundle served natively, hooks do not run for it`);
+	}
+	if (!dynamic) return routes;
+	const strictPath = app["~config"]?.strictPath === true;
+	const handoffs = [];
+	for (const [method, path, handler] of app["~routes"]) {
+		if (require_utils.isHTMLBundle(handler)) continue;
+		const targets = method === "*" ? dynamic : dynamic.has(method) ? [method] : void 0;
+		if (!targets) continue;
+		for (const variant of expandOptional(path)) {
+			const loose = strictPath || variant.endsWith("*") ? variant : require_utils.getLoosePath(variant);
+			for (const raw of loose === variant ? [variant] : [variant, loose]) {
+				if (!isNativePath(raw)) {
+					if (!require_universal_is_production.isProduction()) console.warn(`[Elysia] ${method} ${path} cannot be expressed in Bun's router, so :param / * HTML bundles are not served natively (they would shadow it)`);
+					return routes;
+				}
+				const encoded = encodeURI(raw);
+				for (const target of targets) {
+					if (!/[^ -~]/.test(raw)) handoffs.push([raw, target]);
+					if (encoded !== raw) handoffs.push([encoded, target]);
+				}
+			}
+		}
+	}
+	for (const [method, path, bundle] of bundles) ((routes ??= require_utils.nullObject())[path] ??= require_utils.nullObject())[method] = bundle;
+	for (const [key, method] of handoffs) (routes[key] ??= require_utils.nullObject())[method] ??= handoff;
+	return routes;
+}
 function collectStaticRoutes(app) {
 	app.fetch;
 	const frozenRoot = require_generation.frozenRootOf(app);
@@ -78,11 +156,13 @@ function collectStaticRoutes(app) {
 	const length = table?.length ?? 0;
 	if (!table || !length) return;
 	const { method: methods, path: paths, handler: handlers, flags } = table;
+	const isStatic = (i) => isNativeStaticMethod(methods[i]) && (flags[i] & require_route_table.RouteFlag.Dynamic) === 0;
+	const isPromotable = (h) => promoteResponses && typeof h !== "function" && !(h instanceof Error) && !(h instanceof Promise);
 	let hasCandidate = false;
 	for (let i = 0; i < length; i++) {
-		if (!isNativeStaticMethod(methods[i]) || (flags[i] & require_route_table.RouteFlag.Dynamic) !== 0) continue;
+		if (!isStatic(i)) continue;
 		const h = handlers[i];
-		if (isHTMLBundle(h) || promoteResponses && typeof h !== "function" && !(h instanceof Error) && !(h instanceof Promise)) {
+		if (require_utils.isHTMLBundle(h) || isPromotable(h)) {
 			hasCandidate = true;
 			break;
 		}
@@ -91,8 +171,8 @@ function collectStaticRoutes(app) {
 	const strictPath = frozenRoot["~config"]?.strictPath === true;
 	const routeIndex = /* @__PURE__ */ new Map();
 	for (let i = 0; i < length; i++) {
+		if (!isStatic(i)) continue;
 		const method = methods[i];
-		if (!isNativeStaticMethod(method) || (flags[i] & require_route_table.RouteFlag.Dynamic) !== 0) continue;
 		const path = paths[i];
 		let pathsByMethod = routeIndex.get(method);
 		if (!pathsByMethod) routeIndex.set(method, pathsByMethod = /* @__PURE__ */ new Map());
@@ -110,19 +190,18 @@ function collectStaticRoutes(app) {
 		hasReady = true;
 	};
 	for (let i = 0; i < length; i++) {
+		if (!isStatic(i)) continue;
 		const method = methods[i];
-		const routeFlags = flags[i];
-		if (!isNativeStaticMethod(method) || (routeFlags & require_route_table.RouteFlag.Dynamic) !== 0) continue;
 		const pathsByMethod = routeIndex.get(method);
 		const path = paths[i];
 		if (pathsByMethod.get(path) !== i) continue;
 		const h = handlers[i];
 		let value;
-		if (isHTMLBundle(h)) value = h;
-		else if (!promoteResponses || typeof h === "function" || h instanceof Error || h instanceof Promise) continue;
+		if (require_utils.isHTMLBundle(h)) value = h;
+		else if (!isPromotable(h)) 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;
+		const needsEncode = (flags[i] & require_route_table.RouteFlag.Encode) !== 0;
 		add(method, path, value, needsEncode);
 		if (!strictPath) {
 			const loose = require_utils.getLoosePath(path);
@@ -133,9 +212,6 @@ function collectStaticRoutes(app) {
 	return ready;
 }
 const BunAdapter = require_adapter_index.createAdapter({
-	name: "bun",
-	runtime: "bun",
-	isWebStandard: true,
 	parse: require_adapter_web_standard_index.WebStandardAdapter.parse,
 	response: require_adapter_web_standard_index.WebStandardAdapter.response,
 	listen(app, options, callback) {
@@ -147,30 +223,32 @@ const BunAdapter = require_adapter_index.createAdapter({
 				return live(request, server);
 			});
 		}
-		const optionsIsObject = typeof options === "object";
-		const _options = optionsIsObject ? { ...options } : {
+		const _options = typeof options === "object" ? {
+			...options,
+			fetch: gatedFetch
+		} : {
 			port: +options,
 			fetch: gatedFetch
 		};
-		if (optionsIsObject) _options.fetch = gatedFetch;
 		const _config = app["~config"]?.serve;
 		const serve = _config ? {
 			..._config,
 			..._options
 		} : _options;
-		const server = app.server = Bun.serve(serve.routes || serve.error ? {
+		const handoff = (request, server) => serve.fetch(request, server);
+		const htmlRoutes = collectHTMLBundleRoutes(app, app.pending ? void 0 : handoff);
+		const server = app.server = Bun.serve(serve.routes || serve.error || htmlRoutes ? {
 			...serve,
 			error: unavailableFetch,
-			routes: {}
+			routes: htmlRoutes ?? {}
 		} : serve);
 		let live;
 		let cancelled = false;
 		let shutdownAttempt;
-		let ready;
 		let wsLifecycle;
 		let modulesReady;
-		let built;
 		let pendingSetups;
+		let setupsSettled;
 		const build = () => {
 			const fetch = app.fetch;
 			let routes;
@@ -179,6 +257,7 @@ const BunAdapter = require_adapter_index.createAdapter({
 			} catch (error) {
 				console.warn("[Elysia] Native static promotion was skipped:", error);
 			}
+			routes = collectHTMLBundleRoutes(app, handoff, routes);
 			let websocket;
 			if (app["~hasWS"]) {
 				const resolved = require_generation.resolvedWsOf(app);
@@ -204,6 +283,7 @@ const BunAdapter = require_adapter_index.createAdapter({
 		let startupFailure;
 		let forceRequested = false;
 		const force = Promise.withResolvers();
+		const abandon = Promise.withResolvers();
 		let forceDone = false;
 		let nativeStopped = false;
 		let abandoned = false;
@@ -335,7 +415,10 @@ const BunAdapter = require_adapter_index.createAdapter({
 					throw error;
 				}
 			}
-			if (pendingSetups) return Promise.all(pendingSetups).then(() => epoch.setup = false);
+			if (pendingSetups) {
+				setupsSettled = Promise.allSettled(pendingSetups);
+				return Promise.all(pendingSetups).then(() => epoch.setup = false);
+			}
 			epoch.setup = false;
 		};
 		const stop = (closeActiveConnections, failure) => {
@@ -343,6 +426,7 @@ const BunAdapter = require_adapter_index.createAdapter({
 			if (failure) startupFailure ??= failure;
 			if (closeActiveConnections === true) {
 				force.resolve();
+				if (!failure) abandon.resolve();
 				if (!forceDone) forceRequested = true;
 			}
 			cancelled = true;
@@ -360,6 +444,7 @@ const BunAdapter = require_adapter_index.createAdapter({
 				outcome = shutdownAttempt = promise;
 				const quiescence = quiesce(forceRequested || !published);
 				let releasable = false;
+				let abandonedSetups;
 				(async () => {
 					try {
 						await Promise.resolve();
@@ -368,9 +453,10 @@ const BunAdapter = require_adapter_index.createAdapter({
 						} catch (error) {
 							startupFailure ??= { error };
 						}
-						if (pendingSetups) {
-							const setupResults = await Promise.allSettled(pendingSetups);
-							if (!startupFailure) for (let i = 0; i < setupResults.length; i++) {
+						if (setupsSettled) {
+							const setupResults = await Promise.race([setupsSettled, abandon.promise]);
+							if (!setupResults) abandonedSetups = setupsSettled;
+							else if (!startupFailure) for (let i = 0; i < setupResults.length; i++) {
 								const result = setupResults[i];
 								if (result.status === "rejected") {
 									startupFailure = { error: result.reason };
@@ -402,17 +488,17 @@ 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;
 						}
 						if (cleanupFailures) errors.push(...cleanupFailures);
-						if (releasable) releaseLifecycle(app, ext, createdExt, stop, registerCleanup);
+						const release = () => releaseLifecycle(app, ext, createdExt, stop, registerCleanup);
+						if (releasable && abandonedSetups) abandonedSetups.then((results) => {
+							for (const result of results) if (result.status === "rejected") console.error("[Elysia] setup abandoned by stop(true) failed:", result.reason);
+							release();
+						});
+						else if (releasable) release();
 						require_utils.throwLifecycleErrors(errors);
 					} finally {
 						epoch.setup = false;
@@ -436,7 +522,7 @@ const BunAdapter = require_adapter_index.createAdapter({
 				return;
 			}
 			try {
-				built ??= build();
+				const built = build();
 				live = serve.fetch = withOrigin(built.fetch);
 				published = true;
 				if (built.websocket) serve.websocket = built.websocket;
@@ -468,12 +554,13 @@ const BunAdapter = require_adapter_index.createAdapter({
 				return;
 			}
 			const setupReady = setup();
-			if (setupReady && typeof setupReady.then === "function") return Promise.resolve(setupReady).then(publish);
+			if (setupReady) return setupReady.then(publish);
 			publish();
 		};
 		try {
-			ready = (modulesReady = app.modules).then(start).catch((error) => stop(true, { error }));
-			ready.catch((error) => {
+			const modules = modulesReady = app.modules;
+			const preload = require_type_bridge.preloadTypebox();
+			(preload ? Promise.all([modules, preload]) : modules).then(start).catch((error) => stop(true, { error })).catch((error) => {
 				console.error("[Elysia] listen() failed:", error);
 				if (typeof process !== "undefined") process.exitCode = 1;
 			});
@@ -486,5 +573,6 @@ const BunAdapter = require_adapter_index.createAdapter({
 
 //#endregion
 exports.BunAdapter = BunAdapter;
+exports.collectHTMLBundleRoutes = collectHTMLBundleRoutes;
 exports.collectStaticRoutes = collectStaticRoutes;
-exports.isHTMLBundle = isHTMLBundle;
+exports.isHTMLBundle = require_utils.isHTMLBundle;

package/dist/adapter/bun/index.mjs

@@ -1,5 +1,7 @@
 import { createAdapter } from "../index.mjs";
-import { disposeDecorators, flattenChain, getLoosePath, isSocketQuiet, nullObject, throwLifecycleErrors } from "../../utils.mjs";
+import { flattenChain, getLoosePath, isHTMLBundle, isSocketQuiet, nullObject, throwLifecycleErrors } from "../../utils.mjs";
+import { preloadTypebox } from "../../type/bridge.mjs";
+import { isProduction } from "../../universal/is-production.mjs";
 import { WebStandardAdapter } from "../web-standard/index.mjs";
 import { frozenRootOf, resolvedWsOf } from "../../generation.mjs";
 import { origin } from "../origin.mjs";
@@ -67,7 +69,83 @@ 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 expandOptional(path) {
+	const at = path.indexOf("?");
+	if (at === -1) return [path];
+	const start = path.lastIndexOf("/", at);
+	const rest = path.slice(at + 1);
+	return [...expandOptional(path.slice(0, start) + rest), ...expandOptional(path.slice(0, at) + rest)].map((variant) => variant || "/");
+}
+function isNativePath(path) {
+	const names = /* @__PURE__ */ new Set();
+	const segments = path.split("/");
+	for (let i = 0; i < segments.length; i++) {
+		const segment = segments[i];
+		if (segment.indexOf("*") !== -1) {
+			if (segment !== "*" || i !== segments.length - 1) return false;
+		} else if (segment.indexOf(":") !== -1) {
+			if (!/^:[A-Za-z_$][\w$]*$/.test(segment)) return false;
+			if (names.has(segment)) return false;
+			names.add(segment);
+		}
+	}
+	return true;
+}
+/**
+* HTML bundles served by Bun's native router.
+*
+* A `:param` / `*` bundle (SPA fallback) matches before `fetch`, so with a
+* `handoff` every other route of that method is registered natively too,
+* handing off to `fetch`: Bun's specificity (exact > param > wildcard) then
+* picks the Elysia route, and only unmatched paths reach the bundle (Elysia's
+* own router leaves these bundles out, see `#buildRouterUnsafe`).
+*
+* All or nothing: when any route cannot be expressed in Bun's router, dynamic
+* bundles are not served natively at all, since that route would be shadowed.
+*/
+function collectHTMLBundleRoutes(app, handoff, routes) {
+	let dynamic;
+	let bundles;
+	for (const route of app["~routes"]) {
+		const [method, path, handler] = route;
+		if (!isNativeStaticMethod(method) || !isHTMLBundle(handler)) continue;
+		if (path.indexOf(":") !== -1 || path.indexOf("*") !== -1) {
+			if (!handoff) continue;
+			(dynamic ??= /* @__PURE__ */ new Set()).add(method);
+			(bundles ??= []).push([
+				method,
+				path,
+				handler
+			]);
+		} else ((routes ??= nullObject())[path] ??= nullObject())[method] = handler;
+		if (!isProduction() && (route[4] || route[5] || route[6])) console.warn(`[Elysia] ${method} ${path} is an HTML bundle served natively, hooks do not run for it`);
+	}
+	if (!dynamic) return routes;
+	const strictPath = app["~config"]?.strictPath === true;
+	const handoffs = [];
+	for (const [method, path, handler] of app["~routes"]) {
+		if (isHTMLBundle(handler)) continue;
+		const targets = method === "*" ? dynamic : dynamic.has(method) ? [method] : void 0;
+		if (!targets) continue;
+		for (const variant of expandOptional(path)) {
+			const loose = strictPath || variant.endsWith("*") ? variant : getLoosePath(variant);
+			for (const raw of loose === variant ? [variant] : [variant, loose]) {
+				if (!isNativePath(raw)) {
+					if (!isProduction()) console.warn(`[Elysia] ${method} ${path} cannot be expressed in Bun's router, so :param / * HTML bundles are not served natively (they would shadow it)`);
+					return routes;
+				}
+				const encoded = encodeURI(raw);
+				for (const target of targets) {
+					if (!/[^ -~]/.test(raw)) handoffs.push([raw, target]);
+					if (encoded !== raw) handoffs.push([encoded, target]);
+				}
+			}
+		}
+	}
+	for (const [method, path, bundle] of bundles) ((routes ??= nullObject())[path] ??= nullObject())[method] = bundle;
+	for (const [key, method] of handoffs) (routes[key] ??= nullObject())[method] ??= handoff;
+	return routes;
+}
 function collectStaticRoutes(app) {
 	app.fetch;
 	const frozenRoot = frozenRootOf(app);
@@ -77,11 +155,13 @@ function collectStaticRoutes(app) {
 	const length = table?.length ?? 0;
 	if (!table || !length) return;
 	const { method: methods, path: paths, handler: handlers, flags } = table;
+	const isStatic = (i) => isNativeStaticMethod(methods[i]) && (flags[i] & RouteFlag.Dynamic) === 0;
+	const isPromotable = (h) => promoteResponses && typeof h !== "function" && !(h instanceof Error) && !(h instanceof Promise);
 	let hasCandidate = false;
 	for (let i = 0; i < length; i++) {
-		if (!isNativeStaticMethod(methods[i]) || (flags[i] & RouteFlag.Dynamic) !== 0) continue;
+		if (!isStatic(i)) continue;
 		const h = handlers[i];
-		if (isHTMLBundle(h) || promoteResponses && typeof h !== "function" && !(h instanceof Error) && !(h instanceof Promise)) {
+		if (isHTMLBundle(h) || isPromotable(h)) {
 			hasCandidate = true;
 			break;
 		}
@@ -90,8 +170,8 @@ function collectStaticRoutes(app) {
 	const strictPath = frozenRoot["~config"]?.strictPath === true;
 	const routeIndex = /* @__PURE__ */ new Map();
 	for (let i = 0; i < length; i++) {
+		if (!isStatic(i)) continue;
 		const method = methods[i];
-		if (!isNativeStaticMethod(method) || (flags[i] & RouteFlag.Dynamic) !== 0) continue;
 		const path = paths[i];
 		let pathsByMethod = routeIndex.get(method);
 		if (!pathsByMethod) routeIndex.set(method, pathsByMethod = /* @__PURE__ */ new Map());
@@ -109,19 +189,18 @@ function collectStaticRoutes(app) {
 		hasReady = true;
 	};
 	for (let i = 0; i < length; i++) {
+		if (!isStatic(i)) continue;
 		const method = methods[i];
-		const routeFlags = flags[i];
-		if (!isNativeStaticMethod(method) || (routeFlags & RouteFlag.Dynamic) !== 0) continue;
 		const pathsByMethod = routeIndex.get(method);
 		const path = paths[i];
 		if (pathsByMethod.get(path) !== i) continue;
 		const h = handlers[i];
 		let value;
 		if (isHTMLBundle(h)) value = h;
-		else if (!promoteResponses || typeof h === "function" || h instanceof Error || h instanceof Promise) continue;
+		else if (!isPromotable(h)) continue;
 		else value = buildNativeStaticResponse(routeRow(table, i), app);
 		if (!value) continue;
-		const needsEncode = (routeFlags & RouteFlag.Encode) !== 0;
+		const needsEncode = (flags[i] & RouteFlag.Encode) !== 0;
 		add(method, path, value, needsEncode);
 		if (!strictPath) {
 			const loose = getLoosePath(path);
@@ -132,9 +211,6 @@ function collectStaticRoutes(app) {
 	return ready;
 }
 const BunAdapter = createAdapter({
-	name: "bun",
-	runtime: "bun",
-	isWebStandard: true,
 	parse: WebStandardAdapter.parse,
 	response: WebStandardAdapter.response,
 	listen(app, options, callback) {
@@ -146,30 +222,32 @@ const BunAdapter = createAdapter({
 				return live(request, server);
 			});
 		}
-		const optionsIsObject = typeof options === "object";
-		const _options = optionsIsObject ? { ...options } : {
+		const _options = typeof options === "object" ? {
+			...options,
+			fetch: gatedFetch
+		} : {
 			port: +options,
 			fetch: gatedFetch
 		};
-		if (optionsIsObject) _options.fetch = gatedFetch;
 		const _config = app["~config"]?.serve;
 		const serve = _config ? {
 			..._config,
 			..._options
 		} : _options;
-		const server = app.server = Bun.serve(serve.routes || serve.error ? {
+		const handoff = (request, server) => serve.fetch(request, server);
+		const htmlRoutes = collectHTMLBundleRoutes(app, app.pending ? void 0 : handoff);
+		const server = app.server = Bun.serve(serve.routes || serve.error || htmlRoutes ? {
 			...serve,
 			error: unavailableFetch,
-			routes: {}
+			routes: htmlRoutes ?? {}
 		} : serve);
 		let live;
 		let cancelled = false;
 		let shutdownAttempt;
-		let ready;
 		let wsLifecycle;
 		let modulesReady;
-		let built;
 		let pendingSetups;
+		let setupsSettled;
 		const build = () => {
 			const fetch = app.fetch;
 			let routes;
@@ -178,6 +256,7 @@ const BunAdapter = createAdapter({
 			} catch (error) {
 				console.warn("[Elysia] Native static promotion was skipped:", error);
 			}
+			routes = collectHTMLBundleRoutes(app, handoff, routes);
 			let websocket;
 			if (app["~hasWS"]) {
 				const resolved = resolvedWsOf(app);
@@ -203,6 +282,7 @@ const BunAdapter = createAdapter({
 		let startupFailure;
 		let forceRequested = false;
 		const force = Promise.withResolvers();
+		const abandon = Promise.withResolvers();
 		let forceDone = false;
 		let nativeStopped = false;
 		let abandoned = false;
@@ -334,7 +414,10 @@ const BunAdapter = createAdapter({
 					throw error;
 				}
 			}
-			if (pendingSetups) return Promise.all(pendingSetups).then(() => epoch.setup = false);
+			if (pendingSetups) {
+				setupsSettled = Promise.allSettled(pendingSetups);
+				return Promise.all(pendingSetups).then(() => epoch.setup = false);
+			}
 			epoch.setup = false;
 		};
 		const stop = (closeActiveConnections, failure) => {
@@ -342,6 +425,7 @@ const BunAdapter = createAdapter({
 			if (failure) startupFailure ??= failure;
 			if (closeActiveConnections === true) {
 				force.resolve();
+				if (!failure) abandon.resolve();
 				if (!forceDone) forceRequested = true;
 			}
 			cancelled = true;
@@ -359,6 +443,7 @@ const BunAdapter = createAdapter({
 				outcome = shutdownAttempt = promise;
 				const quiescence = quiesce(forceRequested || !published);
 				let releasable = false;
+				let abandonedSetups;
 				(async () => {
 					try {
 						await Promise.resolve();
@@ -367,9 +452,10 @@ const BunAdapter = createAdapter({
 						} catch (error) {
 							startupFailure ??= { error };
 						}
-						if (pendingSetups) {
-							const setupResults = await Promise.allSettled(pendingSetups);
-							if (!startupFailure) for (let i = 0; i < setupResults.length; i++) {
+						if (setupsSettled) {
+							const setupResults = await Promise.race([setupsSettled, abandon.promise]);
+							if (!setupResults) abandonedSetups = setupsSettled;
+							else if (!startupFailure) for (let i = 0; i < setupResults.length; i++) {
 								const result = setupResults[i];
 								if (result.status === "rejected") {
 									startupFailure = { error: result.reason };
@@ -401,17 +487,17 @@ const BunAdapter = createAdapter({
 										(cleanupFailures ??= []).push(error);
 									}
 								}
-								try {
-									await disposeDecorators(app);
-								} catch (error) {
-									(cleanupFailures ??= []).push(error);
-								}
 							}
 							cleanupCompleted = true;
 							epochCleanup.length = 0;
 						}
 						if (cleanupFailures) errors.push(...cleanupFailures);
-						if (releasable) releaseLifecycle(app, ext, createdExt, stop, registerCleanup);
+						const release = () => releaseLifecycle(app, ext, createdExt, stop, registerCleanup);
+						if (releasable && abandonedSetups) abandonedSetups.then((results) => {
+							for (const result of results) if (result.status === "rejected") console.error("[Elysia] setup abandoned by stop(true) failed:", result.reason);
+							release();
+						});
+						else if (releasable) release();
 						throwLifecycleErrors(errors);
 					} finally {
 						epoch.setup = false;
@@ -435,7 +521,7 @@ const BunAdapter = createAdapter({
 				return;
 			}
 			try {
-				built ??= build();
+				const built = build();
 				live = serve.fetch = withOrigin(built.fetch);
 				published = true;
 				if (built.websocket) serve.websocket = built.websocket;
@@ -467,12 +553,13 @@ const BunAdapter = createAdapter({
 				return;
 			}
 			const setupReady = setup();
-			if (setupReady && typeof setupReady.then === "function") return Promise.resolve(setupReady).then(publish);
+			if (setupReady) return setupReady.then(publish);
 			publish();
 		};
 		try {
-			ready = (modulesReady = app.modules).then(start).catch((error) => stop(true, { error }));
-			ready.catch((error) => {
+			const modules = modulesReady = app.modules;
+			const preload = preloadTypebox();
+			(preload ? Promise.all([modules, preload]) : modules).then(start).catch((error) => stop(true, { error })).catch((error) => {
 				console.error("[Elysia] listen() failed:", error);
 				if (typeof process !== "undefined") process.exitCode = 1;
 			});
@@ -484,4 +571,4 @@ const BunAdapter = createAdapter({
 });
 
 //#endregion
-export { BunAdapter, collectStaticRoutes, isHTMLBundle };
+export { BunAdapter, collectHTMLBundleRoutes, collectStaticRoutes, isHTMLBundle };

package/dist/adapter/types.d.ts

@@ -1,6 +1,6 @@
 import { ListenCallback, Serve } from "../universal/server.js";
-import { MaybePromise } from "../types.js";
 import { Context } from "../context.js";
+import { MaybePromise } from "../types.js";
 import { AnyElysia } from "../base.js";
 
 //#region src/adapter/types.d.ts
@@ -10,25 +10,6 @@ import { AnyElysia } from "../base.js";
  * @since 2.0.0
  */
 interface ElysiaAdapterOptions<App extends AnyElysia | void = void> {
-  /**
-   * Name of the adapter, preferably runtime
-   */
-  name: string;
-  /**
-   *
-   * @param app
-   */
-  runtime: 'node' | 'deno' | 'bun' | 'cloudflare-worker' | 'browser' | 'vercel' | 'netlify' | 'lambda' | 'fastly' | 'edge' | 'unknown' | (string & {});
-  /**
-   * Whether this adapter is web standard
-   */
-  isWebStandard: boolean;
-  /**
-   * Whether this adapter supports WebSocket.
-   *
-   * `.ws()` throws on non-Bun runtimes unless this is set.
-   */
-  websocket?: boolean;
   listen?(app: AnyElysia, options: string | number | Partial<Serve>, callback?: ListenCallback): void;
   parse: {
     json: (context: Context) => MaybePromise<Record<keyof any, undefined> | unknown[]>;
@@ -36,7 +17,7 @@ interface ElysiaAdapterOptions<App extends AnyElysia | void = void> {
     urlencoded: (context: Context) => MaybePromise<Record<string, string | string[]>>;
     arrayBuffer: (context: Context) => MaybePromise<ArrayBuffer>;
     formData: (context: Context) => MaybePromise<Record<string, unknown>>;
-    default: (context: Context, contentType: string, normalized?: boolean) => MaybePromise<any>;
+    default: (context: Context, contentType: string) => MaybePromise<any>;
   };
   response: {
     /**