From c9ce4b5d1adac92cb25aa92d2dd434618d8062a6 Mon Sep 17 00:00:00 2001 From: rift <117926989+Riftriot@users.noreply.github.com> Date: Tue, 12 Mar 2024 13:15:21 -0500 Subject: [PATCH] Revert "Set libcurl as default on ios and update libcurl" This reverts commit 9357f2ed11d350f921d01e671c849985b31d803b. --- package.json | 2 +- src/util/transports.ts | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index b601604..3c8af91 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@fastify/static": "^6.12.0", "@mercuryworkshop/bare-mux": "^1.0.5", "@mercuryworkshop/epoxy-transport": "^1.1.0", - "@mercuryworkshop/libcurl-transport": "^1.2.2", + "@mercuryworkshop/libcurl-transport": "^1.2.1", "@nebula-services/dynamic": "0.7.2-patch.2", "@titaniumnetwork-dev/ultraviolet": "^3.0.0", "@tomphttp/bare-server-node": "2.0.3", diff --git a/src/util/transports.ts b/src/util/transports.ts index b56661f..bd16c8d 100644 --- a/src/util/transports.ts +++ b/src/util/transports.ts @@ -16,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.3/libcurl.wasm" + wasm: "https://cdn.jsdelivr.net/npm/libcurl.js@v0.5.2/libcurl.wasm" }); break; case "bare": @@ -46,9 +46,17 @@ const wispUrl = "/wisp/"; registerRemoteListener(navigator.serviceWorker.controller!); -changeTransport( - localStorage.getItem("transport") || "libcurl", - localStorage.getItem("wispUrl") || wispUrl -); +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 + ); +} export { changeTransport, getTransport };