make window available in web worker

tonbo-io · Nov 27, 2024 · af66ff6 · af66ff6
1 parent 4e7e7d0
commit af66ff6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/fusio/Cargo.toml b/fusio/Cargo.toml
@@ -124,6 +124,8 @@ web-sys = { version = "0.3", optional = true, features = [
     "Storage",
     "StorageManager",
     "Window",
+    "WorkerGlobalScope",
+    "WorkerNavigator",
 
 ] }
 

diff --git a/fusio/src/impls/disk/opfs/fs.rs b/fusio/src/impls/disk/opfs/fs.rs
@@ -19,7 +19,7 @@ use crate::{
     error::wasm_err,
     fs::{FileMeta, FileSystemTag, Fs, OpenOptions},
     path::Path,
-    Error, MaybeSend,
+    Error,
 };
 
 pub struct OPFS;
@@ -122,7 +122,7 @@ impl OPFS {
         path: &Path,
         options: &FileSystemGetDirectoryOptions,
     ) -> Result<FileSystemDirectoryHandle, Error> {
-        let mut parent = storage().await;
+        let mut parent = storage().await?;
         let segments: Vec<&str> = path.as_ref().trim_matches('/').split("/").collect();
 
         if segments.len() == 1 && segments[0].is_empty() {
@@ -148,7 +148,7 @@ impl OPFS {
         path: &Path,
         options: &FileSystemGetDirectoryOptions,
     ) -> Result<FileSystemDirectoryHandle, Error> {
-        let mut parent = storage().await;
+        let mut parent = storage().await?;
         let segments: Vec<&str> = path.as_ref().trim_matches('/').split("/").collect();
         let part_len = segments.len();
 

diff --git a/fusio/src/impls/disk/opfs/mod.rs b/fusio/src/impls/disk/opfs/mod.rs
@@ -8,7 +8,7 @@ use wasm_bindgen_futures::JsFuture;
 use web_sys::{
     wasm_bindgen::JsCast, window, File, FileSystemCreateWritableOptions, FileSystemDirectoryHandle,
     FileSystemFileHandle, FileSystemWritableFileStream, ReadableStreamDefaultReader,
-    ReadableStreamReadResult,
+    ReadableStreamReadResult, WorkerGlobalScope,
 };
 
 use crate::{error::wasm_err, Error, IoBuf, IoBufMut, Read, Write};
@@ -257,11 +257,18 @@ impl Read for OPFSFile {
     }
 }
 
-pub(crate) async fn storage() -> FileSystemDirectoryHandle {
-    let storage_promise = window().unwrap().navigator().storage().get_directory();
-    JsFuture::from(storage_promise)
-        .await
-        .unwrap()
-        .dyn_into::<FileSystemDirectoryHandle>()
-        .unwrap()
+pub(crate) async fn storage() -> Result<FileSystemDirectoryHandle, Error> {
+    let storage_promise = match window() {
+        Some(window) => window.navigator().storage(),
+        None => match js_sys::eval("self")
+            .unwrap()
+            .dyn_into::<WorkerGlobalScope>()
+        {
+            Ok(worker) => worker.navigator().storage(),
+            Err(err) => return Err(wasm_err(err)),
+        },
+    }
+    .get_directory();
+
+    promise::<FileSystemDirectoryHandle>(storage_promise).await
 }