From 0d1d6e5490cbf73d9fffad2d7767bfc59aac1917 Mon Sep 17 00:00:00 2001
From: MotorTruck1221 <motortruck1221@protonmail.com>
Date: Fri, 8 Nov 2024 03:08:29 -0700
Subject: [PATCH] Switch to bare client for omnibox, remove libcurl as a dep

---
 package.json                         |  1 -
 pnpm-lock.yaml                       |  3 ---
 src/components/settings/Loader.astro | 10 ++++++++++
 src/pages/[lang]/index.astro         | 19 ++++++++-----------
 src/utils/libcurl.ts                 | 28 ----------------------------
 src/utils/registerSW.ts              | 27 ++++++++++++++++++++++++++-
 6 files changed, 44 insertions(+), 44 deletions(-)
 delete mode 100644 src/utils/libcurl.ts

diff --git a/package.json b/package.json
index 48d44e4..6272790 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,6 @@
     "fastify": "^5.1.0",
     "form-data": "^4.0.1",
     "gradient-string": "^3.0.0",
-    "libcurl.js-new": "npm:libcurl.js@^0.6.19",
     "nanostores": "^0.10.3",
     "ora": "^8.1.1",
     "pg": "^8.13.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bfa33c0..7144ec5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -83,9 +83,6 @@ importers:
       gradient-string:
         specifier: ^3.0.0
         version: 3.0.0
-      libcurl.js-new:
-        specifier: npm:libcurl.js@^0.6.19
-        version: libcurl.js@0.6.19
       nanostores:
         specifier: ^0.10.3
         version: 0.10.3
diff --git a/src/components/settings/Loader.astro b/src/components/settings/Loader.astro
index 200047d..9827cf3 100644
--- a/src/components/settings/Loader.astro
+++ b/src/components/settings/Loader.astro
@@ -1,5 +1,6 @@
 <script>
     import { settings, Settings } from "@utils/settings/index";
+    import { loadProxyScripts, setTransport, initSw, setSWStuff } from "@utils/registerSW";
     // This loads the settings in a nice way
     settings.tabSettings.cloakTab(localStorage.getItem(Settings.TabSettings.tabCloak) as string || "default");
     settings.proxySettings.changeProxy(localStorage.getItem(Settings.ProxySettings.proxy) as string || "automatic");
@@ -12,4 +13,13 @@
         settings.tabSettings.cloakTab(localStorage.getItem(Settings.TabSettings.tabCloak) as string || "default");
         //settings.marketPlaceSettings.changeTheme(false);
     });
+    document.addEventListener("DOMContentLoaded", async () => {
+        const conn = await loadProxyScripts();
+        await setTransport(
+            conn,
+            localStorage.getItem(Settings.ProxySettings.transport) as string
+        );
+        const sw = await initSw();
+        await setSWStuff({sw, conn});
+    });
 </script>
diff --git a/src/pages/[lang]/index.astro b/src/pages/[lang]/index.astro
index 5e28e7f..d090768 100644
--- a/src/pages/[lang]/index.astro
+++ b/src/pages/[lang]/index.astro
@@ -57,7 +57,7 @@ import { VERSION } from "astro:env/client";
   </div>
 </Layout>
 <script>
-  import { initSw, setTransport, loadProxyScripts } from "@utils/registerSW.ts"; //../../utils/registerSW.ts
+  import { setTransport, getSWStuff } from "@utils/registerSW"; //../../utils/registerSW.ts
   import { pageLoad } from "@utils/events";
   import { SupportedSites } from "@utils/siteSupport";
   import {
@@ -66,8 +66,8 @@ import { VERSION } from "astro:env/client";
     cloak,
     settings,
   } from "@utils/settings/index";
-  import { search } from "@utils/search.ts"; //../../utils/search.ts
-  import { client as libcurlClient } from "@utils/libcurl";
+  import { search } from "@utils/search"; //../../utils/search.ts
+  import { BareClient } from "@mercuryworkshop/bare-mux";
   type Suggestion = {
     phrase: string;
   };
