Issue 5042 - Adds handling for requests which are not associated with browser tab

lib/devtools.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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
@@ skipping 16 matching lines @@
 const {extractHostFromFrame} = require("url");
 const {port} = require("messaging");
 
 const nonRequestTypes = ["DOCUMENT", "ELEMHIDE", "GENERICBLOCK", "GENERICHIDE"];
 
 // Mapping of inspected tabs to their devpanel page
 // and recorded items. We can't use a PageMap here,
 // because data must persist after navigation/reload.
 let panels = new Map();
 
-function hasPanels()
-{
-  return panels.size > 0;
-}
-
 function isActivePanel(panel)
 {
-  if (panel && !panel.reload && !panel.reloading)
-    return true;
-  return false;
+  return panel && !panel.reload && !panel.reloading;
 }
 
 function getActivePanel(page)
 {
   let panel = panels.get(page.id);
   if (isActivePanel(panel))
     return panel;
   return null;
 }
 
@@ skipping 64 matching lines @@
     request.docDomain,
     request.thirdParty,
     request.sitekey,
     request.specificOnly
   );
 }
 
 /**
  * Logs a request to the devtools panel.
  *
- * @param {Page}     page          The page the request occured on
+ * @param {?Page}    page          The page the request occured on or null if
+ *                                 the request isn't associated with a page
  * @param {string}   url           The URL of the request
  * @param {string}   type          The request type
  * @param {string}   docDomain     The IDN-decoded hostname of the document
  * @param {boolean}  thirdParty    Whether the origin of the request and
  *                                 document differs
  * @param {?string}  sitekey       The active sitekey if there is any
  * @param {?boolean} specificOnly  Whether generic filters should be ignored
  * @param {?BlockingFilter} filter The matched filter or null if there is no
  *                                 match
  */
 exports.logRequest = function(page, url, type, docDomain,
                               thirdParty, sitekey,
                               specificOnly, filter)
 {
-  if (!hasPanels())
+  if (panels.size == 0)
     return;
+
   let request = {url, type, docDomain, thirdParty, sitekey, specificOnly};
-  if (page)
-  {
-    let panel = getActivePanel(page);
-    if (panel)
-      addRecord(panel, request, filter);
-    return;
-  }
-  for (let panel of panels.values())
-    if (isActivePanel(panel))
+  for (let [tabId, panel] of panels)
+    if ((!page || page.id == tabId) && isActivePanel(panel))
       addRecord(panel, request, filter);
 };
 
 /**
  * Logs active element hiding filters to the devtools panel.
  *
  * @param {Page}     page       The page the elements were hidden on
  * @param {string[]} selectors  The selectors of applied ElemHideFilters
  * @param {string[]} filters    The text of applied ElemHideEmulationFilters
  * @param {string}   docDomain  The IDN-decoded hostname of the document
@@ skipping 189 matching lines @@
 
   chrome.webRequest.onBeforeRequest.addListener(
     localOnBeforeRequest,
     {
       urls: ["http://*/*", "https://*/*"],
       types: ["main_frame"],
       tabId: inspectedTabId
     }
   );
 
-  if (!hasPanels())
+  if (panels.size == 0)
   {
     ext.pages.onLoading.addListener(onLoading);
     FilterNotifier.on("filter.added", onFilterAdded);
     FilterNotifier.on("filter.removed", onFilterRemoved);
     FilterNotifier.on("subscription.added", onSubscriptionAdded);
   }
 
   newPort.onDisconnect.addListener(() =>
   {
-    delete panels.delete(inspectedTabId);
+    panels.delete(inspectedTabId);
     chrome.webRequest.onBeforeRequest.removeListener(localOnBeforeRequest);
 
-    if (!hasPanels())
+    if (panels.size == 0)
     {
       ext.pages.onLoading.removeListener(onLoading);
       FilterNotifier.off("filter.added", onFilterAdded);
       FilterNotifier.off("filter.removed", onFilterRemoved);
       FilterNotifier.off("subscription.added", onSubscriptionAdded);
     }
   });
 
   panels.set(inspectedTabId, {port: newPort, records: []});
 });
 
 port.on("devtools.traceElemHide", (message, sender) =>
 {
   logHiddenElements(
     sender.page, message.selectors, message.filters,
     extractHostFromFrame(sender.frame)
   );
 });