@orkestrel/websocket 0.0.4 → 0.0.6

package/dist/src/server/index.d.cts

@@ -93,6 +93,61 @@ export declare function encodeWebSocketFrame(opcode: number, payload: Buffer | s
  */
 export declare function isCloseCode(code: number): boolean;
 
+/**
+ * Whether the next frame uses the shortest valid RFC 6455 payload-length encoding.
+ *
+ * @remarks
+ * Returns `undefined` until the complete length prefix is buffered. The 16-bit form
+ * is canonical only for lengths at least 126; the 64-bit form only for lengths at
+ * least 65,536 and with its most-significant bit clear (RFC 6455 §5.2).
+ *
+ * @param buffer - The accumulation buffer containing the next frame header
+ * @returns Its canonicality, or `undefined` while the length prefix is incomplete
+ *
+ * @example
+ * ```ts
+ * if (isWebSocketFrameCanonical(buffer) === false) fail(WEBSOCKET_CLOSE_PROTOCOL)
+ * ```
+ */
+export declare function isWebSocketFrameCanonical(buffer: Buffer): boolean | undefined;
+
+/**
+ * Whether a value is a canonical RFC 6455 `Sec-WebSocket-Key`.
+ *
+ * @remarks
+ * A valid key is exactly 16 random bytes encoded as 24 characters of base64, ending
+ * in `==` (RFC 6455 §4.1). This predicate is suitable at an HTTP upgrade boundary:
+ * malformed or non-canonical encodings return `false`; nothing is thrown.
+ *
+ * @param key - The proposed `Sec-WebSocket-Key` header value
+ * @returns `true` when `key` is the canonical base64 encoding of 16 bytes
+ *
+ * @example
+ * ```ts
+ * const key = request.headers['sec-websocket-key']
+ * if (typeof key !== 'string' || !isWebSocketKey(key)) socket.destroy()
+ * ```
+ */
+export declare function isWebSocketKey(key: string): boolean;
+
+/**
+ * Whether a value is one valid WebSocket subprotocol token.
+ *
+ * @remarks
+ * Subprotocols use the HTTP `token` grammar. Whitespace, separators, commas, and
+ * control characters are rejected, preventing an untrusted value from injecting a
+ * second handshake header.
+ *
+ * @param protocol - The negotiated subprotocol to validate
+ * @returns `true` when `protocol` is one non-empty HTTP token
+ *
+ * @example
+ * ```ts
+ * if (!isWebSocketProtocol(protocol)) throw new RangeError('invalid protocol')
+ * ```
+ */
+export declare function isWebSocketProtocol(protocol: string): boolean;
+
 /**
  * Read the declared payload length off the front of a buffer, without buffering or
  * reading the payload itself.
@@ -131,8 +186,9 @@ export declare function measureWebSocketFrame(buffer: Buffer): number | undefine
  * socket, emitting `close`. `send` writes a text frame, `ping` a ping, `close` a close
  * frame; `destroy` tears down immediately. It owns a typed `#emitter` (AGENTS §13) that
  * isolates a throwing listener and routes the error to its own `error` handler (the `error`
- * option) — the socket never crashes. The untyped socket `data` is narrowed to a `Buffer`
- * with a guard, never an assertion (AGENTS §14).
+ * option) — the socket never crashes. An underlying socket error emits the domain
+ * `error` event and terminates the wrapper. The untyped socket `data` is narrowed to a
+ * `Buffer` with a guard, never an assertion (AGENTS §14).
  */
 export declare class NodeWebSocket implements NodeWebSocketInterface {
     #private;
@@ -152,18 +208,19 @@ export declare class NodeWebSocket implements NodeWebSocketInterface {
  * `open` — the handshake completed and the socket is ready. `message` — a text frame
  * arrived (its decoded UTF-8 string). `close` — the connection ended (its
  * {@link WebSocketClose} metadata). `error` — the underlying socket faulted (a DOMAIN
- * event). `ping` / `pong` — a control frame arrived (a ping is auto-answered with a pong).
+ * event and then terminates the wrapper). `ping` / `pong` — a control frame arrived
+ * (a ping is auto-answered with a pong).
  * Listener isolation is the emitter's (AGENTS §13): a listener throw is routed to the
  * emitter's `error` handler (the `error` option), never onto this map, so a buggy observer
  * never breaks the socket.
  */
 export declare type NodeWebSocketEventMap = {
-    open: [];
-    message: [message: string];
-    close: [code: number | undefined, reason: string | undefined];
-    error: [error: unknown];
-    ping: [];
-    pong: [];
+    readonly open: readonly [];
+    readonly message: readonly [message: string];
+    readonly close: readonly [code: number | undefined, reason: string | undefined];
+    readonly error: readonly [error: unknown];
+    readonly ping: readonly [];
+    readonly pong: readonly [];
 };
 
 /**
@@ -271,6 +328,9 @@ export declare const WEBSOCKET_CLOSE_NORMAL = 1000;
 /** Protocol-error status code (RFC 6455 §7.4.1) — a framing/state rule was violated. */
 export declare const WEBSOCKET_CLOSE_PROTOCOL = 1002;
 
+/** The maximum UTF-8 close-reason length after the two-byte status code. */
+export declare const WEBSOCKET_CLOSE_REASON_MAXLEN: number;
+
 /** The default close-handshake timeout in milliseconds — how long `close()` waits for the peer's echo before tearing the socket down. */
 export declare const WEBSOCKET_CLOSE_TIMEOUT_MS = 30000;
 
@@ -305,6 +365,9 @@ export declare const WEBSOCKET_OPCODE_BINARY = 2;
 /** Close frame opcode — a control frame ending the connection (RFC 6455 §5.5.1). */
 export declare const WEBSOCKET_OPCODE_CLOSE = 8;
 
+/** Continuation frame opcode — the next fragment of an open data message (RFC 6455 §5.4). */
+export declare const WEBSOCKET_OPCODE_CONTINUATION = 0;
+
 /** Ping frame opcode — a control frame the peer must answer with a pong (RFC 6455 §5.5.2). */
 export declare const WEBSOCKET_OPCODE_PING = 9;
 

package/dist/src/server/index.d.ts

@@ -93,6 +93,61 @@ export declare function encodeWebSocketFrame(opcode: number, payload: Buffer | s
  */
 export declare function isCloseCode(code: number): boolean;
 
+/**
+ * Whether the next frame uses the shortest valid RFC 6455 payload-length encoding.
+ *
+ * @remarks
+ * Returns `undefined` until the complete length prefix is buffered. The 16-bit form
+ * is canonical only for lengths at least 126; the 64-bit form only for lengths at
+ * least 65,536 and with its most-significant bit clear (RFC 6455 §5.2).
+ *
+ * @param buffer - The accumulation buffer containing the next frame header
+ * @returns Its canonicality, or `undefined` while the length prefix is incomplete
+ *
+ * @example
+ * ```ts
+ * if (isWebSocketFrameCanonical(buffer) === false) fail(WEBSOCKET_CLOSE_PROTOCOL)
+ * ```
+ */
+export declare function isWebSocketFrameCanonical(buffer: Buffer): boolean | undefined;
+
+/**
+ * Whether a value is a canonical RFC 6455 `Sec-WebSocket-Key`.
+ *
+ * @remarks
+ * A valid key is exactly 16 random bytes encoded as 24 characters of base64, ending
+ * in `==` (RFC 6455 §4.1). This predicate is suitable at an HTTP upgrade boundary:
+ * malformed or non-canonical encodings return `false`; nothing is thrown.
+ *
+ * @param key - The proposed `Sec-WebSocket-Key` header value
+ * @returns `true` when `key` is the canonical base64 encoding of 16 bytes
+ *
+ * @example
+ * ```ts
+ * const key = request.headers['sec-websocket-key']
+ * if (typeof key !== 'string' || !isWebSocketKey(key)) socket.destroy()
+ * ```
+ */
+export declare function isWebSocketKey(key: string): boolean;
+
+/**
+ * Whether a value is one valid WebSocket subprotocol token.
+ *
+ * @remarks
+ * Subprotocols use the HTTP `token` grammar. Whitespace, separators, commas, and
+ * control characters are rejected, preventing an untrusted value from injecting a
+ * second handshake header.
+ *
+ * @param protocol - The negotiated subprotocol to validate
+ * @returns `true` when `protocol` is one non-empty HTTP token
+ *
+ * @example
+ * ```ts
+ * if (!isWebSocketProtocol(protocol)) throw new RangeError('invalid protocol')
+ * ```
+ */
+export declare function isWebSocketProtocol(protocol: string): boolean;
+
 /**
  * Read the declared payload length off the front of a buffer, without buffering or
  * reading the payload itself.
@@ -131,8 +186,9 @@ export declare function measureWebSocketFrame(buffer: Buffer): number | undefine
  * socket, emitting `close`. `send` writes a text frame, `ping` a ping, `close` a close
  * frame; `destroy` tears down immediately. It owns a typed `#emitter` (AGENTS §13) that
  * isolates a throwing listener and routes the error to its own `error` handler (the `error`
- * option) — the socket never crashes. The untyped socket `data` is narrowed to a `Buffer`
- * with a guard, never an assertion (AGENTS §14).
+ * option) — the socket never crashes. An underlying socket error emits the domain
+ * `error` event and terminates the wrapper. The untyped socket `data` is narrowed to a
+ * `Buffer` with a guard, never an assertion (AGENTS §14).
  */
 export declare class NodeWebSocket implements NodeWebSocketInterface {
     #private;
@@ -152,18 +208,19 @@ export declare class NodeWebSocket implements NodeWebSocketInterface {
  * `open` — the handshake completed and the socket is ready. `message` — a text frame
  * arrived (its decoded UTF-8 string). `close` — the connection ended (its
  * {@link WebSocketClose} metadata). `error` — the underlying socket faulted (a DOMAIN
- * event). `ping` / `pong` — a control frame arrived (a ping is auto-answered with a pong).
+ * event and then terminates the wrapper). `ping` / `pong` — a control frame arrived
+ * (a ping is auto-answered with a pong).
  * Listener isolation is the emitter's (AGENTS §13): a listener throw is routed to the
  * emitter's `error` handler (the `error` option), never onto this map, so a buggy observer
  * never breaks the socket.
  */
 export declare type NodeWebSocketEventMap = {
-    open: [];
-    message: [message: string];
-    close: [code: number | undefined, reason: string | undefined];
-    error: [error: unknown];
-    ping: [];
-    pong: [];
+    readonly open: readonly [];
+    readonly message: readonly [message: string];
+    readonly close: readonly [code: number | undefined, reason: string | undefined];
+    readonly error: readonly [error: unknown];
+    readonly ping: readonly [];
+    readonly pong: readonly [];
 };
 
 /**
@@ -271,6 +328,9 @@ export declare const WEBSOCKET_CLOSE_NORMAL = 1000;
 /** Protocol-error status code (RFC 6455 §7.4.1) — a framing/state rule was violated. */
 export declare const WEBSOCKET_CLOSE_PROTOCOL = 1002;
 
+/** The maximum UTF-8 close-reason length after the two-byte status code. */
+export declare const WEBSOCKET_CLOSE_REASON_MAXLEN: number;
+
 /** The default close-handshake timeout in milliseconds — how long `close()` waits for the peer's echo before tearing the socket down. */
 export declare const WEBSOCKET_CLOSE_TIMEOUT_MS = 30000;
 
@@ -305,6 +365,9 @@ export declare const WEBSOCKET_OPCODE_BINARY = 2;
 /** Close frame opcode — a control frame ending the connection (RFC 6455 §5.5.1). */
 export declare const WEBSOCKET_OPCODE_CLOSE = 8;
 
+/** Continuation frame opcode — the next fragment of an open data message (RFC 6455 §5.4). */
+export declare const WEBSOCKET_OPCODE_CONTINUATION = 0;
+
 /** Ping frame opcode — a control frame the peer must answer with a pong (RFC 6455 §5.5.2). */
 export declare const WEBSOCKET_OPCODE_PING = 9;
 

package/dist/src/server/index.js

@@ -16,6 +16,8 @@ var WEBSOCKET_VERSION = "13";
 var WEBSOCKET_OPCODE_TEXT = 1;
 /** Binary frame opcode — a raw byte payload (RFC 6455 §5.6). */
 var WEBSOCKET_OPCODE_BINARY = 2;
+/** Continuation frame opcode — the next fragment of an open data message (RFC 6455 §5.4). */
+var WEBSOCKET_OPCODE_CONTINUATION = 0;
 /** Close frame opcode — a control frame ending the connection (RFC 6455 §5.5.1). */
 var WEBSOCKET_OPCODE_CLOSE = 8;
 /** Ping frame opcode — a control frame the peer must answer with a pong (RFC 6455 §5.5.2). */
@@ -48,6 +50,8 @@ var WEBSOCKET_CLOSE_TIMEOUT_MS = 3e4;
 var WEBSOCKET_FAIL_TIMEOUT_MS = 1e3;
 /** The maximum control-frame payload length in bytes (RFC 6455 §5.5). */
 var WEBSOCKET_CONTROL_MAXLEN = 125;
+/** The maximum UTF-8 close-reason length after the two-byte status code. */
+var WEBSOCKET_CLOSE_REASON_MAXLEN = 123;
 //#endregion
 //#region src/server/helpers.ts
 /**
@@ -65,6 +69,46 @@ function computeWebSocketAccept(key) {
 	return createHash("sha1").update(key + WEBSOCKET_GUID).digest("base64");
 }
 /**
+* Whether a value is a canonical RFC 6455 `Sec-WebSocket-Key`.
+*
+* @remarks
+* A valid key is exactly 16 random bytes encoded as 24 characters of base64, ending
+* in `==` (RFC 6455 §4.1). This predicate is suitable at an HTTP upgrade boundary:
+* malformed or non-canonical encodings return `false`; nothing is thrown.
+*
+* @param key - The proposed `Sec-WebSocket-Key` header value
+* @returns `true` when `key` is the canonical base64 encoding of 16 bytes
+*
+* @example
+* ```ts
+* const key = request.headers['sec-websocket-key']
+* if (typeof key !== 'string' || !isWebSocketKey(key)) socket.destroy()
+* ```
+*/
+function isWebSocketKey(key) {
+	if (!/^[A-Za-z0-9+/]{22}==$/.test(key)) return false;
+	return Buffer.from(key, "base64").length === 16;
+}
+/**
+* Whether a value is one valid WebSocket subprotocol token.
+*
+* @remarks
+* Subprotocols use the HTTP `token` grammar. Whitespace, separators, commas, and
+* control characters are rejected, preventing an untrusted value from injecting a
+* second handshake header.
+*
+* @param protocol - The negotiated subprotocol to validate
+* @returns `true` when `protocol` is one non-empty HTTP token
+*
+* @example
+* ```ts
+* if (!isWebSocketProtocol(protocol)) throw new RangeError('invalid protocol')
+* ```
+*/
+function isWebSocketProtocol(protocol) {
+	return /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/.test(protocol);
+}
+/**
 * Decode a single RFC 6455 frame from the front of a buffer.
 *
 * @remarks
@@ -84,8 +128,8 @@ function computeWebSocketAccept(key) {
 */
 function parseWebSocketFrame(buffer) {
 	if (buffer.length < 2) return void 0;
-	const firstByte = buffer[0] ?? 0;
-	const secondByte = buffer[1] ?? 0;
+	const firstByte = buffer.readUInt8(0);
+	const secondByte = buffer.readUInt8(1);
 	const fin = (firstByte & 128) !== 0;
 	const rsv = (firstByte & 112) >> 4;
 	const opcode = firstByte & 15;
@@ -112,7 +156,7 @@ function parseWebSocketFrame(buffer) {
 	if (buffer.length < offset + length) return void 0;
 	const payload = Buffer.alloc(length);
 	buffer.copy(payload, 0, offset, offset + length);
-	if (mask !== void 0) for (let index = 0; index < length; index += 1) payload[index] = (payload[index] ?? 0) ^ (mask[index % 4] ?? 0);
+	if (mask !== void 0) for (let index = 0; index < length; index += 1) payload[index] = payload.readUInt8(index) ^ mask.readUInt8(index % 4);
 	return {
 		fin,
 		opcode,
@@ -144,7 +188,7 @@ function parseWebSocketFrame(buffer) {
 */
 function measureWebSocketFrame(buffer) {
 	if (buffer.length < 2) return void 0;
-	let length = (buffer[1] ?? 0) & 127;
+	let length = buffer.readUInt8(1) & 127;
 	const offset = 2;
 	if (length === 126) {
 		if (buffer.length < 4) return void 0;
@@ -158,6 +202,36 @@ function measureWebSocketFrame(buffer) {
 	return length;
 }
 /**
+* Whether the next frame uses the shortest valid RFC 6455 payload-length encoding.
+*
+* @remarks
+* Returns `undefined` until the complete length prefix is buffered. The 16-bit form
+* is canonical only for lengths at least 126; the 64-bit form only for lengths at
+* least 65,536 and with its most-significant bit clear (RFC 6455 §5.2).
+*
+* @param buffer - The accumulation buffer containing the next frame header
+* @returns Its canonicality, or `undefined` while the length prefix is incomplete
+*
+* @example
+* ```ts
+* if (isWebSocketFrameCanonical(buffer) === false) fail(WEBSOCKET_CLOSE_PROTOCOL)
+* ```
+*/
+function isWebSocketFrameCanonical(buffer) {
+	if (buffer.length < 2) return void 0;
+	const lengthCode = buffer.readUInt8(1) & 127;
+	if (lengthCode < 126) return true;
+	if (lengthCode === 126) {
+		if (buffer.length < 4) return void 0;
+		return buffer.readUInt16BE(2) >= 126;
+	}
+	if (buffer.length < 10) return void 0;
+	const high = buffer.readUInt32BE(2);
+	const low = buffer.readUInt32BE(6);
+	if ((high & 2147483648) !== 0) return false;
+	return high > 0 || low >= 65536;
+}
+/**
 * Decode a byte sequence as strict UTF-8, or signal it is malformed.
 *
 * @remarks
@@ -203,6 +277,7 @@ function parseUTF8(bytes) {
 * ```
 */
 function isCloseCode(code) {
+	if (!Number.isInteger(code)) return false;
 	if (code >= 1e3 && code <= 1003) return true;
 	if (code >= 1007 && code <= 1014) return true;
 	if (code >= 3e3 && code <= 4999) return true;
@@ -228,6 +303,9 @@ function isCloseCode(code) {
 * @returns The complete frame as wire bytes
 */
 function encodeWebSocketFrame(opcode, payload, options) {
+	if (!Number.isInteger(opcode) || opcode < 0 || opcode > 15) throw new RangeError("opcode must be an integer between 0 and 15");
+	if (options?.mask !== void 0 && options.mask.length !== 4) throw new RangeError("mask must contain exactly 4 bytes");
+	if (options?.mask !== void 0 && options.masked !== true) throw new RangeError("mask requires masked: true");
 	const body = typeof payload === "string" ? Buffer.from(payload, "utf-8") : payload;
 	const length = body.length;
 	const masked = options?.masked === true;
@@ -248,7 +326,7 @@ function encodeWebSocketFrame(opcode, payload, options) {
 	if (mask === void 0) return Buffer.concat([header, body]);
 	mask.copy(header, header.length - 4);
 	const maskedBody = Buffer.alloc(length);
-	for (let index = 0; index < length; index += 1) maskedBody[index] = (body[index] ?? 0) ^ (mask[index % 4] ?? 0);
+	for (let index = 0; index < length; index += 1) maskedBody[index] = body.readUInt8(index) ^ mask.readUInt8(index % 4);
 	return Buffer.concat([header, maskedBody]);
 }
 //#endregion
@@ -269,72 +347,71 @@ function encodeWebSocketFrame(opcode, payload, options) {
 * socket, emitting `close`. `send` writes a text frame, `ping` a ping, `close` a close
 * frame; `destroy` tears down immediately. It owns a typed `#emitter` (AGENTS §13) that
 * isolates a throwing listener and routes the error to its own `error` handler (the `error`
-* option) — the socket never crashes. The untyped socket `data` is narrowed to a `Buffer`
-* with a guard, never an assertion (AGENTS §14).
+* option) — the socket never crashes. An underlying socket error emits the domain
+* `error` event and terminates the wrapper. The untyped socket `data` is narrowed to a
+* `Buffer` with a guard, never an assertion (AGENTS §14).
 */
 var NodeWebSocket = class {
 	#emitter;
 	#socket;
-	#protocol;
 	#masked;
 	#payload;
 	#timeout;
-	#requireMask;
 	#signal;
+	#dataListener;
+	#closeListener;
+	#errorListener;
+	#abortListener;
 	#buffer = Buffer.alloc(0);
 	#readyState = 0;
-	#code = void 0;
-	#reason = void 0;
+	#code;
+	#reason;
 	#fragments = [];
-	#messageOpcode = void 0;
+	#messageOpcode;
 	#fragmentBytes = 0;
-	#closeTimer = void 0;
+	#closeTimer;
 	#destroyed = false;
 	#detached = false;
-	#onData = (chunk) => {
-		if (this.#readyState === 3) return;
-		const bytes = this.#bytes(chunk);
-		if (bytes === void 0) return;
-		this.#ingest(bytes);
-	};
-	#onClose = () => {
-		this.#finish();
-	};
-	#onError = (error) => {
-		this.#emitter.emit("error", error);
-	};
-	#onDetachedError = () => void 0;
-	#onAbort = () => {
-		this.destroy();
-	};
 	constructor(options) {
+		const payload = options.payload ?? 104857600;
+		if (!Number.isSafeInteger(payload) || payload < 0) throw new RangeError("payload must be a non-negative safe integer");
+		const timeout = options.timeout ?? 3e4;
+		if (!Number.isSafeInteger(timeout) || timeout < 0) throw new RangeError("timeout must be a non-negative safe integer");
+		if (options.key !== void 0 && !isWebSocketKey(options.key)) throw new RangeError("key must be the canonical base64 encoding of 16 bytes");
+		if (options.protocol !== void 0 && !isWebSocketProtocol(options.protocol)) throw new RangeError("protocol must be a valid WebSocket subprotocol token");
+		if (options.protocol !== void 0 && options.key === void 0) throw new RangeError("protocol requires a server key");
 		this.#emitter = new Emitter({
-			on: options.on,
-			error: options.error
+			...options.on === void 0 ? {} : { on: options.on },
+			...options.error === void 0 ? {} : { error: options.error }
 		});
 		this.#socket = options.socket;
-		this.#protocol = options.protocol;
 		this.#masked = options.key === void 0;
-		this.#payload = options.payload ?? 104857600;
-		this.#timeout = options.timeout ?? 3e4;
-		this.#requireMask = !this.#masked;
+		this.#payload = payload;
+		this.#timeout = timeout;
 		this.#signal = options.signal;
+		this.#dataListener = this.#handleData.bind(this);
+		this.#closeListener = this.#finish.bind(this);
+		this.#errorListener = this.#handleError.bind(this);
+		this.#abortListener = this.destroy.bind(this);
 		if (options.key !== void 0) {
-			const protocol = this.#protocol === void 0 ? "" : `Sec-WebSocket-Protocol: ${this.#protocol}\r\n`;
-			this.#socket.write(`HTTP/1.1 101 Switching Protocols\r
-Upgrade: websocket\r
-Connection: Upgrade\r
-Sec-WebSocket-Accept: ${computeWebSocketAccept(options.key)}\r\n` + protocol + "\r\n");
+			const headers = [
+				"HTTP/1.1 101 Switching Protocols",
+				"Upgrade: websocket",
+				"Connection: Upgrade",
+				`Sec-WebSocket-Accept: ${computeWebSocketAccept(options.key)}`
+			];
+			if (options.protocol !== void 0) headers.push(`Sec-WebSocket-Protocol: ${options.protocol}`);
+			this.#socket.write(`${headers.join("\r\n")}\r\n\r\n`);
 		}
 		this.#readyState = 1;
-		this.#socket.on("data", this.#onData);
-		this.#socket.on("close", this.#onClose);
-		this.#socket.on("error", this.#onError);
+		this.#socket.on("data", this.#dataListener);
+		this.#socket.on("close", this.#closeListener);
+		this.#socket.on("error", this.#errorListener);
 		this.#emitter.emit("open");
 		const head = options.head;
 		if (head !== void 0 && head.length > 0) this.#ingest(head);
 		if (this.#readyState !== 3) if (this.#signal?.aborted === true) this.destroy();
-		else this.#signal?.addEventListener("abort", this.#onAbort, { once: true });
+		else this.#signal?.addEventListener("abort", this.#abortListener, { once: true });
 	}
 	get emitter() {
 		return this.#emitter;
@@ -354,7 +431,7 @@ Sec-WebSocket-Accept: ${computeWebSocketAccept(options.key)}\r\n` + protocol + "
 	close(code, reason) {
 		if (this.#readyState === 2 || this.#readyState === 3) return;
 		if (code !== void 0 && !isCloseCode(code)) throw new RangeError("invalid close code");
-		if (reason !== void 0 && Buffer.byteLength(reason, "utf-8") > 123) throw new RangeError("close reason exceeds 123 bytes");
+		if (reason !== void 0 && Buffer.byteLength(reason, "utf-8") > 123) throw new RangeError(`close reason exceeds 123 bytes`);
 		this.#readyState = 2;
 		this.#code = code ?? 1e3;
 		this.#reason = reason === void 0 || reason.length === 0 ? void 0 : reason;
@@ -367,7 +444,7 @@ Sec-WebSocket-Accept: ${computeWebSocketAccept(options.key)}\r\n` + protocol + "
 		if (this.#destroyed) return;
 		this.#destroyed = true;
 		this.#detach();
-		this.#signal?.removeEventListener("abort", this.#onAbort);
+		this.#signal?.removeEventListener("abort", this.#abortListener);
 		clearTimeout(this.#closeTimer);
 		this.#closeTimer = void 0;
 		if (!this.#socket.destroyed) this.#socket.destroy();
@@ -376,6 +453,15 @@ Sec-WebSocket-Accept: ${computeWebSocketAccept(options.key)}\r\n` + protocol + "
 	}
 	#drain() {
 		for (;;) {
+			if (isWebSocketFrameCanonical(this.#buffer) === false) {
+				this.#fail(WEBSOCKET_CLOSE_PROTOCOL);
+				return;
+			}
+			const declared = measureWebSocketFrame(this.#buffer);
+			if (declared !== void 0 && declared > this.#payload) {
+				this.#fail(WEBSOCKET_CLOSE_TOOBIG);
+				return;
+			}
 			const frame = parseWebSocketFrame(this.#buffer);
 			if (frame === void 0) return;
 			this.#buffer = this.#buffer.subarray(frame.consumed);
@@ -388,7 +474,7 @@ Sec-WebSocket-Accept: ${computeWebSocketAccept(options.key)}\r\n` + protocol + "
 			this.#fail(WEBSOCKET_CLOSE_PROTOCOL);
 			return;
 		}
-		if (masked !== this.#requireMask) {
+		if (masked === this.#masked) {
 			this.#fail(WEBSOCKET_CLOSE_PROTOCOL);
 			return;
 		}
@@ -479,10 +565,10 @@ Sec-WebSocket-Accept: ${computeWebSocketAccept(options.key)}\r\n` + protocol + "
 	#detach() {
 		if (this.#detached) return;
 		this.#detached = true;
-		this.#socket.off("data", this.#onData);
-		this.#socket.off("close", this.#onClose);
-		this.#socket.off("error", this.#onError);
-		this.#socket.on("error", this.#onDetachedError);
+		this.#socket.off("data", this.#dataListener);
+		this.#socket.off("close", this.#closeListener);
+		this.#socket.off("error", this.#errorListener);
+		this.#socket.on("error", () => void 0);
 	}
 	#write(opcode, payload) {
 		if (this.#socket.destroyed) return;
@@ -511,7 +597,12 @@ Sec-WebSocket-Accept: ${computeWebSocketAccept(options.key)}\r\n` + protocol + "
 			this.#fail(WEBSOCKET_CLOSE_PROTOCOL);
 			return false;
 		}
-		const reason = payload.length > 2 ? parseUTF8(payload.subarray(2)) : "";
+		if (payload.length === 2) {
+			this.#code = code;
+			this.#reason = void 0;
+			return true;
+		}
+		const reason = parseUTF8(payload.subarray(2));
 		if (reason === void 0) {
 			this.#fail(WEBSOCKET_CLOSE_INVALID);
 			return false;
@@ -525,19 +616,24 @@ Sec-WebSocket-Accept: ${computeWebSocketAccept(options.key)}\r\n` + protocol + "
 		this.#detach();
 		clearTimeout(this.#closeTimer);
 		this.#closeTimer = void 0;
-		this.#signal?.removeEventListener("abort", this.#onAbort);
+		this.#signal?.removeEventListener("abort", this.#abortListener);
 		this.#readyState = 3;
 		this.#emitter.emit("close", this.#code, this.#reason);
 	}
 	#ingest(bytes) {
 		this.#buffer = Buffer.concat([this.#buffer, bytes]);
-		const declared = measureWebSocketFrame(this.#buffer);
-		if (declared !== void 0 && declared > this.#payload) {
-			this.#fail(WEBSOCKET_CLOSE_TOOBIG);
-			return;
-		}
 		this.#drain();
 	}
+	#handleData(chunk) {
+		if (this.#readyState === 3) return;
+		const bytes = this.#bytes(chunk);
+		if (bytes === void 0) return;
+		this.#ingest(bytes);
+	}
+	#handleError(error) {
+		this.#emitter.emit("error", error);
+		this.destroy();
+	}
 	#bytes(chunk) {
 		if (Buffer.isBuffer(chunk)) return chunk;
 		if (typeof chunk === "string") return Buffer.from(chunk, "utf-8");
@@ -580,6 +676,6 @@ function createNodeWebSocket(options) {
 	return new NodeWebSocket(options);
 }
 //#endregion
-export { NodeWebSocket, WEBSOCKET_CLOSE_INVALID, WEBSOCKET_CLOSE_NORMAL, WEBSOCKET_CLOSE_PROTOCOL, WEBSOCKET_CLOSE_TIMEOUT_MS, WEBSOCKET_CLOSE_TOOBIG, WEBSOCKET_CLOSE_UNSUPPORTED, WEBSOCKET_CONTROL_MAXLEN, WEBSOCKET_FAIL_TIMEOUT_MS, WEBSOCKET_GUID, WEBSOCKET_MAX_PAYLOAD, WEBSOCKET_OPCODE_BINARY, WEBSOCKET_OPCODE_CLOSE, WEBSOCKET_OPCODE_PING, WEBSOCKET_OPCODE_PONG, WEBSOCKET_OPCODE_TEXT, WEBSOCKET_READY_CLOSED, WEBSOCKET_READY_CLOSING, WEBSOCKET_READY_CONNECTING, WEBSOCKET_READY_OPEN, WEBSOCKET_VERSION, computeWebSocketAccept, createNodeWebSocket, encodeWebSocketFrame, isCloseCode, measureWebSocketFrame, parseUTF8, parseWebSocketFrame };
+export { NodeWebSocket, WEBSOCKET_CLOSE_INVALID, WEBSOCKET_CLOSE_NORMAL, WEBSOCKET_CLOSE_PROTOCOL, WEBSOCKET_CLOSE_REASON_MAXLEN, WEBSOCKET_CLOSE_TIMEOUT_MS, WEBSOCKET_CLOSE_TOOBIG, WEBSOCKET_CLOSE_UNSUPPORTED, WEBSOCKET_CONTROL_MAXLEN, WEBSOCKET_FAIL_TIMEOUT_MS, WEBSOCKET_GUID, WEBSOCKET_MAX_PAYLOAD, WEBSOCKET_OPCODE_BINARY, WEBSOCKET_OPCODE_CLOSE, WEBSOCKET_OPCODE_CONTINUATION, WEBSOCKET_OPCODE_PING, WEBSOCKET_OPCODE_PONG, WEBSOCKET_OPCODE_TEXT, WEBSOCKET_READY_CLOSED, WEBSOCKET_READY_CLOSING, WEBSOCKET_READY_CONNECTING, WEBSOCKET_READY_OPEN, WEBSOCKET_VERSION, computeWebSocketAccept, createNodeWebSocket, encodeWebSocketFrame, isCloseCode, isWebSocketFrameCanonical, isWebSocketKey, isWebSocketProtocol, measureWebSocketFrame, parseUTF8, parseWebSocketFrame };
 
 //# sourceMappingURL=index.js.map