Simplifying middleware

avoidwork · Jul 4, 2016 · 802010d · 802010d
1 parent b5bc637
commit 802010d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/lib/etag.js b/lib/etag.js
@@ -37,7 +37,8 @@ class ETag {
 			const parsed = parse(req),
 				implicit = regex.implicitGet.test(req.method);
 
-			let cached, headers;
+			let cached = obj.cache.get(obj.hash(parsed.href)),
+				headers;
 
 			res.on("finish", () => {
 				if (implicit && !cached && res.statusCode < 400 && regex.etag.test(res._header)) {
@@ -57,17 +58,11 @@ class ETag {
 				}
 			});
 
-			if (implicit && !req.headers.range && req.headers["if-none-match"] !== undefined) {
-				cached = obj.cache.get(obj.hash(parsed.href));
-
-				if (regex.explicitGet.test(req.method) && cached && (req.headers["if-none-match"] || "") === cached.etag) {
-					headers = clone(cached.headers);
-					headers.age = parseInt(new Date().getTime() / 1000 - cached.timestamp, 10);
-					res.writeHead(304, headers);
-					res.end("");
-				} else {
-					next();
-				}
+			if (regex.explicitGet.test(req.method) && cached && !req.headers.range && (req.headers["if-none-match"] || "") === cached.etag) {
+				headers = clone(cached.headers);
+				headers.age = parseInt(new Date().getTime() / 1000 - cached.timestamp, 10);
+				res.writeHead(304, headers);
+				res.end("");
 			} else {
 				next();
 			}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tiny-etag",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "ETag middleware",
   "main": "index.js",
   "scripts": {