elysia 2.0.0-beta.2 → 2.0.0-beta.21

package/dist/validator/index.mjs

@@ -1,9 +1,9 @@
-import { Clone, Compile, Default, HasCodec, Intersect, TypeBoxValidator, TypeBoxValidatorCache, applyCoercions } from "../type/bridge.mjs";
+import { assignOwn } from "../utils.mjs";
+import { Clone, Compile, HasCodec, Intersect, TypeBoxValidator, TypeBoxValidatorCache, applyCoercions } from "../type/bridge.mjs";
 import { ValidationError } from "../error.mjs";
 import { Capture, Compiled } from "../compile/aot.mjs";
 import { isAsyncFunction } from "../compile/utils.mjs";
 import { clearCoerceLeafCache, clearSharedReferenceCaches, nonAdditionalProperties } from "../type/shared.mjs";
-import { isAsyncPredicate } from "../type/elysia/file-type.mjs";
 import { hasProperty } from "../type/utils.mjs";
 
 //#region src/validator/index.ts
@@ -34,11 +34,7 @@ var Validator = class Validator {
 				schemas: options.schemas.map((v) => Validator.reference(v, models))
 			};
 		}
-		if (isCompiledSchema(schema)) {
-			const message = "[Elysia] Compiled schema detected. Please pass t.Schema instead.";
-			if (Capture.isCapturing()) throw new Error(`${message} build plugin cannot serialize a pre-compiled schema.`);
-			console.warn(message);
-		}
+		if (schema != null && typeof schema.Check === "function" && "evaluateResult" in schema && !("~standard" in schema)) throw new Error("[Elysia] Compiled schema detected. Please pass t.Schema instead.");
 		let isIntersectable = false;
 		if (options?.schemas?.length) if ("~kind" in schema && options.schemas.every((v) => "~kind" in v || "~elyAcl" in v)) isIntersectable = true;
 		else return new MultiValidator(schema, options);
@@ -98,7 +94,6 @@ var Validator = class Validator {
 		clearSharedReferenceCaches();
 	}
 };
-const isCompiledSchema = (schema) => schema != null && typeof schema.Check === "function" && "buildResult" in schema;
 const isSingleSchema = (schema) => "~kind" in schema || "~elyAcl" in schema || "~standard" in schema;
 const toStatusBased = (schema) => isSingleSchema(schema) ? { 200: schema } : schema;
 const isAsyncStandardSchema = (schema) => isAsyncFunction(schema["~standard"].validate);
