[FIX]Ignore cache requests & no track incognito host Issue #15

script.js

@@ -24,8 +24,14 @@ isChrome = () => {
 };
 
 headersReceivedListener = (requestDetails) => {
+  // Do not count bytes from requests from local cache
+  if (requestDetails.fromCache) return
+
+  let CONST_INCOGNITO = 'Incognito';
+
   if (isChrome()) {
-     const origin = extractHostname(!requestDetails.initiator ? requestDetails.url : requestDetails.initiator);
+    // If Incognito request we do not track the domain origin
+     const origin = (requestDetails.incognito ? CONST_INCOGNITO : extractHostname(!requestDetails.initiator ? requestDetails.url : requestDetails.initiator));
      const responseHeadersContentLength = requestDetails.responseHeaders.find(element => element.name.toLowerCase() === "content-length");
      const contentLength = undefined === responseHeadersContentLength ? {value: 0}
       : responseHeadersContentLength;
@@ -38,7 +44,8 @@ headersReceivedListener = (requestDetails) => {
   let filter = browser.webRequest.filterResponseData(requestDetails.requestId);
 
   filter.ondata = event => {
-    const origin = extractHostname(!requestDetails.originUrl ? requestDetails.url : requestDetails.originUrl);
+    // If Incognito request we do not track the domain origin
+    const origin = (requestDetails.incognito ? CONST_INCOGNITO : extractHostname(!requestDetails.originUrl ? requestDetails.url : requestDetails.originUrl));
     setByteLengthPerOrigin(origin, event.data.byteLength);
 
     filter.write(event.data);
@@ -51,7 +58,7 @@ headersReceivedListener = (requestDetails) => {
   return {};
 };
 
-setBrowserIcon = (type) => {
+const setBrowserIcon = (type) => {
   chrome.browserAction.setIcon({path: `icons/icon-${type}-48.png`});
 };
 

test/test-script.js

@@ -156,6 +156,7 @@ describe('headersReceivedListener', function () {
     let requestDetails = {};
     // backup for spied methods
     const DOMAIN_NAME = 'http://www.spotify.com';
+    const INCOGNITO_CONST = 'Test';
     const extractHostNameBackup = extractHostname;
     const setByteLengthPerOriginBackup = setByteLengthPerOrigin;
 
@@ -210,6 +211,7 @@ describe('headersReceivedListener', function () {
         done();
     });
 
+
     it('should call extractHostname with Initiator when it is provided from parameter (Chrome Browser behavior)', function (done) {
         extractHostname = chai.spy();
 
@@ -221,6 +223,31 @@ describe('headersReceivedListener', function () {
         done();
     });
 
+    it('should use incognito as Origin when Incognito is provided from parameter (Chrome Browser behavior)', function (done) {
+        extractHostname = chai.spy();
+        setByteLengthPerOrigin = chai.spy();
+
+        requestDetails.incognito = INCOGNITO_CONST;
+
+        headersReceivedListener(requestDetails);
+
+        expect(extractHostname).to.not.have.been.called();
+        expect(setByteLengthPerOrigin).to.have.been.called.with('Incognito');
+        done();
+    });
+
+    it('should use incognito as Origin when Incognito is provided from parameter (Mozilla Firefox Browser behavior)', function (done) {
+        extractHostname = chai.spy();
+        setByteLengthPerOrigin = chai.spy();
+
+        requestDetails.incognito = INCOGNITO_CONST;
+        headersReceivedListener(requestDetails);
+
+        expect(extractHostname).to.not.have.been.called();
+        expect(setByteLengthPerOrigin).to.have.been.called.with('Incognito');
+        done();
+    });
+
     it('should call extractHostname with url when neither Initiator nor originUrl is not provided from from parameter', function (done) {
         extractHostname = chai.spy();
 
@@ -253,4 +280,15 @@ describe('headersReceivedListener', function () {
         expect(setByteLengthPerOrigin).to.have.been.called.with('www.spotify.com', 0);
         done();
     });
+
+    it('should not call setByteLengthPerOrigin when fromCache is defined', function(done){
+        setByteLengthPerOrigin = chai.spy();
+
+        requestDetails.fromCache = "test";
+        requestDetails.responseHeaders = [];
+        headersReceivedListener(requestDetails);
+
+        expect(setByteLengthPerOrigin).to.not.have.been.called();
+    done();
+    });
 });