Merge pull request #399 from wasmerio/sdk-78-pass-the-import-url-to-t…

…he-worker-bootstrap-script-via-the

Pass the import URL to the worker bootstrap script via the `init` message

src/tasks/worker.js

@@ -14,9 +14,9 @@ let handleMessage = async data => {
 
 globalThis.onmessage = async ev => {
     if (ev.data.type == "init") {
-        const { memory, module, id } = ev.data;
+        const { memory, module, id, import_url } = ev.data;
         const imported = await import(
-            new URL("$IMPORT_META_URL", self.location.origin)
+            new URL(import_url, self.location.origin)
         );
 
         // HACK: How we load our imports will change depending on how the code

src/tasks/worker_handle.rs

@@ -132,6 +132,11 @@ fn init_message(id: u32) -> Result<JsValue, JsValue> {
     js_sys::Reflect::set(&msg, &JsString::from("type"), &JsString::from("init"))?;
     js_sys::Reflect::set(&msg, &JsString::from("memory"), &wasm_bindgen::memory())?;
     js_sys::Reflect::set(&msg, &JsString::from("id"), &JsValue::from(id))?;
+    js_sys::Reflect::set(
+        &msg,
+        &JsString::from("import_url"),
+        &JsValue::from(import_meta_url()),
+    )?;
     js_sys::Reflect::set(
         &msg,
         &JsString::from("module"),
@@ -141,8 +146,9 @@ fn init_message(id: u32) -> Result<JsValue, JsValue> {
     Ok(msg.into())
 }
 
-/// A data URL containing our worker's bootstrap script.
-static WORKER_URL: Lazy<String> = Lazy::new(|| {
+/// The URL used by the bootstrapping script to import the `wasm-bindgen` glue
+/// code.
+fn import_meta_url() -> String {
     #[wasm_bindgen]
     #[allow(non_snake_case)]
     extern "C" {
@@ -152,9 +158,13 @@ static WORKER_URL: Lazy<String> = Lazy::new(|| {
 
     let import_url = crate::CUSTOM_WORKER_URL.lock().unwrap();
     let import_url = import_url.as_deref().unwrap_or(IMPORT_META_URL.as_str());
-    tracing::trace!(import_url);
 
-    let script = include_str!("worker.js").replace("$IMPORT_META_URL", import_url);
+    import_url.to_string()
+}
+
+/// A data URL containing our worker's bootstrap script.
+static WORKER_URL: Lazy<String> = Lazy::new(|| {
+    let script = include_str!("worker.js");
 
     let blob = web_sys::Blob::new_with_u8_array_sequence_and_options(
         Array::from_iter([Uint8Array::from(script.as_bytes())]).as_ref(),

tests/directory.test.ts

@@ -10,7 +10,7 @@ const initialized = (async () => {
 })();
 
 describe("In-Memory Directory", function () {
-    this.beforeAll(async () => await initialized);
+    this.timeout("60s").beforeAll(async () => await initialized);
 
     it("read empty dir", async () => {
         const dir = new Directory();