Merge pull request #267 from qerionx/main

Even better path handling

Author: qerionx

public/loadersw.js

@@ -1,6 +1,7 @@
 const k = new TextEncoder().encode(btoa(new Date().toISOString().slice(0, 10) + location.host).split('').reverse().join('').slice(6.7));
+const path = location.pathname.substring(0, location.pathname.indexOf('/', 1));
 self.__uv$config = {
-    prefix: "/portal/k12/",
+    prefix: path + "/portal/k12/",
     encodeUrl: s => {
         if (!s) return s;
         try {
@@ -28,11 +29,11 @@ self.__uv$config = {
             return new TextDecoder().decode(o) + s.slice(h);
         } catch { return decodeURIComponent(s); }
     },
-    handler: "/portal/uv.handler.js",
-    client: "/portal/uv.client.js", 
-    bundle: "/portal/uv.bundle.js",
-    config: "/portal/uv.config.js",
-    sw: "/portal/uv.sw.js"
+    handler: path + "/portal/uv.handler.js",
+    client: path + "/portal/uv.client.js", 
+    bundle: path + "/portal/uv.bundle.js",
+    config: path + "/portal/uv.config.js",
+    sw: path + "/portal/uv.sw.js"
 };
 
 self.console = new Proxy({}, {

public/portal/uv.config.js

@@ -47,7 +47,7 @@ const Omnibox = () => {
   const navigate = useNavigate();
   const { iframeUrls } = loaderStore();
 
-  const isProcied = (url) => url?.includes('/portal/k12/') || url?.includes('/ham/');
+  const isProcied = (url) => url?.includes('portal/k12/') || url?.includes('ham/');
   const isNewTab = (url) => !url || url === 'tabs://new' || url.endsWith('/new');
 
   const updateIcon = (url) => {

public/s_sw.js

@@ -19,13 +19,13 @@ const NotFound = () => {
   };
 
   useEffect(() => {
-    if (loc.pathname.includes('/ham/') || loc.pathname.includes('/portal/k12/')) {
+    if (loc.pathname.includes('ham/') || loc.pathname.includes('portal/k12/')) {
       return;
     }
     nav('/');
   }, [loc, nav]);
 
-  if (loc.pathname.includes('/ham/') || loc.pathname.includes('/portal/k12/')) {
+  if (loc.pathname.includes('ham/') || loc.pathname.includes('portal/k12/')) {
     return (
       <div
         className="min-h-screen flex flex-col items-center justify-center p-6"

public/sw.js

@@ -8,7 +8,10 @@ import store from './useLoaderStore';
 export default function useReg() {
   const { options } = useOptions();
   const ws = `${location.protocol == 'http:' ? 'ws:' : 'wss:'}//${location.host}/wisp/`;
-  const sws = [
+  const sws = isStaticBuild ? [
+    { path: new URL('./sw.js', location.href).href, scope: new URL('./portal/k12/', location.href).href }, 
+    { path: new URL('./s_sw.js', location.href).href, scope: new URL('./ham/', location.href).href }
+  ] : [
     { path: new URL('/sw.js', location.origin).href, scope: new URL('/portal/k12/', location.origin).href }, 
     { path: new URL('/s_sw.js', location.origin).href, scope: new URL('/ham/', location.origin).href }
   ];
@@ -18,7 +21,9 @@ export default function useReg() {
     const init = async () => {
       if (!window.scr) {
         const script = document.createElement('script');
-        script.src = '/eggs/scramjet.all.js';
+        script.src = isStaticBuild 
+          ? new URL('./eggs/scramjet.all.js', location.href).pathname
+          : '/eggs/scramjet.all.js';
         await new Promise((resolve, reject) => {
           script.onload = resolve;
           script.onerror = reject;
@@ -28,12 +33,19 @@ export default function useReg() {
 
       const { ScramjetController } = $scramjetLoadController();
 
+      const hamPrefix = isStaticBuild 
+        ? new URL('./ham/', location.href).pathname
+        : '/ham/';
+      const eggsPath = isStaticBuild
+        ? new URL('./eggs/', location.href).pathname
+        : '/eggs/';
+
       window.scr = new ScramjetController({
-        prefix: "/ham/",
+        prefix: hamPrefix,
         files: {
-          wasm: '/eggs/scramjet.wasm.wasm',
-          all: '/eggs/scramjet.all.js',
-          sync: '/eggs/scramjet.sync.js',
+          wasm: eggsPath + 'scramjet.wasm.wasm',
+          all: eggsPath + 'scramjet.all.js',
+          sync: eggsPath + 'scramjet.sync.js',
         },
         flags: { rewriterLogs: false, scramitize: false, cleanErrors: true, sourcemaps: true },
         codec: makecodec()
@@ -52,7 +64,10 @@ export default function useReg() {
         }
       }
 
-      const connection = new BareMuxConnection(new URL('/baremux/worker.js', location.href).href);
+      const baremuxPath = isStaticBuild
+        ? new URL('./baremux/worker.js', location.href).href
+        : new URL('/baremux/worker.js', location.origin).href;
+      const connection = new BareMuxConnection(baremuxPath);
       isStaticBuild && setWispStatus('init');
       let socket = null;
       try {
@@ -62,7 +77,10 @@ export default function useReg() {
       }
       isStaticBuild && (!socket ? setWispStatus(false) : setWispStatus(true));
 
-      await connection.setTransport('/libcurl/index.mjs', [
+      const libcurlPath = isStaticBuild
+        ? new URL('./libcurl/index.mjs', location.href).pathname
+        : '/libcurl/index.mjs';
+      await connection.setTransport(libcurlPath, [
         {
           wisp:
             options.wServer != null && options.wServer !== ''

src/components/loader/Omnibox.jsx

@@ -29,32 +29,39 @@ const scrwlist = new Set([
 ]);
 
 export const process = (input, decode = false, prType, engine = "https://www.google.com/search?q=") => {
+  const upwefix = isStaticBuild 
+    ? new URL('./portal/k12/', location.href).pathname
+    : '/portal/k12/';
+  const eggowaffle = isStaticBuild
+    ? new URL('./ham/', location.href).pathname
+    : '/ham/';
+  
   let prefix;
 
   switch (prType) {
     case 'uv':
-      prefix = '/portal/k12/';
+      prefix = upwefix;
       break;
     case 'scr':
-      prefix = '/ham/';
+      prefix = eggowaffle;
       break;
     default:
       const url = check(input, engine);
       const match = [...scrwlist].some(d => url.includes(d));
-      prefix = match ? '/ham/' : '/portal/k12/';
+      prefix = match ? eggowaffle : upwefix;
   }
 
   if (decode) {
-    const uvPart = input.split('/portal/k12/')[1];
-    const scrPart = input.split('/ham/')[1];
+    const uvPart = input.split(upwefix)[1];
+    const scrPart = input.split(eggowaffle)[1];
     const decoded = uvPart ? mango.dnc(uvPart) : scrPart ? mango.dnc(scrPart) : input;
     return decoded.endsWith('/') ? decoded.slice(0, -1) : decoded;
   } else {
     const final = check(input, engine);
     if (!final || final.trim() === '') {
       return null;
     }
-    const encoded = prefix === '/ham/' ? mango.enc(final) : mango.enc(final);
+    const encoded = prefix === eggowaffle ? mango.enc(final) : mango.enc(final);
     return `${location.protocol}//${location.host}${prefix}${encoded}`;
   }
 };

src/pages/NotFound.jsx

@@ -172,12 +172,13 @@ class LocalGmLoader {
       let existing = regs.find(r => r.active?.scriptURL.includes('/loadersw.js'));
 
       if (!existing) {
-        const swPath = isStaticBuild 
-          ? new URL('./loadersw.js', location.href).href
-          : new URL('/loadersw.js', location.origin).href;
+        const swPath = isStaticBuild
+          ? './loadersw.js'
+          : '/loadersw.js';
         const swScope = isStaticBuild
-          ? new URL('./', location.href).href
+          ? './'
           : '/';
+        
         const reg = await navigator.serviceWorker.register(swPath, {
           scope: swScope,
           updateViaCache: 'none'
@@ -232,8 +233,8 @@ class LocalGmLoader {
     const existing = await this.getGm(gmName);
 
     const gameUrl = isStaticBuild
-      ? new URL(`./game/${gmName}/index.html`, location.href).href
-      : new URL(`/game/${gmName}/index.html`, location.origin).href;
+      ? `./game/${gmName}/index.html`
+      : `/game/${gmName}/index.html`;
 
     if (existing) {
       await this.updateLastPlayed(gmName);