bug fix: Scramjet

Author: MotorTruck1221

public/sw.js

@@ -1,11 +1,13 @@
 importScripts("/uv/uv.bundle.js");
 importScripts("/uv/uv.config.js");
-importScripts('/scram/scramjet.shared.js');
-importScripts('/scram/scramjet.worker.js');
+//importScripts('/scram/scramjet.shared.js');
+//importScripts('/scram/scramjet.worker.js');
+importScripts('/scram/scramjet.all.js');
 importScripts("/workerware/workerware.js");
 importScripts(__uv$config.sw || "/uv/uv.sw.js");
 const uv = new UVServiceWorker();
 const ww = new WorkerWare({ debug: false });
+const { ScramjetServiceWorker } = $scramjetLoadWorker();
 const sj = new ScramjetServiceWorker();
 (async function () {
         await sj.loadConfig();

src/env.d.ts

@@ -1,45 +1,4 @@
 /// <reference path="../.astro/types.d.ts" />
 /// <reference types="astro/client" />
 /// <reference types="@titaniumnetwork-dev/ultraviolet/client" />
-interface SJOptions {
-    prefix: string;
-    globals?: {
-        wrapfn: string;
-        wrapthisfn: string;
-        trysetfn: string;
-        importfn: string;
-        rewritefn: string;
-        metafn: string;
-        setrealmfn: string;
-        pushsourcemapfn: string;
-    };
-    files: {
-        wasm: string;
-        shared: string;
-        worker: string;
-        client: string;
-        sync: string;
-    };
-    flags?: {
-        serviceworkers?: boolean;
-        syncxhr?: boolean;
-        naiiveRewriter?: boolean;
-        strictRewrites?: boolean;
-        rewriterLogs?: boolean;
-        captureErrors?: boolean;
-        cleanErrors?: boolean;
-        scramitize?: boolean;
-        sourcemaps?: boolean;
-    };
-    siteFlags?: {};
-    codec?: {
-        encode: string;
-        decode: string;
-    };
-}
-
-declare class ScramjetController {
-    constructor(opts: SJOptions);
-    init(): Promise<void>;
-    encodeUrl(term: string): string;
-}
+///  <reference types="@mercuryworkshop/scramjet" />

src/utils/serviceWorker.ts

@@ -30,7 +30,7 @@ function* createProxyScripts() {
     yield uv;
     const uvConfig = createScript("/uv/uv.config.js", true);
     yield uvConfig;
-    const sj = createScript("/scram/scramjet.controller.js", true);
+    const sj = createScript("/scram/scramjet.all.js", true);
     yield sj;
 };
 
@@ -45,7 +45,7 @@ function* createProxyScripts() {
 const checkProxyScripts = (): Promise<void> => {
     return new Promise((resolve) => {
         const checkScript = setInterval(() => {
-            if (typeof __uv$config !== "undefined" && typeof ScramjetController !== "undefined") {
+            if (typeof __uv$config !== "undefined" && typeof $scramjetLoadController !== "undefined") {
                 clearInterval(checkScript);
                 resolve();
             }
@@ -105,13 +105,12 @@ class SW {
     constructor(conn: BareMuxConnection) {
         SW.#instances.add(this);
         const sj = (): ScramjetController => {
+            const { ScramjetController } = $scramjetLoadController();
             const sj = new ScramjetController({
                 prefix: '/~/scramjet',
                 files: {
                     wasm: "/scram/scramjet.wasm.wasm",
-                    worker: "/scram/scramjet.worker.js",
-                    client: "/scram/scramjet.client.js",
-                    shared: "/scram/scramjet.shared.js",
+                    all: "/scram/scramjet.all.js",
                     sync: "/scram/scramjet.sync.js"
                 },
                 flags: {