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

lib/devtools.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
@@ skipping 222 matching lines @@
 
 browser.runtime.onConnect.addListener(newPort =>
 {
   let match = newPort.name.match(/^devtools-(\d+)$/);
   if (!match)
     return;
 
   let inspectedTabId = parseInt(match[1], 10);
   let localOnBeforeRequest = onBeforeRequest.bind();
   let panel = {port: newPort, records: []};
+  let hitListener = addRecord.bind(null, panel);
 
   browser.webRequest.onBeforeRequest.addListener(
     localOnBeforeRequest,
     {
       urls: ["http://*/*", "https://*/*"],
       types: ["main_frame"],
       tabId: inspectedTabId
     }
   );
 
   if (panels.size == 0)
   {
     ext.pages.onLoading.addListener(onLoading);
     FilterNotifier.on("filter.added", onFilterAdded);
     FilterNotifier.on("filter.removed", onFilterRemoved);
     FilterNotifier.on("subscription.added", onSubscriptionAdded);
   }
 
-  let hitListener = addRecord.bind(null, panel);

[Manish Jethani, 2018/04/23 15:30:58]

I'm wondering if panel should be an object of a Panel class.

  function Panel(port)
  {
    this.port = port;
    this.records = [];
  }

  Panel.prototype = {
    addRecord(request, filter)
    {
      if (!this.hasRecord(request, filter))
      {
        ...
      }
    },
    hasRecord(request, filter)
    {
      ...
    }
  };

[kzar, 2018/05/01 10:53:07]

Seems like kind of an unrelated change to me, I'll leave this one for now.

[Manish Jethani, 2018/05/02 13:25:13]

Acknowledged.

-
   newPort.onDisconnect.addListener(() =>
   {
-    HitLogger.off(inspectedTabId, hitListener);
+    HitLogger.removeListener(inspectedTabId, hitListener);
     panels.delete(inspectedTabId);
     browser.webRequest.onBeforeRequest.removeListener(localOnBeforeRequest);
 
     if (panels.size == 0)
     {
       ext.pages.onLoading.removeListener(onLoading);
       FilterNotifier.off("filter.added", onFilterAdded);
       FilterNotifier.off("filter.removed", onFilterRemoved);
       FilterNotifier.off("subscription.added", onSubscriptionAdded);
     }
   });
 
-  HitLogger.on(inspectedTabId, hitListener);
+  HitLogger.addListener(inspectedTabId, hitListener);
   panels.set(inspectedTabId, panel);
 });