feat(fs): improved API (#751)

* feat(fs): improved API * fmt * fix unix builds * again * clippy * clippy * fix import in docs examples * fmt, clippy * Update linux.rs * add API for watch * fix with `watcher` feature flag * use baseDir for all commands * do not export close function * fix build * organize and address review comments * fmt * generated files * rename FsFile to FileHandle, move APIs and docs * extend example * extend `Resource` * actually extend it --------- Co-authored-by: FabianLars <fabianlars@fabianlars.de> Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
1 year ago · 69a1fa099c
parent 2cf8faa3e1
commit 69a1fa099c
16 changed files with 2065 additions and 875 deletions
--- a/.changes/fs-improved-apis.md
+++ b/.changes/fs-improved-apis.md
@ -0,0 +1,6 @@
+---
+"fs": "patch"
+"fs-js": "patch"
+---
+
+The `fs` plugin received a major overhaul to add new APIs and changed existing APIs to be closer to Node.js and Deno APIs.
--- a/Cargo.lock
+++ b/Cargo.lock
@ -93,7 +93,7 @@ version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
 dependencies = [
- "getrandom 0.2.10",
+ "getrandom 0.2.11",
 "once_cell",
 "version_check",
 ]
@ -105,7 +105,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
 dependencies = [
 "cfg-if",
- "getrandom 0.2.10",
+ "getrandom 0.2.11",
 "once_cell",
 "version_check",
 "zerocopy",
@ -271,9 +271,9 @@ dependencies = [

 [[package]]
 name = "arboard"
-version = "3.2.1"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac57f2b058a76363e357c056e4f74f1945bf734d37b8b3ef49066c4787dde0fc"
+checksum = "aafb29b107435aa276664c1db8954ac27a6e105cdad3c88287a199eb0e313c08"
 dependencies = [
 "clipboard-win",
 "core-graphics 0.22.3",
@ -333,7 +333,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e"
 dependencies = [
 "concurrent-queue",
- "event-listener 3.0.1",
+ "event-listener 3.1.0",
 "event-listener-strategy",
 "futures-core",
 "pin-project-lite",
@ -341,9 +341,9 @@ dependencies = [

 [[package]]
 name = "async-compression"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2"
+checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5"
 dependencies = [
 "brotli",
 "flate2",
@ -355,11 +355,11 @@ dependencies = [

 [[package]]
 name = "async-executor"
-version = "1.7.0"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f9936333f3d84275cb4010514544ae7fe0847760f4a242e8ce603b358615cad"
+checksum = "fc5ea910c42e5ab19012bab31f53cb4d63d54c3a27730f9a833a88efcf4bb52d"
 dependencies = [
- "async-lock 3.0.0",
+ "async-lock 3.1.1",
 "async-task",
 "concurrent-queue",
 "fastrand 2.0.1",
@ -405,14 +405,14 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41ed9d5715c2d329bf1b4da8d60455b99b187f27ba726df2883799af9af60997"
 dependencies = [
- "async-lock 3.0.0",
+ "async-lock 3.1.1",
 "cfg-if",
 "concurrent-queue",
 "futures-io",
 "futures-lite 2.0.1",
 "parking",
 "polling 3.3.0",
- "rustix 0.38.21",
+ "rustix 0.38.25",
 "slab",
 "tracing",
 "waker-fn",
@ -430,11 +430,11 @@ dependencies = [

 [[package]]
 name = "async-lock"
-version = "3.0.0"
+version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45e900cdcd39bb94a14487d3f7ef92ca222162e6c7c3fe7cb3550ea75fb486ed"
+checksum = "655b9c7fe787d3b25cc0f804a1a8401790f0c5bc395beb5a64dc77d8de079105"
 dependencies = [
- "event-listener 3.0.1",
+ "event-listener 3.1.0",
 "event-listener-strategy",
 "pin-project-lite",
 ]
@ -450,9 +450,9 @@ dependencies = [
 "async-signal",
 "blocking",
 "cfg-if",
- "event-listener 3.0.1",
+ "event-listener 3.1.0",
 "futures-lite 1.13.0",
- "rustix 0.38.21",
+ "rustix 0.38.25",
 "windows-sys 0.48.0",
 ]

@ -479,7 +479,7 @@ dependencies = [
 "cfg-if",
 "futures-core",
 "futures-io",
- "rustix 0.38.21",
+ "rustix 0.38.25",
 "signal-hook-registry",
 "slab",
 "windows-sys 0.48.0",
@ -540,6 +540,16 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"

+[[package]]
+name = "atomic-write-file"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c232177ba50b16fe7a4588495bd474a62a9e45a8e4ca6fd7d0b7ac29d164631e"
+dependencies = [
+ "nix 0.26.4",
+ "rand 0.8.5",
+]
+
 [[package]]
 name = "authenticator"
 version = "0.3.1"
@ -683,12 +693,12 @@ dependencies = [

 [[package]]
 name = "blocking"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "864b30e660d766b7e9b47347d9b6558a17f1cfa22274034fa6f55b274b3e4620"
+checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118"
 dependencies = [
 "async-channel",
- "async-lock 3.0.0",
+ "async-lock 3.1.1",
 "async-task",
 "fastrand 2.0.1",
 "futures-io",
@ -813,12 +823,12 @@ dependencies = [

 [[package]]
 name = "cargo_toml"
-version = "0.17.1"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d1ece59890e746567b467253aea0adbe8a21784d0b025d8a306f66c391c2957"
+checksum = "6ca592ad99e6a0fd4b95153406138b997cc26ccd3cd0aecdfd4fbdbf1519bd77"
 dependencies = [
 "serde",
- "toml 0.8.6",
+ "toml 0.8.8",
 ]

 [[package]]
@ -938,18 +948,18 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.4.7"
+version = "4.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b"
+checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64"
 dependencies = [
 "clap_builder",
 ]

 [[package]]
 name = "clap_builder"
-version = "4.4.7"
+version = "4.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663"
+checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc"
 dependencies = [
 "anstream",
 "anstyle",
@ -1558,7 +1568,7 @@ checksum = "f54cc3e827ee1c3812239a9a41dede7b4d7d5d5464faa32d71bd7cba28ce2cb2"
 dependencies = [
 "cc",
 "rustc_version",
- "toml 0.8.6",
+ "toml 0.8.8",
 "vswhom",
 "winreg 0.51.0",
 ]
@ -1613,9 +1623,9 @@ dependencies = [

 [[package]]
 name = "env_logger"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
+checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece"
 dependencies = [
 "log",
 "regex",
@ -1629,9 +1639,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"

 [[package]]
 name = "errno"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
+checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8"
 dependencies = [
 "libc",
 "windows-sys 0.48.0",
@ -1666,9 +1676,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"

 [[package]]
 name = "event-listener"
-version = "3.0.1"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cec0252c2afff729ee6f00e903d479fba81784c8e2bd77447673471fdfaea1"
+checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2"
 dependencies = [
 "concurrent-queue",
 "parking",
@ -1681,7 +1691,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160"
 dependencies = [
- "event-listener 3.0.1",
+ "event-listener 3.1.0",
 "pin-project-lite",
 ]

@ -1924,7 +1934,11 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb"
 dependencies = [
+ "fastrand 2.0.1",
 "futures-core",
+ "futures-io",
+ "memchr",
+ "parking",
 "pin-project-lite",
 ]

@ -2102,9 +2116,9 @@ dependencies = [

 [[package]]
 name = "gethostname"
-version = "0.2.3"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e"
+checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177"
 dependencies = [
 "libc",
 "winapi",
@ -2133,9 +2147,9 @@ dependencies = [

 [[package]]
 name = "getrandom"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
 dependencies = [
 "cfg-if",
 "js-sys",
@ -2405,9 +2419,9 @@ dependencies = [

 [[package]]
 name = "h2"
-version = "0.3.21"
+version = "0.3.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
+checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178"
 dependencies = [
 "bytes 1.5.0",
 "fnv",
@ -2415,7 +2429,7 @@ dependencies = [
 "futures-sink",
 "futures-util",
 "http",
- "indexmap 1.9.3",
+ "indexmap 2.1.0",
 "slab",
 "tokio",
 "tokio-util",
@ -2553,9 +2567,9 @@ dependencies = [

 [[package]]
 name = "http"
-version = "0.2.9"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
 dependencies = [
 "bytes 1.5.0",
 "fnv",
@ -2823,7 +2837,7 @@ dependencies = [
 "digest 0.10.7",
 "ed25519-zebra",
 "generic-array",
- "getrandom 0.2.10",
+ "getrandom 0.2.11",
 "hmac",
 "pbkdf2",
 "serde",
@ -2903,7 +2917,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
 "hermit-abi",
- "rustix 0.38.21",
+ "rustix 0.38.25",
 "windows-sys 0.48.0",
 ]

@ -3154,9 +3168,9 @@ dependencies = [

 [[package]]
 name = "libsqlite3-sys"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326"
+checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716"
 dependencies = [
 "cc",
 "pkg-config",
@ -3206,9 +3220,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"

 [[package]]
 name = "linux-raw-sys"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
+checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"

 [[package]]
 name = "lock_api"
@ -3520,6 +3534,7 @@ dependencies = [
 "cfg-if",
 "libc",
 "memoffset 0.7.1",
+ "pin-utils",
 ]

 [[package]]
@ -3572,9 +3587,9 @@ dependencies = [

 [[package]]
 name = "notify-rust"
-version = "4.9.0"
+version = "4.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7b75c8958cb2eab3451538b32db8a7b74006abc33eb2e6a9a56d21e4775c2b"
+checksum = "827c5edfa80235ded4ab3fe8e9dc619b4f866ef16fe9b1c6b8a7f8692c0f2226"
 dependencies = [
 "log",
 "mac-notification-sys",
@ -4194,7 +4209,7 @@ dependencies = [
 "cfg-if",
 "concurrent-queue",
 "pin-project-lite",
- "rustix 0.38.21",
+ "rustix 0.38.25",
 "tracing",
 "windows-sys 0.48.0",
 ]
@ -4369,9 +4384,9 @@ dependencies = [

 [[package]]
 name = "quinn-proto"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1"
+checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a"
 dependencies = [
 "bytes 1.5.0",
 "rand 0.8.5",
@ -4466,7 +4481,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.10",
+ "getrandom 0.2.11",
 ]

 [[package]]
@ -4528,7 +4543,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
 dependencies = [
- "getrandom 0.2.10",
+ "getrandom 0.2.11",
 "libredox",
 "thiserror",
 ]
@ -4629,7 +4644,7 @@ dependencies = [
 "wasm-bindgen-futures",
 "wasm-streams",
 "web-sys",
- "webpki-roots 0.25.2",
+ "webpki-roots",
 "winreg 0.50.0",
 ]

@ -4688,7 +4703,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b"
 dependencies = [
 "cc",
- "getrandom 0.2.10",
+ "getrandom 0.2.11",
 "libc",
 "spin 0.9.8",
 "untrusted 0.9.0",
@ -4697,9 +4712,9 @@ dependencies = [

 [[package]]
 name = "rsa"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d"
+checksum = "6a3211b01eea83d80687da9eef70e39d65144a3894866a5153a2723e425a157f"
 dependencies = [
 "const-oid",
 "digest 0.10.7",
@ -4770,22 +4785,22 @@ dependencies = [

 [[package]]
 name = "rustix"
-version = "0.38.21"
+version = "0.38.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
+checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e"
 dependencies = [
 "bitflags 2.4.1",
 "errno",
 "libc",
- "linux-raw-sys 0.4.10",
+ "linux-raw-sys 0.4.11",
 "windows-sys 0.48.0",
 ]

 [[package]]
 name = "rustls"
-version = "0.21.8"
+version = "0.21.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c"
+checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9"
 dependencies = [
 "log",
 "ring 0.17.5",
@ -4807,9 +4822,9 @@ dependencies = [

 [[package]]
 name = "rustls-pemfile"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
 dependencies = [
 "base64 0.21.5",
 ]
@ -4948,18 +4963,18 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.190"
+version = "1.0.192"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
+checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.190"
+version = "1.0.192"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
+checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
 dependencies = [
 "proc-macro2",
 "quote",
@ -5135,9 +5150,9 @@ dependencies = [

 [[package]]
 name = "signature"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
 dependencies = [
 "digest 0.10.7",
 "rand_core 0.6.4",
@ -5183,9 +5198,9 @@ dependencies = [

 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"

 [[package]]
 name = "socket2"
@ -5271,9 +5286,9 @@ dependencies = [

 [[package]]
 name = "sqlx"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33"
+checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf"
 dependencies = [
 "sqlx-core",
 "sqlx-macros",
@ -5284,9 +5299,9 @@ dependencies = [

 [[package]]
 name = "sqlx-core"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d"
+checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd"
 dependencies = [
 "ahash 0.8.6",
 "atoi",
@ -5323,14 +5338,14 @@ dependencies = [
 "tokio-stream",
 "tracing",
 "url",
- "webpki-roots 0.24.0",
+ "webpki-roots",
 ]

 [[package]]
 name = "sqlx-macros"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec"
+checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5"
 dependencies = [
 "proc-macro2",
 "quote",
@ -5341,10 +5356,11 @@ dependencies = [

 [[package]]
 name = "sqlx-macros-core"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc"
+checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841"
 dependencies = [
+ "atomic-write-file",
 "dotenvy",
 "either",
 "heck",
@ -5367,9 +5383,9 @@ dependencies = [

 [[package]]
 name = "sqlx-mysql"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db"
+checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4"
 dependencies = [
 "atoi",
 "base64 0.21.5",
@ -5410,9 +5426,9 @@ dependencies = [

 [[package]]
 name = "sqlx-postgres"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624"
+checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24"
 dependencies = [
 "atoi",
 "base64 0.21.5",
@ -5450,9 +5466,9 @@ dependencies = [

 [[package]]
 name = "sqlx-sqlite"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f"
+checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490"
 dependencies = [
 "atoi",
 "flume",
@ -5469,6 +5485,7 @@ dependencies = [
 "time 0.3.30",
 "tracing",
 "url",
+ "urlencoding",
 ]

 [[package]]
@ -5677,7 +5694,7 @@ dependencies = [
 "cfg-expr",
 "heck",
 "pkg-config",
- "toml 0.8.6",
+ "toml 0.8.8",
 "version-compare",
 ]

@ -5762,7 +5779,7 @@ dependencies = [
 "dirs-next",
 "embed_plist",
 "futures-util",
- "getrandom 0.2.10",
+ "getrandom 0.2.11",
 "glob",
 "gtk",
 "heck",
@ -5984,8 +6001,10 @@ dependencies = [
 "notify",
 "notify-debouncer-mini",
 "serde",
+ "serde_repr",
 "tauri",
 "thiserror",
+ "url",
 "uuid",
 ]

@ -6323,7 +6342,7 @@ dependencies = [
 "brotli",
 "ctor",
 "dunce",
- "getrandom 0.2.10",
+ "getrandom 0.2.11",
 "glob",
 "heck",
 "html5ever",
@ -6374,7 +6393,7 @@ dependencies = [
 "cfg-if",
 "fastrand 2.0.1",
 "redox_syscall 0.4.1",
- "rustix 0.38.21",
+ "rustix 0.38.25",
 "windows-sys 0.48.0",
 ]

@ -6520,9 +6539,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.33.0"
+version = "1.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
+checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
 dependencies = [
 "backtrace",
 "bytes 1.5.0",
@ -6591,7 +6610,7 @@ dependencies = [
 "tokio-native-tls",
 "tokio-rustls",
 "tungstenite",
- "webpki-roots 0.25.2",
+ "webpki-roots",
 ]

 [[package]]
@ -6622,14 +6641,14 @@ dependencies = [

 [[package]]
 name = "toml"
-version = "0.8.6"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc"
+checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
 dependencies = [
 "serde",
 "serde_spanned",
 "toml_datetime",
- "toml_edit 0.20.7",
+ "toml_edit 0.21.0",
 ]

 [[package]]
@ -6659,6 +6678,17 @@ name = "toml_edit"
 version = "0.20.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
+dependencies = [
+ "indexmap 2.1.0",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
 dependencies = [
 "indexmap 2.1.0",
 "serde",
@ -6708,9 +6738,9 @@ dependencies = [

 [[package]]
 name = "tracing-log"
-version = "0.1.4"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
 dependencies = [
 "log",
 "once_cell",
@ -6719,9 +6749,9 @@ dependencies = [

 [[package]]
 name = "tracing-subscriber"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
 "matchers",
 "nu-ansi-term",
@ -6956,6 +6986,12 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "urlencoding"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+
 [[package]]
 name = "utf-8"
 version = "0.7.6"
@ -6964,9 +7000,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"

 [[package]]
 name = "utf8-width"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1"
+checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"

 [[package]]
 name = "utf8parse"
@ -6976,11 +7012,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"

 [[package]]
 name = "uuid"
-version = "1.5.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
+checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
 dependencies = [
- "getrandom 0.2.10",
+ "getrandom 0.2.11",
 ]

 [[package]]
@ -7218,15 +7254,6 @@ dependencies = [
 "system-deps",
 ]

-[[package]]
-name = "webpki-roots"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888"
-dependencies = [
- "rustls-webpki",
-]
-
 [[package]]
 name = "webpki-roots"
 version = "0.25.2"
@ -7365,14 +7392,15 @@ dependencies = [

 [[package]]
 name = "window-vibrancy"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5931735e675b972fada30c7a402915d4d827aa5ef6c929c133d640c4b785e963"
+checksum = "af6abc2b9c56bd95887825a1ce56cde49a2a97c07e28db465d541f5098a2656c"
 dependencies = [
 "cocoa 0.25.0",
 "objc",
 "raw-window-handle",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
+ "windows-version",
 ]

 [[package]]
@ -7815,12 +7843,12 @@ dependencies = [

 [[package]]
 name = "x11rb"
-version = "0.10.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507"
+checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a"
 dependencies = [
- "gethostname 0.2.3",
- "nix 0.24.3",
+ "gethostname 0.3.0",
+ "nix 0.26.4",
 "winapi",
 "winapi-wsapoll",
 "x11rb-protocol",
@ -7828,11 +7856,11 @@ dependencies = [

 [[package]]
 name = "x11rb-protocol"
-version = "0.10.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67"
+checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc"
 dependencies = [
- "nix 0.24.3",
+ "nix 0.26.4",
 ]

 [[package]]
@ -7933,18 +7961,18 @@ dependencies = [

 [[package]]
 name = "zerocopy"
-version = "0.7.25"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
 dependencies = [
 "zerocopy-derive",
 ]

 [[package]]
 name = "zerocopy-derive"
-version = "0.7.25"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
 dependencies = [
 "proc-macro2",
 "quote",
@ -7953,9 +7981,9 @@ dependencies = [

 [[package]]
 name = "zeroize"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
 dependencies = [
 "zeroize_derive",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@ -9,6 +9,7 @@ tauri = "2.0.0-alpha.20"
 tauri-build = "2.0.0-alpha.13"
 serde_json = "1"
 thiserror = "1"
+url = "2"

 [workspace.package]
 edition = "2021"
--- a/examples/api/src/App.svelte
+++ b/examples/api/src/App.svelte
@ -19,7 +19,7 @@
  import Scanner from "./views/Scanner.svelte";
  import Biometric from "./views/Biometric.svelte";

-  import { onMount } from "svelte";
+  import { onMount, tick } from "svelte";
  import { ask } from "@tauri-apps/plugin-dialog";
  import Nfc from "./views/Nfc.svelte";

@ -178,30 +178,35 @@

  // Console
  let messages = writable([]);
-  function onMessage(value) {
+  let consoleTextEl;
+  async function onMessage(value) {
    messages.update((r) => [
+      ...r,
      {
        html:
          `<pre><strong class="text-accent dark:text-darkAccent">[${new Date().toLocaleTimeString()}]:</strong> ` +
          (typeof value === "string" ? value : JSON.stringify(value, null, 1)) +
          "</pre>",
      },
-      ...r,
    ]);
+    await tick();
+    if (consoleTextEl) consoleTextEl.scrollTop = consoleTextEl.scrollHeight;
  }

  // this function is renders HTML without sanitizing it so it's insecure
  // we only use it with our own input data
-  function insecureRenderHtml(html) {
+  async function insecureRenderHtml(html) {
    messages.update((r) => [
+      ...r,
      {
        html:
          `<pre><strong class="text-accent dark:text-darkAccent">[${new Date().toLocaleTimeString()}]:</strong> ` +
          html +
          "</pre>",
      },
-      ...r,
    ]);
+    await tick();
+    if (consoleTextEl) consoleTextEl.scrollTop = consoleTextEl.scrollHeight;
  }

  function clear() {
@ -486,7 +491,7 @@
          <div class="i-codicon-clear-all" />
        </div>
      </div>
-      <div class="px-2 overflow-y-auto all:font-mono code-block all:text-xs">
+      <div bind:this={consoleTextEl} class="px-2 overflow-y-auto all:font-mono code-block all:text-xs select-text mr-2">
        {#each $messages as r}
          {@html r.html}
        {/each}
--- a/examples/api/src/views/Dialog.svelte
+++ b/examples/api/src/views/Dialog.svelte
@ -1,6 +1,6 @@
 <script>
  import { open, save, confirm } from "@tauri-apps/plugin-dialog";
-  import { readBinaryFile } from "@tauri-apps/plugin-fs";
+  import { readFile } from "@tauri-apps/plugin-fs";

  export let onMessage;
  export let insecureRenderHtml;
@ -55,7 +55,7 @@
        } else {
          var pathToRead = typeof res === "string" ? res : res.path;
          var isFile = pathToRead.match(/\S+\.\S+$/g);
-          readBinaryFile(pathToRead)
+          readFile(pathToRead)
            .then(function (response) {
              if (isFile) {
                if (
--- a/examples/api/src/views/FileSystem.svelte
+++ b/examples/api/src/views/FileSystem.svelte
@ -1,17 +1,14 @@
 <script>
-  import {
-    readBinaryFile,
-    writeTextFile,
-    readDir,
-    Dir,
-  } from "@tauri-apps/plugin-fs";
+  import * as fs from "@tauri-apps/plugin-fs";
  import { convertFileSrc } from "@tauri-apps/api/core";

  export let onMessage;
  export let insecureRenderHtml;

-  let pathToRead = "";
+  let path = "";
  let img;
+  let file;
+  let renameTo;

  function getDir() {
    const dirSelect = document.getElementById("dir");
@ -30,56 +27,123 @@
    reader.readAsDataURL(blob);
  }

-  const DirOptions = Object.keys(Dir)
+  const DirOptions = Object.keys(fs.BaseDirectory)
    .filter((key) => isNaN(parseInt(key)))
-    .map((dir) => [dir, Dir[dir]]);
+    .map((dir) => [dir, fs.BaseDirectory[dir]]);
+
+  function open() {
+    fs.open(path, {
+      baseDir: getDir(),
+      read: true,
+      write: true,
+      create: true,
+    })
+      .then((f) => {
+        file = f;
+        onMessage(`Opened ${path}`);
+      })
+      .catch(onMessage);
+  }
+
+  function mkdir() {
+    fs.mkdir(path, { baseDir: getDir() })
+      .then(() => {
+        onMessage(`Created dir ${path}`);
+      })
+      .catch(onMessage);
+  }
+
+  function remove() {
+    fs.remove(path, { baseDir: getDir() })
+      .then(() => {
+        onMessage(`Removed ${path}`);
+      })
+      .catch(onMessage);
+  }
+
+  function rename() {
+    fs.rename(path, renameTo, {
+      oldPathBaseDir: getDir(),
+      newPathBaseDir: getDir(),
+    })
+      .then(() => {
+        onMessage(`Renamed ${path} to ${renameTo}`);
+      })
+      .catch(onMessage);
+  }
+
+  function truncate() {
+    file
+      .truncate(0)
+      .then(() => {
+        onMessage(`Truncated file`);
+      })
+      .catch(onMessage);
+  }
+
+  function stat() {
+    file
+      .stat()
+      .then((stat) => {
+        onMessage(`File stat ${JSON.stringify(stat)}`);
+      })
+      .catch(onMessage);
+  }

  function read() {
-    const isFile = pathToRead.match(/\S+\.\S+$/g);
    const opts = {
-      dir: getDir(),
+      baseDir: getDir(),
    };
-    const promise = isFile
-      ? readBinaryFile(pathToRead, opts)
-      : readDir(pathToRead, opts);
-    promise
-      .then(function (response) {
-        if (isFile) {
-          if (pathToRead.includes(".png") || pathToRead.includes(".jpg")) {
-            arrayBufferToBase64(new Uint8Array(response), function (base64) {
-              const src = "data:image/png;base64," + base64;
-              insecureRenderHtml('<img src="' + src + '"></img>');
-            });
-          } else {
-            const value = String.fromCharCode.apply(null, response);
-            insecureRenderHtml(
-              '<textarea id="file-response"></textarea><button id="file-save">Save</button>'
-            );
-            setTimeout(() => {
-              const fileInput = document.getElementById("file-response");
-              fileInput.value = value;
-              document
-                .getElementById("file-save")
-                .addEventListener("click", function () {
-                  writeTextFile(pathToRead, fileInput.value, {
-                    dir: getDir(),
-                  }).catch(onMessage);
+    fs.stat(path, opts)
+      .then((stat) => {
+        const isFile = stat.isFile;
+
+        const promise = isFile
+          ? fs.readFile(path, opts)
+          : fs.readDir(path, opts);
+        promise
+          .then(function (response) {
+            if (isFile) {
+              if (path.includes(".png") || path.includes(".jpg")) {
+                arrayBufferToBase64(
+                  new Uint8Array(response),
+                  function (base64) {
+                    const src = "data:image/png;base64," + base64;
+                    insecureRenderHtml('<img src="' + src + '"></img>');
+                  }
+                );
+              } else {
+                const value = String.fromCharCode.apply(null, response);
+                insecureRenderHtml(
+                  '<textarea id="file-response"></textarea><button id="file-save">Save</button>'
+                );
+                setTimeout(() => {
+                  const fileInput = document.getElementById("file-response");
+                  fileInput.value = value;
+                  document
+                    .getElementById("file-save")
+                    .addEventListener("click", function () {
+                      fs.writeTextFile(path, fileInput.value, {
+                        dir: getDir(),
+                      }).catch(onMessage);
+                    });
                });
-            });
-          }
-        } else {
-          onMessage(response);
-        }
+              }
+            } else {
+              onMessage(response);
+            }
+          })
+          .catch(onMessage);
      })
      .catch(onMessage);
  }

  function setSrc() {
-    img.src = convertFileSrc(pathToRead);
+    img.src = convertFileSrc(path);
  }
 </script>

-<form class="flex flex-col" on:submit|preventDefault={read}>
+<div class="flex flex-col">
  <div class="flex gap-1">
    <select class="input" id="dir">
      <option value="">None</option>
@ -89,17 +153,29 @@
    </select>
    <input
      class="input grow"
-      id="path-to-read"
      placeholder="Type the path to read..."
-      bind:value={pathToRead}
+      bind:value={path}
    />
  </div>
  <br />
  <div>
-    <button class="btn" id="read">Read</button>
+    <button class="btn" on:click={open}>Open</button>
+    <button class="btn" on:click={read}>Read</button>
+    <button class="btn" on:click={mkdir}>Mkdir</button>
+    <button class="btn" on:click={remove}>Remove</button>
+    <div class="flex flex-row">
+      <button class="btn" on:click={rename}>Rename</button>
+      <input class="input" bind:value={renameTo} placeholder="To" />
+    </div>
    <button class="btn" type="button" on:click={setSrc}>Use as img src</button>
  </div>
-</form>
+  {#if file}
+    <div>
+      <button class="btn" on:click={truncate}>Truncate</button>
+      <button class="btn" on:click={stat}>Stat</button>
+    </div>
+  {/if}
+</div>

 <br />

--- a/plugins/deep-link/Cargo.toml
+++ b/plugins/deep-link/Cargo.toml
@ -9,9 +9,9 @@ rust-version = { workspace = true }
 links = "tauri-plugin-deep-link"

 [package.metadata.docs.rs]
-rustc-args = [ "--cfg", "docsrs" ]
-rustdoc-args = [ "--cfg", "docsrs" ]
-targets = [ "x86_64-linux-android" ]
+rustc-args = ["--cfg", "docsrs"]
+rustdoc-args = ["--cfg", "docsrs"]
+targets = ["x86_64-linux-android"]

 [build-dependencies]
 serde = { workspace = true }
@ -24,4 +24,4 @@ serde_json = { workspace = true }
 tauri = { workspace = true }
 log = { workspace = true }
 thiserror = { workspace = true }
-url = "2"
+url = { workspace = true }
--- a/plugins/fs/Cargo.toml
+++ b/plugins/fs/Cargo.toml
@ -13,8 +13,10 @@ rustdoc-args = [ "--cfg", "docsrs" ]

 [dependencies]
 serde = { workspace = true }
+serde_repr = "0.1"
 tauri = { workspace = true }
 thiserror = { workspace = true }
+url = { workspace = true }
 anyhow = "1"
 uuid = { version = "1", features = [ "v4" ] }
 glob = "0.3"
--- a/plugins/fs/guest-js/index.ts
+++ b/plugins/fs/guest-js/index.ts
--- a/plugins/fs/src/api-iife.js
+++ b/plugins/fs/src/api-iife.js
--- a/plugins/fs/src/commands.rs
+++ b/plugins/fs/src/commands.rs
--- a/plugins/fs/src/lib.rs
+++ b/plugins/fs/src/lib.rs
@ -49,17 +49,29 @@ pub fn init<R: Runtime>() -> TauriPlugin<R, Option<Config>> {
    PluginBuilder::<R, Option<Config>>::new("fs")
        .js_init_script(include_str!("api-iife.js").to_string())
        .invoke_handler(tauri::generate_handler![
+            commands::create,
+            commands::open,
+            commands::copy_file,
+            commands::close,
+            commands::mkdir,
+            commands::read_dir,
+            commands::read,
            commands::read_file,
            commands::read_text_file,
+            commands::read_text_file_lines,
+            commands::read_text_file_lines_next,
+            commands::remove,
+            commands::rename,
+            commands::seek,
+            commands::stat,
+            commands::lstat,
+            commands::fstat,
+            commands::truncate,
+            commands::ftruncate,
+            commands::write,
            commands::write_file,
-            commands::read_dir,
-            commands::copy_file,
-            commands::create_dir,
-            commands::remove_dir,
-            commands::remove_file,
-            commands::rename_file,
+            commands::write_text_file,
            commands::exists,
-            commands::metadata,
            #[cfg(feature = "watch")]
            watcher::watch,
            #[cfg(feature = "watch")]
@ -75,9 +87,6 @@ pub fn init<R: Runtime>() -> TauriPlugin<R, Option<Config>> {
                    .unwrap_or(&default_scope),
            )?);

-            #[cfg(feature = "watch")]
-            app.manage(watcher::WatcherCollection::default());
-
            Ok(())
        })
        .on_event(|app, event| {
--- a/plugins/fs/src/watcher.rs
+++ b/plugins/fs/src/watcher.rs
@ -5,12 +5,13 @@
 use notify::{Config, Event, RecommendedWatcher, RecursiveMode, Watcher};
 use notify_debouncer_mini::{new_debouncer, DebounceEventResult, Debouncer};
 use serde::Deserialize;
-use tauri::{command, ipc::Channel, State};
-
-use crate::Result;
+use tauri::{
+    ipc::Channel,
+    path::{BaseDirectory, SafePathBuf},
+    AppHandle, Manager, Resource, ResourceId, Runtime,
+};

 use std::{
-    collections::HashMap,
    path::PathBuf,
    sync::{
        mpsc::{channel, Receiver},
@ -20,10 +21,26 @@ use std::{
    time::Duration,
 };

-type Id = u32;
+use crate::commands::{resolve_path, CommandResult};
+
+struct InnerWatcher {
+    pub kind: WatcherKind,
+    paths: Vec<PathBuf>,
+}
+
+pub struct WatcherResource(Mutex<InnerWatcher>);
+impl WatcherResource {
+    fn new(kind: WatcherKind, paths: Vec<PathBuf>) -> Self {
+        Self(Mutex::new(InnerWatcher { kind, paths }))
+    }
+
+    fn with_lock<R, F: FnMut(&mut InnerWatcher) -> R>(&self, mut f: F) -> R {
+        let mut watcher = self.0.lock().unwrap();
+        f(&mut watcher)
+    }
+}

-#[derive(Default)]
-pub struct WatcherCollection(Mutex<HashMap<Id, (WatcherKind, Vec<PathBuf>)>>);
+impl Resource for WatcherResource {}

 enum WatcherKind {
    Debouncer(Debouncer<RecommendedWatcher>),
@ -55,63 +72,76 @@ fn watch_debounced(on_event: Channel, rx: Receiver<DebounceEventResult>) {
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct WatchOptions {
-    delay_ms: Option<u64>,
+    dir: Option<BaseDirectory>,
    recursive: bool,
+    delay_ms: Option<u64>,
 }

-#[command]
-pub async fn watch(
-    watchers: State<'_, WatcherCollection>,
-    id: Id,
-    paths: Vec<PathBuf>,
+#[tauri::command]
+pub async fn watch<R: Runtime>(
+    app: AppHandle<R>,
+    paths: Vec<SafePathBuf>,
    options: WatchOptions,
    on_event: Channel,
-) -> Result<()> {
+) -> CommandResult<ResourceId> {
+    let mut resolved_paths = Vec::with_capacity(paths.capacity());
+    for path in paths {
+        resolved_paths.push(resolve_path(&app, path, options.dir)?);
+    }
+
    let mode = if options.recursive {
        RecursiveMode::Recursive
    } else {
        RecursiveMode::NonRecursive
    };

-    let watcher = if let Some(delay) = options.delay_ms {
+    let kind = if let Some(delay) = options.delay_ms {
        let (tx, rx) = channel();
        let mut debouncer = new_debouncer(Duration::from_millis(delay), tx)?;
        let watcher = debouncer.watcher();
-        for path in &paths {
-            watcher.watch(path, mode)?;
+        for path in &resolved_paths {
+            watcher.watch(path.as_ref(), mode)?;
        }
        watch_debounced(on_event, rx);
        WatcherKind::Debouncer(debouncer)
    } else {
        let (tx, rx) = channel();
        let mut watcher = RecommendedWatcher::new(tx, Config::default())?;
-        for path in &paths {
-            watcher.watch(path, mode)?;
+        for path in &resolved_paths {
+            watcher.watch(path.as_ref(), mode)?;
        }
        watch_raw(on_event, rx);
        WatcherKind::Watcher(watcher)
    };

-    watchers.0.lock().unwrap().insert(id, (watcher, paths));
+    let rid = app
+        .resources_table()
+        .add(WatcherResource::new(kind, resolved_paths));

-    Ok(())
+    Ok(rid)
 }

-#[command]
-pub async fn unwatch(watchers: State<'_, WatcherCollection>, id: Id) -> Result<()> {
-    if let Some((watcher, paths)) = watchers.0.lock().unwrap().remove(&id) {
-        match watcher {
-            WatcherKind::Debouncer(mut debouncer) => {
-                for path in paths {
-                    debouncer.watcher().unwatch(&path)?
+#[tauri::command]
+pub async fn unwatch<R: Runtime>(app: AppHandle<R>, rid: ResourceId) -> CommandResult<()> {
+    let watcher = app.resources_table().take::<WatcherResource>(rid)?;
+    WatcherResource::with_lock(&watcher, |watcher| {
+        match &mut watcher.kind {
+            WatcherKind::Debouncer(ref mut debouncer) => {
+                for path in &watcher.paths {
+                    debouncer.watcher().unwatch(path.as_ref()).map_err(|e| {
+                        format!("failed to unwatch path: {} with error: {e}", path.display())
+                    })?
                }
            }
-            WatcherKind::Watcher(mut watcher) => {
-                for path in paths {
-                    watcher.unwatch(&path)?
+            WatcherKind::Watcher(ref mut w) => {
+                for path in &watcher.paths {
+                    w.unwatch(path.as_ref()).map_err(|e| {
+                        format!("failed to unwatch path: {} with error: {e}", path.display())
+                    })?
                }
            }
-        };
-    }
-    Ok(())
+        }
+
+        Ok(())
+    })
 }
--- a/plugins/http/Cargo.toml
+++ b/plugins/http/Cargo.toml
@ -20,7 +20,7 @@ tauri-plugin-fs = { path = "../fs", version = "2.0.0-alpha.5" }
 glob = "0.3"
 http = "0.2"
 reqwest = { version = "0.11", default-features = false }
-url = "2.4"
+url = { workspace = true }
 data-url = "0.3"

 [features]
--- a/plugins/single-instance/src/platform_impl/windows.rs
+++ b/plugins/single-instance/src/platform_impl/windows.rs
@ -119,7 +119,7 @@ unsafe extern "system" fn single_instance_window_proc<R: Runtime>(
                let data = CStr::from_ptr((*cds_ptr).lpData as _).to_string_lossy();
                let mut s = data.split('|');
                let cwd = s.next().unwrap();
-                let args = s.into_iter().map(|s| s.to_string()).collect();
+                let args = s.map(|s| s.to_string()).collect();
                callback(app_handle, args, cwd.to_string());
            }
            1
--- a/plugins/updater/Cargo.toml
+++ b/plugins/updater/Cargo.toml
@ -18,7 +18,7 @@ serde_json = { workspace = true }
 thiserror = { workspace = true }
 tokio = "1"
 reqwest = { version = "0.11", default-features = false, features = [ "json", "stream" ] }
-url = "2"
+url = { workspace = true }
 http = "0.2"
 dirs-next = "2"
 minisign-verify = "0.2"