switched back to wisp because tgt's gonna fucking bully me

DogeNetwork · Aug 19, 2024 · 1f2fcec · 1f2fcec
1 parent 13a5f35
commit 1f2fcec
Show file tree

Hide file tree

Showing 14 changed files with 99 additions and 105 deletions.
diff --git a/index.js b/index.js
@@ -1,20 +1,18 @@
 import express from 'express';
 import http from 'node:http';
 import path from 'node:path';
-import { createBareServer } from "@tomphttp/bare-server-node";
-import { bareModulePath } from "@mercuryworkshop/bare-as-module3";
+import { libcurlPath } from "@mercuryworkshop/libcurl-transport";
 import { baremuxPath } from "@mercuryworkshop/bare-mux/node";
+import wisp from "wisp-server-node";
 import request from '@cypress/request';
 import chalk from 'chalk';
 import packageJson from './package.json' assert { type: 'json' };
-// Removed libcurl and replaced it with Bare
-// For some reason using Bare is faster (Isn't bare supposed to suck)
+
 const __dirname = path.resolve();
 const server = http.createServer();
 const app = express(server);
 const version = packageJson.version;
 const discord = 'https://discord.gg/unblocking';
-const bareServer = createBareServer("/bear/");
 
 app.use(express.json());
 app.use(
@@ -23,8 +21,8 @@ app.use(
   })
 );
 
+app.use("/libcurl/", express.static(libcurlPath));
 app.use("/baremux/", express.static(baremuxPath));
