Merge pull request #246 from MotorTruck1221/bare-clients

Bare clients fix (permanently)

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(

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

src/routes.tsx

@@ -7,8 +7,8 @@ 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 { setTransport } from './util/transports';
 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!)
+        setTransport();
+    });
     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>

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.");

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\//, "")