svelte-adapter-uws 0.4.12 → 0.4.14

package/files/handler.js

@@ -12,7 +12,7 @@ import { manifest, prerendered, base } from 'MANIFEST';
 import { env } from 'ENV';
 import * as wsModule from 'WS_HANDLER';
 import { parseCookies, createCookies } from './cookies.js';
-import { mimeLookup, parse_as_bytes, parse_origin } from './utils.js';
+import { mimeLookup, parse_as_bytes, parse_origin, writeChunkWithBackpressure } from './utils.js';
 
 /* global ENV_PREFIX */
 /* global PRECOMPRESS */
@@ -1209,11 +1209,11 @@ async function writeResponse(res, response, state, acceptEncoding) {
 			return;
 		}
 
-		// Multi-chunk streaming response - write headers + first two chunks in one cork.
-		// cork() batches these writes into a single syscall, so backpressure from
-		// individual res.write() calls inside cork is not actionable  - the data is
-		// buffered and flushed together when cork returns. The backpressure loop
-		// below handles all subsequent chunks.
+		// Multi-chunk streaming response. Headers + first two chunks share one
+		// cork so they flush as a single syscall. Subsequent chunks are each
+		// written inside their own cork via writeChunkWithBackpressure, which
+		// also captures the drain signal from res.write() without tripping the
+		// uWS "writes must be made from within a corked callback" warning.
 		if (state.aborted) return;
 		streaming = true;
 		res.cork(() => {
@@ -1222,17 +1222,13 @@ async function writeResponse(res, response, state, acceptEncoding) {
 			res.write(second.value);
 		});
 
-		// Stream remaining chunks with backpressure (30s timeout per drain)
 		for (;;) {
 			const { done, value } = await reader.read();
 			if (done || state.aborted) break;
 
-			const ok = res.write(value);
-			if (!ok) {
-				const drained = await new Promise((resolve) => {
-					const timer = setTimeout(() => resolve(false), 30000);
-					res.onWritable(() => { clearTimeout(timer); resolve(true); return true; });
-				});
+			const result = writeChunkWithBackpressure(res, value);
+			if (result !== true) {
+				const drained = await result;
 				if (!drained) { streamTimedOut = true; break; }
 				if (state.aborted) break;
 			}
@@ -1243,7 +1239,7 @@ async function writeResponse(res, response, state, acceptEncoding) {
 				// Backpressure drained past the 30s deadline. Abruptly close the
 				// connection rather than sending a clean EOF on a partial body,
 				// which would look like a successful but truncated response.
-				res.close();
+				res.cork(() => res.close());
 			} else {
 				res.cork(() => res.end());
 			}
@@ -1657,7 +1653,9 @@ if (WS_ENABLED) {
 			// no cookie parsing). Inject remoteAddress so plugins/ratelimit can
 			// key on the real client IP via ws.getUserData().remoteAddress.
 			if (!wsModule.upgrade) {
-				res.upgrade({ remoteAddress: clientIp }, secKey, secProtocol, secExtensions, context);
+				res.cork(() => {
+					res.upgrade({ remoteAddress: clientIp }, secKey, secProtocol, secExtensions, context);
+				});
 				return;
 			}
 
@@ -1727,23 +1725,25 @@ if (WS_ENABLED) {
 					}
 					const ud = userData || {};
 					if (!ud.remoteAddress) ud.remoteAddress = clientIp;
-					if (responseHeaders) {
-						maybeWarnSetCookieOnUpgrade(responseHeaders);
-						for (const [hk, hv] of Object.entries(responseHeaders)) {
-							if (Array.isArray(hv)) {
-								for (const v of hv) res.writeHeader(hk, v);
-							} else {
-								res.writeHeader(hk, hv);
+					if (responseHeaders) maybeWarnSetCookieOnUpgrade(responseHeaders);
+					res.cork(() => {
+						if (responseHeaders) {
+							for (const [hk, hv] of Object.entries(responseHeaders)) {
+								if (Array.isArray(hv)) {
+									for (const v of hv) res.writeHeader(hk, v);
+								} else {
+									res.writeHeader(hk, hv);
+								}
 							}
 						}
-					}
-					res.upgrade(
-						ud,
-						secKey,
-						secProtocol,
-						secExtensions,
-						context
-					);
+						res.upgrade(
+							ud,
+							secKey,
+							secProtocol,
+							secExtensions,
+							context
+						);
+					});
 				})
 				.catch((err) => {
 					clearTimeout(timer);

package/files/utils.js

@@ -111,6 +111,40 @@ export function parse_as_bytes(value) {
 	return Number(multiplier !== 1 ? normalized.slice(0, -1) : normalized) * multiplier;
 }
 
+/**
+ * Write a chunk to a uWS HttpResponse inside a cork and, if backpressure
+ * builds, return a Promise that resolves when the socket drains or the
+ * timeout elapses. Returns `true` synchronously when no drain is needed.
+ *
+ * All uWS response mutations (write + onWritable registration) happen
+ * inside the cork callback, which uWS invokes synchronously, so the
+ * boolean return value of `res.write()` is captured correctly.
+ *
+ * @param {{ cork: (fn: () => void) => void, write: (value: any) => boolean, onWritable: (fn: () => boolean) => void }} res
+ * @param {any} value
+ * @param {number} [timeoutMs]
+ * @returns {true | Promise<boolean>} true if the write succeeded without drain; otherwise a promise that resolves true on drain or false on timeout.
+ */
+export function writeChunkWithBackpressure(res, value, timeoutMs = 30000) {
+	let ok = false;
+	/** @type {Promise<boolean> | null} */
+	let drainPromise = null;
+	res.cork(() => {
+		ok = res.write(value);
+		if (!ok) {
+			drainPromise = new Promise((resolve) => {
+				const timer = setTimeout(() => resolve(false), timeoutMs);
+				res.onWritable(() => {
+					clearTimeout(timer);
+					resolve(true);
+					return true;
+				});
+			});
+		}
+	});
+	return ok ? true : /** @type {Promise<boolean>} */ (drainPromise);
+}
+
 /**
  * @param {string | undefined} value
  * @returns {string | undefined}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-adapter-uws",
-  "version": "0.4.12",
+  "version": "0.4.14",
   "description": "SvelteKit adapter for uWebSockets.js - high-performance C++ HTTP server with built-in WebSocket support",
   "author": "Kevin Radziszewski",
   "license": "MIT",

package/testing.js

@@ -115,7 +115,9 @@ export async function createTestServer(options = {}) {
 			const rawIp = new TextDecoder().decode(res.getRemoteAddressAsText());
 
 			if (!handler.upgrade) {
-				res.upgrade({ remoteAddress: rawIp }, secKey, secProtocol, secExtensions, context);
+				res.cork(() => {
+					res.upgrade({ remoteAddress: rawIp }, secKey, secProtocol, secExtensions, context);
+				});
 				return;
 			}
 
@@ -143,16 +145,18 @@ export async function createTestServer(options = {}) {
 						userData = result || {};
 					}
 					if (!userData.remoteAddress) userData.remoteAddress = rawIp;
-					if (responseHeaders) {
-						for (const [hk, hv] of Object.entries(responseHeaders)) {
-							if (Array.isArray(hv)) {
-								for (const v of hv) res.writeHeader(hk, v);
-							} else {
-								res.writeHeader(hk, hv);
+					res.cork(() => {
+						if (responseHeaders) {
+							for (const [hk, hv] of Object.entries(responseHeaders)) {
+								if (Array.isArray(hv)) {
+									for (const v of hv) res.writeHeader(hk, v);
+								} else {
+									res.writeHeader(hk, hv);
+								}
 							}
 						}
-					}
-					res.upgrade(userData, secKey, secProtocol, secExtensions, context);
+						res.upgrade(userData, secKey, secProtocol, secExtensions, context);
+					});
 				})
 				.catch((err) => {
 					if (!aborted) {