From 9a2306a9a8156b56ebf80a2ce93944ced4993aaa Mon Sep 17 00:00:00 2001
From: MotorTruck1221 <motortruck1221@protonmail.com>
Date: Sat, 28 Sep 2024 15:12:27 -0600
Subject: [PATCH] Revert "It builds, but now the page crashes :fire:"

This reverts commit b716dc5b3502e045b9fe6765c10749320c091d85.
---
 package.json                               |  2 +-
 pnpm-lock.yaml                             |  9 +++++++--
 src/components/settings/SettingsCard.astro |  2 +-
 src/pages/[lang]/index.astro               | 12 +++++-------
 src/pages/[lang]/settings/tab.astro        |  2 +-
 tsconfig.json                              | 20 ++++++++++----------
 6 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 91a81be..acd2e2c 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "@fastify/static": "^7.0.4",
     "@iconify-json/ph": "^1.2.0",
     "@mercuryworkshop/bare-mux": "1.1.1",
-    "@mercuryworkshop/epoxy-tls": "2.0.0-3",
+    "@mercuryworkshop/epoxy-tls": "2.1.4-1",
     "@mercuryworkshop/epoxy-transport": "2.0.1",
     "@titaniumnetwork-dev/ultraviolet": "3.1.2",
     "astro": "^4.15.9",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 732fd6d..9f29cea 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -33,8 +33,8 @@ importers:
         specifier: 1.1.1
         version: 1.1.1
       '@mercuryworkshop/epoxy-tls':
-        specifier: 2.0.0-3
-        version: 2.0.0-3
+        specifier: 2.1.4-1
+        version: 2.1.4-1
       '@mercuryworkshop/epoxy-transport':
         specifier: 2.0.1
         version: 2.0.1(bufferutil@4.0.8)(typescript@5.6.2)(utf-8-validate@6.0.4)
@@ -597,6 +597,9 @@ packages:
   '@mercuryworkshop/epoxy-tls@2.0.0-3':
     resolution: {integrity: sha512-iC5CViTh2xn44xtjvDW4YW9qoeoJcCBOqcNmffBx3RHdK7FAzAWFHLTUBtdlnMVv6cjYZtV+eUTzxyreqlgOVA==}
 
+  '@mercuryworkshop/epoxy-tls@2.1.4-1':
+    resolution: {integrity: sha512-kRbW12tU4TAf9GuoLfyFYvUATqFZq6n9ScRSfwAECceOBWDlr+bACnSH45lLDXvjBKwxZotTyYE5aNc+Ow+M3Q==}
+
   '@mercuryworkshop/epoxy-transport@2.0.1':
     resolution: {integrity: sha512-iGuH/CT5hCVRYBa+5ZrlTG0DWII9VOCMHnmv9CPFLM17obE84y9EUXpTp9hXdfENnuAcNzQVPizjwVas7HiYQA==}
 
@@ -4128,6 +4131,8 @@ snapshots:
 
   '@mercuryworkshop/epoxy-tls@2.0.0-3': {}
 
+  '@mercuryworkshop/epoxy-tls@2.1.4-1': {}
+
   '@mercuryworkshop/epoxy-transport@2.0.1(bufferutil@4.0.8)(typescript@5.6.2)(utf-8-validate@6.0.4)':
     dependencies:
       '@mercuryworkshop/epoxy-tls': 2.0.0-3
diff --git a/src/components/settings/SettingsCard.astro b/src/components/settings/SettingsCard.astro
index e2636e9..6aaa0f0 100644
--- a/src/components/settings/SettingsCard.astro
+++ b/src/components/settings/SettingsCard.astro
@@ -46,7 +46,7 @@ const { title, description, input, select, button } = Astro.props;
                 ))}
             </select>
         }
