@momsfriendlydevco/cowboy 1.0.15 → 1.0.17

package/README.md

@@ -106,7 +106,7 @@ let router = new Cowboy()
 Notes:
 * All middleware items are called in sequence - and are async waited-on)
 * If any middleware functions fail the entire chain aborts with an error
-* All middleware functions are called as `(CowboyRequest, CowboyResponse)`
+* All middleware functions are called as `(CowboyRequest, CowboyResponse, Env)`
 * If any middleware functions call `res.end()` (or any of its automatic methods like `res.send()` / `res.sendStatus()`) the chain also aborts successfully
 * If the last middleware function returns a non response object - i.e. the function didn't call `res.send()` its assumed to be a valid output and is automatically wrapped
 

package/lib/cowboy.js

@@ -2,6 +2,7 @@ import debug from '#lib/debug';
 import CowboyMiddleware from '#middleware';
 import CowboyRequest from '#lib/request';
 import CowboyResponse from '#lib/response';
+import {compile as compileRoutePaths} from '@momsfriendlydevco/path-match';
 
 export class Cowboy {
 	/**
@@ -68,11 +69,14 @@ export class Cowboy {
 	* @returns {Cowboy} This chainable Cowboy router instance
 	*/
 	route(methods, paths, ...middleware) {
+		let matcher = compileRoutePaths(paths);
 		this.routes.push({
 			methods: Array.isArray(methods) ? methods : [methods],
-			paths: Array.isArray(paths) ? paths : [paths],
+			paths: matcher.paths,
+			matcher,
 			middleware,
 		})
+
 		return this;
 	}
 
@@ -96,11 +100,7 @@ export class Cowboy {
 	resolve(req) {
 		return this.routes.find(route =>
 			route.methods.includes(req.method) // Method matches
-			&& route.paths.some(path => // Path matches
-				typeof path == 'string' ? req.path == path
-				: path instanceof RegExp ? path.test(req.path)
-				: (()=> { throw new Error('Path is not a String or RegExp') })()
-			)
+			&& route.matcher.isMatch(req.path)
 		);
 	}
 
@@ -150,6 +150,10 @@ export class Cowboy {
 			return res.sendStatus(404).toCloudflareResponse(); // No matching route
 		}
 
+		// Populate params
+		let firstPathIndex = route.paths.findIndex(re => re.test(req.path));
+		req.params = route.paths[firstPathIndex].exec(req.path)?.groups;
+
 		// Exec route middleware
 		let response = await this.execMiddleware({
 			req, res, env,

package/lib/request.js

@@ -54,6 +54,9 @@ export default class CowboyRequest {
 		this.hostname = url.hostname;
 		this.query = Object.fromEntries(url.searchParams);
 
+		this.routePath = ''; // Eventually matching routePath segment
+		this.params = {}; // Set empty object for path extraction
+
 		// Slurp the headers
 		this.headers = Object.fromEntries(cfReq.headers.entries());
 

package/lib/response.js

@@ -99,7 +99,12 @@ export default class CowboyResponse {
 			status: this.code,
 			headers: this.headers,
 		};
-		console.log('Build response', JSON.stringify({...cfOptions, body: this.body}, null, '\t'));
+		console.log('Response', JSON.stringify({
+			...cfOptions,
+			body:
+				typeof this.body == 'string' && this.body.length > 30 ? this.body.substr(0, 50) + '…'
+				: this.body,
+		}, null, '\t'));
 		return new this.CloudflareResponse(this.body, cfOptions);
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momsfriendlydevco/cowboy",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "Wrapper around Cloudflare Wrangler to provide a more Express-like experience",
   "scripts": {
     "lint": "eslint ."
@@ -36,6 +36,7 @@
   },
   "dependencies": {
     "@momsfriendlydevco/joyful": "^1.0.1",
+    "@momsfriendlydevco/path-match": "^1.0.0",
     "toml": "^3.0.0"
   },
   "devDependencies": {