Merge branch 'master' of https://github.com/QuiteAFancyEmerald/Holy-Unblocker

test.js

@@ -125,6 +125,7 @@ async function testCommonJSOnPage() {
     async function testUltraviolet() {
       await page.goto("http://localhost:8080/?q");
 
+<<<<<<< HEAD
       // Wait for the document's readyState to be complete
       await page.waitForFunction(() => document.readyState === "complete");
 
@@ -144,6 +145,33 @@ async function testCommonJSOnPage() {
               );
 
             throw new Error("Your browser doesn't support service workers.");
+=======
+      const testResults = await page.evaluate(async () => {
+        const results = {};
+        await new Promise((resolve) => {
+
+          const waitForDocument = () => document.readyState === "complete"
+          ? resolve()
+          : window.addEventListener("load", resolve);
+
+//        Wait until a service worker is registered before continuing.
+//        Also make sure the document is loaded.
+          const waitForWorker = async () => setTimeout(async () => (await navigator.serviceWorker.getRegistrations()).length >= 1 ? waitForDocument() : waitForWorker(), 1000);
+
+          waitForWorker();
+        });
+
+        if (window.goProx && window.goProx.ultraviolet) {
+          try {
+            const generatedUrl = window.goProx.ultraviolet(
+              "example.com",
+              false
+            );
+            console.log("Generated Ultraviolet URL:", generatedUrl);
+            results.ultraviolet = generatedUrl ? generatedUrl : "failure";
+          } catch (e) {
+            results.ultraviolet = "failure: " + e.message;
+>>>>>>> 9e01004564071a2c3da4a61de0fff7ed566ee933
           }
 
           await navigator.serviceWorker.register(stockSW);

views/assets/js/common-16451543478.js

@@ -334,7 +334,7 @@ const RammerheadEncode = async baseUrl => {
  * 
  * Key: 1 = "stealth"
  *      0 = "window"
- *      Nothing = return as string variable
+ *      Nothing = return URL as a string
  *
  * Examples:
  * Stealth mode -

views/assets/js/register-sw.js

@@ -17,9 +17,9 @@ async function registerSW() {
   let wispUrl = (location.protocol === "https:" ? "wss" : "ws") + "://" + location.host + "/wisp/";
   await BareMux.SetTransport("EpxMod.EpoxyClient", { wisp: wispUrl });
 
-  //When testing proxy support CLEAR service workers from 8080 (oI'lr whatever current port you are using)
+//  When testing proxy support CLEAR service workers from 8080 (or whatever current port you are using)
 
-  //  navigator.serviceWorker.register(stockSW).then(register => register.unregister().then(bool => console.log("Unregistered: " + bool)));
+//  navigator.serviceWorker.register(stockSW).then(register => register.unregister().then(bool => console.log("Unregistered: " + bool)));
 
 }