Issue 154 - Added devtools panel showing blocked and blockable items

lib/devtools.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 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);
 
 function hasPanels()
 {
-  return Object.getOwnPropertyNames(panels).length > 0;
+  return Object.keys(panels).length > 0;
 }
 
 function getActivePanel(page)
 {
   let panel = panels[page._id];
   if(panel && !panel.reload && !panel.reloading)
     return panel;
   return null;
-}
-
-function getRequestInfo(request)
-{
-  return {
-    url: request.url,
-    type: request.type,
-    docDomain: request.docDomain
-  };
 }
 
 function getFilterInfo(filter)
 {
   if (!filter)
     return null;
 
   let userDefined = false;
   let subscriptionTitle = null;
 
@@ skipping 12 matching lines @@
     text: filter.text,
     whitelisted: filter instanceof WhitelistFilter,
     userDefined: userDefined,
     subscription: subscriptionTitle
   };
 }
 
 function hasRecord(panel, request, filter)
 {
   return panel.records.some(record =>
-    record.request.type      == request.type      &&
     record.request.url       == request.url       &&
     record.request.docDomain == request.docDomain &&
+
+    // Ignore partial (e.g. ELEMHIDE) whitelisting if there is already
+    // a DOCUMENT exception which disables all means of blocking.
+    (record.request.type == "DOCUMENT" ? nonRequestTypes.indexOf(request.type) != -1
+                                       : record.request.type == request.type) &&
 
     // Matched element hiding filters don't relate to a particular request,
     // so we also have to match the CSS selector in order to distinguish them.
     (record.filter && record.filter.selector) == (filter && filter.selector)
   );
 }
 
 function addRecord(panel, request, filter)
 {
   if (!hasRecord(panel, request, filter))
   {
-    panel.panel.sendMessage({
+    panel.port.postMessage({
       type: "add-record",
-      request: getRequestInfo(request),
+      request: request,
       filter: getFilterInfo(filter)
     });
 
     panel.records.push({
       request: request,
       filter: filter
     });
   }
 }
 
 function matchRequest(request)
 {
   return defaultMatcher.matchesAny(
     request.url,
     RegExpFilter.typeMap[request.type],
     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 {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
+ * @param {Page}     page          The page the request occured on
+ * @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)
+                              specificOnly, filter)
 {
   let panel = getActivePanel(page);
   if (panel)
   {
     let request = {
       url: url,
       type: type,
       docDomain: docDomain,
       thirdParty: thirdParty,
       sitekey: sitekey,
@@ skipping 76 matching lines @@
   // 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.panel.sendMessage({type: "reset"});
+    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)
@@ skipping 73 matching lines @@
       // For filters that aren't associated with any sub-resource request,
       // just remove the record. We wouldn't know whether another filter
       // matches instead until the page is reloaded.
       else
       {
         if (filters.indexOf(record.filter) == -1)
           continue;
 
         if (nonRequestTypes.indexOf(record.request.type) != -1)
         {
-          panel.panel.sendMessage({
+          panel.port.postMessage({
             type: "remove-record",
             index: i
           });
           panel.records.splice(i--, 1);
           continue;
         }
 
         record.filter = matchRequest(record.request);
       }
 
-      panel.panel.sendMessage({
+      panel.port.postMessage({
         type: "update-record",
         index: i,
-        request: getRequestInfo(record.request),
+        request: record.request,
         filter: getFilterInfo(record.filter)
       });
     }
   }
 }
 
-ext.devtools.onCreated.addListener(function(panel)
-{
-  let inspectedTabId = panel.inspectedTabId;
+chrome.runtime.onConnect.addListener(port =>
+{
+  let match = port.name.match(/^devtools-(\d+)$/);
+  if (!match)
+    return;
+
+  let inspectedTabId = parseInt(match[1], 10);
   let localOnBeforeRequest = onBeforeRequest.bind();
 
   chrome.webRequest.onBeforeRequest.addListener(
     localOnBeforeRequest,
     {
       urls:  ["<all_urls>"],
       types: ["main_frame"],
       tabId: inspectedTabId
     }
   );
 
   if (!hasPanels())
   {
     ext.pages.onLoading.addListener(onLoading);
     FilterNotifier.addListener(onFilterChange);
   }
 
-  panel.onRemoved.addListener(function()
+  port.onDisconnect.addListener(() =>
   {
     delete panels[inspectedTabId];
     chrome.webRequest.onBeforeRequest.removeListener(localOnBeforeRequest);
 
     if (!hasPanels())
     {
       FilterNotifier.removeListener(onFilterChange);
       ext.pages.onLoading.removeListener(onLoading);
     }
   });
 
-  panels[inspectedTabId] = {panel: panel, records: []};
+  panels[inspectedTabId] = {port: port, records: []};
 });