uh

Reviewed-on: https://gitea.sentt.lol/sent/waves/pulls/2

SECURITY.md

@@ -4,6 +4,7 @@
 
 The following versions of this project that are currently supported and unsupported:  
 
+- **Version 2.3.7** – Supported ✅
 - **Version 2.3.5** – Supported ✅
 - **Version 2.3.1** – Supported ✅
 - **Version 2.3.0** – Supported ✅
@@ -17,4 +18,4 @@ The following versions of this project that are currently supported and unsuppor
 
 ## Support
 
-If you are experiencing an issue with Waves unrelated to security, feel free to join our [Discord](https://discord.gg/dJvdkPRheV) server and open a ticket.  
+If you are experiencing an issue with Waves unrelated to security, feel free to join our [Discord Server](https://discord.gg/dJvdkPRheV) and open a ticket.

index.mjs

@@ -1,74 +1,126 @@
 import cluster from "cluster";
 import os from "os";
 import net from "net";
+import fs from "fs";
+import path from "path";
+import { spawnSync } from "child_process";
 import express from "express";
 import { createServer } from "http";
-import path from "path";
 import compression from "compression";
 import WebSocket from "ws";
+import { LRUCache } from "lru-cache";
 import { baremuxPath } from "@mercuryworkshop/bare-mux/node";
 import { epoxyPath } from "@mercuryworkshop/epoxy-transport";
 import { libcurlPath } from "@mercuryworkshop/libcurl-transport";
 import { uvPath } from "@titaniumnetwork-dev/ultraviolet";
 import wisp from "wisp-server-node";
-import NodeCache from "node-cache";
+
+const surgeConfigPath = path.resolve("surge.config.json");
+const isSurgedRun = process.argv.includes("--surged");
+let startTime = Date.now();
+
+function applySurgeAndRestartIfNeeded() {
+  if (isSurgedRun) {
+    try {
+      const config = JSON.parse(fs.readFileSync(surgeConfigPath, "utf-8"));
+      process.env.UV_THREADPOOL_SIZE = String(config.uvThreadpoolSize);
+    } catch {}
+    return;
+  }
+
+  const result = spawnSync("node", ["./others/surge.mjs"], { stdio: "inherit" });
+  if (result.error) process.exit(1);
+
+  const config = JSON.parse(fs.readFileSync(surgeConfigPath, "utf-8"));
+  const nodeArgs = [...config.nodeFlags, path.resolve("index.mjs"), "--surged"];
+  const env = {
+    ...process.env,
+    UV_THREADPOOL_SIZE: String(config.uvThreadpoolSize),
+    ALREADY_SURGED: "true"
+  };
+
+  const relaunch = spawnSync(process.execPath, nodeArgs, { stdio: "inherit", env });
+  process.exit(relaunch.status || 0);
+}
+
+applySurgeAndRestartIfNeeded();
+
+if (global.gc) {
+  setInterval(() => {
+    const { heapUsed, heapTotal } = process.memoryUsage();
+    if (heapTotal > 0 && heapUsed / heapTotal > 0.7) global.gc();
+  }, 60000);
+}
+
+import "./others/scaler.mjs";
+import "./others/warmup.mjs";
+
+const cache = new LRUCache({
+  maxSize: 1000,
+  ttl: 60_000,
+  allowStale: false,
+  sizeCalculation: (value, key) => Buffer.byteLength(value) + Buffer.byteLength(key)
+});
 
 const port = parseInt(process.env.PORT || "3000", 10);
-cluster.schedulingPolicy = cluster.SCHED_RR;
 
-function logInfo(message) {
+function logInfo(msg) {
-  console.info(`[INFO] ${message}`);
+  console.info(`[~] ${msg}`);
-}
-function logError(error) {
-  const msg = error instanceof Error ? error.message : error;
-  console.error(`[ERR] ${msg}`);
 }
 
-process.on("uncaughtException", (err) => logError(`Unhandled Exception: ${err}`));
+function logSuccess(msg) {
-process.on("unhandledRejection", (reason) => logError(`Unhandled Promise Rejection: ${reason}`));
+  console.info(`[+] ${msg}`);
+}
+
+function logError(err) {
+  console.error(`[!] ${err instanceof Error ? err.message : err}`);
+}
+
+process.on("uncaughtException", err => logError(`Unhandled Exception: ${err}`));
+process.on("unhandledRejection", reason => logError(`Unhandled Rejection: ${reason}`));
 
 if (cluster.isPrimary) {
-  const numCPUs = os.cpus().length;
+  const cpus = os.cpus().length;
-  logInfo(`Master started. Forking ${numCPUs} workers.`);
+  const workers = Math.max(1, cpus - 1);
-  for (let i = 0; i < numCPUs; i++) {
+
+  logInfo(`Master: forking ${workers} workers`);
+
+  for (let i = 0; i < workers; i++) {
     cluster.fork();
   }
-  cluster.on("exit", (worker, code, signal) => {
+
-    logError(`Worker ${worker.process.pid} terminated (code: ${code}, signal: ${signal}). Restarting...`);
+  cluster.on("exit", worker => {
+    logError(`Worker ${worker.process.pid} exited. Restarting...`);
     cluster.fork();
   });
-  let currentWorker = 0;
+
-  const server = net.createServer({ pauseOnConnect: true }, (connection) => {
+  let current = 0;
-    const workerIds = Object.keys(cluster.workers);
+  const server = net.createServer({ pauseOnConnect: true }, conn => {
-    if (workerIds.length === 0) {
+    const workersArr = Object.values(cluster.workers);
-      connection.destroy();
+    if (!workersArr.length) return conn.destroy();
-      return;
+    const worker = workersArr[current++ % workersArr.length];
-    }
+    worker.send("sticky-session:connection", conn);
-    const worker = cluster.workers[workerIds[currentWorker % workerIds.length]];
-    currentWorker++;
-    if (worker) worker.send("sticky-session:connection", connection);
   });
-  server.on("error", (err) => logError(`Server error: ${err}`));
+
-  server.listen(port, () => logInfo(`Server running at http://localhost:${port}`));
+  server.on("error", err => logError(`Server error: ${err}`));
+  server.listen(port, () => logSuccess(`Server listening on ${port}`));
 } else {
-
-  process.env.UV_THREADPOOL_SIZE = os.cpus().length * 2;
-
   const __dirname = process.cwd();
   const publicPath = path.join(__dirname, "public");
   const app = express();
+  let latencySamples = [];
 
-  app.use(compression({ level: 9, threshold: 128, memLevel: 9 }));
+  app.use(compression({ level: 4, memLevel: 4, threshold: 1024 }));
 
-  const cache = new NodeCache({ stdTTL: 1, checkperiod: 1 });
   app.use((req, res, next) => {
     const key = req.originalUrl;
-    if (cache.has(key)) {
+    const val = cache.get(key);
+    if (val) {
       res.setHeader("X-Cache", "HIT");
-      return res.send(cache.get(key));
+      return res.send(val);
     }
-    res.sendResponse = res.send;
+    res.sendResponse = res.send.bind(res);
-    res.send = (body) => {
+    res.send = body => {
       cache.set(key, body);
       res.setHeader("X-Cache", "MISS");
       res.sendResponse(body);
@@ -76,7 +128,7 @@ if (cluster.isPrimary) {
     next();
   });
 
-  const staticOpts = { maxAge: "1s" };
+  const staticOpts = { maxAge: "7d", immutable: true };
   app.use("/baremux/", express.static(baremuxPath, staticOpts));
   app.use("/epoxy/", express.static(epoxyPath, staticOpts));
   app.use("/libcurl/", express.static(libcurlPath, staticOpts));
@@ -84,62 +136,129 @@ if (cluster.isPrimary) {
   app.use("/wah/", express.static(uvPath, staticOpts));
   app.use(express.json());
 
-  app.get("/", (req, res) => res.sendFile(path.join(publicPath, "$.html")));
+  const sendHtml = file => (_req, res) => res.sendFile(path.join(publicPath, file));
-  app.get("/g", (req, res) => res.sendFile(path.join(publicPath, "!.html")));
+
-  app.get("/a", (req, res) => res.sendFile(path.join(publicPath, "!!.html")));
+  app.get("/", sendHtml("$.html"));
-  app.get("/ai", (req, res) => res.sendFile(path.join(publicPath, "!!!.html")));
+  app.get("/g", sendHtml("!.html"));
-  app.get("/resent", (req, res) => res.sendFile(path.join(publicPath, "resent", "index.html")));
+  app.get("/a", sendHtml("!!.html"));
-  app.use((req, res) => res.status(404).sendFile(path.join(publicPath, "404.html")));
+  app.get("/resent", (_req, res) => res.sendFile(path.join(publicPath, "resent", "index.html")));
+
+  app.get("/api/info", (_req, res) => {
+    try {
+      const average = latencySamples.length
+        ? latencySamples.reduce((a, b) => a + b, 0) / latencySamples.length
+        : 0;
+      let speed = "Medium";
+      if (average < 200) speed = "Fast";
+      else if (average > 500) speed = "Slow";
+      const cpus = os.cpus();
+      const totalMem = os.totalmem() / 1024 / 1024 / 1024;
+      res.json({
+        speed,
+        averageLatency: average.toFixed(2),
+        specs: `${cpus[0].model} + ${cpus.length} CPU Cores + ${totalMem.toFixed(1)}GB of RAM`,
+        startTime,
+        samples: latencySamples.length,
+        timestamp: Date.now()
+      });
+    } catch {
+      res.status(500).json({ error: "Internal error" });
+    }
+  });
+
+  app.get("/api/latest-commit", async (_req, res) => {
+    try {
+      const ghRes = await fetch(
+        "https://api.github.com/repos/xojw/waves/commits?per_page=1",
+        {
+          headers: {
+            "User-Agent": "waves-app",
+            Accept: "application/vnd.github.v3+json"
+          }
+        }
+      );
+      if (!ghRes.ok) return res.status(ghRes.status).json({ error: "GitHub API error" });
+
+      const commits = await ghRes.json();
+      const updates = commits.map(c => ({
+        sha: c.sha.slice(0, 7),
+        message: c.commit.message.split("\n")[0],
+        author: c.commit.author.name,
+        date: c.commit.author.date
+      }));
+
+      res.json({ repo: "xojw/waves", updates });
+    } catch {
+      res.status(500).json({ error: "Internal server error" });
+    }
+  });
+
+  app.use((_req, res) => res.status(404).sendFile(path.join(publicPath, "404.html")));
 
   const server = createServer(app);
   server.keepAliveTimeout = 0;
   server.headersTimeout = 0;
 
-  const pingWSS = new WebSocket.Server({ noServer: true, maxPayload: 1048576 });
+  const pingWSS = new WebSocket.Server({
+    noServer: true,
+    maxPayload: 4 * 1024 * 1024,
+    perMessageDeflate: false
+  });
+
   pingWSS.on("connection", (ws, req) => {
-    const remoteAddress = req.socket.remoteAddress || "unknown";
+    const remote = req.socket.remoteAddress || "unknown";
-    let latencies = [];
+    let lat = [];
-    const pingInterval = setInterval(() => {
+    const interval = setInterval(() => {
       if (ws.readyState === WebSocket.OPEN) {
-        const timestamp = Date.now();
+        ws.send(JSON.stringify({ type: "ping", timestamp: Date.now() }));
-        ws.send(JSON.stringify({ type: "ping", timestamp }));
       }
     }, 1000);
-    ws.on("message", (message) => {
+
+    ws.on("message", msg => {
       try {
-        const data = JSON.parse(message);
+        const data = JSON.parse(msg);
         if (data.type === "pong" && data.timestamp) {
-          const latency = Date.now() - data.timestamp;
+          const d = Date.now() - data.timestamp;
-          latencies.push(latency);
+          lat.push(d);
-          if (latencies.length > 5) latencies.shift();
+          if (lat.length > 5) lat.shift();
-          ws.send(JSON.stringify({ type: "latency", latency }));
+          latencySamples.push(d);
+          if (latencySamples.length > 100) latencySamples.shift();
+          ws.send(JSON.stringify({ type: "latency", latency: d }));
         }
       } catch (e) {
         logError(`Ping error: ${e}`);
       }
     });
+
     ws.on("close", () => {
-      clearInterval(pingInterval);
+      clearInterval(interval);
-      const avgLatency = latencies.length ? latencies.reduce((a, b) => a + b) / latencies.length : 0;
+      const avg = lat.length
-      logInfo(`Conn from ${remoteAddress} closed. Avg: ${avgLatency.toFixed(2)}ms.`);
+        ? (lat.reduce((a, b) => a + b) / lat.length).toFixed(2)
+        : 0;
+      logInfo(`WS ${remote} closed. Avg: ${avg}ms`);
     });
   });
 
-  server.on("upgrade", (req, socket, head) => {
+  server.on("upgrade", (req, sock, head) => {
     if (req.url === "/w/ping") {
-      pingWSS.handleUpgrade(req, socket, head, (ws) => pingWSS.emit("connection", ws, req));
+      pingWSS.handleUpgrade(req, sock, head, ws =>
+        pingWSS.emit("connection", ws, req)
+      );
     } else if (req.url.startsWith("/w/")) {
-      wisp.routeRequest(req, socket, head);
+      wisp.routeRequest(req, sock, head);
     } else {
-      socket.end();
+      sock.end();
     }
   });
-  server.on("error", (err) => logError(`Worker server error: ${err}`));
+
-  server.listen(0, () => logInfo(`Worker ${process.pid} ready.`));
+  server.on("error", err => logError(`Worker error: ${err}`));
-  process.on("message", (message, connection) => {
+
-    if (message === "sticky-session:connection") {
+  server.listen(0, () => logSuccess(`Worker ${process.pid} ready`));
-      server.emit("connection", connection);
+
-      connection.resume();
+  process.on("message", (msg, conn) => {
+    if (msg === "sticky-session:connection" && conn) {
+      server.emit("connection", conn);
+      conn.resume();
     }
   });
 }

others/scaler.mjs

@@ -0,0 +1,36 @@
+import { LRUCache } from 'lru-cache';
+
+let maxKeys = 10_000;
+let cache   = makeCache(maxKeys);
+
+function makeCache(maxEntries) {
+  return new LRUCache({
+    maxSize: maxEntries,
+    ttl:     60_000,
+    allowStale:     false,
+    updateAgeOnGet: false,
+    updateAgeOnHas: false,
+  });
+}
+
+function scaleCache() {
+  const { heapUsed, heapTotal } = process.memoryUsage();
+  const freeHeapRatio = (heapTotal - heapUsed) / heapTotal;
+
+  const newMax = freeHeapRatio > 0.5
+    ? 20_000
+    : freeHeapRatio < 0.2
+      ? 5_000
+      : 10_000;
+
+  if (newMax !== maxKeys) {
+    maxKeys = newMax;
+    cache = makeCache(maxKeys);
+    console.log(`[SCALER] freeHeap ${( (heapTotal - heapUsed)/1e6 ).toFixed(1)}MB → maxKeys: ${maxKeys}`);
+  }
+}
+
+setInterval(scaleCache, 60_000);
+scaleCache();
+
+export { cache };

others/surge.mjs

@@ -0,0 +1,57 @@
+import { execSync } from "child_process";
+import os from "os";
+import fs from "fs";
+import path from "path";
+
+const log = (msg) => console.log(`[SURGE] ${msg}`);
+const surgePath = path.resolve("surge.config.json");
+
+function generateSurgeFlags() {
+  const cpus = os.cpus().length;
+  const flags = [
+    "--max-old-space-size=4096",
+    "--optimize_for_size",
+    "--gc-global",
+    "--max-semi-space-size=256",
+    "--no-warnings",
+    "--expose-gc"
+  ];
+
+  if (process.platform !== "win32") {
+    flags.push("--use-largepages=on");
+  }
+
+  return {
+    uvThreadpoolSize: cpus * 2,
+    nodeFlags: flags
+  };
+}
+
+function writeSurgeFile(flags) {
+  fs.writeFileSync(surgePath, JSON.stringify(flags, null, 2));
+  log("Surge config saved.");
+}
+
+function launchSurgedBackend(flags) {
+  const args = [
+    ...flags.nodeFlags,
+    "index.mjs",
+    "--surged"
+  ];
+  log(`Launching backend: node ${args.join(" ")}`);
+  execSync(`node ${args.join(" ")}`, { stdio: "inherit" });
+}
+
+function isSurgedRun() {
+  return process.argv.includes("--surged");
+}
+
+(async () => {
+  if (isSurgedRun()) return;
+
+  log("Detecting best settings...");
+  const flags = generateSurgeFlags();
+  writeSurgeFile(flags);
+  launchSurgedBackend(flags);
+  process.exit(0);
+})();

others/warmup.mjs

@@ -0,0 +1,59 @@
+import http from 'http';
+
+const endpoints = [
+  'http://localhost:3000/',
+  'http://localhost:3000/g',
+  'http://localhost:3000/a'
+];
+
+function httpGet(url, timeout = 5000) {
+  return new Promise((resolve) => {
+    const req = http.get(url, (res) => {
+      res.on('data', () => {});
+      res.on('end', () => {
+        resolve({ url, statusCode: res.statusCode });
+      });
+    });
+
+    req.on('error', (e) => {
+      resolve({ url, error: e.message });
+    });
+
+    req.setTimeout(timeout, () => {
+      req.abort();
+      resolve({ url, error: 'Timeout' });
+    });
+  });
+}
+
+async function warm(retries = 2) {
+  const results = await Promise.all(endpoints.map(async (url) => {
+    for (let i = 0; i <= retries; i++) {
+      const res = await httpGet(url);
+      if (!res.error) {
+        console.log(`[WARMUP] ${url} → ${res.statusCode}`);
+        return res;
+      } else {
+        console.warn(`[WARMUP] ${url} attempt ${i + 1} failed: ${res.error}`);
+      }
+    }
+    return { url, error: `Failed after ${retries + 1} attempts` };
+  }));
+
+  const failed = results.filter(r => r.error);
+  if (failed.length) {
+    console.warn(`[WARMUP] Some endpoints failed to warm:`, failed);
+  } else {
+    console.log('[WARMUP] All endpoints warmed successfully');
+  }
+}
+
+async function periodicWarmup(intervalMs = 5 * 60 * 1000) {
+  while (true) {
+    await warm();
+    console.log('[WARMUP] Cycle done');
+    await new Promise(res => setTimeout(res, intervalMs));
+  }
+}
+
+setTimeout(() => periodicWarmup(), 2000);

package.json

@@ -1,44 +1,41 @@
 {
-    "name": "waves",
+  "name": "waves",
-    "version": "2.3.5",
+  "version": "2.8.7",
-    "description": "A sleek and minimalist Web Proxy.",
+  "description": "A sleek and minimalist Web Proxy.",
-    "type": "module",
+  "type": "module",
-    "engines": {
+  "engines": {
-        "npm": ">=7.0.0",
+    "npm": ">=7.0.0",
-        "node": ">=16.0.0"
+    "node": ">=16.0.0"
-    },
+  },
-    "scripts": {
+  "scripts": {
-        "start": "node index.mjs",
+    "start": "node index.mjs",
-        "dev": "nodemon index.mjs",
+    "dev": "nodemon index.mjs",
-        "lint": "eslint ."
+    "lint": "eslint ."
-    },
+  },
-    "author": {
+  "author": {
-        "name": "sent",
+    "name": "sent",
-        "email": "sentttt@proton.me"
+    "email": "sentttt@proton.me"
-    },
+  },
-    "dependencies": {
+  "dependencies": {
-        "@mercuryworkshop/bare-mux": "latest",
+    "@mercuryworkshop/bare-mux": "latest",
-        "@mercuryworkshop/epoxy-transport": "latest",
+    "@mercuryworkshop/epoxy-transport": "latest",
-        "@mercuryworkshop/libcurl-transport": "latest",
+    "@mercuryworkshop/libcurl-transport": "latest",
-        "@titaniumnetwork-dev/ultraviolet": "latest",
+    "@titaniumnetwork-dev/ultraviolet": "latest",
-        "axios": "^1.8.2",
+    "axios": "latest",
-        "cache": "^3.0.0",
+    "cache": "latest",
-        "compression": "latest",
+    "compression": "latest",
-        "cors": "^2.8.5",
+    "cors": "latest",
-        "express": "latest",
+    "express": "latest",
-        "express-rate-limit": "^7.5.0",
+    "express-rate-limit": "latest",
-        "fs": "^0.0.1-security",
+    "lru-cache": "latest",
-        "node": "^23.9.0",
+    "wisp-server-node": "latest",
-        "node-cache": "latest",
+    "ws": "latest"
-        "node-fetch": "latest",
+  },
-        "wisp-server-node": "latest",
+  "devDependencies": {
-        "ws": "latest"
+    "eslint": "latest",
-    },
+    "glob": "latest",
-    "devDependencies": {
+    "nodemon": "latest",
-        "eslint": "latest",
+    "prettier": "latest",
-        "glob": "latest",
+    "rimraf": "latest"
-        "nodemon": "latest",
+  }
-        "prettier": "latest",
+}
-        "rimraf": "latest"
-    }
-}

public/!!.html

@@ -14,25 +14,47 @@
       <link rel="stylesheet" href="/assets/css/settings.css">
       <link rel="stylesheet" href="/assets/css/toast.css">
       <link rel="stylesheet" href="/assets/css/a.css">
+      <link rel="stylesheet" href="/assets/css/nprogress.css">
       <link href="https://cdn.jsdelivr.net/gh/aquawolf04/font-awesome-pro@5cd1511/css/all.css" rel="stylesheet">
-      <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/nprogress/0.2.0/nprogress.min.css">
-      <script src="https://cdnjs.cloudflare.com/ajax/libs/nprogress/0.2.0/nprogress.min.js"></script>
       <script async src="https://www.googletagmanager.com/gtag/js?id=G-WGJ2192JZY"></script><script>window.dataLayer = window.dataLayer || []; function gtag(){dataLayer.push(arguments);} gtag('js', new Date()); gtag('config', 'G-WGJ2192JZY');</script>
-      <script type='text/javascript' src='//pl26200262.effectiveratecpm.com/f0/e8/15/f0e81559842363ebf19aa99900ff2d02.js'></script>  
+      <!-- Cool little title animation :D-->
+      <script>
+         document.addEventListener('DOMContentLoaded', function () {
+         
+         NProgress.configure({ showSpinner: false });
+         NProgress.start();
+         
+         const titleElement = document.querySelector('.search-title');
+         if (titleElement) {
+         const text = titleElement.textContent.trim();
+         titleElement.textContent = '';
+         text.split('').forEach((letter, i) => {
+         const span = document.createElement('span');
+         span.textContent = letter;
+         span.style.animationDelay = `${i * 0.05}s`;
+         titleElement.appendChild(span);
+         });
+         }
+         
+         window.addEventListener('load', function () {
+         NProgress.done();
+         });
+         });
+      </script>
    </head>
    <body>
       <script src="/baremux/index.js"></script>
+      <script src="/assets/js/nprogress.js?v=0.2.0"></script>
       <script src="/wah/uv.bundle.js" defer></script>
       <script src="/wah/cute1.js" defer></script>
-      <script src="/assets/js/navbar.js" defer></script>
+      <script src="/assets/js/eruda.js?v=2.8.4" defer></script>
-      <script src="/assets/js/load.js" defer></script>
+      <script src="/assets/js/register.js?v=2.8.5" defer></script>
-      <script src="/assets/js/eruda.js" defer></script>
+      <script src="/assets/js/settings.js?v=2.8.7" defer></script>
-      <script src="/assets/js/register.js" defer></script>
+      <script src="/assets/js/greetings.js?v=2.8.5" defer></script>
-      <script src="/assets/js/settings.js" defer></script>
+      <script src="/assets/js/shortcuts.js?v=2.8.4" defer></script>
-      <script src="/assets/js/greetings.js" defer></script>
+      <script src="/assets/js/$.js?v=2.8.4" defer></script>
-      <script src="/assets/js/shortcuts.js" defer></script>
+      <script src="/assets/js/a.js?v=2.8.4" defer></script>
-      <script src="/assets/js/$.js" defer></script>
+      <script src="/assets/js/wv.js?v=1.4.1" defer></script>
-      <script src="/assets/js/a.js" defer></script>
       <div class="relative flex flex-col h-[100vh] items-center justify-center bg-black transition-bg">
          <div class="absolute inset-0 overflow-hidden">
             <div class="god-rays absolute -inset-[10px] opacity-50"></div>
@@ -43,7 +65,7 @@
          <span id="waves">Waves.</span>
          <a href="/" id="home">Home</a>
          <a href="/g" id="games">Games</a>
-         <a href="/a" id="apps">Apps</a>
+         <a href="/a" id="apps" style="color: #ffffff;">Apps</a>
          <a href="#" id="movies">Movies</a>
          <a href="#" id="ai">AI</a>
          <a href="#" id="settings-icon">
@@ -63,7 +85,7 @@
                   <input class="waves" type="text" id="searchInputt" 
                      placeholder="Search for a query or enter a URL..." autocomplete="off" 
                      style="padding-left: 40px;">
-                     <span class="shortcut-indicator-2">Ctrl + S</span>
+                  <span class="shortcut-indicator-2">Ctrl + S</span>
                </div>
             </li>
             <li><a href="/"><i class="fa-regular fa-home"></i></a></li>

public/!.html

@@ -15,24 +15,46 @@
       <link rel="stylesheet" href="/assets/css/toast.css">
       <link rel="stylesheet" href="/assets/css/g.css">
       <link href="https://cdn.jsdelivr.net/gh/aquawolf04/font-awesome-pro@5cd1511/css/all.css" rel="stylesheet" />
-      <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/nprogress/0.2.0/nprogress.min.css">
-      <script src="https://cdnjs.cloudflare.com/ajax/libs/nprogress/0.2.0/nprogress.min.js"></script>
       <script async src="https://www.googletagmanager.com/gtag/js?id=G-WGJ2192JZY"></script><script>window.dataLayer = window.dataLayer || []; function gtag(){dataLayer.push(arguments);} gtag('js', new Date()); gtag('config', 'G-WGJ2192JZY');</script>
-      <script type='text/javascript' src='//pl26200262.effectiveratecpm.com/f0/e8/15/f0e81559842363ebf19aa99900ff2d02.js'></script>  
+      <script type='text/javascript' src='//pl26200262.effectiveratecpm.com/f0/e8/15/f0e81559842363ebf19aa99900ff2d02.js'></script>
+      <!-- Cool little title animation :D-->
+      <script>
+         document.addEventListener('DOMContentLoaded', function () {
+         
+         NProgress.configure({ showSpinner: false });
+         NProgress.start();
+         
+         const titleElement = document.querySelector('.search-title');
+         if (titleElement) {
+         const text = titleElement.textContent.trim();
+         titleElement.textContent = '';
+         text.split('').forEach((letter, i) => {
+         const span = document.createElement('span');
+         span.textContent = letter;
+         span.style.animationDelay = `${i * 0.05}s`;
+         titleElement.appendChild(span);
+         });
+         }
+         
+         window.addEventListener('load', function () {
+         NProgress.done();
+         });
+         });
+      </script>
    </head>
    <body>
       <script src="/baremux/index.js"></script>
+      <script src="/assets/js/nprogress.js?v=0.2.0"></script>
       <script src="/wah/uv.bundle.js" defer></script>
       <script src="/wah/cute1.js" defer></script>
-      <script src="/assets/js/navbar.js" defer></script>
+      <script src="/assets/js/eruda.js?v=2.8.4" defer></script>
-      <script src="/assets/js/load.js" defer></script>
+      <script src="/assets/js/register.js?v=2.8.5" defer></script>
-      <script src="/assets/js/eruda.js" defer></script>
+      <script src="/assets/js/settings.js?v=2.8.7" defer></script>
-      <script src="/assets/js/register.js" defer></script>
+      <script src="/assets/js/greetings.js?v=2.8.5" defer></script>
-      <script src="/assets/js/settings.js" defer></script>
+      <script src="/assets/js/shortcuts.js?v=2.8.4" defer></script>
-      <script src="/assets/js/greetings.js" defer></script>
+      <script src="/assets/js/$.js?v=2.8.4" defer></script>
-      <script src="/assets/js/shortcuts.js" defer></script>
+      <script src="/assets/js/g.js?v=2.8.4" defer></script>
-      <script src="/assets/js/$.js" defer></script>
+      <script src="/assets/js/wv.js?v=1.4.1" defer></script>
-      <script src="/assets/js/g.js" defer></script>
       <div class="relative flex flex-col h-[100vh] items-center justify-center bg-black transition-bg">
          <div class="absolute inset-0 overflow-hidden">
             <div class="god-rays absolute -inset-[10px] opacity-50"></div>
@@ -42,7 +64,7 @@
          <img src="/assets/images/icons/favicon.ico" class="favicon">
          <span id="waves">Waves.</span>
          <a href="/" id="home">Home</a>
-         <a href="/g" id="games">Games</a>
+         <a href="/g" id="games" style="color: #ffffff;">Games</a>
          <a href="/a" id="apps">Apps</a>
          <a href="#" id="movies">Movies</a>
          <a href="#" id="ai">AI</a>
@@ -63,7 +85,7 @@
                   <input class="waves" type="text" id="searchInputt" 
                      placeholder="Search for a query or enter a URL..." autocomplete="off" 
                      style="padding-left: 40px;">
-                     <span class="shortcut-indicator-2">Ctrl + S</span>
+                  <span class="shortcut-indicator-2">Ctrl + S</span>
                </div>
             </li>
             <li><a href="/"><i class="fa-regular fa-home"></i></a></li>
@@ -96,6 +118,5 @@
       <div id="erudaLoadingScreen" style="display: none;">Eruda is loading...</div>
       <iframe id="cool-iframe" class="iframe"></iframe>
       <script type='text/javascript' src='//pl26200346.effectiveratecpm.com/08/db/84/08db842da9b43ad3d13c14634f9fd1c8.js'></script>
-      </div>
    </body>
 </html>

public/$.html

@@ -8,47 +8,70 @@
       <meta property="og:image" content="/assets/images/icons/favicon.ico"/>
       <meta name="theme-color" content="#ffffff"/>
       <meta name="msapplication-TileColor" content="#ffffff"/>
-      <title>Waves.</title> 
+      <title>Waves.</title>
       <link rel="icon" type="image/x-icon" href="/assets/images/icons/favicon.ico">
       <link rel="stylesheet" href="/assets/css/$.css">
       <link rel="stylesheet" href="/assets/css/settings.css">
       <link rel="stylesheet" href="/assets/css/toast.css">
+      <link rel="stylesheet" href="/assets/css/nprogress.css">
       <link href="https://cdn.jsdelivr.net/gh/aquawolf04/font-awesome-pro@5cd1511/css/all.css" rel="stylesheet">
-      <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/nprogress/0.2.0/nprogress.min.css">
-      <script src="https://cdnjs.cloudflare.com/ajax/libs/nprogress/0.2.0/nprogress.min.js"></script>
       <script async src="https://www.googletagmanager.com/gtag/js?id=G-WGJ2192JZY"></script><script>window.dataLayer = window.dataLayer || []; function gtag(){dataLayer.push(arguments);} gtag('js', new Date()); gtag('config', 'G-WGJ2192JZY');</script>
-      <script type='text/javascript' src='//pl26200262.effectiveratecpm.com/f0/e8/15/f0e81559842363ebf19aa99900ff2d02.js'></script>  
+      <!-- Cool little title animation :D-->
+      <script>
+         document.addEventListener('DOMContentLoaded', function () {
+         
+         NProgress.configure({ showSpinner: false });
+         NProgress.start();
+         
+         const titleElement = document.querySelector('.search-title');
+         if (titleElement) {
+         const text = titleElement.textContent.trim();
+         titleElement.textContent = '';
+         text.split('').forEach((letter, i) => {
+           const span = document.createElement('span');
+           span.textContent = letter;
+           span.style.animationDelay = `${i * 0.05}s`;
+           titleElement.appendChild(span);
+         });
+         }
+         
+         window.addEventListener('load', function () {
+         NProgress.done();
+         });
+         });
+      </script>
    </head>
    <body>
       <script src="/baremux/index.js"></script>
+      <script src="/assets/js/nprogress.js?v=0.2.0"></script>
       <script src="/wah/uv.bundle.js" defer></script>
       <script src="/wah/cute1.js" defer></script>
-      <script src="/assets/js/navbar.js" defer></script>
+      <script src="/assets/js/eruda.js?v=2.8.4" defer></script>
-      <script src="/assets/js/load.js" defer></script>
+      <script src="/assets/js/register.js?v=2.8.4" defer></script>
-      <script src="/assets/js/eruda.js" defer></script>
+      <script src="/assets/js/settings.js?v=2.8.8" defer></script>
-      <script src="/assets/js/register.js" defer></script>
+      <script src="/assets/js/ping.js?v=2.8.4" defer></script>
-      <script src="/assets/js/settings.js" defer></script>
+      <script src="/assets/js/greetings.js?v=2.8.4" defer></script>
-      <script src="/assets/js/ping.js" defer></script>
+      <script src="/assets/js/shortcuts.js?v=2.8.4" defer></script>
-      <script src="/assets/js/greetings.js" defer></script>
+      <script src="/assets/js/$.js?v=2.8.4" defer></script>
-      <script src="/assets/js/shortcuts.js" defer></script>
+      <script src="/assets/js/wv.js?v=1.4.1" defer></script>
-      <script src="/assets/js/$.js" defer></script>
+      <div class="relative flex flex-col h-[100vh] items-center justify-center bg-black transition-bg">
-      <div class="relative flex flex-col h-[100vh] items-center justify-center bg-white transition-bg">
          <div class="absolute inset-0 overflow-hidden">
             <div class="god-rays absolute -inset-[10px] opacity-50"></div>
          </div>
       </div>
       <div class="home-navbar">
          <img src="/assets/images/icons/favicon.ico" class="favicon">
-         <span id="waves">Waves.</span>
+         <span id="waves">Waves</span>
-         <a href="/" id="home">Home</a>
+         <a href="/" id="home" style="color: #ffffff;">Home</a>
          <a href="/g" id="games">Games</a>
          <a href="/a" id="apps">Apps</a>
          <a href="#" id="movies">Movies</a>
          <a href="#" id="ai">AI</a>
          <a href="#" id="settings-icon">
-            <i id="settings-icon" class="settings-icon fa-regular fa-gear"></i>         
+         <i class="settings-icon fa-regular fa-gear"></i>
          </a>
       </div>
+      <div class="glow-blob"></div>
       <div id="settings-menu" class="settings-menu"></div>
       <div class="navbar">
          <ul class="nav-buttons">
@@ -59,10 +82,8 @@
             <li>
                <div class="small-searchbar" style="position: relative;">
                   <i id="lockIcon" class="fa-solid fa-lock"></i>
-                  <input class="waves" type="text" id="searchInputt" 
+                  <input class="waves" type="text" id="searchInputt" placeholder="Search for a query or enter a URL..." autocomplete="off" style="padding-left: 40px;">
-                     placeholder="Search for a query or enter a URL..." autocomplete="off" 
+                  <span class="shortcut-indicator-2">Ctrl + S</span>
-                     style="padding-left: 40px;">
-                     <span class="shortcut-indicator-2">Ctrl + S</span>
                </div>
             </li>
             <li><a href="/"><i class="fa-regular fa-home"></i></a></li>
@@ -87,13 +108,30 @@
                <input type="text" id="userName" placeholder="Your name" autocomplete="off">
             </div>
             <button id="doneButton" onclick="submitName()" disabled>
-               <i class="fa-regular fa-check"></i> Done
+            <i class="fa-regular fa-check"></i> Done
             </button>
          </div>
       </div>
-      <div id="pingDisplay">Ping: Connecting...</div>
+      <div id="pingDisplay"><i class="fa-regular fa-wifi"></i> Ping: Connecting...</div>
       <div id="greeting"></div>
       <iframe id="cool-iframe" class="iframe"></iframe>
-      <script type='text/javascript' src='//pl26200346.effectiveratecpm.com/08/db/84/08db842da9b43ad3d13c14634f9fd1c8.js'></script>
+      <div id="lastest-commit">Loading latest commit</div>
+      <div id="copyright">
+         <i class="fa-regular fa-copyright"></i> 2025 
+         <a class="hover-link" href="https://discord.gg/ire" target="_blank" rel="noopener noreferrer">
+         <span class="copyrightname">Waves Services</span>
+         </a>. All Rights Reserved.
+      </div>
+      <div id="discord">
+         <a class="hover-link" href="https://discord.gg/ire" target="_blank" rel="noopener noreferrer">
+         <i class="fa-brands fa-discord"></i> Discord
+         </a>
+      </div>
+      <div id="github">
+         <a class="hover-link" href="https://github.com/xojw/waves" target="_blank" rel="noopener noreferrer">
+         <i class="fa-brands fa-github"></i> Github
+         </a>
+      </div>
+      <script type="text/javascript" src="//pl26200346.effectiveratecpm.com/08/db/84/08db842da9b43ad3d13c14634f9fd1c8.js"></script>
    </body>
 </html>

public/assets/css/$.css

@@ -7,6 +7,7 @@ body {
     color: #e0e0e0;
     overflow-x: hidden;
     transition: background-color 0.3s ease;
+    animation: fadeIn 0.3s ease;
     scroll-behavior: smooth;
     position: relative;
     z-index: 1;
@@ -17,6 +18,23 @@ body {
     color: #000000;
 }
 
+::-webkit-scrollbar {
+    width: 5px;
+}
+
+::-webkit-scrollbar-track {
+    background: #000000;
+}
+
+::-webkit-scrollbar-thumb {
+    background: #4e4e4e;
+    border-radius: 6px;
+}
+
+::-webkit-scrollbar-thumb:hover {
+    background: #6b6b6b;
+}
+
 #nprogress .bar {
 	background: #ffffff !important;
     z-index: 99999 !important;
@@ -54,7 +72,6 @@ body {
     height: 35px;
     color: #818181;
     padding: 10px;
-    animation: fadeIn 2s ease;
     text-align: center;
     font-size: 18px;
     font-weight: bold;
@@ -76,7 +93,7 @@ body {
 }
 
 .home-navbar a {
-    color: #e6e6e6;
+    color: #7c7c7c;
     text-decoration: none;
     padding: 8px 16px;
     font-size: 14px;
@@ -87,6 +104,7 @@ body {
 }
 
 .home-navbar a:hover {
+    color: #bbbbbb;
     font-size: 16px;
 }
 
@@ -100,23 +118,6 @@ body {
     margin-left: 115px;
 }
 
-::-webkit-scrollbar {
-    width: 5px;
-}
-
-::-webkit-scrollbar-track {
-    background: #000000;
-}
-
-::-webkit-scrollbar-thumb {
-    background: #4e4e4e;
-    border-radius: 6px;
-}
-
-::-webkit-scrollbar-thumb:hover {
-    background: #6b6b6b;
-}
-
 .navbar {
     top: 1%;
     background-color: #1111119c;
@@ -255,7 +256,6 @@ body {
     margin-top: 20%;
     left: 50%;
     transform: translate(-50%, -50%);
-    animation: fadeIn 2s ease;
     text-align: center;
     width: 90%;
 }
@@ -265,25 +265,22 @@ body {
     font-weight: bolder;
     text-align: center;
     display: inline-block;
-    background: linear-gradient(-45deg, #4e4e4e, #ffffff);
+    background: linear-gradient(-45deg, #8d8d8d, #ffffff);
     -webkit-background-clip: text;
-            background-clip: text;
+    background-clip: text;
     -webkit-text-fill-color: transparent;
-            color: transparent;
+    color: transparent;
     cursor: default;
     transition: all 0.3s ease;
-}  
+}
 
-  .search-title span {
+.search-title span {
     display: inline-block;
-    background: inherit;
-    -webkit-background-clip: text;
-            background-clip: text;
-    -webkit-text-fill-color: transparent;
-            color: transparent;
     opacity: 0;
-    transform: translateX(-50px);
+    background: inherit;
-    animation: fadeInFromLeft 0.5s ease-in-out forwards;
+    color: transparent;
+    transform: translateY(4rem);
+    animation: fadeSlideIn 0.6s forwards;
 }
 
 .search-bar {
@@ -387,13 +384,13 @@ body {
 }
 
 .hover-link {
-    color: #949494;
+    color: #b3b3b3;
     text-decoration: none;
     transition: color 0.3s ease;
 }
 
 .hover-link:hover {
-    color: #dadada;
+    color: #ffffff;
 }
 
 #pingDisplay {
@@ -401,10 +398,9 @@ body {
     margin-top: -46px;
     left: 50%;
     transform: translate(-50%, -50%);
-    font-weight: bold;
+    font-weight: 550;
     color: #888888;
     cursor: default;
-    animation: fadeIn 2s ease;
     padding: 5px 10px;
     transition: all 0.3s ease;
     z-index: -1;
@@ -412,7 +408,7 @@ body {
 }
 
 #pingDisplay:hover {
-    color: #b6b6b6;
+    color: #d3d3d3;
 }
 
 .god-rays {
@@ -426,7 +422,6 @@ body {
     background-image: var(--stripes), var(--rays);
     background-size: 300%, 200%;
     background-position: 50% 50%, 50% 50%;
-    animation: fadeIn 2s ease;
     mask-image: radial-gradient(ellipse at 100% 0%, transparent 40%, transparent 70%);
     -webkit-mask-image: radial-gradient(ellipse at 100% 0%, white 40%, transparent 70%);
     pointer-events: none;
@@ -572,7 +567,6 @@ body {
     position: fixed;
     left: 50%;
     transform: translate(-50%, -50%);
-    animation: fadeIn 2s ease;
     opacity: 0;
     transition: all 0.3s ease;
     cursor: default;
@@ -580,22 +574,86 @@ body {
 }
 
 #greeting:hover {
-    color: #b6b6b6;
+    color: #d3d3d3;
 }
 
 #namePrompt.fade-out {
     animation: fadeOutPrompt 0.3s ease-in-out forwards;
 }
 
-@keyframes fadeInFromLeft {
+#lastest-commit {
-    0% {
+    position: fixed;
-        opacity: 0;
+    bottom: 10px;
-        transform: translateX(-50px);
+    left: 10px;
-    }
+    z-index: 9999;
+    background-color: #08080894;
+    border: 1px solid #ffffff21;    
+    color: #cfcfcf;
+    font-weight: 540;
+    transition: all 0.3s ease;
+    cursor: default;
+    padding: 8px 12px;
+    border-radius: 15px;
+    font-size: 14px;
+}
 
-    100% {
+#copyright {
+    position: fixed;
+    bottom: 10px;
+    left: 50%;
+    transform: translateX(-50%);
+    z-index: 9999;
+    background-color: #08080894;
+    border: 1px solid #ffffff21;    
+    color: #858585;
+    font-weight: 540;
+    transition: all 0.3s ease;
+    cursor: default;
+    padding: 8px 12px;
+    border-radius: 15px;
+    font-size: 14px;
+}
+
+#copyright:hover {
+    color: #afafaf;
+}
+
+#discord {
+    position: fixed;
+    bottom: 10px;
+    right: 100px;
+    z-index: 9999;
+    background-color: #08080894;
+    border: 1px solid #ffffff21;    
+    color: #858585;
+    font-weight: 540;
+    transition: all 0.3s ease;
+    cursor: default;
+    padding: 8px 12px;
+    border-radius: 15px;
+    font-size: 14px;
+}
+
+#github {
+    position: fixed;
+    bottom: 10px;
+    right: 10px;
+    z-index: 9999;
+    background-color: #08080894;
+    border: 1px solid #ffffff21;    
+    color: #858585;
+    font-weight: 540;
+    transition: all 0.3s ease;
+    cursor: default;
+    padding: 8px 12px;
+    border-radius: 15px;
+    font-size: 14px;
+}
+
+@keyframes fadeSlideIn {
+    to {
         opacity: 1;
-        transform: translateX(0);
+        transform: translateY(0);
     }
 }
 

public/assets/css/a.css

@@ -5,7 +5,6 @@
 }
 
 .apps-page h1 {
-  animation: fadeIn 2s ease;
   font-size: 2.5rem;
   margin-bottom: 20px;
   color: #fff;
@@ -82,7 +81,6 @@
   margin-top: 20px;
   margin-bottom: 20px;
   color: #a8a8a8;
-  animation: fadeIn 2s ease;
   position: relative;
 }
 

public/assets/css/g.css

@@ -5,7 +5,6 @@
 }
 
 .games-page h1 {
-  animation: fadeIn 2s ease;
   font-size: 2.5rem;
   margin-bottom: 20px;
   color: #fff;
@@ -82,7 +81,6 @@
   margin-top: 20px;
   margin-bottom: 20px;
   color: #a8a8a8;
-  animation: fadeIn 2s ease;
   position: relative;
 }
 

public/assets/css/nprogress.css

@@ -0,0 +1 @@
+#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;-webkit-transform:rotate(3deg) translate(0,-4px);-ms-transform:rotate(3deg) translate(0,-4px);transform:rotate(3deg) translate(0,-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner 400ms linear infinite;animation:nprogress-spinner 400ms linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg)}}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}100%{transform:rotate(360deg)}}

public/assets/css/settings.css

@@ -63,7 +63,7 @@
 
 #close-settings:hover {
     transform: rotate(90deg);
-    color: #d3d3d3;
+    color: #ffffff;
 }
 
 #close-settings i {
@@ -94,9 +94,9 @@
 
 .transport-selected {
     background-color: #141414;
+    border: 1px solid #ffffff1a;
     color: #e0e0e0;
     padding: 10px;
-    border: 1px solid #4141411a;
     border-radius: 15px;
     cursor: pointer;
     display: flex;
@@ -159,7 +159,7 @@
     margin-left: -80px;
     background-color: #141414;
     color: #e0e0e0;
-    border: 1px solid #4141411a;
+    border: 1px solid #ffffff1a;
     border-radius: 15px;
     font-size: 15px;
     outline: none;
@@ -266,7 +266,7 @@
     background-color: #1b1b1b;
     color: #e0e0e0;
     padding: 12px 14px;
-    border: 1px solid #4141411a;
+    border: 1px solid #ffffff21;
     border-radius: 15px;
     font-size: 16px;
     cursor: pointer;
@@ -280,9 +280,8 @@
 }
 
 .tab-button.active {
-    background-color: #333;
+    background-color: #5c5c5c;
     color: #ffffff;
-    transform: translateY(-4px);
 }
 
 .tab-content {

public/assets/css/toast.css

@@ -32,6 +32,10 @@
   display: inline-block;
 }
 
+.toast i {
+  margin-right: 8px;
+}
+
 .toast.show {
   animation: slideIn 0.3s forwards;
 }
@@ -51,6 +55,21 @@
   animation: progress 3s linear forwards;
 }
 
+.toast .toast-close {
+  background: none;
+  border: none;
+  color: #888888;
+  font-size: 18px;
+  cursor: pointer;
+  padding: 0;
+  margin-left: 10px;
+  transition: 0.3s;
+}
+
+.toast-close:hover {
+  color: #ffffff;
+}
+
 @keyframes slideIn {
   0% {
       right: -300px;
@@ -79,19 +98,4 @@
   100% {
       width: 0%;
   }
-}
-
-.toast .toast-close {
-  background: none;
-  border: none;
-  color: #888888;
-  font-size: 18px;
-  cursor: pointer;
-  padding: 0;
-  margin-left: 10px;
-  transition: 0.3s;
-}
-
-.toast-close:hover {
-  color: #d3d3d3;
 }

public/assets/g/1v1lol/index.html

@@ -13,7 +13,6 @@
 		<script>
 			var gameLoaded = false;
 			window.addEventListener("beforeunload", function (e) {
-				if (adsVisible || !gameLoaded || !lockedOccured) return null;
 				var confirmationMessage = "Are you sure you want to leave? ";
 				(e || window.event).returnValue = confirmationMessage; //Gecko + IE
 				return confirmationMessage; //Gecko + Webkit, Safari, Chrome etc.
@@ -86,52 +85,10 @@
 					},
 				});
 		</script>
-		<!-- MIDROLL/INTERSTITIAL VIDEO API -->
-		<script src="js/cpmstar.js"></script>
 	</head>
 
 	<body>
-		<div class="ads">
-			<div class="ad-smallscreen">
-				<div class="ad ad-rectangle-bottom"></div>
-			</div>
-			<div class="ad ad-rectangle-upper" id="adRectangleUpper">
-				<!-- 300X250B PLACEMENT TAG - PLACE INTO BODY (ZONE TAG REQUIRED) -->
-				<script>
-					(function (w, pid) {
-						var r = function (c, m) {
-								c = c.split("").reduce(function (a, b) {
-									return ((a << 5) - a + b.charCodeAt(0)) >>> m;
-								}, 0);
-								return (10 + ((c * 7) % 26)).toString(36) + c.toString(36);
-							},
-							y = r(w.location.href.split("#")[0], 1),
-							c = r(w.location.href.split("#")[0] + pid, 0);
-						w.document.write('<div style="width:300px;height:250px" class="' + c + '"></div>');
-					})(window, 83023);
-				</script>
-			</div>
-			<div class="ad-largescreen">
-				<div class="ad ad-leaderboard-bottom">
-					<!-- 300X600B PLACEMENT TAG - PLACE INTO BODY (ZONE TAG REQUIRED) -->
-					<script>
-						(function (w, pid) {
-							var r = function (c, m) {
-									c = c.split("").reduce(function (a, b) {
-										return ((a << 5) - a + b.charCodeAt(0)) >>> m;
-									}, 0);
-									return (10 + ((c * 7) % 26)).toString(36) + c.toString(36);
-								},
-								y = r(w.location.href.split("#")[0], 1),
-								c = r(w.location.href.split("#")[0] + pid, 0);
-							w.document.write('<div style="width:300px;height:600px" class="' + c + '"></div>');
-						})(window, 85420);
-					</script>
-				</div>
-			</div>
-		</div>
 
-		<!-- <div id="interAdsContainer" style="display: none;"></div> -->
 		<div id="gameContainer"></div>
 		<div id="loader">
 			<img class="logo" src="logo.png" />
@@ -222,55 +179,6 @@
 
 			var refreshNextTime = true;
 
-			function showAds() {
-				document.getElementsByClassName("ad-rectangle-bottom")[0].style.display = "block";
-				document.getElementsByClassName("ad-leaderboard-bottom")[0].style.display = "block";
-				document.getElementById("adRectangleUpper").style.display = "block";
-
-				if (typeof counter === "undefined") {
-					startCounter();
-					resumeCounter();
-				} else {
-					resumeCounter();
-					refresh();
-				}
-			}
-
-			function hideAds() {
-				document.getElementsByClassName("ad-rectangle-bottom")[0].style.display = "none";
-				document.getElementsByClassName("ad-leaderboard-bottom")[0].style.display = "none";
-				document.getElementById("adRectangleUpper").style.display = "none";
-
-				pauseCounter();
-			}
-
-			// hide ads
-			hideAds();
-
-			function refresh() {
-				//console.log("time since ads refresh = " + timeSinceRefresh + " seconds");
-				//console.log("time ads visible = " + timeAdsVisible + " seconds");
-
-				if (timeSinceRefresh <= 30 || timeAdsVisible <= 2) {
-					//console.log("don't refresh");
-					return;
-				}
-
-				if (document.getElementById("adRectangleBottom") != null && window.getComputedStyle(document.getElementsByClassName("ad-smallscreen")[0]).display != "none") {
-					cpmstarAPI({ kind: "adcmd", module: "POOL 83023", command: "refresh" });
-				}
-
-				if (document.getElementById("adLeaderboardBottom") != null && window.getComputedStyle(document.getElementsByClassName("ad-largescreen")[0]).display != "none") {
-					cpmstarAPI({ kind: "adcmd", module: "POOL 85420", command: "refresh" });
-				}
-
-				cpmstarAPI({ kind: "adcmd", module: "POOL 83025", command: "refresh" });
-
-				timeSinceRefresh = 0;
-				timeAdsVisible = 0;
-				//console.log("refresh ads");
-			}
-
 			window.onfocus = function () {
 				//console.log("onfocus");
 				resumeCounter();
@@ -283,26 +191,16 @@
 			};
 
 			var timeSinceRefresh = 0;
-			var timeAdsVisible = 0;
 			var counter;
-			var adsVisible = false;
 
 			function startCounter() {
 				timeSinceRefresh++;
-				if (adsVisible) timeAdsVisible++;
 
 				counter = setTimeout(function () {
 					startCounter();
 				}, 1000);
 			}
 
-			function resumeCounter() {
-				adsVisible = true;
-			}
-
-			function pauseCounter() {
-				adsVisible = false;
-			}
 		</script>
 		<!-- Firebase App (the core Firebase SDK) is always required and must be listed first -->
 		<script src="firebase/firebase-app.js"></script>
@@ -341,4 +239,4 @@
 			fixMacUserAgent();
 		</script>
 	</body>
-</html>
+</html>

public/assets/js/$.js

@@ -1,293 +1,499 @@
 document.addEventListener('DOMContentLoaded', () => {
-	const historyStack = []
+    window.APP = {};
-	let currentIndex = -1
+
-	const refreshIcon = document.getElementById('refreshIcon')
+    const iframe = document.getElementById('cool-iframe');
-	const fullscreenIcon = document.getElementById('fullscreenIcon')
+    const erudaLoadingScreen = document.getElementById('erudaLoadingScreen');
-	const backIcon = document.getElementById('backIcon')
+    const searchInput1 = document.getElementById('searchInput');
-	const forwardIcon = document.getElementById('forwardIcon')
+    const movies = document.getElementById('movies');
-	const iframe = document.getElementById('cool-iframe')
+    const ai = document.getElementById('ai');
-	const erudaLoadingScreen = document.getElementById('erudaLoadingScreen')
+    const topBar = document.querySelector('.topbar');
-	if (!refreshIcon || !fullscreenIcon || !backIcon || !forwardIcon || !iframe) return
+    const refreshIcon = document.getElementById('refreshIcon');
-	const originalTitle = document.title
+    const fullscreenIcon = document.getElementById('fullscreenIcon');
-	let loadingHidden = false
+    const backIcon = document.getElementById('backIcon');
-	function showLoadingScreen(withToast = true, showEruda = false) {
+    const forwardIcon = document.getElementById('forwardIcon');
-		loadingHidden = false
+    const searchInput2 = document.getElementById('searchInputt');
-		NProgress.start()
+    const lockIcon = document.getElementById('lockIcon');
-		document.title = 'Loading... <3'
+    const navbarToggle = document.getElementById('navbar-toggle');
-		if (withToast) {
+    const navBar = document.querySelector('.navbar');
-			showToast(
+
-				'Consider joining our <a href="https://discord.gg/dJvdkPRheV" target="_blank" class="hover-link">Discord</a>&nbsp;<3',
+    const historyStack = [];
-				'success',
+    let currentIndex = -1;
-				'heart'
+    const originalTitle = document.title;
-			)
+    let isLoading = false;
-		}
+
-	}
+    if (!iframe || !refreshIcon || !fullscreenIcon || !backIcon || !forwardIcon) {
-	function hideLoadingScreen() {
+        return;
-		if (loadingHidden) return
+    }
-		loadingHidden = true
+
-		NProgress.done()
+    const animationStyle = document.createElement('style');
-		document.title = originalTitle
+    animationStyle.textContent = `
-	}
+        @keyframes slideLeft {0% { transform: translateX(0); } 50% { transform: translateX(-5px); } 100% { transform: translateX(0); }}
-	refreshIcon.addEventListener('click', () => {
+        @keyframes slideRight {0% { transform: translateX(0); } 50% { transform: translateX(5px); } 100% { transform: translateX(0); }}
-		refreshIcon.classList.add('spin')
+        .button-animate-back { animation: slideLeft 0.3s ease-in-out; }
-		if (iframe.tagName === 'IFRAME') {
+        .button-animate-forward { animation: slideRight 0.3s ease-in-out; }
-			const currentUrl = iframe.contentWindow.location.href
+        .spin { animation: spinAnimation 0.3s linear; }
-			if (normalizeUrl(currentUrl) !== normalizeUrl(historyStack[currentIndex] || '')) {
+        @keyframes spinAnimation { 0% { transform: rotate(0deg); } 100% { transform: rotate(360deg); } }
-				addToHistory(currentUrl)
+    `;
-			}
+    document.head.appendChild(animationStyle);
-			iframe.contentWindow.location.reload(true)
+
-		}
+    function showLoadingScreen(withToast = true) {
-		setTimeout(() => refreshIcon.classList.remove('spin'), 300)
+        if (isLoading) return;
-	})
+        isLoading = true;
-	fullscreenIcon.addEventListener('click', () => {
+        if (typeof NProgress !== 'undefined') NProgress.start();
-		if (iframe.requestFullscreen) iframe.requestFullscreen()
+
-		else if (iframe.mozRequestFullScreen) iframe.mozRequestFullScreen()
+        if (withToast) {
-		else if (iframe.webkitRequestFullscreen) iframe.webkitRequestFullscreen()
+            showToast(
-		else if (iframe.msRequestFullscreen) iframe.msRequestFullscreen()
+                'Consider joining our <a href="https://discord.gg/dJvdkPRheV" target="_blank" class="hover-link">Discord</a>&nbsp;<3',
-	})
+                'success',
-	backIcon.addEventListener('click', () => {
+                'heart'
-		if (currentIndex > 0) {
+            );
-			currentIndex--
+        }
-			iframe.src = historyStack[currentIndex]
+    }
-			showLoadingScreen(false, false)
+
-			updateNavButtons()
+    function hideLoadingScreen() {
-			updateDecodedSearchInput()
+        if (!isLoading) return;
-		}
+        if (typeof NProgress !== 'undefined') NProgress.done();
-	})
+        document.title = originalTitle;
-	forwardIcon.addEventListener('click', () => {
+        isLoading = false;
-		if (currentIndex < historyStack.length - 1) {
+        if (erudaLoadingScreen) erudaLoadingScreen.style.display = 'none';
-			currentIndex++
+    }
-			iframe.src = historyStack[currentIndex]
+
-			showLoadingScreen(false, false)
+    function normalizeUrl(urlStr) {
-			updateNavButtons()
+        if (!urlStr || urlStr === 'about:blank') return urlStr;
-			updateDecodedSearchInput()
+        try {
-		}
+            const url = new URL(urlStr);
-	})
+            url.searchParams.delete('ia');
-	function normalizeUrl(urlStr) {
+            return url.toString();
-		try {
+        } catch {
-			const url = new URL(urlStr)
+            return urlStr;
-			url.searchParams.delete('ia')
+        }
-			return url.toString()
+    }
-		} catch {
+
-			return urlStr
+    function decodeUrl(encodedUrl) {
-		}
+        if (!encodedUrl) return '';
-	}
+        try {
-	function addToHistory(url) {
+            const prefix = (typeof __uv$config !== 'undefined' && __uv$config.prefix) ? __uv$config.prefix : '/wa/a/';
-		const normalized = normalizeUrl(url)
+            const decodeFunction = (typeof __uv$config !== 'undefined' && __uv$config.decodeUrl) ? __uv$config.decodeUrl : decodeURIComponent;
-		if (currentIndex >= 0 && normalizeUrl(historyStack[currentIndex]) === normalized) return
+            const urlObject = new URL(encodedUrl, window.location.origin);
-		if (currentIndex < historyStack.length - 1) historyStack.splice(currentIndex + 1)
+            if (urlObject.pathname.startsWith(prefix)) {
-		historyStack.push(url)
+                const encodedPart = urlObject.pathname.slice(prefix.length);
-		currentIndex++
+                return decodeFunction(encodedPart) + urlObject.search + urlObject.hash;
-		updateNavButtons()
+            }
-		updateDecodedSearchInput()
+        } catch {}
-	}
+        try {
-	function updateNavButtons() {
+            return decodeURIComponent(encodedUrl);
-		backIcon.disabled = currentIndex <= 0
+        } catch {
-		forwardIcon.disabled = currentIndex >= historyStack.length - 1
+            return encodedUrl;
-		backIcon.classList.toggle('disabled', currentIndex <= 0)
+        }
-		forwardIcon.classList.toggle('disabled', currentIndex >= historyStack.length - 1)
+    }
-	}
+
-	function updateDecodedSearchInput() {
+    function updateNavButtons() {
-		const searchInput2 = document.getElementById('searchInputt')
+        if (!backIcon || !forwardIcon) return;
-		if (!searchInput2) return
+        const canGoBack = currentIndex > 0;
-		let url = ''
+        const canGoForward = currentIndex < historyStack.length - 1;
-		if (currentIndex >= 0 && historyStack[currentIndex]) {
+        backIcon.disabled = !canGoBack;
-			url = historyStack[currentIndex]
+        forwardIcon.disabled = !canGoForward;
-		} else if (iframe.src) {
+        backIcon.classList.toggle('disabled', !canGoBack);
-			url = iframe.src
+        forwardIcon.classList.toggle('disabled', !canGoForward);
-		}
+    }
-		searchInput2.value = decodeUrl(url)
+
-		const lockIcon = document.getElementById('lockIcon')
+    function updateDecodedSearchInput() {
-		if (lockIcon) {
+        if (!searchInput2) return;
-			lockIcon.className = decodeUrl(url).startsWith('https://') ?
+        let currentUrl = '';
-				'fa-regular fa-lock' :
+        if (currentIndex >= 0 && historyStack[currentIndex]) {
-				'fa-regular fa-lock-open'
+            currentUrl = historyStack[currentIndex];
-			lockIcon.style.color = ''
+        } else if (iframe.src && iframe.src !== 'about:blank') {
-		}
+            currentUrl = iframe.src;
-	}
+        }
-	iframe.addEventListener('load', () => {
+        const decoded = decodeUrl(currentUrl);
-		try {
+        searchInput2.value = decoded;
-			hideLoadingScreen()
+
-		} catch {
+        if (lockIcon) {
-			hideLoadingScreen()
+            const isSecure = decoded.startsWith('https://');
-		} finally {
+            lockIcon.className = isSecure ? 'fa-regular fa-lock' : 'fa-regular fa-lock-open';
-			if (erudaLoadingScreen) erudaLoadingScreen.style.display = 'none'
+        }
-		}
+    }
-	})
+
-	iframe.addEventListener('error', () => {
+    function addToHistory(url, isReplacingCurrent = false) {
-		hideLoadingScreen()
+        if (!url || url === 'about:blank') return;
-	})
+
-	iframe.addEventListener('loadstart', () => {
+        const normalizedNewUrl = normalizeUrl(url);
-		const navBar = document.querySelector('.navbar')
+        const currentHistoryEntry = historyStack[currentIndex];
-		const navbarToggle = document.getElementById('navbar-toggle')
+        const normalizedCurrentHistoryEntry = currentIndex >= 0 ? normalizeUrl(currentHistoryEntry) : null;
-		if (navbarToggle && navbarToggle.checked && navBar) navBar.style.display = 'block'
+
-		showLoadingScreen(false, false)
+        if (isReplacingCurrent && currentIndex >= 0) {
-	})
+            if (normalizedCurrentHistoryEntry !== normalizedNewUrl || currentHistoryEntry !== url) {
-	const navBar = document.querySelector('.navbar')
+                historyStack[currentIndex] = url;
-	const topBar = document.querySelector('.topbar')
+            } else {
-	const searchInput1 = document.getElementById('searchInput')
+                return;
-	const searchInput2 = document.getElementById('searchInputt')
+            }
-	const movies = document.getElementById('movies')
+        } else {
-	const ai = document.getElementById('ai')
+            if (normalizedCurrentHistoryEntry === normalizedNewUrl && currentHistoryEntry === url) {
-	const navbarToggle = document.getElementById('navbar-toggle')
+                return;
-	if (navbarToggle && navBar) {
+            }
-		const savedNavbarState = localStorage.getItem('navbarToggled')
+            if (currentIndex < historyStack.length - 1) {
-		navbarToggle.checked = savedNavbarState === null ? true : savedNavbarState === 'true'
+                historyStack.splice(currentIndex + 1);
-		navBar.style.display = iframe.style.display === 'block' && navbarToggle.checked ? 'block' : 'none'
+            }
-		navbarToggle.addEventListener('change', () => {
+            historyStack.push(url);
-			localStorage.setItem('navbarToggled', navbarToggle.checked)
+            currentIndex++;
-			navBar.style.display = iframe.style.display === 'block' && navbarToggle.checked ? 'block' : 'none'
+        }
-		})
+        updateNavButtons();
-	}
+        updateDecodedSearchInput();
-	iframe.style.display = 'none'
+    }
-	window.addEventListener('load', hideLoadingScreen)
+
-	;[searchInput1, searchInput2].forEach(input => {
+    function generateSubject() {
-		if (input) {
+        const subjects = ['math', 'science', 'history', 'art', 'programming', 'philosophy'];
-			input.addEventListener('keyup', e => {
+        const randomSubject = subjects[Math.floor(Math.random() * subjects.length)];
-				if (e.key === 'Enter') {
+        try {
-					const val = input.value.trim()
+           history.replaceState({}, '', `/learning?subject=${randomSubject}`);
-					if (val) handleSearch(val)
+        } catch(e) {}
-					else showToast('Please enter something in the Search Bar.', 'error', 'warning')
+    }
-				}
+
-			})
+    function setupIframeNavigationListeners() {
-		}
+        try {
-	})
+            const iframeWindow = iframe.contentWindow;
-	if (movies) movies.addEventListener('click', e => {
+            if (!iframeWindow || iframeWindow === window || iframeWindow.location.href === 'about:blank') return;
-		e.preventDefault()
+
-		handleSearch('https://movies.usewaves.site/')
+            const handleNav = (isReplace = false) => {
-	})
+                setTimeout(() => {
-	if (ai) ai.addEventListener('click', e => {
+                    try {
-		e.preventDefault()
+                        const newUrlInIframe = iframeWindow.location.href;
-		handleSearch('https://ai.usewaves.site/')
+                        if (newUrlInIframe === 'about:blank' && historyStack[currentIndex] === 'about:blank') return;
-	})
+                        addToHistory(newUrlInIframe, isReplace);
-	function clearBackground() {
+                    } catch (e) {}
-		const preserved = [
+                }, 0);
-			document.querySelector('.navbar'),
+            };
-			document.getElementById('cool-iframe'),
+
-			document.querySelector('.loading-screen'),
+            if (!iframeWindow.history.pushState.__isPatched) {
-			erudaLoadingScreen
+                const originalPushState = iframeWindow.history.pushState;
-		]
+                iframeWindow.history.pushState = function(...args) {
-		Array.from(document.body.children).forEach(child => {
+                    originalPushState.apply(this, args);
-			if (!preserved.includes(child)) child.remove()
+                    handleNav(false);
-		})
+                };
-	}
+                iframeWindow.history.pushState.__isPatched = true;
-	async function handleSearch(query) {
+            }
-		if (!query || !query.trim()) {
+            if (!iframeWindow.history.replaceState.__isPatched) {
-			showToast('Please enter something in the Search Bar.', 'error', 'warning')
+                const originalReplaceState = iframeWindow.history.replaceState;
-			return
+                iframeWindow.history.replaceState = function(...args) {
-		}
+                    originalReplaceState.apply(this, args);
-		clearBackground()
+                    handleNav(true);
-		let searchURL
+                };
-		if (
+                iframeWindow.history.replaceState.__isPatched = true;
-			query.startsWith('/assets/g/') ||
+            }
-			query.startsWith(window.location.origin + '/assets/g/')
+
-		) {
+            iframeWindow.removeEventListener('popstate', iframeWindow.__popstateHandler);
-			searchURL = query
+            iframeWindow.__popstateHandler = () => handleNav(false);
-		} else {
+            iframeWindow.addEventListener('popstate', iframeWindow.__popstateHandler);
-			searchURL = generateSearchUrl(query)
+
-		}
+            iframeWindow.removeEventListener('hashchange', iframeWindow.__hashchangeHandler);
-		if (searchInput2) searchInput2.value = searchURL
+            iframeWindow.__hashchangeHandler = () => handleNav(false);
-		historyStack.length = 0
+            iframeWindow.addEventListener('hashchange', iframeWindow.__hashchangeHandler);
-		currentIndex = -1
+        } catch (error) {}
-		showLoadingScreen(true, false)
+    }
-		iframe.style.display = 'block'
+
-		if (topBar) topBar.style.display = 'none'
+    iframe.addEventListener('loadstart', () => {
-		backIcon.disabled = forwardIcon.disabled = true
+        showLoadingScreen(false);
-		let finalUrl
+        if (navbarToggle && navbarToggle.checked && navBar) {
-		try {
+            navBar.style.display = 'block';
-			const u = new URL(searchURL, window.location.origin)
+        }
-			if (u.origin === window.location.origin && u.pathname.startsWith('/assets/g/')) {
+    });
-				finalUrl = u.href
+
-			} else {
+    iframe.addEventListener('load', () => {
-				finalUrl = await getUrl(searchURL)
+        hideLoadingScreen();
-			}
+        try {
-		} catch {
+            const newUrl = iframe.contentWindow ? iframe.contentWindow.location.href : iframe.src;
-			finalUrl = await getUrl(searchURL)
+            if (newUrl && newUrl !== 'about:blank') {
-		}
+                if (currentIndex === -1 || normalizeUrl(historyStack[currentIndex]) !== normalizeUrl(newUrl) || historyStack[currentIndex] !== newUrl ) {
-		iframe.src = finalUrl
+                     addToHistory(newUrl);
-		iframe.onload = () => {
+                } else if (historyStack[currentIndex] !== newUrl) {
-			hideLoadingScreen()
+                    addToHistory(newUrl, true);
-			if (navbarToggle && navbarToggle.checked && navBar) navBar.style.display = 'block'
+                }
-			generateSubject()
+            } else if (newUrl === 'about:blank' && historyStack.length > 0 && historyStack[currentIndex] !== 'about:blank') {
-			updateDecodedSearchInput()
+                if (currentIndex > 0) {
-		}
+                    const previousUrl = historyStack[currentIndex -1];
-		iframe.onerror = () => {
+                    currentIndex--;
-			hideLoadingScreen()
+                    iframe.src = previousUrl;
-		}
+                    return; 
-	}
+                }
-	window.handleSearch = handleSearch
+            }
-	function generateSearchUrl(query) {
+            setupIframeNavigationListeners();
-		try {
+            generateSubject();
-			return new URL(query).toString()
+             if (navbarToggle && navbarToggle.checked && navBar) {
-		} catch {
+                navBar.style.display = 'block';
-			try {
+            }
-				const u = new URL(`https://${query}`)
+        } catch (error) {
-				if (u.hostname.includes('.')) return u.toString()
+        } finally {
-			} catch {}
+            updateNavButtons();
-		}
+            updateDecodedSearchInput();
-		return `https://duckduckgo.com/?q=${encodeURIComponent(query)}&ia=web`
+        }
-	}
+    });
-	function showToast(message, type = 'success', iconType = 'check') {
+
-		const toast = document.createElement('div')
+    iframe.addEventListener('error', () => {
-		toast.className = `toast show ${type}`
+        hideLoadingScreen();
-		const icons = {
+        showToast('Error: Could not load page content.', 'error', 'times-circle');
-			success: '<i class="fa-regular fa-check-circle" style="margin-right: 8px;"></i>',
+        updateNavButtons();
-			error: '<i class="fa-regular fa-times-circle" style="margin-right: 8px;"></i>',
+        updateDecodedSearchInput();
-			info: '<i class="fa-regular fa-info-circle" style="margin-right: 8px;"></i>',
+    });
-			warning: '<i class="fa-regular fa-exclamation-triangle" style="margin-right: 8px;"></i>',
+
-			heart: '<i class="fa-regular fa-heart" style="margin-right: 8px;"></i>'
+    function toggleButtonAnimation(button, animationClass) {
-		}
+        if (button) {
-		const icon = icons[iconType] || icons.heart
+            button.classList.add(animationClass);
-		toast.innerHTML = `${icon}${message} `
+            setTimeout(() => button.classList.remove(animationClass), 200);
-		const progressBar = document.createElement('div')
+        }
-		progressBar.className = 'progress-bar'
+    }
-		toast.appendChild(progressBar)
+    
-		const closeBtn = document.createElement('button')
+    backIcon.addEventListener('click', () => {
-		closeBtn.className = 'toast-close'
+        toggleButtonAnimation(backIcon, 'button-animate-back');
-		closeBtn.innerHTML = '<i class="fa-solid fa-xmark" style="margin-left: 8px; font-size: 0.8em;"></i>'
+        if (currentIndex > 0) {
-		closeBtn.addEventListener('click', () => {
+            currentIndex--;
-			toast.classList.add('hide')
+            showLoadingScreen(false);
-			setTimeout(() => toast.remove(), 500)
+            iframe.src = historyStack[currentIndex];
-		})
+            updateNavButtons();
-		toast.appendChild(closeBtn)
+            updateDecodedSearchInput();
-		document.body.appendChild(toast)
+        }
-		setTimeout(() => {
+    });
-			toast.classList.add('hide')
+
-			setTimeout(() => toast.remove(), 500)
+    forwardIcon.addEventListener('click', () => {
-		}, 3000)
+        toggleButtonAnimation(forwardIcon, 'button-animate-forward');
-	}
+        if (currentIndex < historyStack.length - 1) {
-	function preloadResources(url) {
+            currentIndex++;
-		if (!url) return
+            showLoadingScreen(false);
-		try {
+            iframe.src = historyStack[currentIndex];
-			const link = document.createElement('link')
+            updateNavButtons();
-			link.rel = 'preload'
+            updateDecodedSearchInput();
-			link.href = url
+        }
-			link.as = 'fetch'
+    });
-			link.crossOrigin = 'anonymous'
+    
-			document.head.appendChild(link)
+    refreshIcon.addEventListener('click', () => {
-		} catch {}
+        if (refreshIcon) refreshIcon.classList.add('spin');
-	}
+        if (iframe.contentWindow) {
-	function getUrl(url) {
+            showLoadingScreen(false);
-		return Promise.resolve(__uv$config.prefix + __uv$config.encodeUrl(url))
+            const currentIframeUrl = iframe.contentWindow.location.href;
-	}
+            if (normalizeUrl(currentIframeUrl) !== normalizeUrl(historyStack[currentIndex] || '')) {
-	function generateSubject() {
+                 addToHistory(currentIframeUrl);
-		const subjects = ['math', 'science', 'history', 'art', 'programming', 'philosophy']
+            }
-		const random = subjects[Math.floor(Math.random() * subjects.length)]
+            iframe.contentWindow.location.reload(true);
-		history.replaceState({}, '', '/learning?subject=' + random)
+        }
-	}
+        if (refreshIcon) setTimeout(() => refreshIcon.classList.remove('spin'), 300);
-	function decodeUrl(enc) {
+    });
-		try {
+
-			const o = new URL(enc, window.location.origin)
+    fullscreenIcon.addEventListener('click', () => {
-			const p = (__uv$config && __uv$config.prefix) || '/wa/a/'
+        if (iframe.requestFullscreen) iframe.requestFullscreen();
-			if (o.pathname.startsWith(p)) {
+        else if (iframe.mozRequestFullScreen) iframe.mozRequestFullScreen();
-				const part = o.pathname.slice(p.length)
+        else if (iframe.webkitRequestFullscreen) iframe.webkitRequestFullscreen();
-				return (__uv$config.decodeUrl ? __uv$config.decodeUrl(part) : decodeURIComponent(part))
+        else if (iframe.msRequestFullscreen) iframe.msRequestFullscreen();
-			}
+    });
-		} catch {}
+
-		return enc
+    function generateSearchUrl(query) {
-	}
+        query = query.trim();
-	window.decodeUrl = decodeUrl
+        if (!query) return `https://duckduckgo.com/?q=&ia=web`;
-	window.addToHistory = addToHistory
+
-	window.updateDecodedSearchInput = updateDecodedSearchInput
+        if (/^[a-zA-Z]+:\/\//.test(query)) {
-	window.normalizeUrl = normalizeUrl
+            try {
-})
+                new URL(query);
+                return query;
+            } catch (e) {}
+        }
+        
+        if (/^(localhost|(\d{1,3}\.){3}\d{1,3})(:\d+)?(\/.*)?$/.test(query) || query.toLowerCase() === "localhost") {
+             if (!query.toLowerCase().startsWith("http:") && !query.toLowerCase().startsWith("https:")) {
+                return `http://${query}`;
+             }
+             return query;
+        }
+        
+        try {
+            const urlWithHttps = new URL(`https://${query}`);
+            if (urlWithHttps.hostname &&
+                urlWithHttps.hostname.includes('.') &&
+                !urlWithHttps.hostname.endsWith('.') &&
+                urlWithHttps.hostname !== '.' &&
+                urlWithHttps.hostname.split('.').pop().length >= 2 && 
+                !/^\d+$/.test(urlWithHttps.hostname.split('.').pop()) 
+               ) {
+                return urlWithHttps.toString();
+            }
+        } catch (e) {}
+
+        return `https://duckduckgo.com/?q=${encodeURIComponent(query)}&ia=web`;
+    }
+    
+    async function getUrl(url) {
+        if (typeof __uv$config !== 'undefined' && __uv$config.encodeUrl) {
+            return Promise.resolve(__uv$config.prefix + __uv$config.encodeUrl(url));
+        }
+        return Promise.resolve(url);
+    }
+
+    function clearBackground() {
+        const preservedElements = [
+            navBar, iframe, document.querySelector('.loading-screen'),
+            erudaLoadingScreen, topBar
+        ].filter(el => el != null);
+        Array.from(document.body.children).forEach(child => {
+            if (!preservedElements.includes(child) && child.tagName !== 'SCRIPT' && child.tagName !== 'STYLE' && !child.classList.contains('toast')) {
+                child.remove();
+            }
+        });
+    }
+    
+    async function handleSearch(query) {
+        if (!query || !query.trim()) {
+            showToast('Please enter something in the Search Bar.', 'error', 'warning');
+            return;
+        }
+        clearBackground();
+        let searchURL = generateSearchUrl(query);
+
+        historyStack.length = 0;
+        currentIndex = -1;
+        updateNavButtons();
+        showLoadingScreen(true);
+        iframe.style.display = 'block';
+        if (topBar) topBar.style.display = 'flex';
+        if (navBar && navbarToggle && navbarToggle.checked) navBar.style.display = 'block';
+
+        let finalUrlToLoad;
+        if (searchURL.startsWith(window.location.origin + '/assets/g/')) {
+            finalUrlToLoad = searchURL;
+        } else if (searchURL.startsWith('/assets/g/')) {
+             finalUrlToLoad = new URL(searchURL, window.location.origin).href;
+        }
+        else {
+            try {
+                const tempUrl = new URL(searchURL);
+                if (tempUrl.origin === window.location.origin && tempUrl.pathname.startsWith('/assets/g/')) {
+                    finalUrlToLoad = tempUrl.href;
+                } else { finalUrlToLoad = await getUrl(searchURL); }
+            } catch (e) { finalUrlToLoad = await getUrl(searchURL); }
+        }
+        
+        if (searchInput2) searchInput2.value = decodeUrl(finalUrlToLoad);
+        iframe.src = finalUrlToLoad;
+    }
+    window.APP.handleSearch = handleSearch;
+
+    [searchInput1, searchInput2].forEach(input => {
+        if (input) {
+            input.addEventListener('keyup', e => {
+                if (e.key === 'Enter') {
+                    const queryValue = input.value.trim();
+                    if (queryValue) {
+                        APP.handleSearch(queryValue);
+                        if (input === searchInput1) searchInput1.value = '';
+                    } else {
+                        showToast('Please enter something in the Search Bar.', 'error', 'warning');
+                    }
+                }
+            });
+            if (input === searchInput2) {
+                input.addEventListener('focus', updateDecodedSearchInput);
+            }
+        }
+    });
+
+    if (movies) movies.addEventListener('click', e => { e.preventDefault(); APP.handleSearch('https://movies.usewaves.site/'); });
+    if (ai) ai.addEventListener('click', e => { e.preventDefault(); APP.handleSearch('https://ai.usewaves.site/'); });
+    
+    function showToast(message, type = 'success', iconType = 'check') {
+        const toast = document.createElement('div');
+        toast.className = `toast show ${type}`;
+        const icons = { 'check': 'fa-regular fa-check-circle', 'times-circle': 'fa-regular fa-times-circle', 'info': 'fa-regular fa-info-circle', 'warning': 'fa-regular fa-exclamation-triangle', 'heart': 'fa-solid fa-heart' };
+        toast.innerHTML = `<i class="${icons[iconType] || icons.heart}" style="margin-right: 8px;"></i>${message}`;
+        const progressBar = document.createElement('div'); progressBar.className = 'progress-bar'; toast.appendChild(progressBar);
+        const closeBtn = document.createElement('button'); closeBtn.className = 'toast-close';
+        closeBtn.innerHTML = '<i class="fa-solid fa-xmark" style="margin-left: 8px; font-size: 0.8em;"></i>';
+        closeBtn.onclick = () => { toast.classList.add('hide'); setTimeout(() => toast.remove(), 500); };
+        toast.appendChild(closeBtn);
+        document.body.appendChild(toast);
+        setTimeout(() => { toast.classList.add('hide'); setTimeout(() => toast.remove(), 500); }, 3000);
+    }
+    
+    if (navbarToggle && navBar && iframe) {
+        const savedNavbarState = localStorage.getItem('navbarToggled');
+        const defaultChecked = iframe.style.display !== 'block' ? true : (savedNavbarState === null ? false : savedNavbarState === 'true');
+        navbarToggle.checked = defaultChecked;
+
+        const updateNavbarDisplayBasedOnToggle = () => {
+            if (iframe.style.display === 'block') {
+                navBar.style.display = navbarToggle.checked ? 'block' : 'none';
+            } else {
+                navBar.style.display = 'none';
+            }
+        };
+        updateNavbarDisplayBasedOnToggle();
+       
+        navbarToggle.addEventListener('change', () => {
+            localStorage.setItem('navbarToggled', navbarToggle.checked.toString());
+            updateNavbarDisplayBasedOnToggle();
+        });
+        
+        window.APP.updateNavbarDisplay = updateNavbarDisplayBasedOnToggle;
+    }
+    
+    window.addEventListener('load', () => {
+        let iframeInitiallyHidden = true;
+        if (iframe.src && iframe.src !== 'about:blank') {
+            iframeInitiallyHidden = false;
+        }
+
+        if (iframeInitiallyHidden) {
+            hideLoadingScreen();
+            if (topBar) topBar.style.display = 'flex';
+            iframe.style.display = 'none';
+        } else {
+            if (topBar) topBar.style.display = 'flex';
+            iframe.style.display = 'block';
+        }
+        
+        if(window.APP.updateNavbarDisplay) window.APP.updateNavbarDisplay();
+        updateNavButtons();
+        updateDecodedSearchInput();
+    });
+
+    window.APP.decodeUrl = decodeUrl;
+    window.APP.normalizeUrl = normalizeUrl;
+});
+
+(async () => {
+  const commitElement = document.getElementById('lastest-commit');
+
+  try {
+    const res = await fetch('/api/latest-commit');
+
+    console.log('Fetching latest commit from API:', res);
+
+    if (!res.ok) {
+      const remaining = res.headers.get('X-RateLimit-Remaining');
+      const reset = res.headers.get('X-RateLimit-Reset');
+
+      console.warn(`Status: ${res.status}`);
+      if (remaining !== null) {
+        console.warn(`Rate limit remaining: ${remaining}`);
+        if (Number(remaining) === 0) {
+          const resetDate = reset ? new Date(Number(reset) * 1000) : 'unknown';
+          throw new Error(`Rate limit exceeded. Try again at ${resetDate}`);
+        }
+      }
+
+      if (res.status === 403) {
+        throw new Error('403 Forbidden — possibly rate limited or blocked.');
+      }
+
+      throw new Error(`HTTP error! status: ${res.status}`);
+    }
+
+    const { updates } = await res.json();
+    const u = updates[0];
+    const commitUrl = `https://github.com/xojw/waves/commit/${u.sha}`;
+
+    commitElement.innerHTML = `
+      <a href="${commitUrl}" class="hover-link" target="_blank" rel="noopener noreferrer">
+        <i class="fa-solid fa-code-commit"></i> ${u.sha}
+      </a>`;
+  } catch (err) {
+    console.error('Failed to fetch latest commit:', err.message || err);
+
+    commitElement.textContent = 'Failed to load latest commit';
+  }
+})();

public/assets/js/g.js

@@ -1,43 +1,98 @@
-document.addEventListener('DOMContentLoaded', function() {
+document.addEventListener('DOMContentLoaded', () => {
-    const searchInput = document.getElementById('gameSearchInput');
+  const searchInput = document.getElementById('gameSearchInput');
-    const grid = document.querySelector('.games-grid');
+  const grid        = document.querySelector('.games-grid');
-    let gamesData = [];
+  let gamesData     = [];
+  let filteredData  = [];
+  const BATCH_SIZE  = 50;
+  let renderedCount = 0;
 
-    fetch('/assets/data/g.json')
+  const sentinel = document.createElement('div');
-        .then(response => response.json())
+  sentinel.className = 'sentinel';
-        .then(data => {
+  grid.after(sentinel);
-            gamesData = data;
-            searchInput.placeholder = `Search through ${gamesData.length} Games…`;
-            displayGames(gamesData);
-            searchInput.addEventListener('input', function() {
-                const query = searchInput.value.toLowerCase();
-                const filtered = gamesData.filter(game => {
-                    const name = (game.name || '').toLowerCase();
-                    return name.includes(query);
-                });
-                displayGames(filtered);
-            });
-        })
-        .catch(err => console.error('Error loading games data:', err));
 
-    function displayGames(games) {
+  const observer = new IntersectionObserver(entries => {
-        grid.innerHTML = '';
+    entries.forEach(entry => {
-        if (games.length === 0) {
+      if (entry.isIntersecting) {
-            grid.innerHTML = '<p>Zero games were found matching your search :(</p>';
+        renderNextBatch();
-            return;
+      }
-        }
+    });
-        games.forEach(game => {
+  }, { rootMargin: '200px', threshold: 0.1 });
-            const card = document.createElement('div');
+
-            card.classList.add('game-card');
+  function debounce(fn, wait = 200) {
-            card.innerHTML = `
+    let t;
-		  <img src="/assets/g/${game.directory}/${game.image}" alt="${game.name} Icon" />
+    return (...args) => {
-		  <h2>${game.name}</h2>
+      clearTimeout(t);
-		`;
+      t = setTimeout(() => fn.apply(this, args), wait);
-            card.addEventListener('click', function() {
+    };
-                const url = `/assets/g/${game.directory}`;
+  }
-                window.handleSearch(url);
+
-            });
+  fetch('/assets/data/g.json')
-            grid.appendChild(card);
+    .then(r => r.json())
-        });
+    .then(data => {
+      gamesData    = data;
+      filteredData = data;
+      searchInput.placeholder = `Search through ${data.length} Games…`;
+
+      observer.observe(sentinel);
+      renderNextBatch();
+
+      searchInput.addEventListener('input', debounce(() => {
+        const q = searchInput.value.trim().toLowerCase();
+        filteredData = gamesData.filter(g =>
+          (g.name || '').toLowerCase().includes(q)
+        );
+        resetRendering();
+      }, 250));
+    })
+    .catch(console.error);
+
+  function resetRendering() {
+    grid.innerHTML = '';
+    renderedCount  = 0;
+    observer.observe(sentinel);
+    renderNextBatch();
+  }
+
+  function renderNextBatch() {
+    const batch = filteredData.slice(renderedCount, renderedCount + BATCH_SIZE);
+    if (!batch.length) {
+      observer.unobserve(sentinel);
+      return;
     }
+
+    const frag = document.createDocumentFragment();
+    batch.forEach(game => {
+      const card = document.createElement('div');
+      card.className = 'game-card';
+      card.innerHTML = `
+        <img
+          loading="lazy"
+          src="/assets/g/${game.directory}/${game.image}"
+          alt="${game.name} Icon"
+        />
+        <h2>${game.name}</h2>
+      `;
+      card.addEventListener('click', () => {
+        window.handleSearch(`/assets/g/${game.directory}`);
+      });
+      frag.appendChild(card);
+    });
+
+    grid.appendChild(frag);
+    renderedCount += batch.length;
+
+    preloadNextImages(5);
+
+    if (renderedCount >= filteredData.length) {
+      observer.unobserve(sentinel);
+    }
+  }
+
+  function preloadNextImages(limit = 3) {
+    const next = filteredData.slice(renderedCount, renderedCount + limit);
+    next.forEach(({ directory, image }) => {
+      const img = new Image();
+      img.src = `/assets/g/${directory}/${image}`;
+    });
+  }
 });

public/assets/js/greetings.js

@@ -1,5 +1,6 @@
 window.onload = function() {
     const storedName = localStorage.getItem('userName');
+    const path = window.location.pathname;
     if (!storedName) {
         document.getElementById('overlay').style.display = 'block';
         document.getElementById('namePrompt').style.display = 'block';
@@ -11,7 +12,9 @@ window.onload = function() {
         });
         return;
     }
-    showToast(`Hey, ${storedName}! Welcome back to Waves!`, 'success', 'wave');
+    const welcomeMsg = getWelcomeMessage(storedName);
+    const iconType = getIconType(path);
+    showToast(welcomeMsg, 'success', iconType);
     const greetingElement = document.getElementById('greeting');
     if (greetingElement) {
         updateGreeting(storedName);
@@ -31,15 +34,93 @@ function submitName() {
     }, 300);
 }
 
-function updateGreeting(name) {
+function getWelcomeMessage(name) {
-    const { text, icon } = getGreeting();
+    const path = window.location.pathname;
-    const el = document.getElementById('greeting');
+    if (path === '/g') {
-    if (el) {
+        return `Have fun playing games, ${name}!`;
-        el.innerHTML = `${icon} ${text}, ${name}!`;
+    } else if (path === '/a') {
-        el.style.opacity = 1;
+        return `Enjoy our collection of apps, ${name}!`;
+    } else {
+        return `Welcome back, ${name}!`;
     }
 }
 
+function getIconType(path) {
+    if (path === '/g') return 'game';
+    if (path === '/a') return 'apps';
+    return 'wave';
+}
+
+const generalGreetings = [
+    { text: 'Welcome aboard', icon: '<i class="fa-regular fa-rocket"></i>', suffix: '!' },
+    { text: 'Hii', icon: '<i class="fa-regular fa-hand-wave"></i>', suffix: '!!' },
+    { text: 'Hope you enjoy Waves', icon: '<i class="fa-solid fa-heart"></i>', suffix: ' <3' },
+    { text: 'Consider joining our Discord (discord.gg/ire)', icon: '<i class="fa-solid fa-smile"></i>', suffix: '!' },
+    { text: 'How you doing today', icon: '<i class="fa-regular fa-question"></i>', suffix: '?' }
+];
+
+const timeGreetings = [];
+
+timeGreetings.push(
+    { text: 'Good morning, sunshine', icon: '<i class="fa-regular fa-sun"></i>', suffix: ' :D' },
+    { text: 'Here’s to a bright morning', icon: '<i class="fa-regular fa-cloud-sun"></i>', suffix: '.' },
+    { text: 'Enjoy your morning', icon: '<i class="fa-regular fa-mug-hot"></i>', suffix: '!' },
+    { text: 'Your day starts here', icon: '<i class="fa-regular fa-star"></i>', suffix: ' !' }
+);
+
+timeGreetings.push(
+    { text: 'Good afternoon', icon: '<i class="fa-regular fa-leaf"></i>', suffix: '!' },
+    { text: 'Hope your day is going well', icon: '<i class="fa-regular fa-coffee"></i>', suffix: '.' },
+    { text: 'Keep up the pace', icon: '<i class="fa-regular fa-book"></i>', suffix: '!' },
+    { text: 'Stay on track today', icon: '<i class="fa-regular fa-sun"></i>', suffix: '.' }
+);
+
+timeGreetings.push(
+    { text: 'Good evening', icon: '<i class="fa-regular fa-cloud-moon"></i>', suffix: '!' },
+    { text: 'Time to unwind', icon: '<i class="fa-regular fa-fire"></i>', suffix: '.' },
+    { text: 'Evening’s here—relax', icon: '<i class="fa-regular fa-star"></i>', suffix: '.' },
+    { text: 'Breathe and recharge', icon: '<i class="fa-regular fa-moon"></i>', suffix: '…' }
+);
+
+timeGreetings.push(
+    { text: 'Good night', icon: '<i class="fa-regular fa-bed"></i>', suffix: '!' },
+    { text: 'Rest well', icon: '<i class="fa-regular fa-blanket"></i>', suffix: '.' },
+    { text: 'Sweet dreams', icon: '<i class="fa-regular fa-star-and-crescent"></i>', suffix: '!' },
+    { text: 'See you tomorrow', icon: '<i class="fa-regular fa-moon"></i>', suffix: '!' }
+);
+
+function getGreeting() {
+    const now = new Date();
+    const hour = now.getHours();
+    let pool = [];
+    if (hour >= 5 && hour < 12) {
+        pool = timeGreetings.slice(0, 4);
+    } else if (hour < 17) {
+        pool = timeGreetings.slice(4, 8);
+    } else if (hour < 21) {
+        pool = timeGreetings.slice(8, 12);
+    } else {
+        pool = timeGreetings.slice(12, 16);
+    }
+    if (Math.random() < 0.5) {
+        pool = generalGreetings;
+    }
+    const choice = pool[Math.floor(Math.random() * pool.length)];
+    return { text: choice.text, icon: choice.icon, suffix: choice.suffix };
+}
+
+function updateGreeting(name) {
+    const { text, icon, suffix } = getGreeting();
+    const el = document.getElementById('greeting');
+    if (!el) return;
+    if (text === 'Hope you enjoy Waves') {
+        el.innerHTML = `${icon} ${text}, ${name}${suffix}`;
+    } else {
+        el.innerHTML = `${icon} ${text}, ${name}${suffix}`;
+    }
+    el.style.opacity = 1;
+}
+
 function showToast(message, type = 'success', iconType = 'wave') {
     const toast = document.createElement('div');
     toast.className = `toast show ${type}`;
@@ -48,9 +129,11 @@ function showToast(message, type = 'success', iconType = 'wave') {
         error: '<i class="fas fa-times-circle" style="margin-right: 8px;"></i>',
         info: '<i class="fas fa-info-circle" style="margin-right: 8px;"></i>',
         warning: '<i class="fas fa-exclamation-triangle" style="margin-right: 8px;"></i>',
-        wave: '<i class="fa-regular fa-hand-wave" style="margin-right: 8px;"></i>'
+        wave: '<i class="fa-regular fa-hand-wave" style="margin-right: 8px;"></i>',
+        game: '<i class="fa-regular fa-gamepad" style="margin-right: 8px;"></i>',
+        apps: '<i class="fa-regular fa-th" style="margin-right: 8px;"></i>'
     };
-    toast.innerHTML = `${icons[iconType] || icons.wave}${message} `;
+    toast.innerHTML = `${icons[iconType] || icons.wave}${message}`;
     const progressBar = document.createElement('div');
     progressBar.className = 'progress-bar';
     toast.appendChild(progressBar);
@@ -67,64 +150,4 @@ function showToast(message, type = 'success', iconType = 'wave') {
         toast.classList.add('hide');
         setTimeout(() => toast.remove(), 500);
     }, 3000);
-}
-
-function getGreeting() {
-    const now = new Date();
-    const hour = now.getHours();
-    const day = now.getDay();
-    const options = [];
-
-    if (hour >= 5 && hour < 12) {
-        options.push(
-            { text: 'Good morning, sunshine', icon: '<i class="fa-regular fa-sun"></i>' },
-            { text: 'Here’s to a bright morning', icon: '<i class="fa-regular fa-cloud-sun"></i>' },
-            { text: 'Morning vibes only', icon: '<i class="fa-regular fa-mug-hot"></i>' },
-            { text: 'Your day starts here', icon: '<i class="fa-regular fa-star"></i>' }
-        );
-    } else if (hour < 17) {
-        options.push(
-            { text: 'Good afternoon', icon: '<i class="fa-regular fa-leaf"></i>' },
-            { text: 'Hope your day is going well', icon: '<i class="fa-regular fa-coffee"></i>' },
-            { text: 'Keep up the pace', icon: '<i class="fa-regular fa-book"></i>' },
-            { text: 'Stay on track today', icon: '<i class="fa-regular fa-sun"></i>' }
-        );
-    } else if (hour < 21) {
-        options.push(
-            { text: 'Good evening', icon: '<i class="fa-regular fa-cloud-moon"></i>' },
-            { text: 'Time to unwind', icon: '<i class="fa-regular fa-fire"></i>' },
-            { text: 'Evening’s here—relax', icon: '<i class="fa-regular fa-star"></i>' },
-            { text: 'Breathe and recharge', icon: '<i class="fa-regular fa-moon"></i>' }
-        );
-    } else {
-        options.push(
-            { text: 'Good night', icon: '<i class="fa-regular fa-bed"></i>' },
-            { text: 'Rest well', icon: '<i class="fa-regular fa-blanket"></i>' },
-            { text: 'Sweet dreams', icon: '<i class="fa-regular fa-star-and-crescent"></i>' },
-            { text: 'See you tomorrow', icon: '<i class="fa-regular fa-moon"></i>' }
-        );
-    }
-
-    if (day === 4) {
-        options.push(
-            { text: 'Thursday mode: engaged', icon: '<i class="fa-regular fa-party-popper"></i>' },
-            { text: 'Almost Friday', icon: '<i class="fa-regular fa-music"></i>' },
-            { text: 'Keep going', icon: '<i class="fa-regular fa-thumbs-up"></i>' }
-        );
-    }
-
-    if (day === 0 || day === 6) {
-        options.push(
-            { text: 'Happy weekend', icon: '<i class="fa-regular fa-umbrella-beach"></i>' },
-            { text: 'Enjoy some downtime', icon: '<i class="fa-regular fa-cocktail"></i>' }
-        );
-    } else {
-        options.push(
-            { text: 'You’ve got this', icon: '<i class="fa-regular fa-hand-holding-heart"></i>' },
-            { text: 'One step at a time', icon: '<i class="fa-regular fa-walking"></i>' },
-            { text: 'Summer is coming', icon: '<i class="fa-regular fa-umbrella-beach"></i>' }
-        );
-    }
-
-    return options[Math.floor(Math.random() * options.length)];
 }

public/assets/js/load.js

@@ -1,21 +0,0 @@
-document.addEventListener('DOMContentLoaded', function () {
-	NProgress.configure({ showSpinner: false });
-	NProgress.start();
-});
-  
-  window.addEventListener('load', function () {
-	NProgress.done();
-});
-  
-const titleElement = document.querySelector('.search-title');
-if (titleElement) {
-	const text = titleElement.textContent;
-	titleElement.innerHTML = '';
-
-	text.split('').forEach((letter, index) => {
-		const span = document.createElement('span');
-		span.textContent = letter;
-		span.style.animationDelay = `${index * 0.2}s`;
-		titleElement.appendChild(span);
-	});
-}

public/assets/js/navbar.js

@@ -1,183 +0,0 @@
-const style = document.createElement('style');
-style.textContent = `
-@keyframes slideLeft {0% { transform: translateX(0); } 50% { transform: translateX(-5px); } 100% { transform: translateX(0); }}
-@keyframes slideRight {0% { transform: translateX(0); } 50% { transform: translateX(5px); } 100% { transform: translateX(0); }}
-.button-animate-back { animation: slideLeft 0.3s ease-in-out; }
-.button-animate-forward { animation: slideRight 0.3s ease-in-out; }
-`;
-document.head.appendChild(style);
-
-const historyStack = [];
-let currentIndex = -1;
-const elements = {
-	refreshIcon: document.getElementById('refreshIcon'),
-	fullscreenIcon: document.getElementById('fullscreenIcon'),
-	backIcon: document.getElementById('backIcon'),
-	forwardIcon: document.getElementById('forwardIcon'),
-	searchInput2: document.getElementById('searchInputt'),
-	iframe: document.getElementById('cool-iframe')
-};
-const originalTitle = document.title;
-let loadingFallbackTimeout;
-
-elements.refreshIcon.addEventListener('click', handleRefresh);
-elements.fullscreenIcon.addEventListener('click', handleFullscreen);
-elements.backIcon.addEventListener('click', handleBack);
-elements.forwardIcon.addEventListener('click', handleForward);
-
-function showLoadingScreen() {
-	if (typeof NProgress !== 'undefined') {
-		NProgress.start();
-		document.title = 'Loading... <3';
-		setTimeout(() => {
-			if (typeof NProgress !== 'undefined') NProgress.done();
-		}, 10000);
-	}
-}
-
-function hideLoadingScreen() {
-	if (typeof NProgress !== 'undefined') NProgress.done();
-	document.title = originalTitle;
-}
-
-function handleRefresh() {
-	elements.refreshIcon.classList.add('spin');
-	const iframe = elements.iframe;
-	const currentUrl = iframe.contentWindow.location.href;
-	if (normalizeUrl(currentUrl) !== normalizeUrl(historyStack[currentIndex] || '')) {
-		addToHistory(currentUrl);
-	}
-	iframe.contentWindow.location.reload(true);
-	setTimeout(() => elements.refreshIcon.classList.remove('spin'), 300);
-}
-
-function handleFullscreen() {
-	const iframe = elements.iframe;
-	if (iframe && iframe.tagName === 'IFRAME') iframe.requestFullscreen();
-}
-
-function handleBack() {
-	toggleButtonAnimation(elements.backIcon, 'button-animate-back');
-	if (currentIndex > 0) {
-		currentIndex--;
-		updateIframeSrc();
-	}
-}
-
-function handleForward() {
-	toggleButtonAnimation(elements.forwardIcon, 'button-animate-forward');
-	if (currentIndex < historyStack.length - 1) {
-		currentIndex++;
-		updateIframeSrc();
-	}
-}
-
-function toggleButtonAnimation(button, animationClass) {
-	button.classList.add(animationClass);
-	setTimeout(() => button.classList.remove(animationClass), 200);
-}
-
-function normalizeUrl(urlStr) {
-	try {
-		const url = new URL(urlStr);
-		url.searchParams.delete('ia');
-		return url.toString();
-	} catch (e) {
-		return urlStr;
-	}
-}
-
-function addToHistory(url) {
-	const normalized = normalizeUrl(url);
-	if (currentIndex >= 0 && normalizeUrl(historyStack[currentIndex]) === normalized) return;
-	if (currentIndex < historyStack.length - 1) historyStack.splice(currentIndex + 1);
-	historyStack.push(url);
-	currentIndex++;
-	updateNavButtons();
-	updateDecodedSearchInput();
-}
-
-function updateIframeSrc() {
-	showLoadingScreen();
-	elements.iframe.src = historyStack[currentIndex];
-	updateNavButtons();
-	updateDecodedSearchInput();
-}
-
-function updateNavButtons() {
-	const isAtStart = currentIndex <= 0;
-	const isAtEnd = currentIndex >= historyStack.length - 1;
-	elements.backIcon.disabled = isAtStart;
-	elements.forwardIcon.disabled = isAtEnd;
-	elements.backIcon.classList.toggle('disabled', isAtStart);
-	elements.forwardIcon.classList.toggle('disabled', isAtEnd);
-}
-
-function updateDecodedSearchInput() {
-	if (elements.searchInput2) {
-		const url = historyStack[currentIndex] || elements.iframe.src;
-		elements.searchInput2.value = decodeUrl(url);
-	}
-}
-
-function decodeUrl(url) {
-	try {
-		return decodeURIComponent(url);
-	} catch (e) {
-		return url;
-	}
-}
-
-window.addToHistory = addToHistory;
-window.updateDecodedSearchInput = updateDecodedSearchInput;
-window.normalizeUrl = normalizeUrl;
-
-function detectIframeNavigation() {
-	try {
-		const iframeWindow = elements.iframe.contentWindow;
-		const pushState = iframeWindow.history.pushState;
-		const replaceState = iframeWindow.history.replaceState;
-		iframeWindow.history.pushState = function() {
-			pushState.apply(this, arguments);
-			handleIframeNavigation(iframeWindow.location.href);
-		};
-		iframeWindow.history.replaceState = function() {
-			replaceState.apply(this, arguments);
-			handleIframeNavigation(iframeWindow.location.href);
-		};
-		iframeWindow.addEventListener('popstate', () => handleIframeNavigation(iframeWindow.location.href));
-		iframeWindow.addEventListener('hashchange', () => handleIframeNavigation(iframeWindow.location.href));
-	} catch (error) {}
-}
-
-function handleIframeNavigation(rawUrl) {
-	let urlStr = rawUrl;
-	try {
-		urlStr = decodeUrl(rawUrl);
-	} catch {}
-	try {
-		const u = new URL(urlStr);
-		if (u.hostname.endsWith('duckduckgo.com')) {
-			if (typeof NProgress !== 'undefined') NProgress.done();
-			return;
-		}
-	} catch (e) {}
-	if (normalizeUrl(urlStr) !== normalizeUrl(historyStack[currentIndex] || '')) {
-		showLoadingScreen();
-		addToHistory(urlStr);
-	} else {
-		hideLoadingScreen();
-	}
-}
-
-elements.iframe.addEventListener('load', () => {
-	try {
-		detectIframeNavigation();
-		if (historyStack.length === 0) {
-			addToHistory(elements.iframe.contentWindow.location.href);
-		} else {
-			handleIframeNavigation(elements.iframe.contentWindow.location.href);
-		}
-	} catch (error) {}
-	hideLoadingScreen();
-});

public/assets/js/nprogress.js

@@ -0,0 +1 @@
+!function(n,e){"function"==typeof define&&define.amd?define(e):"object"==typeof exports?module.exports=e():n.NProgress=e()}(this,function(){function n(n,e,t){return e>n?e:n>t?t:n}function e(n){return 100*(-1+n)}function t(n,t,r){var i;return i="translate3d"===c.positionUsing?{transform:"translate3d("+e(n)+"%,0,0)"}:"translate"===c.positionUsing?{transform:"translate("+e(n)+"%,0)"}:{"margin-left":e(n)+"%"},i.transition="all "+t+"ms "+r,i}function r(n,e){var t="string"==typeof n?n:o(n);return t.indexOf(" "+e+" ")>=0}function i(n,e){var t=o(n),i=t+e;r(t,e)||(n.className=i.substring(1))}function s(n,e){var t,i=o(n);r(n,e)&&(t=i.replace(" "+e+" "," "),n.className=t.substring(1,t.length-1))}function o(n){return(" "+(n.className||"")+" ").replace(/\s+/gi," ")}function a(n){n&&n.parentNode&&n.parentNode.removeChild(n)}var u={};u.version="0.2.0";var c=u.settings={minimum:.08,easing:"ease",positionUsing:"",speed:200,trickle:!0,trickleRate:.02,trickleSpeed:800,showSpinner:!0,barSelector:'[role="bar"]',spinnerSelector:'[role="spinner"]',parent:"body",template:'<div class="bar" role="bar"><div class="peg"></div></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'};u.configure=function(n){var e,t;for(e in n)t=n[e],void 0!==t&&n.hasOwnProperty(e)&&(c[e]=t);return this},u.status=null,u.set=function(e){var r=u.isStarted();e=n(e,c.minimum,1),u.status=1===e?null:e;var i=u.render(!r),s=i.querySelector(c.barSelector),o=c.speed,a=c.easing;return i.offsetWidth,l(function(n){""===c.positionUsing&&(c.positionUsing=u.getPositioningCSS()),f(s,t(e,o,a)),1===e?(f(i,{transition:"none",opacity:1}),i.offsetWidth,setTimeout(function(){f(i,{transition:"all "+o+"ms linear",opacity:0}),setTimeout(function(){u.remove(),n()},o)},o)):setTimeout(n,o)}),this},u.isStarted=function(){return"number"==typeof u.status},u.start=function(){u.status||u.set(0);var n=function(){setTimeout(function(){u.status&&(u.trickle(),n())},c.trickleSpeed)};return c.trickle&&n(),this},u.done=function(n){return n||u.status?u.inc(.3+.5*Math.random()).set(1):this},u.inc=function(e){var t=u.status;return t?("number"!=typeof e&&(e=(1-t)*n(Math.random()*t,.1,.95)),t=n(t+e,0,.994),u.set(t)):u.start()},u.trickle=function(){return u.inc(Math.random()*c.trickleRate)},function(){var n=0,e=0;u.promise=function(t){return t&&"resolved"!==t.state()?(0===e&&u.start(),n++,e++,t.always(function(){e--,0===e?(n=0,u.done()):u.set((n-e)/n)}),this):this}}(),u.render=function(n){if(u.isRendered())return document.getElementById("nprogress");i(document.documentElement,"nprogress-busy");var t=document.createElement("div");t.id="nprogress",t.innerHTML=c.template;var r,s=t.querySelector(c.barSelector),o=n?"-100":e(u.status||0),l=document.querySelector(c.parent);return f(s,{transition:"all 0 linear",transform:"translate3d("+o+"%,0,0)"}),c.showSpinner||(r=t.querySelector(c.spinnerSelector),r&&a(r)),l!=document.body&&i(l,"nprogress-custom-parent"),l.appendChild(t),t},u.remove=function(){s(document.documentElement,"nprogress-busy"),s(document.querySelector(c.parent),"nprogress-custom-parent");var n=document.getElementById("nprogress");n&&a(n)},u.isRendered=function(){return!!document.getElementById("nprogress")},u.getPositioningCSS=function(){var n=document.body.style,e="WebkitTransform"in n?"Webkit":"MozTransform"in n?"Moz":"msTransform"in n?"ms":"OTransform"in n?"O":"";return e+"Perspective"in n?"translate3d":e+"Transform"in n?"translate":"margin"};var l=function(){function n(){var t=e.shift();t&&t(n)}var e=[];return function(t){e.push(t),1==e.length&&n()}}(),f=function(){function n(n){return n.replace(/^-ms-/,"ms-").replace(/-([\da-z])/gi,function(n,e){return e.toUpperCase()})}function e(n){var e=document.body.style;if(n in e)return n;for(var t,r=i.length,s=n.charAt(0).toUpperCase()+n.slice(1);r--;)if(t=i[r]+s,t in e)return t;return n}function t(t){return t=n(t),s[t]||(s[t]=e(t))}function r(n,e,r){e=t(e),n.style[e]=r}var i=["Webkit","O","Moz","ms"],s={};return function(n,e){var t,i,s=arguments;if(2==s.length)for(t in e)i=e[t],void 0!==i&&e.hasOwnProperty(t)&&r(n,t,i);else r(n,s[1],s[2])}}();return u});

public/assets/js/ping.js

@@ -23,7 +23,7 @@
 					}));
 				}
 				if (data.type === "latency" && typeof data.latency === "number") {
-					pingDisplay.innerHTML = '<i class="fa-regular fa-wifi"></i> Ping: ' + data.latency + ' ms';
+					pingDisplay.innerHTML = '<i class="fa-solid fa-wifi"></i> Ping: ' + '~' + data.latency + 'ms';
 				}
 			} catch (err) {
 				console.error("Error parsing message:", err);

public/assets/js/register.js

@@ -1,4 +1,5 @@
 document.addEventListener('DOMContentLoaded', function() {
+
 	const defaultWispUrl = `${window.location.protocol === "https:" ? "wss" : "ws"}://${window.location.host}/w/`;
 	let currentWispUrl = localStorage.getItem('customWispUrl') || defaultWispUrl;
 	const wispUrl = currentWispUrl;
@@ -7,24 +8,17 @@ document.addEventListener('DOMContentLoaded', function() {
 	async function registerSW() {
 		try {
 			if (!navigator.serviceWorker) {
-				console.log("%c[⚠️]%c Service Workers are not supported by this browser.", "color: orange; font-weight: bold;", "color: black;");
+				console.log("%c[!]%c Service Workers are not supported by this browser.", "background-color: black; color: white; font-weight: bold;", "background-color: black; color: white;");
 				return;
 			}
-
 			await ensureWebSocketConnection(wispUrl);
-
+			console.log("%c[+]%c Registering Service Worker...", "background-color: black; color: white; font-weight: bold;", "background-color: black; color: white;");
-			console.log("%c[⚙️]%c Registering Service Worker...", "color: #007bff; font-weight: bold;", "color: #007bff;");
+			await navigator.serviceWorker.register("/wah/sw.js", { scope: '/wah/a/' });
-			await navigator.serviceWorker.register("/wah/sw.js", {
+			console.log("%c[*]%c Service Worker registered successfully.", "background-color: black; color: white; font-weight: bold;", "background-color: black; color: white;");
-				scope: '/wah/a/'
-			});
-			console.log("%c[✅]%c Service Worker registered successfully.", "color: green; font-weight: bold;", "color: green;");
-
 			const savedTransport = localStorage.getItem('transport') || "epoxy";
 			switchTransport(savedTransport);
 			updateTransportUI(savedTransport);
-
+			console.log(`%c[#]%c Using ${capitalizeTransport(savedTransport)} transport.`, "background-color: black; color: white; font-weight: bold;", "background-color: black; color: white;");
-			console.log(`%c[🚀]%c Using ${savedTransport} transport.`, "color: #ffffff 255, 255); font-weight: bold;", "color: #ffffff;");
-
 		} catch (error) {
 			logError(error, 'An error occurred during Service Worker registration or WebSocket connection');
 		}
@@ -32,31 +26,28 @@ document.addEventListener('DOMContentLoaded', function() {
 
 	async function ensureWebSocketConnection(url) {
 		return new Promise((resolve, reject) => {
-			console.log("%c[🌐]%c Establishing WebSocket connection...", "color: #007bff; font-weight: bold;", "color: #007bff;");
+			console.log("%c[+]%c Establishing WebSocket connection...", "background-color: black; color: white; font-weight: bold;", "background-color: black; color: white;");
 			const ws = new WebSocket(url);
-
 			ws.onopen = () => {
-				console.log("%c[✅]%c WebSocket connection established.", "color: green; font-weight: bold;", "color: green;");
+				console.log("%c[*]%c WebSocket connection established.", "background-color: black; color: white; font-weight: bold;", "background-color: black; color: white;");
 				resolve(ws);
 			};
-
 			ws.onerror = (error) => {
 				logError(error, 'Failed to establish WebSocket connection');
 				reject(error);
 			};
-
 			ws.onclose = (event) => {
 				if (event.code !== 1000) {
-					console.warn(`%c[⚠️]%c WebSocket connection closed. Reason: ${event.reason || "No reason provided"}`, "color: orange; font-weight: bold;", "color: orange;");
+					console.warn(`%c[-]%c WebSocket connection closed. Reason: ${event.reason || "No reason provided"}`, "background-color: black; color: white; font-weight: bold;", "background-color: black; color: white;");
 				} else {
-					console.warn("%c[⚠️]%c WebSocket connection closed normally.", "color: orange; font-weight: bold;", "color: orange;");
+					console.warn("%c[-]%c WebSocket connection closed normally.", "background-color: black; color: white; font-weight: bold;", "background-color: black; color: white;");
 				}
 			};
 		});
 	}
 
 	function logError(error, message) {
-		console.error(`%c[❌]%c ${message}: ${error.message || error}`, "color: red; font-weight: bold;", "color: red;");
+		console.error(`%c[!]%c ${message}: ${error.message || error}`, "background-color: black; color: white; font-weight: bold;", "background-color: black; color: white;");
 	}
 
 	function switchTransport(transport) {
@@ -64,12 +55,9 @@ document.addEventListener('DOMContentLoaded', function() {
 			"epoxy": "/epoxy/index.mjs",
 			"libcurl": "/libcurl/index.mjs"
 		};
-
 		const transportFile = transportMap[transport];
 		if (transportFile) {
-			connection.setTransport(transportFile, [{
+			connection.setTransport(transportFile, [{ wisp: wispUrl }]);
-				wisp: wispUrl
-			}]);
 		}
 	}
 
@@ -85,7 +73,11 @@ document.addEventListener('DOMContentLoaded', function() {
 
 	function updateTransportUI(transport) {
 		const transportSelected = document.querySelector(".transport-selected");
-		transportSelected.textContent = transport.charAt(0).toUpperCase() + transport.slice(1);
+		transportSelected.textContent = capitalizeTransport(transport);
+	}
+
+	function capitalizeTransport(transport) {
+		return transport.charAt(0).toUpperCase() + transport.slice(1).toLowerCase();
 	}
 
 	document.addEventListener('wispUrlChanged', function(e) {

public/assets/js/settings.js

@@ -1,177 +1,120 @@
-document.addEventListener('DOMContentLoaded', function() {
+document.addEventListener('DOMContentLoaded', function () {
-	const settingsMenu = document.getElementById('settings-menu');
+  const settingsMenu = document.getElementById('settings-menu');
-	settingsMenu.innerHTML = `
+  settingsMenu.innerHTML = `
-  <h2>Settings</h2>
+    <h2>Settings</h2>
-  <div class="settings-tabs">
+    <div class="settings-tabs">
-    <button class="tab-button active" id="proxy-tab"><i class="fa-regular fa-server"></i> Proxy</button>
+      <button class="tab-button active" id="proxy-tab">
-    <button class="tab-button" id="cloak-tab"><i class="fa-regular fa-user-secret"></i> Cloak</button>
+        <i class="fa-regular fa-server"></i> Proxy
-    <button class="tab-button" id="appearance-tab"><i class="fa-regular fa-palette"></i> Appearance</button>
+      </button>
-    <button class="tab-button" id="info-tab"><i class="fa-regular fa-info"></i> Info</button>
+      <button class="tab-button" id="cloak-tab">
-  </div>
+        <i class="fa-regular fa-user-secret"></i> Cloak
-  <div id="proxy-content" class="tab-content">
+      </button>
-    <label for="transport-selector">Transport</label>
+      <button class="tab-button" id="appearance-tab">
-    <p>Transport is how the proxy will send information.</p>
+        <i class="fa-regular fa-palette"></i> Appearance
-    <div class="transport-selector">
+      </button>
-      <div class="transport-selected">Epoxy</div>
+      <button class="tab-button" id="info-tab">
-      <div class="transport-options">
+        <i class="fa-regular fa-info"></i> Info
-        <div>Epoxy</div>
+      </button>
-        <div>Libcurl</div>
+    </div>
+
+    <div id="proxy-content" class="tab-content">
+      <label for="transport-selector">Transport</label>
+      <p>Transport is how the proxy will send information.</p>
+      <div class="transport-selector">
+        <div class="transport-selected">Epoxy</div>
+        <div class="transport-options">
+          <div>Epoxy</div>
+          <div>Libcurl</div>
+        </div>
+      </div>
+      <label for="wisp-server">Wisp Server</label>
+      <p>Enter a different Wisp Server to connect to.</p>
+      <p>Recommended to keep this as default.</p>
+      <input type="text" id="wisp-server" placeholder="Wisp Server URL Here..." autocomplete="off">
+      <button id="save-wisp-url">Save</button>
+    </div>
+
+    <div id="cloak-content" class="tab-content">
+      <label for="aboutblank-toggle">Auto About:Blank</label>
+      <p>Turn this on to go into about:blank every time the page loads (Recommended).</p>
+      <input type="checkbox" id="aboutblank-toggle">
+    </div>
+
+    <div id="appearance-content" class="tab-content">
+      <label for="navbar-toggle">Navigation Bar</label>
+      <p>Keep this on for the navigation bar when searching (Recommended).</p>
+      <input type="checkbox" id="navbar-toggle">
+    </div>
+
+    <div id="info-content" class="tab-content">
+      <label>Version 2.8.7</label>
+      <label 
+        onmouseover="this.querySelector('span').style.color='lime'" 
+        onmouseout="this.querySelector('span').style.color='green'">
+        Server Status: 
+        <span style="color: green; transition: color 0.3s ease; font-size: 0.95em;">Running</span>
+      </label>
+      <label 
+        onmouseover="this.querySelector('span').style.color='lime'" 
+        onmouseout="this.querySelector('span').style.color='green'">
+        Server Speed: 
+        <span id="server-speed" style="color: green; transition: color 0.3s ease; font-size: 0.95em;">Checking...</span>
+      </label>
+      <label 
+        onmouseover="this.querySelector('span').style.color='#dadada'" 
+        onmouseout="this.querySelector('span').style.color='#949494'">
+        Server Uptime: 
+        <span id="server-uptime" style="color: #949494; transition: color 0.3s ease; font-size: 0.95em;">Calculating...</span>
+      </label>
+      <label 
+        onmouseover="this.querySelector('span').style.color='#dadada'" 
+        onmouseout="this.querySelector('span').style.color='#949494'">
+        Server Specs: 
+        <span id="server-specs" style="color: #949494; transition: color 0.3s ease; font-size: 0.95em;">Loading...</span>
+      </label>
+      <p>Having any problems? Join our Discord Server below or open an issue on GitHub for support.</p>
+      <div style="display: flex; gap: 10px; justify-content: left; align-items: left; margin-top: 10px; margin-bottom: -20px;">
+        <label>
+          <a href="https://discord.gg/dJvdkPRheV" target="_blank" class="hover-link">
+            <i class="fab fa-discord" style="font-size: 20px;"></i>
+          </a>
+        </label>
+        <label>
+          <a href="https://github.com/xojw/waves" target="_blank" class="hover-link">
+            <i class="fab fa-github" style="font-size: 20px;"></i>
+          </a>
+        </label>
       </div>
     </div>
-    <label for="wisp-server">Wisp Server</label>
+
-    <p>Enter a different Wisp Server to connect to.</p>
+    <button id="close-settings">
-    <p>Recommended to keep this as default.</p>
+      <i class="fa-regular fa-times"></i>
-    <input type="text" id="wisp-server" placeholder="Wisp Server URL Here..." autocomplete="off">
+    </button>
-    <button id="save-wisp-url">Save</button>
-  </div>
-  <div id="cloak-content" class="tab-content">
-    <label for="aboutblank-toggle">About:Blank</label>
-    <p>Turn this on to go into about:blank every time the page loads (Recommended).</p>
-    <input type="checkbox" id="aboutblank-toggle">
-  </div>
-  <div id="appearance-content" class="tab-content">
-    <label for="navbar-toggle">Navigation Bar</label>
-    <p>Keep this on for the navigation bar when searching (Recommended).</p>
-    <input type="checkbox" id="navbar-toggle">
-  </div>
-  <div id="info-content" class="tab-content">
-    <label>Version 2.3.5</label>
-    <label onmouseover="this.querySelector('span').style.color='lime'" onmouseout="this.querySelector('span').style.color='green'">
-      Server Status: <span style="color: green; transition: color 0.3s ease;">Running</span>
-    </label>
-    <p>If you want to see Waves status please visit <a href="https://status.usewaves.site" target="_blank" class="hover-link">https://status.usewaves.site</a>.</p>
-    <div style="display: flex; gap: 10px; justify-content: left; align-items: left; margin-top: 10px; margin-bottom: -20px;">
-      <label><a href="https://discord.gg/wves" target="_blank" class="hover-link"><i class="fab fa-discord" style="font-size: 20px;"></i></a></label>
-      <label><a href="https://github.com/xojw/waves" target="_blank" class="hover-link"><i class="fab fa-github" style="font-size: 20px;"></i></a></label>
-    </div>
-  </div>
-  <button id="close-settings"><i class="fa-regular fa-times"></i></button>
   `;
-	const settingsIcon = document.getElementById('settings-icon');
-	const closeSettingsButton = document.getElementById('close-settings');
-	const saveButton = document.getElementById('save-wisp-url');
-	const transportSelector = document.querySelector('.transport-selector');
-	const transportSelected = transportSelector.querySelector('.transport-selected');
-	const transportOptions = transportSelector.querySelector('.transport-options');
-	const navbarToggle = document.getElementById('navbar-toggle');
-	const defaultWispUrl = `${window.location.protocol === "https:" ? "wss" : "ws"}://${window.location.host}/w/`;
-	let currentWispUrl = localStorage.getItem('customWispUrl') || defaultWispUrl;
-	const wispInput = document.querySelector("#wisp-server");
-	wispInput.value = currentWispUrl;
 
-	function isValidUrl(url) {
+  const settingsIcon = document.getElementById('settings-icon');
-		try {
+  const closeSettingsBtn = document.getElementById('close-settings');
-			const parsedUrl = new URL(url);
+  const saveWispBtn = document.getElementById('save-wisp-url');
-			return (parsedUrl.protocol === "wss:" || parsedUrl.protocol === "ws:") && url.endsWith('/');
+  const transportSelector = document.querySelector('.transport-selector');
-		} catch (_) {
+  const transportSelected = transportSelector.querySelector('.transport-selected');
-			return false;
+  const transportOptions = transportSelector.querySelector('.transport-options');
-		}
+  const navbarToggle = document.getElementById('navbar-toggle');
-	}
+  const defaultWispUrl = `${window.location.protocol === "https:" ? "wss" : "ws"}://${window.location.host}/w/`;
+  let currentWispUrl = localStorage.getItem('customWispUrl') || defaultWispUrl;
+  const wispInput = document.querySelector("#wisp-server");
+  wispInput.value = currentWispUrl;
+  let isToggling = false;
 
-	function updateWispServerUrl(url) {
+  function isValidUrl(url) {
-		if (isValidUrl(url)) {
+    try {
-			currentWispUrl = url;
+      const p = new URL(url);
-			localStorage.setItem('customWispUrl', url);
+      return (p.protocol === "wss:" || p.protocol === "ws:") && url.endsWith('/');
-			document.dispatchEvent(new CustomEvent('wispUrlChanged', {
+    } catch (_) {
-				detail: currentWispUrl
+      return false;
-			}));
+    }
-			wispInput.value = currentWispUrl;
+  }
-			showToast('success', `WISP URL successfully updated to: ${currentWispUrl}`);
-			location.reload();
-		} else {
-			console.log("%c[❌]%c Invalid WISP URL. Please enter a valid one.", "color: red; font-weight: bold;", "color: inherit;");
-			currentWispUrl = defaultWispUrl;
-			localStorage.setItem('customWispUrl', defaultWispUrl);
-			wispInput.value = defaultWispUrl;
-			showToast('error', "Invalid URL. Reverting back to default...");
-			location.reload();
-		}
-	}
-	saveButton.addEventListener('click', () => {
-		const customUrl = wispInput.value.trim();
-		updateWispServerUrl(customUrl);
-	});
-	settingsIcon.addEventListener('click', (event) => {
-		event.preventDefault();
-		toggleSettingsMenu();
-	});
-	closeSettingsButton.addEventListener('click', () => {
-		toggleSettingsMenu();
-	});
 
-	function toggleSettingsMenu() {
+    function runScriptIfChecked() {
-		const icon = document.querySelector('#settings-icon i.settings-icon');
-		if (settingsMenu.classList.contains('open')) {
-		  settingsMenu.classList.add('close');
-		  icon.classList.remove('fa-solid');
-		  icon.classList.add('fa-regular');
-		  setTimeout(() => {
-			settingsMenu.classList.remove('open', 'close');
-		  }, 300);
-		} else {
-		  settingsMenu.classList.add('open');
-		  icon.classList.remove('fa-regular');
-		  icon.classList.add('fa-solid');
-		  setTimeout(() => {
-			settingsMenu.classList.remove('close');
-		  }, 300);
-		}
-	  }	  
-	transportSelected.addEventListener('click', function(e) {
-		e.stopPropagation();
-		transportOptions.classList.toggle('transport-show');
-		this.classList.toggle('transport-arrow-active');
-	});
-	const optionDivs = transportOptions.getElementsByTagName('div');
-	for (let i = 0; i < optionDivs.length; i++) {
-		optionDivs[i].addEventListener('click', function(e) {
-			e.stopPropagation();
-			const selectedValue = this.innerHTML;
-			transportSelected.innerHTML = selectedValue;
-			localStorage.setItem('transport', selectedValue.toLowerCase());
-			transportOptions.classList.remove('transport-show');
-			transportSelected.classList.remove('transport-arrow-active');
-			const event = new Event('newTransport', {
-				detail: selectedValue.toLowerCase()
-			});
-			document.dispatchEvent(event);
-			showToast('success', `Transport successfully changed to ${selectedValue}`);
-			location.reload();
-		});
-	}
-	document.getElementById('proxy-content').classList.add('active');
-
-	function switchTab(tabId, contentId, otherTabId1, otherContentId1, otherTabId2, otherContentId2, otherTabId3, otherContentId3) {
-		document.getElementById(otherContentId1).classList.remove('active');
-		document.getElementById(otherContentId2).classList.remove('active');
-		document.getElementById(otherContentId3).classList.remove('active');
-		document.getElementById(otherTabId1).classList.remove('active');
-		document.getElementById(otherTabId2).classList.remove('active');
-		document.getElementById(otherTabId3).classList.remove('active');
-		document.getElementById(contentId).classList.add('active');
-		document.getElementById(tabId).classList.add('active');
-	}
-	document.getElementById('proxy-tab').addEventListener('click', function() {
-		switchTab('proxy-tab', 'proxy-content', 'appearance-tab', 'appearance-content', 'cloak-tab', 'cloak-content', 'info-tab', 'info-content');
-	});
-	document.getElementById('cloak-tab').addEventListener('click', function() {
-		switchTab('cloak-tab', 'cloak-content', 'proxy-tab', 'proxy-content', 'appearance-tab', 'appearance-content', 'info-tab', 'info-content');
-	});
-	document.getElementById('appearance-tab').addEventListener('click', function() {
-		switchTab('appearance-tab', 'appearance-content', 'proxy-tab', 'proxy-content', 'cloak-tab', 'cloak-content', 'info-tab', 'info-content');
-	});
-	document.getElementById('info-tab').addEventListener('click', function() {
-		switchTab('info-tab', 'info-content', 'proxy-tab', 'proxy-content', 'appearance-tab', 'appearance-content', 'cloak-tab', 'cloak-content');
-	});
-	navbarToggle.addEventListener('change', function() {
-		if (this.checked) {
-			showToast('success', 'Navigation Bar is now enabled.');
-		} else {
-			showToast('error', 'Navigation Bar is now disabled.');
-		}
-	});
-
-	function runScriptIfChecked() {
 		let inFrame;
 		try {
 			inFrame = window !== top;
@@ -204,9 +147,9 @@ document.addEventListener('DOMContentLoaded', function() {
 	document.getElementById("aboutblank-toggle").addEventListener("change", function() {
 		localStorage.setItem("aboutBlankChecked", JSON.stringify(this.checked));
 		if (this.checked) {
-			showToast('success', 'About:Blank is now enabled.');
+			showToast('success', 'Auto About:Blank is now enabled.');
 		} else {
-			showToast('error', 'About:Blank is now disabled.');
+			showToast('error', 'Auto About:Blank is now disabled.');
 		}
 		runScriptIfChecked();
 	});
@@ -216,38 +159,174 @@ document.addEventListener('DOMContentLoaded', function() {
 		runScriptIfChecked();
 	});
 
-	function showToast(type, message) {
+  function updateWispServerUrl(url) {
-		const toast = document.createElement('div');
+    if (isValidUrl(url)) {
-		toast.className = `toast ${type} show`;
+      currentWispUrl = url;
-		const icons = {
+      localStorage.setItem('customWispUrl', url);
-			success: '<i class="fa-regular fa-check-circle" style="margin-right: 8px;"></i>',
+      document.dispatchEvent(new CustomEvent('wispUrlChanged', { detail: currentWispUrl }));
-			error: '<i class="fa-regular fa-times-circle" style="margin-right: 8px;"></i>',
+      showToast('success', `Wisp Server URL changed to: ${currentWispUrl}`);
-			info: '<i class="fa-regular fa-info-circle" style="margin-right: 8px;"></i>',
+    } else {
-			warning: '<i class="fa-regular fa-exclamation-triangle" style="margin-right: 8px;"></i>'
+      currentWispUrl = defaultWispUrl;
-		};
+      localStorage.setItem('customWispUrl', defaultWispUrl);
-		const icon = icons[type] || '';
+      document.dispatchEvent(new CustomEvent('wispUrlChanged', { detail: currentWispUrl }));
-		toast.innerHTML = `${icon}${message}`;
+      showToast('error', "Invalid URL. Reverting to default...");
-		const progressBar = document.createElement('div');
+    }
-		progressBar.className = 'progress-bar';
+  }
-		toast.appendChild(progressBar);
+
-		const closeBtn = document.createElement('button');
+  function updateServerInfo() {
-		closeBtn.className = 'toast-close';
+    const speedSpan = document.getElementById('server-speed');
-		closeBtn.innerHTML = '<i class="fa-regular fa-xmark" style="margin-left: 8px; font-size: 0.8em;"></i>';
+    const uptimeSpan = document.getElementById('server-uptime');
-		closeBtn.addEventListener('click', () => {
+    const specsSpan = document.getElementById('server-specs');
-			toast.classList.remove('show');
+    let uptimeInterval;
-			toast.classList.add('hide');
+
-			setTimeout(() => {
+    fetch('/api/info')
-				toast.remove();
+      .then(response => {
-			}, 500);
+        if (!response.ok) throw new Error();
-		});
+        return response.json();
-		toast.appendChild(closeBtn);
+      })
-		document.body.appendChild(toast);
+      .then(data => {
-		setTimeout(() => {
+        if (data?.speed) {
-			toast.classList.remove('show');
+          const updateUptimeDisplay = () => {
-			toast.classList.add('hide');
+            const uptime = Date.now() - data.startTime;
-			setTimeout(() => {
+            const days = Math.floor(uptime / 86400000);
-				toast.remove();
+            const hours = Math.floor((uptime % 86400000) / 3600000);
-			}, 500);
+            const minutes = Math.floor((uptime % 3600000) / 60000);
-		}, 3000);
+            const seconds = Math.floor((uptime % 60000) / 1000);
-	}
+            uptimeSpan.textContent = `${days}d ${hours}h ${minutes}m ${seconds}s`;
+          };
+
+          updateUptimeDisplay();
+          clearInterval(uptimeInterval);
+          uptimeInterval = setInterval(updateUptimeDisplay, 1000);
+
+          speedSpan.textContent = `${data.speed} (${data.averageLatency}ms)`;
+          specsSpan.textContent = data.specs;
+        }
+        setTimeout(updateServerInfo, 10000);
+      })
+      .catch(() => {
+        speedSpan.textContent = 'Connection error';
+        setTimeout(updateServerInfo, 30000);
+      });
+  }
+
+  function initializeInfo() {
+    const infoTab = document.getElementById('info-tab');
+    const infoContent = document.getElementById('info-content');
+
+    const startMonitoring = () => {
+      updateServerInfo();
+      infoTab.removeEventListener('click', startMonitoring);
+    };
+
+    if (infoContent.classList.contains('active')) {
+      updateServerInfo();
+    } else {
+      infoTab.addEventListener('click', startMonitoring, { once: true });
+    }
+  }
+
+  function showToast(type, message) {
+    const toast = document.createElement('div');
+    toast.className = `toast ${type} show`;
+    const icons = {
+      success: '<i class="fa-regular fa-check-circle"></i>',
+      error: '<i class="fa-regular fa-times-circle"></i>',
+      info: '<i class="fa-regular fa-info-circle"></i>',
+      warning: '<i class="fa-regular fa-exclamation-triangle"></i>'
+    };
+    toast.innerHTML = `${icons[type]||''}${message}`;
+    const progressBar = document.createElement('div');
+    progressBar.className = 'progress-bar';
+    toast.appendChild(progressBar);
+    const closeBtn = document.createElement('button');
+    closeBtn.className = 'toast-close';
+    closeBtn.innerHTML = '<i class="fa-regular fa-xmark"></i>';
+    closeBtn.addEventListener('click', () => {
+      toast.classList.replace('show', 'hide');
+      setTimeout(() => toast.remove(), 500);
+    });
+    toast.appendChild(closeBtn);
+    document.body.appendChild(toast);
+    setTimeout(() => {
+      toast.classList.replace('show', 'hide');
+      setTimeout(() => toast.remove(), 500);
+    }, 3000);
+  }
+
+  saveWispBtn.addEventListener('click', () => updateWispServerUrl(wispInput.value.trim()));
+  settingsIcon.addEventListener('click', e => {
+    e.preventDefault();
+    toggleSettingsMenu();
+  });
+  closeSettingsBtn.addEventListener('click', toggleSettingsMenu);
+
+  function toggleSettingsMenu() {
+    if (isToggling) return;
+    isToggling = true;
+    const icon = document.querySelector('#settings-icon i.settings-icon');
+    if (settingsMenu.classList.contains('open')) {
+      settingsMenu.classList.add('close');
+      icon.classList.replace('fa-solid', 'fa-regular');
+      setTimeout(() => {
+        settingsMenu.classList.remove('open', 'close');
+        isToggling = false;
+      }, 300);
+    } else {
+      settingsMenu.classList.add('open');
+      icon.classList.replace('fa-regular', 'fa-solid');
+      setTimeout(() => {
+        settingsMenu.classList.remove('close');
+        isToggling = false;
+      }, 300);
+    }
+  }
+
+  transportSelected.addEventListener('click', e => {
+    e.stopPropagation();
+    transportOptions.classList.toggle('transport-show');
+    transportSelected.classList.toggle('transport-arrow-active');
+  });
+
+  Array.from(transportOptions.getElementsByTagName('div')).forEach(option => {
+    option.addEventListener('click', function (e) {
+      e.stopPropagation();
+      const val = this.textContent;
+      transportSelected.textContent = val;
+      localStorage.setItem('transport', val.toLowerCase());
+      transportOptions.classList.remove('transport-show');
+      transportSelected.classList.remove('transport-arrow-active');
+      document.dispatchEvent(new CustomEvent('newTransport', { detail: val.toLowerCase() }));
+      showToast('success', `Transport changed to ${val}`);
+    });
+  });
+
+  document.getElementById('proxy-content').classList.add('active');
+
+  function switchTab(activeTab, activeContent, ...others) {
+    others.forEach(id => document.getElementById(id).classList.remove('active'));
+    document.getElementById(activeTab).classList.add('active');
+    document.getElementById(activeContent).classList.add('active');
+  }
+
+  document.getElementById('proxy-tab').addEventListener('click', () => switchTab('proxy-tab', 'proxy-content', 'cloak-tab', 'cloak-content', 'appearance-tab', 'appearance-content', 'info-tab', 'info-content'));
+  document.getElementById('cloak-tab').addEventListener('click', () => switchTab('cloak-tab', 'cloak-content', 'proxy-tab', 'proxy-content', 'appearance-tab', 'appearance-content', 'info-tab', 'info-content'));
+  document.getElementById('appearance-tab').addEventListener('click', () => switchTab('appearance-tab', 'appearance-content', 'proxy-tab', 'proxy-content', 'cloak-tab', 'cloak-content', 'info-tab', 'info-content'));
+  document.getElementById('info-tab').addEventListener('click', () => switchTab('info-tab', 'info-content', 'proxy-tab', 'proxy-content', 'cloak-tab', 'cloak-content', 'appearance-tab', 'appearance-content'));
+
+  document.querySelectorAll('.tab-button').forEach(btn => {
+    btn.addEventListener('click', function () {
+      const icon = this.querySelector('i');
+      if (!icon.classList.contains('fa-bounce')) {
+        icon.classList.add('fa-bounce');
+        setTimeout(() => icon.classList.remove('fa-bounce'), 750);
+      }
+    });
+  });
+
+  navbarToggle.addEventListener('change', function () {
+    showToast(this.checked ? 'success' : 'error', `Navigation Bar ${this.checked ? 'enabled' : 'disabled'}`);
+  });
+
+  initializeInfo();
 });

public/assets/js/wv.js

@@ -0,0 +1,59 @@
+(async()=>{
+  const storageKey = 'wv-verified';
+  const last = localStorage.getItem(storageKey);
+  if(last && Date.now() - last < 2592000000) return;
+
+  const style = document.createElement('style');
+  style.textContent = `
+    :root{--bg:#000;--card:rgba(0,0,0,0.85);--accent:#fff;--radius:12px;--trans:.3s}
+    #wv-overlay{position:fixed;inset:0!important;pointer-events:auto;user-select:none;background:var(--bg);display:flex;align-items:center;justify-content:center;font-family:system-ui;z-index:2147483647!important;opacity:1;transition:opacity .4s}
+    #wv-card{background:var(--card);backdrop-filter:blur(12px);border-radius:var(--radius);padding:32px;width:320px;text-align:center;color:var(--accent)}
+    #wv-progress{width:100%;height:6px;background:#333;border-radius:var(--radius);overflow:hidden;margin:16px 0}
+    #wv-bar{width:0;height:100%;background:var(--accent);transition:width var(--trans)}
+    #wv-info{font-size:.95rem;opacity:.8}
+    #wv-complete{display:none;}
+    #wv-complete.show{display:block;}
+  `;
+  document.head.appendChild(style);
+
+  const overlay = document.createElement('div'); overlay.id='wv-overlay';
+  overlay.innerHTML = `
+    <div id="wv-card">
+      <h2><i class="fas fa-shield-alt"></i> Verifying Browser</h2>
+      <div id="wv-progress"><div id="wv-bar"></div></div>
+      <div id="wv-info"></div>
+    </div>
+    <div id="wv-complete"><h2><i class="fas fa-check-circle"></i> Success!</h2><p>You May Continue.</p></div>
+  `;
+  document.body.appendChild(overlay);
+
+  const info = document.getElementById('wv-info');
+  const bar = document.getElementById('wv-bar');
+  const tests = [
+    {msg:'Automation',pass:!navigator.webdriver},
+    {msg:'Headless',pass:!/headless|phantomjs|puppeteer|selenium/i.test(navigator.userAgent)},
+    {msg:'Languages',pass:Array.isArray(navigator.languages) && navigator.languages.length>0},
+    {msg:'Plugins',pass:navigator.plugins.length>0},
+    {msg:'WebGL',pass:(()=>{try{const c=document.createElement('canvas');const g=c.getContext('webgl')||c.getContext('experimental-webgl');return!!g;}catch{return false;}})()}
+  ];
+
+  let failures = [];
+  for(let i=0;i<tests.length;i++){
+    const t=tests[i];
+    info.textContent = `${t.msg}...`;
+    if(!t.pass) failures.push(t.msg);
+    bar.style.width = `${((i+1)/tests.length)*100}%`;
+    await new Promise(r=>setTimeout(r,200));
+  }
+
+  if(failures.length===0){
+    localStorage.setItem(storageKey, Date.now());
+    document.getElementById('wv-card').style.display='none';
+    const done = document.getElementById('wv-complete'); done.classList.add('show');
+    setTimeout(()=>overlay.style.opacity='0',500);
+    setTimeout(()=>overlay.remove(),800);
+  } else {
+    info.innerHTML = `Failed:<br>${failures.map(f=>`• ${f}`).join('<br>')}`;
+    bar.style.background='red';
+  }
+})();

setup.sh

@@ -83,6 +83,10 @@ cat <<EOF | sudo tee /etc/caddy/Caddyfile > /dev/null
         Referrer-Policy "no-referrer"
     }
 }
+
+:80 {
+    reverse_proxy http://localhost:3000
+}
 EOF
 separator
 h