@@ -142,7 +137,6 @@ var MultiValidator = class MultiValidator extends Validator {
 	#schemas;
 	#codecs;
 	#hasDefaults;
-	#tbSchemas;
 	#asyncMembers;
 	constructor(schema, options) {
 		super();
@@ -151,7 +145,6 @@ var MultiValidator = class MultiValidator extends Validator {
 		const schemas = [schema].concat(options.schemas);
 		const codecs = [];
 		const hasDefaults = [];
-		const tbSchemas = [];
 		const asyncMembers = [];
 		const shouldClose = options?.normalize === false;
 		const compileMember = (rawSchema, hd) => {
@@ -160,8 +153,7 @@ var MultiValidator = class MultiValidator extends Validator {
 			const compiled = Compile(coercedSchema);
 			codecs.push(HasCodec(coercedSchema));
 			hasDefaults.push(hd);
-			tbSchemas.push(hd ? coercedSchema : null);
-			if (compiled.buildResult?.external?.variables?.some(isAsyncPredicate) ?? false) {
+			if (TypeBoxValidator.member(coercedSchema, compiled)) {
 				this.isAsync = true;
 				asyncMembers.push(Validator.create(rawSchema, {
 					coerces: options?.coerces,
@@ -187,7 +179,6 @@ var MultiValidator = class MultiValidator extends Validator {
 				if (isAsyncStandardSchema(schema)) this.isAsync = true;
 				codecs.push(false);
 				hasDefaults.push(false);
-				tbSchemas.push(null);
 				asyncMembers.push(null);
 			}
 		}
@@ -195,7 +186,6 @@ var MultiValidator = class MultiValidator extends Validator {
 		this.#schemas = schemas;
 		this.#codecs = codecs;
 		this.#hasDefaults = hasDefaults;
-		this.#tbSchemas = tbSchemas;
 		this.#asyncMembers = asyncMembers;
 	}
 	static #merge(snapshot, result) {
@@ -204,7 +194,7 @@ var MultiValidator = class MultiValidator extends Validator {
 			snapshot.push(...result);
 			return snapshot;
 		}
-		if (typeof snapshot === "object" && typeof result === "object") return Object.assign(snapshot, result);
+		if (typeof snapshot === "object" && typeof result === "object") return assignOwn(snapshot, result);
 		throw new Error("Unable to merged value with different type");
 	}
 	static #syncStandard(schema, value) {
@@ -246,20 +236,6 @@ var MultiValidator = class MultiValidator extends Validator {
 	EncodeFrom(value) {
 		return this.From(value);
 	}
-	#fromTypeBox(compiled, index, value, type) {
-		let v = this.#cloneForMember(value);
-		if (this.#hasDefaults[index]) v = compiled.Default ? compiled.Default(v) : Default(this.#tbSchemas[index], v);
-		if (this.#codecs[index]) try {
-			return compiled.Clean(compiled.Decode(v));
-		} catch {
-			throw new ValidationError(type, value, () => compiled.Errors(value));
-		}
-		if (!compiled.Check(v)) throw new ValidationError(type, value, () => compiled.Errors(v));
-		return compiled.Clean(v);
-	}
-	#fromTypeBoxAsync(tbv, value, type) {
-		return tbv.FromAsync(this.#cloneForMember(value), type);
-	}
 	From(value, type, allowAsync = this.isAsync) {
 		return this.#fromLoop(value, 0, void 0, type, allowAsync);
 	}
@@ -282,9 +258,20 @@ var MultiValidator = class MultiValidator extends Validator {
 			const asyncTbv = this.#asyncMembers[i];
 			if (asyncTbv) {
 				if (!allowAsync) throw asyncStandardSchemaError();
-				return this.#fromTypeBoxAsync(asyncTbv, value, type).then((result) => this.#fromLoop(value, i + 1, MultiValidator.#merge(snapshot, result), type, allowAsync));
+				return asyncTbv.FromAsync(this.#cloneForMember(value), type).then((result) => this.#fromLoop(value, i + 1, MultiValidator.#merge(snapshot, result), type, allowAsync));
+			}
+			const compiled = validator;
+			let v = this.#cloneForMember(value);
+			if (this.#hasDefaults[i]) v = compiled.Default(v);
+			let memberValue;
+			if (this.#codecs[i]) try {
+				memberValue = compiled.Clean(compiled.Decode(v));
+			} catch {
+				throw new ValidationError(type, value, () => compiled.Errors(value));
 			}
-			snapshot = MultiValidator.#merge(snapshot, this.#fromTypeBox(validator, i, value, type));
+			else if (!compiled.Check(v)) throw new ValidationError(type, value, () => compiled.Errors(v));
+			else memberValue = compiled.Clean(v);
+			snapshot = MultiValidator.#merge(snapshot, memberValue);
 		}
 		return snapshot;
 	}

package/dist/validator/route.js

@@ -31,7 +31,8 @@ var RouteValidator = class {
 			const merge = pickMerge(mergeSchemas, slot);
 			if (!route[slot] && !merge?.length) continue;
 			const reference = require_validator_index.Validator.reference(route[slot] ?? merge[0], options?.models);
-			const coerces = isTb(reference) ? coerce(reference) : merge?.find(isTb) ? coerce(merge.find(isTb)) : void 0;
+			const tb = isTb(reference) ? reference : merge?.find(isTb);
+			const coerces = tb ? coerce(tb) : void 0;
 			this[slot] = require_validator_index.Validator.create(route[slot], {
 				...options,
 				slot,

package/dist/validator/route.mjs

@@ -30,7 +30,8 @@ var RouteValidator = class {
 			const merge = pickMerge(mergeSchemas, slot);
 			if (!route[slot] && !merge?.length) continue;
 			const reference = Validator.reference(route[slot] ?? merge[0], options?.models);
-			const coerces = isTb(reference) ? coerce(reference) : merge?.find(isTb) ? coerce(merge.find(isTb)) : void 0;
+			const tb = isTb(reference) ? reference : merge?.find(isTb);
+			const coerces = tb ? coerce(tb) : void 0;
 			this[slot] = Validator.create(route[slot], {
 				...options,
 				slot,

package/dist/ws/context.d.ts

@@ -11,12 +11,19 @@ interface WSConnectionData {
   ping?: (elysia: ElysiaWS<any>, data: Buffer) => void | Promise<void>;
   pong?: (elysia: ElysiaWS<any>, data: Buffer) => void | Promise<void>;
   closeHandlerInvoked?: boolean;
+  /** in-flight `message` handlers, bounded by `MAX_INFLIGHT_MESSAGES` */
+  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>;
@@ -46,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

@@ -3,10 +3,14 @@ const require_utils = require('../utils.js');
 const require_error = require('../error.js');
 
 //#region src/ws/context.ts
-function pickValidator(validators, defaultValidator, data) {
-	if (!validators) return;
-	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);
 }
 function memoize(view, key, value) {
 	const self = view.raw.data.elysia ?? view;
@@ -24,6 +28,15 @@ var ElysiaWS = class {
 		this.raw = raw;
 		if (context) for (const key in context) {
 			if (key === "ws" || key === "body") continue;
+			if (key === "__proto__") {
+				Object.defineProperty(this, key, {
+					value: context[key],
+					writable: true,
+					enumerable: true,
+					configurable: true
+				});
+				continue;
+			}
 			this[key] = context[key];
 		}
 	}
@@ -36,11 +49,11 @@ var ElysiaWS = class {
 	}
 	get ping() {
 		const self = this.raw.data.elysia ?? this;
-		return memoize(this, "ping", self.#ping.bind(self));
+		return memoize(this, "ping", self.#control.bind(self, "ping"));
 	}
 	get pong() {
 		const self = this.raw.data.elysia ?? this;
-		return memoize(this, "pong", self.#pong.bind(self));
+		return memoize(this, "pong", self.#control.bind(self, "pong"));
 	}
 	get publish() {
 		const self = this.raw.data.elysia ?? this;
@@ -62,58 +75,68 @@ var ElysiaWS = class {
 	get data() {
 		return this.raw.data;
 	}
-	#prepare(data) {
-		if (data === void 0) return null;
-		if (data instanceof require_error.ElysiaStatus) return JSON.stringify({
-			status: data.status,
-			error: data.response
-		});
-		if (typeof data === "object") return JSON.stringify(data);
-		return data;
-	}
-	#validatedOrError(data) {
+	/**
+	* Validate, redact and serialize an outbound value, or return the
+	* `ValidationError` the payload was refused with.
+	*/
+	#frame(data) {
 		const connectionData = this.raw.data;
-		const v = pickValidator(connectionData?.validator, connectionData?.defaultValidator, data);
-		if (!v) return;
-		const value = data instanceof require_error.ElysiaStatus ? data.response : data;
-		if (v.Check(value)) return;
-		return new require_error.ValidationError("message", value, v.Errors(value)).message;
+		const validators = connectionData?.validator;
+		const defaultValidator = connectionData?.defaultValidator;
+		const status = data instanceof require_error.ElysiaStatus ? data : void 0;
+		const v = validators && (status ? validators[status.status] : defaultValidator);
+		let value = status ? status.response : data;
+		if (v) {
+			const encode = v.EncodeFrom;
+			let redacted;
+			if (typeof encode === "function" && !v.hasCodec && !v.mayReturnPromise) try {
+				redacted = encode.call(v, value, "message");
+			} catch {}
+			if (redacted !== void 0) value = redacted;
+			else if (!v.Check(value)) return new require_error.ValidationError("message", value, v.Errors(value));
+		}
+		if (status) return JSON.stringify({
+			status: status.status,
+			error: value
+		});
+		if (value === void 0) return null;
+		if (typeof value === "object") return JSON.stringify(value);
+		return value;
 	}
 	#send(data, compress) {
 		if (data === void 0) return 0;
 		if (data instanceof ArrayBuffer || ArrayBuffer.isView(data)) return this.raw.send(data, compress);
-		const err = this.#validatedOrError(data);
-		if (err !== void 0) return this.raw.send(err);
-		return this.raw.send(this.#prepare(data), compress);
-	}
-	#ping(data) {
-		if (data === void 0) return this.raw.ping();
-		if (data instanceof ArrayBuffer || ArrayBuffer.isView(data)) return this.raw.ping(data);
-		const err = this.#validatedOrError(data);
-		if (err !== void 0) return this.raw.send(err);
-		return this.raw.ping(this.#prepare(data));
-	}
-	#pong(data) {
-		if (data === void 0) return this.raw.pong();
-		if (data instanceof ArrayBuffer || ArrayBuffer.isView(data)) return this.raw.pong(data);
-		const err = this.#validatedOrError(data);
-		if (err !== void 0) return this.raw.send(err);
-		return this.raw.pong(this.#prepare(data));
+		const frame = this.#frame(data);
+		if (frame instanceof require_error.ValidationError) return this.raw.send(frame.message);
+		return this.raw.send(frame, compress);
+	}
+	#control(kind, data) {
+		if (data === void 0) return this.raw[kind]();
+		if (data instanceof ArrayBuffer || ArrayBuffer.isView(data)) return this.raw[kind](data);
+		const frame = this.#frame(data);
+		if (frame instanceof require_error.ValidationError) return this.raw.send(frame.message);
+		return this.raw[kind](frame);
 	}
 	#publish(topic, data, compress) {
 		if (data === void 0) return 0;
 		if (data instanceof ArrayBuffer || ArrayBuffer.isView(data)) return this.raw.publish(topic, data, compress);
-		const err = this.#validatedOrError(data);
-		if (err !== void 0) return this.raw.send(err);
-		return this.raw.publish(topic, this.#prepare(data), compress);
+		const frame = this.#frame(data);
+		if (frame instanceof require_error.ValidationError) return this.raw.send(frame.message);
+		return this.raw.publish(topic, frame, compress);
 	}
 	#close(code, reason) {
 		const data = this.raw.data;
 		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 close = data.close;
+				const lifecycle = data["~lifecycleRun"];
+				const result = lifecycle ? lifecycle(close, this, code ?? 1e3, reason ?? "") : 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 {}
 		}
@@ -149,4 +172,5 @@ function isGeneratorObject(value) {
 
 //#endregion
 exports.ElysiaWS = ElysiaWS;
-exports.isGeneratorObject = isGeneratorObject;
+exports.isGeneratorObject = isGeneratorObject;
+exports.trackWSSettling = trackWSSettling;

package/dist/ws/context.mjs

@@ -2,10 +2,14 @@ import { requestId } from "../utils.mjs";
 import { ElysiaStatus, ValidationError } from "../error.mjs";
 
 //#region src/ws/context.ts
-function pickValidator(validators, defaultValidator, data) {
-	if (!validators) return;
-	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);
 }
 function memoize(view, key, value) {
 	const self = view.raw.data.elysia ?? view;
@@ -23,6 +27,15 @@ var ElysiaWS = class {
 		this.raw = raw;
 		if (context) for (const key in context) {
 			if (key === "ws" || key === "body") continue;
+			if (key === "__proto__") {
+				Object.defineProperty(this, key, {
+					value: context[key],
+					writable: true,
+					enumerable: true,
+					configurable: true
+				});
+				continue;
+			}
 			this[key] = context[key];
 		}
 	}
@@ -35,11 +48,11 @@ var ElysiaWS = class {
 	}
 	get ping() {
 		const self = this.raw.data.elysia ?? this;
-		return memoize(this, "ping", self.#ping.bind(self));
+		return memoize(this, "ping", self.#control.bind(self, "ping"));
 	}
 	get pong() {
 		const self = this.raw.data.elysia ?? this;
-		return memoize(this, "pong", self.#pong.bind(self));
+		return memoize(this, "pong", self.#control.bind(self, "pong"));
 	}
 	get publish() {
 		const self = this.raw.data.elysia ?? this;
@@ -61,58 +74,68 @@ var ElysiaWS = class {
 	get data() {
 		return this.raw.data;
 	}
-	#prepare(data) {
-		if (data === void 0) return null;
-		if (data instanceof ElysiaStatus) return JSON.stringify({
-			status: data.status,
-			error: data.response
-		});
-		if (typeof data === "object") return JSON.stringify(data);
-		return data;
-	}
-	#validatedOrError(data) {
+	/**
+	* Validate, redact and serialize an outbound value, or return the
+	* `ValidationError` the payload was refused with.
+	*/
+	#frame(data) {
 		const connectionData = this.raw.data;
-		const v = pickValidator(connectionData?.validator, connectionData?.defaultValidator, data);
-		if (!v) return;
-		const value = data instanceof ElysiaStatus ? data.response : data;
-		if (v.Check(value)) return;
-		return new ValidationError("message", value, v.Errors(value)).message;
+		const validators = connectionData?.validator;
+		const defaultValidator = connectionData?.defaultValidator;
+		const status = data instanceof ElysiaStatus ? data : void 0;
+		const v = validators && (status ? validators[status.status] : defaultValidator);
+		let value = status ? status.response : data;
+		if (v) {
+			const encode = v.EncodeFrom;
+			let redacted;
+			if (typeof encode === "function" && !v.hasCodec && !v.mayReturnPromise) try {
+				redacted = encode.call(v, value, "message");
+			} catch {}
+			if (redacted !== void 0) value = redacted;
+			else if (!v.Check(value)) return new ValidationError("message", value, v.Errors(value));
+		}
+		if (status) return JSON.stringify({
+			status: status.status,
+			error: value
+		});
+		if (value === void 0) return null;
+		if (typeof value === "object") return JSON.stringify(value);
+		return value;
 	}
 	#send(data, compress) {
 		if (data === void 0) return 0;
 		if (data instanceof ArrayBuffer || ArrayBuffer.isView(data)) return this.raw.send(data, compress);
-		const err = this.#validatedOrError(data);
-		if (err !== void 0) return this.raw.send(err);
-		return this.raw.send(this.#prepare(data), compress);
-	}
-	#ping(data) {
-		if (data === void 0) return this.raw.ping();
-		if (data instanceof ArrayBuffer || ArrayBuffer.isView(data)) return this.raw.ping(data);
-		const err = this.#validatedOrError(data);
-		if (err !== void 0) return this.raw.send(err);
-		return this.raw.ping(this.#prepare(data));
-	}
-	#pong(data) {
-		if (data === void 0) return this.raw.pong();
-		if (data instanceof ArrayBuffer || ArrayBuffer.isView(data)) return this.raw.pong(data);
-		const err = this.#validatedOrError(data);
-		if (err !== void 0) return this.raw.send(err);
-		return this.raw.pong(this.#prepare(data));
+		const frame = this.#frame(data);
+		if (frame instanceof ValidationError) return this.raw.send(frame.message);
+		return this.raw.send(frame, compress);
+	}
+	#control(kind, data) {
+		if (data === void 0) return this.raw[kind]();
+		if (data instanceof ArrayBuffer || ArrayBuffer.isView(data)) return this.raw[kind](data);
+		const frame = this.#frame(data);
+		if (frame instanceof ValidationError) return this.raw.send(frame.message);
+		return this.raw[kind](frame);
 	}
 	#publish(topic, data, compress) {
 		if (data === void 0) return 0;
 		if (data instanceof ArrayBuffer || ArrayBuffer.isView(data)) return this.raw.publish(topic, data, compress);
-		const err = this.#validatedOrError(data);
-		if (err !== void 0) return this.raw.send(err);
-		return this.raw.publish(topic, this.#prepare(data), compress);
+		const frame = this.#frame(data);
+		if (frame instanceof ValidationError) return this.raw.send(frame.message);
+		return this.raw.publish(topic, frame, compress);
 	}
 	#close(code, reason) {
 		const data = this.raw.data;
 		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 close = data.close;
+				const lifecycle = data["~lifecycleRun"];
+				const result = lifecycle ? lifecycle(close, this, code ?? 1e3, reason ?? "") : 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 {}
 		}
@@ -147,4 +170,4 @@ function isGeneratorObject(value) {
 }
 
 //#endregion
-export { ElysiaWS, isGeneratorObject };
+export { ElysiaWS, isGeneratorObject, trackWSSettling };

package/dist/ws/parser.js

@@ -1,25 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 //#region src/ws/parser.ts
-function isNumericString(s) {
-	if (s.length === 0) return false;
-	let sawDigit = false;
-	let sawDot = false;
-	for (let i = 0; i < s.length; i++) {
-		const c = s.charCodeAt(i);
-		if (i === 0 && (c === 43 || c === 45)) continue;
-		if (c >= 48 && c <= 57) {
-			sawDigit = true;
-			continue;
-		}
-		if (c === 46 && !sawDot) {
-			sawDot = true;
-			continue;
-		}
-		return false;
-	}
-	return sawDigit;
-}
 function defaultWSParse(message) {
 	if (typeof message !== "string") return message;
 	const start = message.charCodeAt(0);
@@ -28,7 +9,16 @@ function defaultWSParse(message) {
 	} catch {
 		return message;
 	}
-	if (isNumericString(message)) {
+	let i = start === 43 || start === 45 ? 1 : 0;
+	let sawDigit = false;
+	let sawDot = false;
+	for (; i < message.length; i++) {
+		const c = message.charCodeAt(i);
+		if (c >= 48 && c <= 57) sawDigit = true;
+		else if (c === 46 && !sawDot) sawDot = true;
+		else break;
+	}
+	if (sawDigit && i === message.length) {
 		if (message.length < 16) return +message;
 		const n = +message;
 		if (message.length === 16 && String(n) === message) return n;

package/dist/ws/parser.mjs

@@ -1,23 +1,4 @@
 //#region src/ws/parser.ts
-function isNumericString(s) {
-	if (s.length === 0) return false;
-	let sawDigit = false;
-	let sawDot = false;
-	for (let i = 0; i < s.length; i++) {
-		const c = s.charCodeAt(i);
-		if (i === 0 && (c === 43 || c === 45)) continue;
-		if (c >= 48 && c <= 57) {
-			sawDigit = true;
-			continue;
-		}
-		if (c === 46 && !sawDot) {
-			sawDot = true;
-			continue;
-		}
-		return false;
-	}
-	return sawDigit;
-}
 function defaultWSParse(message) {
 	if (typeof message !== "string") return message;
 	const start = message.charCodeAt(0);
@@ -26,7 +7,16 @@ function defaultWSParse(message) {
 	} catch {
 		return message;
 	}
-	if (isNumericString(message)) {
+	let i = start === 43 || start === 45 ? 1 : 0;
+	let sawDigit = false;
+	let sawDot = false;
+	for (; i < message.length; i++) {
+		const c = message.charCodeAt(i);
+		if (c >= 48 && c <= 57) sawDigit = true;
+		else if (c === 46 && !sawDot) sawDot = true;
+		else break;
+	}
+	if (sawDigit && i === message.length) {
 		if (message.length < 16) return +message;
 		const n = +message;
 		if (message.length === 16 && String(n) === message) return n;

package/dist/ws/route.d.ts

@@ -1,5 +1,5 @@
-import { InternalRoute } from "../types.js";
 import { Context } from "../context.js";
+import { InternalRoute } from "../types.js";
 import { WSOptions, WSOptionsEntry, WebSocketHandler } from "./types.js";
 import { AnyElysia } from "../base.js";
 import { ElysiaWS, WSConnectionData } from "./context.js";
@@ -10,7 +10,7 @@ declare function drainWaiters(ws: ElysiaWS<any>): void;
 declare function handleWSResponse(ws: ElysiaWS<any>, value: unknown, mapResponses: readonly AnyFn[]): Promise<void>;
 declare function buildWSRoute(route: InternalRoute, app: AnyElysia): [fetch: (context: Context) => Promise<Response | undefined> | Response | undefined, options: Partial<WebSocketHandler<any>>];
 declare function resolveWSOptions(entries: WSOptionsEntry[]): WSOptions | undefined;
-declare function accumulateWSOptions(target: WSOptions, routeOptions: WSOptions, _path: string): void;
+declare function accumulateWSOptions(target: WSOptions, routeOptions: WSOptions): void;
 declare function buildGlobalWSHandler(): WebSocketHandler<WSConnectionData>;
 //#endregion
 export { accumulateWSOptions, buildGlobalWSHandler, buildWSRoute, drainWaiters, handleWSResponse, resolveWSOptions };