fix?

Author: sylvieisnton

proxyServiceValidator.js

@@ -240,51 +240,42 @@ xx                                                  xx
           try {
             results[0].ultraviolet = generatedUrl;
 
-            try {
-              await fetch(generatedUrl, {
-                method: 'GET',
-                mode: 'no-cors',
-                credentials: 'omit',
-                cache: 'no-store',
-              });
-            } catch (_) {
-            }
-
-            // Test to see if the document title for example.com has loaded,
-            // by appending an IFrame to the document and grabbing its content.
-            const testGeneratedUrlHacky = async (url) => {
-              const exampleIFrame = document.createElement('iframe');
-              exampleIFrame.style.display = 'none';
-              document.documentElement.appendChild(exampleIFrame);
-
-              const checkTitle = () => {
-                try {
-                  return (
-                    exampleIFrame.contentWindow.document.title === pageTitle
-                  );
-                } catch (_) {
-                  return false;
-                }
+            const fetchProxiedPage = async (url) => {
+              const out = {
+                status: 0,
+                ok: false,
+                length: 0,
+                hasTitle: false,
+                error: null,
               };
-
-              const waitForDocument = new Promise((resolve) => {
-                exampleIFrame.addEventListener('load', () => {
-                  setTimeout(() => resolve(checkTitle()), 250);
+              const controller = new AbortController();
+              const abortId = setTimeout(() => controller.abort(), 30000);
+              try {
+                const response = await fetch(url, {
+                  method: 'GET',
+                  credentials: 'omit',
+                  cache: 'no-store',
+                  signal: controller.signal,
                 });
-              });
-
-              // Give 30 seconds for the IFrame to load before manually checking.
-              const timeout = new Promise((resolve) => {
-                setTimeout(() => resolve(checkTitle()), 30000);
-              });
-
-              exampleIFrame.src = url;
-              return await Promise.race([waitForDocument, timeout]);
+                out.status = response.status;
+                out.ok = response.ok;
+                const body = await response.text();
+                out.length = body.length;
+                out.hasTitle = body.indexOf('<title>' + pageTitle) !== -1;
+              } catch (e) {
+                out.error = e && e.message ? e.message : String(e);
+              } finally {
+                clearTimeout(abortId);
+              }
+              return out;
             };
 
-            results[1].uvTestPassed =
-              !!results[0].ultraviolet.indexOf(errorPrefix) &&
-              (await testGeneratedUrlHacky(results[0].ultraviolet));
+            const proxiedResult =
+              results[0].ultraviolet.indexOf(errorPrefix) === 0
+                ? { status: 0, ok: false, length: 0, hasTitle: false, error: 'omnibox failure' }
+                : await fetchProxiedPage(results[0].ultraviolet);
+            results[1].uvProxiedResponse = proxiedResult;
+            results[1].uvTestPassed = proxiedResult.ok && proxiedResult.hasTitle;
           } catch (e) {
             results[0].ultraviolet = errorPrefix + ': ' + e.message;
           }
@@ -295,6 +286,11 @@ xx                                                  xx
       );
 
       console.log('Ultraviolet test results:', testResults[0]);
+      if (testResults[1] && testResults[1].uvProxiedResponse)
+        console.log(
+          'Ultraviolet proxied response:',
+          testResults[1].uvProxiedResponse
+        );
       const uvTestPassed =
         testResults[0].ultraviolet &&
         testResults[0].ultraviolet !== 'failure' &&