From 4cfa30b6eab0445b588b406c49c22a4fddceda94 Mon Sep 17 00:00:00 2001
From: wvalid19 <sonti4@outlook.com>
Date: Sat, 30 May 2026 13:03:18 -0400
Subject: [PATCH 1/7] bim bim bam bam scramjet

i basically commented out games because they were being fucky
---
 package.json              |   3 +-
 pnpm-lock.yaml            |   3 +
 public/index.html         |   3 +-
 src/app/TabManager.ts     |  42 ++++++++--
 src/app/constants.ts      |   8 +-
 src/app/types.ts          |   1 +
 src/app/utils.ts          |  11 +++
 src/components/UI.ts      |  12 ++-
 src/games/GamesManager.ts | 168 +++++++++++++++++++-------------------
 src/global.d.ts           |   7 +-
 src/index.ts              |  94 ++++++++++++++++++---
 src/styles/main.css       |  28 +++++++
 sw/pingas.js              |  56 ++++++++++---
 tsconfig.json             |   3 +-
 14 files changed, 316 insertions(+), 123 deletions(-)

diff --git a/package.json b/package.json
index 363017b..8031eca 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
     "webpack-dev-server": "^5.2.4"
   },
   "dependencies": {
-    "@mercuryworkshop/scramjet": "^1.1.0"
+    "@mercuryworkshop/scramjet": "^1.1.0",
+    "idb": "^8.0.3"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b30f492..9372b98 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -11,6 +11,9 @@ importers:
       '@mercuryworkshop/scramjet':
         specifier: ^1.1.0
         version: 1.1.0
+      idb:
+        specifier: ^8.0.3
+        version: 8.0.3
     devDependencies:
       copy-webpack-plugin:
         specifier: ^14.0.0
diff --git a/public/index.html b/public/index.html
index b0449b2..b547b81 100644
--- a/public/index.html
+++ b/public/index.html
@@ -19,7 +19,8 @@
     />
     <script src="https://unpkg.com/@mercuryworkshop/bare-mux@2.1.9/dist/index.js"></script>
     <script src="https://unpkg.com/@titaniumnetwork-dev/ultraviolet@3.2.8/dist/uv.bundle.js"></script>
-    <script src="https://cdn.jsdelivr.net/gh/luminsdk/script@latest/lumin.min.js"></script>
+    <!WHEN FIXED PUT THIS HERE script src https://cdn.jsdelivr.net/gh/luminsdk/script@latest/lumin.min.js>
+    <script src="https://unpkg.com/@mercuryworkshop/scramjet@1.1.0/dist/scramjet.all.js"></script>
     <script
       defer
       src="https://cdn.jsdelivr.net/npm/libcurl.js@0.7.1/libcurl.js"
diff --git a/src/app/TabManager.ts b/src/app/TabManager.ts
index b7d5cd2..e5b6d22 100644
--- a/src/app/TabManager.ts
+++ b/src/app/TabManager.ts
@@ -1,25 +1,40 @@
 import { Tab } from "./types";
 import { homeDataURL } from "../components/StartPage";
-import { PREFIX } from "./constants";
+import { PREFIX, CURRENT_PROXY } from "./constants";
 import { normalizeUrl } from "./utils";
 import { checkLarp } from "./EasterEgg";
 import logo from "../assets/logo.png";
+import { openDB } from "idb";
+import { sj } from "../index";
+
+const dbPromise = openDB('SettingsDB', 1, {
+  upgrade(db) {
+    db.createObjectStore('settings');
+  },
+});
+const db = await dbPromise;
+async function proxyFind() {
+  return await db.get('settings', 'deployable.proxy');
+}
 
 let tabs: Tab[] = [];
 let activeTab: Tab | null = null;
+let sjFrame;
+let frame;
 
 export function getTabs() { return tabs; }
 export function getActiveTab() { return activeTab; }
 export function setActiveTab(tab: Tab | null) { activeTab = tab; }
 
-export function createTab(url: string = homeDataURL) {
+export async function createTab(url: string = homeDataURL) {
   const framesContainer = document.getElementById("frames-container") as HTMLDivElement;
   const tabBar = document.getElementById("tab-bar") as HTMLDivElement;
   const newTabBtn = document.getElementById("new-tab-btn") as HTMLButtonElement;
   const urlBar = document.getElementById("url-bar") as HTMLInputElement;
 
   const id = Math.random().toString(36).substring(2, 11);
-  const frame = document.createElement("iframe");
+  const sjFrame = sj.createFrame();
+  const frame = sjFrame.frame;
   frame.className = "proxy-frame";
   frame.id = `frame-${id}`;
   framesContainer.appendChild(frame);
@@ -42,6 +57,7 @@ export function createTab(url: string = homeDataURL) {
     historyIndex: -1,
     frame,
     tabElement,
+    sjFrame
   };
 
   tabs.push(tab);
@@ -74,9 +90,13 @@ export function createTab(url: string = homeDataURL) {
         const encodedUrl = frameHref.substring(
           frameHref.indexOf(PREFIX) + PREFIX.length,
         );
-        const decodedUrl = (window as any).Ultraviolet.codec.xor.decode(
-          encodedUrl,
-        );
+        let decodedUrl;
+        if (CURRENT_PROXY === "choice-scram") {
+          const decodedUrl = decodeURIComponent(encodedUrl);
+        }
+        else {
+          const decodedUrl = (window as any).Ultraviolet.codec.xor.decode(encodedUrl);
+        }
         if (decodedUrl && normalizeUrl(decodedUrl) !== normalizeUrl(tab.url)) {
           tab.url = decodedUrl;
           if (activeTab === tab) urlBar.value = decodedUrl;
@@ -158,7 +178,15 @@ export function loadTab(
     tab.frame.src = homeDataURL;
   } else {
     if (activeTab === tab) urlBar.value = url;
-    const encodedUrl = (window as any).Ultraviolet.codec.xor.encode(url);
+    let encodedUrl: string;
+    // console.log(CURRENT_PROXY);
+    if (CURRENT_PROXY === "choice-scram") {
+      encodedUrl = encodeURIComponent(url);
+    }
+    else {
+      encodedUrl = (window as any).Ultraviolet.codec.xor.encode(url);
+    }
+    // console.log(encodedUrl);
     tab.frame.src = PREFIX + encodedUrl;
     checkLarp(url);
   }
diff --git a/src/app/constants.ts b/src/app/constants.ts
index 62467bf..5e9a0f9 100644
--- a/src/app/constants.ts
+++ b/src/app/constants.ts
@@ -1,4 +1,8 @@
-export const BASE = new URL("./", location.href).pathname;
-export const PREFIX = BASE + "uv/service/";
+import { proxyFind } from "./utils"
+export const CURRENT_PROXY = await proxyFind();
+export const BASE = new URL("./", location.href).pathname; 
+export const PREFIX = CURRENT_PROXY === "choice-scram"
+  ? BASE + "scramjet/"
+  : BASE + "uv/service/";
 export const DEFAULT_WISP = "wss://anura.pro/";
 export const WISP_STORAGE_KEY = "deployable.wispServer";
diff --git a/src/app/types.ts b/src/app/types.ts
index 457c9af..a689444 100644
--- a/src/app/types.ts
+++ b/src/app/types.ts
@@ -5,4 +5,5 @@ export interface Tab {
   historyIndex: number;
   frame: HTMLIFrameElement;
   tabElement: HTMLElement;
+  sjFrame: any;
 }
diff --git a/src/app/utils.ts b/src/app/utils.ts
index 3c11263..5793d15 100644
--- a/src/app/utils.ts
+++ b/src/app/utils.ts
@@ -1,4 +1,5 @@
 import { DEFAULT_WISP, WISP_STORAGE_KEY } from "./constants";
+import { openDB } from "idb";
 
 export const getWispServer = () =>
   localStorage.getItem(WISP_STORAGE_KEY) || DEFAULT_WISP;
@@ -13,3 +14,13 @@ export const normalizeUrl = (u: string) => {
     return u;
   }
 };
+
+export const proxyFind = async () => {
+  const dbPromise = openDB('SettingsDB', 1, {
+    upgrade(db) {
+      db.createObjectStore('settings');
+    },
+  });
+  const db = await dbPromise;
+  return await db.get('settings', 'deployable.proxy');
+}
diff --git a/src/components/UI.ts b/src/components/UI.ts
index 1200de1..1f779d3 100644
--- a/src/components/UI.ts
+++ b/src/components/UI.ts
@@ -1,4 +1,4 @@
-import { loadGames } from "../games/GamesManager";
+// import { loadGames } from "../games/GamesManager";
 
 export function initUI(app: HTMLElement) {
   app.innerHTML = `
@@ -51,6 +51,14 @@ export function initUI(app: HTMLElement) {
           <p class="settings-hint">WebSocket URL used for the proxy transport.</p>
         </div>
 
+        <div class="settings-section">
+          <label for="proxy-choice">Proxy</label>
+          <div class="choice-actions">
+            <button id="choice-uv">Ultraviolet</button><button id="choice-scram">Scramjet</button>
+          </div>
+          <p class="settings-hint">Scramjet is newer and is still maintained. There are few reasons to choose Ultraviolet.</p>
+        </div>
+
         <div class="settings-section">
           <label>Data Management</label>
           <div class="data-actions">
@@ -89,7 +97,7 @@ export function initUI(app: HTMLElement) {
       gamesView.style.display = "flex";
       navWeb.classList.remove("active");
       navGames.classList.add("active");
-      loadGames(gamesSearch.value);
+      // loadGames(gamesSearch.value);
     }
   }
 
diff --git a/src/games/GamesManager.ts b/src/games/GamesManager.ts
index 69fd76a..23a26ea 100644
--- a/src/games/GamesManager.ts
+++ b/src/games/GamesManager.ts
@@ -1,98 +1,98 @@
-let selectedCategory = "";
-let currentPage = 1;
-let totalPages = 1;
+// let selectedCategory = "";
+// let currentPage = 1;
+// let totalPages = 1;
 
-export function getGamesState() {
-  return { selectedCategory, currentPage, totalPages };
-}
+// export function getGamesState() {
+//   return { selectedCategory, currentPage, totalPages };
+// }
 
-export function setGamesState(state: Partial<{ selectedCategory: string, currentPage: number, totalPages: number }>) {
-  if (state.selectedCategory !== undefined) selectedCategory = state.selectedCategory;
-  if (state.currentPage !== undefined) currentPage = state.currentPage;
-  if (state.totalPages !== undefined) totalPages = state.totalPages;
-}
+// export function setGamesState(state: Partial<{ selectedCategory: string, currentPage: number, totalPages: number }>) {
+//   if (state.selectedCategory !== undefined) selectedCategory = state.selectedCategory;
+//   if (state.currentPage !== undefined) currentPage = state.currentPage;
+//   if (state.totalPages !== undefined) totalPages = state.totalPages;
+// }
 
-export async function renderCategories(categories: string[]) {
-  const gamesCategories = document.getElementById("games-categories") as HTMLDivElement;
-  const gamesSearch = document.getElementById("games-search") as HTMLInputElement;
+// export async function renderCategories(categories: string[]) {
+//   const gamesCategories = document.getElementById("games-categories") as HTMLDivElement;
+//   const gamesSearch = document.getElementById("games-search") as HTMLInputElement;
 
-  gamesCategories.innerHTML = `
-    <button class="category-btn ${selectedCategory === "" ? "active" : ""}" data-category="">All</button>
-    ${categories.map((cat) => `<button class="category-btn ${selectedCategory === cat ? "active" : ""}" data-category="${cat}">${cat}</button>`).join("")}
-  `;
-  gamesCategories.querySelectorAll(".category-btn").forEach((btn) => {
-    (btn as HTMLElement).onclick = () => {
-      selectedCategory = (btn as HTMLButtonElement).dataset.category || "";
-      currentPage = 1;
-      loadGames(gamesSearch.value, selectedCategory, currentPage);
-    };
-  });
-}
+//   gamesCategories.innerHTML = `
+//     <button class="category-btn ${selectedCategory === "" ? "active" : ""}" data-category="">All</button>
+//     ${categories.map((cat) => `<button class="category-btn ${selectedCategory === cat ? "active" : ""}" data-category="${cat}">${cat}</button>`).join("")}
+//   `;
+//   gamesCategories.querySelectorAll(".category-btn").forEach((btn) => {
+//     (btn as HTMLElement).onclick = () => {
+//       selectedCategory = (btn as HTMLButtonElement).dataset.category || "";
+//       currentPage = 1;
+//       loadGames(gamesSearch.value, selectedCategory, currentPage);
+//     };
+//   });
+// }
 
-export async function loadGames(query = "", category = "", page = 1) {
-  const gamesLoader = document.getElementById("games-loader") as HTMLDivElement;
-  const gamesGrid = document.getElementById("games-grid") as HTMLDivElement;
-  const pageInfo = document.getElementById("page-info") as HTMLSpanElement;
-  const prevPageBtn = document.getElementById("prev-page") as HTMLButtonElement;
-  const nextPageBtn = document.getElementById("next-page") as HTMLButtonElement;
+// export async function loadGames(query = "", category = "", page = 1) {
+//   const gamesLoader = document.getElementById("games-loader") as HTMLDivElement;
+//   const gamesGrid = document.getElementById("games-grid") as HTMLDivElement;
+//   const pageInfo = document.getElementById("page-info") as HTMLSpanElement;
+//   const prevPageBtn = document.getElementById("prev-page") as HTMLButtonElement;
+//   const nextPageBtn = document.getElementById("next-page") as HTMLButtonElement;
 
-  gamesLoader.style.display = "block";
-  gamesGrid.innerHTML = "";
+//   gamesLoader.style.display = "block";
+//   gamesGrid.innerHTML = "";
 
-  try {
-    const opts: any = {
-      page: page,
-      limit: 30,
-    };
+//   try {
+//     const opts: any = {
+//       page: page,
+//       limit: 30,
+//     };
 
-    if (query.trim()) opts.q = query.trim();
-    if (category) opts.category = category;
+//     if (query.trim()) opts.q = query.trim();
+//     if (category) opts.category = category;
 
-    const { games, pages } = await (window as any).Lumin.getGames(opts);
+//     const { games, pages } = await (window as any).Lumin.getGames(opts);
 
-    totalPages = pages || 1;
-    currentPage = page;
-    pageInfo.textContent = `Page ${currentPage} of ${totalPages}`;
-    prevPageBtn.disabled = currentPage <= 1;
-    nextPageBtn.disabled = currentPage >= totalPages;
+//     totalPages = pages || 1;
+//     currentPage = page;
+//     pageInfo.textContent = `Page ${currentPage} of ${totalPages}`;
+//     prevPageBtn.disabled = currentPage <= 1;
+//     nextPageBtn.disabled = currentPage >= totalPages;
 
-    const { categories } = await (window as any).Lumin.getCategories();
-    renderCategories(categories);
+//     const { categories } = await (window as any).Lumin.getCategories();
+//     renderCategories(categories);
 
-    const images = await Promise.all(
-      games.map((g: any) => (window as any).Lumin.getImageUrl(g.image_token)),
-    );
+//     const images = await Promise.all(
+//       games.map((g: any) => (window as any).Lumin.getImageUrl(g.image_token)),
+//     );
 
-    gamesGrid.innerHTML = games
-      .map(
-        (game: any, i: number) => `
-      <div class="game-card" data-id="${game.id}">
-        <div class="game-img-container">
-          <img src="${images[i]}" alt="${game.name}" loading="lazy" />
-        </div>
-        <div class="game-info">
-          <span class="game-name">${game.name}</span>
-          <span class="game-category">${game.category || ""}</span>
-        </div>
-      </div>
-    `,
-      )
-      .join("");
+//     gamesGrid.innerHTML = games
+//       .map(
+//         (game: any, i: number) => `
+//       <div class="game-card" data-id="${game.id}">
+//         <div class="game-img-container">
+//           <img src="${images[i]}" alt="${game.name}" loading="lazy" />
+//         </div>
+//         <div class="game-info">
+//           <span class="game-name">${game.name}</span>
+//           <span class="game-category">${game.category || ""}</span>
+//         </div>
+//       </div>
+//     `,
+//       )
+//       .join("");
 
-    gamesGrid.querySelectorAll(".game-card").forEach((card) => {
-      (card as HTMLElement).onclick = () => {
-        const id = (card as HTMLElement).dataset.id;
-        if (id) (window as any).Lumin.loadGame(id);
-      };
-    });
-  } catch (err) {
-    gamesGrid.innerHTML = `<div class="error">No games found or failed to load.</div>`;
-    totalPages = 1;
-    currentPage = 1;
-    pageInfo.textContent = `Page 1 of 1`;
-    prevPageBtn.disabled = true;
-    nextPageBtn.disabled = true;
-  } finally {
-    gamesLoader.style.display = "none";
-  }
-}
+//     gamesGrid.querySelectorAll(".game-card").forEach((card) => {
+//       (card as HTMLElement).onclick = () => {
+//         const id = (card as HTMLElement).dataset.id;
+//         if (id) (window as any).Lumin.loadGame(id);
+//       };
+//     });
+//   } catch (err) {
+//     gamesGrid.innerHTML = `<div class="error">No games found or failed to load.</div>`;
+//     totalPages = 1;
+//     currentPage = 1;
+//     pageInfo.textContent = `Page 1 of 1`;
+//     prevPageBtn.disabled = true;
+//     nextPageBtn.disabled = true;
+//   } finally {
+//     gamesLoader.style.display = "none";
+//   }
+// }
diff --git a/src/global.d.ts b/src/global.d.ts
index 2c7871d..071c27c 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -7,10 +7,11 @@ declare module "*.svg";
 declare module "*.woff2";
 declare module "*.woff";
 
-declare const $scramjetLoadController: () => any;
+declare const BareMuxConnection: any;
+declare const sj: any;
+declare const $scramjetLoadController: any;
 declare const $scramjetLoadClient: () => any;
 declare const $scramjetLoadWorker: () => any;
 declare const $scramjetVersion: any;
 declare const Lumin: any;
-
-declare const LibcurlTransport: any;
+declare const LibcurlTransport: any;
\ No newline at end of file
diff --git a/src/index.ts b/src/index.ts
index 3ec6f76..b3cdbb3 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -4,15 +4,18 @@ import { getWispServer, setWispServer } from "./app/utils";
 import { homeDataURL } from "./components/StartPage";
 import { initUI } from "./components/UI";
 import { createTab, getActiveTab, loadTab } from "./app/TabManager";
-import { loadGames, getGamesState } from "./games/GamesManager";
+// import { loadGames, getGamesState } from "./games/GamesManager";
 import { exportData, importData } from "./app/SettingsManager";
+import { openDB } from 'idb';
+
+export let sj: any = null;
 
 let bareMuxConnection: any = null;
 
 async function applyTransport(wispUrl: string) {
   if (!bareMuxConnection) return; 
   await bareMuxConnection.setTransport(
-    "https://unpkg.com/@mercuryworkshop/libcurl-transport@1/dist/index.mjs",
+    "https://unpkg.com/@mercuryworkshop/libcurl-transport@1.5.2/dist/index.mjs",
     [
       {
         websocket: wispUrl,
@@ -23,7 +26,7 @@ async function applyTransport(wispUrl: string) {
 }
 
 async function init() {
-  await navigator.serviceWorker.register("pingas.js"); // change *this* 
+  await navigator.serviceWorker.register("pingas.js", {scope: "/"}); // change *this* 
   await navigator.serviceWorker.ready;
 
   bareMuxConnection = new (window as any).BareMux.BareMuxConnection(
@@ -31,14 +34,47 @@ async function init() {
   );
 
   await applyTransport(getWispServer());
+  const { ScramjetController } = $scramjetLoadController();
+
+  sj = new ScramjetController({
+    prefix: BASE + "scramjet/",
+    files: { 
+      wasm: "https://unpkg.com/@mercuryworkshop/scramjet@1.1.0/dist/scramjet.wasm.wasm",
+      all: "https://unpkg.com/@mercuryworkshop/scramjet@1.1.0/dist/scramjet.all.js",
+      sync: "https://unpkg.com/@mercuryworkshop/scramjet@1.1.0/dist/scramjet.sync.js"
+    },
+    codec: {
+      encode: (url: any) => encodeURIComponent(url),
+      decode: (url: any) => decodeURIComponent(url),
+    }
+  });
+  sj.init();
 }
 
+const dbPromise = openDB('SettingsDB', 1, {
+  upgrade(db) {
+    db.createObjectStore('settings');
+  },
+});
+
+async function loadProxyChoice() {
+  const db = await dbPromise;
+  const savedProxy = await db.get('settings', 'deployable.proxy');
+  
+  if (savedProxy) {
+    const btn = document.getElementById(savedProxy);
+    if (btn) btn.classList.add('selected');
+  }
+}
+
+loadProxyChoice();
+
 const app = document.getElementById("app");
 
 if (app) {
   initUI(app);
 
-  await (window as any).Lumin.init({ headless: true });
+  // await (window as any).Lumin.init({ headless: true });
 
   init()
     .then(() => {
@@ -122,20 +158,23 @@ if (app) {
       gamesSearch.oninput = () => {
         clearTimeout(searchTimeout);
         searchTimeout = setTimeout(() => {
-          loadGames(gamesSearch.value);
+          // loadGames(gamesSearch.value);
+          return;
         }, 400);
       };
 
       prevPageBtn.onclick = () => {
-        const { currentPage, selectedCategory } = getGamesState();
-        if (currentPage > 1)
-          loadGames(gamesSearch.value, selectedCategory, currentPage - 1);
+        // const { currentPage, selectedCategory } = getGamesState();
+        // if (currentPage > 1)
+          // loadGames(gamesSearch.value, selectedCategory, currentPage - 1);
+        return;
       };
 
       nextPageBtn.onclick = () => {
-        const { currentPage, totalPages, selectedCategory } = getGamesState();
-        if (currentPage < totalPages)
-          loadGames(gamesSearch.value, selectedCategory, currentPage + 1);
+        // const { currentPage, totalPages, selectedCategory } = getGamesState();
+        // if (currentPage < totalPages)
+          // loadGames(gamesSearch.value, selectedCategory, currentPage + 1);
+        return;
       };
 
       const wispInput = document.getElementById(
@@ -171,6 +210,15 @@ if (app) {
       const settingsOverlay = document.getElementById(
         "settings-overlay",
       ) as HTMLDivElement;
+      const choiceScram = document.getElementById(
+        "choice-scram"
+      ) as HTMLButtonElement;
+      const choiceUv = document.getElementById(
+        "choice-uv"
+      ) as HTMLButtonElement;
+      const choiceBtns = document.querySelectorAll(
+        '.choice-actions button'
+      ) as NodeListOf<HTMLButtonElement>;
 
       settingsBtn.onclick = () => {
         wispInput.value = getWispServer();
@@ -184,6 +232,13 @@ if (app) {
         setWispServer(value);
         await applyTransport(value);
         settingsOverlay.style.display = "none";
+        const activeBtn = document.querySelector('.choice-actions button.selected') as HTMLButtonElement | null;
+        if (activeBtn) {
+          const db = await dbPromise;
+          await db.put('settings', activeBtn.id, 'deployable.proxy');
+          console.log('Settings saved to IndexedDB: deployable.proxy:' + activeBtn.id);
+        }
+        window.location.reload();
       };
       settingsReset.onclick = () => (wispInput.value = DEFAULT_WISP);
       settingsOverlay.onclick = (e) => {
@@ -204,6 +259,23 @@ if (app) {
         }
       };
 
+      async function initProxySelection() {
+        const db = await dbPromise;
+        const storedProxyId = await db.get('settings', 'deployable.proxy');
+
+        choiceBtns.forEach((btn) => {
+          if (btn.id === storedProxyId) {
+            btn.classList.add('selected');
+          }
+
+          btn.addEventListener('click', () => {
+            choiceBtns.forEach((b) => b.classList.remove('selected'));
+            btn.classList.add('selected');
+          });
+        });
+      }
+      initProxySelection();
+
       exportBtn.onclick = exportData;
       importBtn.onclick = () => importInput.click();
       importInput.onchange = (e) => {
diff --git a/src/styles/main.css b/src/styles/main.css
index 31bf44f..91b0267 100644
--- a/src/styles/main.css
+++ b/src/styles/main.css
@@ -472,6 +472,34 @@ body {
   margin: 0;
 }
 
+.choice-actions {
+  display: flex;
+  gap: 10px;
+}
+
+.choice-actions button {
+  flex: 1;
+  padding: 10px;
+  background: #1a1a1a;
+  border: 1px solid #333;
+  border-radius: 8px;
+  color: #fff;
+  cursor: pointer;
+  font-size: 13px;
+  transition: all 0.2s ease;
+}
+
+.choice-actions button:hover {
+  background: #222;
+  border-color: #444;
+}
+
+.choice-actions button.selected {
+  border-color: #3b82f6;
+  background-color: #e0f2fe;
+  color: #0369a1;
+}
+
 .data-actions {
   display: flex;
   gap: 10px;
diff --git a/sw/pingas.js b/sw/pingas.js
index 3210b43..1661a01 100644
--- a/sw/pingas.js
+++ b/sw/pingas.js
@@ -1,7 +1,9 @@
 const UV_CDN = "https://unpkg.com/@titaniumnetwork-dev/ultraviolet@3.2.8/dist/";
+const SJ_CDN = "https://unpkg.com/@mercuryworkshop/scramjet@1.1.0/dist/";
 
 importScripts(UV_CDN + "uv.bundle.js");
 importScripts(UV_CDN + "uv.sw.js");
+importScripts(SJ_CDN + "scramjet.all.js");
 
 const base = new URL("./", location.href).pathname;
 
@@ -19,6 +21,40 @@ self.__uv$config = {
 };
 
 const uv = new UVServiceWorker();
+let sjInitialized = false;
+let sj = null;
+async function getSJ() {
+  if (!sj) {
+    const { ScramjetServiceWorker } = $scramjetLoadWorker();
+    sj = new ScramjetServiceWorker();
+  }
+  // console.log(sj);
+  return sj;
+}
+let sjReady = false;
+
+async function sjRequest(event) {
+  try {
+    const s = await getSJ();
+    if (!sjInitialized) {
+      try {
+        await s.loadConfig();
+        sjInitialized = true;
+      } catch (e) {e
+        return new Response(
+          `<p>trying to initialize scramjet...</p>`,
+          { status: 200, headers: { "Content-Type": "text/html" } }
+        );
+      }
+    }
+    if (s.route(event)) {
+      return await s.fetch(event);
+    }
+  } catch (e) {
+    return new Response("scramjet eror: " + e.message, { status: 500 });
+  }
+  return await fetch(event.request);
+}
 
 self.addEventListener("install", () => self.skipWaiting());
 self.addEventListener("activate", (event) =>
@@ -64,7 +100,7 @@ self.addEventListener("fetch", (event) => {
     );
     return;
   }
-
+  
   // when it tries to get the other files we fetch from cdn
   if (
     [
@@ -86,13 +122,11 @@ self.addEventListener("fetch", (event) => {
     );
     return;
   }
-
-  event.respondWith(
-    (async () => {
-      if (uv.route(event)) {
-        return await uv.fetch(event);
-      }
-      return await fetch(event.request);
-    })(),
-  );
-});
+  if (uv.route(event)) {
+      event.respondWith(uv.fetch(event));
+      return;
+  }
+  if (url.pathname.startsWith("/scramjet/")) {
+    event.respondWith(sjRequest(event));
+  }
+});
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 5d96f1b..f80783e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,7 +4,8 @@
     "module": "ESNext",
     "strict": true,
 
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "typeRoots": ["@mercuryworkshop/scramjet"]
   },
   "include": ["src"]
 }

From 569ce9faedf1fb42147221a9a4a9b0f6cda3cac9 Mon Sep 17 00:00:00 2001
From: wvalid19 <sonti4@outlook.com>
Date: Sat, 30 May 2026 13:15:34 -0400
Subject: [PATCH 2/7] css thing falling3_4 wanted me to do

yay scramjet btw
---
 public/index.html   |  2 +-
 src/index.ts        |  6 ++++--
 src/styles/main.css | 10 +++++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/public/index.html b/public/index.html
index b547b81..f442426 100644
--- a/public/index.html
+++ b/public/index.html
@@ -19,7 +19,7 @@
     />
     <script src="https://unpkg.com/@mercuryworkshop/bare-mux@2.1.9/dist/index.js"></script>
     <script src="https://unpkg.com/@titaniumnetwork-dev/ultraviolet@3.2.8/dist/uv.bundle.js"></script>
-    <!WHEN FIXED PUT THIS HERE script src https://cdn.jsdelivr.net/gh/luminsdk/script@latest/lumin.min.js>
+    <script src="https://cdn.jsdelivr.net/gh/luminsdk/script@latest/lumin.min.js"></script>
     <script src="https://unpkg.com/@mercuryworkshop/scramjet@1.1.0/dist/scramjet.all.js"></script>
     <script
       defer
diff --git a/src/index.ts b/src/index.ts
index b3cdbb3..e9fb81f 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -262,9 +262,11 @@ if (app) {
       async function initProxySelection() {
         const db = await dbPromise;
         const storedProxyId = await db.get('settings', 'deployable.proxy');
-
+        
         choiceBtns.forEach((btn) => {
-          if (btn.id === storedProxyId) {
+          const shouldSelect = storedProxyId ? btn.id === storedProxyId : btn.id === 'choice-uv';
+          
+          if (shouldSelect) {
             btn.classList.add('selected');
           }
 
diff --git a/src/styles/main.css b/src/styles/main.css
index 91b0267..f200e89 100644
--- a/src/styles/main.css
+++ b/src/styles/main.css
@@ -495,9 +495,13 @@ body {
 }
 
 .choice-actions button.selected {
-  border-color: #3b82f6;
-  background-color: #e0f2fe;
-  color: #0369a1;
+  background: #2563eb;
+  border-color: #2563eb;
+  color: #fff;
+}
+
+.choice-actions button.selected:hover {
+  background: #1d4ed8;
 }
 
 .data-actions {

From 03b5d75e5b266288aaae5d0ff09607b8d8a6f6b4 Mon Sep 17 00:00:00 2001
From: wvalid19 <sonti4@outlook.com>
Date: Sat, 30 May 2026 22:16:33 -0400
Subject: [PATCH 3/7] Add skidala fallback thing

---
 sw/pingas.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sw/pingas.js b/sw/pingas.js
index 1661a01..bd55581 100644
--- a/sw/pingas.js
+++ b/sw/pingas.js
@@ -129,4 +129,5 @@ self.addEventListener("fetch", (event) => {
   if (url.pathname.startsWith("/scramjet/")) {
     event.respondWith(sjRequest(event));
   }
-});
\ No newline at end of file
+  evend.respondWith(fetch(event));
+});

From 8245e34a09e4fc46254dd8f5650fd402cb17f88d Mon Sep 17 00:00:00 2001
From: wvalid19 <sonti4@outlook.com>
Date: Sat, 30 May 2026 22:19:03 -0400
Subject: [PATCH 4/7] Uncomment out skidala

---
 src/games/GamesManager.ts | 169 +++++++++++++++++++-------------------
 1 file changed, 85 insertions(+), 84 deletions(-)

diff --git a/src/games/GamesManager.ts b/src/games/GamesManager.ts
index 23a26ea..aa1ae18 100644
--- a/src/games/GamesManager.ts
+++ b/src/games/GamesManager.ts
@@ -1,98 +1,99 @@
-// let selectedCategory = "";
-// let currentPage = 1;
-// let totalPages = 1;
+let selectedCategory = "";
+let currentPage = 1;
+let totalPages = 1;
 
-// export function getGamesState() {
-//   return { selectedCategory, currentPage, totalPages };
-// }
+export function getGamesState() {
+  return { selectedCategory, currentPage, totalPages };
+}
 
-// export function setGamesState(state: Partial<{ selectedCategory: string, currentPage: number, totalPages: number }>) {
-//   if (state.selectedCategory !== undefined) selectedCategory = state.selectedCategory;
-//   if (state.currentPage !== undefined) currentPage = state.currentPage;
-//   if (state.totalPages !== undefined) totalPages = state.totalPages;
-// }
+export function setGamesState(state: Partial<{ selectedCategory: string, currentPage: number, totalPages: number }>) {
+  if (state.selectedCategory !== undefined) selectedCategory = state.selectedCategory;
+  if (state.currentPage !== undefined) currentPage = state.currentPage;
+  if (state.totalPages !== undefined) totalPages = state.totalPages;
+}
 
-// export async function renderCategories(categories: string[]) {
-//   const gamesCategories = document.getElementById("games-categories") as HTMLDivElement;
-//   const gamesSearch = document.getElementById("games-search") as HTMLInputElement;
+export async function renderCategories(categories: string[]) {
+  const gamesCategories = document.getElementById("games-categories") as HTMLDivElement;
+  const gamesSearch = document.getElementById("games-search") as HTMLInputElement;
 
-//   gamesCategories.innerHTML = `
-//     <button class="category-btn ${selectedCategory === "" ? "active" : ""}" data-category="">All</button>
-//     ${categories.map((cat) => `<button class="category-btn ${selectedCategory === cat ? "active" : ""}" data-category="${cat}">${cat}</button>`).join("")}
-//   `;
-//   gamesCategories.querySelectorAll(".category-btn").forEach((btn) => {
-//     (btn as HTMLElement).onclick = () => {
-//       selectedCategory = (btn as HTMLButtonElement).dataset.category || "";
-//       currentPage = 1;
-//       loadGames(gamesSearch.value, selectedCategory, currentPage);
-//     };
-//   });
-// }
+  gamesCategories.innerHTML = `
+    <button class="category-btn ${selectedCategory === "" ? "active" : ""}" data-category="">All</button>
+    ${categories.map((cat) => `<button class="category-btn ${selectedCategory === cat ? "active" : ""}" data-category="${cat}">${cat}</button>`).join("")}
+  `;
+  gamesCategories.querySelectorAll(".category-btn").forEach((btn) => {
+    (btn as HTMLElement).onclick = () => {
+      selectedCategory = (btn as HTMLButtonElement).dataset.category || "";
+      currentPage = 1;
+      loadGames(gamesSearch.value, selectedCategory, currentPage);
+    };
+  });
+}
 
-// export async function loadGames(query = "", category = "", page = 1) {
-//   const gamesLoader = document.getElementById("games-loader") as HTMLDivElement;
-//   const gamesGrid = document.getElementById("games-grid") as HTMLDivElement;
-//   const pageInfo = document.getElementById("page-info") as HTMLSpanElement;
-//   const prevPageBtn = document.getElementById("prev-page") as HTMLButtonElement;
-//   const nextPageBtn = document.getElementById("next-page") as HTMLButtonElement;
+export async function loadGames(query = "", category = "", page = 1) {
+  const gamesLoader = document.getElementById("games-loader") as HTMLDivElement;
+  const gamesGrid = document.getElementById("games-grid") as HTMLDivElement;
+  const pageInfo = document.getElementById("page-info") as HTMLSpanElement;
+  const prevPageBtn = document.getElementById("prev-page") as HTMLButtonElement;
+  const nextPageBtn = document.getElementById("next-page") as HTMLButtonElement;
 
-//   gamesLoader.style.display = "block";
-//   gamesGrid.innerHTML = "";
+  gamesLoader.style.display = "block";
+  gamesGrid.innerHTML = "";
 
-//   try {
-//     const opts: any = {
-//       page: page,
-//       limit: 30,
-//     };
+  try {
+    const opts: any = {
+      page: page,
+      limit: 30,
+    };
 
-//     if (query.trim()) opts.q = query.trim();
-//     if (category) opts.category = category;
+    if (query.trim()) opts.q = query.trim();
+    if (category) opts.category = category;
 
-//     const { games, pages } = await (window as any).Lumin.getGames(opts);
+    const { games, pages } = await (window as any).Lumin.getGames(opts);
 
-//     totalPages = pages || 1;
-//     currentPage = page;
-//     pageInfo.textContent = `Page ${currentPage} of ${totalPages}`;
-//     prevPageBtn.disabled = currentPage <= 1;
-//     nextPageBtn.disabled = currentPage >= totalPages;
+    totalPages = pages || 1;
+    currentPage = page;
+    pageInfo.textContent = `Page ${currentPage} of ${totalPages}`;
+    prevPageBtn.disabled = currentPage <= 1;
+    nextPageBtn.disabled = currentPage >= totalPages;
 
-//     const { categories } = await (window as any).Lumin.getCategories();
-//     renderCategories(categories);
+    const { categories } = await (window as any).Lumin.getCategories();
+    renderCategories(categories);
 
-//     const images = await Promise.all(
-//       games.map((g: any) => (window as any).Lumin.getImageUrl(g.image_token)),
-//     );
+    const images = await Promise.all(
+      games.map((g: any) => (window as any).Lumin.getImageUrl(g.image_token)),
+    );
 
-//     gamesGrid.innerHTML = games
-//       .map(
-//         (game: any, i: number) => `
-//       <div class="game-card" data-id="${game.id}">
-//         <div class="game-img-container">
-//           <img src="${images[i]}" alt="${game.name}" loading="lazy" />
-//         </div>
-//         <div class="game-info">
-//           <span class="game-name">${game.name}</span>
-//           <span class="game-category">${game.category || ""}</span>
-//         </div>
-//       </div>
-//     `,
-//       )
-//       .join("");
+    gamesGrid.innerHTML = games
+      .map(
+        (game: any, i: number) => `
+      <div class="game-card" data-id="${game.id}">
+        <div class="game-img-container">
+          <img src="${images[i]}" alt="${game.name}" loading="lazy" />
+        </div>
+        <div class="game-info">
+          <span class="game-name">${game.name}</span>
+          <span class="game-category">${game.category || ""}</span>
+        </div>
+      </div>
+    `,
+      )
+      .join("");
 
-//     gamesGrid.querySelectorAll(".game-card").forEach((card) => {
-//       (card as HTMLElement).onclick = () => {
-//         const id = (card as HTMLElement).dataset.id;
-//         if (id) (window as any).Lumin.loadGame(id);
-//       };
-//     });
-//   } catch (err) {
-//     gamesGrid.innerHTML = `<div class="error">No games found or failed to load.</div>`;
-//     totalPages = 1;
-//     currentPage = 1;
-//     pageInfo.textContent = `Page 1 of 1`;
-//     prevPageBtn.disabled = true;
-//     nextPageBtn.disabled = true;
-//   } finally {
-//     gamesLoader.style.display = "none";
-//   }
-// }
+    gamesGrid.querySelectorAll(".game-card").forEach((card) => {
+      (card as HTMLElement).onclick = () => {
+        const id = (card as HTMLElement).dataset.id;
+        if (id) (window as any).Lumin.loadGame(id);
+      };
+    });
+  } catch (err) {
+    gamesGrid.innerHTML = `<div class="error">No games found or failed to load.</div>`;
+    totalPages = 1;
+    currentPage = 1;
+    pageInfo.textContent = `Page 1 of 1`;
+    prevPageBtn.disabled = true;
+    nextPageBtn.disabled = true;
+  } finally {
+    gamesLoader.style.display = "none";
+  }
+        }
+  

From 88aa2e1ce0b1661cb33e05404779e0560426886f Mon Sep 17 00:00:00 2001
From: wvalid19 <sonti4@outlook.com>
Date: Sat, 30 May 2026 22:19:48 -0400
Subject: [PATCH 5/7] Uncomment out skidala

---
 src/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index e9fb81f..a10b5d0 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -4,7 +4,7 @@ import { getWispServer, setWispServer } from "./app/utils";
 import { homeDataURL } from "./components/StartPage";
 import { initUI } from "./components/UI";
 import { createTab, getActiveTab, loadTab } from "./app/TabManager";
-// import { loadGames, getGamesState } from "./games/GamesManager";
+import { loadGames, getGamesState } from "./games/GamesManager";
 import { exportData, importData } from "./app/SettingsManager";
 import { openDB } from 'idb';
 
@@ -74,7 +74,7 @@ const app = document.getElementById("app");
 if (app) {
   initUI(app);
 
-  // await (window as any).Lumin.init({ headless: true });
+  await (window as any).Lumin.init({ headless: true });
 
   init()
     .then(() => {

From e34dd0617d4a90fbc3b264ea53498e91725b7d8f Mon Sep 17 00:00:00 2001
From: wvalid19 <sonti4@outlook.com>
Date: Sat, 30 May 2026 22:20:54 -0400
Subject: [PATCH 6/7] Uncomment out skidala

---
 src/components/UI.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/UI.ts b/src/components/UI.ts
index 1f779d3..cbce1b0 100644
--- a/src/components/UI.ts
+++ b/src/components/UI.ts
@@ -1,4 +1,4 @@
-// import { loadGames } from "../games/GamesManager";
+import { loadGames } from "../games/GamesManager";
 
 export function initUI(app: HTMLElement) {
   app.innerHTML = `
@@ -97,7 +97,7 @@ export function initUI(app: HTMLElement) {
       gamesView.style.display = "flex";
       navWeb.classList.remove("active");
       navGames.classList.add("active");
-      // loadGames(gamesSearch.value);
+      loadGames(gamesSearch.value);
     }
   }
 

From 1a35db42b7e0d2fb4b5daf19dbe9a59f6f26f0e6 Mon Sep 17 00:00:00 2001
From: wvalid19 <sonti4@outlook.com>
Date: Sat, 30 May 2026 22:22:09 -0400
Subject: [PATCH 7/7] Uncomment out skidala

---
 src/index.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index a10b5d0..2df0799 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -158,23 +158,23 @@ if (app) {
       gamesSearch.oninput = () => {
         clearTimeout(searchTimeout);
         searchTimeout = setTimeout(() => {
-          // loadGames(gamesSearch.value);
+          loadGames(gamesSearch.value);
           return;
         }, 400);
       };
 
       prevPageBtn.onclick = () => {
-        // const { currentPage, selectedCategory } = getGamesState();
-        // if (currentPage > 1)
-          // loadGames(gamesSearch.value, selectedCategory, currentPage - 1);
-        return;
+        const { currentPage, selectedCategory } = getGamesState();
+        if (currentPage > 1)
+          loadGames(gamesSearch.value, selectedCategory, currentPage - 1);
+        // return;
       };
 
       nextPageBtn.onclick = () => {
-        // const { currentPage, totalPages, selectedCategory } = getGamesState();
-        // if (currentPage < totalPages)
-          // loadGames(gamesSearch.value, selectedCategory, currentPage + 1);
-        return;
+        const { currentPage, totalPages, selectedCategory } = getGamesState();
+        if (currentPage < totalPages)
+          loadGames(gamesSearch.value, selectedCategory, currentPage + 1);
+        // return;
       };
 
       const wispInput = document.getElementById(