@momsfriendlydevco/cowboy 1.0.18 → 1.1.0

package/README.md

@@ -136,6 +136,11 @@ This function will, in order:
 6. Return the final response - if it the function did not already explicitly do so
 
 
+Cowboy.proxy(path, request, env)
+--------------------------------
+Forward from one route to another as if the second route was called first.
+
+
 CowboyRequest
 -------------
 ```javascript
@@ -376,3 +381,8 @@ cowboy()
 		(req, res, env) => /* ... */
 	)
 ```
+
+
+parseJwt()
+----------
+Parse the incoming request as a JWT string and decode its contents into `req.body`.

package/lib/cowboy.js

@@ -166,6 +166,41 @@ export class Cowboy {
 	}
 
 
+	/**
+	* Call a router function as if it were invoked directly
+	* This function exists as an easier way to remap body contents without
+	*
+	* @param {String} url The URL path to call
+	* @param {Object} request Additional request options
+	* @param {Object} env The environment object to use
+	*
+	* @returns {CloudflareResponse} The returned CloudflareResponse object
+	*/
+	async proxy(url, options, env) {
+		if (!url || !options || !env) throw new Error('Url + options + env must be specified to proxy()');
+
+		return this.fetch(new Request(new URL(url, 'http://localhost').toString(), {
+			...options,
+			body: (()=> {
+				if ( // Being handed a native Cloudflare request body?
+					!options.body
+					|| options.body instanceof FormData
+					|| options.body instanceof ReadableStream
+					|| options.body instanceof URLSearchParams
+					|| typeof options.body == 'string'
+				) {
+					return options.body;
+				} else if (typeof options.body == 'object') { // Convert POJO into Formdata
+					let body = new FormData();
+					Object.entries(options.body)
+						.forEach(([key, val]) => body.append(key, val))
+					return body;
+				}
+			})(),
+		}), env);
+	}
+
+
 	async execMiddleware({middleware, req, res, env}) {
 		let middlewareStack = middleware
 			.map(m => {
@@ -183,7 +218,7 @@ export class Cowboy {
 		while (middlewareStack.length > 0) {
 			let middleware = middlewareStack.shift();
 			try {
-				response = await middleware(req, res, env);
+				response = await middleware.call(this, req, res, env);
 				if (response?.hasSent) { // Stop middleware chain as some intermediate has signalled the chain should end
 					response = res;
 					break;
@@ -193,7 +228,7 @@ export class Cowboy {
 			} catch (e) {
 				let errorText = typeof e == 'string' ? e : e.toString();
 
-				debug('Error thrown', errorText);
+				debug('Error thrown', e);
 
 				// Form: '404: Not found'
 				if (/^(\d{3}):/.test(errorText)) {
@@ -226,8 +261,8 @@ export class Cowboy {
 	* @returns {Cowboy} This chainable Cowboy router instance
 	*/
 	init() {
-		debug('INIT!');
 		if (this.doneInit) return this; // Already completed init
+		debug('INIT!');
 
 		if (this.settings.patchAxios) {
 			// TODO: Patch Axios somehow

package/lib/request.js

@@ -28,6 +28,14 @@ export default class CowboyRequest {
 	/**
 	* Raw body payload provided by cfReq
 	* This gets translated into a usable object after a call to `parseBody()`
+	* @type {Buffer}
+	*/
+	text = null;
+
+
+	/**
+	* Body payload provided by cfReq (
+	* Defaults to the same value as `text` until its parsed by `parseBody()`
 	* @type {*}
 	*/
 	body = null;
@@ -60,6 +68,9 @@ export default class CowboyRequest {
 		// Slurp the headers
 		this.headers = Object.fromEntries(cfReq.headers.entries());
 
+		// Hold the raw data
+		this.text = cfReq.text.bind(cfReq),
+
 		// Hold the body element - this wont be decoded until parseBody() is called
 		this.body = {
 			json: cfReq.json.bind(cfReq),
@@ -110,7 +121,8 @@ export default class CowboyRequest {
 					throw new Error('Invalid text body');
 				}
 			default:
-				debug('Empty Body Payload');
+				debug('Empty Body Payload - assuming raw payload');
+				this.text = await this.body.text();
 				this.body = {};
 		}
 	}

package/lib/response.js

@@ -25,6 +25,24 @@ export default class CowboyResponse {
 	}
 
 
+	/**
+	* ExpressJS-like type setter and shortcut function
+	* Recognises various shorthand types or defaults to setting a MIME type
+	* @param {String} type The type string to set, can be a shorthand string or a mime type
+	* @returns {CowboyResponse} This chainable instance
+	*/
+	type(type) {
+		switch (type) {
+			case 'html': return this.set('Content-Type', 'text/html');
+			case 'json': return this.set('Content-Type', 'application/json');
+			case 'text': return this.set('Content-Type', 'text/plain');
+			default:
+				if (!/\//.test(type)) throw new Error(`Shorthand type "${type}" is not recognised and does not look like a valid mime type`);
+				return this.set('Content-Type', type);
+		}
+	}
+
+
 	/**
 	* Send data and (optionally) mark the response as complete
 	* @param {*} data The data to transmit
@@ -34,7 +52,12 @@ export default class CowboyResponse {
 	send(data, end = true) {
 		if (this.code === null) this.code = 200; // Assume OK if not told otherwise
 
-		if (typeof data == 'string') {
+		if (
+			typeof data == 'string'
+			|| data instanceof FormData
+			|| data instanceof ReadableStream
+			|| data instanceof URLSearchParams
+		) {
 			this.body = data;
 		} else {
 			this.body = JSON.stringify(data);

package/middleware/index.js

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

package/middleware/parseJwt.js

@@ -0,0 +1,21 @@
+/**
+* Return a parsing middleware layer which accepts a JWT body and decodes the object into req.body
+*
+* @param {Object} [options] Additional options to mutate behaviour
+* @param {Function} [options.isJwt] Async function, called as `(req, res)` to determine if the input is a JWT payload, defaults to checking the content-type header
+*/
+export default function CowboyMiddlewareParseJwt(options) {
+	let settings = {
+		async isJwt(req, res) { // eslint-disable-line no-unused-vars
+			return req.headers['content-type'] == 'application/jwt';
+		},
+		...options,
+	};
+
+	return async (req, res) => {
+		if (await !settings.isJwt(req, res)) return;
+
+		const base64 = req.text.split('.')[1].replace(/-/g, '+').replace(/_/g, '/');
+		req.body = JSON.parse(atob(base64));
+	}
+}

package/package.json

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