Merge branch 'feature/AG-16687_01' of ssh://bit.adguard.com:7999/adgu…

…ard-filters/scriptlets into feature/AG-16687_01
AdguardTeam · Oct 17, 2022 · 18a5a61 · 18a5a61
2 parents 93efce6 + 0976bb9
commit 18a5a61
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/src/scriptlets/xml-prune.js b/src/scriptlets/xml-prune.js
@@ -65,14 +65,12 @@ export function xmlPrune(source, propsToRemove, optionalProp = '', urlToMatch) {
     }
 
     let shouldPruneResponse = true;
-    let shouldLogResponse = false;
     // eslint-disable-next-line no-console
     const log = console.log.bind(console);
     if (!propsToRemove) {
         // If "propsToRemove" is not defined, then response shouldn't be pruned
         // but it should be logged in browser console
         shouldPruneResponse = false;
-        shouldLogResponse = true;
     }
 
     const urlMatchRegexp = toRegExp(urlToMatch);
@@ -125,15 +123,12 @@ export function xmlPrune(source, propsToRemove, optionalProp = '', urlToMatch) {
                 if (thisArg.readyState === 4) {
                     const { response } = thisArg;
                     thisArg.removeEventListener('readystatechange', pruneResponse);
-                    if (!shouldPruneResponse && shouldLogResponse) {
+                    if (!shouldPruneResponse) {
                         if (isXML(response)) {
                             log(`XMLHttpRequest.open() URL: ${xhrURL}\nresponse: ${response}`);
                         }
                     } else {
-                        shouldPruneResponse = true;
                         const prunedResponseContent = pruneXML(response);
-                        // pruneXML set shouldPruneResponse to false
-                        // in case if response shouldn't be pruned
                         if (shouldPruneResponse) {
                             Object.defineProperty(thisArg, 'response', {
                                 value: prunedResponseContent,
@@ -143,6 +138,11 @@ export function xmlPrune(source, propsToRemove, optionalProp = '', urlToMatch) {
                             });
                             hit(source);
                         }
+                        // In case if response shouldn't be pruned
+                        // pruneXML sets shouldPruneResponse to false
+                        // so it's necessary to set it to true again
+                        // otherwise response will be only logged
+                        shouldPruneResponse = true;
                     }
                 }
             });
@@ -167,15 +167,12 @@ export function xmlPrune(source, propsToRemove, optionalProp = '', urlToMatch) {
         if (urlMatchRegexp.test(fetchURL)) {
             return nativeFetch.apply(this, args).then((response) => {
                 return response.text().then((text) => {
-                    if (!shouldPruneResponse && shouldLogResponse) {
+                    if (!shouldPruneResponse) {
                         if (isXML(text)) {
                             log(`fetch URL: ${fetchURL}\nresponse text: ${text}`);
                         }
                         return Reflect.apply(target, thisArg, args);
                     }
-                    shouldPruneResponse = true;
-                    // pruneXML set shouldPruneResponse to false
-                    // in case if response shouldn't be pruned
                     const prunedText = pruneXML(text);
                     if (shouldPruneResponse) {
                         hit(source);
@@ -185,6 +182,11 @@ export function xmlPrune(source, propsToRemove, optionalProp = '', urlToMatch) {
                             headers: response.headers,
                         });
                     }
+                    // In case if response shouldn't be pruned
+                    // pruneXML sets shouldPruneResponse to false
+                    // so it's necessary to set it to true again
+                    // otherwise response will be only logged
+                    shouldPruneResponse = true;
                     return Reflect.apply(target, thisArg, args);
                 });
             });