@momsfriendlydevco/cowboy 1.6.0 → 1.6.1

package/middleware/etagCaching.js

@@ -13,7 +13,7 @@ function sortKeys(o) {
 
 
 /**
-* Cowboy middleware which will return a 304 if the incoming eTag matches the hash of the last identical response
+* Cowboy middleware which will return a 304 if the incoming eTag matches the hash of the last identical payload response
 * If hitting the same endpoints over and over this can significantly improve response times
 *
 * @param {Object} [options] Additional options to mutate behaviour
@@ -35,17 +35,16 @@ export default function CowboyEtagCaching(options) {
 			);
 		},
 		payload(req, res, settings) { // eslint-disable-line no-unused-vars
-			let payload = {
+			return {
 				method: req.method,
 				query: req.query,
 				url: req.path,
 				body: res.body,
 			};
-			return payload;
 		},
 		textEncoder: new TextEncoder(),
 		async hasher(obj, settings) {
-			let text = JSON.stringify(sortKeys(obj));
+			let text = typeof obj == 'string' ? obj : JSON.stringify(sortKeys(obj));
 			let data = settings.textEncoder.encode(text);
 			let hashBuffer = await crypto.subtle.digest('SHA-256', data);
 			let hashArray = Array.from(new Uint8Array(hashBuffer));
@@ -72,10 +71,11 @@ export default function CowboyEtagCaching(options) {
 
 		settings.debug('Enabled for request', req.path);
 
-		// Queue up interceptor before responding to handle the output
+		// Queue up interceptor to handle the eventual middleware chain output
 		res.beforeServe(async ()=> {
-			if (typeof res.data == 'object') {
-				settings.debug('Refusing to cache - res.data is not an object');
+			let dataType = typeof res.body;
+			if (!['object', 'string'].includes(dataType)) {
+				settings.debug(`Refusing to cache - res.body data type is "${dataType}" and not a POJO or plain String`);
 				return;
 			}
 

package/package.json

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