From 17a05d44617692b3d581684b86017fa27a13e1bb Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Wed, 20 Mar 2024 23:43:53 -0600 Subject: [PATCH] Fix SW registration errors --- index.html | 27 ++++++++++++++++++++++----- src/routes.tsx | 24 ++++++++++++------------ src/util/transports.ts | 8 ++++++++ vite.config.ts | 6 ++++++ 4 files changed, 48 insertions(+), 17 deletions(-) diff --git a/index.html b/index.html index b43df8d..e7d47cd 100644 --- a/index.html +++ b/index.html @@ -10,6 +10,22 @@ +
@@ -22,11 +38,12 @@ window.location.href = window.location.href; diff --git a/src/routes.tsx b/src/routes.tsx index 15c7498..de52f17 100644 --- a/src/routes.tsx +++ b/src/routes.tsx @@ -14,18 +14,18 @@ import "./i18n"; import { setTransport } from "./util/transports"; export default function Routes() { - if ("serviceWorker" in navigator) { - window.addEventListener("load", () => { - navigator.serviceWorker - .register("/sw.js", { - scope: "/~/" - }) - .then(() => { - console.log("Service worker registered successfully"); - setTransport(); - }); - }); - } + //if ("serviceWorker" in navigator) { + //window.addEventListener("load", () => { + // navigator.serviceWorker + // .register("/sw.js", { + // scope: "/~/" + // }) + // .then(() => { + // console.log("Service worker registered successfully"); + // setTransport(); + // }); + //}); + //} return ( diff --git a/src/util/transports.ts b/src/util/transports.ts index 7850340..06c7471 100644 --- a/src/util/transports.ts +++ b/src/util/transports.ts @@ -4,6 +4,12 @@ import { } from "@mercuryworkshop/bare-mux"; //import { isIOS } from "./IosDetector"; +declare global { + interface Window { + setTransport: () => void; + } +} + function changeTransport(transport: string, wispUrl: string) { switch (transport) { case "epoxy": @@ -72,4 +78,6 @@ function setTransport() { ); } +window.setTransport = setTransport; + export { changeTransport, getTransport, setTransport }; diff --git a/vite.config.ts b/vite.config.ts index e67e9e2..488d763 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -52,6 +52,12 @@ export default defineConfig({ target: "http://localhost:8080/", changeOrigin: true, rewrite: (path) => path.replace(/^\/bare/, "") + }, + "/wisp": { + target: "https://ruby.rubynetwork.co/wisp/", + changeOrigin: true, + ws: true, + rewrite: (path) => path.replace(/^\/wisp/, "") } } }