elysia 2.0.0-beta.3 → 2.0.0-beta.4

package/dist/type/validator/index.d.ts

@@ -1,8 +1,8 @@
 import { MaybePromise } from "../../types.js";
 import { Validator as Validator$1, ValidatorOptions } from "../../validator/index.js";
 import { TypeBoxValidatorCache, mayHaveFileType } from "./validator-cache.js";
-import { Static, StaticDecode, StaticEncode, TAny, TSchema } from "typebox/type";
 import { Validator } from "typebox/schema";
+import { Static, StaticDecode, StaticEncode, TAny, TSchema } from "typebox/type";
 import { TLocalizedValidationError } from "typebox/error";
 
 //#region src/type/validator/index.d.ts

package/dist/type/validator/index.js

@@ -348,8 +348,8 @@ var TypeBoxValidator = class extends require_validator_index.Validator {
 	#error(value, type, errors) {
 		return new require_error.ValidationError(type, value, errors ?? (() => this.Errors(value)), this.schema, this.#findCustomError);
 	}
-	#validate(value) {
-		if (!this.#refinements) return this.Check(value) ? void 0 : [];
+	#validate(value, countHit = true) {
+		if (!this.#refinements) return (countHit ? this.Check(value) : this.#check(value, false)) ? void 0 : [];
 		const pool = this.#refineScratch ??= freshRefineValidation(this.#refinements);
 		const usingPool = !pool.active;
 		const validation = usingPool ? pool : freshRefineValidation(this.#refinements);
@@ -359,7 +359,7 @@ var TypeBoxValidator = class extends require_validator_index.Validator {
 		validation.replay = false;
 		activeRefineValidation = validation;
 		try {
-			if (this.Check(value)) return;
+			if (countHit ? this.Check(value) : this.#check(value, false)) return;
 			validation.replay = true;
 			validation.replayEpoch++;
 			return this.Errors(value);
@@ -430,7 +430,10 @@ var TypeBoxValidator = class extends require_validator_index.Validator {
 		} catch {}
 	}
 	Check(value) {
-		this.#tick();
+		return this.#check(value, true);
+	}
+	#check(value, countHit) {
+		if (countHit) this.#tick();
 		const pool = this.#refineScratch;
 		if (pool?.active && this.#refinements) {
 			if (pool.checking) {
@@ -494,12 +497,12 @@ var TypeBoxValidator = class extends require_validator_index.Validator {
 	EncodeFrom(value, type) {
 		this.#tick();
 		if (this.#isForm) {
-			const errors = this.#noValidate ? void 0 : this.#validate(value);
+			const errors = this.#noValidate ? void 0 : this.#validate(value, false);
 			if (errors) throw this.#error(value, type, errors.length ? errors : void 0);
 			return value;
 		}
 		if (!this.hasCodec) {
-			const errors = this.#noValidate ? void 0 : this.#validate(value);
+			const errors = this.#noValidate ? void 0 : this.#validate(value, false);
 			if (errors) throw this.#error(value, type, errors.length ? errors : void 0);
 			if (this.Clean) value = this.Clean(value);
 			return value;
@@ -507,7 +510,7 @@ var TypeBoxValidator = class extends require_validator_index.Validator {
 		try {
 			if (this.#encodeMirror) {
 				const out = this.#encodeMirror(value);
-				const errors = this.#noValidate ? void 0 : this.#validate(out);
+				const errors = this.#noValidate ? void 0 : this.#validate(out, false);
 				if (errors) throw new require_error.ValidationError(type, out, errors.length ? errors : () => this.Errors(out), this.schema);
 				return out;
 			}

package/dist/type/validator/index.mjs

@@ -347,8 +347,8 @@ var TypeBoxValidator = class extends Validator {
 	#error(value, type, errors) {
 		return new ValidationError(type, value, errors ?? (() => this.Errors(value)), this.schema, this.#findCustomError);
 	}
-	#validate(value) {
-		if (!this.#refinements) return this.Check(value) ? void 0 : [];
+	#validate(value, countHit = true) {
+		if (!this.#refinements) return (countHit ? this.Check(value) : this.#check(value, false)) ? void 0 : [];
 		const pool = this.#refineScratch ??= freshRefineValidation(this.#refinements);
 		const usingPool = !pool.active;
 		const validation = usingPool ? pool : freshRefineValidation(this.#refinements);
@@ -358,7 +358,7 @@ var TypeBoxValidator = class extends Validator {
 		validation.replay = false;
 		activeRefineValidation = validation;
 		try {
-			if (this.Check(value)) return;
+			if (countHit ? this.Check(value) : this.#check(value, false)) return;
 			validation.replay = true;
 			validation.replayEpoch++;
 			return this.Errors(value);
@@ -429,7 +429,10 @@ var TypeBoxValidator = class extends Validator {
 		} catch {}
 	}
 	Check(value) {
-		this.#tick();
+		return this.#check(value, true);
+	}
+	#check(value, countHit) {
+		if (countHit) this.#tick();
 		const pool = this.#refineScratch;
 		if (pool?.active && this.#refinements) {
 			if (pool.checking) {
@@ -493,12 +496,12 @@ var TypeBoxValidator = class extends Validator {
 	EncodeFrom(value, type) {
 		this.#tick();
 		if (this.#isForm) {
-			const errors = this.#noValidate ? void 0 : this.#validate(value);
+			const errors = this.#noValidate ? void 0 : this.#validate(value, false);
 			if (errors) throw this.#error(value, type, errors.length ? errors : void 0);
 			return value;
 		}
 		if (!this.hasCodec) {
-			const errors = this.#noValidate ? void 0 : this.#validate(value);
+			const errors = this.#noValidate ? void 0 : this.#validate(value, false);
 			if (errors) throw this.#error(value, type, errors.length ? errors : void 0);
 			if (this.Clean) value = this.Clean(value);
 			return value;
@@ -506,7 +509,7 @@ var TypeBoxValidator = class extends Validator {
 		try {
 			if (this.#encodeMirror) {
 				const out = this.#encodeMirror(value);
-				const errors = this.#noValidate ? void 0 : this.#validate(out);
+				const errors = this.#noValidate ? void 0 : this.#validate(out, false);
 				if (errors) throw new ValidationError(type, out, errors.length ? errors : () => this.Errors(out), this.schema);
 				return out;
 			}

package/dist/type/validator/validator-cache.d.ts

@@ -1,7 +1,7 @@
 import { CoerceOption } from "../coerce.js";
-import { TSchema } from "typebox/type";
 import * as _$typebox_schema0 from "typebox/schema";
 import { Validator } from "typebox/schema";
+import { TSchema } from "typebox/type";
 
 //#region src/type/validator/validator-cache.d.ts
 interface SchemaMeta {

package/dist/type/validator/validator-cache.js

@@ -189,8 +189,15 @@ var TypeBoxValidatorCache = class TypeBoxValidatorCache {
 	get(schema, coercions = TypeBoxValidatorCache.EMPTY, normalize = "", models) {
 		const meta = TypeBoxValidatorCache.meta(schema);
 		normalize += TypeBoxValidatorCache.#modelsToken(models, meta.hasRef);
-		const refBucket = this.#referenceCache.get(schema)?.get(normalize);
-		if (refBucket?.has(coercions)) return refBucket.get(coercions);
+		const byNormalize = this.#referenceCache.get(schema);
+		const refBucket = byNormalize?.get(normalize);
+		if (refBucket?.has(coercions)) {
+			if (byNormalize.size >= DEFAULT_CACHE_LIMIT) {
+				byNormalize.delete(normalize);
+				byNormalize.set(normalize, refBucket);
+			}
+			return refBucket.get(coercions);
+		}
 		if (meta.special) return;
 		const key = meta.key + "\0" + normalize;
 		const coercionsCache = this.#cache.get(key);
@@ -202,13 +209,14 @@ var TypeBoxValidatorCache = class TypeBoxValidatorCache {
 			if (coercionsCache.has(coercions)) return coercionsCache.get(coercions);
 		}
 	}
-	#refBucket(schema) {
+	#setRefBucket(schema, normalize, cache) {
 		let byNormalize = this.#referenceCache.get(schema);
 		if (!byNormalize) {
 			byNormalize = /* @__PURE__ */ new Map();
 			this.#referenceCache.set(schema, byNormalize);
 		}
-		return byNormalize;
+		if (!byNormalize.has(normalize) && byNormalize.size >= DEFAULT_CACHE_LIMIT) require_utils.evictOldestHalf(byNormalize);
+		byNormalize.set(normalize, cache);
 	}
 	set(schema, coercions = TypeBoxValidatorCache.EMPTY, validator, normalize = "", models) {
 		this.#scheduleClear();
@@ -216,21 +224,21 @@ var TypeBoxValidatorCache = class TypeBoxValidatorCache {
 		normalize += TypeBoxValidatorCache.#modelsToken(models, meta.hasRef);
 		if (meta.special) {
 			const cache = (/* @__PURE__ */ new WeakMap()).set(coercions, validator);
-			this.#refBucket(schema).set(normalize, cache);
+			this.#setRefBucket(schema, normalize, cache);
 			return;
 		}
 		const key = meta.key + "\0" + normalize;
 		if (this.#cache.has(key)) {
 			const cache = this.#cache.get(key).set(coercions, validator);
-			const byNormalize = this.#refBucket(schema);
-			if (byNormalize.has(normalize)) byNormalize.get(normalize).set(coercions, validator);
-			else byNormalize.set(normalize, cache);
+			const byNormalize = this.#referenceCache.get(schema);
+			if (byNormalize?.has(normalize)) byNormalize.get(normalize).set(coercions, validator);
+			else this.#setRefBucket(schema, normalize, cache);
 			return;
 		}
 		if (this.#cache.size >= DEFAULT_CACHE_LIMIT) require_utils.evictOldestHalf(this.#cache);
 		const cache = (/* @__PURE__ */ new WeakMap()).set(coercions, validator);
 		this.#cache.set(key, cache);
-		this.#refBucket(schema).set(normalize, cache);
+		this.#setRefBucket(schema, normalize, cache);
 	}
 	clear() {
 		if (this.#gc) {

package/dist/type/validator/validator-cache.mjs

@@ -188,8 +188,15 @@ var TypeBoxValidatorCache = class TypeBoxValidatorCache {
 	get(schema, coercions = TypeBoxValidatorCache.EMPTY, normalize = "", models) {
 		const meta = TypeBoxValidatorCache.meta(schema);
 		normalize += TypeBoxValidatorCache.#modelsToken(models, meta.hasRef);
-		const refBucket = this.#referenceCache.get(schema)?.get(normalize);
-		if (refBucket?.has(coercions)) return refBucket.get(coercions);
+		const byNormalize = this.#referenceCache.get(schema);
+		const refBucket = byNormalize?.get(normalize);
+		if (refBucket?.has(coercions)) {
+			if (byNormalize.size >= DEFAULT_CACHE_LIMIT) {
+				byNormalize.delete(normalize);
+				byNormalize.set(normalize, refBucket);
+			}
+			return refBucket.get(coercions);
+		}
 		if (meta.special) return;
 		const key = meta.key + "\0" + normalize;
 		const coercionsCache = this.#cache.get(key);
@@ -201,13 +208,14 @@ var TypeBoxValidatorCache = class TypeBoxValidatorCache {
 			if (coercionsCache.has(coercions)) return coercionsCache.get(coercions);
 		}
 	}
-	#refBucket(schema) {
+	#setRefBucket(schema, normalize, cache) {
 		let byNormalize = this.#referenceCache.get(schema);
 		if (!byNormalize) {
 			byNormalize = /* @__PURE__ */ new Map();
 			this.#referenceCache.set(schema, byNormalize);
 		}
-		return byNormalize;
+		if (!byNormalize.has(normalize) && byNormalize.size >= DEFAULT_CACHE_LIMIT) evictOldestHalf(byNormalize);
+		byNormalize.set(normalize, cache);
 	}
 	set(schema, coercions = TypeBoxValidatorCache.EMPTY, validator, normalize = "", models) {
 		this.#scheduleClear();
@@ -215,21 +223,21 @@ var TypeBoxValidatorCache = class TypeBoxValidatorCache {
 		normalize += TypeBoxValidatorCache.#modelsToken(models, meta.hasRef);
 		if (meta.special) {
 			const cache = (/* @__PURE__ */ new WeakMap()).set(coercions, validator);
-			this.#refBucket(schema).set(normalize, cache);
+			this.#setRefBucket(schema, normalize, cache);
 			return;
 		}
 		const key = meta.key + "\0" + normalize;
 		if (this.#cache.has(key)) {
 			const cache = this.#cache.get(key).set(coercions, validator);
-			const byNormalize = this.#refBucket(schema);
-			if (byNormalize.has(normalize)) byNormalize.get(normalize).set(coercions, validator);
-			else byNormalize.set(normalize, cache);
+			const byNormalize = this.#referenceCache.get(schema);
+			if (byNormalize?.has(normalize)) byNormalize.get(normalize).set(coercions, validator);
+			else this.#setRefBucket(schema, normalize, cache);
 			return;
 		}
 		if (this.#cache.size >= DEFAULT_CACHE_LIMIT) evictOldestHalf(this.#cache);
 		const cache = (/* @__PURE__ */ new WeakMap()).set(coercions, validator);
 		this.#cache.set(key, cache);
-		this.#refBucket(schema).set(normalize, cache);
+		this.#setRefBucket(schema, normalize, cache);
 	}
 	clear() {
 		if (this.#gc) {

package/dist/utils.d.ts

@@ -183,5 +183,14 @@ declare namespace prefix {
   var capitalize: <T extends string, Models extends Record<string, AnySchema>>(prefix: T, models: Models) => { [k in keyof Models as `${T}.${Capitalize<k & string>}`]: Models[k] };
 }
 declare function serializeMacroSeed(_key: string, value: unknown): unknown;
+declare const throwLifecycleErrors: (errors: unknown[]) => void;
+declare const isSocketQuiet: (socket: {
+  readyState: number;
+  data: {
+    inflight?: number;
+    opening?: unknown;
+    settling?: number;
+  };
+}) => boolean;
 //#endregion
-export { ChainNode, CompactBeforeHandleChunk, CompactBeforeHandlePrefix, DeriveEntry, ELYSIA_FORM_PROTOTYPE, assignOwn, authorityEnd, bytes, clearFlattenChainMemo, cloneHook, clonePlainDecorators, clonePlainDeep, coalesceSchemas, compactBeforeHandleConflicts, compactBeforeHandlePrefix, constantTimeEqual, createErrorEventHandler, deriveEntryFn, eventProperties, evictOldestHalf, fallbackRequestId, flattenChain, flattenChainMemo, flattenChainMemoReadonly, fnOrigin, fnv1a, form, formToFormData, getLoosePath, guardNonPlainLeaves, hookToGuard, invalidateMacroEpoch, isBlob, isByteStream, isCompactBeforeHandleOnly, isElysiaForm, isEmpty, isLocalScope, isMapDeriveEntry, isNotEmpty, isRecordNumber, joinPath, macroEpoch, macroOrigin, mapDeriveEntry, mergeArray, mergeDeep, mergeHook, mergeResponse, nullObject, prefix, pushField, redirect, replaceUrlPath, requestId, schemaProperties, serializeMacroSeed, sse, sseData };
+export { ChainNode, CompactBeforeHandleChunk, CompactBeforeHandlePrefix, DeriveEntry, ELYSIA_FORM_PROTOTYPE, assignOwn, authorityEnd, bytes, clearFlattenChainMemo, cloneHook, clonePlainDecorators, clonePlainDeep, coalesceSchemas, compactBeforeHandleConflicts, compactBeforeHandlePrefix, constantTimeEqual, createErrorEventHandler, deriveEntryFn, eventProperties, evictOldestHalf, fallbackRequestId, flattenChain, flattenChainMemo, flattenChainMemoReadonly, fnOrigin, fnv1a, form, formToFormData, getLoosePath, guardNonPlainLeaves, hookToGuard, invalidateMacroEpoch, isBlob, isByteStream, isCompactBeforeHandleOnly, isElysiaForm, isEmpty, isLocalScope, isMapDeriveEntry, isNotEmpty, isRecordNumber, isSocketQuiet, joinPath, macroEpoch, macroOrigin, mapDeriveEntry, mergeArray, mergeDeep, mergeHook, mergeResponse, nullObject, prefix, pushField, redirect, replaceUrlPath, requestId, schemaProperties, serializeMacroSeed, sse, sseData, throwLifecycleErrors };

package/dist/utils.js

@@ -690,6 +690,11 @@ function serializeMacroSeed(_key, value) {
 		default: return value;
 	}
 }
+const throwLifecycleErrors = (errors) => {
+	if (errors.length === 1) throw errors[0];
+	if (errors.length) throw new AggregateError(errors, "Multiple lifecycle failures");
+};
+const isSocketQuiet = (socket) => socket.readyState === 3 && !socket.data.inflight && !socket.data.opening && !socket.data.settling;
 
 //#endregion
 exports.ELYSIA_FORM_PROTOTYPE = ELYSIA_FORM_PROTOTYPE;
@@ -729,6 +734,7 @@ exports.isLocalScope = isLocalScope;
 exports.isMapDeriveEntry = isMapDeriveEntry;
 exports.isNotEmpty = isNotEmpty;
 exports.isRecordNumber = isRecordNumber;
+exports.isSocketQuiet = isSocketQuiet;
 exports.joinPath = joinPath;
 exports.macroEpoch = macroEpoch;
 exports.macroOrigin = macroOrigin;
@@ -746,4 +752,5 @@ exports.requestId = requestId;
 exports.schemaProperties = schemaProperties;
 exports.serializeMacroSeed = serializeMacroSeed;
 exports.sse = sse;
-exports.sseData = sseData;
+exports.sseData = sseData;
+exports.throwLifecycleErrors = throwLifecycleErrors;

package/dist/utils.mjs

@@ -689,6 +689,11 @@ function serializeMacroSeed(_key, value) {
 		default: return value;
 	}
 }
+const throwLifecycleErrors = (errors) => {
+	if (errors.length === 1) throw errors[0];
+	if (errors.length) throw new AggregateError(errors, "Multiple lifecycle failures");
+};
+const isSocketQuiet = (socket) => socket.readyState === 3 && !socket.data.inflight && !socket.data.opening && !socket.data.settling;
 
 //#endregion
-export { ELYSIA_FORM_PROTOTYPE, assignOwn, authorityEnd, bytes, clearFlattenChainMemo, cloneHook, clonePlainDecorators, clonePlainDeep, coalesceSchemas, compactBeforeHandleConflicts, compactBeforeHandlePrefix, constantTimeEqual, createErrorEventHandler, deriveEntryFn, eventProperties, evictOldestHalf, fallbackRequestId, flattenChain, flattenChainMemo, flattenChainMemoReadonly, fnOrigin, fnv1a, form, formToFormData, getLoosePath, guardNonPlainLeaves, hookToGuard, invalidateMacroEpoch, isBlob, isByteStream, isCompactBeforeHandleOnly, isElysiaForm, isEmpty, isLocalScope, isMapDeriveEntry, isNotEmpty, isRecordNumber, joinPath, macroEpoch, macroOrigin, mapDeriveEntry, mergeArray, mergeDeep, mergeHook, mergeResponse, nullObject, prefix, pushField, redirect, replaceUrlPath, requestId, schemaProperties, serializeMacroSeed, sse, sseData };
+export { ELYSIA_FORM_PROTOTYPE, assignOwn, authorityEnd, bytes, clearFlattenChainMemo, cloneHook, clonePlainDecorators, clonePlainDeep, coalesceSchemas, compactBeforeHandleConflicts, compactBeforeHandlePrefix, constantTimeEqual, createErrorEventHandler, deriveEntryFn, eventProperties, evictOldestHalf, fallbackRequestId, flattenChain, flattenChainMemo, flattenChainMemoReadonly, fnOrigin, fnv1a, form, formToFormData, getLoosePath, guardNonPlainLeaves, hookToGuard, invalidateMacroEpoch, isBlob, isByteStream, isCompactBeforeHandleOnly, isElysiaForm, isEmpty, isLocalScope, isMapDeriveEntry, isNotEmpty, isRecordNumber, isSocketQuiet, joinPath, macroEpoch, macroOrigin, mapDeriveEntry, mergeArray, mergeDeep, mergeHook, mergeResponse, nullObject, prefix, pushField, redirect, replaceUrlPath, requestId, schemaProperties, serializeMacroSeed, sse, sseData, throwLifecycleErrors };

package/dist/ws/context.d.ts

@@ -15,12 +15,15 @@ interface WSConnectionData {
   inflight?: number;
   /** settles when an async `open` hook finished; dispatch chains onto it */
   opening?: Promise<void>;
+  /** async socket lifecycle callbacks other than message/open */
+  settling?: number;
   elysia?: ElysiaWS<any>;
   context?: Record<string, unknown>;
   resumeWaiters?: Set<() => void>;
   validator?: WSResponseValidator;
   defaultValidator?: WSValidatorLike;
 }
+declare function trackWSSettling(data: WSConnectionData, result: void | Promise<void>, onSettled?: () => void): void;
 declare class ElysiaWS<Route extends RouteSchema = {}> {
   #private;
   raw: ServerWebSocket<WSConnectionData>;
@@ -50,4 +53,4 @@ declare class ElysiaWS<Route extends RouteSchema = {}> {
 }
 declare function isGeneratorObject(value: unknown): boolean;
 //#endregion
-export { ElysiaWS, WSConnectionData, isGeneratorObject };
+export { ElysiaWS, WSConnectionData, isGeneratorObject, trackWSSettling };

package/dist/ws/context.js

@@ -8,6 +8,19 @@ function pickValidator(validators, defaultValidator, data) {
 	if (data instanceof require_error.ElysiaStatus) return validators[data.status];
 	return defaultValidator;
 }
+function trackWSSettling(data, result, onSettled) {
+	if (!(result instanceof Promise)) return;
+	data.settling = (data.settling ?? 0) + 1;
+	const release = () => {
+		data.settling--;
+		onSettled?.();
+	};
+	result.then(release, release);
+}
+const runWSLifecycle = (data, callback, ...args) => {
+	const lifecycle = data["~lifecycleRun"];
+	return lifecycle ? lifecycle(callback, ...args) : callback(...args);
+};
 function memoize(view, key, value) {
 	const self = view.raw.data.elysia ?? view;
 	Object.defineProperty(self, key, {
@@ -130,8 +143,12 @@ var ElysiaWS = class {
 		if (!data.closeHandlerInvoked && data.close) {
 			data.closeHandlerInvoked = true;
 			try {
-				const result = data.close(this, code ?? 1e3, reason ?? "");
-				if (result instanceof Promise) result.then(() => this.raw.close(code, reason)).catch(() => this.raw.close(code, reason));
+				const result = runWSLifecycle(data, data.close, this, code ?? 1e3, reason ?? "");
+				if (result instanceof Promise) {
+					const closing = result.catch(() => {});
+					trackWSSettling(data, closing);
+					closing.then(() => this.raw.close(code, reason)).catch(() => this.raw.close(code, reason));
+				}
 				return;
 			} catch {}
 		}
@@ -167,4 +184,5 @@ function isGeneratorObject(value) {
 
 //#endregion
 exports.ElysiaWS = ElysiaWS;
-exports.isGeneratorObject = isGeneratorObject;
+exports.isGeneratorObject = isGeneratorObject;
+exports.trackWSSettling = trackWSSettling;

package/dist/ws/context.mjs

@@ -7,6 +7,19 @@ function pickValidator(validators, defaultValidator, data) {
 	if (data instanceof ElysiaStatus) return validators[data.status];
 	return defaultValidator;
 }
+function trackWSSettling(data, result, onSettled) {
+	if (!(result instanceof Promise)) return;
+	data.settling = (data.settling ?? 0) + 1;
+	const release = () => {
+		data.settling--;
+		onSettled?.();
+	};
+	result.then(release, release);
+}
+const runWSLifecycle = (data, callback, ...args) => {
+	const lifecycle = data["~lifecycleRun"];
+	return lifecycle ? lifecycle(callback, ...args) : callback(...args);
+};
 function memoize(view, key, value) {
 	const self = view.raw.data.elysia ?? view;
 	Object.defineProperty(self, key, {
@@ -129,8 +142,12 @@ var ElysiaWS = class {
 		if (!data.closeHandlerInvoked && data.close) {
 			data.closeHandlerInvoked = true;
 			try {
-				const result = data.close(this, code ?? 1e3, reason ?? "");
-				if (result instanceof Promise) result.then(() => this.raw.close(code, reason)).catch(() => this.raw.close(code, reason));
+				const result = runWSLifecycle(data, data.close, this, code ?? 1e3, reason ?? "");
+				if (result instanceof Promise) {
+					const closing = result.catch(() => {});
+					trackWSSettling(data, closing);
+					closing.then(() => this.raw.close(code, reason)).catch(() => this.raw.close(code, reason));
+				}
 				return;
 			} catch {}
 		}
@@ -165,4 +182,4 @@ function isGeneratorObject(value) {
 }
 
 //#endregion
-export { ElysiaWS, isGeneratorObject };
+export { ElysiaWS, isGeneratorObject, trackWSSettling };

package/dist/ws/route.js

@@ -570,6 +570,8 @@ function accumulateWSOptions(target, routeOptions, _path) {
 }
 const MAX_INFLIGHT_MESSAGES = 256;
 function buildGlobalWSHandler() {
+	let lifecycle;
+	const runLifecycle = (callback, ...args) => lifecycle ? lifecycle.run(callback, ...args) : callback(...args);
 	function getElysia(ws) {
 		let elysia = ws.data.elysia;
 		if (!elysia) {
@@ -584,9 +586,19 @@ function buildGlobalWSHandler() {
 			ws.send(typeof error?.message === "string" ? error.message : "Internal Server Error");
 		} catch {}
 	};
+	const releaseLifecycle = (ws) => {
+		if (!lifecycle?.closing && require_utils.isSocketQuiet(ws)) {
+			delete ws.data["~lifecycleRun"];
+			lifecycle?.sockets.delete(ws);
+		}
+	};
 	const release = (ws) => {
-		const inflight = ws.data.inflight;
-		if (inflight) ws.data.inflight = inflight - 1;
+		const data = ws.data;
+		const inflight = data.inflight;
+		if (inflight) {
+			data.inflight = inflight - 1;
+			if (inflight === 1 && data.closeHandlerInvoked) releaseLifecycle(ws);
+		}
 	};
 	function dispatch(ws, message) {
 		let result;
@@ -603,8 +615,9 @@ function buildGlobalWSHandler() {
 		});
 		else release(ws);
 	}
-	return {
+	const handler = {
 		message(ws, message) {
+			if (lifecycle?.closing) return;
 			const data = ws.data;
 			if (!data.message) return;
 			const inflight = (data.inflight ?? 0) + 1;
@@ -617,41 +630,73 @@ function buildGlobalWSHandler() {
 			data.inflight = inflight;
 			const opening = data.opening;
 			if (opening) return void opening.then(() => {
-				if (ws.readyState > 1) return release(ws);
+				if (lifecycle?.closing || ws.readyState > 1) return release(ws);
 				dispatch(ws, message);
 			});
 			dispatch(ws, message);
 		},
 		open(ws) {
-			const result = ws.data.open?.(getElysia(ws));
+			if (lifecycle) Object.defineProperty(ws.data, "~lifecycleRun", {
+				configurable: true,
+				value: lifecycle.run
+			});
+			lifecycle?.sockets.add(ws);
+			if (lifecycle?.closing) {
+				ws.data.closeHandlerInvoked = true;
+				try {
+					ws.terminate();
+				} catch {}
+				return;
+			}
+			const open = ws.data.open;
+			const result = open && runLifecycle(open, getElysia(ws));
 			if (result instanceof Promise) {
 				const clear = () => {
 					ws.data.opening = void 0;
+					releaseLifecycle(ws);
 				};
 				ws.data.opening = result.then(clear, clear);
 			}
 		},
 		drain(ws) {
+			if (lifecycle?.closing) return;
 			const elyWs = getElysia(ws);
 			drainWaiters(elyWs);
-			ws.data.drain?.(elyWs);
+			const drain = ws.data.drain;
+			require_ws_context.trackWSSettling(ws.data, drain && runLifecycle(drain, elyWs), () => releaseLifecycle(ws));
 		},
 		close(ws, code, reason) {
 			const elyWs = getElysia(ws);
 			drainWaiters(elyWs);
-			ws.data.opening = void 0;
-			if (ws.data.closeHandlerInvoked) return;
+			if (ws.data.closeHandlerInvoked) return releaseLifecycle(ws);
 			ws.data.closeHandlerInvoked = true;
-			const result = ws.data.close?.(elyWs, code, reason);
-			if (result instanceof Promise) result.catch(() => {});
+			let result;
+			try {
+				const close = ws.data.close;
+				result = close && runLifecycle(close, elyWs, code, reason);
+			} finally {
+				if (!(result instanceof Promise)) releaseLifecycle(ws);
+			}
+			if (result instanceof Promise) {
+				const closing = result.catch(() => {});
+				require_ws_context.trackWSSettling(ws.data, closing, () => releaseLifecycle(ws));
+			}
 		},
 		ping(ws, data) {
-			ws.data.ping?.(getElysia(ws), data);
+			if (lifecycle?.closing) return;
+			const ping = ws.data.ping;
+			require_ws_context.trackWSSettling(ws.data, ping && runLifecycle(ping, getElysia(ws), data), () => releaseLifecycle(ws));
 		},
 		pong(ws, data) {
-			ws.data.pong?.(getElysia(ws), data);
+			if (lifecycle?.closing) return;
+			const pong = ws.data.pong;
+			require_ws_context.trackWSSettling(ws.data, pong && runLifecycle(pong, getElysia(ws), data), () => releaseLifecycle(ws));
 		}
 	};
+	Object.defineProperty(handler, "~lifecycle", { set(value) {
+		lifecycle = value;
+	} });
+	return handler;
 }
 
 //#endregion