Blocking generating an ETag for responses that can't be cached & addi…

…ng tests, updating dependencies
avoidwork · Feb 6, 2017 · 09b0996 · 09b0996
1 parent 8af434c
commit 09b0996
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 13 deletions.
diff --git a/lib/etag.js b/lib/etag.js
@@ -11,7 +11,8 @@ const lru = require("tiny-lru"),
 		explicitGet: /^GET$/i,
 		etag: /ETag:\s/i,
 		invalid: /^(a|cache|connection|content-(d|e|l|m|r)|d|ex|l|p|r|s|t|u|v|w|x)/,
-		valid: /^(200|304)$/
+		valid: /^(200|304)$/,
+		nonCachable: /no-cache|no-store|private|must-revalidate/
 	};
 
 function clone (arg) {
@@ -60,11 +61,13 @@ class ETag {
 						}
 					});
 
-					obj.register(parsed.href, {
-						etag: lheaders.etag,
-						headers: lheaders,
-						timestamp: cached ? cached.timestamp : parseInt(new Date().getTime() / 1000, 10)
-					});
+					if (!lheaders["cache-control"] || !regex.nonCachable.test(lheaders["cache-control"])) {
+						obj.register(parsed.href, {
+							etag: lheaders.etag,
+							headers: lheaders,
+							timestamp: cached ? cached.timestamp : parseInt(new Date().getTime() / 1000, 10)
+						});
+					}
 				}
 			});
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tiny-etag",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "description": "ETag middleware",
   "main": "index.js",
   "scripts": {
@@ -31,15 +31,15 @@
     "murmurhash3js": "~3.0.1",
     "retsu": "~2.0.3",
     "tiny-lru": "~1.4.2",
-    "tiny-parse": "~1.0.3"
+    "tiny-parse": "~2.0.0"
   },
   "devDependencies": {
     "grunt": "~1.0.1",
-    "grunt-eslint": "~18.1.0",
+    "grunt-eslint": "~19.0.0",
     "grunt-mocha-test": "~0.12.7",
     "grunt-nsp": "~2.2.0",
     "hippie": "~0.5.0",
     "mocha": "~2.5.3",
-    "woodland": "~1.1.17"
+    "woodland": "~1.1.18"
   }
 }
diff --git a/test/test.js b/test/test.js
@@ -6,7 +6,7 @@ const http = require("http"),
 	mmh3 = require("murmurhash3js").x86.hash32,
 	etagValue = "\"" + mmh3("Hello World!", random) + "\"",
 	cacheSize = 1000,
-	router = require("woodland")({defaultHeaders: {"Cache-Control": "no-cache"}, cacheSize: cacheSize, defaultHost: "localhost", hosts: ["localhost", "noresponse"]}),
+	router = require("woodland")({defaultHeaders: {"Cache-Control": "public"}, cacheSize: cacheSize, defaultHost: "localhost", hosts: ["localhost", "noresponse"]}),
 	hippie = require("hippie"),
 	etag = require(path.join(__dirname, "..", "index.js"))({cacheSize: cacheSize, seed: random});
 
@@ -21,6 +21,11 @@ router.use("/", function hello (req, res) {
 	res.end("Hello World!");
 });
 
+router.use("/no-cache", function hello (req, res) {
+  res.writeHead(200, {"Content-Type": "text/plain", "Cache-Control":"no-cache"});
+  res.end("Hello World!");
+});
+
 http.createServer(router.route).listen(8001);
 
 describe("Valid ETag", function () {
@@ -29,7 +34,7 @@ describe("Valid ETag", function () {
 			.get("/")
 			.expectStatus(200)
 			.expectHeader("Allow", "GET, HEAD, OPTIONS")
-			.expectHeader("Cache-Control", "no-cache")
+			.expectHeader("Cache-Control", "public")
 			.expectHeader("Content-Type", "text/plain")
 			.expectHeader("ETag", etagValue)
 			.expectBody(/^Hello World!$/)
@@ -44,7 +49,7 @@ describe("Valid ETag", function () {
 			.head("/")
 			.expectStatus(200)
 			.expectHeader("Allow", "GET, HEAD, OPTIONS")
-			.expectHeader("Cache-Control", "no-cache")
+			.expectHeader("Cache-Control", "public")
 			.expectHeader("Content-Type", "text/plain")
 			.expectHeader("ETag", etagValue)
 			.expectBody(/^$/)
@@ -83,4 +88,34 @@ describe("Valid ETag", function () {
 				done();
 			});
 	});
+
+	it("GET /no-cache (200 / 'Success' / No Etag)", function (done) {
+		request()
+			.get("/no-cache")
+			.expectStatus(200)
+			.expectHeader("Allow", "GET, HEAD, OPTIONS")
+			.expectHeader("Cache-Control", "no-cache")
+			.expectHeader("Content-Type", "text/plain")
+			.expectHeader("ETag", undefined)
+			.expectBody(/^Hello World!$/)
+			.end(function (err) {
+				if (err) throw err;
+				done();
+			});
+	});
+
+	it("HEAD /no-cache (200 / 'Success' / No Etag)", function (done) {
+		request()
+			.head("/no-cache")
+			.expectStatus(200)
+			.expectHeader("Allow", "GET, HEAD, OPTIONS")
+			.expectHeader("Cache-Control", "no-cache")
+			.expectHeader("Content-Type", "text/plain")
+			.expectHeader("ETag", undefined)
+			.expectBody(/^$/)
+			.end(function (err) {
+				if (err) throw err;
+				done();
+			});
+	});
 });