From bd4d20ba38a153e1c7bd662beabddf429514b679 Mon Sep 17 00:00:00 2001
From: MotorTruck1221 <motortruck1221@protonmail.com>
Date: Fri, 12 Apr 2024 10:42:09 -0600
Subject: [PATCH 1/2] Start fixing...

---
 src/routes.tsx | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/routes.tsx b/src/routes.tsx
index 20bd1c2..ae2fe0d 100644
--- a/src/routes.tsx
+++ b/src/routes.tsx
@@ -7,7 +7,7 @@ import { Radon } from "./pages/Radon";
 import { Settings } from "./pages/Settings/";
 import { AboutBlank } from "./AboutBlank";
 import { Faq } from "./pages/Faq";
-import { SetTransport } from "@mercuryworkshop/bare-mux";
+import { registerRemoteListener } from "@mercuryworkshop/bare-mux";
 
 import "./style.css";
 import "./i18n";
@@ -20,25 +20,14 @@ export default function Routes() {
 
   if ("serviceWorker" in navigator) {
     console.log("am bout to bus");
+    navigator.serviceWorker.ready.then(async (sw) => {
+        //await registerRemoteListener(sw.active!)
+        console.log("More code soon")
+    });
     navigator.serviceWorker
       .register("/sw.js", {
         scope: "/~/"
       })
-      .then(() => {
-        console.log("Service Worker Registered");
-        try {
-          localStorage.setItem("transport", "libcurl");
-          console.log("Setting transport to Libcurl");
-          SetTransport("CurlMod.LibcurlClient", {
-            wisp: wispUrl
-          });
-        } catch {}
-      })
-      .catch((err) => {
-        console.error("Service Worker Failed to Register", err);
-      });
-  } else {
-    alert("err");
   }
   return (
     <LocationProvider>

From 94236a36dca40d93de8fcef2a65a70bcc2917313 Mon Sep 17 00:00:00 2001
From: MotorTruck1221 <motortruck1221@protonmail.com>
Date: Fri, 12 Apr 2024 10:59:17 -0600
Subject: [PATCH 2/2] The bare clients now exist

---
 src/pages/Home.tsx     | 3 ---
 src/pages/Radon.tsx    | 3 +--
 src/routes.tsx         | 4 ++--
 src/util/transports.ts | 2 +-
 vite.config.ts         | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx
index 5314835..d290f2b 100644
--- a/src/pages/Home.tsx
+++ b/src/pages/Home.tsx
@@ -8,7 +8,6 @@ import prod from "./config.json"; // Set prod to true if you wish to load balanc
 import { enc } from "../aes";
 import CloakedHead from "../util/CloakedHead";
 import { useEffect } from "preact/hooks";
-import { setTransport } from "../util/transports";
 import { updateServiceWorkers } from "../util/SWHelper.js";
 
 export function Home() {
@@ -92,8 +91,6 @@ export function Home() {
 
   const handleSubmit = (event) => {
     event.preventDefault();
-    //ensure transport is set
-    setTransport();
     window.location.href =
       "/go/" +
       encodeURIComponent(
diff --git a/src/pages/Radon.tsx b/src/pages/Radon.tsx
index 1369558..d4b24ba 100644
--- a/src/pages/Radon.tsx
+++ b/src/pages/Radon.tsx
@@ -1,11 +1,10 @@
 import { HeaderRoute } from "../components/HeaderRoute";
-import { setTransport } from "../util/transports";
 interface Window {
   __uv$config: any;
 }
 export function Radon() {
   //make sure there is a transport set
-  setTransport();
+  //setTransport();
   return (
     <HeaderRoute>
       <iframe
diff --git a/src/routes.tsx b/src/routes.tsx
index ae2fe0d..a2ffe7b 100644
--- a/src/routes.tsx
+++ b/src/routes.tsx
@@ -8,7 +8,7 @@ import { Settings } from "./pages/Settings/";
 import { AboutBlank } from "./AboutBlank";
 import { Faq } from "./pages/Faq";
 import { registerRemoteListener } from "@mercuryworkshop/bare-mux";
-
+import { setTransport } from './util/transports';
 import "./style.css";
 import "./i18n";
 
@@ -22,7 +22,7 @@ export default function Routes() {
     console.log("am bout to bus");
     navigator.serviceWorker.ready.then(async (sw) => {
         //await registerRemoteListener(sw.active!)
-        console.log("More code soon")
+        setTransport();
     });
     navigator.serviceWorker
       .register("/sw.js", {
diff --git a/src/util/transports.ts b/src/util/transports.ts
index fc052cd..8dd2780 100644
--- a/src/util/transports.ts
+++ b/src/util/transports.ts
@@ -48,7 +48,7 @@ const wispUrl =
   (location.protocol === "https:" ? "wss://" : "ws://") +
   location.host +
   "/wisp/";
-registerRemoteListener(navigator.serviceWorker.controller!);
+//registerRemoteListener(navigator.serviceWorker.controller!);
 
 //if (isIOS) {
 //  console.log("iOS device detected. Bare will be used.");
diff --git a/vite.config.ts b/vite.config.ts
index efcbbe2..8a9bb2c 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -59,7 +59,7 @@ export default defineConfig({
         rewrite: (path) => path.replace(/^\/bare\//, "")
       },
       "/wisp/": {
-        target: "http://ruby.rubynetwork.co/wisp/",
+        target: "http://localhost:3000/",
         changeOrigin: true,
         ws: true,
         rewrite: (path) => path.replace(/^\/wisp\//, "")