-        <button id={button.id} class="w-36 h-10 rounded-md border border-input-border-color text-input-text bg-input hover:border-input hover:bg-input-border-color hover:text-input hover:font-bold active:bg-input active:text-input-text transition-all duration-200"> 
+        <button id={button.id.replace(/[^a-zA-Z0-9]/g, '').toLowerCase()} class="w-36 h-10 rounded-md border border-input-border-color text-input-text bg-input hover:border-input hover:bg-input-border-color hover:text-input hover:font-bold active:bg-input active:text-input-text transition-all duration-200"> 
             {button.name}
         </button>
     </div>
diff --git a/src/pages/[lang]/index.astro b/src/pages/[lang]/index.astro
index 6af2c3a..c96b2ad 100644
--- a/src/pages/[lang]/index.astro
+++ b/src/pages/[lang]/index.astro
@@ -43,12 +43,11 @@ const t = useTranslations(lang);
 <script>
     import { initSw, wispUrl } from "@utils/registerSW.ts"; //../../utils/registerSW.ts
     import { search } from "@utils/search.ts"; //../../utils/search.ts
-    import epoxy from "@mercuryworkshop/epoxy-tls";
-    //@ts-ignore
-    import ROOTS from "@mercuryworkshop/epoxy-tls/certs";
+    import initEpoxy, { EpoxyClient, EpoxyClientOptions } from "@mercuryworkshop/epoxy-tls";
     type Suggestion =  {
         phrase: string
     }
+    await initEpoxy();
     function proxy(term: string) {
         return __uv$config!.prefix + __uv$config.encodeUrl!(search(term, "https://www.google.com/search?q=%s"));
     }
@@ -71,12 +70,11 @@ const t = useTranslations(lang);
             })
             input?.addEventListener("input", async function() {
                 console.log("EA");
-                const { EpoxyClient, EpoxyClientOptions } = await epoxy(); //This ONLY runs once 
+                await initEpoxy(); //This ONLY runs once 
                 if (!epoxyClient) {
                     console.debug("Creating epoxy client");
-                    epoxyClientOptions = await new EpoxyClientOptions();
-		            epoxyClientOptions.udp_extension_required = false;
-                    epoxyClient = await new EpoxyClient(wispUrl, ROOTS, epoxyClientOptions);
+                    epoxyClientOptions = new EpoxyClientOptions();
+                    epoxyClient = new EpoxyClient(wispUrl, epoxyClientOptions);
                 }
                 const value = input?.value;
                 console.log(value);
diff --git a/src/pages/[lang]/settings/tab.astro b/src/pages/[lang]/settings/tab.astro
index 6483720..de8c7f2 100644
--- a/src/pages/[lang]/settings/tab.astro
+++ b/src/pages/[lang]/settings/tab.astro
@@ -30,7 +30,7 @@ export const prerender = true;
                     {name: 'Google', value: 'google', disabled: false }, 
                     { name: 'Wikipedia', value: 'wikipedia', disabled: false}
                     ] }}>
-            </SettingsCard>
+            </SettingsCard
             <SettingsCard
                 title="A:B & Blob" 
                 description="Choose to open your tab in about:blank or blob" 
diff --git a/tsconfig.json b/tsconfig.json
index 814e7f2..2ff3b69 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,12 +1,12 @@
 {
-    "extends": "astro/tsconfigs/strict",
-    "exclude": ["dist/**", "node_modules/**", "public/**", "src/ts/rammerhead.ts"],
-    "compilerOptions": {
-        "baseUrl": ".",
-        "paths": {
-            "@components/*": ["src/components/*"],
-            "@layouts/*": ["src/layouts/*"],
-            "@utils/*": ["src/utils/*"]
-        }
-    }
+  "extends": "astro/tsconfigs/strict",
+  "include": ["src"],
+  "compilerOptions": {
+      "baseUrl": ".",
+      "paths": {
+          "@components/*": ["src/components/*"],
+          "@layouts/*": ["src/layouts/*"],
+          "@utils/*" : ["src/utils/*"]
+      }
+  }
 }