fix(fs): support any UTF-8 path in writeFile (#1640)

SRutile · lucasfernog · web-flow · commit 9291e4d2caa3 · 2024-09-11T12:02:24.000-03:00
* In the `writeFile` function, when `options.baseDir` is not set, convert `path` to URL to avoid errors caused by Chinese characters.

* fmt

* use TextEncoder

* use percent encoding

* add change file

* fmt

---------

Co-authored-by: Lucas Nogueira &lt;lucas@tauri.studio&gt;
diff --git a/.changes/fs-write-file-utf8-chars.md b/.changes/fs-write-file-utf8-chars.md
@@ -0,0 +1,5 @@
+---
+"fs": patch
+---
+
+Support any UTF-8 character in the writeFile API.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/plugins/fs/Cargo.toml b/plugins/fs/Cargo.toml
@@ -31,6 +31,7 @@ glob = "0.3"
 notify = { version = "6", optional = true, features = ["serde"] }
 notify-debouncer-full = { version = "0.3", optional = true }
 dunce = { workspace = true }
+percent-encoding = "2"
 
 [features]
 watch = ["notify", "notify-debouncer-full"]
diff --git a/plugins/fs/api-iife.js b/plugins/fs/api-iife.js
diff --git a/plugins/fs/guest-js/index.ts b/plugins/fs/guest-js/index.ts
@@ -1015,7 +1015,7 @@ async function writeFile(
 
   await invoke('plugin:fs|write_file', data, {
     headers: {
-      path: path instanceof URL ? path.toString() : path,
+      path: encodeURIComponent(path instanceof URL ? path.toString() : path),
       options: JSON.stringify(options)
     }
   })
diff --git a/plugins/fs/src/commands.rs b/plugins/fs/src/commands.rs
@@ -855,10 +855,11 @@ pub async fn write_file<R: Runtime>(
         .get("path")
         .ok_or_else(|| anyhow::anyhow!("missing file path").into())
         .and_then(|p| {
-            p.to_str()
-                .map_err(|e| anyhow::anyhow!("invalid path: {e}").into())
+            percent_encoding::percent_decode(p.as_ref())
+                .decode_utf8()
+                .map_err(|_| anyhow::anyhow!("path is not a valid UTF-8").into())
         })
-        .and_then(|p| SafeFilePath::from_str(p).map_err(CommandError::from))?;
+        .and_then(|p| SafeFilePath::from_str(&p).map_err(CommandError::from))?;
     let options = request
         .headers()
         .get("options")

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"fs": patch
 +---
++
 +Support any UTF-8 character in the writeFile API.
Original file line number	Diff line number	Diff line change
`@@ -1015,7 +1015,7 @@ async function writeFile(`
`1015`	`1015`
`1016`	`1016`	`await invoke('plugin:fs\|write_file', data, {`
`1017`	`1017`	`headers: {`
`1018`		`- path: path instanceof URL ? path.toString() : path,`
	`1018`	`+ path: encodeURIComponent(path instanceof URL ? path.toString() : path),`
`1019`	`1019`	`options: JSON.stringify(options)`
`1020`	`1020`	`}`
`1021`	`1021`	`})`