feat(turbo-tasks-fs): enable fs watcher on wasm

Author: xusd320

Cargo.lock

@@ -387,6 +387,7 @@ napi = { version = "2", default-features = false, features = [
   "compat-mode",
 ] }
 notify = "8.1.0"
+notify-types = "2.0.0"
 once_cell = "1.17.1"
 owo-colors = "3.5.0"
 parcel_selectors = "0.28.2"

Cargo.toml

@@ -50,12 +50,13 @@ turbo-rcstr = { workspace = true }
 turbo-tasks = { workspace = true }
 turbo-tasks-hash = { workspace = true }
 urlencoding = { workspace = true }
+notify-types = { workspace = true }
 
 [target.'cfg(not(all(target_family = "wasm", target_os = "unknown")))'.dependencies]
 notify = { workspace = true }
 
 [target.'cfg(all(target_family = "wasm", target_os = "unknown"))'.dependencies]
-tokio-fs-ext = { version = "0.5.6", features = ["wasm_offload"] }
+tokio-fs-ext = { version = "0.6.0", features = ["opfs_offload", "opfs_watch"] }
 wasm_thread = { git = "https://github.com/utooland/wasm_thread.git", default-features = false, features = [
   "spawn_from_worker",
 ] }

turbopack/crates/turbo-tasks-fs/Cargo.toml

@@ -22,7 +22,6 @@ pub mod rope;
 pub mod source_context;
 pub mod util;
 pub(crate) mod virtual_fs;
-#[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
 mod watcher;
 use std::{
     borrow::Cow,
@@ -66,7 +65,6 @@ use turbo_tasks::{
 use turbo_tasks_hash::{DeterministicHash, DeterministicHasher, hash_xxh3_hash64};
 use util::{extract_disk_access, join_path, normalize_path, sys_to_unix, unix_to_sys};
 pub use virtual_fs::VirtualFileSystem;
-#[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
 use watcher::DiskWatcher;
 
 use self::{invalidation::Write, json::UnparsableJson, mutex_map::MutexMap};
@@ -245,7 +243,6 @@ struct DiskFileSystemInner {
     semaphore: tokio::sync::Semaphore,
 
     #[turbo_tasks(debug_ignore, trace_ignore)]
-    #[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
     watcher: DiskWatcher,
 }
 
@@ -387,7 +384,6 @@ impl DiskFileSystemInner {
     }
 
     #[tracing::instrument(level = "info", name = "start filesystem watching", skip_all, fields(path = %self.root))]
-    #[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
     async fn start_watching_internal(
         self: &Arc<Self>,
         report_invalidation_reason: bool,
@@ -396,6 +392,7 @@ impl DiskFileSystemInner {
         let root_path = self.root_path().to_path_buf();
 
         // create the directory for the filesystem on disk, if it doesn't exist
+        #[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
         retry_blocking(root_path.clone(), move |path| {
             let _tracing =
                 tracing::info_span!("create root directory", name = display(path.display()))
@@ -406,9 +403,20 @@ impl DiskFileSystemInner {
         .concurrency_limited(&self.semaphore)
         .await?;
 
+        #[cfg(all(target_family = "wasm", target_os = "unknown"))]
+        wasm_fs_offload::CLIENT
+            .create_dir_all(root_path.clone())
+            .await?;
+
+        #[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
         self.watcher
             .start_watching(self.clone(), report_invalidation_reason, poll_interval)?;
 
+        #[cfg(all(target_family = "wasm", target_os = "unknown"))]
+        self.watcher
+            .start_watching(self.clone(), report_invalidation_reason, poll_interval)
+            .await?;
+
         Ok(())
     }
 
@@ -469,14 +477,12 @@ impl DiskFileSystem {
         self.inner.invalidate_with_reason(reason);
     }
 
-    #[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
     pub async fn start_watching(&self, poll_interval: Option<Duration>) -> Result<()> {
         self.inner
             .start_watching_internal(false, poll_interval)
             .await
     }
 
-    #[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
     pub async fn start_watching_with_invalidation_reason(
         &self,
         poll_interval: Option<Duration>,
@@ -550,7 +556,6 @@ impl DiskFileSystem {
                 invalidator_map: InvalidatorMap::new(),
                 dir_invalidator_map: InvalidatorMap::new(),
                 semaphore: create_semaphore(),
-                #[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
                 watcher: DiskWatcher::new(
                     ignored_subpaths.into_iter().map(PathBuf::from).collect(),
                 ),

turbopack/crates/turbo-tasks-fs/src/lib.rs

@@ -1,7 +1,11 @@
-use std::sync::LazyLock;
+use std::{
+    path::{Path, PathBuf},
+    sync::LazyLock,
+};
 
 use anyhow::{Context, Result};
 use parking_lot::Mutex;
+use serde::{Deserialize, Serialize};
 use tokio::sync::oneshot;
 use tokio_fs_ext::offload::{self, FsOffload};