Issue 6586 - Fixed WebRTC wrapper after removing ext.webRequest.onBeforeRequest

lib/requestBlocker.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 177 matching lines @@
       // can just use the request's frame ID, but for subdocument requests
       // (e.g. iframes) we must instead use the request's parent frame ID.
       details.type == "sub_frame" ? details.parentFrameId : details.frameId
     );
   }
 
   if (checkWhitelisted(page, frame, originUrl))
     return;
 
   let type = resourceTypes.get(details.type) || "OTHER";
   let [docDomain, sitekey, specificOnly] = getDocumentInfo(page, frame,

[kzar, 2018/04/17 12:46:39]

Perhaps it would be a nicer abstraction to have a function called matchRequests
which takes a collection of URLs and returns an iterator of the matches? It
could do the work of getDocumentInfo then, as well as optionally calling
logRequest.

[Sebastian Noack, 2018/04/17 12:56:47]

FWIW, I'm not too happy with this abstraction (just slightly more than repeating
myself 3 times in the same file). However, at least I'm pretty sure that this
way, the code just gets inlined by the JIT. If I move the loop in here, I'm
mildly concerned that this might effect the performance in the onBeforeRequest
listener. In particular when turning it into a generator, I know for sure that
this will cause the JIT to struggle.

As for calling logRequest(), I don't see how this can be generalized (in a
reasonable way), since the onBeforeRequest listener must call getRelatedTabIds()
first, while the message listener for the WebRTC wrapper must pass in page.id.

[kzar, 2018/04/17 13:54:06]

Yea, fair enough.

                                                            originUrl);
   let [filter, urlString, thirdParty] = matchRequest(url, type, docDomain,
                                                      sitekey, specificOnly);
 
   getRelatedTabIds(details).then(tabIds =>
   {
     logRequest(tabIds, urlString, type, docDomain,
                thirdParty, sitekey, specificOnly, filter);
   });
 
@@ skipping 21 matching lines @@
     {
       if (filter.collapse != null)
         return filter.collapse;
       blocked = true;
     }
   }
 
   return blocked && Prefs.hidePlaceholders;
 });
 
+port.on("request.blockedByRTCWrapper", (msg, sender) =>
+{
+  let {page, frame} = sender;
+
+  if (checkWhitelisted(page, frame))
+    return false;
+
+  let [docDomain, sitekey, specificOnly] = getDocumentInfo(page, frame);
+  let [filter, url, thirdParty] = matchRequest(new URL(msg.url),
+                                               "WEBRTC", docDomain,
+                                               sitekey, specificOnly);
+
+  logRequest([sender.page.id], url, "WEBRTC", docDomain,
+             thirdParty, sitekey, specificOnly, filter);
+
+  return filter instanceof BlockingFilter;
+});
+
 let ignoreFilterNotifications = false;
 
 function onFilterChange(arg, isDisabledAction)
 {
   // Avoid triggering filters.behaviorChanged multiple times
   // when multiple filter hanges happen at the same time.
   if (ignoreFilterNotifications)
     return;
 
   // Ignore disabled subscriptions and filters, unless they just got
@@ skipping 21 matching lines @@
 }
 
 FilterNotifier.on("subscription.added", onFilterChange);
 FilterNotifier.on("subscription.removed", onFilterChange);
 FilterNotifier.on("subscription.updated", onFilterChange);
 FilterNotifier.on("subscription.disabled", arg => onFilterChange(arg, true));
 FilterNotifier.on("filter.added", onFilterChange);
 FilterNotifier.on("filter.removed", onFilterChange);
 FilterNotifier.on("filter.disabled", arg => onFilterChange(arg, true));
 FilterNotifier.on("load", onFilterChange);
-
-port.on("request.blockedByRTCWrapper", (msg, sender) =>
-{
-  let {page, frame} = sender;
-
-  if (checkWhitelisted(page, frame))
-    return false;
-
-  let [docDomain, sitekey, specificOnly] = getDocumentInfo(page, frame);
-  let [filter, url, thirdParty] = matchRequest(new URL(msg.url),
-                                               "WEBRTC", docDomain,
-                                               sitekey, specificOnly);
-
-  logRequest([sender.page.id], url, "WEBRTC", docDomain,
-             thirdParty, sitekey, specificOnly, filter);
-
-  return filter instanceof BlockingFilter;
-});