fix things. libreddit, searxng coming soon ™️

.gitmodules

@@ -1,3 +1,7 @@
 [submodule "views/archive"]
 	path = views/archive
-	url = https://github.com/QuiteAFancyEmerald/HU-Archive.git
+	url = https://github.com/QuiteAFancyEmerald/HU-Archive.git
+
+[submodule "views/archive/osu"]
+	path = views/archive/osu
+	url = https://github.com/BlaNKtext/webosu.git

src/config.json

@@ -1,6 +1,6 @@
 {
     "title": "HU OSS",
-    "port": "8080",
+    "port": "8081",
     "ssl": false,
     "ws": true,
     "prefix": "/service/",

src/server.mjs

@@ -22,6 +22,12 @@ const router = express.Router();
 const bare = createBareServer('/bare/');
 const rh = createRammerhead();
 
+app.get('/baremux/bare.cjs', (req, res) => {
+    res.setHeader('Content-Type', 'application/javascript');
+    res.sendFile(path.join(baremuxPath, 'bare.cjs'));
+});
+
+
 const rammerheadScopes = [
     '/rammerhead.js',
     '/hammerhead.js',

views/assets/js/common-16451543478.js

@@ -59,9 +59,6 @@ const xor = {
     },
 };
 
-const stockSW = "/uv/sw.js";
-const swAllowedHostnames = ["localhost", "127.0.0.1"];
-
 /* To use:
  * goProx.proxy(url-string, stealth-boolean-optional)
  *
@@ -268,18 +265,23 @@ async function RammerheadEncode(baseUrl) {
     });
 }
 
+function uvUrl(url) {
+    return location.origin + __uv$config.prefix + __uv$config.encodeUrl(url);
+};
+
 window.goProx = {
+    // `location.protocol + "//" + getDomain()` more like `location.origin`
     ultraviolet: function (url, stealth) {
         setAuthCookie("__cor_auth=1", false);
-        goToUrl(location.protocol + "//" + getDomain() + __uv$config.prefix + __uv$config.encodeUrl(omnibox(url)), stealth);
+        goToUrl(location.origin + __uv$config.prefix + __uv$config.encodeUrl(omnibox(url)), stealth);
     },
     womginx: function (url, stealth) {
         setAuthCookie("wgauth=yes", false);
         goToUrl(location.protocol + "//a." + getDomain() + "/main/" + omnibox(url), stealth);
     },
     rammerhead: async function (url, stealth) {
-        goToUrl(location.protocol + "//" + getDomain() + await RammerheadEncode(omnibox(url)), stealth);
+        goToUrl(location.origin + await RammerheadEncode(omnibox(url)), stealth);
-    }, // i spent like 20 mins just to realize i had to make it async
+    },
     searx: function (stealth) {
         setAuthCookie("oldsmobile=badcar", false);
         goToUrl(location.protocol + "//c." + getDomain() + "/engine/", stealth);
@@ -293,50 +295,50 @@ window.goProx = {
     },
     osu: function (stealth) {
         setAuthCookie("osauth=true", false);
-        goToUrl(location.protocol + "//osu." + getDomain() + "/index.html", stealth);
+        goToUrl(location.origin + '/archive/osu', stealth);
     },
     mcnow: function (stealth) {
         setAuthCookie("__cor_auth=1", false);
-        goToUrl(location.protocol + "//" + getDomain() + __uv$config.prefix + __uv$config.encodeUrl('https://now.gg/play/mojang/2534/minecraft-trial'), stealth);
+        goToUrl(location.origin + __uv$config.prefix + __uv$config.encodeUrl('https://now.gg/play/mojang/2534/minecraft-trial'), stealth);
     },
     glife: function (stealth) {
         setAuthCookie("__cor_auth=1", false);
-        goToUrl(location.protocol + "//" + getDomain() + __uv$config.prefix + __uv$config.encodeUrl('https://now.gg/play/lunime/5767/gacha-life'), stealth);
+        goToUrl(location.origin + __uv$config.prefix + __uv$config.encodeUrl('https://now.gg/play/lunime/5767/gacha-life'), stealth);
     },
     roblox: function (stealth) {
         setAuthCookie("__cor_auth=1", false);
-        goToUrl(location.protocol + "//" + getDomain() + __uv$config.prefix + __uv$config.encodeUrl('https://now.gg/play/roblox-corporation/5349/roblox'), stealth);
+        goToUrl(location.origin + __uv$config.prefix + __uv$config.encodeUrl('https://now.gg/play/roblox-corporation/5349/roblox'), stealth);
     },
     amongus: function (stealth) {
         setAuthCookie("__cor_auth=1", false);
-        goToUrl(location.protocol + "//" + getDomain() + __uv$config.prefix + __uv$config.encodeUrl('https://now.gg/play/innersloth-llc/4047/among-us'), stealth);
+        goToUrl(location.origin + __uv$config.prefix + __uv$config.encodeUrl('https://now.gg/play/innersloth-llc/4047/among-us'), stealth);
     },
     pubg: function (stealth) {
         setAuthCookie("__cor_auth=1", false);
-        goToUrl(location.protocol + "//" + getDomain() + __uv$config.prefix + __uv$config.encodeUrl('https://now.gg/play/proxima-beta/2609/pubg-mobile-resistance'), stealth);
+        goToUrl(location.origin + __uv$config.prefix + __uv$config.encodeUrl('https://now.gg/play/proxima-beta/2609/pubg-mobile-resistance'), stealth);
     },
     train: function (stealth) {
         setAuthCookie("wgauth=yes", false);
-        goToUrl(location.protocol + "//" + getDomain() + __uv$config.prefix + __uv$config.encodeUrl('v6p9' + 'd9t4.ssl.hw' + 'cdn.net/html/1970' + '387/index.ht' + 'ml'), stealth);
+        goToUrl(location.origin + __uv$config.prefix + __uv$config.encodeUrl('v6p9' + 'd9t4.ssl.hw' + 'cdn.net/html/1970' + '387/index.ht' + 'ml'), stealth);
     },
     village: function (stealth) {
         setAuthCookie("wgauth=yes", false);
-        goToUrl(location.protocol + "//" + getDomain() + __uv$config.prefix + __uv$config.encodeUrl('v6p' + '9d9t4.ss' + 'l.hwcd' + 'n.net/html/3' + '626475/index.html'), stealth);
+        goToUrl(location.origin + __uv$config.prefix + __uv$config.encodeUrl('v6p' + '9d9t4.ss' + 'l.hwcd' + 'n.net/html/3' + '626475/index.html'), stealth);
     },
     prison: function (stealth) {
         setAuthCookie("wgauth=yes", false);
-        goToUrl(location.protocol + "//" + getDomain() + __uv$config.prefix + __uv$config.encodeUrl('v6p' + '9d9t4.ssl.hwc' + 'dn.net/h' + 'tml/364' + '7099/index.html'), stealth);
+        goToUrl(location.origin + __uv$config.prefix + __uv$config.encodeUrl('v6p' + '9d9t4.ssl.hwc' + 'dn.net/h' + 'tml/364' + '7099/index.html'), stealth);
     },
     rpg: function (stealth) {
         setAuthCookie("wgauth=yes", false);
-        goToUrl(location.protocol + "//" + getDomain() + __uv$config.prefix + __uv$config.encodeUrl('v6p9d9' + 't4.ssl.hwc' + 'dn.net/html/347' + '0524/Die%20in%20the%20Du' + 'ngeon%201.1%20[WEB]/index.html'), stealth);
+        goToUrl(location.origin + __uv$config.prefix + __uv$config.encodeUrl('v6p9d9' + 't4.ssl.hwc' + 'dn.net/html/347' + '0524/Die%20in%20the%20Du' + 'ngeon%201.1%20[WEB]/index.html'), stealth);
     },
     speed: function (stealth) {
         setAuthCookie("wgauth=yes", false);
-        goToUrl(location.protocol + "//" + getDomain() + __uv$config.prefix + __uv$config.encodeUrl('v6p9' + 'd9t4.ssl.hw' + 'cdn.net/html/36' + '28752/index.html'), stealth);
+        goToUrl(location.origin + __uv$config.prefix + __uv$config.encodeUrl('v6p9' + 'd9t4.ssl.hw' + 'cdn.net/html/36' + '28752/index.html'), stealth);
     },
     heli: function (stealth) {
         setAuthCookie("wgauth=yes", false);
-        goToUrl(location.protocol + "//" + __uv$config.prefix + __uv$config.encodeUrl('v6p9d' + '9t4.ssl.h' + 'wcdn.net/ht' + 'ml/3605' + '579/Helo%20Sto' + 'rm/index.html'), stealth);
+        goToUrl(location.origin + __uv$config.prefix + __uv$config.encodeUrl('v6p9d' + '9t4.ssl.h' + 'wcdn.net/ht' + 'ml/3605' + '579/Helo%20Sto' + 'rm/index.html'), stealth);
     }
 };

views/assets/js/register-sw.js

@@ -1,16 +1,21 @@
+const stockSW = "/uv/sw.js";
+const swAllowedHostnames = ["localhost", "127.0.0.1"];
+
 async function registerSW() {
-    if (!navigator.serviceWorker) {
+  if (!navigator.serviceWorker) {
-      if (
+    if (
-        location.protocol !== "https:" &&
+      location.protocol !== "https:" &&
-        !swAllowedHostnames.includes(location.hostname)
+      !swAllowedHostnames.includes(location.hostname)
-      )
+    )
-        throw new Error("Service workers cannot be registered without https.");
+      throw new Error("Service workers cannot be registered without https.");
-  
+
-      throw new Error("Your browser doesn't support service workers.");
+    throw new Error("Your browser doesn't support service workers.");
-    }
+  }
-  
+
-    await navigator.serviceWorker.register(stockSW);
+  await navigator.serviceWorker.register(stockSW);
-  
+
-    let wispUrl = (location.protocol === "https:" ? "wss" : "ws") + "://" + location.host + "/wisp/";
+  let wispUrl = (location.protocol === "https:" ? "wss" : "ws") + "://" + location.host + "/wisp/";
-    await BareMux.SetTransport("EpxMod.EpoxyClient", { wisp: wispUrl });
+  await BareMux.SetTransport("EpxMod.EpoxyClient", { wisp: wispUrl });
-  }
+}
+
+registerSW();

views/pages/frame.html

@@ -17,7 +17,6 @@
     <script src="/uv/uv.bundle.js" defer></script>
     <script src="/uv/uv.config.js" defer></script>
     <script src="/assets/js/register-sw.js" defer></script>
-    <script src="/assets/js/search.js" defer></script>
     <!-- Arc widget causes lag on some gams, so it is created by js below if &nolag isn't specified in the querystring -->
 </head>
 

views/pages/nav/games5.html

@@ -12,6 +12,11 @@
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="dns-prefetch" href="https://fonts.googleapis.com">
     <link rel="stylesheet" href="assets/css/styles.css">
+    <script src="/baremux/bare.cjs" defer></script>
+    <script src="/epoxy/index.js" defer></script>
+    <script src="/uv/uv.bundle.js" defer></script>
+    <script src="/uv/uv.config.js" defer></script>
+    <script src="/assets/js/register-sw.js" defer></script>
     <script src="
     https://cdn.jsdelivr.net/npm/tsparticles@3.5/tsparticles.bundle.min.js
     "></script>

views/pages/proxnav/corrosion.html

@@ -18,6 +18,11 @@
     <script src="
     https://cdn.jsdelivr.net/npm/tsparticles@3.5/tsparticles.bundle.min.js
     "></script>
+    <script src="/baremux/bare.cjs" defer></script>
+    <script src="/epoxy/index.js" defer></script>
+    <script src="/uv/uv.bundle.js" defer></script>
+    <script src="/uv/uv.config.js" defer></script>
+    <script src="/assets/js/register-sw.js" defer></script>
 </head>
 
 <body>

views/pages/proxnav/preset/discord.html

@@ -17,7 +17,6 @@
     <script src="/uv/uv.bundle.js" defer></script>
     <script src="/uv/uv.config.js" defer></script>
     <script src="/assets/js/register-sw.js" defer></script>
-    <script src="/assets/js/search.js" defer></script>
     <script src="
     https://cdn.jsdelivr.net/npm/tsparticles@3.5/tsparticles.bundle.min.js
     "></script>
@@ -64,8 +63,8 @@
             </div>
         </div>
     </div>
-    <iframe style="display: none;" id="hu-frame"></iframe>
     <div id="footer" class="fullwidth"><!--FOOTER--></div>
+    <script src="assets/js/common.js"></script>
     <script src="assets/js/links.js"></script>
     <script defer="defer" src="assets/js/particlesjs/particles.js"></script>
 </body>

views/pages/proxnav/preset/reddit.html

@@ -12,6 +12,11 @@
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="dns-prefetch" href="https://fonts.googleapis.com">
     <link rel="stylesheet" href="assets/css/styles.css">
+    <script src="/baremux/bare.cjs" defer></script>
+    <script src="/epoxy/index.js" defer></script>
+    <script src="/uv/uv.bundle.js" defer></script>
+    <script src="/uv/uv.config.js" defer></script>
+    <script src="/assets/js/register-sw.js" defer></script>
     <script src="
     https://cdn.jsdelivr.net/npm/tsparticles@3.5/tsparticles.bundle.min.js
     "></script>
@@ -46,12 +51,6 @@
     </div>
     <div id="footer" class="fullwidth"><!--FOOTER--></div>
     <!-- IMPORTANT-HUCOOKINGINSERT-DONOTDELETE -->
-    <script src="uv/uv.bundle.js"></script>
-    <script src="uv/uv.config.js"></script>
-    <script src="assets/js/register-sw.js"></script>
-    <script>
-        registerSW();
-    </script>
     <script src="assets/js/common.js"></script>
     <script defer="defer" src="assets/js/particlesjs/particles.js"></script>
 </body>

views/pages/proxnav/preset/spotify.html

@@ -15,6 +15,11 @@
     <script src="
     https://cdn.jsdelivr.net/npm/tsparticles@3.5/tsparticles.bundle.min.js
     "></script>
+    <script src="/baremux/bare.cjs" defer></script>
+    <script src="/epoxy/index.js" defer></script>
+    <script src="/uv/uv.bundle.js" defer></script>
+    <script src="/uv/uv.config.js" defer></script>
+    <script src="/assets/js/register-sw.js" defer></script>
 </head>
 
 <body>
@@ -45,12 +50,6 @@
     </div>
     <div id="footer" class="fullwidth"><!--FOOTER--></div>
     <!-- IMPORTANT-HUCOOKINGINSERT-DONOTDELETE -->
-    <script src="uv/uv.bundle.js"></script>
-    <script src="uv/uv.config.js"></script>
-    <script src="assets/js/register-sw.js"></script>
-    <script>
-        registerSW();
-    </script>
     <script src="assets/js/common.js"></script>
     <script defer="defer" src="assets/js/particlesjs/particles.js"></script>
 </body>

views/pages/proxnav/preset/youtube.html

@@ -15,6 +15,11 @@
     <script src="
     https://cdn.jsdelivr.net/npm/tsparticles@3.5/tsparticles.bundle.min.js
     "></script>
+    <script src="/baremux/bare.cjs" defer></script>
+    <script src="/epoxy/index.js" defer></script>
+    <script src="/uv/uv.bundle.js" defer></script>
+    <script src="/uv/uv.config.js" defer></script>
+    <script src="/assets/js/register-sw.js" defer></script>
 </head>
 
 <body>
@@ -45,12 +50,6 @@
     </div>
     <div id="footer" class="fullwidth"><!--FOOTER--></div>
     <!-- IMPORTANT-HUCOOKINGINSERT-DONOTDELETE -->
-    <script src="uv/uv.bundle.js"></script>
-    <script src="uv/uv.config.js"></script>
-    <script src="assets/js/register-sw.js"></script>
-    <script>
-        registerSW();
-    </script>
     <script src="assets/js/common.js"></script>
     <script defer="defer" src="assets/js/particlesjs/particles.js"></script>
 </body>

views/pages/proxnav/ultraviolet.html

@@ -75,25 +75,6 @@
     <script defer="defer" src="assets/js/particlesjs/particles.js"></script>
     <script>
         prSet("ultraviolet");
-
-        async function registerSW() {
-            if (!navigator.serviceWorker) {
-                if (
-                    location.protocol !== "https:" &&
-                    !swAllowedHostnames.includes(location.hostname)
-                )
-                    throw new Error("Service workers cannot be registered without https.");
-
-                throw new Error("Your browser doesn't support service workers.");
-            }
-
-            await navigator.serviceWorker.register(stockSW);
-
-            let wispUrl = (location.protocol === "https:" ? "wss" : "ws") + "://" + location.host + "/wisp/";
-            await BareMux.SetTransport("EpxMod.EpoxyClient", { wisp: wispUrl });
-        }
-        
-        registerSW();
     </script>
 </body>