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 14 matching lines @@
 const {defaultMatcher} = require("matcher");
 const {FilterNotifier} = require("filterNotifier");
 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 = Object.create(null);
+let panels = new Map();
 
 function hasPanels()
 {
-  return Object.keys(panels).length > 0;
+  return panels.size > 0;
+}
+
+function isActivePanel(panel)
+{
+  if (panel && !panel.reload && !panel.reloading)
+    return true;
+  return false;
 }
 
 function getActivePanel(page)
 {
-  let panel = panels[page.id];
-  if (panel && !panel.reload && !panel.reloading)
+  let panel = panels.get(page.id);
+  if (isActivePanel(panel))
     return panel;
   return null;
 }
 
 function getFilterInfo(filter)
 {
   if (!filter)
     return null;
 
   let userDefined = false;
@@ skipping 73 matching lines @@
  *                                 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)
 {
-  let panel = getActivePanel(page);
-  if (panel)
+  if (!hasPanels())
+    return;
+  let request = {url, type, docDomain, thirdParty, sitekey, specificOnly};
+  if (page)
   {
-    let request = {url, type, docDomain, thirdParty, sitekey, specificOnly};
-    addRecord(panel, request, filter);
+    let panel = getActivePanel(page);
+    if (panel)
+      addRecord(panel, request, filter);
+    return;
   }
+  for (let panel of panels.values())
+    if (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 51 matching lines @@
 };
 
 /**
  * Checks whether a page is inspected by the devtools panel.
  *
  * @param {Page} page
  * @return {boolean}
  */
 exports.hasPanel = function(page)
 {
-  return page.id in panels;
+  return panels.has(page.id);
 };
 
 function onBeforeRequest(details)
 {
-  let panel = panels[details.tabId];
+  let panel = panels.get(details.tabId);
 
   // Clear the devtools panel and reload the inspected tab without caching
   // when a new request is issued. However, make sure that we don't end up
   // in an infinite recursion if we already triggered a reload.
   if (panel.reloading)
   {
     panel.reloading = false;
   }
   else
   {
     panel.records = [];
     panel.port.postMessage({type: "reset"});
 
     // We can't repeat the request if it isn't a GET request. Chrome would
     // prompt the user to confirm reloading the page, and POST requests are
     // known to cause issues on many websites if repeated.
     if (details.method == "GET")
       panel.reload = true;
   }
 }
 
 function onLoading(page)
 {
   let tabId = page.id;
-  let panel = panels[tabId];
+  let panel = panels.get(tabId);
 
   // Reloading the tab is the only way that allows bypassing all caches, in
   // order to see all requests in the devtools panel. Reloading must not be
   // performed before the tab changes to "loading", otherwise it will load the
   // previous URL.
   if (panel && panel.reload)
   {
     chrome.tabs.reload(tabId, {bypassCache: true});
 
     panel.reload = false;
     panel.reloading = true;
   }
 }
 
 function updateFilters(filters, added)
 {
-  for (let tabId in panels)
+  for (let panel of panels.values())
   {
-    let panel = panels[tabId];
-
     for (let i = 0; i < panel.records.length; i++)
     {
       let record = panel.records[i];
 
       // If an added filter matches a request shown in the devtools panel,
       // update that record to show the new filter. Ignore filters that aren't
       // associated with any sub-resource request. There is no record for these
       // if they don't already match. In particular, in case of element hiding
       // filters, we also wouldn't know if any new element matches.
       if (added)
@@ skipping 78 matching lines @@
   if (!hasPanels())
   {
     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[inspectedTabId];
+    delete panels.delete(inspectedTabId);
     chrome.webRequest.onBeforeRequest.removeListener(localOnBeforeRequest);
 
     if (!hasPanels())
     {
       ext.pages.onLoading.removeListener(onLoading);
       FilterNotifier.off("filter.added", onFilterAdded);
       FilterNotifier.off("filter.removed", onFilterRemoved);
       FilterNotifier.off("subscription.added", onSubscriptionAdded);
     }
   });
 
-  panels[inspectedTabId] = {port: newPort, records: []};
+  panels.set(inspectedTabId, {port: newPort, records: []});
 });
 
 port.on("devtools.traceElemHide", (message, sender) =>
 {
   logHiddenElements(
     sender.page, message.selectors, message.filters,
     extractHostFromFrame(sender.frame)
   );
 });