support urlencoded form data (#4)

* support urlencoded form data

* remove prettierrc

.github/workflows/node.js.yml

@@ -2,9 +2,9 @@ name: Node.js CI
 
 on:
   push:
-    branches: ['main']
+    branches: ["main"]
   pull_request:
-    branches: ['main']
+    branches: ["main"]
 
 jobs:
   test:
@@ -18,7 +18,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          cache: 'npm'
+          cache: "npm"
       - run: npm ci
       - run: npm test
   deploy:

src/index.js

@@ -1,26 +1,36 @@
 const validate = async (request) => {
-	const required = ['subject', 'to'];
+	const required = ["subject", "to"];
 	let data;
 	try {
-		data = (await request.json()) ?? {};
+		if (request.headers.get("content-type") === "application/json") {
+			data = (await request.json()) ?? {};
+		}
+
+		if (
+			request.headers.get("content-type") ===
+			"application/x-www-form-urlencoded"
+		) {
+			data = Object.fromEntries(
+				new URLSearchParams((await request.text()) ?? ""),
+			);
+		}
 	} catch (e) {
 		data = {};
 	}
 
-	data.errors = required.reduce((acc, el) => {
-		if (!data[el]) {
-			return [...acc, `missing required parameter '${el}'`];
-		}
-		return acc;
-	}, []);
+	data.errors = required.reduce(
+		(acc, el) =>
+			data[el] ? acc : [...acc, `missing required parameter '${el}'`],
+		[],
+	);
 
 	return data;
 };
 
 export default {
 	async fetch(request, env, ctx) {
 		const { pathname } = new URL(request.url);
-		if (pathname === '/api/notify') {
+		if (pathname === "/api/notify") {
 			const { subject, to, errors } = await validate(request);
 			const body = {
 				subject,
@@ -30,13 +40,15 @@ export default {
 				...body,
 				...(errors.length && { errors }),
 			};
-			return new Response(JSON.stringify(response), { status: errors.length ? 400 : 200 });
+			return new Response(JSON.stringify(response), {
+				status: errors.length ? 400 : 200,
+			});
 		}
 		return new Response(
 			JSON.stringify(
 				{
-					message: 'Not Found',
-					documentation_url: 'https://www.cinotify.cc/docs',
+					message: "Not Found",
+					documentation_url: "https://www.cinotify.cc/docs",
 				},
 				null,
 				2,

test/index.spec.js

@@ -1,46 +1,76 @@
-import { env, createExecutionContext, waitOnExecutionContext, SELF } from 'cloudflare:test';
-import { describe, it, expect } from 'vitest';
-import worker from '../src';
+import {
+	env,
+	createExecutionContext,
+	waitOnExecutionContext,
+	SELF,
+} from "cloudflare:test";
+import { describe, it, expect } from "vitest";
+import worker from "../src";
 
-const makeRequest = async (request) => {
+const send = async (request) => {
 	const ctx = createExecutionContext();
 	const response = await worker.fetch(request, env, ctx);
 	await waitOnExecutionContext(ctx);
 	return response;
 };
 
-describe('API', () => {
-	it('errors for missing required parameters', async () => {
-		const request = new Request('http://example.com/api/notify', {
-			method: 'POST',
+describe("API", () => {
+	it("errors for missing required parameters", async () => {
+		const request = new Request("http://example.com/api/notify", {
+			method: "POST",
 			headers: {
-				'Content-Type': 'application/json',
+				"Content-Type": "application/json",
 			},
 		});
-		const response = await makeRequest(request);
+		const response = await send(request);
 		expect(await response.json()).toEqual({
-			errors: ["missing required parameter 'subject'", "missing required parameter 'to'"],
+			errors: [
+				"missing required parameter 'subject'",
+				"missing required parameter 'to'",
+			],
 		});
 		expect(response.status).toEqual(400);
 	});
-	it('does not error if the required parameters are present', async () => {
-		const request = new Request('http://example.com/api/notify', {
-			method: 'POST',
-			headers: {
-				'Content-Type': 'application/json',
-			},
-			body: JSON.stringify({
-				to: '[email protected]',
-				subject: 'hello world',
+	it("responds to application/json and application/x-www-form-urlencoded", async () => {
+		const jsonResponse = await send(
+			new Request("http://example.com/api/notify", {
+				method: "POST",
+				headers: {
+					"Content-Type": "application/json",
+				},
+				body: JSON.stringify({
+					to: "[email protected]",
+					subject: "hello world",
+				}),
 			}),
+		);
+		expect(await jsonResponse.json()).toEqual({
+			to: "[email protected]",
+			subject: "hello world",
 		});
-		const response = await makeRequest(request);
-		expect(await response.json()).toEqual(expect.not.objectContaining({ errors: [] }));
-		expect(response.status).toEqual(200);
+		expect(jsonResponse.status).toEqual(200);
+
+		const formResponse = await send(
+			new Request("http://example.com/api/notify", {
+				method: "POST",
+				headers: {
+					"Content-Type": "application/x-www-form-urlencoded",
+				},
+				body: "[email protected]&subject=hello world",
+			}),
+		);
+		expect(await formResponse.json()).toEqual({
+			to: "[email protected]",
+			subject: "hello world",
+		});
+		expect(formResponse.status).toEqual(200);
+
+		expect.assertions(4);
 	});
-	it('404s for undefined routes', async () => {
-		const request = new Request('http://example.com/undefined-route');
-		const response = await makeRequest(request);
+
+	it("404s for undefined routes", async () => {
+		const request = new Request("http://example.com/undefined-route");
+		const response = await send(request);
 		expect(response.status).toEqual(404);
 	});
 });

vitest.config.js

@@ -1,10 +1,10 @@
-import { defineWorkersConfig } from '@cloudflare/vitest-pool-workers/config';
+import { defineWorkersConfig } from "@cloudflare/vitest-pool-workers/config";
 
 export default defineWorkersConfig({
 	test: {
 		poolOptions: {
 			workers: {
-				wrangler: { configPath: './wrangler.toml' },
+				wrangler: { configPath: "./wrangler.toml" },
 			},
 		},
 	},