@sveltejs/kit 1.0.0-next.478 → 1.0.0-next.480

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.478",
+  "version": "1.0.0-next.480",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

package/src/exports/node/index.js

@@ -1,7 +1,10 @@
 import * as set_cookie_parser from 'set-cookie-parser';
 
-/** @param {import('http').IncomingMessage} req */
-function get_raw_body(req) {
+/**
+ * @param {import('http').IncomingMessage} req
+ * @param {number} [body_size_limit]
+ */
+function get_raw_body(req, body_size_limit) {
 	const h = req.headers;
 
 	if (!h['content-type']) {
@@ -11,11 +14,26 @@ function get_raw_body(req) {
 	const length = Number(h['content-length']);
 
 	// check if no request body
-	// https://github.com/jshttp/type-is/blob/c1f4388c71c8a01f79934e68f630ca4a15fffcd6/index.js#L81-L95
-	if (isNaN(length) && h['transfer-encoding'] == null) {
+	if (
+		(req.httpVersionMajor === 1 && isNaN(length) && h['transfer-encoding'] == null) ||
+		length === 0
+	) {
 		return null;
 	}
 
+	if (body_size_limit) {
+		if (!length) {
+			throw new Error(
+				`Received content-length of ${length}. content-length must be provided when body size limit is specified.`
+			);
+		}
+		if (length > body_size_limit) {
+			throw new Error(
+				`Received content-length of ${length}, but only accept up to ${body_size_limit} bytes.`
+			);
+		}
+	}
+
 	if (req.destroyed) {
 		const readable = new ReadableStream();
 		readable.cancel();
@@ -65,9 +83,9 @@ function get_raw_body(req) {
 }
 
 /** @type {import('@sveltejs/kit/node').getRequest} */
-export async function getRequest(base, req) {
-	let headers = /** @type {Record<string, string>} */ (req.headers);
-	if (req.httpVersionMajor === 2) {
+export async function getRequest({ request, base, bodySizeLimit }) {
+	let headers = /** @type {Record<string, string>} */ (request.headers);
+	if (request.httpVersionMajor === 2) {
 		// we need to strip out the HTTP/2 pseudo-headers because node-fetch's
 		// Request implementation doesn't like them
 		// TODO is this still true with Node 18
@@ -78,10 +96,10 @@ export async function getRequest(base, req) {
 		delete headers[':scheme'];
 	}
 
-	return new Request(base + req.url, {
-		method: req.method,
+	return new Request(base + request.url, {
+		method: request.method,
 		headers,
-		body: get_raw_body(req)
+		body: get_raw_body(request, bodySizeLimit)
 	});
 }
 

package/src/exports/vite/dev/index.js

@@ -391,10 +391,13 @@ export async function dev(vite, vite_config, svelte_config) {
 				let request;
 
 				try {
-					request = await getRequest(base, req);
+					request = await getRequest({
+						base,
+						request: req
+					});
 				} catch (/** @type {any} */ err) {
 					res.statusCode = err.status || 400;
-					return res.end(err.reason || 'Invalid request body');
+					return res.end(err.message || 'Invalid request body');
 				}
 
 				const template = load_template(cwd, svelte_config);

package/src/exports/vite/preview/index.js

@@ -131,10 +131,13 @@ export async function preview(vite, vite_config, svelte_config) {
 			let request;
 
 			try {
-				request = await getRequest(`${protocol}://${host}`, req);
+				request = await getRequest({
+					base: `${protocol}://${host}`,
+					request: req
+				});
 			} catch (/** @type {any} */ err) {
 				res.statusCode = err.status || 400;
-				return res.end(err.reason || 'Invalid request body');
+				return res.end(err.message || 'Invalid request body');
 			}
 
 			setResponse(

package/src/runtime/app/forms.js

@@ -19,7 +19,7 @@ export const applyAction = ssr ? guard('applyAction') : client.apply_action;
 export function enhance(form, submit = () => {}) {
 	/**
 	 * @param {{
-	 *   action: string;
+	 *   action: URL;
 	 *   result: import('types').ActionResult;
 	 * }} opts
 	 */
@@ -28,7 +28,7 @@ export function enhance(form, submit = () => {}) {
 			await invalidateAll();
 		}
 
-		if (location.origin + location.pathname === action.split('?')[0]) {
+		if (location.origin + location.pathname === action.origin + action.pathname) {
 			applyAction(result);
 		}
 	};
@@ -37,10 +37,13 @@ export function enhance(form, submit = () => {}) {
 	async function handle_submit(event) {
 		event.preventDefault();
 
-		// We can't do submitter.formAction directly because that property is always set
-		const action = event.submitter?.hasAttribute('formaction')
-			? /** @type {HTMLButtonElement | HTMLInputElement} */ (event.submitter).formAction
-			: form.action;
+		const action = new URL(
+			// We can't do submitter.formAction directly because that property is always set
+			event.submitter?.hasAttribute('formaction')
+				? /** @type {HTMLButtonElement | HTMLInputElement} */ (event.submitter).formAction
+				: form.action
+		);
+
 		const data = new FormData(form);
 		const controller = new AbortController();
 

package/types/ambient.d.ts

@@ -99,7 +99,7 @@ declare module '$app/forms' {
 		Success extends Record<string, unknown> | undefined = Record<string, any>,
 		Invalid extends Record<string, unknown> | undefined = Record<string, any>
 	> = (input: {
-		action: string;
+		action: URL;
 		data: FormData;
 		form: HTMLFormElement;
 		controller: AbortController;
@@ -108,7 +108,7 @@ declare module '$app/forms' {
 		| void
 		| ((opts: {
 				form: HTMLFormElement;
-				action: string;
+				action: URL;
 				result: ActionResult<Success, Invalid>;
 		  }) => void);
 
@@ -408,10 +408,11 @@ declare module '@sveltejs/kit/node/polyfills' {
  * Utilities used by adapters for Node-like environments.
  */
 declare module '@sveltejs/kit/node' {
-	export function getRequest(
-		base: string,
-		request: import('http').IncomingMessage
-	): Promise<Request>;
+	export function getRequest(opts: {
+		base: string;
+		request: import('http').IncomingMessage;
+		bodySizeLimit?: number;
+	}): Promise<Request>;
 	export function setResponse(res: import('http').ServerResponse, response: Response): void;
 }