in new york I milly rock

TerbiumOS · Jun 15, 2024 · dd20dbf · dd20dbf
1 parent 771efbf
commit dd20dbf
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "terbium",
-  "version": "1.44-LTS",
+  "version": "1.45-LTS",
   "description": "A Instance of Terbium WebOS!",
   "type": "module",
   "main": "index.js",

diff --git a/static/index.html b/static/index.html
@@ -20,7 +20,7 @@
                 if ('serviceWorker' in navigator) {
                     await navigator.serviceWorker.register('/sw.js', {
                         scope: '/sw/',
-                    }).then(() => updateTransports());
+                    }).then(updateTransport);
 
                     await navigator.serviceWorker.register('/dynsw.js', {
                         scope: '/dyn/',
@@ -36,15 +36,16 @@
 
             async function updateTransports() {
                 BareMux.registerRemoteListener(navigator.serviceWorker.controller);
+                let transport = localStorage.getItem('transport') || "EpxMod.EpoxyClient"
                 if (window.location.origin.includes('.pages.dev')) {
                     console.log('your static hosting, using TOMP Wisp Server.')
                     let wispserver = "wss://tomp.app/wisp"
-                    BareMux.SetTransport("CurlMod.LibcurlClient", { wisp: wispserver, wasm: "https://cdn.jsdelivr.net/npm/[email protected]/libcurl.wasm" });
+                    BareMux.SetTransport(transport, { wisp: wispserver });
                 } else {
                     console.log('Using Backend Wisp Server, if your static hosting just delete these lines bellow and uncomment out the text bellow')
                     //let wispserver = "wss://tomp.app/wisp" Uncomment if static hosting
                     let wispserver = `${window.location.origin.replace(/^https?:\/\//, 'ws://')}/wisp/`
-                    BareMux.SetTransport("CurlMod.LibcurlClient", { wisp: wispserver, wasm: "https://cdn.jsdelivr.net/npm/[email protected]/libcurl.wasm" });
+                    BareMux.SetTransport(transport, { wisp: wispserver });
                 }
             }
         </script>

diff --git a/static/js/settings.js b/static/js/settings.js
@@ -182,6 +182,7 @@ const customShadow = document.getElementById("customShadow");
 const clearCustomShadow = document.getElementById("clearCustomShadow");
 const login = document.getElementById("login");
 const usedynamic = document.getElementById("dyn");
+const uselibcurl = document.getElementById("libcurl");
 const dockPos = document.querySelectorAll(".dockPos");
 const dockFull = document.getElementById("dockFull");
 const dockOpaque = document.getElementById("dockOpq");
@@ -499,6 +500,14 @@ if (dynVal === "true") {
     usedynamic.checked = false;
 }
 
+const lbVal = localStorage.getItem("transport");
+
+if (lbVal === "CurlMod.LibcurlClient" | null) {
+    uselibcurl.checked = true;
+} else {
+    uselibcurl.checked = false;
+}
+
 function addLogoutButton() {
     const logoutHolder = document.createElement("div");
     logoutHolder.classList.add("sys");
@@ -568,6 +577,19 @@ usedynamic.addEventListener("click", () => {
     }
 })
 
+uselibcurl.addEventListener("click", () => {
+    switch(uselibcurl.checked) {
+        case true:
+            localStorage.setItem("transport", "CurlMod.LibcurlClient");
+            break;
+        case false:
+            localStorage.setItem("transport", "EpxMod.EpoxyClient");
+            break;
+        default:
+            break;
+    }
+})
+
 switch(localStorage.getItem("fullscreen")) {
     case null:
         localStorage.setItem("fullscreen", "no");

diff --git a/static/settings.html b/static/settings.html
@@ -171,6 +171,9 @@ <h3>Browser SearXNG Personalization</h3>
                 <div class="title">
                     <label>Use Dynamic</label><input class="toggle" id="dyn" checked type="checkbox">
                 </div>
+                <div class="title">
+                    <label>Use Libcurl</label><input class="toggle" id="libcurl" checked type="checkbox">
+                </div>
                 <h3>Safe Search</h3>
                 <div class="btns slides">
                     <div class="dropdown">
@@ -195,7 +198,7 @@ <h1>About</h1>
                         <img src="./resources/terbium.png" alt="TB Logo" class="centered-image">
                     </div>
                     <h4 class="centered-text">Terbium WebOS</h4>
-                    <h4 class="centered-text">Version: 1.44 LTS</h4>
+                    <h4 class="centered-text">Version: 1.45 LTS</h4>
                     <h4 class="centered-text">Made By: SNOOT, XSTARS, Raffelisia, Illusions, Riftriot</h4>
                     <h4 class="centered-text">(C) Copyright 2024 TerbiumOS Group All Rights Reserved</h4>
                     <h4 class="centered-text">Licensed under the <a href="https://github.com/TerbiumOS/webOS/blob/main/LICENSE" target="_blank">Apache 2.0 License</a></h4>

diff --git a/static/sw.js b/static/sw.js
@@ -6,22 +6,29 @@
  * However, if a user changes the location of uv.bundle.js/uv.config.js or sw.js is not relative to them, they will need to modify this script locally.
  */
 try {
-    importScripts('/libcurl/index.js');
-    importScripts('/baremux/bare.js');
-    importScripts('/uv/uv.bundle.js');
-    importScripts('/uv/uv.config.js');
-    importScripts('/uv/uv.sw.js');
-
-    const sw = new UVServiceWorker();
-
-    self.addEventListener('fetch', (event) => {
-      event.respondWith(sw.fetch(event));
-    });
-
-    sw.on('request', (event) => {
+  importScripts('/uv/uv.bundle.js');
+  importScripts('/uv/uv.config.js');
+  importScripts(__uv$config.sw || '/uv/uv.sw.js');
+  importScripts('/libcurl/index.js');
+  importScripts('/epoxy/index.js');
+
+  const uv = new UVServiceWorker();
+
+  self.addEventListener('fetch', event => {
+      event.respondWith(
+          (async ()=>{
+              if (uv.route(event)) {
+                  return await uv.fetch(event);
+              }
+              return await fetch(event.request);
+          })()
+      );
+  });
+
+  uv.on('request', (event) => {
       event.data.headers['user-agent'] =
-        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36 HyperTabs/1.4.0';
-    });
-  } catch (e) {
-    console.error(e);
-  }
+      'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36 HyperTabs/1.4.0';
+  });
+} catch (e) {
+  console.error(e);
+}