AG-8562 clean up filtering events

Merge in EXTENSIONS/browser-extension from fix/AG-8562 to feature/AG-2737 * commit 'e2d55052702fed977e49ad97567699cc8b61694d': revert no default value and fix jsdoc for clearEventsByTabId param ignorePreserveLog no extra requestContextStorage.record for DOCUMENT-type requests clean up ditch SHOULD_CLEAR_EMPTY_EVENTS clean up comment rename sortedPreviousEvents to filteredPreviousEvents clean up comments add clearOnlyEmpty flag for clearEventsByTabId for wiping empty events clean up empty events while pushFilteringEvent clean up filter events for tab
AdguardTeam · Jun 21, 2021 · 34fa747 · 34fa747
2 parents 8eb2d9f + e2d5505
commit 34fa747
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 19 deletions.
diff --git a/Extension/src/background/filter/filtering-log/filtering-log.__ABSTRACT_API__.js b/Extension/src/background/filter/filtering-log/filtering-log.__ABSTRACT_API__.js
@@ -15,7 +15,6 @@
  * along with Adguard Browser Extension.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 /**
  * This is an abstract filtering log module with methods throwing errors if used.
  * It should be replaced by webpack during compilation

diff --git a/Extension/src/background/filter/filtering-log/filtering-log.browsers.js b/Extension/src/background/filter/filtering-log/filtering-log.browsers.js
@@ -619,8 +619,8 @@ const browsersFilteringLog = (function () {
 
     /**
      * Remove log requests for tab
-     * @param tabId
-     * @param {boolean} ignorePreserveLog
+     * @param {number} tabId
+     * @param {boolean} [ignorePreserveLog]
      */
     const clearEventsByTabId = function (tabId, ignorePreserveLog) {
         const tabInfo = tabsInfoMap[tabId];

diff --git a/Extension/src/background/filter/request-blocking.js b/Extension/src/background/filter/request-blocking.js
@@ -155,7 +155,7 @@ export const webRequestService = (function () {
             referrerUrl,
             requestType,
             tab,
-            requestRule
+            requestRule,
         });
 
         return isRequestBlockedByRule(requestRule);
@@ -449,9 +449,9 @@ export const webRequestService = (function () {
                 const ruleResult = r.getAdvancedModifier().removeParameters(result);
                 if (ruleResult !== result) {
                     filteringLog.addRemoveParamEvent({
-                        tab, 
-                        frameUrl: requestUrl, 
-                        requestType, 
+                        tab,
+                        frameUrl: requestUrl,
+                        requestType,
                         rule: r,
                         timestamp: Date.now(),
                     });

diff --git a/Extension/src/background/webrequest.js b/Extension/src/background/webrequest.js
@@ -104,17 +104,6 @@ const webrequestInit = function () {
             // Reset tab button state
             listeners.notifyListeners(listeners.UPDATE_TAB_BUTTON_STATE, tab, true);
 
-            // Record request context for the main frame
-            requestContextStorage.record({
-                requestId,
-                requestUrl,
-                referrerUrl: requestUrl,
-                originUrl,
-                requestType, 
-                tab,
-                method,
-            });
-
             /**
              * Just to remember!
              * In the case of the "about:newtab" pages we don't receive onResponseReceived event for the main_frame
@@ -517,7 +506,6 @@ const webrequestInit = function () {
         const requestContext = requestContextStorage.get(requestId);
         if (!requestContext) {
             // Record request for other types
-                    //const { requestId, requestUrl, referrerUrl, originUrl, requestType, tab } = params;
             requestContextStorage.record({
                 requestId,
                 requestUrl,
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,6 @@ @@
      * along with Adguard Browser Extension.  If not, see <http://www.gnu.org/licenses/>.
      */
     /**
      * This is an abstract filtering log module with methods throwing errors if used.
      * It should be replaced by webpack during compilation
@@ Expand Down @@