update adapters

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));
+ res.write(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());
 };