diff --git a/src/pages/Settings/Proxy.tsx b/src/pages/Settings/Proxy.tsx
index 451eb0b..5e8b904 100644
--- a/src/pages/Settings/Proxy.tsx
+++ b/src/pages/Settings/Proxy.tsx
@@ -4,8 +4,8 @@ import Dropdown from "./Dropdown";
import BareInput from "./BareInput";
import WispInput from "./WispInput";
import ProxyInput from "./ProxyInput";
-import { changeTransport } from "../../util/transports";
import { useTranslation } from "react-i18next";
+import TransportDropdown from "./transportDropdown";
const Proxy = ({ id, active }) => {
const { t } = useTranslation();
@@ -118,10 +118,10 @@ const Proxy = ({ id, active }) => {
Select the transport to use
-
diff --git a/src/pages/Settings/transportDropdown.tsx b/src/pages/Settings/transportDropdown.tsx
new file mode 100644
index 0000000..34e80e3
--- /dev/null
+++ b/src/pages/Settings/transportDropdown.tsx
@@ -0,0 +1,76 @@
+import { FaAngleDown } from "react-icons/fa";
+import { useState, useEffect } from "preact/hooks"
+import { changeTransport } from "../../util/transports.ts";
+const wispUrl = localStorage.getItem("wispUrl") || (location.protocol === "https:" ? "wss://" : "ws://") + location.host + "/wisp/";
+
+interface Option {
+ id: string;
+ label: string; // Translations CAN be passed
+}
+
+const TransportDropdown = ({
+ storageKey,
+ options,
+ refresh
+}: {
+ storageKey: string;
+ options: Option[];
+ refresh: boolean;
+}) => {
+ const [isOpen, setIsOpen] = useState(false);
+
+ const [choice, setChoice] = useState(() => {
+ return localStorage.getItem(storageKey) || options[0]?.id || "";
+ });
+
+ // update on localstorage change
+ useEffect(() => {
+ setChoice(localStorage.getItem(storageKey) || options[0]?.id || "");
+ }, [storageKey, options]);
+
+ return (
+
+
setIsOpen(!isOpen)}
+ >
+
+
+
+ {options.find((o) => o.id === choice)?.label}
+
+
+
+
+
+ {isOpen && (
+
+ {options.map((option, index) => (
+
{
+ setIsOpen(false);
+ setChoice(option.id);
+ localStorage.setItem(storageKey, option.id);
+ changeTransport(option.id, wispUrl);
+ if (refresh === true) {
+ window.location.reload();
+ }
+ }}
+ >
+ {option.label}
+
+ ))}
+
+ )}
+
+
+ );
+};
+
+export default TransportDropdown;
diff --git a/src/routes.tsx b/src/routes.tsx
index df9bc6c..da89116 100644
--- a/src/routes.tsx
+++ b/src/routes.tsx
@@ -7,6 +7,7 @@ import { Radon } from "./pages/Radon";
import { Settings } from "./pages/Settings/";
import { AboutBlank } from "./AboutBlank";
import { Faq } from "./pages/Faq";
+import { setTransport } from "./util/transports";
import "./style.css";
import "./i18n";
@@ -20,6 +21,7 @@ export default function Routes() {
})
.then(() => {
console.log("Service worker registered successfully");
+ setTransport();
});
});
}
diff --git a/src/util/SWHelper.js b/src/util/SWHelper.js
index b79b849..651f16a 100644
--- a/src/util/SWHelper.js
+++ b/src/util/SWHelper.js
@@ -16,4 +16,7 @@ function uninstallServiceWorkers() {
});
}
+function reInitServiceWorkers() {
+}
+
export { updateServiceWorkers, uninstallServiceWorkers };
diff --git a/src/util/transports.ts b/src/util/transports.ts
index b58302d..48cf10b 100644
--- a/src/util/transports.ts
+++ b/src/util/transports.ts
@@ -2,6 +2,7 @@ import {
SetTransport,
registerRemoteListener
} from "@mercuryworkshop/bare-mux";
+//import { isIOS } from "./IosDetector";
function changeTransport(transport: string, wispUrl: string) {
switch (transport) {
@@ -15,7 +16,7 @@ function changeTransport(transport: string, wispUrl: string) {
console.log("Setting transport to Libcurl");
SetTransport("CurlMod.LibcurlClient", {
wisp: wispUrl,
- wasm: "https://cdn.jsdelivr.net/npm/libcurl.js@v0.5.2/libcurl.wasm"
+ wasm: "https://cdn.jsdelivr.net/npm/libcurl.js@v0.5.3/libcurl.wasm"
});
break;
case "bare":
@@ -29,7 +30,7 @@ function changeTransport(transport: string, wispUrl: string) {
default:
SetTransport("CurlMod.LibcurlClient", {
wisp: wispUrl,
- wasm: "/libcurl.wasm"
+ wasm: "https://cdn.jsdelivr.net/npm/libcurl.js@v0.5.3/libcurl.wasm"
});
break;
}
@@ -45,10 +46,30 @@ const wispUrl =
"/wisp/";
registerRemoteListener(navigator.serviceWorker.controller!);
+//if (isIOS) {
+// console.log("iOS device detected. Bare will be used.");
+// changeTransport(
+// localStorage.getItem("transport") || "libcurl",
+// localStorage.getItem("wispUrl") || wispUrl
+// );
+//} else {
+// changeTransport(
+// localStorage.getItem("transport") || "bare",
+// localStorage.getItem("wispUrl") || wispUrl
+// );
+//}
-changeTransport(
- localStorage.getItem("transport") || "libcurl",
- localStorage.getItem("wispUrl") || wispUrl
-);
+//changeTransport(
+// localStorage.getItem("transport") || "libcurl",
+// localStorage.getItem("wispUrl") || wispUrl
+//);
-export { changeTransport, getTransport };
+// helper function for ../routes.tsx
+function setTransport() {
+ changeTransport(
+ localStorage.getItem("transport") || "libcurl",
+ localStorage.getItem("wispUrl") || wispUrl
+ );
+}
+
+export { changeTransport, getTransport, setTransport };