@@ -97,12 +97,11 @@ import { VERSION } from "astro:env/client";
     }
   }
   async function uv(iframe: HTMLIFrameElement, term: string) {
-    const conn = await loadProxyScripts();
+    const { sw, conn } = getSWStuff(); 
     await setTransport(
       conn,
       localStorage.getItem(Settings.ProxySettings.transport) as string
     );
-    const sw = await initSw();
     await settings.marketPlaceSettings.handlePlugins(sw);
     iframe.classList.remove("hidden");
     const url = await proxy(term);
@@ -148,12 +147,10 @@ import { VERSION } from "astro:env/client";
         omnibox.classList.add("hidden");
       }
       if (value.length >= 3) {
-        await libcurlClient.initLibcurl();
-        const data = (await libcurlClient.fetchFromLibcurl(
-          `https://api.duckduckgo.com/ac?q=${encodeURIComponent(value)}&format=json`,
-          "json"
-        )) as [];
-        const filteredData = data.slice(0, 8); //Trim to only about 8 results. Any more and our omnibox dies
+        const client = new BareClient();
+        const data = await client.fetch(`https://api.duckduckgo.com/ac?q=${encodeURIComponent(value)}&format=json`);
+        const dataRes = await data.json();
+        const filteredData = dataRes.slice(0, 8); //Trim to only about 8 results. Any more and our omnibox dies
         if (filteredData) {
           omnibox.innerHTML = "";
           filteredData.map((results: Suggestion) => {
diff --git a/src/utils/libcurl.ts b/src/utils/libcurl.ts
deleted file mode 100644
index 58c3fe1..0000000
--- a/src/utils/libcurl.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { WispServerURLS } from "@utils/settings/index";
-//helper for libcurl as we have to use it in multiple locations and we don't want to re-download the WASM every time
-//@ts-expect-error No types, expected. See: https://github.com/ading2210/libcurl.js for docs on how to use.
-import { libcurl } from "libcurl.js-new/bundled";
-let clientExists: boolean = false;
-async function initLibcurl() {
-    if (!clientExists) {
-        await libcurl.load_wasm();
-        libcurl.set_websocket(WispServerURLS.default);
-        console.debug("Libcurl ready?", libcurl.ready);
-        clientExists = true;
-    }
-}
-
-type fetchType = "json" | "text";
-
-async function fetchFromLibcurl(url: string, type: fetchType): Promise<string | [] | {}> {
-    const res = await libcurl.fetch(url);
-    const data = type === "json" ? await res.json() : await res.text();
-    return data;
-}
-
-const client = {
-    initLibcurl,
-    fetchFromLibcurl
-};
-
-export { client };
diff --git a/src/utils/registerSW.ts b/src/utils/registerSW.ts
index e09e427..6262f88 100644
--- a/src/utils/registerSW.ts
+++ b/src/utils/registerSW.ts
@@ -1,5 +1,9 @@
 import { BareMuxConnection } from "@mercuryworkshop/bare-mux";
 import { Settings, WispServerURLS } from "./settings/index";
+
+let baremuxConn: BareMuxConnection;
+let swReg: ServiceWorkerRegistration;
+
 function loadProxyScripts() {
     //wrap everything in a promise to avoid race conditions
     return new Promise<BareMuxConnection>((resolve) => {
@@ -57,4 +61,25 @@ function initSw() {
     });
 }
 
-export { initSw, setTransport, loadProxyScripts };
+interface SWStuff {
+    sw: ServiceWorkerRegistration;
+    conn: BareMuxConnection;
+}
+
+function setSWStuff(stuff: SWStuff): Promise<void> {
+    return new Promise<void>((resolve) => {
+        swReg = stuff.sw;
+        baremuxConn = stuff.conn;
+        resolve();
+    });
+}
+
+function getSWStuff(): SWStuff {
+    const stuff: SWStuff = {
+        sw: swReg,
+        conn: baremuxConn
+    }
+    return stuff;
+}
+
+export { initSw, setTransport, loadProxyScripts, setSWStuff, getSWStuff };