@momsfriendlydevco/cowboy 1.0.8 → 1.0.10

package/README.md

@@ -291,8 +291,8 @@ cowboy()
 ```
 
 
-cors
-----
+cors(options)
+-------------
 Inject simple CORS headers to allow websites to use the endpoint from the browser frontend.
 
 

package/lib/request.js

@@ -16,6 +16,13 @@ export default class CowboyRequest {
 	hostname;
 
 
+	/**
+	* Extracted URL query parameters
+	* @type {Object}
+	*/
+	query = {};
+
+
 	constructor(cfReq, props) {
 		// Copy all cfReq keys locally as a shallow copy
 		Object.assign(
@@ -35,6 +42,7 @@ 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);
 	}
 
 

package/middleware/cors.js

@@ -1,20 +1,40 @@
-export default function CowboyMiddlewareCORS(headers) {
-	let injectHeaders = headers || {
-		'Access-Control-Allow-Origin': '*',
-		'Access-Control-Allow-Methods': 'GET, POST, OPTIONS',
-		'Access-Control-Allow-Headers': '*',
-		'Content-Type': 'application/json;charset=UTF-8',
+/**
+* Register a generic middleware to handle CORS requests
+*
+* @param {Object} [options] Additional options to mutate behaviour
+* @param {Boolean} [options.attachOptions=true] Attach an `options` method against all routes that don't already have one to pass the CORS pre-flight check
+* @param {Object} [options.headers] Generic CORS headers to inject
+*
+* @returns {CowboyMiddleware}
+*/
+export default function CowboyMiddlewareCORS(options) {
+	let settings = {
+		attachOptions: true,
+		headers: {
+			'Access-Control-Allow-Origin': '*',
+			'Access-Control-Allow-Methods': 'GET, POST, OPTIONS',
+			'Access-Control-Allow-Headers': '*',
+			'Content-Type': 'application/json;charset=UTF-8',
+		},
+		...options,
 	};
 
 	return (req, res) => {
 		// Always inject CORS headers
-		res.set(injectHeaders);
+		res.set(settings.headers);
+
+		// Inject various OPTIONS endpoints for CORS pre-flight
+		if (settings.attachOptions && !req.router.loadedCors) {
+			req.router.routes
+				.filter(route => !route.methods.includes('OPTIONS'))
+				.forEach(route =>
+					route.paths.forEach(path =>
+						req.router.options(path, (req, res) =>
+							res.sendStatus(200)
+						)
+					)
+				);
 
-		// Handle hits to OPTIONS '/' endpoint
-		if (!req.router.loadedCors) {
-			req.router.options('/', (req, res) => {
-				return res.sendStatus(200);
-			});
 			req.router.loadedCors = true; // Mark we've already done this so we don't keep tweaking the router
 		}
 	}

package/package.json

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