@momsfriendlydevco/cowboy 1.0.9 → 1.0.11

package/README.md

@@ -9,6 +9,7 @@ Features:
 * Express-like `req` + `res` object for routes
 * Built in middleware + request validation via [Joi](https://joi.dev)
 * Built-in debug support for testkits + Wrangler
+* Built-in JSON / Multipart (or FormData) / Plain text decoding and population of `req.body`
 
 
 Examples

package/lib/cowboy.js

@@ -123,17 +123,7 @@ export class Cowboy {
 			pathTidy: this.settings.pathTidy,
 		});
 
-		// Decode input if we're expecting JSON
-		if (cfReq.body) {
-			try {
-				req.body = await cfReq.json();
-			} catch (e) {
-				if (debug.enabled) {
-					debug('Failed to decode request body as JSON: [[[' + cfReq.body.toString() + ']]]');
-				}
-				throw new Error('Invalid JSON body');
-			}
-		}
+		await req.parseBody();
 
 		let res = new CowboyResponse();
 		debug('Incoming request:', req.toString());

package/lib/request.js

@@ -1,3 +1,5 @@
+import debug from '#lib/debug';
+
 /**
 * Tiny wrapper around Wrangler to wrap its default Request object in an Express-like structure
 * @extends CloudflareRequest
@@ -16,6 +18,21 @@ export default class CowboyRequest {
 	hostname;
 
 
+	/**
+	* Extracted URL query parameters
+	* @type {Object}
+	*/
+	query = {};
+
+
+	/**
+	* Raw body payload provided by cfReq
+	* This gets translated into a usable object after a call to `parseBody()`
+	* @type {*}
+	*/
+	body = null;
+
+
 	constructor(cfReq, props) {
 		// Copy all cfReq keys locally as a shallow copy
 		Object.assign(
@@ -35,6 +52,64 @@ export default class CowboyRequest {
 		let url = new URL(cfReq.url);
 		this.path = this.pathTidy(url.pathname);
 		this.hostname = url.hostname;
+		this.query = Object.fromEntries(url.searchParams);
+
+		// Slurp the headers
+		this.headers = Object.fromEntries(cfReq.headers.entries());
+
+		// Hold the body element - this wont be decoded until parseBody() is called
+		this.body = {
+			json: cfReq.json.bind(cfReq),
+			formData: cfReq.formData.bind(cfReq),
+			text: cfReq.text.bind(cfReq),
+		};
+	}
+
+
+	/**
+	* Parse the body of an incoming request
+	*
+	* @param {String} [forceType] Whether to force a specific mime-type instead of using the header supplied format
+	* @returns {Promise} A promise which will resolve when the body has been parsed
+	*/
+	async parseBody(forceType) {
+		let type = (forceType || this.headers['content-type'])
+			.replace(/^([a-z\-\/]+).*$/, '$1'); // Scrap everything after the mime
+
+		switch (type) {
+			case 'json':
+			case 'application/json':
+				try {
+					this.body = await this.body.json();
+					break;
+				} catch (e) {
+					if (debug.enabled) debug('Failed to decode request body as JSON:', e.toString());
+					throw new Error('Invalid JSON body');
+				}
+			case 'formData':
+			case 'multipart/form-data': // Decode as multi-part
+			case 'application/x-www-form-urlencoded': // Decode as multi-part
+				try {
+					let formData = await this.body.formData();
+					this.body = Object.fromEntries(formData.entries());
+					break;
+				} catch (e) {
+					if (debug.enabled) debug('Failed to decode multi-part body:', e.toString());
+					throw new Error('Invalid multi-part encoded body');
+				}
+			case 'text':
+			case 'text/plain': // Decode as plain text
+				try {
+					this.body = await this.body.text();
+					break;
+				} catch (e) {
+					if (debug.enabled) debug('Failed to decode plain-text body:', e.toString());
+					throw new Error('Invalid text body');
+				}
+			default:
+				debug('EMPTY BODY PAYLOAD');
+				this.body = {};
+		}
 	}
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momsfriendlydevco/cowboy",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Wrapper around Cloudflare Wrangler to provide a more Express-like experience",
   "scripts": {
     "lint": "eslint ."