Merge pull request #403 from Percslol/upstream-master

update to bare-mux v2
QuiteAFancyEmerald · Jul 11, 2024 · 0c9118b · 0c9118b
2 parents dd2d9c1 + f92ba67
commit 0c9118b
Show file tree

Hide file tree

Showing 27 changed files with 17 additions and 988 deletions.
diff --git a/bin/LICENSE b/bin/LICENSE
diff --git a/bin/README.md b/bin/README.md
diff --git a/bin/client.d.ts b/bin/client.d.ts
diff --git a/bin/dist/sw.js b/bin/dist/sw.js
diff --git a/bin/dist/uv.bundle.js b/bin/dist/uv.bundle.js
diff --git a/bin/dist/uv.bundle.js.map b/bin/dist/uv.bundle.js.map
diff --git a/bin/dist/uv.client.js b/bin/dist/uv.client.js
diff --git a/bin/dist/uv.client.js.map b/bin/dist/uv.client.js.map
diff --git a/bin/dist/uv.config.js b/bin/dist/uv.config.js
diff --git a/bin/dist/uv.handler.js b/bin/dist/uv.handler.js
diff --git a/bin/dist/uv.handler.js.map b/bin/dist/uv.handler.js.map
diff --git a/bin/dist/uv.sw.js b/bin/dist/uv.sw.js
diff --git a/bin/dist/uv.sw.js.map b/bin/dist/uv.sw.js.map
diff --git a/bin/lib/index.cjs b/bin/lib/index.cjs
diff --git a/bin/lib/index.d.cts b/bin/lib/index.d.cts
diff --git a/bin/package.json b/bin/package.json
diff --git a/bin/uv.d.ts b/bin/uv.d.ts
diff --git a/package.json b/package.json
@@ -19,16 +19,17 @@
     "author": "Titanium Network",
     "license": "GNU AFFERO",
     "dependencies": {
-        "@mercuryworkshop/bare-mux": "^1.1.0",
-        "@mercuryworkshop/epoxy-transport": "^1.1.0",
+        "@mercuryworkshop/bare-mux": "^2.0.1",
+        "@mercuryworkshop/epoxy-transport": "^2.1.2",
+        "@titaniumnetwork-dev/ultraviolet": "3.2.1",
         "@tomphttp/bare-server-node": "^2.0.3",
         "axios": "^1.7.2",
         "express": "^4.19.2",
         "helmet": "^7.1.0",
         "mime-types": "^2.1.35",
         "puppeteer": "^22.12.1",
         "rammerhead": "https://github.com/NebulaServices/rammerhead/releases/download/rammerhead-1.2.41-nebula.8/rammerhead-1.2.41-nebula.7.tgz",
-        "wisp-server-node": "^1.0.6",
+        "wisp-server-node": "^1.1.0",
         "ws": "^8.18.0"
     }
 }
diff --git a/proxyServiceValidator.js b/proxyServiceValidator.js
@@ -51,8 +51,9 @@ const testServerResponse = async () => {
     "http://localhost:8080/assets/js/links-1644738239.js",
     "http://localhost:8080/assets/js/csel.js",
     "http://localhost:8080/assets/js/particlesjs/particles.js",
-    "http://localhost:8080/baremux/bare.cjs",
-    "http://localhost:8080/epoxy/index.js",
+    "http://localhost:8080/baremux/index.js",
+    "http://localhost:8080/baremux/worker.mjs",
+    "http://localhost:8080/epoxy/index.mjs",
     "http://localhost:8080/uv/uv.bundle.js",
     "http://localhost:8080/uv/uv.config.js",
     "http://localhost:8080/assets/js/register-sw.js",

diff --git a/src/server.mjs b/src/server.mjs
@@ -11,7 +11,7 @@ import { createBareServer } from "@tomphttp/bare-server-node";
 import wisp from "wisp-server-node";
 import { epoxyPath } from "@mercuryworkshop/epoxy-transport";
 import { baremuxPath } from "@mercuryworkshop/bare-mux/node";
-import { uvPath } from "../bin/lib/index.cjs";
+import { uvPath } from "@titaniumnetwork-dev/ultraviolet";
 
 const config = JSON.parse(
   await readFile(new URL("./config.json", import.meta.url))
@@ -24,11 +24,6 @@ router = express.Router(),
 bare = createBareServer("/bare/"),
 rh = createRammerhead();
 
-app.get("/baremux/bare.cjs", (req, res) => {
-  res.setHeader("Content-Type", "application/javascript");
-  res.sendFile(path.join(baremuxPath, "bare.cjs"));
-});
-
 const rammerheadScopes = [
   "/rammerhead.js",
   "/hammerhead.js",