@momsfriendlydevco/cowboy 1.2.0 → 1.3.0

package/README.md

@@ -322,6 +322,11 @@ cors(options)
 Inject simple CORS headers to allow websites to use the endpoint from the browser frontend.
 
 
+devOnly()
+---------
+Allow access to the endpoint ONLY if Cloudflare is running in local development mode. Throws a 403 otherwise.
+
+
 validate(key, validator)
 ------------------------
 Validate the incoming `req.$KEY` object using [Joyful](https://github.com/MomsFriendlyDevCo/Joyful).

package/lib/cowboy.js

@@ -256,7 +256,7 @@ export class Cowboy {
 					: e?.code && e?.message && typeof e.code == 'string' && typeof e.message == 'string' ? `${e.code}: ${e.message}` // Supabase error objects
 					: 'An unknown error has occured';
 
-				debug('Error thrown', e);
+				console.warn('Error thrown', e);
 				debug('Extracted error text digest', {errorText});
 
 				// Form: '404: Not found'

package/lib/request.js

@@ -93,33 +93,37 @@ export default class CowboyRequest {
 		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');
+				if (this.headers['content-length'] == 0) { // Sending JSON but its blank
+					this.body = {};
+				} else { // Try to decode JSON in a wrapper
+					try {
+						this.body = await this.body.json();
+					} catch (e) {
+						if (debug.enabled) debug('Failed to decode request body as JSON:', e.toString());
+						throw new Error('Invalid JSON body');
+					}
 				}
+				break;
 			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');
 				}
+				break;
 			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');
 				}
+				break;
 			default:
 				debug('Empty Body Payload - assuming raw payload');
 				this.text = await this.body.text();

package/middleware/devOnly.js

@@ -0,0 +1,15 @@
+/**
+* Only permit access if Cloudflare is running in development mode
+* This should only permit access in local dev environments
+*
+* @returns {CowboyMiddleware} A CowboyMiddleware worker which will return 403 if not in development mode
+*/
+export default function CowboyMiddlewareDevOnly() {
+	return (req, res, env) => {
+		const isDev = self.ENVIRONMENT === 'development';
+
+		if (!isDev) return res
+			.status(403)
+			.send('Endpoint responds in development mode only');
+	};
+}

package/middleware/index.js

@@ -1,4 +1,5 @@
 import cors from '#middleware/cors';
+import devOnly from '#middleware/devOnly';
 import parseJwt from '#middleware/parseJwt';
 import validate from '#middleware/validate';
 import validateBody from '#middleware/validateBody';
@@ -8,6 +9,7 @@ import validateQuery from '#middleware/validateQuery';
 
 export default {
 	cors,
+	devOnly,
 	parseJwt,
 	validate,
 	validateBody,

package/middleware/validate.js

@@ -5,7 +5,7 @@ import joyful from '@momsfriendlydevco/joyful';
 *
 * @param {String} subkey The subkey to run against
 * @param {Function|Object} Callback to use with Joyful to validate with
-* @returns {Void} Either a successful middleware cycle (if validatio succeeds) or a call to `res.status(400)` if failed
+* @returns {Void} Either a successful middleware cycle (if validation succeeds) or a call to `res.status(400)` if failed
 */
 export default function CowboyMiddlewareValidate(subkey, validator) {
 	return (req, res) => {

package/package.json

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