elysia 2.0.0-beta.21 → 2.0.0-beta.23

package/dist/ws/route.js

@@ -2,6 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_universal_constants = require('../universal/constants.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_error = require('../error.js');
 const require_cookie_crypto = require('../cookie/crypto.js');
 const require_adapter_web_standard_handler = require('../adapter/web-standard/handler.js');
@@ -94,17 +95,22 @@ async function handleWSResponse(ws, value, mapResponses) {
 	ws.send(mapped);
 }
 function wsErrorFrameFallback(error) {
-	if (require_handler_error.claimsProblemType(error)) try {
+	const type = error?.type;
+	if (require_handler_error.claimsProblemType(error, type)) try {
 		const status = require_handler_error.resolveStatus(error.status);
 		const served = typeof status === "number" && status >= 100 ? status : 500;
 		const stringify = (value) => typeof value === "object" && value !== null ? JSON.stringify(value) : String(value);
-		const problemFrame = (detail) => JSON.stringify(require_error.problemBody({
-			type: error.type ?? "about:blank",
-			...typeof error.code === "string" ? { code: error.code } : {},
-			detail,
-			status: served
-		}));
-		const serveMessage = () => problemFrame(require_handler_error.statusFallbackBody(error, served));
+		const problemFrame = (detail, trusted = true) => {
+			const code = trusted ? error.code : void 0;
+			return JSON.stringify(require_error.problemBody({
+				type: typeof type === "string" ? type : "about:blank",
+				...typeof code === "string" ? { code } : {},
+				detail,
+				status: served
+			}));
+		};
+		if (require_universal_is_production.isProduction() && served >= 500 && !(error instanceof require_error.HTTPError)) return error instanceof Error && typeof status === "number" && status >= 500 ? problemFrame(require_error.titleOf(served), false) : wsLegacyFrame(error);
+		const serveMessage = () => problemFrame(require_handler_error.statusFallbackBody(error, served, require_error.titleOf(served)));
 		const serveDetail = () => {
 			const detail = require_handler_error.readAnnotation(error, "detail", true);
 			if (detail === void 0) return serveMessage();
@@ -120,7 +126,7 @@ function wsErrorFrameFallback(error) {
 }
 function wsLegacyFrame(error) {
 	if (error?.status) {
-		const body = require_handler_error.statusFallbackBody(error, error.status);
+		const body = require_handler_error.statusFallbackBody(error, require_handler_error.resolveStatus(error.status));
 		return typeof body === "object" ? JSON.stringify(body) : String(body);
 	}
 	return require_error.internalServerErrorBodyString(error);
@@ -160,7 +166,7 @@ function sendErrorFrame(ws, error) {
 		} catch {}
 	}, () => {});
 }
-function validateUpgradeChannel(validator, value, type) {
+function validateChannel(validator, value, type) {
 	return validator.hasCodec || validator instanceof require_validator_index.StandardValidator ? validator.From(value, type) : validator.EncodeFrom(value, type);
 }
 const wsOptions = [
@@ -173,11 +179,12 @@ const wsOptions = [
 	"perMessageDeflate"
 ];
 function buildWSRoute(route, app) {
-	const hook = require_compile_handler_index.resolveWSLocalHook(require_compile_handler_index.localMacroRoot(route[7] ?? route[3] ?? app, app), route[4], app) ?? require_utils.nullObject();
+	const localHook = require_compile_handler_index.resolveWSLocalHook(require_compile_handler_index.localMacroRoot(route[7] ?? route[3] ?? app, app), route[4], app);
+	const hook = localHook ?? require_utils.nullObject();
 	const instance = route[3] ?? app;
 	const appHookChain = route[5];
 	const inheritedChain = route[6];
-	const composed = require_compile_handler_index.composeRouteHook(instance, route[4], appHookChain, inheritedChain, app, route[7]) ?? hook;
+	const composed = require_compile_handler_index.composeRouteHook(instance, localHook, appHookChain, inheritedChain, app, route[7]) ?? hook;
 	let validators;
 	const programId = require_generation.frozenRootOf(app)["~programId"];
 	const captured = require_compile_aot.Compiled.getHandler(programId, "WS", route[1]);
@@ -210,14 +217,14 @@ function buildWSRoute(route, app) {
 		});
 	} catch (error) {
 		if (!require_compile_handler_frozen_validator.isBridgeNotInitialized(error)) throw error;
-		if (live) throw new Error(require_compile_aot.aotDrift("WS", route[1]), { cause: error });
+		if (live) throw new Error(require_compile_aot.aotDriftMessage("WS", route[1]), { cause: error });
 		const frozen = require_compile_handler_frozen_validator.buildFrozenRouteValidator(composed, app, "WS", route[1]);
 		if (!frozen) throw error;
 		validators = frozen;
 	}
 	if (live && captured) require_compile_aot.warnAotDrift("WS", route[1]);
 	const responseValidator = validators.response;
-	const defaultResponseValidator = responseValidator ? responseValidator[200] ?? responseValidator[Object.keys(responseValidator)[0]] : void 0;
+	const defaultResponseValidator = responseValidator?.get(200) ?? responseValidator?.values().next().value;
 	const cookieIsOptional = !!composed.cookie?.["~optional"];
 	const queryChannels = require_compile_handler_utils.getQueryParseChannels(validators.query?.schema);
 	const queryArray = queryChannels?.array;
@@ -226,14 +233,16 @@ function buildWSRoute(route, app) {
 	const parseHooks = concatHooks(hook.parse);
 	const transforms = concatHooks(flatAppHook.transform, hook.transform);
 	const allBeforeHandles = concatHooks(flatAppHook.beforeHandle, hook.beforeHandle);
-	const deriveEntries = concatHooks(flatAppHook["~deriveEntries"], hook["~deriveEntries"]);
-	const deriveSet = deriveEntries.length ? new Set(deriveEntries.map(require_utils.deriveEntryFn)) : void 0;
-	const upgradeDeriveModes = require_compile_handler_utils.deriveModes(allBeforeHandles, deriveEntries);
-	const messageBeforeHandles = allBeforeHandles.filter((fn) => !deriveSet?.has(fn));
+	const upgradeDeriveModes = require_compile_handler_utils.deriveModes(allBeforeHandles, require_compile_handler_utils.joinDeriveEntries([flatAppHook, hook]) ?? concatHooks(flatAppHook["~deriveEntries"], hook["~deriveEntries"]));
+	const messageBeforeHandles = allBeforeHandles.filter((_, i) => upgradeDeriveModes?.[i] === void 0);
 	const afterHandles = concatHooks(flatAppHook.afterHandle, hook.afterHandle);
 	const mapResponses = concatHooks(flatAppHook.mapResponse, hook.mapResponse);
 	const afterResponses = concatHooks(flatAppHook.afterResponse, hook.afterResponse);
 	const errorHandlers = concatHooks(hook.error, flatAppHook.error);
+	const finalizeOwnError = require_handler_utils.finalizeRouteErrorOf({
+		error: errorHandlers,
+		mapResponse: mapResponses
+	});
 	const inference = require_sucrose.sucrose(hook.message, {
 		beforeHandle: [
 			...allBeforeHandles,
@@ -252,7 +261,7 @@ function buildWSRoute(route, app) {
 		afterResponse: afterResponses
 	});
 	const cookieConfig = validators.cookie || inference.cookie ? require_cookie_config.compileCookieConfig(composed.cookie, require_generation.frozenRootOf(app)["~config"]?.cookie, require_generation.frozenRootOf(app)["~ext"]?.models, composed.schemas) : void 0;
-	const signCookies = cookieConfig?.hasSign ? (set) => require_cookie_utils.signCookieValues(set.cookie, cookieConfig) : void 0;
+	const signCookies = cookieConfig?.hasSign ? (set) => require_cookie_utils.signCookieValues(set.cookie, cookieConfig, set) : void 0;
 	const parseMessage = require_ws_parser.createMessageParser(parseHooks);
 	const handleUpgradeError = require_handler_error.createErrorHandler(errorHandlers.length ? errorHandlers : void 0, ((response, set, context) => {
 		const map = () => require_adapter_web_standard_handler.mapResponse(response, set, context?.request);
@@ -303,7 +312,7 @@ function buildWSRoute(route, app) {
 		if (bodyValidator) {
 			let decoded;
 			try {
-				decoded = validateUpgradeChannel(bodyValidator, message, "body");
+				decoded = validateChannel(bodyValidator, message, "body");
 			} catch (error) {
 				return onMessageValidationError(ws, error);
 			}
@@ -396,7 +405,7 @@ function buildWSRoute(route, app) {
 		const request = context.request;
 		try {
 			if (validators.params) {
-				let r = validateUpgradeChannel(validators.params, context.params ?? require_utils.nullObject(), "params");
+				let r = validateChannel(validators.params, context.params ?? require_utils.nullObject(), "params");
 				if (r instanceof Promise) r = await r;
 				context.params = r;
 			}
@@ -404,7 +413,7 @@ function buildWSRoute(route, app) {
 				const url = request.url;
 				let r = require_parse_query.parseQueryFromURL(url, context.qi ?? url.indexOf("?"), queryArray, queryObject);
 				if (validators.query) {
-					r = validateUpgradeChannel(validators.query, r, "query");
+					r = validateChannel(validators.query, r, "query");
 					if (r instanceof Promise) r = await r;
 				}
 				context.query = r;
@@ -412,7 +421,7 @@ function buildWSRoute(route, app) {
 			if (validators.headers || inference.headers) {
 				let r = require_universal_constants.isBun ? request.headers.toJSON() : Object.fromEntries(request.headers);
 				if (validators.headers) {
-					r = validateUpgradeChannel(validators.headers, r, "headers");
+					r = validateChannel(validators.headers, r, "headers");
 					if (r instanceof Promise) r = await r;
 				}
 				context.headers = r;
@@ -423,7 +432,7 @@ function buildWSRoute(route, app) {
 					const raw = await require_cookie_utils.parseCookieRaw(cookieHeader, cookieConfig);
 					let r = raw;
 					if (!cookieIsOptional || Object.keys(raw).length) {
-						r = validateUpgradeChannel(validators.cookie, raw, "cookie");
+						r = validateChannel(validators.cookie, raw, "cookie");
 						if (r instanceof Promise) r = await r;
 					}
 					context.cookie = require_cookie_utils.buildCookieJar(context.set, r, cookieConfig);
@@ -481,7 +490,7 @@ function buildWSRoute(route, app) {
 			try {
 				return await handleUpgradeError(context, error);
 			} catch (thrown) {
-				return require_handler_utils.finalizeRouteError(app, context, thrown, signCookies);
+				return finalizeOwnError(app, context, thrown, signCookies);
 			}
 		}
 	};

package/dist/ws/route.mjs

@@ -1,17 +1,19 @@
+// @bun
 import { isBun } from "../universal/constants.mjs";
-import { assignOwn, deriveEntryFn, isSocketQuiet, nullObject } from "../utils.mjs";
+import { assignOwn, isSocketQuiet, nullObject } from "../utils.mjs";
 import { isBridgeLive } from "../type/bridge.mjs";
-import { ElysiaError, ElysiaStatus, ValidationError, elysiaErrorProblem, internalServerErrorBodyString, problemBody, problemResponse } from "../error.mjs";
+import { isProduction } from "../universal/is-production.mjs";
+import { ElysiaError, ElysiaStatus, HTTPError, ValidationError, elysiaErrorProblem, internalServerErrorBodyString, problemBody, problemResponse, titleOf } from "../error.mjs";
 import { hasSyncHmac } from "../cookie/crypto.mjs";
 import { mapResponse } from "../adapter/web-standard/handler.mjs";
 import { parseQueryFromURL } from "../parse-query.mjs";
-import { Capture, Compiled, aotDrift, warnAotDrift } from "../compile/aot.mjs";
+import { Capture, Compiled, aotDriftMessage, warnAotDrift } from "../compile/aot.mjs";
 import { frozenRootOf } from "../generation.mjs";
 import { compileCookieConfig } from "../cookie/config.mjs";
 import { buildCookieJar, parseCookieRaw, parseCookieRawDeferred, parseCookieRawLazy, signCookieValues } from "../cookie/utils.mjs";
-import { finalizeRouteError } from "../handler/utils.mjs";
+import { finalizeRouteErrorOf } from "../handler/utils.mjs";
 import { adoptErrorType, claimsProblemType, createErrorHandler, readAnnotation, resolveStatus, statusFallbackBody } from "../handler/error.mjs";
-import { deriveModes, getQueryParseChannels, replaceDeriveContext } from "../compile/handler/utils.mjs";
+import { deriveModes, getQueryParseChannels, joinDeriveEntries, replaceDeriveContext } from "../compile/handler/utils.mjs";
 import { sucrose } from "../sucrose.mjs";
 import { StandardValidator } from "../validator/index.mjs";
 import { RouteValidator } from "../validator/route.mjs";
@@ -93,17 +95,22 @@ async function handleWSResponse(ws, value, mapResponses) {
 	ws.send(mapped);
 }
 function wsErrorFrameFallback(error) {
-	if (claimsProblemType(error)) try {
+	const type = error?.type;
+	if (claimsProblemType(error, type)) try {
 		const status = resolveStatus(error.status);
 		const served = typeof status === "number" && status >= 100 ? status : 500;
 		const stringify = (value) => typeof value === "object" && value !== null ? JSON.stringify(value) : String(value);
-		const problemFrame = (detail) => JSON.stringify(problemBody({
-			type: error.type ?? "about:blank",
-			...typeof error.code === "string" ? { code: error.code } : {},
-			detail,
-			status: served
-		}));
-		const serveMessage = () => problemFrame(statusFallbackBody(error, served));
+		const problemFrame = (detail, trusted = true) => {
+			const code = trusted ? error.code : void 0;
+			return JSON.stringify(problemBody({
+				type: typeof type === "string" ? type : "about:blank",
+				...typeof code === "string" ? { code } : {},
+				detail,
+				status: served
+			}));
+		};
+		if (isProduction() && served >= 500 && !(error instanceof HTTPError)) return error instanceof Error && typeof status === "number" && status >= 500 ? problemFrame(titleOf(served), false) : wsLegacyFrame(error);
+		const serveMessage = () => problemFrame(statusFallbackBody(error, served, titleOf(served)));
 		const serveDetail = () => {
 			const detail = readAnnotation(error, "detail", true);
 			if (detail === void 0) return serveMessage();
@@ -119,7 +126,7 @@ function wsErrorFrameFallback(error) {
 }
 function wsLegacyFrame(error) {
 	if (error?.status) {
-		const body = statusFallbackBody(error, error.status);
+		const body = statusFallbackBody(error, resolveStatus(error.status));
 		return typeof body === "object" ? JSON.stringify(body) : String(body);
 	}
 	return internalServerErrorBodyString(error);
@@ -159,7 +166,7 @@ function sendErrorFrame(ws, error) {
 		} catch {}
 	}, () => {});
 }
-function validateUpgradeChannel(validator, value, type) {
+function validateChannel(validator, value, type) {
 	return validator.hasCodec || validator instanceof StandardValidator ? validator.From(value, type) : validator.EncodeFrom(value, type);
 }
 const wsOptions = [
@@ -172,11 +179,12 @@ const wsOptions = [
 	"perMessageDeflate"
 ];
 function buildWSRoute(route, app) {
-	const hook = resolveWSLocalHook(localMacroRoot(route[7] ?? route[3] ?? app, app), route[4], app) ?? nullObject();
+	const localHook = resolveWSLocalHook(localMacroRoot(route[7] ?? route[3] ?? app, app), route[4], app);
+	const hook = localHook ?? nullObject();
 	const instance = route[3] ?? app;
 	const appHookChain = route[5];
 	const inheritedChain = route[6];
-	const composed = composeRouteHook(instance, route[4], appHookChain, inheritedChain, app, route[7]) ?? hook;
+	const composed = composeRouteHook(instance, localHook, appHookChain, inheritedChain, app, route[7]) ?? hook;
 	let validators;
 	const programId = frozenRootOf(app)["~programId"];
 	const captured = Compiled.getHandler(programId, "WS", route[1]);
@@ -209,14 +217,14 @@ function buildWSRoute(route, app) {
 		});
 	} catch (error) {
 		if (!isBridgeNotInitialized(error)) throw error;
-		if (live) throw new Error(aotDrift("WS", route[1]), { cause: error });
+		if (live) throw new Error(aotDriftMessage("WS", route[1]), { cause: error });
 		const frozen = buildFrozenRouteValidator(composed, app, "WS", route[1]);
 		if (!frozen) throw error;
 		validators = frozen;
 	}
 	if (live && captured) warnAotDrift("WS", route[1]);
 	const responseValidator = validators.response;
-	const defaultResponseValidator = responseValidator ? responseValidator[200] ?? responseValidator[Object.keys(responseValidator)[0]] : void 0;
+	const defaultResponseValidator = responseValidator?.get(200) ?? responseValidator?.values().next().value;
 	const cookieIsOptional = !!composed.cookie?.["~optional"];
 	const queryChannels = getQueryParseChannels(validators.query?.schema);
 	const queryArray = queryChannels?.array;
@@ -225,14 +233,16 @@ function buildWSRoute(route, app) {
 	const parseHooks = concatHooks(hook.parse);
 	const transforms = concatHooks(flatAppHook.transform, hook.transform);
 	const allBeforeHandles = concatHooks(flatAppHook.beforeHandle, hook.beforeHandle);
-	const deriveEntries = concatHooks(flatAppHook["~deriveEntries"], hook["~deriveEntries"]);
-	const deriveSet = deriveEntries.length ? new Set(deriveEntries.map(deriveEntryFn)) : void 0;
-	const upgradeDeriveModes = deriveModes(allBeforeHandles, deriveEntries);
-	const messageBeforeHandles = allBeforeHandles.filter((fn) => !deriveSet?.has(fn));
+	const upgradeDeriveModes = deriveModes(allBeforeHandles, joinDeriveEntries([flatAppHook, hook]) ?? concatHooks(flatAppHook["~deriveEntries"], hook["~deriveEntries"]));
+	const messageBeforeHandles = allBeforeHandles.filter((_, i) => upgradeDeriveModes?.[i] === void 0);
 	const afterHandles = concatHooks(flatAppHook.afterHandle, hook.afterHandle);
 	const mapResponses = concatHooks(flatAppHook.mapResponse, hook.mapResponse);
 	const afterResponses = concatHooks(flatAppHook.afterResponse, hook.afterResponse);
 	const errorHandlers = concatHooks(hook.error, flatAppHook.error);
+	const finalizeOwnError = finalizeRouteErrorOf({
+		error: errorHandlers,
+		mapResponse: mapResponses
+	});
 	const inference = sucrose(hook.message, {
 		beforeHandle: [
 			...allBeforeHandles,
@@ -251,7 +261,7 @@ function buildWSRoute(route, app) {
 		afterResponse: afterResponses
 	});
 	const cookieConfig = validators.cookie || inference.cookie ? compileCookieConfig(composed.cookie, frozenRootOf(app)["~config"]?.cookie, frozenRootOf(app)["~ext"]?.models, composed.schemas) : void 0;
-	const signCookies = cookieConfig?.hasSign ? (set) => signCookieValues(set.cookie, cookieConfig) : void 0;
+	const signCookies = cookieConfig?.hasSign ? (set) => signCookieValues(set.cookie, cookieConfig, set) : void 0;
 	const parseMessage = createMessageParser(parseHooks);
 	const handleUpgradeError = createErrorHandler(errorHandlers.length ? errorHandlers : void 0, ((response, set, context) => {
 		const map = () => mapResponse(response, set, context?.request);
@@ -302,7 +312,7 @@ function buildWSRoute(route, app) {
 		if (bodyValidator) {
 			let decoded;
 			try {
-				decoded = validateUpgradeChannel(bodyValidator, message, "body");
+				decoded = validateChannel(bodyValidator, message, "body");
 			} catch (error) {
 				return onMessageValidationError(ws, error);
 			}
@@ -395,7 +405,7 @@ function buildWSRoute(route, app) {
 		const request = context.request;
 		try {
 			if (validators.params) {
-				let r = validateUpgradeChannel(validators.params, context.params ?? nullObject(), "params");
+				let r = validateChannel(validators.params, context.params ?? nullObject(), "params");
 				if (r instanceof Promise) r = await r;
 				context.params = r;
 			}
@@ -403,7 +413,7 @@ function buildWSRoute(route, app) {
 				const url = request.url;
 				let r = parseQueryFromURL(url, context.qi ?? url.indexOf("?"), queryArray, queryObject);
 				if (validators.query) {
-					r = validateUpgradeChannel(validators.query, r, "query");
+					r = validateChannel(validators.query, r, "query");
 					if (r instanceof Promise) r = await r;
 				}
 				context.query = r;
@@ -411,7 +421,7 @@ function buildWSRoute(route, app) {
 			if (validators.headers || inference.headers) {
 				let r = isBun ? request.headers.toJSON() : Object.fromEntries(request.headers);
 				if (validators.headers) {
-					r = validateUpgradeChannel(validators.headers, r, "headers");
+					r = validateChannel(validators.headers, r, "headers");
 					if (r instanceof Promise) r = await r;
 				}
 				context.headers = r;
@@ -422,7 +432,7 @@ function buildWSRoute(route, app) {
 					const raw = await parseCookieRaw(cookieHeader, cookieConfig);
 					let r = raw;
 					if (!cookieIsOptional || Object.keys(raw).length) {
-						r = validateUpgradeChannel(validators.cookie, raw, "cookie");
+						r = validateChannel(validators.cookie, raw, "cookie");
 						if (r instanceof Promise) r = await r;
 					}
 					context.cookie = buildCookieJar(context.set, r, cookieConfig);
@@ -480,7 +490,7 @@ function buildWSRoute(route, app) {
 			try {
 				return await handleUpgradeError(context, error);
 			} catch (thrown) {
-				return finalizeRouteError(app, context, thrown, signCookies);
+				return finalizeOwnError(app, context, thrown, signCookies);
 			}
 		}
 	};

package/dist/ws/types.d.ts

@@ -107,9 +107,8 @@ interface WSValidatorLike {
   Check(data: unknown): boolean;
   Errors(data: unknown): any[];
 }
-type WSResponseValidator = {
-  [status: number]: WSValidatorLike;
-} | undefined;
+/** keyed by numeric status */
+type WSResponseValidator = Map<number, WSValidatorLike> | undefined;
 /**
  * App-wide WebSocket server-tuning options, the Bun server-level
  * `websocket: {...}` knobs (`maxPayloadLength`, `idleTimeout`,

package/dist/ws/types.mjs

@@ -1 +1,2 @@
+// @bun
 export {  };

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "elysia",
 	"description": "Ergonomic Framework for Human",
-	"version": "2.0.0-beta.21",
+	"version": "2.0.0-beta.23",
 	"author": {
 		"name": "saltyAom",
 		"url": "https://github.com/SaltyAom",
@@ -216,7 +216,7 @@
 	],
 	"dependencies": {
 		"deuri": "^3.0.0",
-		"memoirist": "1.2.2"
+		"memoirist": "1.2.3"
 	},
 	"devDependencies": {
 		"@eslint/eslintrc": "^3.3.5",