allow web worker resource to be relative

fixes yewstack#2056
astraw · Sep 26, 2021 · bfcd71d · bfcd71d
1 parent 0e4be56
commit bfcd71d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/packages/yew-agent/src/lib.rs b/packages/yew-agent/src/lib.rs
@@ -53,6 +53,11 @@ pub trait Agent: Sized + 'static {
         "main.js"
     }
 
+    /// Indicates whether the name of the resource is relative.
+    fn name_of_resource_is_relative() -> bool {
+        false
+    }
+
     /// Signifies if resource is a module.
     /// This has pending browser support.
     fn is_module() -> bool {

diff --git a/packages/yew-agent/src/worker/mod.rs b/packages/yew-agent/src/worker/mod.rs
@@ -70,10 +70,23 @@ where
     worker.post_message_vec(msg);
 }
 
-fn worker_new(name_of_resource: &str, is_module: bool) -> Worker {
+fn worker_new(name_of_resource: &str, name_is_relative: bool, is_module: bool) -> Worker {
     let origin = yew::utils::origin().unwrap();
-    let script_url = format!("{}/{}", origin, name_of_resource);
-    let wasm_url = format!("{}/{}", origin, name_of_resource.replace(".js", "_bg.wasm"));
+    let pathname = yew::utils::window().location().pathname().unwrap();
+
+    let prefix = if name_is_relative {
+        // Location pathname always contains initial '/', so unwrap will never fail.
+        pathname.rsplit_once('/').unwrap().0
+    } else {
+        ""
+    };
+    let script_url = format!("{}{}/{}", origin, prefix, name_of_resource);
+    let wasm_url = format!(
+        "{}{}/{}",
+        origin,
+        prefix,
+        name_of_resource.replace(".js", "_bg.wasm")
+    );
     let array = Array::new();
     array.push(
         &format!(

diff --git a/packages/yew-agent/src/worker/private.rs b/packages/yew-agent/src/worker/private.rs
@@ -54,11 +54,12 @@ where
         };
 
         let name_of_resource = AGN::name_of_resource();
+        let is_relative = AGN::name_of_resource_is_relative();
         let handler_cell = Rc::new(RefCell::new(Some(handler)));
 
         let worker = {
             let handler_cell = handler_cell.clone();
-            let worker = worker_new(name_of_resource, AGN::is_module());
+            let worker = worker_new(name_of_resource, is_relative, AGN::is_module());
             let worker_clone = worker.clone();
             worker.set_onmessage_closure(move |data: Vec<u8>| {
                 if let Some(handler) = handler_cell.borrow().as_ref() {

diff --git a/packages/yew-agent/src/worker/public.rs b/packages/yew-agent/src/worker/public.rs
@@ -64,8 +64,9 @@ where
                         }
                     };
                     let name_of_resource = AGN::name_of_resource();
+                    let is_relative = AGN::name_of_resource_is_relative();
                     let worker = {
-                        let worker = worker_new(name_of_resource, AGN::is_module());
+                        let worker = worker_new(name_of_resource, is_relative, AGN::is_module());
                         let worker_clone = worker.clone();
                         worker.set_onmessage_closure(move |data: Vec<u8>| {
                             handler(data, &worker_clone);