Simplify multipart requests by dropping manually encoding (#122)

* Remove `express-fileupload` package

* Drop manually encoding multipart requests

Author: fluiddot

package-lock.json

@@ -47,7 +47,6 @@
 		"@timfish/forge-externals-plugin": "^0.2.1",
 		"@types/archiver": "^6.0.2",
 		"@types/ejs": "^3.1.5",
-		"@types/express-fileupload": "1.5.0",
 		"@types/jest": "^29.5.11",
 		"@types/react": "^18.2.42",
 		"@types/react-dom": "^18.2.17",
@@ -108,7 +107,6 @@
 		"date-fns": "^3.3.1",
 		"electron-squirrel-startup": "^1.0.0",
 		"express": "4.19.2",
-		"express-fileupload": "1.4.0",
 		"file-stream-rotator": "^1.0.0",
 		"follow-redirects": "1.15.6",
 		"fs-extra": "11.1.1",

package.json

@@ -4,13 +4,11 @@ import { HTTPMethod } from '@php-wasm/universal';
 import express from 'express';
 import compression from 'compression';
 import compressible from 'compressible';
-import fileUpload from 'express-fileupload';
 import { portFinder } from './port-finder';
 import { NodePHP } from '@php-wasm/node';
 import startWPNow from './wp-now';
 import { output } from './output';
 import { addTrailingSlash } from './add-trailing-slash';
-import { encodeAsMultipart } from './encode-as-multipart';
 
 const requestBodyToBytes = async ( req ): Promise< Uint8Array > =>
 	await new Promise( ( resolve ) => {
@@ -45,7 +43,6 @@ export async function startServer(
 		);
 	}
 	const app = express();
-	app.use(fileUpload({ defCharset: 'utf8', defParamCharset: 'utf8'}));
 	app.use(compression({ filter: shouldCompress }));
 	app.use(addTrailingSlash('/wp-admin'));
 	const port = options.port ?? await portFinder.getOpenPort();
@@ -61,19 +58,11 @@ export async function startServer(
 				}
 			}
 
-			let body: Uint8Array;
-			if ( requestHeaders[ 'content-type' ]?.startsWith( 'multipart/form-data' ) ) {
-				const multipart = await encodeAsMultipart( req );
-				body = multipart.bytes;
-				requestHeaders[ 'content-type' ] = multipart.contentType;
-			} else {
-				body = await requestBodyToBytes( req );
-			}
 			const data = {
 				url: req.url,
 				headers: requestHeaders,
 				method: req.method as HTTPMethod,
-				body,
+				body: await requestBodyToBytes( req ),
 			};
 			const resp = await php.request(data);
 			res.statusCode = resp.httpStatusCode;