Issue 6402 - Split filter hit / request logging out into own API

lib/popupBlocker.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @module popupBlocker */
 
 "use strict";
 
-const {defaultMatcher} = require("matcher");
-const {BlockingFilter, RegExpFilter} = require("filterClasses");
-const {stringifyURL, isThirdParty, extractHostFromFrame} = require("url");
-const {checkWhitelisted} = require("whitelisting");
-const {logRequest} = require("devLogger");
+const {defaultMatcher} = require("../adblockpluscore/lib/matcher");
+const {BlockingFilter,
+       RegExpFilter} = require("../adblockpluscore/lib/filterClasses");
+const {isThirdParty, extractHostFromFrame} = require("./url");
+const {checkWhitelisted} = require("./whitelisting");
+const {logRequest} = require("./hitLogger");
 
 let loadingPopups = new Map();
 
 function forgetPopup(tabId)
 {
   loadingPopups.delete(tabId);
 
   if (loadingPopups.size == 0)
   {
     browser.webRequest.onBeforeRequest.removeListener(onPopupURLChanged);
     browser.webNavigation.onCommitted.removeListener(onPopupURLChanged);
     browser.webNavigation.onCompleted.removeListener(onCompleted);
     browser.tabs.onRemoved.removeListener(forgetPopup);
   }
 }
 
 function checkPotentialPopup(tabId, popup)
 {
-  let urlObj = new URL(popup.url || "about:blank");
-  let urlString = stringifyURL(urlObj);
+  let url = popup.url || "about:blank";
   let documentHost = extractHostFromFrame(popup.sourceFrame);
-  let thirdParty = isThirdParty(urlObj, documentHost);
+  let thirdParty = isThirdParty(new URL(url), documentHost);
 
   let specificOnly = !!checkWhitelisted(
-    popup.sourcePage, popup.sourceFrame,
+    popup.sourcePage, popup.sourceFrame, null,
     RegExpFilter.typeMap.GENERICBLOCK
   );
 
   let filter = defaultMatcher.matchesAny(
-    urlString, RegExpFilter.typeMap.POPUP,
+    url, RegExpFilter.typeMap.POPUP,
     documentHost, thirdParty, null, specificOnly
   );
 
   if (filter instanceof BlockingFilter)
     browser.tabs.remove(tabId);
 
   logRequest(
-    popup.sourcePage, urlString, "POPUP",
-    documentHost, thirdParty, null,
-    specificOnly, filter
+    [popup.sourcePage.id],
+    {url, type: "POPUP", docDomain: documentHost, thirdParty, specificOnly},
+    filter
   );
 }
 
 function onPopupURLChanged(details)
 {
   // Ignore frames inside the popup window.
   if (details.frameId != 0)
     return;
 
   let popup = loadingPopups.get(details.tabId);
@@ skipping 46 matching lines @@
     {
       forgetPopup(details.tabId);
     }
     else
     {
       popup.sourceFrame = frame;
       checkPotentialPopup(details.tabId, popup);
     }
   });
 }