@momsfriendlydevco/cowboy 1.0.16 → 1.0.18

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
 
@@ -335,6 +335,10 @@ cowboy()
 	)
 ```
 
+validateHeaders(validator)
+-----------------------
+Shorthand validator which runs validation on the `req.headers` parameter only.
+
 
 validateParams(validator)
 -------------------------

package/lib/cowboy.js

@@ -69,9 +69,11 @@ 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],
-			matcher: compileRoutePaths(paths),
+			paths: matcher.paths,
+			matcher,
 			middleware,
 		})
 
@@ -148,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/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/middleware/index.js

@@ -1,6 +1,7 @@
 import cors from '#middleware/cors';
 import validate from '#middleware/validate';
 import validateBody from '#middleware/validateBody';
+import validateHeaders from '#middleware/validateHeaders';
 import validateParams from '#middleware/validateParams';
 import validateQuery from '#middleware/validateQuery';
 
@@ -8,6 +9,7 @@ export default {
 	cors,
 	validate,
 	validateBody,
+	validateHeaders,
 	validateParams,
 	validateQuery,
 }

package/middleware/validateHeaders.js

@@ -0,0 +1,5 @@
+import CowboyMiddlewareValidate from '#middleware/validate';
+
+export default function CowboyMiddlewareValidateHeaders(validator) {
+	return CowboyMiddlewareValidate('headers', validator);
+}

package/package.json

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