From b34b24e78367157fe2d9fd7315ae0996556671d0 Mon Sep 17 00:00:00 2001
From: MotorTruck1221 <motortruck1221@protonmail.com>
Date: Fri, 3 Jan 2025 12:52:58 -0700
Subject: [PATCH] More changes?

---
 src/pages/loading.astro    | 19 ++++++++++++++++---
 src/utils/serviceWorker.ts | 14 +++++++++-----
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/pages/loading.astro b/src/pages/loading.astro
index 78760be..0fbb78a 100644
--- a/src/pages/loading.astro
+++ b/src/pages/loading.astro
@@ -3,11 +3,12 @@ import LoadingComponent from "@components/Loading.astro";
 import Layout from "@layouts/Layout.astro";
 ---
 
-<Layout title="Loading page..." noHeader="true">
+<!-- Layout title="Loading page..." noHeader="true">
     <LoadingComponent />
-</Layout>
+</Layout-->
 <script>
     import { EventHandler } from "@utils/events";
+import { createBareMuxConn, createProxyScripts, SW } from "@utils/serviceWorker";
     import { navigate } from "astro:transitions/client";
     function isComingFromIframe() {
         try {
@@ -24,8 +25,20 @@ import Layout from "@layouts/Layout.astro";
                 const isIframe = isComingFromIframe();
                 if (!isIframe) {
                     console.log("Assuming request isn't coming from iframe. Redirecting...");
-                    navigate("/");
+                    //navigate("/");
                 }
+            }),
+            "DOMContentLoaded": (async () => {
+                for (let item of createProxyScripts()) {
+                        document.body.appendChild(item);
+                }
+                const checkScript = setInterval(async () => {
+                    if (typeof __uv$config !== "undefined" && typeof ScramjetController !== "undefined") {
+                        clearInterval(checkScript);
+                        const conn = await createBareMuxConn("/baremux/worker.js");
+                        window.sw = new SW(conn);
+                    }
+                }, 100); 
             })
         },
         logging: false
diff --git a/src/utils/serviceWorker.ts b/src/utils/serviceWorker.ts
index cb5e533..e2b0023 100644
--- a/src/utils/serviceWorker.ts
+++ b/src/utils/serviceWorker.ts
@@ -27,6 +27,8 @@ const createScript = (src: string, defer?: boolean): HTMLScriptElement => {
 function* createProxyScripts() {
     const uv = createScript("/uv/uv.bundle.js", true);
     yield uv;
+    const uvConfig = createScript("/uv/uv.config.js", true);
+    yield uvConfig;
     const sj = createScript("/scram/scramjet.controller.js", true);
     yield sj;
 };
@@ -78,7 +80,7 @@ type SWInit = {
 class SW {
     #init!: SWInit;
     constructor(conn: BareMuxConnection) {
-        const sj = async (): Promise<ScramjetController> => {
+        const sj = (): ScramjetController => {
             const sj = new ScramjetController({
                 prefix: '/~/scramjet',
                 files: {
@@ -89,13 +91,14 @@ class SW {
                     sync: "/scram/scramjet.sync.js"
                 }
             });
-            await sj.init();
             return sj;
         }
         if ("serviceWorker" in navigator) {
+            const scram = sj();
+            (async () => await scram.init())();
             navigator.serviceWorker.ready.then(async (reg) => {
                 console.log("Service worker ready and active!");
-                this.#init = { serviceWorker: reg, sj: await sj(), bareMuxConn: conn }
+                this.#init = { serviceWorker: reg, sj: scram, bareMuxConn: conn }
             });
             navigator.serviceWorker.register("/sw.js", { scope: '/' });
         }
@@ -114,8 +117,9 @@ class SW {
     /**
         * Returns an object with the service worker, scramjet controller and baremux connection all in one method.
     */
-    getSWInfo(): SWInit {
-        return this.#init;
+    getSWInfo(): SWInit | Error {
+        if (this.#init !== undefined) return this.#init;
+        return new Error("this object is undefined!");
     }
 }