From 63b20d138832d198089b22fa8f788793a651b6e5 Mon Sep 17 00:00:00 2001
From: wearrrrr <contact@wearr.dev>
Date: Thu, 7 Mar 2024 15:56:43 -0600
Subject: [PATCH] Create STATIC_PATHS export for astro, and make
 TransportManager

---
 index.js                                      |  2 +-
 public/iframe.css                             | 10 +++----
 public/sw.js                                  |  4 +--
 src/components/ProxyRegistrar.astro           | 15 +++++-----
 .../SettingsContent/CloakingTab.astro         |  2 +-
 src/components/TransportManager.astro         | 25 ++++++++++++++++
 src/i18n/utils.ts                             |  2 ++
 src/layouts/Layout.astro                      |  3 +-
 src/pages/[lang]/games.astro                  |  4 +--
 src/pages/[lang]/index.astro                  | 30 +++----------------
 src/pages/[lang]/settings.astro               |  4 +--
 11 files changed, 53 insertions(+), 48 deletions(-)
 create mode 100644 src/components/TransportManager.astro

diff --git a/index.js b/index.js
index 14d30b6..d29d3d0 100644
--- a/index.js
+++ b/index.js
@@ -61,7 +61,7 @@ app.use(function (req, res, next) {
 app.use("/", express.static("dist/client/"));
 app.get("/favicon.ico", (req, res) => {
   res.sendFile(path.join(process.cwd(), "dist/client/favicon.svg"));
-})
+});
 app.get("/search", async (req, res) => {
   try {
     const { query } = req.query;
diff --git a/public/iframe.css b/public/iframe.css
index e6b8a26..530274b 100644
--- a/public/iframe.css
+++ b/public/iframe.css
@@ -1,11 +1,11 @@
 /* CSS for about:blank iframes */
 
 body {
-    margin: 0;
+  margin: 0;
 }
 
 iframe {
-    width: 100%;
-    height: 100%;
-    border: none;
-}
\ No newline at end of file
+  width: 100%;
+  height: 100%;
+  border: none;
+}
diff --git a/public/sw.js b/public/sw.js
index 6689406..ad2434c 100644
--- a/public/sw.js
+++ b/public/sw.js
@@ -1,8 +1,8 @@
-importScripts('/epoxy/index.js');
+importScripts("/epoxy/index.js");
 importScripts("/uv/uv.bundle.js");
 importScripts("/uv.config.js");
 importScripts(__uv$config.sw);
 
 const sw = new UVServiceWorker();
 
-self.addEventListener('fetch', (event) => event.respondWith(sw.fetch(event)));
+self.addEventListener("fetch", (event) => event.respondWith(sw.fetch(event)));
diff --git a/src/components/ProxyRegistrar.astro b/src/components/ProxyRegistrar.astro
index df4bed5..de31ac5 100644
--- a/src/components/ProxyRegistrar.astro
+++ b/src/components/ProxyRegistrar.astro
@@ -62,7 +62,7 @@
         let iframe = newWindowDocument.createElement("iframe");
         iframe.src = await getProxyURL();
         // Inject css into the iframe
-        let css = newWindowDocument.createElement("link")
+        let css = newWindowDocument.createElement("link");
         css.rel = "stylesheet";
         css.href = "/iframe.css";
         newWindowDocument.head.appendChild(css);
@@ -195,8 +195,10 @@
   function updateProxiedFavicon(iframe) {
     let proxiedFavicon = document.getElementById("proxied-favicon");
     if (iframe) {
-        if (iframe.contentDocument) {
-        let favicon = iframe.contentDocument.querySelector("link[rel='icon']") || iframe.contentDocument.querySelector("link[rel*='icon']");
+      if (iframe.contentDocument) {
+        let favicon =
+          iframe.contentDocument.querySelector("link[rel='icon']") ||
+          iframe.contentDocument.querySelector("link[rel*='icon']");
         if (favicon) {
           proxiedFavicon.src = favicon.href;
         } else {
@@ -206,10 +208,8 @@
       }
     }
     setTimeout(() => updateProxiedFavicon(iframe), 400);
-
   }
 
-
   function iframeURLChange(iframe, callback) {
     var lastDispatched = null;
 
@@ -251,15 +251,14 @@
     let urlText = document.getElementById("url-text");
     if (urlText) {
       if (preference === "rammerhead") {
-      let newurl = newURL.slice(
+        let newurl = newURL.slice(
           newURL.indexOf("/" + getCookie("rammerhead-session")) +
             getCookie("rammerhead-session").length +
             2
         );
         if (newurl.length > 30) newurl = newurl.slice(0, 50) + "...";
         urlText.innerText = newurl;
-      }
-      else urlText.innerText = window.__uv$config.decodeUrl(newURL.split(__uv$config.prefix)[1]);
+      } else urlText.innerText = window.__uv$config.decodeUrl(newURL.split(__uv$config.prefix)[1]);
     }
   }
 </script>
diff --git a/src/components/SettingsContent/CloakingTab.astro b/src/components/SettingsContent/CloakingTab.astro
index 2a8c407..4994e7d 100644
--- a/src/components/SettingsContent/CloakingTab.astro
+++ b/src/components/SettingsContent/CloakingTab.astro
@@ -35,7 +35,7 @@ const presetCloaks = [
   {
     cloakTitle: "YouTube",
     favicon: "https://www.youtube.com/s/desktop/0f128ffd/img/favicon_144x144.png",
-  }
+  },
 ];
 ---
 
diff --git a/src/components/TransportManager.astro b/src/components/TransportManager.astro
new file mode 100644
index 0000000..547c467
--- /dev/null
+++ b/src/components/TransportManager.astro
@@ -0,0 +1,25 @@
+<script>
+  import { SetTransport, registerRemoteListener } from "@mercuryworkshop/bare-mux";
+  const wispURLDefault =
+    (location.protocol === "https:" ? "wss://" : "ws://") + location.host + "/wisp/";
+  class TransportManager {
+    private transport = localStorage.getItem("alu__currentTransport") || "EpxMod.EpoxyClient";
+
+    constructor(transport?: string) {
+      if (transport) {
+        this.transport = transport;
+      }
+    }
+    getTransport() {
+      return this.transport;
+    }
+
+    setTransport(transport: string, wispURL = wispURLDefault) {
+      this.transport = transport;
+      SetTransport(transport, { wisp: wispURL });
+    }
+  }
+  const TransportMgr = new TransportManager();
+  registerRemoteListener(navigator.serviceWorker.controller);
+  TransportMgr.setTransport(TransportMgr.getTransport());
+</script>
diff --git a/src/i18n/utils.ts b/src/i18n/utils.ts
index 3277262..6c8d123 100644
--- a/src/i18n/utils.ts
+++ b/src/i18n/utils.ts
@@ -1,5 +1,7 @@
 import { ui, defaultLang } from "./ui";
 
+export const STATIC_PATHS = [{ params: { lang: "en" } }, { params: { lang: "jp" } }];
+
 export function getLangFromUrl(url: URL) {
   // comma lol
   const [, lang] = url.pathname.split("/");
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 2f77df9..714d17b 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -193,7 +193,8 @@ const { title, optionalPreloads } = Astro.props;
         opacity: 0;
         gap: 10px;
       }
-      .top-bar-right, .top-bar-left {
+      .top-bar-right,
+      .top-bar-left {
         display: flex;
         justify-content: center;
         align-items: center;
diff --git a/src/pages/[lang]/games.astro b/src/pages/[lang]/games.astro
index dfd2744..4a7fa55 100644
--- a/src/pages/[lang]/games.astro
+++ b/src/pages/[lang]/games.astro
@@ -3,12 +3,12 @@ import Layout from "../../layouts/Layout.astro";
 import games from "../../json/games.json";
 import GameItem from "../../components/GameItem.astro";
 
-import { getLangFromUrl, useTranslations } from "../../i18n/utils";
+import { STATIC_PATHS, getLangFromUrl, useTranslations } from "../../i18n/utils";
 const lang = getLangFromUrl(Astro.url);
 const t = useTranslations(lang);
 
 export function getStaticPaths() {
-  return [{ params: { lang: "en" } }, { params: { lang: "jp" } }];
+  return STATIC_PATHS;
 }
 ---
 
diff --git a/src/pages/[lang]/index.astro b/src/pages/[lang]/index.astro
index 8542601..336a536 100644
--- a/src/pages/[lang]/index.astro
+++ b/src/pages/[lang]/index.astro
@@ -1,43 +1,21 @@
 ---
 import Layout from "../../layouts/Layout.astro";
 
-import { getLangFromUrl, useTranslations } from "../../i18n/utils";
+import { STATIC_PATHS, getLangFromUrl, useTranslations } from "../../i18n/utils";
 import Link from "../../components/Link.astro";
+import TransportManager from "../../components/TransportManager.astro";
 const lang = getLangFromUrl(Astro.url);
 const t = useTranslations(lang);
 
 export function getStaticPaths() {
-  return [{ params: { lang: "en" } }, { params: { lang: "jp" } }];
+  return STATIC_PATHS;
 }
 ---
 
 <Layout title={t("pages.home")}>
   <script src="/baremux/bare.cjs" is:inline></script>
   <script src="/epoxy/index.js" is:inline></script>
-  <script>
-    import { SetTransport, registerRemoteListener } from "@mercuryworkshop/bare-mux"
-    const wispURLDefault = (location.protocol === "https:" ? "wss://" : "ws://") + location.host + "/wisp/"
-    class TransportManager {
-        private transport = localStorage.getItem("alu__currentTransport") || "EpxMod.EpoxyClient";
-
-        constructor(transport?: string) {
-            if (transport) {
-                this.transport = transport;
-            }
-        }
-        getTransport() {
-            return this.transport;
-        }
-
-        setTransport(transport: string, wispURL = wispURLDefault) {
-            this.transport = transport;
-            SetTransport(transport, { wisp: wispURL });
-        }
-    }
-    const TransportMgr = new TransportManager();
-    registerRemoteListener(navigator.serviceWorker.controller)
-    TransportMgr.setTransport(TransportMgr.getTransport());
-  </script>
+  <TransportManager />
   <div class="main-content">
     <h1 class="title-text">{t("menu.welcome")}</h1>
     <div class="form-wrapper">
diff --git a/src/pages/[lang]/settings.astro b/src/pages/[lang]/settings.astro
index daf05ae..cdf7f68 100644
--- a/src/pages/[lang]/settings.astro
+++ b/src/pages/[lang]/settings.astro
@@ -2,12 +2,12 @@
 import SettingsTablist from "../../components/SettingsTablist.astro";
 import Layout from "../../layouts/Layout.astro";
 
-import { getLangFromUrl, useTranslations } from "../../i18n/utils";
+import { STATIC_PATHS, getLangFromUrl, useTranslations } from "../../i18n/utils";
 const lang = getLangFromUrl(Astro.url);
 const t = useTranslations(lang);
 
 export function getStaticPaths() {
-  return [{ params: { lang: "en" } }, { params: { lang: "jp" } }];
+  return STATIC_PATHS;
 }
 ---