@utoo/web 0.0.1-alpha.14 → 0.0.1-alpha.15

package/esm/index.js

@@ -19,8 +19,8 @@ export class Project {
     constructor(options) {
         var _a, _b;
         _Project_tunnel.set(this, void 0);
-        const { cwd, workerUrl, wasmUrl, threadWorkerUrl, serviceWorkerOptions } = options;
-        this.serviceWorkerOptions = serviceWorkerOptions;
+        const { cwd, workerUrl, wasmUrl, threadWorkerUrl, serviceWorker } = options;
+        this.serviceWorkerOptions = serviceWorker;
         const { port1, port2 } = new MessageChannel();
         (_a = this.remote) !== null && _a !== void 0 ? _a : (this.remote = comlink.wrap(port1));
         if (!ProjectWorker) {
@@ -52,11 +52,12 @@ export class Project {
     async installServiceWorker() {
         var _a;
         if (this.serviceWorkerOptions) {
-            const { serviceWorkerUrl, proxiedResourcePath } = this.serviceWorkerOptions;
-            await navigator.serviceWorker.register(serviceWorkerUrl);
+            const { url, scope } = this.serviceWorkerOptions;
+            // Should add "Service-Worker-Allowed": "/" in page root response,
+            await navigator.serviceWorker.register(url, { scope: "/" });
             (_a = navigator.serviceWorker.controller) === null || _a === void 0 ? void 0 : _a.postMessage({
                 [ServiceWorkerHandShake]: true,
-                proxiedResourcePath,
+                scope,
             });
         }
     }

package/esm/serviceWorker.js

@@ -1,25 +1,24 @@
 import { Project } from ".";
 import { ServiceWorkerHandShake } from "./message";
-let __resolve__;
-let _promise__ = new Promise((resolve) => {
-    __resolve__ = resolve;
+let _resolve;
+let _promise = new Promise((resolve) => {
+    _resolve = resolve;
 });
-let projectEndpoint;
-let proxiedResourcePath;
+let _projectEndpoint;
+let _serviceWorkerScope;
 self.addEventListener("message", (event) => {
     if (event.data && event.data[ServiceWorkerHandShake] === true) {
-        proxiedResourcePath = event.data.proxiedResourcePath;
-        projectEndpoint = Project.fork(new MessageChannel(), event.source);
-        __resolve__();
+        _serviceWorkerScope = event.data.scope;
+        _projectEndpoint = Project.fork(new MessageChannel(), event.source);
+        _resolve();
     }
 });
 self.addEventListener("fetch", async (event) => {
     const { url, referrer } = event.request;
-    if (new URL(url).pathname.startsWith(`/${proxiedResourcePath}`) ||
-        (referrer &&
-            new URL(referrer).pathname.startsWith(`/${proxiedResourcePath}`))) {
-        await _promise__;
-        const projectPath = "." + new URL(url).pathname.replace(`/${proxiedResourcePath}`, "");
+    if (new URL(url).pathname.startsWith(_serviceWorkerScope) ||
+        (referrer && new URL(referrer).pathname.startsWith(_serviceWorkerScope))) {
+        await _promise;
+        const projectPath = "." + new URL(url).pathname.replace(_serviceWorkerScope, "");
         event.respondWith(readFileFromProject(projectPath));
     }
     else {
@@ -28,7 +27,7 @@ self.addEventListener("fetch", async (event) => {
 });
 async function readFileFromProject(projectPath) {
     try {
-        const content = await projectEndpoint.readFile(projectPath);
+        const content = await _projectEndpoint.readFile(projectPath);
         let mimeType = "application/octet-stream";
         if (projectPath.endsWith(".js")) {
             mimeType = "application/javascript";

package/esm/threadWorker.js

@@ -1,2 +1,4 @@
 import initWasm from "./utoo";
+// this is for wasm_thread to spawn new worker thread.
+// see: https://github.com/utooland/wasm_thread/blob/94438ff771ee0a6a55d79e49a655707970acb615/src/wasm32/js/web_worker.js#L10
 self.wasm_bindgen = initWasm;

package/esm/type.d.ts

@@ -29,9 +29,9 @@ export interface ProjectOptions {
     workerUrl?: string;
     threadWorkerUrl: string;
     wasmUrl?: string;
-    serviceWorkerOptions?: ServiceWorkerOptions;
+    serviceWorker?: ServiceWorkerOptions;
 }
 export interface ServiceWorkerOptions {
-    serviceWorkerUrl: string;
-    proxiedResourcePath: string;
+    url: string;
+    scope: string;
 }

package/esm/utoo/index.js

@@ -1150,27 +1150,27 @@ function __wbg_get_imports() {
         const ret = false;
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper163125 = function (arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper163109 = function (arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 9521, __wbg_adapter_49);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_closure_wrapper163127 = function (arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper163111 = function (arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 1976, __wbg_adapter_49);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_closure_wrapper168916 = function (arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper168917 = function (arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 9521, __wbg_adapter_49);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_closure_wrapper168970 = function (arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper168971 = function (arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 9524, __wbg_adapter_56);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_closure_wrapper168993 = function (arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper168994 = function (arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 9528, __wbg_adapter_46);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_closure_wrapper30076 = function (arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper30059 = function (arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 1976, __wbg_adapter_46);
         return addHeapObject(ret);
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utoo/web",
-  "version": "0.0.1-alpha.14",
+  "version": "0.0.1-alpha.15",
   "module": "esm/index.js",
   "types": "esm/index.d.ts",
   "files": [
@@ -30,5 +30,5 @@
   },
   "author": "xusd320",
   "license": "MIT",
-  "repository": "git@github.com:umijs/mako.git"
+  "repository": "git@github.com:utooland/utoo.git"
 }