fix logging in all request scriptlets

AdguardTeam · Nov 1, 2022 · d9ab3c1 · d9ab3c1
1 parent 8d7d5a3
commit d9ab3c1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/src/scriptlets/prevent-fetch.js b/src/scriptlets/prevent-fetch.js
@@ -97,6 +97,9 @@ export function preventFetch(source, propsToMatch, responseBody = 'emptyObj', re
         return;
     }
 
+    // eslint-disable-next-line no-console
+    const log = console.log.bind(console);
+
     let strResponseBody;
     if (responseBody === 'emptyObj') {
         strResponseBody = '{}';
@@ -109,7 +112,7 @@ export function preventFetch(source, propsToMatch, responseBody = 'emptyObj', re
     // Skip disallowed response types
     if (!(responseType === 'default' || responseType === 'opaque')) {
         // eslint-disable-next-line no-console
-        console.log(`Invalid parameter: ${responseType}`);
+        log(`Invalid parameter: ${responseType}`);
         return;
     }
 
@@ -118,8 +121,8 @@ export function preventFetch(source, propsToMatch, responseBody = 'emptyObj', re
         const fetchData = getFetchData(args);
         if (typeof propsToMatch === 'undefined') {
             // log if no propsToMatch given
-            const logMessage = `log: fetch( ${objectToString(fetchData)} )`;
-            hit(source, logMessage);
+            log(`fetch( ${objectToString(fetchData)} )`);
+            hit(source);
             return Reflect.apply(target, thisArg, args);
         }
 

diff --git a/src/scriptlets/prevent-xhr.js b/src/scriptlets/prevent-xhr.js
@@ -95,6 +95,9 @@ export function preventXHR(source, propsToMatch, customResponseText) {
         return;
     }
 
+    // eslint-disable-next-line no-console
+    const log = console.log.bind(console);
+
     let shouldPrevent = false;
     let response = '';
     let responseText = '';
@@ -108,8 +111,8 @@ export function preventXHR(source, propsToMatch, customResponseText) {
         responseUrl = xhrData.url;
         if (typeof propsToMatch === 'undefined') {
             // Log if no propsToMatch given
-            const logMessage = `log: xhr( ${objectToString(xhrData)} )`;
-            hit(source, logMessage);
+            log(`log: xhr( ${objectToString(xhrData)} )`);
+            hit(source);
         } else {
             shouldPrevent = matchRequestProps(propsToMatch);
         }
@@ -135,8 +138,7 @@ export function preventXHR(source, propsToMatch, customResponseText) {
             if (randomText) {
                 responseText = randomText;
             } else {
-                // eslint-disable-next-line no-console
-                console.log(`Invalid range: ${customResponseText}`);
+                log(`Invalid range: ${customResponseText}`);
             }
         }
         // Mock response object

diff --git a/src/scriptlets/trusted-replace-fetch-response.js b/src/scriptlets/trusted-replace-fetch-response.js
@@ -106,8 +106,7 @@ export function trustedReplaceFetchResponse(source, pattern = '', replacement =
 
         if (shouldLog) {
             // log if no propsToMatch given
-            const logMessage = `log: fetch( ${objectToString(fetchData)} )`;
-            log(source, logMessage);
+            log(`fetch( ${objectToString(fetchData)} )`);
             hit(source);
             return Reflect.apply(target, thisArg, args);
         }

diff --git a/src/scriptlets/trusted-replace-xhr-response.js b/src/scriptlets/trusted-replace-xhr-response.js
@@ -102,7 +102,8 @@ export function trustedReplaceXhrResponse(source, pattern = '', replacement = ''
         if (shouldLog) {
             // Log if no propsToMatch given
             const logMessage = `log: xhr( ${objectToString(xhrData)} )`;
-            log(source, logMessage);
+            log(logMessage);
+            hit(source);
             return Reflect.apply(target, thisArg, args);
         }