feat: new rawBody type on SvelteKit req

.tool-versions

@@ -1,4 +1,4 @@
-firebase 9.10.2
-nodejs 14.17.0
-pnpm 6.3.0
+firebase 9.16.5
+nodejs 14.17.5
+pnpm 6.13.0
 java openjdk-14.0.2

README.md

@@ -89,7 +89,7 @@ SvelteKit is still in Beta and the Adapter API is in flux, this can result in th
 
 | Adapter Version | SvelteKit Version |
 | --------------- | ----------------- |
-| WIP  | `1.0.0-next.152` |
+| `0.11.x` | `1.0.0-next.152` |
 | `0.10.x` | `1.0.0-next.132` |
 | `0.9.1` | `1.0.0-next.122` |
 | `0.9.0` | `1.0.0-next.120` |

package.json

@@ -35,16 +35,16 @@
  "node": "^14.13.1 || >= 16"
  },
  "dependencies": {
- "esbuild": "^0.11.23",
+ "esbuild": "^0.12.20",
  "kleur": "^4.1.4"
  },
  "peerDependencies": {
- "@sveltejs/kit": "^1.0.0-next.132"
+ "@sveltejs/kit": "^1.0.0-next.152"
  },
  "devDependencies": {
  "@commitlint/cli": "^11.0.0",
  "@commitlint/config-conventional": "^11.0.0",
- "@sveltejs/kit": "1.0.0-next.132",
+ "@sveltejs/kit": "^1.0.0-next.152",
  "@types/express": "^4.17.12",
  "@types/node": "^14.14.35",
  "ava": "^3.15.0",

src/files/handler.js

@@ -1,4 +1,5 @@
 // TODO: hardcoding the relative location makes this brittle
+// @ts-expect-error
 import {init, render} from '../output/server/app.js';
 
 init();
@@ -7,40 +8,45 @@ init();
  * Firebase Cloud Function handler for SvelteKit
  *
  * This function converts the Firebase Cloud Function (Express.js) Request object
- * into a format consumable to the SvelteKit render() function, which is of type
- * SvelteKit `import('types/hooks').StrictBody | null`
+ * into a format consumable to the SvelteKit render() function
  *
  * Relevant documentation - https://firebase.google.com/docs/functions/http-events#read_values_from_the_request
  *
  * @param {import('firebase-functions').https.Request} request
  * @param {import('express').Response} response
  * @returns {Promise<void>}
  */
-const svelteKit = async ({body, headers, method, rawBody, url}, response) => {
- const host = `${headers['x-forwarded-proto']}://${headers.host}`;
- const {pathname, searchParams: searchParameters = ''} = new URL(url || '', host);
+async function svelteKit(request, response) {
+ const rendered = await render(toSvelteKitRequest(request));
 
- const finalRawBody =
- headers['content-type'] === undefined ?
- rawBody :
- (headers['content-type'] === 'application/octet-stream' ?
- body :
- new TextDecoder(headers['content-encoding'] || 'utf-8').decode(rawBody));
+ return rendered ?
+ response.writeHead(rendered.status, rendered.headers).end(rendered.body) :
+ response.writeHead(404, 'Not Found').end();
+}
 
- const rendered = await render({
- method,
- headers,
- path: pathname,
- query: searchParameters,
- rawBody: finalRawBody
- });
-
- if (rendered) {
- const {status, headers, body} = rendered;
- return response.writeHead(status, headers).end(body);
- }
+/**
+ * @param {import('firebase-functions').https.Request} request
+ * @return {import('@sveltejs/kit/types/internal').Incoming}
+ */
+function toSvelteKitRequest(request) {
+ const host = `${request.headers['x-forwarded-proto']}://${request.headers.host}`;
+ const {pathname, searchParams: searchParameters} = new URL(
+ request.url || '',
+ host
+ );
 
- return response.writeHead(404).end();
-};
+ return {
+ // Incoming
+ method: request.method,
+ headers: request.headers,
+ rawBody: new Uint8Array(request.rawBody),
+ // Body: request.body, Why does SvelteKit not use body?
+ // Location
+ host,
+ path: pathname,
+ params: request.params,
+ query: searchParameters
+ };
+}
 
 export default svelteKit;