feat: support SvelteKit 1.0.0-next.234 (#29)

* update adapter to support sveltekit 1.0.0-next.234

* Refactor request/response creation

* Missing await

Co-authored-by: Geoff Rich <[email protected]>

Author: biltongza

files/entry.js

@@ -20,38 +20,62 @@ const app = new App(manifest);
  * @param {Context} context
  */
 export async function index(context) {
+	const request = toRequest(context);
+
+	if (debug) {
+		context.log(`Request: ${JSON.stringify(request)}`);
+	}
+
+	const rendered = await app.render(request);
+	const response = await toResponse(rendered);
+
+	if (debug) {
+		context.log(`Response: ${JSON.stringify(response)}`);
+	}
+
+	context.res = response;
+}
+
+/**
+ * @param {Context} context
+ * @returns {Request}
+ * */
+function toRequest(context) {
 	const { method, headers, rawBody: body } = context.req;
 	// because we proxy all requests to the render function, the original URL in the request is /api/__render
 	// this header contains the URL the user requested
 	const originalUrl = headers['x-ms-original-url'];
-	const url = new URL(originalUrl);
 
-	const rawBody = typeof body === 'string' ? Buffer.from(body, 'utf-8') : body;
-	const request = {
-		url,
+	/** @type {RequestInit} */
+	const init = {
 		method,
-		headers,
-		rawBody
+		headers: new Headers(headers)
 	};
 
-	if (debug) {
-		context.log(`Request: ${JSON.stringify(request)}`);
+	if (method !== 'GET' && method !== 'HEAD') {
+		init.body = typeof body === 'string' ? Buffer.from(body, 'utf-8') : body;
 	}
 
-	const rendered = await app.render(request);
+	return new Request(originalUrl, init);
+}
+
+/**
+ * @param {Response} rendered
+ * @returns {Promise<Record<string, any>>}
+ */
+async function toResponse(rendered) {
+	const { status } = rendered;
+	const resBody = await rendered.text();
 
-	const { status, headers: resHeaders, body: resBody } = rendered;
+	/** @type {Record<string, string>} */
+	const resHeaders = {};
+	rendered.headers.forEach((value, key) => {
+		resHeaders[key] = value;
+	});
 
-	const response = {
+	return {
 		status,
 		body: resBody,
-		headers: resHeaders,
-		rawBody
+		headers: resHeaders
 	};
-
-	if (debug) {
-		context.log(`Response: ${JSON.stringify(response)}`);
-	}
-
-	context.res = response;
 }

package-lock.json

@@ -27,11 +27,11 @@
 		"url": "https://github.com/geoffrich/svelte-adapter-azure-swa/issues"
 	},
 	"peerDependencies": {
-		"@sveltejs/kit": "^1.0.0-next.218"
+		"@sveltejs/kit": "^1.0.0-next.234"
 	},
 	"devDependencies": {
 		"@azure/functions": "^1.2.3",
-		"@sveltejs/kit": "^1.0.0-next.218",
+		"@sveltejs/kit": "^1.0.0-next.234",
 		"@types/node": "^17.0.5",
 		"prettier": "^2.4.1"
 	},