@utoo/web 1.0.6 → 1.0.7

package/esm/installServiceWorker.js

@@ -1,14 +1,17 @@
 import { ServiceWorkerHandShake } from "./message";
 export async function installServiceWorker(url, scope, targetDirToCwd) {
-    const registration = await navigator.serviceWorker.register(url, {
+    const swUrl = new URL(url, window.location.href);
+    swUrl.searchParams.set("scope", scope);
+    if (targetDirToCwd) {
+        swUrl.searchParams.set("targetDirToCwd", targetDirToCwd);
+    }
+    const registration = await navigator.serviceWorker.register(swUrl.toString(), {
         scope: "/",
     });
     return new Promise((resolve) => {
         function sendMessage(sw) {
             sw.postMessage({
                 [ServiceWorkerHandShake]: true,
-                scope,
-                targetDirToCwd,
             });
             resolve();
         }

package/esm/serviceWorker.js

@@ -5,8 +5,9 @@ let _promise = new Promise((resolve) => {
     _resolve = resolve;
 });
 let _projectEndpoint;
-let _serviceWorkerScope;
-let _targetDirToCwd;
+const params = new URLSearchParams(self.location.search);
+const _serviceWorkerScope = params.get("scope");
+const _targetDirToCwd = params.get("targetDirToCwd");
 self.addEventListener("install", (event) => {
     event.waitUntil(self.skipWaiting());
 });
@@ -15,27 +16,23 @@ self.addEventListener("activate", (event) => {
 });
 self.addEventListener("message", (event) => {
     if (event.data && event.data[ServiceWorkerHandShake] === true) {
-        _serviceWorkerScope = event.data.scope;
-        _targetDirToCwd = event.data.targetDirToCwd;
         _projectEndpoint = Project.fork(new MessageChannel(), event.source);
         _resolve();
     }
 });
 self.addEventListener("fetch", (event) => {
-    event.respondWith((async () => {
-        await _promise;
-        let { url: url_str, referrer } = event.request;
-        let url = new URL(url_str);
-        if (url.pathname.startsWith(_serviceWorkerScope) ||
-            (referrer && new URL(referrer).pathname.startsWith(_serviceWorkerScope))) {
-            const relativePathToCwd = (_targetDirToCwd !== null && _targetDirToCwd !== void 0 ? _targetDirToCwd : ".") +
-                url.pathname.replace(_serviceWorkerScope, "");
-            return readFileFromProject(relativePathToCwd);
+    let { url: urlStr } = event.request;
+    let url = new URL(urlStr);
+    if (typeof _serviceWorkerScope === "string") {
+        if (url.pathname.startsWith(_serviceWorkerScope)) {
+            event.respondWith((async () => {
+                await _promise;
+                const relativePathToCwd = (_targetDirToCwd !== null && _targetDirToCwd !== void 0 ? _targetDirToCwd : ".") +
+                    url.pathname.replace(_serviceWorkerScope, "");
+                return readFileFromProject(relativePathToCwd);
+            })());
         }
-        else {
-            return fetch(event.request);
-        }
-    })());
+    }
 });
 async function readFileFromProject(projectPath) {
     try {

package/esm/utoo/index.js

@@ -315,8 +315,8 @@ function passArray8ToWasm0(arg, malloc) {
 export function wasm_thread_entry_point(ptr) {
     wasm.wasm_thread_entry_point(ptr);
 }
-function __wbg_adapter_10(arg0, arg1) {
-    wasm.__wbindgen_export_6(arg0, arg1);
+function __wbg_adapter_4(arg0, arg1, arg2) {
+    wasm.__wbindgen_export_6(arg0, arg1, addHeapObject(arg2));
 }
 let stack_pointer = 128;
 function addBorrowedObject(obj) {
@@ -325,7 +325,7 @@ function addBorrowedObject(obj) {
     heap[--stack_pointer] = obj;
     return stack_pointer;
 }
-function __wbg_adapter_15(arg0, arg1, arg2) {
+function __wbg_adapter_7(arg0, arg1, arg2) {
     try {
         wasm.__wbindgen_export_7(arg0, arg1, addBorrowedObject(arg2));
     }
@@ -333,11 +333,11 @@ function __wbg_adapter_15(arg0, arg1, arg2) {
         heap[stack_pointer++] = undefined;
     }
 }
-function __wbg_adapter_18(arg0, arg1, arg2) {
+function __wbg_adapter_10(arg0, arg1, arg2) {
     wasm.__wbindgen_export_8(arg0, arg1, addHeapObject(arg2));
 }
-function __wbg_adapter_27(arg0, arg1, arg2) {
-    wasm.__wbindgen_export_9(arg0, arg1, addHeapObject(arg2));
+function __wbg_adapter_15(arg0, arg1) {
+    wasm.__wbindgen_export_9(arg0, arg1);
 }
 function __wbg_adapter_94(arg0, arg1, arg2, arg3) {
     wasm.__wbindgen_export_10(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
@@ -1627,12 +1627,12 @@ function __wbg_get_imports() {
     };
     imports.wbg.__wbindgen_cast_228b11ff07fcd80f = function (arg0, arg1) {
         // Cast intrinsic for `Closure(Closure { dtor_idx: 8687, function: Function { arguments: [], shim_idx: 600, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, 8687, __wbg_adapter_10);
+        const ret = makeMutClosure(arg0, arg1, 8687, __wbg_adapter_15);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_cast_3255823a0b603d96 = function (arg0, arg1) {
         // Cast intrinsic for `Closure(Closure { dtor_idx: 8661, function: Function { arguments: [Ref(NamedExternref("MessageEvent"))], shim_idx: 8685, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, 8661, __wbg_adapter_15);
+        const ret = makeMutClosure(arg0, arg1, 8661, __wbg_adapter_7);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_cast_4625c577ab2ec9ee = function (arg0) {
@@ -1642,12 +1642,12 @@ function __wbg_get_imports() {
     };
     imports.wbg.__wbindgen_cast_4c807b347a3d0cbf = function (arg0, arg1) {
         // Cast intrinsic for `Closure(Closure { dtor_idx: 599, function: Function { arguments: [], shim_idx: 600, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, 599, __wbg_adapter_10);
+        const ret = makeMutClosure(arg0, arg1, 599, __wbg_adapter_15);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_cast_535e935a655d72df = function (arg0, arg1) {
         // Cast intrinsic for `Closure(Closure { dtor_idx: 8680, function: Function { arguments: [Externref], shim_idx: 8681, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, 8680, __wbg_adapter_18);
+        const ret = makeMutClosure(arg0, arg1, 8680, __wbg_adapter_4);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_cast_76322aab70622876 = function (arg0, arg1) {
@@ -1676,12 +1676,12 @@ function __wbg_get_imports() {
     };
     imports.wbg.__wbindgen_cast_ded0188a991d8b3c = function (arg0, arg1) {
         // Cast intrinsic for `Closure(Closure { dtor_idx: 8680, function: Function { arguments: [NamedExternref("MessageEvent")], shim_idx: 8681, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, 8680, __wbg_adapter_18);
+        const ret = makeMutClosure(arg0, arg1, 8680, __wbg_adapter_4);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_cast_ffa04fbd359d627f = function (arg0, arg1) {
         // Cast intrinsic for `Closure(Closure { dtor_idx: 8661, function: Function { arguments: [NamedExternref("Array<any>")], shim_idx: 8662, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`.
-        const ret = makeClosure(arg0, arg1, 8661, __wbg_adapter_27);
+        const ret = makeClosure(arg0, arg1, 8661, __wbg_adapter_10);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_link_dd5153a359f2e504 = function (arg0) {