ventiws 1.0.0-alpha.13 → 1.0.0-alpha.15

package/README.md

@@ -12,7 +12,7 @@ observable behaviour rather than its source. ventiws is not affiliated with the
 as the pinned contract, credited in
 [THIRD_PARTY_NOTICES.md](THIRD_PARTY_NOTICES.md).
 
-**ventiws is at `1.0.0-alpha.13`.** The surface may change between alpha
+**ventiws is at `1.0.0-alpha.15`.** The surface may change between alpha
 releases. What "alpha" means here is bounded: the `ws` compatibility
 contract is tracked row by row in
 [COMPATIBILITY.md](COMPATIBILITY.md), and the four places ventiws knowingly

package/dist/index.cjs

@@ -434,6 +434,41 @@ function closeWebSocketServer(state, callback) {
 		emitClose(state);
 	});
 }
+function normalizeParameters(parameters, isServer) {
+	const out = {};
+	for (const [key, values] of Object.entries(parameters)) {
+		if (values.length > 1) return null;
+		const parsed = parseParameter(key, values[0] ?? "", isServer);
+		if (parsed === null) return null;
+		out[key] = parsed;
+	}
+	return {
+		server_no_context_takeover: out.server_no_context_takeover === true,
+		client_no_context_takeover: out.client_no_context_takeover === true,
+		server_max_window_bits: numberOf(out.server_max_window_bits),
+		client_max_window_bits: windowOf(out.client_max_window_bits)
+	};
+}
+function parseParameter(key, value, isServer) {
+	if (key === "server_no_context_takeover" || key === "client_no_context_takeover") return value === "" ? true : null;
+	if (key === "client_max_window_bits") {
+		if (value === "") return isServer ? true : null;
+		return windowSize(value);
+	}
+	if (key === "server_max_window_bits") return value === "" ? null : windowSize(value);
+	return null;
+}
+function windowSize(value) {
+	const parsed = Number(value);
+	if (!Number.isInteger(parsed) || parsed < 8 || parsed > 15) return null;
+	return parsed;
+}
+function windowOf(value) {
+	return typeof value === "number" || value === true ? value : void 0;
+}
+function numberOf(value) {
+	return typeof value === "number" ? value : void 0;
+}
 //#endregion
 //#region src/compat/options/shared.ts
 const DEFAULT_MAX_PAYLOAD = 104857600;