-app.use("/baremod/", express.static(bareModulePath));
 app.use(express.static(path.join(__dirname, 'static')));
 
 app.get('/app', (req, res) => {
@@ -65,19 +63,13 @@ app.use((req, res) => {
 });
 
 server.on("request", (req, res) => {
-  if (bareServer.shouldRoute(req)) {
-    bareServer.routeRequest(req, res);
-  } else {
-    app(req, res);
-  }
+  app(req, res);
 });
 
 server.on("upgrade", (req, socket, head) => {
-  if (bareServer.shouldRoute(req)) {
-    bareServer.routeUpgrade(req, socket, head);
-  } else {
-    socket.end();
-  }
+  if (req.url.endsWith("/wisp/")) {
+    wisp.routeRequest(req, socket, head);
+  } else socket.end();
 });
 
 server.on('listening', () => {

diff --git a/package.json b/package.json
@@ -15,10 +15,10 @@
   "license": "GPL-3.0-or-later",
   "dependencies": {
     "@cypress/request": "^3.0.0",
-    "@mercuryworkshop/bare-as-module3": "^2.2.2",
     "@mercuryworkshop/bare-mux": "^2.0.4",
-    "@tomphttp/bare-server-node": "2.0.3",
+    "@mercuryworkshop/libcurl-transport": "^1.3.7",
+    "wisp-server-node": "^1.1.3",
     "chalk": "^5.3.0",
     "express": "^4.18.2"
   }
-}
+}
diff --git a/static/404.html b/static/404.html
@@ -4,12 +4,12 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta name="robots" content="noindex">
   <link rel="icon" id="icon" href="/assets/img/doge.jpg">
-  <link rel="stylesheet" href="/assets/css/app.css?v=1.3">
-  <link rel="stylesheet" href="/assets/css/menu.css?v=1.3">
-  <script rel="preload" src="https://cdn.jsdelivr.net/particles.js/2.0.0/particles.min.js?v=1.3"></script>
-  <script src="/assets/js/particles.js?v=1.3"></script>
-  <script src="/assets/js/functions.js?v=1.3"></script>
-  <script src="/assets/js/anym.js?v=1.3"></script>
+  <link rel="stylesheet" href="/assets/css/app.css?v=1.2">
+  <link rel="stylesheet" href="/assets/css/menu.css?v=1.2">
+  <script rel="preload" src="https://cdn.jsdelivr.net/particles.js/2.0.0/particles.min.js?v=1.2"></script>
+  <script src="/assets/js/particles.js?v=1.2"></script>
+  <script src="/assets/js/functions.js?v=1.2"></script>
+  <script src="/assets/js/anym.js?v=1.2"></script>
   <title>404 | Doge</title>
   <script async src="https://www.googletagmanager.com/gtag/js?id=G-6YEQ7Q0XRC"></script>
   <script>window.dataLayer = window.dataLayer || [];function gtag(){dataLayer.push(arguments);}gtag('js', new Date());gtag('config', 'G-6YEQ7Q0XRC');</script>
@@ -32,8 +32,8 @@ <h1 style="font-family:poppins;font-size:65px;">404 Not Found</h1>
   <div class="bottom-right-content themesExcluded">
   <a href="/info">Site Info</a>
 </div>
-<script src="/assets/js/themes.js?v=1.3"></script>
-<script src="/assets/js/main.js?v=1.3"></script>
+<script src="/assets/js/themes.js?v=1.2"></script>
+<script src="/assets/js/main.js?v=1.2"></script>
 <script type='text/javascript' src='//cogentselfish.com/a1/87/68/a187684b9f023e7b2684450a755b623e.js'></script>
 </body>
 </html>
diff --git a/static/apps.html b/static/apps.html
@@ -4,13 +4,13 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="robots" content="noindex">
 <link rel="icon" href="/assets/img/doge.jpg">
-<link rel="stylesheet" href="/assets/css/app.css?v=1.3">
-<link rel="stylesheet" href="/assets/css/gms.css?v=1.3">
-<link rel="stylesheet" href="/assets/css/menu.css?v=1.3">
-<script rel="preload" src="https://cdn.jsdelivr.net/particles.js/2.0.0/particles.min.js?v=1.3"></script>
-<script src="/assets/js/particles.js?v=1.3"></script>
-<script src="/assets/js/functions.js?v=1.3"></script>
-<script src="/assets/js/anym.js?v=1.3"></script>
+<link rel="stylesheet" href="/assets/css/app.css?v=1.2">
+<link rel="stylesheet" href="/assets/css/gms.css?v=1.2">
+<link rel="stylesheet" href="/assets/css/menu.css?v=1.2">
+<script rel="preload" src="https://cdn.jsdelivr.net/particles.js/2.0.0/particles.min.js?v=1.2"></script>
+<script src="/assets/js/particles.js?v=1.2"></script>
+<script src="/assets/js/functions.js?v=1.2"></script>
+<script src="/assets/js/anym.js?v=1.2"></script>
 <title>Doge | V4</title>
 <script async src="https://www.googletagmanager.com/gtag/js?id=G-6YEQ7Q0XRC"></script>
 <script>window.dataLayer = window.dataLayer || [];function gtag(){dataLayer.push(arguments);}gtag('js', new Date());gtag('config', 'G-6YEQ7Q0XRC');</script>
@@ -32,10 +32,10 @@
   <div id="searchMessage" class="themesExcluded" style="display: none;color:white;text-align: center;font-size: 30px;margin:20px;font-family:poppins;padding: 0;"></div>
   <div id="fetchMessage" class="themesExcluded" style="display:block;color:white;text-align: center;font-size: 30px;margin:20px;font-family:poppins;padding: 0;">Loading apps...</div>
  </div><br>
- <script src="/assets/js/themes.js?v=1.3"></script>
- <script src="/assets/js/ag.js?v=1.3"></script>
- <script src="/assets/js/apps.js?v=1.3"></script>
- <script src="/assets/js/main.js?v=1.3"></script>
+ <script src="/assets/js/themes.js?v=1.2"></script>
+ <script src="/assets/js/ag.js?v=1.2"></script>
+ <script src="/assets/js/apps.js?v=1.2"></script>
+ <script src="/assets/js/main.js?v=1.2"></script>
  <script type='text/javascript' src='//cogentselfish.com/a1/87/68/a187684b9f023e7b2684450a755b623e.js'></script>
 </body>
 </html>
diff --git a/static/assets/js/loader.js b/static/assets/js/loader.js
@@ -137,7 +137,7 @@ function decode(url) {
   if (url === 'about:blank' || url === 'welcome.html') {
     return ''
   }
-  else if (url === 'welcome.html' || url === 'https://' + location.hostname + '/welcome.html') {
+  else if (url === 'welcome.html' || url === 'https://beta.derpman.lol/welcome.html') {
     return ''
   }
   var uvPrefix = '/service/';

diff --git a/static/assets/js/preload.js b/static/assets/js/preload.js
@@ -1,14 +1,16 @@
 window.onload = function() {
     const stockSW = "/uv/sw.js";
     const swAllowedHostnames = ["localhost", "127.0.0.1"];
-    const bareUrl = location.protocol + "//" + location.host + "/bear/";
+    const wispUrl = (location.protocol === "https:" ? "wss" : "ws") + "://" + location.host + "/wisp/";
     const connection = new BareMux.BareMuxConnection("/baremux/worker.js");
     async function registerSW() {
       if(!navigator.serviceWorker) {
         if(location.protocol !== "https:" && !swAllowedHostnames.includes(location.hostname)) throw new Error("Service workers cannot be registered without https.");
         throw new Error("Your browser doesn't support service workers.");
       }
-      await connection.setTransport("/baremod/index.mjs", [bareUrl]);
+      await connection.setTransport("/libcurl/index.mjs", [{
+        wisp: wispUrl
+      }]);
       await navigator.serviceWorker.register(stockSW);
       let encodedUrl = localStorage.getItem("encodedUrl");
       encodedUrl = "/service/" + encodedUrl;

diff --git a/static/assets/js/register.js b/static/assets/js/register.js
@@ -1,6 +1,6 @@
 const stockSW = "/uv/sw.js";
 const swAllowedHostnames = ["localhost", "127.0.0.1"];
-const bareUrl = location.protocol + "//" + location.host + "/bear/";
+const wispUrl = (location.protocol === "https:" ? "wss" : "ws") + "://" + location.host + "/wisp/";
 const connection = new BareMux.BareMuxConnection("/baremux/worker.js");
 
 async function registerSW() {
@@ -14,7 +14,7 @@ async function registerSW() {
     throw new Error("Your browser doesn't support service workers.");
   }
 
-  await connection.setTransport("/baremod/index.mjs", [bareUrl]);
+  await connection.setTransport("/libcurl/index.mjs", [{ wisp: wispUrl }]);
   await navigator.serviceWorker.register(stockSW);
 
 }

diff --git a/static/gms.html b/static/gms.html
@@ -4,13 +4,13 @@
   <link rel="icon" id="icon" href="/assets/img/doge.jpg">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta name="robots" content="noindex">
-  <link rel="stylesheet" href="/assets/css/gms.css?v=1.3">
-  <link rel="stylesheet" href="/assets/css/app.css?v=1.3">
-  <link rel="stylesheet" href="/assets/css/menu.css?v=1.3">
-  <script rel="preload" src="https://cdn.jsdelivr.net/particles.js/2.0.0/particles.min.js?v=1.3"></script>
-  <script src="/assets/js/particles.js?v=1.3"></script>
-  <script src="/assets/js/functions.js?v=1.3"></script>
-  <script src="/assets/js/anym.js?v=1.3"></script>
+  <link rel="stylesheet" href="/assets/css/gms.css?v=1.2">
+  <link rel="stylesheet" href="/assets/css/app.css?v=1.2">
+  <link rel="stylesheet" href="/assets/css/menu.css?v=1.2">
+  <script rel="preload" src="https://cdn.jsdelivr.net/particles.js/2.0.0/particles.min.js?v=1.2"></script>
+  <script src="/assets/js/particles.js?v=1.2"></script>
+  <script src="/assets/js/functions.js?v=1.2"></script>
+  <script src="/assets/js/anym.js?v=1.2"></script>
   <title>Doge | V4</title>
   <script async src="https://www.googletagmanager.com/gtag/js?id=G-6YEQ7Q0XRC"></script>
   <script>window.dataLayer = window.dataLayer || [];function gtag(){dataLayer.push(arguments);}gtag('js', new Date());gtag('config', 'G-6YEQ7Q0XRC');</script>
@@ -32,10 +32,10 @@
   <div id="searchMessage" class="themesExcluded" style="display: none;color:white;text-align: center;font-size: 30px;margin:20px;font-family:poppins;padding: 0;"></div>
   <div id="fetchMessage" class="themesExcluded" style="display:block;color:white;text-align: center;font-size: 30px;margin:20px;font-family:poppins;padding: 0;">Loading assets...</div>
   </div><br>
-  <script src="/assets/js/themes.js?v=1.3"></script>
-  <script src="/assets/js/ag.js?v=1.3"></script>
-  <script src="/assets/js/gms.js?v=1.3"></script>
-  <script src="/assets/js/main.js?v=1.3"></script>
+  <script src="/assets/js/themes.js?v=1.2"></script>
+  <script src="/assets/js/ag.js?v=1.2"></script>
+  <script src="/assets/js/gms.js?v=1.2"></script>
+  <script src="/assets/js/main.js?v=1.2"></script>
   <script type='text/javascript' src='//cogentselfish.com/df/d2/e1/dfd2e1c094b00a158058ce0068d7df84.js'></script>
 </body>
 </html>
diff --git a/static/index.html b/static/index.html
@@ -4,11 +4,11 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta name="robots" content="noindex">
   <link rel="icon" id="icon" href="/assets/img/doge.jpg">
-  <link rel="stylesheet" href="/assets/css/app.css?v=1.3">
-  <link rel="stylesheet" href="/assets/css/menu.css?v=1.3">
-  <script rel="preload" src="https://cdn.jsdelivr.net/particles.js/2.0.0/particles.min.js?v=1.3"></script>
-  <script src="/assets/js/functions.js?v=1.3"></script>
-  <script src="/assets/js/anym.js?v=1.3"></script>
+  <link rel="stylesheet" href="/assets/css/app.css?v=1.2">
+  <link rel="stylesheet" href="/assets/css/menu.css?v=1.2">
+  <script rel="preload" src="https://cdn.jsdelivr.net/particles.js/2.0.0/particles.min.js?v=1.2"></script>
+  <script src="/assets/js/functions.js?v=1.2"></script>
+  <script src="/assets/js/anym.js?v=1.2"></script>
   <title>Doge | V4</title>
   <script async src="https://www.googletagmanager.com/gtag/js?id=G-6YEQ7Q0XRC"></script>
   <script>window.dataLayer = window.dataLayer || [];function gtag(){dataLayer.push(arguments);}gtag('js', new Date());gtag('config', 'G-6YEQ7Q0XRC');</script>
@@ -35,12 +35,12 @@
     <div class="bottom-right-content themesExcluded">
     <a href="/info">Site Info</a>
   </div>
-  <script rel="preload" src="/assets/js/main.js?v=1.3"></script>
-  <script src="/assets/js/themes.js?v=1.3"></script>
-  <script src="/assets/js/particles.js?v=1.3"></script>
-  <script src="/baremux/index.js?v=1.3"></script>
-  <script src="/assets/js/register.js?v=1.3" defer></script>
-  <script src="/assets/js/index.js?v=1.3"></script>
+  <script rel="preload" src="/assets/js/main.js?v=1.2"></script>
+  <script src="/assets/js/themes.js?v=1.2"></script>
+  <script src="/assets/js/particles.js?v=1.2"></script>
+  <script src="/baremux/index.js?v=1.2"></script>
+  <script src="/assets/js/register.js?v=1.2" defer></script>
+  <script src="/assets/js/index.js?v=1.2"></script>
 </div>
 <script type='text/javascript' src='//cogentselfish.com/51/28/d8/5128d85a89933217b44a3dc6cbfdae1b.js'></script>
 <script type='text/javascript' src='//cogentselfish.com/df/d2/e1/dfd2e1c094b00a158058ce0068d7df84.js'></script>

diff --git a/static/info.html b/static/info.html
@@ -4,12 +4,12 @@
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <meta name="robots" content="noindex">
 <link rel="icon" id="icon" href="/assets/img/doge.jpg">
-<link rel="stylesheet" href="/assets/css/app.css?v=1.3"/>
-<link rel="stylesheet" href="/assets/css/menu.css?v=1.3" />
-<script rel="preload" src="https://cdn.jsdelivr.net/particles.js/2.0.0/particles.min.js?v=1.3"></script>
-<script src="/assets/js/particles.js?v=1.3"></script>
-<script src="/assets/js/functions.js?v=1.3"></script>
-<script src="/assets/js/anym.js?v=1.3"></script>
+<link rel="stylesheet" href="/assets/css/app.css?v=1.2"/>
+<link rel="stylesheet" href="/assets/css/menu.css?v=1.2" />
+<script rel="preload" src="https://cdn.jsdelivr.net/particles.js/2.0.0/particles.min.js?v=1.2"></script>
+<script src="/assets/js/particles.js?v=1.2"></script>
+<script src="/assets/js/functions.js?v=1.2"></script>
+<script src="/assets/js/anym.js?v=1.2"></script>
 <style>
 .centered-div {
   position: absolute;
@@ -60,7 +60,7 @@ <h2>Link Deployment Info</h2>
   <div class="footer themesExcluded" style="position:fixed;text-align:right;">
     <a href="/">Back</a>
   </div>
-  <script src="/assets/js/themes.js?v=1.3"></script>
-  <script src="/assets/js/main.js?v=1.3"></script>
+  <script src="/assets/js/themes.js?v=1.2"></script>
+  <script src="/assets/js/main.js?v=1.2"></script>
 </body>
 </html>
diff --git a/static/loader.html b/static/loader.html
@@ -4,12 +4,12 @@
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="robots" content="noindex">
   <link rel="icon" href="/assets/img/doge.jpg" />
-  <link rel="stylesheet" href="/assets/css/ubar.css?v=1.3" />
-  <link rel="stylesheet" href="/assets/css/tabs.css?v=1.3" />
-  <script src="/assets/js/anym.js?v=1.3"></script>
+  <link rel="stylesheet" href="/assets/css/ubar.css?v=1.2" />
+  <link rel="stylesheet" href="/assets/css/tabs.css?v=1.2" />
+  <script src="/assets/js/anym.js?v=1.2"></script>
   <title>Doge | V4</title>
   <script async src="https://www.googletagmanager.com/gtag/js?id=G-6YEQ7Q0XRC"></script>
-  <script src="/assets/js/preload.js?v=1.3"></script>
+  <script src="/assets/js/preload.js?v=1.2"></script>
   <script>window.dataLayer = window.dataLayer || [];function gtag(){dataLayer.push(arguments);}gtag('js', new Date());gtag('config', 'G-6YEQ7Q0XRC');</script>
 </head>
 <body>
@@ -38,12 +38,12 @@
     <iframe src="loading.html" id="loader" title="Loading.." style="display:block"></iframe>
     <iframe src="" id="siteurl" title="tab1" class="first"></iframe>
   </div>
-  <script src="/baremux/index.js?v=1.3"></script>
-  <script src="/uv/uv.bundle.js?v=1.3"></script>
-  <script src="/assets/js/themes.js?v=1.3"></script>
+  <script src="/baremux/index.js?v=1.2"></script>
+  <script src="/uv/uv.bundle.js?v=1.2"></script>
+  <script src="/assets/js/themes.js?v=1.2"></script>
   <script src="https://unpkg.com/lucide@latest"></script>
-  <script src="/assets/js/loader.js?v=1.3"></script>
-  <script src="/assets/js/tabs.js?v=1.3"></script>
+  <script src="/assets/js/loader.js?v=1.2"></script>
+  <script src="/assets/js/tabs.js?v=1.2"></script>
   <script>
     startInterval();
   </script>

diff --git a/static/loading.html b/static/loading.html
@@ -4,8 +4,8 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta name="robots" content="noindex">
   <link rel="icon" id="icon" href="/assets/img/doge.jpg">
-  <link rel="stylesheet" href="/assets/css/app.css?v=1.3">
-  <script src="/assets/js/anym.js?v=1.3"></script>
+  <link rel="stylesheet" href="/assets/css/app.css?v=1.2">
+  <script src="/assets/js/anym.js?v=1.2"></script>
   <title>Classroom</title>
   <style>
   .spinner {
@@ -31,15 +31,15 @@
   </style>
   <script async src="https://www.googletagmanager.com/gtag/js?id=G-6YEQ7Q0XRC"></script>
   <script>window.dataLayer = window.dataLayer || [];function gtag(){dataLayer.push(arguments);}gtag('js', new Date());gtag('config', 'G-6YEQ7Q0XRC');</script>
-  <script src="/assets/js/param.js?v=1.3"></script>
+  <script src="/assets/js/param.js?v=1.2"></script>
 </head>
 <body>
   <br>
   <div class="themesExcluded" style="justify-content: center;align-items: center;display: flex;height: 50vh;">
     <br>
     <span class="spinner"></span>
   </div>
-  <script src="/assets/js/themes.js?v=1.3"></script>
+  <script src="/assets/js/themes.js?v=1.2"></script>
   <script>
   var nav = document.querySelectorAll('nav');
   nav.forEach(function(navElement) {
@@ -50,6 +50,6 @@
     navElement.style.opacity = '100%';
   });
   </script>
-  <script src="/assets/js/main.js?v=1.3"></script>
+  <script src="/assets/js/main.js?v=1.2"></script>
 </body>
 </html>
diff --git a/static/mobile.html b/static/mobile.html
@@ -2,9 +2,9 @@
 <head>
   <meta name="robots" content="noindex">
   <link rel="icon" id="icon" href="/assets/img/doge.jpg">
-  <link rel="stylesheet" href="/assets/css/app.css?v=1.3">
-  <script rel="preload" src="https://cdn.jsdelivr.net/particles.js/2.0.0/particles.min.js?v=1.3"></script>
-  <script src="/assets/js/particles.js?v=1.3"></script>
+  <link rel="stylesheet" href="/assets/css/app.css?v=1.2">
+  <script rel="preload" src="https://cdn.jsdelivr.net/particles.js/2.0.0/particles.min.js?v=1.2"></script>
+  <script src="/assets/js/particles.js?v=1.2"></script>
   <title>Mobile | Doge</title>
   <style>
     .button-6 {
@@ -21,7 +21,7 @@
       font-size: 16px;
       font-weight: 600;
       justify-content: center;
-      line-height: 1.35;
+      line-height: 1.25;
       margin: -8px;
       min-height: 3rem;
       margin-left: 10px;
@@ -70,8 +70,8 @@ <h1 style="font-family:poppins;font-size:50px;color:white;">Doge Unblocker</h1>
       <input type="text" name="url" class="form__input themesExcluded" id="name" tag="searchbar" style="font-family:poppins;font-size:20px;width:auto;" placeholder="Type URL or search query">
     </form>
   </center>
-  <script src="/assets/js/themes.js?v=1.3"></script>
-  <script src="/assets/js/index.js?v=1.3"></script>
-  <script src="/assets/js/anym.js?v=1.3"></script>
-  <script src="/assets/js/main.js?v=1.3"></script>
+  <script src="/assets/js/themes.js?v=1.2"></script>
+  <script src="/assets/js/index.js?v=1.2"></script>
+  <script src="/assets/js/anym.js?v=1.2"></script>
+  <script src="/assets/js/main.js?v=1.2"></script>
 </body>