Refactoring assignment of req.last to be the first non-blacklisted …

…HTTP method specific handler
avoidwork · Oct 24, 2019 · 5237a6c · 5237a6c
1 parent 79f5b41
commit 5237a6c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/lib/utility.js b/lib/utility.js
@@ -172,10 +172,17 @@ function reduce (uri, map = new Map(), arg = {}, end = false) {
 
 		return i[0].test(uri);
 	}).forEach(i => {
-		arg.middleware = [...arg.middleware, ...i[1].handlers];
+		const handlers = i[1].handlers;
 
-		if (end) {
-			arg.last = arg.middleware[arg.middleware.length - 1];
+		arg.middleware = [...arg.middleware, ...handlers];
+
+		if (end && arg.last === null) {
+			for (const fn of handlers) {
+				if ("blacklisted" in fn === false) {
+					arg.last = fn;
+					break;
+				}
+			}
 		}
 
 		if (i[1].pos.length > 0 && arg.pos.length === 0) {

diff --git a/lib/woodland.js b/lib/woodland.js
@@ -77,6 +77,7 @@ class Woodland extends EventEmitter {
 	}
 
 	blacklist (fn) {
+		fn.blacklisted = true;
 		this.blacklisted.add(fn);
 
 		return this;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "woodland",
-  "version": "9.1.2",
+  "version": "9.1.3",
   "description": "Lightweight HTTP/HTTP2 router with automatic `Allow` & `CORS` headers",
   "main": "index.js",
   "scripts": {