@@ -463,6 +498,11 @@ function normalizeProtocols$1(protocols) {
 function parseProtocolHeader(header) {
 	return normalizeProtocols$1(header.split(",").map((protocol) => protocol.trim()));
 }
+function windowBitsOf(name, raw) {
+	if (raw === void 0 || raw === false) return raw;
+	if (typeof raw === "number" && Number.isInteger(raw) && raw >= 8 && raw <= 15) return raw;
+	return invalidOption(`The ${name} option must be an integer in [8, 15] (received ${String(raw)})`, RangeError);
+}
 function normalizePerMessageDeflate(value, fallback) {
 	if (value !== void 0 && !value) return false;
 	const resolved = value ?? fallback;
@@ -471,8 +511,8 @@ function normalizePerMessageDeflate(value, fallback) {
 	return {
 		serverNoContextTakeover: options.serverNoContextTakeover,
 		clientNoContextTakeover: options.clientNoContextTakeover,
-		serverMaxWindowBits: options.serverMaxWindowBits,
-		clientMaxWindowBits: options.clientMaxWindowBits,
+		serverMaxWindowBits: windowBitsOf("serverMaxWindowBits", options.serverMaxWindowBits),
+		clientMaxWindowBits: windowBitsOf("clientMaxWindowBits", options.clientMaxWindowBits),
 		threshold: options.threshold ?? 1024,
 		concurrencyLimit: options.concurrencyLimit ?? 10,
 		zlibDeflateOptions: options.zlibDeflateOptions,
@@ -850,12 +890,6 @@ function socketBufferedAmount(server, connection) {
 	return callNative(() => addon.socketBufferedAmount(server, connection));
 }
 //#endregion
-//#region src/compat/socket/queued.ts
-function queuedBytes(state) {
-	if (state.transport === null) return 0;
-	return state.transport.writableLength;
-}
-//#endregion
 //#region src/compat/socket/payload.ts
 const READY_STATE_NAMES = [
 	"CONNECTING",
@@ -895,6 +929,10 @@ function notOpenError(readyState) {
 function statusError(status) {
 	return createStatusError(status, `ventiws: socket operation failed with status "${status}"`);
 }
+function queuedBytes(state) {
+	if (state.transport === null) return 0;
+	return state.transport.writableLength;
+}
 function bufferedAmountOf(state) {
 	if (state.attachment === null) return queuedBytes(state);
 	return socketBufferedAmount(state.attachment.server, state.attachment.connection);
@@ -1005,8 +1043,8 @@ function closeFailure(status) {
 		case "payload-too-large":
 		case "invalid-close-code":
 		case "invalid-close-reason":
-		case "protocol-error":
-		case "policy-violation": return statusError(status);
+		case "protocol-error": return statusError(status);
+		case "policy-violation": return createError("ERR_POLICY_VIOLATION", "ventiws: app-initiated close is not implemented on the engine route");
 	}
 }
 //#endregion
@@ -1082,6 +1120,7 @@ function finishConnection(state, code, reason) {
 	state.readyState = 3;
 	state.closeCode = code;
 	state.closeReason = reason;
+	state.pendingInput = [];
 	emitEvent(state, "close", code, reason);
 }
 function failConnection(state, error) {
@@ -1132,6 +1171,11 @@ function closeConnection(state, code, reason) {
 		finishConnection(state, CLOSE_ABNORMAL$1, EMPTY$1);
 		return;
 	}
+	if (status === "policy-violation") {
+		state.readyState = 1;
+		reportWithoutClosing(state, closeFailure(status));
+		return;
+	}
 	failConnection(state, closeFailure(status));
 }
 function closeUnattached(state) {
@@ -1532,59 +1576,16 @@ const NO_CONTEXT_TAKEOVER = {
 	client_no_context_takeover: ""
 };
 //#endregion
-//#region src/compat/extensions/params.ts
-const MIN_WINDOW_BITS = 8;
-const MAX_WINDOW_BITS = 15;
-function normalizeParameters(parameters, isServer) {
-	const out = {};
-	for (const [key, values] of Object.entries(parameters)) {
-		if (values.length > 1) return null;
-		const parsed = parseParameter(key, values[0] ?? "", isServer);
-		if (parsed === null) return null;
-		out[key] = parsed;
-	}
-	return {
-		server_no_context_takeover: out.server_no_context_takeover === true,
-		client_no_context_takeover: out.client_no_context_takeover === true,
-		server_max_window_bits: numberOf(out.server_max_window_bits),
-		client_max_window_bits: windowOf(out.client_max_window_bits)
-	};
-}
-function parseParameter(key, value, isServer) {
-	if (key === "server_no_context_takeover" || key === "client_no_context_takeover") return value === "" ? true : null;
-	if (key === "client_max_window_bits") {
-		if (value === "") return isServer ? true : null;
-		return windowSize(value);
-	}
-	if (key === "server_max_window_bits") return value === "" ? null : windowSize(value);
-	return null;
-}
-function windowSize(value) {
-	const parsed = Number(value);
-	if (!Number.isInteger(parsed) || parsed < MIN_WINDOW_BITS || parsed > MAX_WINDOW_BITS) return null;
-	return parsed;
-}
-function windowOf(value) {
-	return typeof value === "number" || value === true ? value : void 0;
-}
-function numberOf(value) {
-	return typeof value === "number" ? value : void 0;
-}
-//#endregion
-//#region src/compat/extensions/window.ts
-function narrowed(parameters, name, option) {
-	if (typeof option !== "number" || option >= 15) return;
-	parameters[name] = String(option);
-}
-//#endregion
 //#region src/compat/extensions/offer-window.ts
 function serverWindowUsable(options, offer) {
+	const wanted = options.serverMaxWindowBits;
+	if (typeof wanted === "number" && wanted < 15) return false;
 	const asked = offer.server_max_window_bits;
 	if (asked === void 0) return true;
-	if (options.serverMaxWindowBits === false) return false;
-	if (typeof options.serverMaxWindowBits === "number") {
-		if (options.serverMaxWindowBits > asked) return false;
-		return options.serverMaxWindowBits >= 15;
+	if (wanted === false) return false;
+	if (typeof wanted === "number") {
+		if (wanted > asked) return false;
+		return wanted >= 15;
 	}
 	return asked >= 15;
 }
@@ -1592,7 +1593,7 @@ function serverWindowUsable(options, offer) {
 //#region src/compat/extensions/decline.ts
 function declines(options, offer) {
 	if (options.serverNoContextTakeover === false && offer.server_no_context_takeover) return true;
-	if (offer.server_max_window_bits !== void 0 && !serverWindowUsable(options, offer)) return true;
+	if (!serverWindowUsable(options, offer)) return true;
 	if (offer.client_max_window_bits === true && options.clientMaxWindowBits === false) return true;
 	if (typeof options.clientMaxWindowBits === "number") {
 		if (offer.client_max_window_bits === void 0) return true;
@@ -1628,11 +1629,14 @@ function acceptAsClient(response, options) {
 	if (typeof asked === "number" && asked < 15) return { refusal: "Server requested a window this implementation cannot use" };
 	return { accepted: answer(options, normalized) };
 }
+function narrowClientWindow(parameters, option) {
+	if (typeof option !== "number" || option >= 15) return;
+	parameters.client_max_window_bits = String(option);
+}
 function answer(options, offer) {
 	const parameters = { ...NO_CONTEXT_TAKEOVER };
 	if (offer.server_no_context_takeover) parameters.server_no_context_takeover = "";
-	narrowed(parameters, "server_max_window_bits", options.serverMaxWindowBits);
-	narrowed(parameters, "client_max_window_bits", options.clientMaxWindowBits);
+	narrowClientWindow(parameters, options.clientMaxWindowBits);
 	return {
 		name: PERMESSAGE_DEFLATE,
 		parameters,
@@ -1843,7 +1847,7 @@ function completeUpgrade(state, request, socket, head, key, protocols, callback)
 		if (extensions) acceptedState.extensions = extensions.header;
 		acceptedState.threshold = thresholdOf(state.normalizedOptions.perMessageDeflate);
 	}
-	attachSocket(accepted, socket);
+	attachSocket(accepted, socket, void 0, head);
 	if (state.normalizedOptions.clientTracking) trackClient(state, accepted);
 	callback(accepted, request);
 }
@@ -2731,6 +2735,69 @@ function acceptExtension(response, options) {
 	return acceptAsClient(offered[0], options) ?? { accepted: null };
 }
 //#endregion
+//#region src/compat/client/hop.ts
+function finish(attempt, request) {
+	const callback = attempt.options.finishRequest;
+	if (callback === void 0) {
+		request.end();
+		return;
+	}
+	const target = attempt.state.target;
+	if (target === void 0) {
+		request.end();
+		return;
+	}
+	callback(request, target);
+}
+function create(attempt, handlers) {
+	const { options, handshake } = attempt;
+	if (attempt.state.readyState === 3) return null;
+	const request = issue(attempt, handshake.request);
+	attempt.request = request;
+	attempt.state.cancelHandshake = () => {
+		request.abort();
+	};
+	request.on("error", (error) => {
+		if (attempt.request !== request) return;
+		attempt.request = null;
+		failConnection(attempt.state, error);
+	});
+	if (options.handshakeTimeout) request.setTimeout(options.handshakeTimeout, () => {
+		refuse(attempt, request, "Opening handshake has timed out");
+	});
+	request.on("upgrade", (response, socket, head) => {
+		if (attempt.request !== request) return;
+		attempt.request = null;
+		handlers.upgrade(attempt, response, socket, head);
+	});
+	request.on("response", (response) => {
+		if (attempt.request !== request) return;
+		attempt.request = null;
+		handlers.response(attempt, request, response);
+	});
+	return request;
+}
+function issue(attempt, options) {
+	return attempt.address.secure ? (0, node_https.request)(options) : (0, node_http.request)(options);
+}
+function refuse(attempt, request, message) {
+	request?.abort();
+	abort(attempt, createError("ERR_PROTOCOL", message));
+}
+function abort(attempt, error) {
+	const { state } = attempt;
+	if (state.readyState === 3) return;
+	state.cancelHandshake = null;
+	attempt.request?.destroy();
+	attempt.request = null;
+	if (attempt.transport !== null) discard(attempt.transport);
+	failConnection(state, error);
+}
+function discard(socket) {
+	socket.on("error", () => void 0);
+	socket.destroy();
+}
+//#endregion
 //#region src/compat/client/open.ts
 function onUpgrade(attempt, response, socket, head) {
 	const { state } = attempt;
@@ -2777,16 +2844,6 @@ function reportUnexpected(attempt, request, response) {
 	abort(attempt, createError("ERR_PROTOCOL", `Unexpected server response: ${response.statusCode ?? 0}`));
 }
 //#endregion
-//#region src/compat/client/credentials.ts
-function stripCredentials(headers) {
-	if (typeof headers !== "object" || headers === null) return;
-	const map = headers;
-	for (const name of Object.keys(map)) {
-		const lower = name.toLowerCase();
-		if (lower === "authorization" || lower === "cookie") delete map[name];
-	}
-}
-//#endregion
 //#region src/compat/client/redirect.ts
 function isRedirect(status, location) {
 	return location !== void 0 && status >= 300 && status < 400;
@@ -2799,6 +2856,14 @@ function onResponse(attempt, request, response) {
 	}
 	reportUnexpected(attempt, request, response);
 }
+function stripCredentials(headers) {
+	if (typeof headers !== "object" || headers === null) return;
+	const map = headers;
+	for (const name of Object.keys(map)) {
+		const lower = name.toLowerCase();
+		if (lower === "authorization" || lower === "cookie") delete map[name];
+	}
+}
 function follow(attempt, request, response, location) {
 	if (attempt.redirects + 1 > attempt.options.maxRedirects) {
 		request.abort();
@@ -2828,7 +2893,10 @@ function follow(attempt, request, response, location) {
 	attempt.address = next;
 	attempt.redirects += 1;
 	attempt.handshake = buildRequest(next, attempt.options, attempt.requested, newKey(), attempt.auth);
-	const hop = create(attempt);
+	const hop = create(attempt, {
+		upgrade: onUpgrade,
+		response: onResponse
+	});
 	if (hop === null) return;
 	emitEvent(attempt.state, "redirect", next.url, hop);
 	finish(attempt, hop);
@@ -2846,72 +2914,14 @@ function listenerCount(attempt) {
 //#endregion
 //#region src/compat/client/dial.ts
 function dial(attempt) {
-	const request = create(attempt);
+	const request = create(attempt, {
+		upgrade: onUpgrade,
+		response: onResponse
+	});
 	if (request === null) return null;
 	finish(attempt, request);
 	return request;
 }
-function finish(attempt, request) {
-	const callback = attempt.options.finishRequest;
-	if (callback === void 0) {
-		request.end();
-		return;
-	}
-	const target = attempt.state.target;
-	if (target === void 0) {
-		request.end();
-		return;
-	}
-	callback(request, target);
-}
-function create(attempt) {
-	const { options, handshake } = attempt;
-	if (attempt.state.readyState === 3) return null;
-	const request = issue(attempt, handshake.request);
-	attempt.request = request;
-	attempt.state.cancelHandshake = () => {
-		request.abort();
-	};
-	request.on("error", (error) => {
-		if (attempt.request !== request) return;
-		attempt.request = null;
-		failConnection(attempt.state, error);
-	});
-	if (options.handshakeTimeout) request.setTimeout(options.handshakeTimeout, () => {
-		refuse(attempt, request, "Opening handshake has timed out");
-	});
-	request.on("upgrade", (response, socket, head) => {
-		if (attempt.request !== request) return;
-		attempt.request = null;
-		onUpgrade(attempt, response, socket, head);
-	});
-	request.on("response", (response) => {
-		if (attempt.request !== request) return;
-		attempt.request = null;
-		onResponse(attempt, request, response);
-	});
-	return request;
-}
-function issue(attempt, options) {
-	return attempt.address.secure ? (0, node_https.request)(options) : (0, node_http.request)(options);
-}
-function refuse(attempt, request, message) {
-	request?.abort();
-	abort(attempt, createError("ERR_PROTOCOL", message));
-}
-function abort(attempt, error) {
-	const { state } = attempt;
-	if (state.readyState === 3) return;
-	state.cancelHandshake = null;
-	attempt.request?.destroy();
-	attempt.request = null;
-	if (attempt.transport !== null) discard(attempt.transport);
-	failConnection(state, error);
-}
-function discard(socket) {
-	socket.on("error", () => void 0);
-	socket.destroy();
-}
 //#endregion
 //#region src/compat/client/connect.ts
 function connectSocket(address, protocols, options) {

package/dist/index.mjs

@@ -430,6 +430,41 @@ function closeWebSocketServer(state, callback) {
 		emitClose(state);
 	});
 }
+function normalizeParameters(parameters, isServer) {
+	const out = {};
+	for (const [key, values] of Object.entries(parameters)) {
+		if (values.length > 1) return null;
+		const parsed = parseParameter(key, values[0] ?? "", isServer);
+		if (parsed === null) return null;
+		out[key] = parsed;
+	}
+	return {
+		server_no_context_takeover: out.server_no_context_takeover === true,
+		client_no_context_takeover: out.client_no_context_takeover === true,
+		server_max_window_bits: numberOf(out.server_max_window_bits),
+		client_max_window_bits: windowOf(out.client_max_window_bits)
+	};
+}
+function parseParameter(key, value, isServer) {
+	if (key === "server_no_context_takeover" || key === "client_no_context_takeover") return value === "" ? true : null;
+	if (key === "client_max_window_bits") {
+		if (value === "") return isServer ? true : null;
+		return windowSize(value);
+	}
+	if (key === "server_max_window_bits") return value === "" ? null : windowSize(value);
+	return null;
+}
+function windowSize(value) {
+	const parsed = Number(value);
+	if (!Number.isInteger(parsed) || parsed < 8 || parsed > 15) return null;
+	return parsed;
+}
+function windowOf(value) {
+	return typeof value === "number" || value === true ? value : void 0;
+}
+function numberOf(value) {
+	return typeof value === "number" ? value : void 0;
+}
 //#endregion
 //#region src/compat/options/shared.ts
 const DEFAULT_MAX_PAYLOAD = 104857600;
@@ -459,6 +494,11 @@ function normalizeProtocols$1(protocols) {
 function parseProtocolHeader(header) {
 	return normalizeProtocols$1(header.split(",").map((protocol) => protocol.trim()));
 }
+function windowBitsOf(name, raw) {
+	if (raw === void 0 || raw === false) return raw;
+	if (typeof raw === "number" && Number.isInteger(raw) && raw >= 8 && raw <= 15) return raw;
+	return invalidOption(`The ${name} option must be an integer in [8, 15] (received ${String(raw)})`, RangeError);
+}
 function normalizePerMessageDeflate(value, fallback) {
 	if (value !== void 0 && !value) return false;
 	const resolved = value ?? fallback;
@@ -467,8 +507,8 @@ function normalizePerMessageDeflate(value, fallback) {
 	return {
 		serverNoContextTakeover: options.serverNoContextTakeover,
 		clientNoContextTakeover: options.clientNoContextTakeover,
-		serverMaxWindowBits: options.serverMaxWindowBits,
-		clientMaxWindowBits: options.clientMaxWindowBits,
+		serverMaxWindowBits: windowBitsOf("serverMaxWindowBits", options.serverMaxWindowBits),
+		clientMaxWindowBits: windowBitsOf("clientMaxWindowBits", options.clientMaxWindowBits),
 		threshold: options.threshold ?? 1024,
 		concurrencyLimit: options.concurrencyLimit ?? 10,
 		zlibDeflateOptions: options.zlibDeflateOptions,
@@ -846,12 +886,6 @@ function socketBufferedAmount(server, connection) {
 	return callNative(() => addon.socketBufferedAmount(server, connection));
 }
 //#endregion
-//#region src/compat/socket/queued.ts
-function queuedBytes(state) {
-	if (state.transport === null) return 0;
-	return state.transport.writableLength;
-}
-//#endregion
 //#region src/compat/socket/payload.ts
 const READY_STATE_NAMES = [
 	"CONNECTING",
@@ -891,6 +925,10 @@ function notOpenError(readyState) {
 function statusError(status) {
 	return createStatusError(status, `ventiws: socket operation failed with status "${status}"`);
 }
+function queuedBytes(state) {
+	if (state.transport === null) return 0;
+	return state.transport.writableLength;
+}
 function bufferedAmountOf(state) {
 	if (state.attachment === null) return queuedBytes(state);
 	return socketBufferedAmount(state.attachment.server, state.attachment.connection);
@@ -1001,8 +1039,8 @@ function closeFailure(status) {
 		case "payload-too-large":
 		case "invalid-close-code":
 		case "invalid-close-reason":
-		case "protocol-error":
-		case "policy-violation": return statusError(status);
+		case "protocol-error": return statusError(status);
+		case "policy-violation": return createError("ERR_POLICY_VIOLATION", "ventiws: app-initiated close is not implemented on the engine route");
 	}
 }
 //#endregion
@@ -1078,6 +1116,7 @@ function finishConnection(state, code, reason) {
 	state.readyState = 3;
 	state.closeCode = code;
 	state.closeReason = reason;
+	state.pendingInput = [];
 	emitEvent(state, "close", code, reason);
 }
 function failConnection(state, error) {
@@ -1128,6 +1167,11 @@ function closeConnection(state, code, reason) {
 		finishConnection(state, CLOSE_ABNORMAL$1, EMPTY$1);
 		return;
 	}
+	if (status === "policy-violation") {
+		state.readyState = 1;
+		reportWithoutClosing(state, closeFailure(status));
+		return;
+	}
 	failConnection(state, closeFailure(status));
 }
 function closeUnattached(state) {
@@ -1528,59 +1572,16 @@ const NO_CONTEXT_TAKEOVER = {
 	client_no_context_takeover: ""
 };
 //#endregion
-//#region src/compat/extensions/params.ts
-const MIN_WINDOW_BITS = 8;
-const MAX_WINDOW_BITS = 15;
-function normalizeParameters(parameters, isServer) {
-	const out = {};
-	for (const [key, values] of Object.entries(parameters)) {
-		if (values.length > 1) return null;
-		const parsed = parseParameter(key, values[0] ?? "", isServer);
-		if (parsed === null) return null;
-		out[key] = parsed;
-	}
-	return {
-		server_no_context_takeover: out.server_no_context_takeover === true,
-		client_no_context_takeover: out.client_no_context_takeover === true,
-		server_max_window_bits: numberOf(out.server_max_window_bits),
-		client_max_window_bits: windowOf(out.client_max_window_bits)
-	};
-}
-function parseParameter(key, value, isServer) {
-	if (key === "server_no_context_takeover" || key === "client_no_context_takeover") return value === "" ? true : null;
-	if (key === "client_max_window_bits") {
-		if (value === "") return isServer ? true : null;
-		return windowSize(value);
-	}
-	if (key === "server_max_window_bits") return value === "" ? null : windowSize(value);
-	return null;
-}
-function windowSize(value) {
-	const parsed = Number(value);
-	if (!Number.isInteger(parsed) || parsed < MIN_WINDOW_BITS || parsed > MAX_WINDOW_BITS) return null;
-	return parsed;
-}
-function windowOf(value) {
-	return typeof value === "number" || value === true ? value : void 0;
-}
-function numberOf(value) {
-	return typeof value === "number" ? value : void 0;
-}
-//#endregion
-//#region src/compat/extensions/window.ts
-function narrowed(parameters, name, option) {
-	if (typeof option !== "number" || option >= 15) return;
-	parameters[name] = String(option);
-}
-//#endregion
 //#region src/compat/extensions/offer-window.ts
 function serverWindowUsable(options, offer) {
+	const wanted = options.serverMaxWindowBits;
+	if (typeof wanted === "number" && wanted < 15) return false;
 	const asked = offer.server_max_window_bits;
 	if (asked === void 0) return true;
-	if (options.serverMaxWindowBits === false) return false;
-	if (typeof options.serverMaxWindowBits === "number") {
-		if (options.serverMaxWindowBits > asked) return false;
-		return options.serverMaxWindowBits >= 15;
+	if (wanted === false) return false;
+	if (typeof wanted === "number") {
+		if (wanted > asked) return false;
+		return wanted >= 15;
 	}
 	return asked >= 15;
 }
@@ -1588,7 +1589,7 @@ function serverWindowUsable(options, offer) {
 //#region src/compat/extensions/decline.ts
 function declines(options, offer) {
 	if (options.serverNoContextTakeover === false && offer.server_no_context_takeover) return true;
-	if (offer.server_max_window_bits !== void 0 && !serverWindowUsable(options, offer)) return true;
+	if (!serverWindowUsable(options, offer)) return true;
 	if (offer.client_max_window_bits === true && options.clientMaxWindowBits === false) return true;
 	if (typeof options.clientMaxWindowBits === "number") {
 		if (offer.client_max_window_bits === void 0) return true;
@@ -1624,11 +1625,14 @@ function acceptAsClient(response, options) {
 	if (typeof asked === "number" && asked < 15) return { refusal: "Server requested a window this implementation cannot use" };
 	return { accepted: answer(options, normalized) };
 }
+function narrowClientWindow(parameters, option) {
+	if (typeof option !== "number" || option >= 15) return;
+	parameters.client_max_window_bits = String(option);
+}
 function answer(options, offer) {
 	const parameters = { ...NO_CONTEXT_TAKEOVER };
 	if (offer.server_no_context_takeover) parameters.server_no_context_takeover = "";
-	narrowed(parameters, "server_max_window_bits", options.serverMaxWindowBits);
-	narrowed(parameters, "client_max_window_bits", options.clientMaxWindowBits);
+	narrowClientWindow(parameters, options.clientMaxWindowBits);
 	return {
 		name: PERMESSAGE_DEFLATE,
 		parameters,
@@ -1839,7 +1843,7 @@ function completeUpgrade(state, request, socket, head, key, protocols, callback)
 		if (extensions) acceptedState.extensions = extensions.header;
 		acceptedState.threshold = thresholdOf(state.normalizedOptions.perMessageDeflate);
 	}
-	attachSocket(accepted, socket);
+	attachSocket(accepted, socket, void 0, head);
 	if (state.normalizedOptions.clientTracking) trackClient(state, accepted);
 	callback(accepted, request);
 }
@@ -2727,6 +2731,69 @@ function acceptExtension(response, options) {
 	return acceptAsClient(offered[0], options) ?? { accepted: null };
 }
 //#endregion
+//#region src/compat/client/hop.ts
+function finish(attempt, request) {
+	const callback = attempt.options.finishRequest;
+	if (callback === void 0) {
+		request.end();
+		return;
+	}
+	const target = attempt.state.target;
+	if (target === void 0) {
+		request.end();
+		return;
+	}
+	callback(request, target);
+}
+function create(attempt, handlers) {
+	const { options, handshake } = attempt;
+	if (attempt.state.readyState === 3) return null;
+	const request = issue(attempt, handshake.request);
+	attempt.request = request;
+	attempt.state.cancelHandshake = () => {
+		request.abort();
+	};
+	request.on("error", (error) => {
+		if (attempt.request !== request) return;
+		attempt.request = null;
+		failConnection(attempt.state, error);
+	});
+	if (options.handshakeTimeout) request.setTimeout(options.handshakeTimeout, () => {
+		refuse(attempt, request, "Opening handshake has timed out");
+	});
+	request.on("upgrade", (response, socket, head) => {
+		if (attempt.request !== request) return;
+		attempt.request = null;
+		handlers.upgrade(attempt, response, socket, head);
+	});
+	request.on("response", (response) => {
+		if (attempt.request !== request) return;
+		attempt.request = null;
+		handlers.response(attempt, request, response);
+	});
+	return request;
+}
+function issue(attempt, options) {
+	return attempt.address.secure ? request$1(options) : request(options);
+}
+function refuse(attempt, request, message) {
+	request?.abort();
+	abort(attempt, createError("ERR_PROTOCOL", message));
+}
+function abort(attempt, error) {
+	const { state } = attempt;
+	if (state.readyState === 3) return;
+	state.cancelHandshake = null;
+	attempt.request?.destroy();
+	attempt.request = null;
+	if (attempt.transport !== null) discard(attempt.transport);
+	failConnection(state, error);
+}
+function discard(socket) {
+	socket.on("error", () => void 0);
+	socket.destroy();
+}
+//#endregion
 //#region src/compat/client/open.ts
 function onUpgrade(attempt, response, socket, head) {
 	const { state } = attempt;
@@ -2773,16 +2840,6 @@ function reportUnexpected(attempt, request, response) {
 	abort(attempt, createError("ERR_PROTOCOL", `Unexpected server response: ${response.statusCode ?? 0}`));
 }
 //#endregion
-//#region src/compat/client/credentials.ts
-function stripCredentials(headers) {
-	if (typeof headers !== "object" || headers === null) return;
-	const map = headers;
-	for (const name of Object.keys(map)) {
-		const lower = name.toLowerCase();
-		if (lower === "authorization" || lower === "cookie") delete map[name];
-	}
-}
-//#endregion
 //#region src/compat/client/redirect.ts
 function isRedirect(status, location) {
 	return location !== void 0 && status >= 300 && status < 400;
@@ -2795,6 +2852,14 @@ function onResponse(attempt, request, response) {
 	}
 	reportUnexpected(attempt, request, response);
 }
+function stripCredentials(headers) {
+	if (typeof headers !== "object" || headers === null) return;
+	const map = headers;
+	for (const name of Object.keys(map)) {
+		const lower = name.toLowerCase();
+		if (lower === "authorization" || lower === "cookie") delete map[name];
+	}
+}
 function follow(attempt, request, response, location) {
 	if (attempt.redirects + 1 > attempt.options.maxRedirects) {
 		request.abort();
@@ -2824,7 +2889,10 @@ function follow(attempt, request, response, location) {
 	attempt.address = next;
 	attempt.redirects += 1;
 	attempt.handshake = buildRequest(next, attempt.options, attempt.requested, newKey(), attempt.auth);
-	const hop = create(attempt);
+	const hop = create(attempt, {
+		upgrade: onUpgrade,
+		response: onResponse
+	});
 	if (hop === null) return;
 	emitEvent(attempt.state, "redirect", next.url, hop);
 	finish(attempt, hop);
@@ -2842,72 +2910,14 @@ function listenerCount(attempt) {
 //#endregion
 //#region src/compat/client/dial.ts
 function dial(attempt) {
-	const request = create(attempt);
+	const request = create(attempt, {
+		upgrade: onUpgrade,
+		response: onResponse
+	});
 	if (request === null) return null;
 	finish(attempt, request);
 	return request;
 }
-function finish(attempt, request) {
-	const callback = attempt.options.finishRequest;
-	if (callback === void 0) {
-		request.end();
-		return;
-	}
-	const target = attempt.state.target;
-	if (target === void 0) {
-		request.end();
-		return;
-	}
-	callback(request, target);
-}
-function create(attempt) {
-	const { options, handshake } = attempt;
-	if (attempt.state.readyState === 3) return null;
-	const request = issue(attempt, handshake.request);
-	attempt.request = request;
-	attempt.state.cancelHandshake = () => {
-		request.abort();
-	};
-	request.on("error", (error) => {
-		if (attempt.request !== request) return;
-		attempt.request = null;
-		failConnection(attempt.state, error);
-	});
-	if (options.handshakeTimeout) request.setTimeout(options.handshakeTimeout, () => {
-		refuse(attempt, request, "Opening handshake has timed out");
-	});
-	request.on("upgrade", (response, socket, head) => {
-		if (attempt.request !== request) return;
-		attempt.request = null;
-		onUpgrade(attempt, response, socket, head);
-	});
-	request.on("response", (response) => {
-		if (attempt.request !== request) return;
-		attempt.request = null;
-		onResponse(attempt, request, response);
-	});
-	return request;
-}
-function issue(attempt, options) {
-	return attempt.address.secure ? request$1(options) : request(options);
-}
-function refuse(attempt, request, message) {
-	request?.abort();
-	abort(attempt, createError("ERR_PROTOCOL", message));
-}
-function abort(attempt, error) {
-	const { state } = attempt;
-	if (state.readyState === 3) return;
-	state.cancelHandshake = null;
-	attempt.request?.destroy();
-	attempt.request = null;
-	if (attempt.transport !== null) discard(attempt.transport);
-	failConnection(state, error);
-}
-function discard(socket) {
-	socket.on("error", () => void 0);
-	socket.destroy();
-}
 //#endregion
 //#region src/compat/client/connect.ts
 function connectSocket(address, protocols, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ventiws",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.15",
   "description": "A drop-in replacement for ws for Node.js, built on the first-party µWebZockets Zig engine via napi-zig.",
   "homepage": "https://github.com/farbenbuilds/ventiws#readme",
   "bugs": {
@@ -30,10 +30,10 @@
     "node": ">=22.12.0"
   },
   "optionalDependencies": {
-    "@ventiws/binding-darwin-arm64": "1.0.0-alpha.13",
-    "@ventiws/binding-darwin-x64": "1.0.0-alpha.13",
-    "@ventiws/binding-linux-arm64-gnu": "1.0.0-alpha.13",
-    "@ventiws/binding-linux-x64-gnu": "1.0.0-alpha.13",
-    "@ventiws/binding-linux-x64-musl": "1.0.0-alpha.13"
+    "@ventiws/binding-darwin-arm64": "1.0.0-alpha.15",
+    "@ventiws/binding-darwin-x64": "1.0.0-alpha.15",
+    "@ventiws/binding-linux-arm64-gnu": "1.0.0-alpha.15",
+    "@ventiws/binding-linux-x64-gnu": "1.0.0-alpha.15",
+    "@ventiws/binding-linux-x64-musl": "1.0.0-alpha.15"
   }
 }