im going insane

package.json

@@ -12,9 +12,10 @@
     "author": "Polaris Development Group",
     "license": "GNU-3.0-or-later",
     "dependencies": {
-        "@mercuryworkshop/bare-mux": "^1.0.5",
-        "@mercuryworkshop/epoxy-transport": "^1.1.0",
-        "@titaniumnetwork-dev/ultraviolet": "^3.0.0",
+        "@mercuryworkshop/bare-mux": "^2.0.4",
+        "@mercuryworkshop/epoxy-transport": "^2.1.18",
+        "@mercuryworkshop/libcurl-transport": "1.3.10",
+        "@titaniumnetwork-dev/ultraviolet": "^3.2.7",
         "cors": "^2.8.5",
         "express": "^4.18.3",
         "html-minifier": "^4.0.0",
@@ -22,6 +23,6 @@
         "jsdom": "^23.0.1",
         "mime": "^4.0.1",
         "uuid": "^9.0.1",
-        "wisp-server-node": "^1.0.1"
+        "wisp-server-node": "^1.1.3"
     }
 }

server/index.js

@@ -1,6 +1,6 @@
 import { epoxyPath } from '@mercuryworkshop/epoxy-transport';
 import { uvPath } from '@titaniumnetwork-dev/ultraviolet';
-import { baremuxPath } from '@mercuryworkshop/bare-mux';
+import { baremuxPath } from '@mercuryworkshop/bare-mux/node';
 import wisp from 'wisp-server-node';
 import express from 'express';
 import mime from 'mime';
@@ -23,9 +23,9 @@ const packageFile = JSON.parse(fs.readFileSync(path.join(__dirname, '../package.
 
 const swPaths = [
     '/uv/sw.js',
-    '/assets/js/offline.js'
 ];
 
+
 app.use(express.json());
 
 api(app);
@@ -116,26 +116,12 @@ app.use(async (req, res, next) => {
     }
 });
 
-app.use('/uv/', express.static(uvPath, {
-    setHeaders: (res, path) => {
-        if (path.endsWith('.cjs')) res.setHeader('Content-Type', 'text/javascript');
-    }
-}));
-app.use('/epoxy/', express.static(epoxyPath, {
-    setHeaders: (res, path) => {
-        if (path.endsWith('.cjs')) res.setHeader('Content-Type', 'text/javascript');
-    }
-}));
-app.use('/baremux/', express.static(baremuxPath, {
-    setHeaders: (res, path) => {
-        if (path.endsWith('.cjs')) res.setHeader('Content-Type', 'text/javascript');
-    }
-}));
 
-app.use(async (req, res) => {
-    res.setHeader('content-type', 'text/html');
-    res.status(404).end(await rewriter.html(fs.readFileSync(path.join(__dirname, '../pages/404.html'))));
-});
+app.get('/uv/service/*', async (req, res) => res.end(await rewriter.html(fs.readFileSync(path.join(__dirname, '../pages/proxy_404.html')))));
+
+app.use('/uv/', express.static(uvPath));
+app.use("/epoxy/", express.static(epoxyPath));
+app.use("/baremux/", express.static(baremuxPath));
 
 server.on('request', (req, res) => {
     app(req, res);

static/assets/js/main.js

@@ -1,4 +1,4 @@
-import { createViewPage, isValidURL, getVH, CrossTabCommunication, PolarisError, storage } from './utils.js';
+import { createViewPage, isValidURL, getVH, PolarisError, storage } from './utils.js';
 import { loadSettings, loadSidebarInterface } from './settings.js';
 import loadEasterEggs from './eastereggs.js';
 import loadAnalytics from './analytics.js';

static/uv/sw.js

@@ -5,6 +5,16 @@ importScripts('/uv/uv.bundle.js');
 importScripts('/uv/uv.config.js');
 importScripts(__uv$config.sw || '/uv/uv.sw.js');
 
-const sw = new UVServiceWorker();
+const uv = new UVServiceWorker();
 
-self.addEventListener('fetch', (event) => event.respondWith(sw.fetch(event)));
+async function handleRequest(event) {
+    if (uv.route(event)) {
+        return await uv.fetch(event);
+    }
+    
+    return await fetch(event.request)
+}
+
+self.addEventListener('fetch', (event) => {
+    event.respondWith(handleRequest(event));
+});