[fix] Default body parsing to binary

.changeset/dry-jokes-explain.md

@@ -0,0 +1,7 @@
+---
+'@sveltejs/adapter-cloudflare-workers': patch
+'@sveltejs/adapter-netlify': patch
+'@sveltejs/kit': patch
+---
+
+Default body parsing to binary

packages/adapter-cloudflare-workers/files/entry.js

@@ -1,7 +1,7 @@
 // TODO hardcoding the relative location makes this brittle
 import { init, render } from '../output/server/app.js'; // eslint-disable-line import/no-unresolved
 import { getAssetFromKV, NotFoundError } from '@cloudflare/kv-asset-handler'; // eslint-disable-line import/no-unresolved
-import { isContentTypeBinary } from '@sveltejs/kit/adapter-utils'; // eslint-disable-line import/no-unresolved
+import { isContentTypeTextual } from '@sveltejs/kit/adapter-utils'; // eslint-disable-line import/no-unresolved
 
 init();
 
@@ -58,9 +58,9 @@ async function handle(event) {
 /** @param {Request} request */
 async function read(request) {
 	const type = request.headers.get('content-type') || '';
-	if (isContentTypeBinary(type)) {
-		return new Uint8Array(await request.arrayBuffer());
+	if (isContentTypeTextual(type)) {
+		return request.text();
 	}
 
-	return request.text();
+	return new Uint8Array(await request.arrayBuffer());
 }

packages/adapter-netlify/files/entry.js

@@ -1,6 +1,6 @@
 // TODO hardcoding the relative location makes this brittle
 import { init, render } from '../output/server/app.js'; // eslint-disable-line import/no-unresolved
-import { isContentTypeBinary } from '@sveltejs/kit/adapter-utils'; // eslint-disable-line import/no-unresolved
+import { isContentTypeTextual } from '@sveltejs/kit/adapter-utils'; // eslint-disable-line import/no-unresolved
 
 init();
 
@@ -11,11 +11,11 @@ export async function handler(event) {
 
 	const type = headers['content-type'];
 	const rawBody =
-		type && isContentTypeBinary(type)
-			? new TextEncoder('base64').encode(body)
-			: isBase64Encoded
-			? Buffer.from(body, 'base64').toString()
-			: body;
+		type && isContentTypeTextual(type)
+			? isBase64Encoded
+				? Buffer.from(body, 'base64').toString()
+				: body
+			: new TextEncoder('base64').encode(body);
 
 	const rendered = await render({
 		method: httpMethod,

packages/kit/src/core/adapter-utils.js

@@ -1,16 +1,18 @@
 /**
- * Decides how the body should be parsed based on its mime type.
+ * Decides how the body should be parsed based on its mime type. Should match what's in parse_body
  *
  * This is intended to be used with both requests and responses, to have a consistent body parsing across adapters.
  *
- * @param {string} content_type The `content-type` header of a request/response.
+ * @param {string?} content_type The `content-type` header of a request/response.
  * @returns {boolean}
  */
-export function isContentTypeBinary(content_type) {
+export function isContentTypeTextual(content_type) {
+	if (!content_type) return true; // defaults to json
+	const [type] = content_type.split(';'); // get the mime type
 	return (
-		content_type.startsWith('image/') ||
-		content_type.startsWith('audio/') ||
-		content_type.startsWith('video/') ||
-		content_type.startsWith('application/octet-stream')
+		type === 'text/plain' ||
+		type === 'application/json' ||
+		type === 'application/x-www-form-urlencoded' ||
+		type === 'multipart/form-data'
 	);
 }

packages/kit/src/core/node/index.js

@@ -1,4 +1,4 @@
-import { isContentTypeBinary } from '../adapter-utils.js';
+import { isContentTypeTextual } from '../adapter-utils.js';
 
 /**
  * @param {import('http').IncomingMessage} req
@@ -50,12 +50,12 @@ export function getRawBody(req) {
 		req.on('end', () => {
 			const [type] = h['content-type'].split(/;\s*/);
 
-			if (isContentTypeBinary(type)) {
-				return fulfil(data);
+			if (isContentTypeTextual(type)) {
+				const encoding = h['content-encoding'] || 'utf-8';
+				fulfil(new TextDecoder(encoding).decode(data));
 			}
 
-			const encoding = h['content-encoding'] || 'utf-8';
-			fulfil(new TextDecoder(encoding).decode(data));
+			return fulfil(data);
 		});
 	});
 }

packages/kit/src/runtime/server/endpoint.js

@@ -1,4 +1,4 @@
-import { isContentTypeBinary } from '../../core/adapter-utils.js';
+import { isContentTypeTextual } from '../../core/adapter-utils.js';
 import { lowercase_keys } from './utils.js';
 
 /** @param {string} body */
@@ -38,18 +38,12 @@ export default async function render_route(request, route) {
 			headers = lowercase_keys(headers);
 			const type = headers['content-type'];
 
-			const is_type_binary = type && isContentTypeBinary(type);
+			const is_type_textual = isContentTypeTextual(type);
 
 			// validation
-			if (is_type_binary && !(body instanceof Uint8Array)) {
+			if (!is_type_textual && !(body instanceof Uint8Array)) {
 				return error(
-					`${preface}: body must be an instance of Uint8Array if content type is image/*, audio/*, video/* or application/octet-stream`
-				);
-			}
-
-			if (body instanceof Uint8Array && !is_type_binary) {
-				return error(
-					`${preface}: Uint8Array body must have content-type header of image/*, audio/*, video/* or application/octet-stream`
+					`${preface}: body must be an instance of Uint8Array if content-type is not a supported textual content-type`
 				);
 			}