@momsfriendlydevco/cowboy 1.0.1 → 1.0.3

package/lib/cowboy.js

@@ -19,6 +19,20 @@ export class Cowboy {
 	* @property {Array<CowboyMiddleware>} [middleware] Middleware / resolvers to use for the route, should it match
 	*/
 
+
+	/**
+	* General settings for this Cowboy instance
+	*
+	* @type {Object}
+	* @property {Function} pathTidy Additional tidyup for server request paths, useful if the API does not live at the server root. Defaults to removing a "/api/:worker/" prefix
+	*/
+	settings = {
+		pathTidy(path) {
+			return path.replace(/^\/api\/\w+/, '/');
+		},
+	};
+
+
 	/**
 	* List of middleware which will be called on all matching routes
 	* @type Array<CowboyMiddleware>
@@ -93,7 +107,10 @@ export class Cowboy {
 		}
 
 		// Create basic [req]uest / [res]ponse objects
-		let req = new CowboyRequest(cfReq, {router: this});
+		let req = new CowboyRequest(cfReq, {
+			router: this,
+			pathTidy: this.settings.pathTidy,
+		});
 		let res = new CowboyResponse();
 
 		// Exec all earlyMiddleware - every time

package/lib/request.js

@@ -33,7 +33,7 @@ export default class CowboyRequest {
 
 		// Break appart the incoming URL
 		let url = new URL(cfReq.url);
-		this.path = url.pathname;
+		this.path = this.pathTidy(url.pathname);
 		this.hostname = url.hostname;
 	}
 }

package/lib/response.js

@@ -66,7 +66,11 @@ export default class CowboyResponse {
 	*/
 	status(code) {
 		this.code = code;
-		if (!this.body) this.body = 'ok'; // Set body payload if we don't already have one
+		if (!this.body)
+			this.body = this.code >= 200 && this.code <= 299
+				? 'ok' // Set body payload if we don't already have one
+				: `${this.code}: Fail`
+
 		return this;
 	}
 

package/middleware/cors.js

@@ -11,8 +11,11 @@ export default function CowboyMiddlewareCORS(headers) {
 		res.set(injectHeaders);
 
 		// Handle hits to OPTIONS '/' endpoint
-		req.router.options('/', (req, res) => {
-			return res.sendStatus(200);
-		});
+		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.1",
+  "version": "1.0.3",
   "description": "Wrapper around Cloudflare Wrangler to provide a more Express-like experience",
   "scripts": {
     "lint": "eslint ."