Breaking: use Request and Response objects in endpoints and hooks

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

@@ -50,46 +50,18 @@ async function handle(event) {
 
 	// dynamically-generated pages
 	try {
-		const rendered = await app.render({
+		return await app.render({
 			url: request.url,
 			rawBody: await read(request),
 			headers: Object.fromEntries(request.headers),
 			method: request.method
 		});
-
-		if (rendered) {
-			return new Response(rendered.body, {
-				status: rendered.status,
-				headers: make_headers(rendered.headers)
-			});
-		}
 	} catch (e) {
 		return new Response('Error rendering route:' + (e.message || e.toString()), { status: 500 });
 	}
-
-	return new Response('Not Found', {
-		status: 404,
-		statusText: 'Not Found'
-	});
 }
 
 /** @param {Request} request */
 async function read(request) {
 	return new Uint8Array(await request.arrayBuffer());
 }
-
-/** @param {Record<string, string | string[]>} headers */
-function make_headers(headers) {
-	const result = new Headers();
-	for (const header in headers) {
-		const value = headers[header];
-		if (typeof value === 'string') {
-			result.set(header, value);
-			continue;
-		}
-		for (const sub of value) {
-			result.append(header, sub);
-		}
-	}
-	return result;
-}

packages/adapter-cloudflare/files/worker.js

@@ -45,41 +45,14 @@ export default {
 
 		// dynamically-generated pages
 		try {
-			const rendered = await app.render({
+			return await app.render({
 				url,
 				rawBody: new Uint8Array(await req.arrayBuffer()),
 				headers: Object.fromEntries(req.headers),
 				method: req.method
 			});
-
-			if (rendered) {
-				return new Response(rendered.body, {
-					status: rendered.status,
-					headers: make_headers(rendered.headers)
-				});
-			}
 		} catch (e) {
 			return new Response('Error rendering route: ' + (e.message || e.toString()), { status: 500 });
 		}
-
-		return new Response({
-			status: 404,
-			statusText: 'Not Found'
-		});
 	}
 };
-
-function make_headers(headers) {
-	const result = new Headers();
-	for (const header in headers) {
-		const value = headers[header];
-		if (typeof value === 'string') {
-			result.set(header, value);
-			continue;
-		}
-		for (const sub of value) {
-			result.append(header, sub);
-		}
-	}
-	return result;
-}

packages/adapter-netlify/src/handler.js

@@ -25,18 +25,12 @@ export function init(manifest) {
 			rawBody
 		});
 
-		if (!rendered) {
-			return {
-				statusCode: 404,
-				body: 'Not found'
-			};
-		}
-
 		const partial_response = {
 			statusCode: rendered.status,
 			...split_headers(rendered.headers)
 		};
 
+		// TODO this is probably wrong now?
 		if (rendered.body instanceof Uint8Array) {
 			// Function responses should be strings (or undefined), and responses with binary
 			// content should be base64 encoded and set isBase64Encoded to true.
@@ -50,14 +44,14 @@ export function init(manifest) {
 
 		return {
 			...partial_response,
-			body: rendered.body
+			body: await rendered.text()
 		};
 	};
 }
 
 /**
  * Splits headers into two categories: single value and multi value
- * @param {Record<string, string | string[]>} headers
+ * @param {Headers} headers
  * @returns {{
  *   headers: Record<string, string>,
  *   multiValueHeaders: Record<string, string[]>
@@ -70,11 +64,14 @@ function split_headers(headers) {
 	/** @type {Record<string, string[]>} */
 	const m = {};
 
-	for (const key in headers) {
-		const value = headers[key];
-		const target = Array.isArray(value) ? m : h;
-		target[key] = value;
-	}
+	headers.forEach((value, key) => {
+		if (key === 'set-cookie') {
+			m[key] = value.split(', ');
+		} else {
+			h[key] = value;
+		}
+	});
+
 	return {
 		headers: h,
 		multiValueHeaders: m

packages/adapter-node/src/handler.js

@@ -11,7 +11,7 @@ import { manifest } from 'MANIFEST';
 
 __fetch_polyfill();
 
-const app = new App(manifest);
+const app = /** @type {import('@sveltejs/kit').App} */ (new App(manifest));
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -47,15 +47,13 @@ const ssr = async (req, res) => {
 	const rendered = await app.render({
 		url: req.url,
 		method: req.method,
-		headers: req.headers, // TODO: what about repeated headers, i.e. string[]
+		headers: req.headers,
 		rawBody: body
 	});
 
 	if (rendered) {
-		res.writeHead(rendered.status, rendered.headers);
-		if (rendered.body) {
-			res.write(rendered.body);
-		}
+		res.writeHead(rendered.status, Object.fromEntries(rendered.headers));
+		if (rendered.body) res.write(new Uint8Array(await rendered.arrayBuffer()));
 		res.end();
 	} else {
 		res.statusCode = 404;

packages/adapter-vercel/files/entry.js

@@ -5,13 +5,13 @@ import { manifest } from 'MANIFEST';
 
 __fetch_polyfill();
 
-const app = new App(manifest);
+const app = /** @type {import('@sveltejs/kit').App} */ (new App(manifest));
 
 export default async (req, res) => {
-	let body;
+	let rawBody;
 
 	try {
-		body = await getRawBody(req);
+		rawBody = await getRawBody(req);
 	} catch (err) {
 		res.statusCode = err.status || 400;
 		return res.end(err.reason || 'Invalid request body');
@@ -21,13 +21,9 @@ export default async (req, res) => {
 		url: req.url,
 		method: req.method,
 		headers: req.headers,
-		rawBody: body
+		rawBody
 	});
 
-	if (rendered) {
-		const { status, headers, body } = rendered;
-		return res.writeHead(status, headers).end(body);
-	}
-
-	return res.writeHead(404).end();
+	res.writeHead(rendered.status, Object.fromEntries(rendered.headers));
+	res.end(await rendered.arrayBuffer());
 };

packages/kit/src/core/adapt/prerender/prerender.js

@@ -4,7 +4,6 @@ import { pathToFileURL, URL } from 'url';
 import { mkdirp } from '../../../utils/filesystem.js';
 import { __fetch_polyfill } from '../../../install-fetch.js';
 import { SVELTE_KIT } from '../../constants.js';
-import { get_single_valued_header } from '../../../utils/http.js';
 import { is_root_relative, resolve } from '../../../utils/url.js';
 import { queue } from './queue.js';
 import { crawl } from './crawl.js';
@@ -150,8 +149,7 @@ export async function prerender({ cwd, out, log, config, build_data, fallback, a
 
 		if (rendered) {
 			const response_type = Math.floor(rendered.status / 100);
-			const headers = rendered.headers;
-			const type = headers && headers['content-type'];
+			const type = rendered.headers.get('content-type');
 			const is_html = response_type === REDIRECT || type === 'text/html';
 
 			const parts = decoded_path.split('/');
@@ -162,7 +160,7 @@ export async function prerender({ cwd, out, log, config, build_data, fallback, a
 			const file = `${out}${parts.join('/')}`;
 
 			if (response_type === REDIRECT) {
-				const location = get_single_valued_header(headers, 'location');
+				const location = rendered.headers.get('location');
 
 				if (location) {
 					mkdirp(dirname(file));
@@ -185,7 +183,7 @@ export async function prerender({ cwd, out, log, config, build_data, fallback, a
 				mkdirp(dirname(file));
 
 				log.info(`${rendered.status} ${decoded_path}`);
-				writeFileSync(file, rendered.body || '');
+				writeFileSync(file, await rendered.text());
 				paths.push(normalize(decoded_path));
 			} else if (response_type !== OK) {
 				error({ status: rendered.status, path, referrer, referenceType: 'linked' });
@@ -222,7 +220,7 @@ export async function prerender({ cwd, out, log, config, build_data, fallback, a
 			});
 
 			if (is_html && config.kit.prerender.crawl) {
-				for (const href of crawl(/** @type {string} */ (rendered.body))) {
+				for (const href of crawl(await rendered.text())) {
 					if (href.startsWith('data:') || href.startsWith('#')) continue;
 
 					const resolved = resolve(path, href);
@@ -283,7 +281,7 @@ export async function prerender({ cwd, out, log, config, build_data, fallback, a
 
 		const file = join(out, fallback);
 		mkdirp(dirname(file));
-		writeFileSync(file, rendered.body || '');
+		writeFileSync(file, await rendered.text());
 	}
 
 	return {

packages/kit/src/core/adapt/test/fixtures/prerender/.svelte-kit/output/server/app.js

@@ -1,12 +1,11 @@
 export class App {
 	render() {
-		return {
+		return new Response('', {
 			status: 200,
 			headers: {
 				'content-type': 'text/html'
-			},
-			body: ''
-		};
+			}
+		});
 	}
 }
 

packages/kit/src/core/build/build_server.js

@@ -84,7 +84,7 @@ export class App {
 		};
 	}
 
-	render(request, {
+	async render(request, {
 		prerender
 	} = {}) {
 		// TODO remove this for 1.0
@@ -105,7 +105,8 @@ export class App {
 				: 'default_protocol'
 		};
 
-		return respond({ ...request, url: new URL(request.url, protocol + '://' + host) }, this.options, { prerender });
+		const { status, headers, body } = await respond({ ...request, url: new URL(request.url, protocol + '://' + host) }, this.options, { prerender });
+		return new Response(body, { status, headers });
 	}
 }
 `;

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

@@ -100,8 +100,8 @@ export async function preview({
 				}));
 
 			if (rendered) {
-				res.writeHead(rendered.status, rendered.headers);
-				if (rendered.body) res.write(rendered.body);
+				res.writeHead(rendered.status, Object.fromEntries(rendered.headers));
+				if (rendered.body) res.write(new Uint8Array(await rendered.arrayBuffer()));
 				res.end();
 			} else {
 				res.statusCode = 404;

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

@@ -8,7 +8,7 @@ import { hash } from '../hash.js';
 import { get_single_valued_header } from '../../utils/http.js';
 import { coalesce_to_error } from '../../utils/error.js';
 
-/** @type {import('@sveltejs/kit/ssr').Respond} */
+/** @type {import('types/internal').Respond} */
 export async function respond(incoming, options, state = {}) {
 	if (incoming.url.pathname !== '/' && options.trailing_slash !== 'ignore') {
 		const has_trailing_slash = incoming.url.pathname.endsWith('/');

packages/kit/types/ambient-modules.d.ts

@@ -183,20 +183,6 @@ declare module '@sveltejs/kit/node' {
 	export const getRawBody: GetRawBody;
 }
 
-declare module '@sveltejs/kit/ssr' {
-	import { IncomingRequest, Response } from '@sveltejs/kit';
-	// TODO import from public types, right now its heavily coupled with internal
-	type Options = import('@sveltejs/kit/types/internal').SSRRenderOptions;
-	type State = import('@sveltejs/kit/types/internal').SSRRenderState;
-
-	export interface Respond {
-		(incoming: IncomingRequest & { url: URL }, options: Options, state?: State): Promise<
-			Response | undefined
-		>;
-	}
-	export const respond: Respond;
-}
-
 declare module '@sveltejs/kit/install-fetch' {
 	import fetch, { Headers, Request, Response } from 'node-fetch';
 

packages/kit/types/app.d.ts

@@ -1,10 +1,9 @@
 import { ReadOnlyFormData, RequestHeaders } from './helper';
-import { ServerResponse } from './hooks';
 import { PrerenderOptions, SSRNodeLoader, SSRRoute } from './internal';
 
 export class App {
 	constructor(manifest: SSRManifest);
-	render(incoming: IncomingRequest): Promise<ServerResponse>;
+	render(incoming: IncomingRequest): Promise<Response>;
 }
 
 export class InternalApp extends App {
@@ -13,7 +12,7 @@ export class InternalApp extends App {
 		options?: {
 			prerender: PrerenderOptions;
 		}
-	): Promise<ServerResponse>;
+	): Promise<Response>;
 }
 
 export type RawBody = null | Uint8Array;

packages/kit/types/internal.d.ts

@@ -1,6 +1,6 @@
 import { OutputAsset, OutputChunk } from 'rollup';
 import { RequestHandler } from './endpoint';
-import { InternalApp, SSRManifest } from './app';
+import { IncomingRequest, InternalApp, SSRManifest } from './app';
 import {
 	ExternalFetch,
 	GetSession,
@@ -235,3 +235,11 @@ export interface MethodOverride {
 	parameter: string;
 	allowed: string[];
 }
+
+export interface Respond {
+	(
+		incoming: IncomingRequest & { url: URL },
+		options: SSRRenderOptions,
+		state?: SSRRenderState
+	): Promise<ServerResponse | undefined>;
+}