Load and loadend event simulation

AdguardTeam · Oct 9, 2024 · 2f927e7 · 2f927e7
1 parent 959076c
commit 2f927e7
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 29 deletions.
diff --git a/src/scriptlets/prevent-xhr.js b/src/scriptlets/prevent-xhr.js
@@ -187,14 +187,33 @@ export function preventXHR(source, propsToMatch, customResponseText) {
          * By using Object.defineProperty, the function ensures
          * that the readyState can be modified and configured appropriately,
          * while allowing the property to be writable.
-         * @param {number} readyState - request status number.
+         * @param {number} state - request status number.
          */
-        const transitionReadyState = (readyState) => {
-            Object.defineProperty(thisArg, 'readyState', {
-                value: readyState,
-                writable: true,
-                configurable: true,
-            });
+        const transitionReadyState = (state) => {
+            if (state === 4) {
+                const {
+                    responseURL,
+                    responseXML,
+                } = forgedRequest;
+
+                // Mock response object
+                Object.defineProperties(thisArg, {
+                    readyState: { value: 4, writable: false },
+                    statusText: { value: 'OK', writable: false },
+                    responseURL: { value: responseURL || thisArg.xhrData.url, writable: false },
+                    responseXML: { value: responseXML, writable: false },
+                    status: { value: 200, writable: false },
+                    response: { value: modifiedResponse, writable: false },
+                    responseText: { value: modifiedResponseText, writable: false },
+                });
+                hit(source);
+            } else {
+                Object.defineProperty(thisArg, 'readyState', {
+                    value: state,
+                    writable: true,
+                    configurable: true,
+                });
+            }
             const stateEvent = new Event('readystatechange');
             thisArg.dispatchEvent(stateEvent);
         };
@@ -211,32 +230,14 @@ export function preventXHR(source, propsToMatch, customResponseText) {
             const progressEvent = new ProgressEvent('progress');
             thisArg.dispatchEvent(progressEvent);
             transitionReadyState(4);
+        });
 
-            hit(source);
-
-            const {
-                responseURL,
-                responseXML,
-            } = forgedRequest;
-
-            // Mock response object
-            Object.defineProperties(thisArg, {
-                readyState: { value: 4, writable: false },
-                statusText: { value: 'OK', writable: false },
-                responseURL: { value: responseURL || thisArg.xhrData.url, writable: false },
-                responseXML: { value: responseXML, writable: false },
-                status: { value: 200, writable: false },
-                response: { value: modifiedResponse, writable: false },
-                responseText: { value: modifiedResponseText, writable: false },
-            });
-
-            // Dispatch final events
+        setTimeout(() => {
             const loadEvent = new ProgressEvent('load');
             thisArg.dispatchEvent(loadEvent);
-
             const loadEndEvent = new ProgressEvent('loadend');
             thisArg.dispatchEvent(loadEndEvent);
-        });
+        }, 1);
 
         nativeOpen.apply(forgedRequest, [thisArg.xhrData.method, thisArg.xhrData.url]);
 

diff --git a/tests/scriptlets/prevent-xhr.test.js b/tests/scriptlets/prevent-xhr.test.js
@@ -96,6 +96,7 @@ if (isSupported) {
             xhrEvents[xhr.readyState - 1] = true;
 
             if (xhr.readyState === 4) {
+                assert.strictEqual(xhr.responseURL, URL, 'URL mocked');
                 assert.ok(xhrEvents.every((event) => event), 'All readyState change events were fired');
                 done();
             }
@@ -691,6 +692,7 @@ if (isSupported) {
 
         const xhr = new XMLHttpRequest();
         xhr.open(METHOD, URL);
+        xhr.send();
         xhr.addEventListener('load', () => {
             done1();
         });
@@ -700,7 +702,6 @@ if (isSupported) {
         xhr.addEventListener('loadend', () => {
             done3();
         });
-        xhr.send();
     });
 
     test('Args, pass unmatched', async (assert) => {