Refactoring keymaster() middleware to use the router Map instead …

…of `config` such that all middleware is accounted for, updating `woodland` for no good reason

Fixing an npmjs registry mistake

lib/middleware.js

@@ -132,28 +132,28 @@ function keymaster (req, res, next) {
 	// No authentication, or it's already happened
 	if (req.protect === false || req.protectAsync === false || (req.session !== void 0 && req.isAuthenticated() === true) === true) {
 		const method = regex.get_rewrite.test(req.method) ? "get" : req.method.toLowerCase(),
-			routes = req.server.config.routes[method] || {},
+			routes = req.server.router.middleware.get(method.toUpperCase()) || new Map(),
 			uri = req.parsed.pathname;
 		let result;
 
-		if (uri in routes) {
-			result = routes[uri];
+		if (routes.has(uri)) {
+			result = routes.get(uri)[0];
 
 			if (typeof result === "function") {
 				result.call(req.server.tenso, req, res);
 			} else {
 				res.send(result);
 			}
 		} else {
-			retsu.each(Object.keys(routes), i => {
+			retsu.each(Array.from(routes.keys()), i => {
 				let key = i;
 
 				if (regex.has_param.test(i) === true && regex.leftBrace.test(i) === false) {
 					key = i.replace(/\/:(\w*)/g, "/(.*)");
 				}
 
 				if (new RegExp(`^${key}$`, "i").test(uri) === true) {
-					return !(result = routes[i]);
+					return !(result = routes.get(i)[0]);
 				}
 
 				return void 0;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tenso",
   "description": "Tensō is an elastic REST API gateway for node.js",
-  "version": "6.1.2",
+  "version": "6.1.3",
   "homepage": "http://avoidwork.github.io/tenso",
   "author": "Jason Mulligan <[email protected]>",
   "repository": {
@@ -50,7 +50,7 @@
     "tiny-uuid4": "^1.0.1",
     "tiny-xml": "^1.0.6",
     "uws": "^8.14.1",
-    "woodland": "^4.1.1",
+    "woodland": "^4.2.0",
     "yamljs": "^0.3.0"
   },
   "devDependencies": {