ventiws 1.0.0-rc.0 → 1.0.0-rc.1

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-rc.0`.** The surface may change between beta
+**ventiws is at `1.0.0-rc.1`.** The surface may change between beta
 releases. What "beta" 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

@@ -475,7 +475,7 @@ function trackClient(state, socket) {
 }
 //#endregion
 //#region package.json
-var version = "1.0.0-rc.0";
+var version = "1.0.0-rc.1";
 //#endregion
 //#region src/logging/lifecycle.ts
 const CONTROL = /\p{Cc}/gu;
@@ -1091,8 +1091,8 @@ function queuedBytes(state) {
 	return state.transport.writableLength;
 }
 function bufferedAmountOf(state) {
-	if (state.attachment === null) return queuedBytes(state);
-	return socketBufferedAmount(state.attachment.server, state.attachment.connection);
+	if (state.attachment === null) return queuedBytes(state) + state.bufferedExtra;
+	return socketBufferedAmount(state.attachment.server, state.attachment.connection) + state.bufferedExtra;
 }
 function defer(callback, error) {
 	if (typeof callback !== "function") return;
@@ -1327,6 +1327,7 @@ function createSocketState() {
 		maxFragments: DEFAULT_MAX_FRAGMENTS,
 		cancelHandshake: null,
 		pendingSend: null,
+		bufferedExtra: 0,
 		compressible: false,
 		threshold: 0,
 		autoPong: true,
@@ -1354,6 +1355,7 @@ function finishConnection(state, code, reason) {
 	state.closeCode = code;
 	state.closeReason = reason;
 	state.pendingInput = [];
+	state.cancelHandshake = null;
 	logSocketClose(state, code, reason);
 	emitEvent(state, "close", code, reason);
 }
@@ -1382,6 +1384,7 @@ function reportWithoutClosing(state, error) {
 function closeConnection(state, code, reason) {
 	if (state.readyState === 3) return;
 	if (state.readyState === 0) {
+		state.cancelHandshake?.();
 		failConnection(state, createError("ERR_INVALID_STATE", "WebSocket was closed before the connection was established"));
 		return;
 	}
@@ -1529,6 +1532,7 @@ function shapeBinary(binaryType, payload, ends) {
 	}
 }
 function slicedArrayBuffer(payload) {
+	if (payload.length === payload.buffer.byteLength) return payload.buffer;
 	return payload.buffer.slice(payload.byteOffset, payload.byteOffset + payload.byteLength);
 }
 function sliceFragments(payload, ends) {
@@ -1536,7 +1540,7 @@ function sliceFragments(payload, ends) {
 	const pieces = [];
 	let start = 0;
 	for (const end of ends) {
-		const at = Math.min(end, payload.length);
+		const at = Math.max(start, Math.min(end, payload.length));
 		if (at > start) pieces.push(payload.subarray(start, at));
 		start = at;
 	}
@@ -1554,7 +1558,7 @@ function dispatch(state, handle, kind, code, payload, ends) {
 			emitBinary(state, payload, ends);
 			return;
 		case "ping":
-			if (state.autoPong) writePong(state, payload);
+			if (state.autoPong && state.readyState === 1) writePong(state, payload);
 			emitEvent(state, "ping", payload);
 			return;
 		case "pong":
@@ -1615,7 +1619,7 @@ function drainDeferred(state, handle, released, resume) {
 			return;
 		}
 		honoured = false;
-		const ends = codecFragmentEnds(handle);
+		const ends = state.binaryType === "fragments" ? codecFragmentEnds(handle) : null;
 		takeCodecEvent(handle);
 		if (event === null) continue;
 		dispatch(state, handle, event.kind, event.code, event.payload, ends);
@@ -1744,6 +1748,7 @@ function failTransport(state, error) {
 function terminateConnection(state) {
 	if (state.readyState === 3) return;
 	if (state.readyState === 0) {
+		state.cancelHandshake?.();
 		failConnection(state, createError("ERR_INVALID_STATE", "WebSocket was closed before the connection was established"));
 		return;
 	}
@@ -1847,7 +1852,6 @@ function serverWindowUsable(options, offer) {
 function declines(options, offer) {
 	if (options.serverNoContextTakeover === false && offer.server_no_context_takeover) 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;
 		const asked = offer.client_max_window_bits;
@@ -1872,6 +1876,7 @@ function acceptAsClient(response, options) {
 	if (options === false) return null;
 	const normalized = normalizeParameters(response.parameters, false);
 	if (normalized === null) return { refusal: "Invalid Sec-WebSocket-Extensions header" };
+	if (normalized.server_no_context_takeover !== true) return { refusal: "Missing parameter \"server_no_context_takeover\"" };
 	if (normalized.client_no_context_takeover && options.clientNoContextTakeover === false) return { refusal: "Unexpected parameter \"client_no_context_takeover\"" };
 	const asked = normalized.client_max_window_bits;
 	if (asked === void 0) return { accepted: answer(options, normalized) };
@@ -2598,11 +2603,13 @@ function isBlob(value) {
 }
 function sendBlob(state, blob, options, callback) {
 	if (state.readyState !== 1) {
+		state.bufferedExtra += blob.size;
 		defer(callback, notOpenError(state.readyState));
 		return;
 	}
 	const reading = blob.arrayBuffer().then((buffer) => {
 		if (state.readyState !== 1) {
+			state.bufferedExtra += buffer.byteLength;
 			defer(callback, notOpenError(state.readyState));
 			return;
 		}
@@ -2621,25 +2628,18 @@ function asOptions(options) {
 	return typeof options === "object" && options !== null ? { ...options } : {};
 }
 //#endregion
-//#region src/compat/socket/send.ts
-function sendData(state, data, options, callback) {
-	if (state.readyState === 0) throw notOpenError(0);
-	const pending = state.pendingSend;
-	if (pending === null) {
-		framePayload(state, data, options, callback);
-		return;
-	}
-	const work = () => framePayload(state, data, options, callback);
-	pending.then(work, work);
-}
+//#region src/compat/socket/send-frame.ts
 function framePayload(state, data, options, callback) {
 	const failure = resolveCallback(options, callback);
 	if (isBlob(data)) {
 		sendBlob(state, data, options, failure);
 		return;
 	}
-	const payload = toPayload(data);
+	frameResolved(state, toPayload(data), options, failure);
+}
+function frameResolved(state, payload, options, failure) {
 	if (state.readyState !== 1) {
+		state.bufferedExtra += payload.bytes.length;
 		defer(failure, notOpenError(state.readyState));
 		return;
 	}
@@ -2693,6 +2693,38 @@ function unhandledStatus(status) {
 	return createError("ERR_INVALID_STATE", `ventiws: the engine reported an unknown socket status "${String(status)}"`);
 }
 //#endregion
+//#region src/compat/socket/send.ts
+function sendData(state, data, options, callback) {
+	if (state.readyState === 0) throw notOpenError(0);
+	const pending = state.pendingSend;
+	if (pending === null) {
+		framePayload(state, data, options, callback);
+		return;
+	}
+	queueSend(state, pending, data, options, callback);
+}
+function queueSend(state, pending, data, options, callback) {
+	const failure = resolveCallback(options, callback);
+	if (isBlob(data)) {
+		settle(state, pending, failure, () => framePayload(state, data, options, callback));
+		return;
+	}
+	const payload = toPayload(data);
+	settle(state, pending, failure, () => frameResolved(state, payload, options, failure));
+}
+function settle(state, pending, failure, work) {
+	const run = () => {
+		try {
+			work();
+		} catch (error) {
+			const reported = error instanceof Error ? error : createError("ERR_INVALID_STATE", String(error));
+			if (typeof failure === "function") defer(failure, reported);
+			else reportWithoutClosing(state, reported);
+		}
+	};
+	pending.then(run, run);
+}
+//#endregion
 //#region src/compat/socket/record.ts
 const BINARY_TYPE_VALUES = [
 	"nodebuffer",
@@ -3137,6 +3169,7 @@ function follow(attempt, request, response, location) {
 	}
 	if (next.authority !== attempt.address.authority && listenerCount(attempt) === 0) {
 		stripCredentials(attempt.handshake.request.headers);
+		stripCredentials(attempt.options.headers);
 		attempt.auth = void 0;
 	}
 	request.abort();

package/dist/index.mjs

@@ -448,7 +448,7 @@ function trackClient(state, socket) {
 }
 //#endregion
 //#region package.json
-var version = "1.0.0-rc.0";
+var version = "1.0.0-rc.1";
 //#endregion
 //#region src/logging/lifecycle.ts
 const CONTROL = /\p{Cc}/gu;
@@ -1064,8 +1064,8 @@ function queuedBytes(state) {
 	return state.transport.writableLength;
 }
 function bufferedAmountOf(state) {
-	if (state.attachment === null) return queuedBytes(state);
-	return socketBufferedAmount(state.attachment.server, state.attachment.connection);
+	if (state.attachment === null) return queuedBytes(state) + state.bufferedExtra;
+	return socketBufferedAmount(state.attachment.server, state.attachment.connection) + state.bufferedExtra;
 }
 function defer(callback, error) {
 	if (typeof callback !== "function") return;
@@ -1300,6 +1300,7 @@ function createSocketState() {
 		maxFragments: DEFAULT_MAX_FRAGMENTS,
 		cancelHandshake: null,
 		pendingSend: null,
+		bufferedExtra: 0,
 		compressible: false,
 		threshold: 0,
 		autoPong: true,
@@ -1327,6 +1328,7 @@ function finishConnection(state, code, reason) {
 	state.closeCode = code;
 	state.closeReason = reason;
 	state.pendingInput = [];
+	state.cancelHandshake = null;
 	logSocketClose(state, code, reason);
 	emitEvent(state, "close", code, reason);
 }
@@ -1355,6 +1357,7 @@ function reportWithoutClosing(state, error) {
 function closeConnection(state, code, reason) {
 	if (state.readyState === 3) return;
 	if (state.readyState === 0) {
+		state.cancelHandshake?.();
 		failConnection(state, createError("ERR_INVALID_STATE", "WebSocket was closed before the connection was established"));
 		return;
 	}
@@ -1502,6 +1505,7 @@ function shapeBinary(binaryType, payload, ends) {
 	}
 }
 function slicedArrayBuffer(payload) {
+	if (payload.length === payload.buffer.byteLength) return payload.buffer;
 	return payload.buffer.slice(payload.byteOffset, payload.byteOffset + payload.byteLength);
 }
 function sliceFragments(payload, ends) {
@@ -1509,7 +1513,7 @@ function sliceFragments(payload, ends) {
 	const pieces = [];
 	let start = 0;
 	for (const end of ends) {
-		const at = Math.min(end, payload.length);
+		const at = Math.max(start, Math.min(end, payload.length));
 		if (at > start) pieces.push(payload.subarray(start, at));
 		start = at;
 	}
@@ -1527,7 +1531,7 @@ function dispatch(state, handle, kind, code, payload, ends) {
 			emitBinary(state, payload, ends);
 			return;
 		case "ping":
-			if (state.autoPong) writePong(state, payload);
+			if (state.autoPong && state.readyState === 1) writePong(state, payload);
 			emitEvent(state, "ping", payload);
 			return;
 		case "pong":
@@ -1588,7 +1592,7 @@ function drainDeferred(state, handle, released, resume) {
 			return;
 		}
 		honoured = false;
-		const ends = codecFragmentEnds(handle);
+		const ends = state.binaryType === "fragments" ? codecFragmentEnds(handle) : null;
 		takeCodecEvent(handle);
 		if (event === null) continue;
 		dispatch(state, handle, event.kind, event.code, event.payload, ends);
@@ -1717,6 +1721,7 @@ function failTransport(state, error) {
 function terminateConnection(state) {
 	if (state.readyState === 3) return;
 	if (state.readyState === 0) {
+		state.cancelHandshake?.();
 		failConnection(state, createError("ERR_INVALID_STATE", "WebSocket was closed before the connection was established"));
 		return;
 	}
@@ -1820,7 +1825,6 @@ function serverWindowUsable(options, offer) {
 function declines(options, offer) {
 	if (options.serverNoContextTakeover === false && offer.server_no_context_takeover) 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;
 		const asked = offer.client_max_window_bits;
@@ -1845,6 +1849,7 @@ function acceptAsClient(response, options) {
 	if (options === false) return null;
 	const normalized = normalizeParameters(response.parameters, false);
 	if (normalized === null) return { refusal: "Invalid Sec-WebSocket-Extensions header" };
+	if (normalized.server_no_context_takeover !== true) return { refusal: "Missing parameter \"server_no_context_takeover\"" };
 	if (normalized.client_no_context_takeover && options.clientNoContextTakeover === false) return { refusal: "Unexpected parameter \"client_no_context_takeover\"" };
 	const asked = normalized.client_max_window_bits;
 	if (asked === void 0) return { accepted: answer(options, normalized) };
@@ -2571,11 +2576,13 @@ function isBlob(value) {
 }
 function sendBlob(state, blob, options, callback) {
 	if (state.readyState !== 1) {
+		state.bufferedExtra += blob.size;
 		defer(callback, notOpenError(state.readyState));
 		return;
 	}
 	const reading = blob.arrayBuffer().then((buffer) => {
 		if (state.readyState !== 1) {
+			state.bufferedExtra += buffer.byteLength;
 			defer(callback, notOpenError(state.readyState));
 			return;
 		}
@@ -2594,25 +2601,18 @@ function asOptions(options) {
 	return typeof options === "object" && options !== null ? { ...options } : {};
 }
 //#endregion
-//#region src/compat/socket/send.ts
-function sendData(state, data, options, callback) {
-	if (state.readyState === 0) throw notOpenError(0);
-	const pending = state.pendingSend;
-	if (pending === null) {
-		framePayload(state, data, options, callback);
-		return;
-	}
-	const work = () => framePayload(state, data, options, callback);
-	pending.then(work, work);
-}
+//#region src/compat/socket/send-frame.ts
 function framePayload(state, data, options, callback) {
 	const failure = resolveCallback(options, callback);
 	if (isBlob(data)) {
 		sendBlob(state, data, options, failure);
 		return;
 	}
-	const payload = toPayload(data);
+	frameResolved(state, toPayload(data), options, failure);
+}
+function frameResolved(state, payload, options, failure) {
 	if (state.readyState !== 1) {
+		state.bufferedExtra += payload.bytes.length;
 		defer(failure, notOpenError(state.readyState));
 		return;
 	}
@@ -2666,6 +2666,38 @@ function unhandledStatus(status) {
 	return createError("ERR_INVALID_STATE", `ventiws: the engine reported an unknown socket status "${String(status)}"`);
 }
 //#endregion
+//#region src/compat/socket/send.ts
+function sendData(state, data, options, callback) {
+	if (state.readyState === 0) throw notOpenError(0);
+	const pending = state.pendingSend;
+	if (pending === null) {
+		framePayload(state, data, options, callback);
+		return;
+	}
+	queueSend(state, pending, data, options, callback);
+}
+function queueSend(state, pending, data, options, callback) {
+	const failure = resolveCallback(options, callback);
+	if (isBlob(data)) {
+		settle(state, pending, failure, () => framePayload(state, data, options, callback));
+		return;
+	}
+	const payload = toPayload(data);
+	settle(state, pending, failure, () => frameResolved(state, payload, options, failure));
+}
+function settle(state, pending, failure, work) {
+	const run = () => {
+		try {
+			work();
+		} catch (error) {
+			const reported = error instanceof Error ? error : createError("ERR_INVALID_STATE", String(error));
+			if (typeof failure === "function") defer(failure, reported);
+			else reportWithoutClosing(state, reported);
+		}
+	};
+	pending.then(run, run);
+}
+//#endregion
 //#region src/compat/socket/record.ts
 const BINARY_TYPE_VALUES = [
 	"nodebuffer",
@@ -3110,6 +3142,7 @@ function follow(attempt, request, response, location) {
 	}
 	if (next.authority !== attempt.address.authority && listenerCount(attempt) === 0) {
 		stripCredentials(attempt.handshake.request.headers);
+		stripCredentials(attempt.options.headers);
 		attempt.auth = void 0;
 	}
 	request.abort();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ventiws",
-  "version": "1.0.0-rc.0",
+  "version": "1.0.0-rc.1",
   "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": {
@@ -34,10 +34,10 @@
     "node": ">=22.12.0"
   },
   "optionalDependencies": {
-    "@ventiws/binding-darwin-arm64": "1.0.0-rc.0",
-    "@ventiws/binding-darwin-x64": "1.0.0-rc.0",
-    "@ventiws/binding-linux-arm64-gnu": "1.0.0-rc.0",
-    "@ventiws/binding-linux-x64-gnu": "1.0.0-rc.0",
-    "@ventiws/binding-linux-x64-musl": "1.0.0-rc.0"
+    "@ventiws/binding-darwin-arm64": "1.0.0-rc.1",
+    "@ventiws/binding-darwin-x64": "1.0.0-rc.1",
+    "@ventiws/binding-linux-arm64-gnu": "1.0.0-rc.1",
+    "@ventiws/binding-linux-x64-gnu": "1.0.0-rc.1",
+    "@ventiws/binding-linux-x64-musl": "1.0.0-rc.1"
   }
 }