Include URL in key for better debugging

lib/key-generator.js

@@ -2,11 +2,11 @@
 
 var crypto = require('crypto');
 
-function generateKeyHash(url, headers, varyHeader) {
-  if (!varyHeader) return { url: url };
+function generateKeyHash(headers, varyHeader) {
+  if (!varyHeader) return { };
 
   var varySplit = varyHeader.toLowerCase().split(/,\s*/);
-  if (!varySplit.length) return { url: url };
+  if (!varySplit.length) return { };
 
   var lcHeaders;
   if (headers) {
@@ -21,11 +21,9 @@ function generateKeyHash(url, headers, varyHeader) {
   varySplit.sort(); // Always keep the list in alphabetical order
 
   return varySplit.reduce(function(memo, vary) {
-    memo['h.' + vary] = lcHeaders[vary] || '';
-    return memo;
-  }, {
-    url: url
-  });
+      memo[vary] = lcHeaders[vary] || '';
+      return memo;
+    }, {});
 }
 
 function hashKeyString(s) {
@@ -35,6 +33,6 @@ function hashKeyString(s) {
 }
 
 module.exports = function(url, headers, varyHeader) {
-  var hash = generateKeyHash(url, headers, varyHeader);
-  return hashKeyString(JSON.stringify(hash));
+  var hash = generateKeyHash(headers, varyHeader);
+  return "" + hashKeyString(JSON.stringify(hash)) + ":" + url;
 };

test/key-generator-test.js

@@ -62,6 +62,7 @@ describe('key-generator', function() {
   it('should handle case insensitivity of request headers ', function() {
     var k1 = keyGenerator('https://api.github.com/v1', { accePT: 'application/json', authorization: 'x' }, 'aCCept,AuthorizaTIon');
     var k2 = keyGenerator('https://api.github.com/v1', { accept: 'application/json', AUthorizatioN: 'x' }, 'AccePT,authorizatioN');
+
     assert(k1);
     assert(k2);
     assert.strictEqual(k1, k2);
@@ -84,6 +85,14 @@ describe('key-generator', function() {
     assert.strictEqual(k1, k2);
   });
 
+  it('should generate the same key for different Vary field order', function() {
+    var k1 = keyGenerator('https://api.github.com/v1', { accept: 'application/json' }, 'AuthorizaTIon, aCCept');
+    var k2 = keyGenerator('https://api.github.com/v1', { accept: 'application/json' }, 'AccePT,authorizatioN');
+    assert(k1);
+    assert(k2);
+    assert.strictEqual(k1, k2);
+  });
+
   it('should treat missing and null header fields equally', function() {
     var k1 = keyGenerator('https://api.github.com/v1', null, 'aCCept,AuthorizaTIon');
     var k2 = keyGenerator('https://api.github.com/v1', { accept: '' }, 'AccePT,authorizatioN');