Found bug; fixed some routing

TODO.md

@@ -8,6 +8,8 @@ This will be our nonexhaustive todo list for Holy Unblocker LTS v6.x.x and above
   - [ ] Optimize the JS. This time it won't be in one line and will be somewhat thoroughly commented.
   - [ ] Restructure navigation scripts to ensure updated proxy functionality is sanitized and effective
   - [x] Particles.js automatically adjusting per display size
+  - [ ] Fix routes.mjs throwing with incorrect paths
+  - [x] Create test script
 
 ## Proxy Functionality
   - [x] Ensure Ultraviolet is updated to support bare-mux and wisp - done

src/routes.mjs

@@ -12,15 +12,14 @@ const text404 = readFileSync(path.normalize(__dirname + '/views/404.html'), 'utf
 const pages = {
     'index': 'index.html',
     /* Main */
-    'in': 'docs.html',
+    'documentation': 'docs.html',
     'faq': 'faq.html',
     'j': 'hidden.html',
     's': 'pages/frame.html',
-    'z': 'pages/surf.html',
+    'browse': 'pages/surf.html',
-    'c': 'pages/nav/credits.html',
+    'credits': 'pages/nav/credits.html',
     'x': 'pages/nav/bookmarklets.html',
-    'i': 'pages/nav/icons.html',
+    'terms': 'pages/nav/terms.html',
-    't': 'pages/nav/terms.html',
     /* Games */
     'g': 'pages/nav/gtools.html',
     'h': 'pages/nav/games5.html',
@@ -31,10 +30,8 @@ const pages = {
     'q': 'pages/proxnav/ultraviolet.html',
     'rh': 'pages/proxnav/rammerhead.html',
     /* Proxy Presets */
-    'sx': 'pages/proxnav/preset/spotify.html',
     'y': 'pages/proxnav/preset/youtube.html',
-    'd': 'pages/proxnav/preset/discord.html',
+    'apps': 'pages/proxnav/preset/applications.html',
-    'r': 'pages/proxnav/preset/reddit.html',
     /* Misc */
     'fg': 'archive/gfiles/flash/index.html',
     'eg': 'archive/gfiles/rarch/index.html',

test.js

@@ -2,7 +2,7 @@ const axios = require('axios');
 
 async function testServerResponse() {
     try {
-        const response = await axios.get('http://localhost:8080/');
+        const response = await axios.get('http://localhost:8080/?pathtonowhere');
         if (response.status === 200) {
             console.log('Server responded with status code 200. Test passed.');
             process.exit(0); // Exit with success

views/index.html

@@ -88,7 +88,7 @@
             <img class="hero" src="/assets/img/icon2.png" alt="icon" />
             <h1>Holy Unblocker LTS</h1>
             <h2>Free and transparent for use</h2>
-            <a class="fancybutton glowbutton" href="/?z">Browse Now</a>
+            <a class="fancybutton glowbutton" href="/?browse">Browse Now</a>
           </div>
         </div>
       </div>
@@ -187,7 +187,7 @@
             <div class="text-wrap">
               <h1>Usage</h1>
               <p>
-                Head to the <a href="?z">Web Proxies</a> page and select one of
+                Head to the <a href="?browse">Web Proxies</a> page and select one of
                 the proxies featured! Afterwards, type out the site you wish to
                 access in the search box. Each web proxy has its own level of
                 effectiveness, speed and security. It is recommended to use

views/pages/misc/deobf/header.html

@@ -7,11 +7,11 @@
   <span class="mnavebutton"></span>
 </label>
 <ul class="navbar-1">
-  <li class="pulse" ><a href="/?z">Web Proxies</a></li>
+  <li class="pulse" ><a href="/?browse">Web Proxies</a></li>
   <li class="pulse" ><a href="/?g">Games</a></li>
   <li class="pulse" ><a href="/?y">YouTube</a></li>
   <li class="brand-logo-container pulse">
-    <a href="/?r">Applications</a>
+    <a href="/?apps">Applications</a>
     <div class="new"></div>
   </li>
 </ul>
@@ -25,10 +25,10 @@
       <ul class="subnavbar">
         <i class="fas fa-bars"></i>
         <li><a href="/?x">Bookmarklets</a></li>
-        <li><a href="/?in">Docs</a></li>
+        <li><a href="/?documentation">Docs</a></li>
         <li><a href="/?faq">FAQ</a></li>
-        <li><a href="/?c">Credits</a></li>
+        <li><a href="/?credits">Credits</a></li>
-        <li><a href="/?t">TOS</a></li>
+        <li><a href="/?terms">TOS</a></li>
       </ul>
     </div>
   </li>

views/pages/proxnav/preset/reddit.html

@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-    <title>Holy Unblocker - SearX</title>
-    <meta name="description" content="Holy Unblocker is a secure web proxy service with support for many sites. Bypass filters and freely enjoy a safer private browsing experience or unblock websites on devices such as Chromebooks and at places like school or work without downloading anything."
-    />
-    <meta name="theme-color" media="(prefers-color-scheme: dark)" content="#434c5e">
-    <link rel="icon" type="image/png" sizes="32x32" href="assets/img/icon.png">
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="dns-prefetch" href="https://fonts.googleapis.com">
-    <link rel="stylesheet" href="assets/css/styles.css">
-    <script src="/baremux/bare.cjs" defer></script>
-    <script src="/epoxy/index.js" defer></script>
-    <script src="/uv/uv.bundle.js" defer></script>
-    <script src="/uv/uv.config.js" defer></script>
-    <script src="/assets/js/register-sw.js" defer></script>
-    <script src="
-    https://cdn.jsdelivr.net/npm/tsparticles@3.5/tsparticles.bundle.min.js
-    "></script>
-</head>
-
-<body>
-    <!-- IMPORTANT-HUCOOKINGINSERT-DONOTDELETE -->
-    <div id="header" class="fullwidth"><!--HEADER--></div>
-    <div id="particles-js" class="fullwidth"></div>
-    <div id="mainbody" class="fullwidth">
-        <div class="ad" id="ad-left"></div>
-        <div class="ad" id="ad-right"></div>
-        <!-- IMPORTANT-HUCOOKINGINSERT-DONOTDELETE -->
-        <div class="box box-medium text-center textm">
-            <h1 class="bigtitle">Reddit Proxy</h1>
-            <p class="responsive-fix">
-                Using the local libreddit instance is recommended.
-            </p>
-            <h3>Having Issues?</h3>
-            <p class="font3 accented">
-                Read the <a href="/?faq">FAQ page</a> for more information.
-                <br>Sometimes the proxies are under high load so things may be slow, sorry. In that case simply wait for the page to load.
-            </p>
-            <div class="responsive-fix">
-                <a class="fancybutton glowbutton" href="#" onclick="goProx.libreddit();">Local Libreddit Instance (Classic)</a>
-                <a class="fancybutton glowbutton" href="#" onclick="goProx.libreddit(true);">Local Libreddit Instance (Stealth)</a>
-                <br>
-                <a class="fancybutton glowbutton" href="#" onclick="goProx.ultraviolet('https://reddit.com');">UV (Classic)</a>
-                <a class="fancybutton glowbutton" href="#" onclick="goProx.ultraviolet('https://reddit.com', true);">UV (Stealth)</a>
-            </div>
-        </div>
-    </div>
-    <div id="footer" class="fullwidth"><!--FOOTER--></div>
-    <!-- IMPORTANT-HUCOOKINGINSERT-DONOTDELETE -->
-    <script src="assets/js/common.js"></script>
-    <script src="assets/js/csel.js"></script>
-    <script defer="defer" src="assets/js/particlesjs/particles.js"></script>
-</body>
-
-</html>

views/pages/proxnav/preset/spotify.html

@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-    <title>Holy Unblocker</title>
-    <meta name="description" content="Holy Unblocker is a secure web proxy service with support for many sites. Bypass filters and freely enjoy a safer private browsing experience or unblock websites on devices such as Chromebooks and at places like school or work without downloading anything."
-    />
-    <meta name="theme-color" media="(prefers-color-scheme: dark)" content="#434c5e">
-    <link rel="icon" type="image/png" sizes="32x32" href="assets/img/icon.png">
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="dns-prefetch" href="https://fonts.googleapis.com">
-    <link rel="stylesheet" href="assets/css/styles.css">
-    <script src="
-    https://cdn.jsdelivr.net/npm/tsparticles@3.5/tsparticles.bundle.min.js
-    "></script>
-    <script src="/baremux/bare.cjs" defer></script>
-    <script src="/epoxy/index.js" defer></script>
-    <script src="/uv/uv.bundle.js" defer></script>
-    <script src="/uv/uv.config.js" defer></script>
-    <script src="/assets/js/register-sw.js" defer></script>
-</head>
-
-<body>
-    <!-- IMPORTANT-HUCOOKINGINSERT-DONOTDELETE -->
-    <div id="header" class="fullwidth"><!--HEADER--></div>
-    <div id="particles-js" class="fullwidth"></div>
-    <div id="mainbody" class="fullwidth">
-        <div class="ad" id="ad-left"></div>
-        <div class="ad" id="ad-right"></div>
-        <!-- IMPORTANT-HUCOOKINGINSERT-DONOTDELETE -->
-        <div class="box box-medium text-center textm">
-            <h1 class="bigtitle">Spotify</h1>
-            <p class="responsive-fix">
-                Spotify is a digital music, podcast, and video service that gives you access to millions of songs and other content from creators all over the
-                world.
-                <br>Using Ultraviolet, Spotify works while being super fast. Enjoy unblocked music streaming!
-            </p>
-            <h3>Having Issues?</h3>
-            <p class="font3 accented">
-                Read the <a href="/?faq">FAQ page</a> for more information.
-                <br>Sometimes the proxies are under high load so things may be slow, sorry. In that case simply wait for the page to load.
-            </p>
-            <div class="responsive-fix">
-                <a class="fancybutton glowbutton" href="#" onclick="goProx.ultraviolet('https://open.spotify.com');">Classic</a>
-                <a class="fancybutton glowbutton" href="#" onclick="goProx.ultraviolet('https://open.spotify.com', true);">Stealth</a>
-            </div>
-        </div>
-    </div>
-    <div id="footer" class="fullwidth"><!--FOOTER--></div>
-    <!-- IMPORTANT-HUCOOKINGINSERT-DONOTDELETE -->
-    <script src="assets/js/common.js"></script>
-    <script src="assets/js/csel.js"></script>
-    <script defer="defer" src="assets/js/particlesjs/particles.js"></script>
-</body>
-
-</html>