@momsfriendlydevco/cowboy 1.0.5 → 1.0.7

package/lib/cowboy.js

@@ -77,11 +77,11 @@ export class Cowboy {
 
 	/**
 	* Prepend middleware which will be used for all routes
-	* @param {CowboyMiddleware} middleware Middleware to use
+	* @param {CowboyMiddleware...} middleware Middleware(s) to use
 	* @returns {Cowboy} This chainable Cowboy router instance
 	*/
 	use(...middleware) {
-		this.earlyMiddleware.push(middleware);
+		this.earlyMiddleware.push(...middleware);
 		return this;
 	}
 
@@ -120,7 +120,18 @@ export class Cowboy {
 			router: this,
 			pathTidy: this.settings.pathTidy,
 		});
-		if (cfReq.body) req.body = await cfReq.json();
+
+		// 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');
+			}
+		}
 
 		let res = new CowboyResponse();
 		debug('Incoming request:', req.toString());

package/lib/testkit.js

@@ -18,6 +18,7 @@ export let worker;
 * @param {Object} [options] Additional options to mutate behaviour
 * @param {Axios} [options.axios] Axios instance to mutate with the base URL, if specified
 * @param {Boolean} [options.server=true] Initialize a local server - disable this if you're running your own
+* @param {Boolean} [options.debug=false] Force debug as if `DEBUG=cowboy` was set
 * @param {Function} [options.logOutput] Function to wrap STDOUT output. Called as `(line:String)`
 * @param {Function} [options.logOutputErr] Function to wrap STDERR output. Called as `(line:String)`
 * @param {String} [options.host='127.0.0.1'] Host to run Wrangler on
@@ -30,6 +31,7 @@ export function start(options) {
 	let settings = {
 		axios: null,
 		server: true,
+		debug: false,
 		logOutput: output => console.log('WRANGLER>', output),
 		logOutputErr: output => console.log('WRANGLER!', output),
 		host: '127.0.0.1',
@@ -38,6 +40,7 @@ export function start(options) {
 		...options,
 	};
 
+	if (settings.debug) Debug.enable('cowboy');
 	debug('Start cowboy testkit');
 	let wranglerConfig; // Eventual wrangler config
 
@@ -93,7 +96,6 @@ export function start(options) {
 			});
 		})
 		// }}}
-		// .then(()=> new Promise(resolve => setTimeout(resolve, 10 * 1000)))
 		// Mutate axios if provided {{{
 		.then(()=> {
 			if (settings.axios) {

package/package.json

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