From a252984cc68115d84e28c2103ffe3867ee7c6535 Mon Sep 17 00:00:00 2001 From: Guilherme Fontes Date: Mon, 22 Dec 2025 10:30:21 -0400 Subject: [PATCH 01/18] feat: start project ot_client --- .gitignore | 28 +- .vscode/extensions.json | 3 +- .vscode/settings.json | 2 + Cargo.lock | 5223 +++++++++++++++++ Cargo.toml | 4 + apps/client/README.md | 7 + apps/client/index.html | 14 + apps/client/package.json | 35 + apps/client/public/tauri.svg | 6 + apps/client/public/vite.svg | 1 + apps/client/src-tauri/.gitignore | 7 + apps/client/src-tauri/Cargo.lock | 5223 +++++++++++++++++ apps/client/src-tauri/Cargo.toml | 25 + apps/client/src-tauri/build.rs | 3 + .../src-tauri/capabilities/default.json | 10 + apps/client/src-tauri/icons/128x128.png | Bin 0 -> 3512 bytes apps/client/src-tauri/icons/128x128@2x.png | Bin 0 -> 7012 bytes apps/client/src-tauri/icons/32x32.png | Bin 0 -> 974 bytes .../src-tauri/icons/Square107x107Logo.png | Bin 0 -> 2863 bytes .../src-tauri/icons/Square142x142Logo.png | Bin 0 -> 3858 bytes .../src-tauri/icons/Square150x150Logo.png | Bin 0 -> 3966 bytes .../src-tauri/icons/Square284x284Logo.png | Bin 0 -> 7737 bytes .../src-tauri/icons/Square30x30Logo.png | Bin 0 -> 903 bytes .../src-tauri/icons/Square310x310Logo.png | Bin 0 -> 8591 bytes .../src-tauri/icons/Square44x44Logo.png | Bin 0 -> 1299 bytes .../src-tauri/icons/Square71x71Logo.png | Bin 0 -> 2011 bytes .../src-tauri/icons/Square89x89Logo.png | Bin 0 -> 2468 bytes apps/client/src-tauri/icons/StoreLogo.png | Bin 0 -> 1523 bytes apps/client/src-tauri/icons/icon.icns | Bin 0 -> 98451 bytes apps/client/src-tauri/icons/icon.ico | Bin 0 -> 86642 bytes apps/client/src-tauri/icons/icon.png | Bin 0 -> 14183 bytes apps/client/src-tauri/src/lib.rs | 14 + apps/client/src-tauri/src/main.rs | 6 + apps/client/src-tauri/tauri.conf.json | 35 + apps/client/src/App.tsx | 10 + apps/client/src/assets/react.svg | 1 + apps/client/src/game/GameStage.tsx | 174 + apps/client/src/game/movementSystem.ts | 25 + apps/client/src/global.css | 1 + apps/client/src/main.tsx | 13 + apps/client/src/store/game.ts | 116 + apps/client/src/vite-env.d.ts | 1 + apps/client/tsconfig.json | 25 + apps/client/tsconfig.node.json | 10 + apps/client/vite.config.ts | 32 + apps/web/package.json | 14 +- pnpm-lock.yaml | 565 +- pnpm-workspace.yaml | 9 + turbo.json | 2 +- 49 files changed, 11552 insertions(+), 92 deletions(-) create mode 100644 Cargo.lock create mode 100644 Cargo.toml create mode 100644 apps/client/README.md create mode 100644 apps/client/index.html create mode 100644 apps/client/package.json create mode 100644 apps/client/public/tauri.svg create mode 100644 apps/client/public/vite.svg create mode 100644 apps/client/src-tauri/.gitignore create mode 100644 apps/client/src-tauri/Cargo.lock create mode 100644 apps/client/src-tauri/Cargo.toml create mode 100644 apps/client/src-tauri/build.rs create mode 100644 apps/client/src-tauri/capabilities/default.json create mode 100644 apps/client/src-tauri/icons/128x128.png create mode 100644 apps/client/src-tauri/icons/128x128@2x.png create mode 100644 apps/client/src-tauri/icons/32x32.png create mode 100644 apps/client/src-tauri/icons/Square107x107Logo.png create mode 100644 apps/client/src-tauri/icons/Square142x142Logo.png create mode 100644 apps/client/src-tauri/icons/Square150x150Logo.png create mode 100644 apps/client/src-tauri/icons/Square284x284Logo.png create mode 100644 apps/client/src-tauri/icons/Square30x30Logo.png create mode 100644 apps/client/src-tauri/icons/Square310x310Logo.png create mode 100644 apps/client/src-tauri/icons/Square44x44Logo.png create mode 100644 apps/client/src-tauri/icons/Square71x71Logo.png create mode 100644 apps/client/src-tauri/icons/Square89x89Logo.png create mode 100644 apps/client/src-tauri/icons/StoreLogo.png create mode 100644 apps/client/src-tauri/icons/icon.icns create mode 100644 apps/client/src-tauri/icons/icon.ico create mode 100644 apps/client/src-tauri/icons/icon.png create mode 100644 apps/client/src-tauri/src/lib.rs create mode 100644 apps/client/src-tauri/src/main.rs create mode 100644 apps/client/src-tauri/tauri.conf.json create mode 100644 apps/client/src/App.tsx create mode 100644 apps/client/src/assets/react.svg create mode 100644 apps/client/src/game/GameStage.tsx create mode 100644 apps/client/src/game/movementSystem.ts create mode 100644 apps/client/src/global.css create mode 100644 apps/client/src/main.tsx create mode 100644 apps/client/src/store/game.ts create mode 100644 apps/client/src/vite-env.d.ts create mode 100644 apps/client/tsconfig.json create mode 100644 apps/client/tsconfig.node.json create mode 100644 apps/client/vite.config.ts diff --git a/.gitignore b/.gitignore index 5fd0e8a..9cff7f8 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ bundle-analysis.html dist .turbo .alchemy +target # envs .env @@ -25,4 +26,29 @@ __generated__ generated # Bun -*.bun-build \ No newline at end of file +*.bun-build + +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* +lerna-debug.log* + +node_modules +dist +dist-ssr +*.local + +# Editor directories and files +.vscode/* +!.vscode/extensions.json +.idea +.DS_Store +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 8b0915b..09f6090 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,3 +1,4 @@ { - "recommendations": ["biomejs.biome", "vstirbu.vscode-mermaid-preview", "usernamehw.errorlens", "oven.bun-vscode"] + "recommendations": ["biomejs.biome", "vstirbu.vscode-mermaid-preview", "usernamehw.errorlens", "oven.bun-vscode", "tauri-apps.tauri-vscode", "rust-lang.rust-analyzer"] + } \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 44891a0..fd320aa 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -41,6 +41,7 @@ "bullmq", "clienttype", "clientversion", + "clsx", "cmdk", "commitlint", "conninfo", @@ -208,6 +209,7 @@ "vipgrouplist", "vipgroups", "viplist", + "vitejs", "walkspeed", "warid", "wheeldata", diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 index 0000000..78ffbf2 --- /dev/null +++ b/Cargo.lock @@ -0,0 +1,5223 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "adler2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" + +[[package]] +name = "aho-corasick" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" + +[[package]] +name = "async-broadcast" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532" +dependencies = [ + "event-listener", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-channel" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "pin-project-lite", + "slab", +] + +[[package]] +name = "async-io" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc" +dependencies = [ + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite", + "parking", + "polling", + "rustix", + "slab", + "windows-sys 0.61.2", +] + +[[package]] +name = "async-lock" +version = "3.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc" +dependencies = [ + "event-listener", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75" +dependencies = [ + "async-channel", + "async-io", + "async-lock", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener", + "futures-lite", + "rustix", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "async-signal" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix", + "signal-hook-registry", + "slab", + "windows-sys 0.61.2", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "atk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "241b621213072e993be4f6f3a9e4b45f65b7e6faad43001be957184b7bb1824b" +dependencies = [ + "atk-sys", + "glib", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e48b684b0ca77d2bbadeef17424c2ea3c897d44d566a1617e7e8f30614d086" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" +dependencies = [ + "serde_core", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2 0.5.2", +] + +[[package]] +name = "block2" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" +dependencies = [ + "objc2 0.6.3", +] + +[[package]] +name = "blocking" +version = "1.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21" +dependencies = [ + "async-channel", + "async-task", + "futures-io", + "futures-lite", + "piper", +] + +[[package]] +name = "brotli" +version = "8.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bumpalo" +version = "3.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" + +[[package]] +name = "bytemuck" +version = "1.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" +dependencies = [ + "serde", +] + +[[package]] +name = "cairo-rs" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" +dependencies = [ + "bitflags 2.10.0", + "cairo-sys-rs", + "glib", + "libc", + "once_cell", + "thiserror 1.0.69", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "camino" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609" +dependencies = [ + "serde_core", +] + +[[package]] +name = "cargo-platform" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror 2.0.17", +] + +[[package]] +name = "cargo_toml" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77" +dependencies = [ + "serde", + "toml 0.9.8", +] + +[[package]] +name = "cc" +version = "1.2.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c481bdbf0ed3b892f6f806287d72acd515b352a4ec27a208489b8c1bc839633a" +dependencies = [ + "find-msvc-tools", + "shlex", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfb" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" +dependencies = [ + "byteorder", + "fnv", + "uuid", +] + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "chrono" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" +dependencies = [ + "iana-time-zone", + "num-traits", + "serde", + "windows-link 0.2.1", +] + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "cookie" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" +dependencies = [ + "time", + "version_check", +] + +[[package]] +name = "core-foundation" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "core-graphics" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" +dependencies = [ + "bitflags 2.10.0", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" +dependencies = [ + "bitflags 2.10.0", + "core-foundation", + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + +[[package]] +name = "crypto-common" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cssparser" +version = "0.29.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa", + "matches", + "phf 0.10.1", + "proc-macro2", + "quote", + "smallvec", + "syn 1.0.109", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn 2.0.111", +] + +[[package]] +name = "ctor" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" +dependencies = [ + "quote", + "syn 2.0.111", +] + +[[package]] +name = "darling" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.111", +] + +[[package]] +name = "darling_macro" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "deranged" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" +dependencies = [ + "powerfmt", + "serde_core", +] + +[[package]] +name = "derive_more" +version = "0.99.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 2.0.111", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.61.2", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dispatch2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "dlopen2" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d65cde5fb0c42a3d5882d99807698b459f5928de035fa7f547c784fb7b34219" +dependencies = [ + "dlopen2_derive", + "libc", + "once_cell", + "winapi", +] + +[[package]] +name = "dlopen2_derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95f4a04e1bfbfa4835a6073177aafb95ead4de0722dbb339195fdc7e0a09599b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "dpi" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76" +dependencies = [ + "serde", +] + +[[package]] +name = "dtoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04" + +[[package]] +name = "dtoa-short" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" +dependencies = [ + "dtoa", +] + +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + +[[package]] +name = "dyn-clone" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" + +[[package]] +name = "embed-resource" +version = "3.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55a075fc573c64510038d7ee9abc7990635863992f83ebc52c8b433b8411a02e" +dependencies = [ + "cc", + "memchr", + "rustc_version", + "toml 0.9.8", + "vswhom", + "winreg", +] + +[[package]] +name = "embed_plist" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" + +[[package]] +name = "endi" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66b7e2430c6dff6a955451e2cfc438f09cea1965a9d6f87f7e3b90decc014099" + +[[package]] +name = "enumflags2" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "equivalent" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + +[[package]] +name = "erased-serde" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89e8918065695684b2b0702da20382d5ae6065cf3327bc2d6436bd49a71ce9f3" +dependencies = [ + "serde", + "serde_core", + "typeid", +] + +[[package]] +name = "errno" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" +dependencies = [ + "libc", + "windows-sys 0.61.2", +] + +[[package]] +name = "event-listener" +version = "5.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" +dependencies = [ + "event-listener", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + +[[package]] +name = "fdeflate" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset", + "rustc_version", +] + +[[package]] +name = "find-msvc-tools" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" + +[[package]] +name = "flate2" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-executor" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-lite" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "gdk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9f245958c627ac99d8e529166f9823fb3b838d1d41fd2b297af3075093c2691" +dependencies = [ + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec" +dependencies = [ + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", + "once_cell", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c2d13f38594ac1e66619e188c6d5a1adb98d11b2fcf7894fc416ad76aa2f3f7" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps", +] + +[[package]] +name = "gdkwayland-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140071d506d223f7572b9f09b5e155afbd77428cd5cc7af8f2694c41d98dfe69" +dependencies = [ + "gdk-sys", + "glib-sys", + "gobject-sys", + "libc", + "pkg-config", + "system-deps", +] + +[[package]] +name = "gdkx11" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3caa00e14351bebbc8183b3c36690327eb77c49abc2268dd4bd36b856db3fbfe" +dependencies = [ + "gdk", + "gdkx11-sys", + "gio", + "glib", + "libc", + "x11", +] + +[[package]] +name = "gdkx11-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e7445fe01ac26f11601db260dd8608fe172514eb63b3b5e261ea6b0f4428d" +dependencies = [ + "gdk-sys", + "glib-sys", + "libc", + "system-deps", + "x11", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.1+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasip2", +] + +[[package]] +name = "gio" +version = "0.18.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys", + "glib", + "libc", + "once_cell", + "pin-project-lite", + "smallvec", + "thiserror 1.0.69", +] + +[[package]] +name = "gio-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "winapi", +] + +[[package]] +name = "glib" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" +dependencies = [ + "bitflags 2.10.0", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "once_cell", + "smallvec", + "thiserror 1.0.69", +] + +[[package]] +name = "glib-macros" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" +dependencies = [ + "heck 0.4.1", + "proc-macro-crate 2.0.2", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "glib-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "glob" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" + +[[package]] +name = "gobject-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gtk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd56fb197bfc42bd5d2751f4f017d44ff59fbb58140c6b49f9b3b2bdab08506a" +dependencies = [ + "atk", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf", + "gio", + "glib", + "gtk-sys", + "gtk3-macros", + "libc", + "pango", + "pkg-config", +] + +[[package]] +name = "gtk-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f29a1c21c59553eb7dd40e918be54dccd60c52b049b75119d5d96ce6b624414" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "gtk3-macros" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ff3c5b21f14f0736fed6dcfc0bfb4225ebf5725f3c0209edeec181e4d73e9d" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "html5ever" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7410cae13cbc75623c98ac4cbfd1f0bedddf3227afc24f370cf0f50a44a11c" +dependencies = [ + "log", + "mac", + "markup5ever", + "match_token", +] + +[[package]] +name = "http" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" +dependencies = [ + "bytes", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" + +[[package]] +name = "hyper" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" +dependencies = [ + "atomic-waker", + "bytes", + "futures-channel", + "futures-core", + "http", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "pin-utils", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-util" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e9a2a24dc5c6821e71a7030e1e14b7b632acac55c40e9d2e082c621261bb56" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http", + "http-body", + "hyper", + "ipnet", + "libc", + "percent-encoding", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "log", + "wasm-bindgen", + "windows-core 0.62.2", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ico" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc50b891e4acf8fe0e71ef88ec43ad82ee07b3810ad09de10f1d01f072ed4b98" +dependencies = [ + "byteorder", + "png", +] + +[[package]] +name = "icu_collections" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" +dependencies = [ + "displaydoc", + "potential_utf", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" +dependencies = [ + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" + +[[package]] +name = "icu_properties" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" +dependencies = [ + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" + +[[package]] +name = "icu_provider" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" +dependencies = [ + "displaydoc", + "icu_locale_core", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" +dependencies = [ + "equivalent", + "hashbrown 0.16.1", + "serde", + "serde_core", +] + +[[package]] +name = "infer" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a588916bfdfd92e71cacef98a63d9b1f0d74d6599980d11894290e7ddefffcf7" +dependencies = [ + "cfb", +] + +[[package]] +name = "ipnet" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" + +[[package]] +name = "iri-string" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "is-docker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] + +[[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] + +[[package]] +name = "itoa" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "javascriptcore-rs" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca5671e9ffce8ffba57afc24070e906da7fc4b1ba66f2cabebf61bf2ea257fcc" +dependencies = [ + "bitflags 1.3.2", + "glib", + "javascriptcore-rs-sys", +] + +[[package]] +name = "javascriptcore-rs-sys" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1be78d14ffa4b75b66df31840478fef72b51f8c2465d4ca7c194da9f7a5124" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror 1.0.69", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "js-sys" +version = "0.3.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "json-patch" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08" +dependencies = [ + "jsonptr", + "serde", + "serde_json", + "thiserror 1.0.69", +] + +[[package]] +name = "jsonptr" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dea2b27dd239b2556ed7a25ba842fe47fd602e7fc7433c2a8d6106d4d9edd70" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "keyboard-types" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" +dependencies = [ + "bitflags 2.10.0", + "serde", + "unicode-segmentation", +] + +[[package]] +name = "kuchikiki" +version = "0.8.8-speedreader" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02cb977175687f33fa4afa0c95c112b987ea1443e5a51c8f8ff27dc618270cc2" +dependencies = [ + "cssparser", + "html5ever", + "indexmap 2.12.1", + "selectors", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libappindicator" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a" +dependencies = [ + "glib", + "gtk", + "gtk-sys", + "libappindicator-sys", + "log", +] + +[[package]] +name = "libappindicator-sys" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" +dependencies = [ + "gtk-sys", + "libloading", + "once_cell", +] + +[[package]] +name = "libc" +version = "0.2.178" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libredox" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" +dependencies = [ + "bitflags 2.10.0", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" + +[[package]] +name = "litemap" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" + +[[package]] +name = "lock_api" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "markup5ever" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7a7213d12e1864c0f002f52c2923d4556935a43dec5e71355c2760e0f6e7a18" +dependencies = [ + "log", + "phf 0.11.3", + "phf_codegen 0.11.3", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "match_token" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "memchr" +version = "2.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "miclient" +version = "0.1.0" +dependencies = [ + "serde", + "serde_json", + "tauri", + "tauri-build", + "tauri-plugin-opener", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "miniz_oxide" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" +dependencies = [ + "adler2", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" +dependencies = [ + "libc", + "wasi 0.11.1+wasi-snapshot-preview1", + "windows-sys 0.61.2", +] + +[[package]] +name = "muda" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01c1738382f66ed56b3b9c8119e794a2e23148ac8ea214eda86622d4cb9d415a" +dependencies = [ + "crossbeam-channel", + "dpi", + "gtk", + "keyboard-types", + "objc2 0.6.3", + "objc2-app-kit", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "once_cell", + "png", + "serde", + "thiserror 2.0.17", + "windows-sys 0.60.2", +] + +[[package]] +name = "ndk" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" +dependencies = [ + "bitflags 2.10.0", + "jni-sys", + "log", + "ndk-sys", + "num_enum", + "raw-window-handle", + "thiserror 1.0.69", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.6.0+11769913" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nix" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" +dependencies = [ + "bitflags 2.10.0", + "cfg-if", + "cfg_aliases", + "libc", + "memoffset", +] + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_enum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c" +dependencies = [ + "num_enum_derive", + "rustversion", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7" +dependencies = [ + "proc-macro-crate 3.4.0", + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05" +dependencies = [ + "objc2-encode", + "objc2-exception-helper", +] + +[[package]] +name = "objc2-app-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" +dependencies = [ + "bitflags 2.10.0", + "block2 0.6.2", + "libc", + "objc2 0.6.3", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-core-image", + "objc2-core-text", + "objc2-core-video", + "objc2-foundation 0.3.2", + "objc2-quartz-core 0.3.2", +] + +[[package]] +name = "objc2-cloud-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", + "objc2-foundation 0.3.2", +] + +[[package]] +name = "objc2-core-data" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", + "objc2-foundation 0.3.2", +] + +[[package]] +name = "objc2-core-foundation" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" +dependencies = [ + "bitflags 2.10.0", + "dispatch2", + "objc2 0.6.3", +] + +[[package]] +name = "objc2-core-graphics" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" +dependencies = [ + "bitflags 2.10.0", + "dispatch2", + "objc2 0.6.3", + "objc2-core-foundation", + "objc2-io-surface", +] + +[[package]] +name = "objc2-core-image" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006" +dependencies = [ + "objc2 0.6.3", + "objc2-foundation 0.3.2", +] + +[[package]] +name = "objc2-core-text" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", + "objc2-core-foundation", + "objc2-core-graphics", +] + +[[package]] +name = "objc2-core-video" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-io-surface", +] + +[[package]] +name = "objc2-encode" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" + +[[package]] +name = "objc2-exception-helper" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7a1c5fbb72d7735b076bb47b578523aedc40f3c439bea6dfd595c089d79d98a" +dependencies = [ + "cc", +] + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.10.0", + "block2 0.5.1", + "libc", + "objc2 0.5.2", +] + +[[package]] +name = "objc2-foundation" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" +dependencies = [ + "bitflags 2.10.0", + "block2 0.6.2", + "libc", + "objc2 0.6.3", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-io-surface" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-javascript-core" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a1e6550c4caed348956ce3370c9ffeca70bb1dbed4fa96112e7c6170e074586" +dependencies = [ + "objc2 0.6.3", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.10.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation 0.2.2", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.10.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation 0.2.2", + "objc2-metal", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", + "objc2-foundation 0.3.2", +] + +[[package]] +name = "objc2-security" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "709fe137109bd1e8b5a99390f77a7d8b2961dafc1a1c5db8f2e60329ad6d895a" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", + "objc2-core-foundation", + "objc2-foundation 0.3.2", +] + +[[package]] +name = "objc2-web-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f" +dependencies = [ + "bitflags 2.10.0", + "block2 0.6.2", + "objc2 0.6.3", + "objc2-app-kit", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "objc2-javascript-core", + "objc2-security", +] + +[[package]] +name = "once_cell" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "open" +version = "5.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43bb73a7fa3799b198970490a51174027ba0d4ec504b03cd08caf513d40024bc" +dependencies = [ + "dunce", + "is-wsl", + "libc", + "pathdiff", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "pango" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" +dependencies = [ + "gio", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + +[[package]] +name = "parking_lot" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-link 0.2.1", +] + +[[package]] +name = "pathdiff" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" + +[[package]] +name = "percent-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" + +[[package]] +name = "phf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_shared 0.8.0", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_macros 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", +] + +[[package]] +name = "phf" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" +dependencies = [ + "phf_macros 0.11.3", + "phf_shared 0.11.3", +] + +[[package]] +name = "phf_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_codegen" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" +dependencies = [ + "phf_generator 0.11.3", + "phf_shared 0.11.3", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.5", +] + +[[package]] +name = "phf_generator" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" +dependencies = [ + "phf_shared 0.11.3", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "phf_macros" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" +dependencies = [ + "phf_generator 0.11.3", + "phf_shared 0.11.3", + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher 0.3.11", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher 0.3.11", +] + +[[package]] +name = "phf_shared" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" +dependencies = [ + "siphasher 1.0.1", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" +dependencies = [ + "atomic-waker", + "fastrand", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + +[[package]] +name = "plist" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07" +dependencies = [ + "base64 0.22.1", + "indexmap 2.12.1", + "quick-xml", + "serde", + "time", +] + +[[package]] +name = "png" +version = "0.17.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "3.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi", + "pin-project-lite", + "rustix", + "windows-sys 0.61.2", +] + +[[package]] +name = "potential_utf" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" +dependencies = [ + "zerovec", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" +dependencies = [ + "toml_datetime 0.6.3", + "toml_edit 0.20.2", +] + +[[package]] +name = "proc-macro-crate" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" +dependencies = [ + "toml_edit 0.23.7", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.38.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", + "rand_pcg", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.16", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "raw-window-handle" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + +[[package]] +name = "redox_syscall" +version = "0.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" +dependencies = [ + "bitflags 2.10.0", +] + +[[package]] +name = "redox_users" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" +dependencies = [ + "getrandom 0.2.16", + "libredox", + "thiserror 2.0.17", +] + +[[package]] +name = "ref-cast" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "regex" +version = "1.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" + +[[package]] +name = "reqwest" +version = "0.12.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "js-sys", + "log", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-util", + "tower", + "tower-http", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", +] + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" +dependencies = [ + "bitflags 2.10.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.61.2", +] + +[[package]] +name = "rustversion" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + +[[package]] +name = "ryu" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schemars" +version = "0.8.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615" +dependencies = [ + "dyn-clone", + "indexmap 1.9.3", + "schemars_derive", + "serde", + "serde_json", + "url", + "uuid", +] + +[[package]] +name = "schemars" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + +[[package]] +name = "schemars" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9558e172d4e8533736ba97870c4b2cd63f84b382a3d6eb063da41b91cce17289" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + +[[package]] +name = "schemars_derive" +version = "0.8.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.111", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "selectors" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416" +dependencies = [ + "bitflags 1.3.2", + "cssparser", + "derive_more", + "fxhash", + "log", + "phf 0.8.0", + "phf_codegen 0.8.0", + "precomputed-hash", + "servo_arc", + "smallvec", +] + +[[package]] +name = "semver" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" +dependencies = [ + "serde", + "serde_core", +] + +[[package]] +name = "serde" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde-untagged" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9faf48a4a2d2693be24c6289dbe26552776eb7737074e6722891fadbe6c5058" +dependencies = [ + "erased-serde", + "serde", + "serde_core", + "typeid", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "serde_json" +version = "1.0.145" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", + "serde_core", +] + +[[package]] +name = "serde_repr" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "serde_spanned" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_spanned" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392" +dependencies = [ + "serde_core", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "3.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.12.1", + "schemars 0.9.0", + "schemars 1.1.0", + "serde_core", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52a8e3ca0ca629121f70ab50f95249e5a6f925cc0f6ffe8256c45b728875706c" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "serialize-to-javascript" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04f3666a07a197cdb77cdf306c32be9b7f598d7060d50cfd4d5aa04bfd92f6c5" +dependencies = [ + "serde", + "serde_json", + "serialize-to-javascript-impl", +] + +[[package]] +name = "serialize-to-javascript-impl" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "servo_arc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741" +dependencies = [ + "nodrop", + "stable_deref_trait", +] + +[[package]] +name = "sha2" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + +[[package]] +name = "slab" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" + +[[package]] +name = "smallvec" +version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" + +[[package]] +name = "socket2" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" +dependencies = [ + "libc", + "windows-sys 0.60.2", +] + +[[package]] +name = "softbuffer" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18051cdd562e792cad055119e0cdb2cfc137e44e3987532e0f9659a77931bb08" +dependencies = [ + "bytemuck", + "cfg_aliases", + "core-graphics", + "foreign-types", + "js-sys", + "log", + "objc2 0.5.2", + "objc2-foundation 0.2.2", + "objc2-quartz-core 0.2.2", + "raw-window-handle", + "redox_syscall", + "wasm-bindgen", + "web-sys", + "windows-sys 0.59.0", +] + +[[package]] +name = "soup3" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "471f924a40f31251afc77450e781cb26d55c0b650842efafc9c6cbd2f7cc4f9f" +dependencies = [ + "futures-channel", + "gio", + "glib", + "libc", + "soup3-sys", +] + +[[package]] +name = "soup3-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ebe8950a680a12f24f15ebe1bf70db7af98ad242d9db43596ad3108aab86c27" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "string_cache" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f" +dependencies = [ + "new_debug_unreachable", + "parking_lot", + "phf_shared 0.11.3", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0" +dependencies = [ + "phf_generator 0.11.3", + "phf_shared 0.11.3", + "proc-macro2", + "quote", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "swift-rs" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4057c98e2e852d51fdcfca832aac7b571f6b351ad159f9eda5db1655f8d0c4d7" +dependencies = [ + "base64 0.21.7", + "serde", + "serde_json", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.111" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] + +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr", + "heck 0.5.0", + "pkg-config", + "toml 0.8.2", + "version-compare", +] + +[[package]] +name = "tao" +version = "0.34.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a753bdc39c07b192151523a3f77cd0394aa75413802c883a0f6f6a0e5ee2e7" +dependencies = [ + "bitflags 2.10.0", + "block2 0.6.2", + "core-foundation", + "core-graphics", + "crossbeam-channel", + "dispatch", + "dlopen2", + "dpi", + "gdkwayland-sys", + "gdkx11-sys", + "gtk", + "jni", + "lazy_static", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "objc2 0.6.3", + "objc2-app-kit", + "objc2-foundation 0.3.2", + "once_cell", + "parking_lot", + "raw-window-handle", + "scopeguard", + "tao-macros", + "unicode-segmentation", + "url", + "windows", + "windows-core 0.61.2", + "windows-version", + "x11-dl", +] + +[[package]] +name = "tao-macros" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "tauri" +version = "2.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15524fc7959bfcaa051ba6d0b3fb1ef18e978de2176c7c6acb977f7fd14d35c7" +dependencies = [ + "anyhow", + "bytes", + "cookie", + "dirs", + "dunce", + "embed_plist", + "getrandom 0.3.4", + "glob", + "gtk", + "heck 0.5.0", + "http", + "jni", + "libc", + "log", + "mime", + "muda", + "objc2 0.6.3", + "objc2-app-kit", + "objc2-foundation 0.3.2", + "objc2-ui-kit", + "objc2-web-kit", + "percent-encoding", + "plist", + "raw-window-handle", + "reqwest", + "serde", + "serde_json", + "serde_repr", + "serialize-to-javascript", + "swift-rs", + "tauri-build", + "tauri-macros", + "tauri-runtime", + "tauri-runtime-wry", + "tauri-utils", + "thiserror 2.0.17", + "tokio", + "tray-icon", + "url", + "webkit2gtk", + "webview2-com", + "window-vibrancy", + "windows", +] + +[[package]] +name = "tauri-build" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17fcb8819fd16463512a12f531d44826ce566f486d7ccd211c9c8cebdaec4e08" +dependencies = [ + "anyhow", + "cargo_toml", + "dirs", + "glob", + "heck 0.5.0", + "json-patch", + "schemars 0.8.22", + "semver", + "serde", + "serde_json", + "tauri-utils", + "tauri-winres", + "toml 0.9.8", + "walkdir", +] + +[[package]] +name = "tauri-codegen" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa9844cefcf99554a16e0a278156ae73b0d8680bbc0e2ad1e4287aadd8489cf" +dependencies = [ + "base64 0.22.1", + "brotli", + "ico", + "json-patch", + "plist", + "png", + "proc-macro2", + "quote", + "semver", + "serde", + "serde_json", + "sha2", + "syn 2.0.111", + "tauri-utils", + "thiserror 2.0.17", + "time", + "url", + "uuid", + "walkdir", +] + +[[package]] +name = "tauri-macros" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3764a12f886d8245e66b7ee9b43ccc47883399be2019a61d80cf0f4117446fde" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.111", + "tauri-codegen", + "tauri-utils", +] + +[[package]] +name = "tauri-plugin" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1d0a4860b7ff570c891e1d2a586bf1ede205ff858fbc305e0b5ae5d14c1377" +dependencies = [ + "anyhow", + "glob", + "plist", + "schemars 0.8.22", + "serde", + "serde_json", + "tauri-utils", + "toml 0.9.8", + "walkdir", +] + +[[package]] +name = "tauri-plugin-opener" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c26b72571d25dee25667940027114e60f569fc3974f8cefbe50c2cbc5fd65e3b" +dependencies = [ + "dunce", + "glob", + "objc2-app-kit", + "objc2-foundation 0.3.2", + "open", + "schemars 0.8.22", + "serde", + "serde_json", + "tauri", + "tauri-plugin", + "thiserror 2.0.17", + "url", + "windows", + "zbus", +] + +[[package]] +name = "tauri-runtime" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f766fe9f3d1efc4b59b17e7a891ad5ed195fa8d23582abb02e6c9a01137892" +dependencies = [ + "cookie", + "dpi", + "gtk", + "http", + "jni", + "objc2 0.6.3", + "objc2-ui-kit", + "objc2-web-kit", + "raw-window-handle", + "serde", + "serde_json", + "tauri-utils", + "thiserror 2.0.17", + "url", + "webkit2gtk", + "webview2-com", + "windows", +] + +[[package]] +name = "tauri-runtime-wry" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7950f3bde6bcca6655bc5e76d3d6ec587ceb81032851ab4ddbe1f508bdea2729" +dependencies = [ + "gtk", + "http", + "jni", + "log", + "objc2 0.6.3", + "objc2-app-kit", + "objc2-foundation 0.3.2", + "once_cell", + "percent-encoding", + "raw-window-handle", + "softbuffer", + "tao", + "tauri-runtime", + "tauri-utils", + "url", + "webkit2gtk", + "webview2-com", + "windows", + "wry", +] + +[[package]] +name = "tauri-utils" +version = "2.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a423c51176eb3616ee9b516a9fa67fed5f0e78baaba680e44eb5dd2cc37490" +dependencies = [ + "anyhow", + "brotli", + "cargo_metadata", + "ctor", + "dunce", + "glob", + "html5ever", + "http", + "infer", + "json-patch", + "kuchikiki", + "log", + "memchr", + "phf 0.11.3", + "proc-macro2", + "quote", + "regex", + "schemars 0.8.22", + "semver", + "serde", + "serde-untagged", + "serde_json", + "serde_with", + "swift-rs", + "thiserror 2.0.17", + "toml 0.9.8", + "url", + "urlpattern", + "uuid", + "walkdir", +] + +[[package]] +name = "tauri-winres" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1087b111fe2b005e42dbdc1990fc18593234238d47453b0c99b7de1c9ab2c1e0" +dependencies = [ + "dunce", + "embed-resource", + "toml 0.9.8", +] + +[[package]] +name = "tempfile" +version = "3.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" +dependencies = [ + "fastrand", + "getrandom 0.3.4", + "once_cell", + "rustix", + "windows-sys 0.61.2", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +dependencies = [ + "thiserror-impl 2.0.17", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "time" +version = "0.3.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" + +[[package]] +name = "time-macros" +version = "0.2.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinystr" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tokio" +version = "1.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" +dependencies = [ + "bytes", + "libc", + "mio", + "pin-project-lite", + "socket2", + "windows-sys 0.61.2", +] + +[[package]] +name = "tokio-util" +version = "0.7.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +dependencies = [ + "serde", + "serde_spanned 0.6.9", + "toml_datetime 0.6.3", + "toml_edit 0.20.2", +] + +[[package]] +name = "toml" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8" +dependencies = [ + "indexmap 2.12.1", + "serde_core", + "serde_spanned 1.0.3", + "toml_datetime 0.7.3", + "toml_parser", + "toml_writer", + "winnow 0.7.14", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_datetime" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533" +dependencies = [ + "serde_core", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.12.1", + "toml_datetime 0.6.3", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +dependencies = [ + "indexmap 2.12.1", + "serde", + "serde_spanned 0.6.9", + "toml_datetime 0.6.3", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.23.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d" +dependencies = [ + "indexmap 2.12.1", + "toml_datetime 0.7.3", + "toml_parser", + "winnow 0.7.14", +] + +[[package]] +name = "toml_parser" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e" +dependencies = [ + "winnow 0.7.14", +] + +[[package]] +name = "toml_writer" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2" + +[[package]] +name = "tower" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf146f99d442e8e68e585f5d798ccd3cad9a7835b917e09728880a862706456" +dependencies = [ + "bitflags 2.10.0", + "bytes", + "futures-util", + "http", + "http-body", + "iri-string", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "tracing-core" +version = "0.1.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c" +dependencies = [ + "once_cell", +] + +[[package]] +name = "tray-icon" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d5572781bee8e3f994d7467084e1b1fd7a93ce66bd480f8156ba89dee55a2b" +dependencies = [ + "crossbeam-channel", + "dirs", + "libappindicator", + "muda", + "objc2 0.6.3", + "objc2-app-kit", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-foundation 0.3.2", + "once_cell", + "png", + "serde", + "thiserror 2.0.17", + "windows-sys 0.60.2", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typeid" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" + +[[package]] +name = "typenum" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset", + "tempfile", + "winapi", +] + +[[package]] +name = "unic-char-property" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +dependencies = [ + "unic-char-range", +] + +[[package]] +name = "unic-char-range" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" + +[[package]] +name = "unic-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" + +[[package]] +name = "unic-ucd-ident" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-version" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +dependencies = [ + "unic-common", +] + +[[package]] +name = "unicode-ident" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" + +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "url" +version = "2.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlpattern" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70acd30e3aa1450bc2eece896ce2ad0d178e9c079493819301573dae3c37ba6d" +dependencies = [ + "regex", + "serde", + "unic-ucd-ident", + "url", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "uuid" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a" +dependencies = [ + "getrandom 0.3.4", + "js-sys", + "serde_core", + "wasm-bindgen", +] + +[[package]] +name = "version-compare" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03c2856837ef78f57382f06b2b8563a2f512f7185d732608fd9176cb3b8edf0e" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ + "libc", + "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb067e4cbd1ff067d1df46c9194b5de0e98efd2810bbc95c5d5e5f25a3231150" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.11.1+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + +[[package]] +name = "wasip2" +version = "1.0.1+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c" +dependencies = [ + "cfg-if", + "js-sys", + "once_cell", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" +dependencies = [ + "bumpalo", + "proc-macro2", + "quote", + "syn 2.0.111", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "wasm-streams" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webkit2gtk" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76b1bc1e54c581da1e9f179d0b38512ba358fb1af2d634a1affe42e37172361a" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk", + "gdk-sys", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "gtk", + "gtk-sys", + "javascriptcore-rs", + "libc", + "once_cell", + "soup3", + "webkit2gtk-sys", +] + +[[package]] +name = "webkit2gtk-sys" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62daa38afc514d1f8f12b8693d30d5993ff77ced33ce30cd04deebc267a6d57c" +dependencies = [ + "bitflags 1.3.2", + "cairo-sys-rs", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk-sys", + "javascriptcore-rs-sys", + "libc", + "pkg-config", + "soup3-sys", + "system-deps", +] + +[[package]] +name = "webview2-com" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4ba622a989277ef3886dd5afb3e280e3dd6d974b766118950a08f8f678ad6a4" +dependencies = [ + "webview2-com-macros", + "webview2-com-sys", + "windows", + "windows-core 0.61.2", + "windows-implement", + "windows-interface", +] + +[[package]] +name = "webview2-com-macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "webview2-com-sys" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36695906a1b53a3bf5c4289621efedac12b73eeb0b89e7e1a89b517302d5d75c" +dependencies = [ + "thiserror 2.0.17", + "windows", + "windows-core 0.61.2", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" +dependencies = [ + "windows-sys 0.61.2", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "window-vibrancy" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c" +dependencies = [ + "objc2 0.6.3", + "objc2-app-kit", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "raw-window-handle", + "windows-sys 0.59.0", + "windows-version", +] + +[[package]] +name = "windows" +version = "0.61.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" +dependencies = [ + "windows-collections", + "windows-core 0.61.2", + "windows-future", + "windows-link 0.1.3", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" +dependencies = [ + "windows-core 0.61.2", +] + +[[package]] +name = "windows-core" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link 0.1.3", + "windows-result 0.3.4", + "windows-strings 0.4.2", +] + +[[package]] +name = "windows-core" +version = "0.62.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link 0.2.1", + "windows-result 0.4.1", + "windows-strings 0.5.1", +] + +[[package]] +name = "windows-future" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" +dependencies = [ + "windows-core 0.61.2", + "windows-link 0.1.3", + "windows-threading", +] + +[[package]] +name = "windows-implement" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "windows-interface" +version = "0.59.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "windows-link" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" + +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + +[[package]] +name = "windows-numerics" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" +dependencies = [ + "windows-core 0.61.2", + "windows-link 0.1.3", +] + +[[package]] +name = "windows-result" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +dependencies = [ + "windows-link 0.1.3", +] + +[[package]] +name = "windows-result" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" +dependencies = [ + "windows-link 0.2.1", +] + +[[package]] +name = "windows-strings" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +dependencies = [ + "windows-link 0.1.3", +] + +[[package]] +name = "windows-strings" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" +dependencies = [ + "windows-link 0.2.1", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.5", +] + +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link 0.2.1", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +dependencies = [ + "windows-link 0.2.1", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", +] + +[[package]] +name = "windows-threading" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" +dependencies = [ + "windows-link 0.1.3", +] + +[[package]] +name = "windows-version" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4060a1da109b9d0326b7262c8e12c84df67cc0dbc9e33cf49e01ccc2eb63631" +dependencies = [ + "windows-link 0.2.1", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_i686_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.55.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97" +dependencies = [ + "cfg-if", + "windows-sys 0.59.0", +] + +[[package]] +name = "wit-bindgen" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" + +[[package]] +name = "writeable" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" + +[[package]] +name = "wry" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728b7d4c8ec8d81cab295e0b5b8a4c263c0d41a785fb8f8c4df284e5411140a2" +dependencies = [ + "base64 0.22.1", + "block2 0.6.2", + "cookie", + "crossbeam-channel", + "dirs", + "dpi", + "dunce", + "gdkx11", + "gtk", + "html5ever", + "http", + "javascriptcore-rs", + "jni", + "kuchikiki", + "libc", + "ndk", + "objc2 0.6.3", + "objc2-app-kit", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "objc2-ui-kit", + "objc2-web-kit", + "once_cell", + "percent-encoding", + "raw-window-handle", + "sha2", + "soup3", + "tao-macros", + "thiserror 2.0.17", + "url", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", + "windows", + "windows-core 0.61.2", + "windows-version", + "x11-dl", +] + +[[package]] +name = "x11" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "yoke" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" +dependencies = [ + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", + "synstructure", +] + +[[package]] +name = "zbus" +version = "5.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b622b18155f7a93d1cd2dc8c01d2d6a44e08fb9ebb7b3f9e6ed101488bad6c91" +dependencies = [ + "async-broadcast", + "async-executor", + "async-io", + "async-lock", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "enumflags2", + "event-listener", + "futures-core", + "futures-lite", + "hex", + "nix", + "ordered-stream", + "serde", + "serde_repr", + "tracing", + "uds_windows", + "uuid", + "windows-sys 0.61.2", + "winnow 0.7.14", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "5.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cdb94821ca8a87ca9c298b5d1cbd80e2a8b67115d99f6e4551ac49e42b6a314" +dependencies = [ + "proc-macro-crate 3.4.0", + "proc-macro2", + "quote", + "syn 2.0.111", + "zbus_names", + "zvariant", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97" +dependencies = [ + "serde", + "static_assertions", + "winnow 0.7.14", + "zvariant", +] + +[[package]] +name = "zerocopy" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "zerofrom" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", + "synstructure", +] + +[[package]] +name = "zerotrie" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "zvariant" +version = "5.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2be61892e4f2b1772727be11630a62664a1826b62efa43a6fe7449521cb8744c" +dependencies = [ + "endi", + "enumflags2", + "serde", + "winnow 0.7.14", + "zvariant_derive", + "zvariant_utils", +] + +[[package]] +name = "zvariant_derive" +version = "5.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da58575a1b2b20766513b1ec59d8e2e68db2745379f961f86650655e862d2006" +dependencies = [ + "proc-macro-crate 3.4.0", + "proc-macro2", + "quote", + "syn 2.0.111", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6949d142f89f6916deca2232cf26a8afacf2b9fdc35ce766105e104478be599" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "syn 2.0.111", + "winnow 0.7.14", +] diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000..12d5ef4 --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,4 @@ +[workspace] +resolver = "2" + +members = ["apps/client/src-tauri"] diff --git a/apps/client/README.md b/apps/client/README.md new file mode 100644 index 0000000..102e366 --- /dev/null +++ b/apps/client/README.md @@ -0,0 +1,7 @@ +# Tauri + React + Typescript + +This template should help get you started developing with Tauri, React and Typescript in Vite. + +## Recommended IDE Setup + +- [VS Code](https://code.visualstudio.com/) + [Tauri](https://marketplace.visualstudio.com/items?itemName=tauri-apps.tauri-vscode) + [rust-analyzer](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer) diff --git a/apps/client/index.html b/apps/client/index.html new file mode 100644 index 0000000..ff93803 --- /dev/null +++ b/apps/client/index.html @@ -0,0 +1,14 @@ + + + + + + + Tauri + React + Typescript + + + +
+ + + diff --git a/apps/client/package.json b/apps/client/package.json new file mode 100644 index 0000000..029898c --- /dev/null +++ b/apps/client/package.json @@ -0,0 +1,35 @@ +{ + "name": "@miforge/client", + "private": true, + "version": "0.1.0", + "type": "module", + "scripts": { + "dev": "tauri dev", + "vite:dev": "vite", + "build": "tsc && vite build", + "preview": "vite preview", + "tauri": "tauri" + }, + "dependencies": { + "@pixi/react": "^8.0.5", + "@tailwindcss/vite": "catalog:vite", + "@tauri-apps/api": "^2.9.1", + "@tauri-apps/plugin-opener": "^2.5.2", + "clsx": "catalog:tailwind", + "pixi.js": "^8.14.3", + "react": "catalog:react", + "react-dom": "catalog:react", + "tailwind-merge": "catalog:tailwind", + "tailwindcss": "catalog:tailwind", + "tw-animate-css": "catalog:tailwind", + "zustand": "^5.0.9" + }, + "devDependencies": { + "@tauri-apps/cli": "^2.9.6", + "@types/react": "catalog:react", + "@types/react-dom": "catalog:react", + "@vitejs/plugin-react": "catalog:vite", + "typescript": "catalog:ts", + "vite": "catalog:vite" + } +} diff --git a/apps/client/public/tauri.svg b/apps/client/public/tauri.svg new file mode 100644 index 0000000..31b62c9 --- /dev/null +++ b/apps/client/public/tauri.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/apps/client/public/vite.svg b/apps/client/public/vite.svg new file mode 100644 index 0000000..e7b8dfb --- /dev/null +++ b/apps/client/public/vite.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/client/src-tauri/.gitignore b/apps/client/src-tauri/.gitignore new file mode 100644 index 0000000..b21bd68 --- /dev/null +++ b/apps/client/src-tauri/.gitignore @@ -0,0 +1,7 @@ +# Generated by Cargo +# will have compiled files and executables +/target/ + +# Generated by Tauri +# will have schema files for capabilities auto-completion +/gen/schemas diff --git a/apps/client/src-tauri/Cargo.lock b/apps/client/src-tauri/Cargo.lock new file mode 100644 index 0000000..78ffbf2 --- /dev/null +++ b/apps/client/src-tauri/Cargo.lock @@ -0,0 +1,5223 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "adler2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" + +[[package]] +name = "aho-corasick" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" + +[[package]] +name = "async-broadcast" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532" +dependencies = [ + "event-listener", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-channel" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "pin-project-lite", + "slab", +] + +[[package]] +name = "async-io" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc" +dependencies = [ + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite", + "parking", + "polling", + "rustix", + "slab", + "windows-sys 0.61.2", +] + +[[package]] +name = "async-lock" +version = "3.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc" +dependencies = [ + "event-listener", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75" +dependencies = [ + "async-channel", + "async-io", + "async-lock", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener", + "futures-lite", + "rustix", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "async-signal" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix", + "signal-hook-registry", + "slab", + "windows-sys 0.61.2", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "atk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "241b621213072e993be4f6f3a9e4b45f65b7e6faad43001be957184b7bb1824b" +dependencies = [ + "atk-sys", + "glib", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e48b684b0ca77d2bbadeef17424c2ea3c897d44d566a1617e7e8f30614d086" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" +dependencies = [ + "serde_core", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2 0.5.2", +] + +[[package]] +name = "block2" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" +dependencies = [ + "objc2 0.6.3", +] + +[[package]] +name = "blocking" +version = "1.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21" +dependencies = [ + "async-channel", + "async-task", + "futures-io", + "futures-lite", + "piper", +] + +[[package]] +name = "brotli" +version = "8.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bumpalo" +version = "3.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" + +[[package]] +name = "bytemuck" +version = "1.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" +dependencies = [ + "serde", +] + +[[package]] +name = "cairo-rs" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" +dependencies = [ + "bitflags 2.10.0", + "cairo-sys-rs", + "glib", + "libc", + "once_cell", + "thiserror 1.0.69", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "camino" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609" +dependencies = [ + "serde_core", +] + +[[package]] +name = "cargo-platform" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror 2.0.17", +] + +[[package]] +name = "cargo_toml" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77" +dependencies = [ + "serde", + "toml 0.9.8", +] + +[[package]] +name = "cc" +version = "1.2.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c481bdbf0ed3b892f6f806287d72acd515b352a4ec27a208489b8c1bc839633a" +dependencies = [ + "find-msvc-tools", + "shlex", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfb" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" +dependencies = [ + "byteorder", + "fnv", + "uuid", +] + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "chrono" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" +dependencies = [ + "iana-time-zone", + "num-traits", + "serde", + "windows-link 0.2.1", +] + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "cookie" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" +dependencies = [ + "time", + "version_check", +] + +[[package]] +name = "core-foundation" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "core-graphics" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" +dependencies = [ + "bitflags 2.10.0", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" +dependencies = [ + "bitflags 2.10.0", + "core-foundation", + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + +[[package]] +name = "crypto-common" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cssparser" +version = "0.29.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa", + "matches", + "phf 0.10.1", + "proc-macro2", + "quote", + "smallvec", + "syn 1.0.109", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn 2.0.111", +] + +[[package]] +name = "ctor" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" +dependencies = [ + "quote", + "syn 2.0.111", +] + +[[package]] +name = "darling" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.111", +] + +[[package]] +name = "darling_macro" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "deranged" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" +dependencies = [ + "powerfmt", + "serde_core", +] + +[[package]] +name = "derive_more" +version = "0.99.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 2.0.111", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.61.2", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dispatch2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "dlopen2" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d65cde5fb0c42a3d5882d99807698b459f5928de035fa7f547c784fb7b34219" +dependencies = [ + "dlopen2_derive", + "libc", + "once_cell", + "winapi", +] + +[[package]] +name = "dlopen2_derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95f4a04e1bfbfa4835a6073177aafb95ead4de0722dbb339195fdc7e0a09599b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "dpi" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76" +dependencies = [ + "serde", +] + +[[package]] +name = "dtoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04" + +[[package]] +name = "dtoa-short" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" +dependencies = [ + "dtoa", +] + +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + +[[package]] +name = "dyn-clone" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" + +[[package]] +name = "embed-resource" +version = "3.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55a075fc573c64510038d7ee9abc7990635863992f83ebc52c8b433b8411a02e" +dependencies = [ + "cc", + "memchr", + "rustc_version", + "toml 0.9.8", + "vswhom", + "winreg", +] + +[[package]] +name = "embed_plist" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" + +[[package]] +name = "endi" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66b7e2430c6dff6a955451e2cfc438f09cea1965a9d6f87f7e3b90decc014099" + +[[package]] +name = "enumflags2" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "equivalent" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + +[[package]] +name = "erased-serde" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89e8918065695684b2b0702da20382d5ae6065cf3327bc2d6436bd49a71ce9f3" +dependencies = [ + "serde", + "serde_core", + "typeid", +] + +[[package]] +name = "errno" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" +dependencies = [ + "libc", + "windows-sys 0.61.2", +] + +[[package]] +name = "event-listener" +version = "5.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" +dependencies = [ + "event-listener", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + +[[package]] +name = "fdeflate" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset", + "rustc_version", +] + +[[package]] +name = "find-msvc-tools" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" + +[[package]] +name = "flate2" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-executor" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-lite" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "gdk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9f245958c627ac99d8e529166f9823fb3b838d1d41fd2b297af3075093c2691" +dependencies = [ + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec" +dependencies = [ + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", + "once_cell", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c2d13f38594ac1e66619e188c6d5a1adb98d11b2fcf7894fc416ad76aa2f3f7" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps", +] + +[[package]] +name = "gdkwayland-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140071d506d223f7572b9f09b5e155afbd77428cd5cc7af8f2694c41d98dfe69" +dependencies = [ + "gdk-sys", + "glib-sys", + "gobject-sys", + "libc", + "pkg-config", + "system-deps", +] + +[[package]] +name = "gdkx11" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3caa00e14351bebbc8183b3c36690327eb77c49abc2268dd4bd36b856db3fbfe" +dependencies = [ + "gdk", + "gdkx11-sys", + "gio", + "glib", + "libc", + "x11", +] + +[[package]] +name = "gdkx11-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e7445fe01ac26f11601db260dd8608fe172514eb63b3b5e261ea6b0f4428d" +dependencies = [ + "gdk-sys", + "glib-sys", + "libc", + "system-deps", + "x11", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.1+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasip2", +] + +[[package]] +name = "gio" +version = "0.18.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys", + "glib", + "libc", + "once_cell", + "pin-project-lite", + "smallvec", + "thiserror 1.0.69", +] + +[[package]] +name = "gio-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "winapi", +] + +[[package]] +name = "glib" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" +dependencies = [ + "bitflags 2.10.0", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "once_cell", + "smallvec", + "thiserror 1.0.69", +] + +[[package]] +name = "glib-macros" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" +dependencies = [ + "heck 0.4.1", + "proc-macro-crate 2.0.2", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "glib-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "glob" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" + +[[package]] +name = "gobject-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gtk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd56fb197bfc42bd5d2751f4f017d44ff59fbb58140c6b49f9b3b2bdab08506a" +dependencies = [ + "atk", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf", + "gio", + "glib", + "gtk-sys", + "gtk3-macros", + "libc", + "pango", + "pkg-config", +] + +[[package]] +name = "gtk-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f29a1c21c59553eb7dd40e918be54dccd60c52b049b75119d5d96ce6b624414" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "gtk3-macros" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ff3c5b21f14f0736fed6dcfc0bfb4225ebf5725f3c0209edeec181e4d73e9d" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "html5ever" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7410cae13cbc75623c98ac4cbfd1f0bedddf3227afc24f370cf0f50a44a11c" +dependencies = [ + "log", + "mac", + "markup5ever", + "match_token", +] + +[[package]] +name = "http" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" +dependencies = [ + "bytes", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" + +[[package]] +name = "hyper" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" +dependencies = [ + "atomic-waker", + "bytes", + "futures-channel", + "futures-core", + "http", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "pin-utils", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-util" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e9a2a24dc5c6821e71a7030e1e14b7b632acac55c40e9d2e082c621261bb56" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http", + "http-body", + "hyper", + "ipnet", + "libc", + "percent-encoding", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "log", + "wasm-bindgen", + "windows-core 0.62.2", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ico" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc50b891e4acf8fe0e71ef88ec43ad82ee07b3810ad09de10f1d01f072ed4b98" +dependencies = [ + "byteorder", + "png", +] + +[[package]] +name = "icu_collections" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" +dependencies = [ + "displaydoc", + "potential_utf", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" +dependencies = [ + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" + +[[package]] +name = "icu_properties" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" +dependencies = [ + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" + +[[package]] +name = "icu_provider" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" +dependencies = [ + "displaydoc", + "icu_locale_core", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" +dependencies = [ + "equivalent", + "hashbrown 0.16.1", + "serde", + "serde_core", +] + +[[package]] +name = "infer" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a588916bfdfd92e71cacef98a63d9b1f0d74d6599980d11894290e7ddefffcf7" +dependencies = [ + "cfb", +] + +[[package]] +name = "ipnet" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" + +[[package]] +name = "iri-string" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "is-docker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] + +[[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] + +[[package]] +name = "itoa" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "javascriptcore-rs" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca5671e9ffce8ffba57afc24070e906da7fc4b1ba66f2cabebf61bf2ea257fcc" +dependencies = [ + "bitflags 1.3.2", + "glib", + "javascriptcore-rs-sys", +] + +[[package]] +name = "javascriptcore-rs-sys" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1be78d14ffa4b75b66df31840478fef72b51f8c2465d4ca7c194da9f7a5124" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror 1.0.69", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "js-sys" +version = "0.3.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "json-patch" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08" +dependencies = [ + "jsonptr", + "serde", + "serde_json", + "thiserror 1.0.69", +] + +[[package]] +name = "jsonptr" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dea2b27dd239b2556ed7a25ba842fe47fd602e7fc7433c2a8d6106d4d9edd70" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "keyboard-types" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" +dependencies = [ + "bitflags 2.10.0", + "serde", + "unicode-segmentation", +] + +[[package]] +name = "kuchikiki" +version = "0.8.8-speedreader" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02cb977175687f33fa4afa0c95c112b987ea1443e5a51c8f8ff27dc618270cc2" +dependencies = [ + "cssparser", + "html5ever", + "indexmap 2.12.1", + "selectors", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libappindicator" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a" +dependencies = [ + "glib", + "gtk", + "gtk-sys", + "libappindicator-sys", + "log", +] + +[[package]] +name = "libappindicator-sys" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" +dependencies = [ + "gtk-sys", + "libloading", + "once_cell", +] + +[[package]] +name = "libc" +version = "0.2.178" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libredox" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" +dependencies = [ + "bitflags 2.10.0", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" + +[[package]] +name = "litemap" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" + +[[package]] +name = "lock_api" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "markup5ever" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7a7213d12e1864c0f002f52c2923d4556935a43dec5e71355c2760e0f6e7a18" +dependencies = [ + "log", + "phf 0.11.3", + "phf_codegen 0.11.3", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "match_token" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "memchr" +version = "2.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "miclient" +version = "0.1.0" +dependencies = [ + "serde", + "serde_json", + "tauri", + "tauri-build", + "tauri-plugin-opener", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "miniz_oxide" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" +dependencies = [ + "adler2", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" +dependencies = [ + "libc", + "wasi 0.11.1+wasi-snapshot-preview1", + "windows-sys 0.61.2", +] + +[[package]] +name = "muda" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01c1738382f66ed56b3b9c8119e794a2e23148ac8ea214eda86622d4cb9d415a" +dependencies = [ + "crossbeam-channel", + "dpi", + "gtk", + "keyboard-types", + "objc2 0.6.3", + "objc2-app-kit", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "once_cell", + "png", + "serde", + "thiserror 2.0.17", + "windows-sys 0.60.2", +] + +[[package]] +name = "ndk" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" +dependencies = [ + "bitflags 2.10.0", + "jni-sys", + "log", + "ndk-sys", + "num_enum", + "raw-window-handle", + "thiserror 1.0.69", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.6.0+11769913" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nix" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" +dependencies = [ + "bitflags 2.10.0", + "cfg-if", + "cfg_aliases", + "libc", + "memoffset", +] + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_enum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c" +dependencies = [ + "num_enum_derive", + "rustversion", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7" +dependencies = [ + "proc-macro-crate 3.4.0", + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05" +dependencies = [ + "objc2-encode", + "objc2-exception-helper", +] + +[[package]] +name = "objc2-app-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" +dependencies = [ + "bitflags 2.10.0", + "block2 0.6.2", + "libc", + "objc2 0.6.3", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-core-image", + "objc2-core-text", + "objc2-core-video", + "objc2-foundation 0.3.2", + "objc2-quartz-core 0.3.2", +] + +[[package]] +name = "objc2-cloud-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", + "objc2-foundation 0.3.2", +] + +[[package]] +name = "objc2-core-data" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", + "objc2-foundation 0.3.2", +] + +[[package]] +name = "objc2-core-foundation" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" +dependencies = [ + "bitflags 2.10.0", + "dispatch2", + "objc2 0.6.3", +] + +[[package]] +name = "objc2-core-graphics" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" +dependencies = [ + "bitflags 2.10.0", + "dispatch2", + "objc2 0.6.3", + "objc2-core-foundation", + "objc2-io-surface", +] + +[[package]] +name = "objc2-core-image" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006" +dependencies = [ + "objc2 0.6.3", + "objc2-foundation 0.3.2", +] + +[[package]] +name = "objc2-core-text" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", + "objc2-core-foundation", + "objc2-core-graphics", +] + +[[package]] +name = "objc2-core-video" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-io-surface", +] + +[[package]] +name = "objc2-encode" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" + +[[package]] +name = "objc2-exception-helper" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7a1c5fbb72d7735b076bb47b578523aedc40f3c439bea6dfd595c089d79d98a" +dependencies = [ + "cc", +] + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.10.0", + "block2 0.5.1", + "libc", + "objc2 0.5.2", +] + +[[package]] +name = "objc2-foundation" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" +dependencies = [ + "bitflags 2.10.0", + "block2 0.6.2", + "libc", + "objc2 0.6.3", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-io-surface" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-javascript-core" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a1e6550c4caed348956ce3370c9ffeca70bb1dbed4fa96112e7c6170e074586" +dependencies = [ + "objc2 0.6.3", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.10.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation 0.2.2", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.10.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation 0.2.2", + "objc2-metal", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", + "objc2-foundation 0.3.2", +] + +[[package]] +name = "objc2-security" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "709fe137109bd1e8b5a99390f77a7d8b2961dafc1a1c5db8f2e60329ad6d895a" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", + "objc2-core-foundation", + "objc2-foundation 0.3.2", +] + +[[package]] +name = "objc2-web-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f" +dependencies = [ + "bitflags 2.10.0", + "block2 0.6.2", + "objc2 0.6.3", + "objc2-app-kit", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "objc2-javascript-core", + "objc2-security", +] + +[[package]] +name = "once_cell" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "open" +version = "5.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43bb73a7fa3799b198970490a51174027ba0d4ec504b03cd08caf513d40024bc" +dependencies = [ + "dunce", + "is-wsl", + "libc", + "pathdiff", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "pango" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" +dependencies = [ + "gio", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + +[[package]] +name = "parking_lot" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-link 0.2.1", +] + +[[package]] +name = "pathdiff" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" + +[[package]] +name = "percent-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" + +[[package]] +name = "phf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_shared 0.8.0", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_macros 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", +] + +[[package]] +name = "phf" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" +dependencies = [ + "phf_macros 0.11.3", + "phf_shared 0.11.3", +] + +[[package]] +name = "phf_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_codegen" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" +dependencies = [ + "phf_generator 0.11.3", + "phf_shared 0.11.3", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.5", +] + +[[package]] +name = "phf_generator" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" +dependencies = [ + "phf_shared 0.11.3", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "phf_macros" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" +dependencies = [ + "phf_generator 0.11.3", + "phf_shared 0.11.3", + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher 0.3.11", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher 0.3.11", +] + +[[package]] +name = "phf_shared" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" +dependencies = [ + "siphasher 1.0.1", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" +dependencies = [ + "atomic-waker", + "fastrand", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + +[[package]] +name = "plist" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07" +dependencies = [ + "base64 0.22.1", + "indexmap 2.12.1", + "quick-xml", + "serde", + "time", +] + +[[package]] +name = "png" +version = "0.17.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "3.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi", + "pin-project-lite", + "rustix", + "windows-sys 0.61.2", +] + +[[package]] +name = "potential_utf" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" +dependencies = [ + "zerovec", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" +dependencies = [ + "toml_datetime 0.6.3", + "toml_edit 0.20.2", +] + +[[package]] +name = "proc-macro-crate" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" +dependencies = [ + "toml_edit 0.23.7", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.38.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", + "rand_pcg", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.16", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "raw-window-handle" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + +[[package]] +name = "redox_syscall" +version = "0.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" +dependencies = [ + "bitflags 2.10.0", +] + +[[package]] +name = "redox_users" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" +dependencies = [ + "getrandom 0.2.16", + "libredox", + "thiserror 2.0.17", +] + +[[package]] +name = "ref-cast" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "regex" +version = "1.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" + +[[package]] +name = "reqwest" +version = "0.12.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "js-sys", + "log", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-util", + "tower", + "tower-http", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", +] + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" +dependencies = [ + "bitflags 2.10.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.61.2", +] + +[[package]] +name = "rustversion" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + +[[package]] +name = "ryu" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schemars" +version = "0.8.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615" +dependencies = [ + "dyn-clone", + "indexmap 1.9.3", + "schemars_derive", + "serde", + "serde_json", + "url", + "uuid", +] + +[[package]] +name = "schemars" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + +[[package]] +name = "schemars" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9558e172d4e8533736ba97870c4b2cd63f84b382a3d6eb063da41b91cce17289" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + +[[package]] +name = "schemars_derive" +version = "0.8.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.111", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "selectors" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416" +dependencies = [ + "bitflags 1.3.2", + "cssparser", + "derive_more", + "fxhash", + "log", + "phf 0.8.0", + "phf_codegen 0.8.0", + "precomputed-hash", + "servo_arc", + "smallvec", +] + +[[package]] +name = "semver" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" +dependencies = [ + "serde", + "serde_core", +] + +[[package]] +name = "serde" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde-untagged" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9faf48a4a2d2693be24c6289dbe26552776eb7737074e6722891fadbe6c5058" +dependencies = [ + "erased-serde", + "serde", + "serde_core", + "typeid", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "serde_json" +version = "1.0.145" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", + "serde_core", +] + +[[package]] +name = "serde_repr" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "serde_spanned" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_spanned" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392" +dependencies = [ + "serde_core", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "3.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.12.1", + "schemars 0.9.0", + "schemars 1.1.0", + "serde_core", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52a8e3ca0ca629121f70ab50f95249e5a6f925cc0f6ffe8256c45b728875706c" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "serialize-to-javascript" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04f3666a07a197cdb77cdf306c32be9b7f598d7060d50cfd4d5aa04bfd92f6c5" +dependencies = [ + "serde", + "serde_json", + "serialize-to-javascript-impl", +] + +[[package]] +name = "serialize-to-javascript-impl" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "servo_arc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741" +dependencies = [ + "nodrop", + "stable_deref_trait", +] + +[[package]] +name = "sha2" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + +[[package]] +name = "slab" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" + +[[package]] +name = "smallvec" +version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" + +[[package]] +name = "socket2" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" +dependencies = [ + "libc", + "windows-sys 0.60.2", +] + +[[package]] +name = "softbuffer" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18051cdd562e792cad055119e0cdb2cfc137e44e3987532e0f9659a77931bb08" +dependencies = [ + "bytemuck", + "cfg_aliases", + "core-graphics", + "foreign-types", + "js-sys", + "log", + "objc2 0.5.2", + "objc2-foundation 0.2.2", + "objc2-quartz-core 0.2.2", + "raw-window-handle", + "redox_syscall", + "wasm-bindgen", + "web-sys", + "windows-sys 0.59.0", +] + +[[package]] +name = "soup3" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "471f924a40f31251afc77450e781cb26d55c0b650842efafc9c6cbd2f7cc4f9f" +dependencies = [ + "futures-channel", + "gio", + "glib", + "libc", + "soup3-sys", +] + +[[package]] +name = "soup3-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ebe8950a680a12f24f15ebe1bf70db7af98ad242d9db43596ad3108aab86c27" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "string_cache" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f" +dependencies = [ + "new_debug_unreachable", + "parking_lot", + "phf_shared 0.11.3", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0" +dependencies = [ + "phf_generator 0.11.3", + "phf_shared 0.11.3", + "proc-macro2", + "quote", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "swift-rs" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4057c98e2e852d51fdcfca832aac7b571f6b351ad159f9eda5db1655f8d0c4d7" +dependencies = [ + "base64 0.21.7", + "serde", + "serde_json", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.111" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] + +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr", + "heck 0.5.0", + "pkg-config", + "toml 0.8.2", + "version-compare", +] + +[[package]] +name = "tao" +version = "0.34.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a753bdc39c07b192151523a3f77cd0394aa75413802c883a0f6f6a0e5ee2e7" +dependencies = [ + "bitflags 2.10.0", + "block2 0.6.2", + "core-foundation", + "core-graphics", + "crossbeam-channel", + "dispatch", + "dlopen2", + "dpi", + "gdkwayland-sys", + "gdkx11-sys", + "gtk", + "jni", + "lazy_static", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "objc2 0.6.3", + "objc2-app-kit", + "objc2-foundation 0.3.2", + "once_cell", + "parking_lot", + "raw-window-handle", + "scopeguard", + "tao-macros", + "unicode-segmentation", + "url", + "windows", + "windows-core 0.61.2", + "windows-version", + "x11-dl", +] + +[[package]] +name = "tao-macros" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "tauri" +version = "2.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15524fc7959bfcaa051ba6d0b3fb1ef18e978de2176c7c6acb977f7fd14d35c7" +dependencies = [ + "anyhow", + "bytes", + "cookie", + "dirs", + "dunce", + "embed_plist", + "getrandom 0.3.4", + "glob", + "gtk", + "heck 0.5.0", + "http", + "jni", + "libc", + "log", + "mime", + "muda", + "objc2 0.6.3", + "objc2-app-kit", + "objc2-foundation 0.3.2", + "objc2-ui-kit", + "objc2-web-kit", + "percent-encoding", + "plist", + "raw-window-handle", + "reqwest", + "serde", + "serde_json", + "serde_repr", + "serialize-to-javascript", + "swift-rs", + "tauri-build", + "tauri-macros", + "tauri-runtime", + "tauri-runtime-wry", + "tauri-utils", + "thiserror 2.0.17", + "tokio", + "tray-icon", + "url", + "webkit2gtk", + "webview2-com", + "window-vibrancy", + "windows", +] + +[[package]] +name = "tauri-build" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17fcb8819fd16463512a12f531d44826ce566f486d7ccd211c9c8cebdaec4e08" +dependencies = [ + "anyhow", + "cargo_toml", + "dirs", + "glob", + "heck 0.5.0", + "json-patch", + "schemars 0.8.22", + "semver", + "serde", + "serde_json", + "tauri-utils", + "tauri-winres", + "toml 0.9.8", + "walkdir", +] + +[[package]] +name = "tauri-codegen" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa9844cefcf99554a16e0a278156ae73b0d8680bbc0e2ad1e4287aadd8489cf" +dependencies = [ + "base64 0.22.1", + "brotli", + "ico", + "json-patch", + "plist", + "png", + "proc-macro2", + "quote", + "semver", + "serde", + "serde_json", + "sha2", + "syn 2.0.111", + "tauri-utils", + "thiserror 2.0.17", + "time", + "url", + "uuid", + "walkdir", +] + +[[package]] +name = "tauri-macros" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3764a12f886d8245e66b7ee9b43ccc47883399be2019a61d80cf0f4117446fde" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.111", + "tauri-codegen", + "tauri-utils", +] + +[[package]] +name = "tauri-plugin" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1d0a4860b7ff570c891e1d2a586bf1ede205ff858fbc305e0b5ae5d14c1377" +dependencies = [ + "anyhow", + "glob", + "plist", + "schemars 0.8.22", + "serde", + "serde_json", + "tauri-utils", + "toml 0.9.8", + "walkdir", +] + +[[package]] +name = "tauri-plugin-opener" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c26b72571d25dee25667940027114e60f569fc3974f8cefbe50c2cbc5fd65e3b" +dependencies = [ + "dunce", + "glob", + "objc2-app-kit", + "objc2-foundation 0.3.2", + "open", + "schemars 0.8.22", + "serde", + "serde_json", + "tauri", + "tauri-plugin", + "thiserror 2.0.17", + "url", + "windows", + "zbus", +] + +[[package]] +name = "tauri-runtime" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f766fe9f3d1efc4b59b17e7a891ad5ed195fa8d23582abb02e6c9a01137892" +dependencies = [ + "cookie", + "dpi", + "gtk", + "http", + "jni", + "objc2 0.6.3", + "objc2-ui-kit", + "objc2-web-kit", + "raw-window-handle", + "serde", + "serde_json", + "tauri-utils", + "thiserror 2.0.17", + "url", + "webkit2gtk", + "webview2-com", + "windows", +] + +[[package]] +name = "tauri-runtime-wry" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7950f3bde6bcca6655bc5e76d3d6ec587ceb81032851ab4ddbe1f508bdea2729" +dependencies = [ + "gtk", + "http", + "jni", + "log", + "objc2 0.6.3", + "objc2-app-kit", + "objc2-foundation 0.3.2", + "once_cell", + "percent-encoding", + "raw-window-handle", + "softbuffer", + "tao", + "tauri-runtime", + "tauri-utils", + "url", + "webkit2gtk", + "webview2-com", + "windows", + "wry", +] + +[[package]] +name = "tauri-utils" +version = "2.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a423c51176eb3616ee9b516a9fa67fed5f0e78baaba680e44eb5dd2cc37490" +dependencies = [ + "anyhow", + "brotli", + "cargo_metadata", + "ctor", + "dunce", + "glob", + "html5ever", + "http", + "infer", + "json-patch", + "kuchikiki", + "log", + "memchr", + "phf 0.11.3", + "proc-macro2", + "quote", + "regex", + "schemars 0.8.22", + "semver", + "serde", + "serde-untagged", + "serde_json", + "serde_with", + "swift-rs", + "thiserror 2.0.17", + "toml 0.9.8", + "url", + "urlpattern", + "uuid", + "walkdir", +] + +[[package]] +name = "tauri-winres" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1087b111fe2b005e42dbdc1990fc18593234238d47453b0c99b7de1c9ab2c1e0" +dependencies = [ + "dunce", + "embed-resource", + "toml 0.9.8", +] + +[[package]] +name = "tempfile" +version = "3.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" +dependencies = [ + "fastrand", + "getrandom 0.3.4", + "once_cell", + "rustix", + "windows-sys 0.61.2", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +dependencies = [ + "thiserror-impl 2.0.17", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "time" +version = "0.3.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" + +[[package]] +name = "time-macros" +version = "0.2.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinystr" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tokio" +version = "1.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" +dependencies = [ + "bytes", + "libc", + "mio", + "pin-project-lite", + "socket2", + "windows-sys 0.61.2", +] + +[[package]] +name = "tokio-util" +version = "0.7.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +dependencies = [ + "serde", + "serde_spanned 0.6.9", + "toml_datetime 0.6.3", + "toml_edit 0.20.2", +] + +[[package]] +name = "toml" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8" +dependencies = [ + "indexmap 2.12.1", + "serde_core", + "serde_spanned 1.0.3", + "toml_datetime 0.7.3", + "toml_parser", + "toml_writer", + "winnow 0.7.14", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_datetime" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533" +dependencies = [ + "serde_core", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.12.1", + "toml_datetime 0.6.3", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +dependencies = [ + "indexmap 2.12.1", + "serde", + "serde_spanned 0.6.9", + "toml_datetime 0.6.3", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.23.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d" +dependencies = [ + "indexmap 2.12.1", + "toml_datetime 0.7.3", + "toml_parser", + "winnow 0.7.14", +] + +[[package]] +name = "toml_parser" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e" +dependencies = [ + "winnow 0.7.14", +] + +[[package]] +name = "toml_writer" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2" + +[[package]] +name = "tower" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf146f99d442e8e68e585f5d798ccd3cad9a7835b917e09728880a862706456" +dependencies = [ + "bitflags 2.10.0", + "bytes", + "futures-util", + "http", + "http-body", + "iri-string", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "tracing-core" +version = "0.1.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c" +dependencies = [ + "once_cell", +] + +[[package]] +name = "tray-icon" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d5572781bee8e3f994d7467084e1b1fd7a93ce66bd480f8156ba89dee55a2b" +dependencies = [ + "crossbeam-channel", + "dirs", + "libappindicator", + "muda", + "objc2 0.6.3", + "objc2-app-kit", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-foundation 0.3.2", + "once_cell", + "png", + "serde", + "thiserror 2.0.17", + "windows-sys 0.60.2", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typeid" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" + +[[package]] +name = "typenum" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset", + "tempfile", + "winapi", +] + +[[package]] +name = "unic-char-property" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +dependencies = [ + "unic-char-range", +] + +[[package]] +name = "unic-char-range" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" + +[[package]] +name = "unic-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" + +[[package]] +name = "unic-ucd-ident" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-version" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +dependencies = [ + "unic-common", +] + +[[package]] +name = "unicode-ident" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" + +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "url" +version = "2.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlpattern" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70acd30e3aa1450bc2eece896ce2ad0d178e9c079493819301573dae3c37ba6d" +dependencies = [ + "regex", + "serde", + "unic-ucd-ident", + "url", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "uuid" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a" +dependencies = [ + "getrandom 0.3.4", + "js-sys", + "serde_core", + "wasm-bindgen", +] + +[[package]] +name = "version-compare" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03c2856837ef78f57382f06b2b8563a2f512f7185d732608fd9176cb3b8edf0e" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ + "libc", + "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb067e4cbd1ff067d1df46c9194b5de0e98efd2810bbc95c5d5e5f25a3231150" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.11.1+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + +[[package]] +name = "wasip2" +version = "1.0.1+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c" +dependencies = [ + "cfg-if", + "js-sys", + "once_cell", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" +dependencies = [ + "bumpalo", + "proc-macro2", + "quote", + "syn 2.0.111", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "wasm-streams" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webkit2gtk" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76b1bc1e54c581da1e9f179d0b38512ba358fb1af2d634a1affe42e37172361a" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk", + "gdk-sys", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "gtk", + "gtk-sys", + "javascriptcore-rs", + "libc", + "once_cell", + "soup3", + "webkit2gtk-sys", +] + +[[package]] +name = "webkit2gtk-sys" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62daa38afc514d1f8f12b8693d30d5993ff77ced33ce30cd04deebc267a6d57c" +dependencies = [ + "bitflags 1.3.2", + "cairo-sys-rs", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk-sys", + "javascriptcore-rs-sys", + "libc", + "pkg-config", + "soup3-sys", + "system-deps", +] + +[[package]] +name = "webview2-com" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4ba622a989277ef3886dd5afb3e280e3dd6d974b766118950a08f8f678ad6a4" +dependencies = [ + "webview2-com-macros", + "webview2-com-sys", + "windows", + "windows-core 0.61.2", + "windows-implement", + "windows-interface", +] + +[[package]] +name = "webview2-com-macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "webview2-com-sys" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36695906a1b53a3bf5c4289621efedac12b73eeb0b89e7e1a89b517302d5d75c" +dependencies = [ + "thiserror 2.0.17", + "windows", + "windows-core 0.61.2", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" +dependencies = [ + "windows-sys 0.61.2", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "window-vibrancy" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c" +dependencies = [ + "objc2 0.6.3", + "objc2-app-kit", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "raw-window-handle", + "windows-sys 0.59.0", + "windows-version", +] + +[[package]] +name = "windows" +version = "0.61.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" +dependencies = [ + "windows-collections", + "windows-core 0.61.2", + "windows-future", + "windows-link 0.1.3", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" +dependencies = [ + "windows-core 0.61.2", +] + +[[package]] +name = "windows-core" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link 0.1.3", + "windows-result 0.3.4", + "windows-strings 0.4.2", +] + +[[package]] +name = "windows-core" +version = "0.62.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link 0.2.1", + "windows-result 0.4.1", + "windows-strings 0.5.1", +] + +[[package]] +name = "windows-future" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" +dependencies = [ + "windows-core 0.61.2", + "windows-link 0.1.3", + "windows-threading", +] + +[[package]] +name = "windows-implement" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "windows-interface" +version = "0.59.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "windows-link" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" + +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + +[[package]] +name = "windows-numerics" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" +dependencies = [ + "windows-core 0.61.2", + "windows-link 0.1.3", +] + +[[package]] +name = "windows-result" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +dependencies = [ + "windows-link 0.1.3", +] + +[[package]] +name = "windows-result" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" +dependencies = [ + "windows-link 0.2.1", +] + +[[package]] +name = "windows-strings" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +dependencies = [ + "windows-link 0.1.3", +] + +[[package]] +name = "windows-strings" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" +dependencies = [ + "windows-link 0.2.1", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.5", +] + +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link 0.2.1", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +dependencies = [ + "windows-link 0.2.1", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", +] + +[[package]] +name = "windows-threading" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" +dependencies = [ + "windows-link 0.1.3", +] + +[[package]] +name = "windows-version" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4060a1da109b9d0326b7262c8e12c84df67cc0dbc9e33cf49e01ccc2eb63631" +dependencies = [ + "windows-link 0.2.1", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_i686_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.55.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97" +dependencies = [ + "cfg-if", + "windows-sys 0.59.0", +] + +[[package]] +name = "wit-bindgen" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" + +[[package]] +name = "writeable" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" + +[[package]] +name = "wry" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728b7d4c8ec8d81cab295e0b5b8a4c263c0d41a785fb8f8c4df284e5411140a2" +dependencies = [ + "base64 0.22.1", + "block2 0.6.2", + "cookie", + "crossbeam-channel", + "dirs", + "dpi", + "dunce", + "gdkx11", + "gtk", + "html5ever", + "http", + "javascriptcore-rs", + "jni", + "kuchikiki", + "libc", + "ndk", + "objc2 0.6.3", + "objc2-app-kit", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "objc2-ui-kit", + "objc2-web-kit", + "once_cell", + "percent-encoding", + "raw-window-handle", + "sha2", + "soup3", + "tao-macros", + "thiserror 2.0.17", + "url", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", + "windows", + "windows-core 0.61.2", + "windows-version", + "x11-dl", +] + +[[package]] +name = "x11" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "yoke" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" +dependencies = [ + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", + "synstructure", +] + +[[package]] +name = "zbus" +version = "5.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b622b18155f7a93d1cd2dc8c01d2d6a44e08fb9ebb7b3f9e6ed101488bad6c91" +dependencies = [ + "async-broadcast", + "async-executor", + "async-io", + "async-lock", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "enumflags2", + "event-listener", + "futures-core", + "futures-lite", + "hex", + "nix", + "ordered-stream", + "serde", + "serde_repr", + "tracing", + "uds_windows", + "uuid", + "windows-sys 0.61.2", + "winnow 0.7.14", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "5.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cdb94821ca8a87ca9c298b5d1cbd80e2a8b67115d99f6e4551ac49e42b6a314" +dependencies = [ + "proc-macro-crate 3.4.0", + "proc-macro2", + "quote", + "syn 2.0.111", + "zbus_names", + "zvariant", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97" +dependencies = [ + "serde", + "static_assertions", + "winnow 0.7.14", + "zvariant", +] + +[[package]] +name = "zerocopy" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "zerofrom" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", + "synstructure", +] + +[[package]] +name = "zerotrie" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "zvariant" +version = "5.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2be61892e4f2b1772727be11630a62664a1826b62efa43a6fe7449521cb8744c" +dependencies = [ + "endi", + "enumflags2", + "serde", + "winnow 0.7.14", + "zvariant_derive", + "zvariant_utils", +] + +[[package]] +name = "zvariant_derive" +version = "5.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da58575a1b2b20766513b1ec59d8e2e68db2745379f961f86650655e862d2006" +dependencies = [ + "proc-macro-crate 3.4.0", + "proc-macro2", + "quote", + "syn 2.0.111", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6949d142f89f6916deca2232cf26a8afacf2b9fdc35ce766105e104478be599" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "syn 2.0.111", + "winnow 0.7.14", +] diff --git a/apps/client/src-tauri/Cargo.toml b/apps/client/src-tauri/Cargo.toml new file mode 100644 index 0000000..633851c --- /dev/null +++ b/apps/client/src-tauri/Cargo.toml @@ -0,0 +1,25 @@ +[package] +name = "miclient" +version = "0.1.0" +description = "A Tauri App" +authors = ["you"] +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[lib] +# The `_lib` suffix may seem redundant but it is necessary +# to make the lib name unique and wouldn't conflict with the bin name. +# This seems to be only an issue on Windows, see https://github.com/rust-lang/cargo/issues/8519 +name = "miclient_lib" +crate-type = ["staticlib", "cdylib", "rlib"] + +[build-dependencies] +tauri-build = { version = "2", features = [] } + +[dependencies] +tauri = { version = "2", features = [] } +tauri-plugin-opener = "2" +serde = { version = "1", features = ["derive"] } +serde_json = "1" + diff --git a/apps/client/src-tauri/build.rs b/apps/client/src-tauri/build.rs new file mode 100644 index 0000000..d860e1e --- /dev/null +++ b/apps/client/src-tauri/build.rs @@ -0,0 +1,3 @@ +fn main() { + tauri_build::build() +} diff --git a/apps/client/src-tauri/capabilities/default.json b/apps/client/src-tauri/capabilities/default.json new file mode 100644 index 0000000..4cdbf49 --- /dev/null +++ b/apps/client/src-tauri/capabilities/default.json @@ -0,0 +1,10 @@ +{ + "$schema": "../gen/schemas/desktop-schema.json", + "identifier": "default", + "description": "Capability for the main window", + "windows": ["main"], + "permissions": [ + "core:default", + "opener:default" + ] +} diff --git a/apps/client/src-tauri/icons/128x128.png b/apps/client/src-tauri/icons/128x128.png new file mode 100644 index 0000000000000000000000000000000000000000..6be5e50e9b9ae84d9e2ee433f32ef446495eaf3b GIT binary patch literal 3512 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 literal 0 HcmV?d00001 diff --git a/apps/client/src-tauri/icons/128x128@2x.png b/apps/client/src-tauri/icons/128x128@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..e81becee571e96f76aa5667f9324c05e5e7a4479 GIT binary patch literal 7012 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 Sh@|Ye~|0>}wMPLT8jm@Y!H33Sz}5aFI6 zM9Lzqz|;A*0sGs=2A1uU!1nk2dGF7knQwr99SAFen)x(eCO;F8y2C~0FD1YxRTPcy zPWVxkUYmeuz}Tv?7&Fe-!UE{)ZW)Mb;H)^#eHDv$`dkZGguJz@^MA!ZNGAUqt{|0H zpZ7Ch9S`q5!>R%}>}62!+(T^evyO+ImSo2wpu)su4^3nw5(%)KD%gbSev^*HZZ&3( z#&c@Z0gH|}Ck)w6fh0&NBJ62ib%R}(3@$VFl*_#l2W$wQ-~4RmZZAt5O*^2Q5}Xr8Hy@c`#pM?kc?hFWxRXr*mUfUCXf4ka5DD~ zat6d85COB05l#(P9*cQZ3EC8fVdS~?&vN#rce(aF9@xp80O2{{FBvU+{X>Hoh;xI` z{$e^Nw1y*VbO8wv`8|-m?NwNaKGTGaF{P^JLB^DbOYWIbn%eT`*!^C1H36=O8Z-M> zkD~88ry`eSo`tEBN4>w7OWZwUzlh{WM1m8R6zepqGcGMaV7vWY9b?K4b6~|HVG)ec wi>I@ws#sZo7or4_*4M>7;p5{nr2pZ?Uu4>Krr0kU)&Kwi07*qoM6N<$f)&@lf&c&j literal 0 HcmV?d00001 diff --git a/apps/client/src-tauri/icons/Square107x107Logo.png b/apps/client/src-tauri/icons/Square107x107Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..0ca4f27198838968bd60ed7d371bfa23496b7fe5 GIT binary patch literal 2863 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 Y2S8W#vM)6=T>t<807*qoM6N<$f*y@n<^TWy literal 0 HcmV?d00001 diff --git a/apps/client/src-tauri/icons/Square284x284Logo.png b/apps/client/src-tauri/icons/Square284x284Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..c021d2ba76619c08969ab688db3b27f29257aa6f GIT binary patch literal 7737 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 literal 0 HcmV?d00001 diff --git a/apps/client/src-tauri/icons/Square30x30Logo.png b/apps/client/src-tauri/icons/Square30x30Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..621970023096ed9f494ba18ace15421a45cd65fa GIT binary patch literal 903 zcmV;219<$2P)2 z+CUKPMqaqGiH;zb!R4$B-WXS^YzQr=@UH>k4?*L)&R=zYjBrZenKdc9|JlS$SO*RJ zKt8FSTDAdk1g_WPAO!p^V!AuL;Lm;uQyV;zKq)J3i(;q*;k+pD%f3eltU`PYdy9(k0&%` zuWAPcV6|-y?|?7O1W!KSK}pbk8#~!|FA@(VJkt^V@0lio{afoAeo*f&$W2s6${5!1eKvAGD2$GZwSB98L2ZVS- zKn8ENRkZ*sb!@QugOrQNK3(sy1v%J#m|rpB+h|Nkqa3FRT>74xSs{#&saU2Lf!_Iq zKmuKAESh`gs!fneGWn+nf}l?7jE$HW!Af&vE5=G!QU)U2v&HLIBGXKk4nQx{hsHjL zLPMAo5=*uInFbq7(aa`Y2VX5wCmaeqvECOFv)a>0t>ZaEb*cJccER=BB?KFZhV$c^ znL*l8x*UYZv4WK|j?~Jt6~~F%{pk~z5A*>^M`?r5m9@RJ_x|uEtX(6Vk@Y()MVto* z93wr)%3m%|#OZ~srm>zF(JvDuTq*@;d&^>_BJm5hOU`3FjG70L#Vzv9I?`<7$T@

jU?lMi@tgxr7CqX_r3uw^y4tVU3Pm0sw;|1WSUO%?=bG`*Kmz6u4{#ti;T7AWIBAEh!(Y zz>O01&#X?Ds@L)Sb{CkG#Yz4$3o d@96)?#cz^xWoA}>B$xmI002ovPDHLkV1l3&k#zt7 literal 0 HcmV?d00001 diff --git a/apps/client/src-tauri/icons/Square310x310Logo.png b/apps/client/src-tauri/icons/Square310x310Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..f9bc04839491e66c07b16ab03743c0c53b4109cc GIT binary patch literal 8591 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 JPDHLkV1lm|RXG3v literal 0 HcmV?d00001 diff --git a/apps/client/src-tauri/icons/Square71x71Logo.png b/apps/client/src-tauri/icons/Square71x71Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..63440d7984936a9caa89275928d8dce97e4d033b GIT binary patch literal 2011 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∓t$dRJGIadE?vc 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 Kx8Vjl{{H|h@<;Lj literal 0 HcmV?d00001 diff --git a/apps/client/src-tauri/icons/icon.ico b/apps/client/src-tauri/icons/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..b3636e4b22ba65db9061cd60a77b02c92022dfd6 GIT binary patch literal 86642 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 AKmY&$ literal 0 HcmV?d00001 diff --git a/apps/client/src-tauri/icons/icon.png b/apps/client/src-tauri/icons/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e1cd2619e0b5ec089cbba5ec7b03ddf2b1dfceb6 GIT binary patch literal 14183 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

5l#v3A#xI3*z~1~fvo9Q(N^(==!|_FZ z*duZ=+M1~)8E|otX8KNZlr?qels#x_1Xq@9IIw~@9uAREJVH)Xw^}UclF6327}E42 zT)E&?U%TK?(+K7%R!`H5oX0i)4Qn5??Iw3p5J~6_u+aWehY{DSn}3V2p$bgjnAu?o)v@iC254fXeMv50$9YrpU`N?u@QIWs)T?SP|fa}(|9 zqAX+!7`cx=4)cCBg5h~pu(?@9`)aCr#oyz$ld=#RFxYCNZCZls@4v2~*e-t6PEVvV z&bbK3b3wt(Coc!ufAbXXC<**#HQ%J9k`New6iG<5RjtO4XVO?dCvwxD{kJ#tfQr(X zg^NTwF-FwAeS_{V4bfel8l`~NbfrTR2s!G>WduFWxH(t~aK4q=6rEE^$+Uox>gJO2 z{L<;6Q6nHa5#ZEM>H58not!)z(6*_=^~8}jWf*IG$AUKVWOZ4?)GfF z+BM#*wKKmLFD7E~W3U!$IVm$k_k1f&Kz6WV8@55P?r~bcg-Za-!rvW?ns&)KOGT2~ zlkAyqhQj=P$Eg3w#K~}zH@J5bo-BfHjInKSz$@?+Z)NPD4pHj^_Qxmi`UqoTy=`sV zLVxrXGuBr=QRm|}wg75yetQQK4fY3#P_~J}zEfPnb2C4Wo!E(d*(cA;b?7$g2in<( zPn)ghX}nzJPmb6(3Dpeg_GW~Hc}Lt=lgsSZz z!5QXyz7KaR;D`3Ee}d`af{H>WWZ|Io1QI3~4Ll_`g1(cRnhLK73Ro)7zPCd={1W2x zRp%Xlvv4>!<2@}$hz|!V{T}_eHx2xkLl^hQoZTCnsjCl|W_@5Fx2(+j0ogy&Y+;L- z<)G$*CiN7hOm^s!{U>1F7U=iNk{+u~dAC!eDz%=|glFW0jEZU1&o(G_c#wTxUjnG} z#cg3>jEpUi#Mlq@t?Msg_#geK^Lx@DyHWf7=AS5vVyM7YOjvUVCfcpVR<(+5!H?9- zySI6s>o3m&*zr||=wcPGyBkQV`EWJl@bH8qobjOp+sXL*)=&yX)8aAbf~tGv?a2SN zu^Ddo-z?DWk9h9Yz#5p^NU#x~wYSd?H@w@!2Gb4G)6-utEMV~~M85Br5ff(v5O1|T z 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 String { + format!("Hello, {}! You've been greeted from Rust!", name) +} + +#[cfg_attr(mobile, tauri::mobile_entry_point)] +pub fn run() { + tauri::Builder::default() + .plugin(tauri_plugin_opener::init()) + .invoke_handler(tauri::generate_handler![greet]) + .run(tauri::generate_context!()) + .expect("error while running tauri application"); +} diff --git a/apps/client/src-tauri/src/main.rs b/apps/client/src-tauri/src/main.rs new file mode 100644 index 0000000..d183cc0 --- /dev/null +++ b/apps/client/src-tauri/src/main.rs @@ -0,0 +1,6 @@ +// Prevents additional console window on Windows in release, DO NOT REMOVE!! +#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] + +fn main() { + miclient_lib::run() +} diff --git a/apps/client/src-tauri/tauri.conf.json b/apps/client/src-tauri/tauri.conf.json new file mode 100644 index 0000000..259bbd2 --- /dev/null +++ b/apps/client/src-tauri/tauri.conf.json @@ -0,0 +1,35 @@ +{ + "$schema": "https://schema.tauri.app/config/2", + "productName": "miclient", + "version": "0.1.0", + "identifier": "com.kamity.miclient", + "build": { + "beforeDevCommand": "pnpm vite:dev", + "devUrl": "http://localhost:1420", + "beforeBuildCommand": "pnpm build", + "frontendDist": "../dist" + }, + "app": { + "windows": [ + { + "title": "miclient", + "width": 800, + "height": 600 + } + ], + "security": { + "csp": null + } + }, + "bundle": { + "active": true, + "targets": "all", + "icon": [ + "icons/32x32.png", + "icons/128x128.png", + "icons/128x128@2x.png", + "icons/icon.icns", + "icons/icon.ico" + ] + } +} diff --git a/apps/client/src/App.tsx b/apps/client/src/App.tsx new file mode 100644 index 0000000..f5c258a --- /dev/null +++ b/apps/client/src/App.tsx @@ -0,0 +1,10 @@ +import { invoke } from "@tauri-apps/api/core"; +import { GameStage } from "./game/GameStage"; + +export default function App() { + return ( +

+ ); +} diff --git a/apps/client/src/assets/react.svg b/apps/client/src/assets/react.svg new file mode 100644 index 0000000..6c87de9 --- /dev/null +++ b/apps/client/src/assets/react.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/client/src/game/GameStage.tsx b/apps/client/src/game/GameStage.tsx new file mode 100644 index 0000000..e21e0e7 --- /dev/null +++ b/apps/client/src/game/GameStage.tsx @@ -0,0 +1,174 @@ +import { Application, extend } from "@pixi/react"; +import { Container, Graphics as PixiGraphics } from "pixi.js"; +import { type JSX, useCallback, useEffect, useMemo, useState } from "react"; +import { useGameStore } from "../store/game"; + +extend({ Container, Graphics: PixiGraphics }); + +type HoveredTile = { tx: number; ty: number } | null; + +export function GameStage() { + const { + tileSize, + worldWidth, + worldHeight, + viewWidth, + viewHeight, + player, + camera, + movePlayer, + setDestination, + } = useGameStore(); + + const [hoveredTile, setHoveredTile] = useState(null); + + const baseWidth = viewWidth * tileSize; + const baseHeight = viewHeight * tileSize; + + const worldOffsetX = -camera.cx * tileSize; + const worldOffsetY = -camera.cy * tileSize; + + // teclado (igual antes) + useEffect(() => { + const handler = (e: KeyboardEvent) => { + switch (e.key) { + case "w": + case "ArrowUp": + movePlayer(0, -1); + break; + case "s": + case "ArrowDown": + movePlayer(0, 1); + break; + case "a": + case "ArrowLeft": + movePlayer(-1, 0); + break; + case "d": + case "ArrowRight": + movePlayer(1, 0); + break; + } + }; + + window.addEventListener("keydown", handler); + return () => window.removeEventListener("keydown", handler); + }, [movePlayer]); + + // desenhar tiles visíveis, já com hover/click + const tiles = useMemo(() => { + const res: JSX.Element[] = []; + + for (let ty = camera.cy; ty < camera.cy + viewHeight; ty++) { + for (let tx = camera.cx; tx < camera.cx + viewWidth; tx++) { + if (tx < 0 || ty < 0 || tx >= worldWidth || ty >= worldHeight) continue; + + const x = tx * tileSize; + const y = ty * tileSize; + + const isHovered = hoveredTile?.tx === tx && hoveredTile?.ty === ty; + + res.push( + setHoveredTile({ tx, ty })} + onPointerOut={() => + setHoveredTile((current) => + current?.tx === tx && current?.ty === ty ? null : current, + ) + } + // click + onPointerTap={() => { + // aqui você manda o personagem ir até esse tile + setDestination(tx, ty); + }} + draw={(g: PixiGraphics) => { + g.clear(); + + const isOdd = (tx + ty) % 2 === 1; + const baseColor = isOdd ? 0x222222 : 0x333333; + + g.setFillStyle({ + color: baseColor, + }); + g.rect(0, 0, tileSize, tileSize); + g.fill(); + + // borda normal + g.setStrokeStyle({ + color: 0x444444, + width: 1, + }); + g.rect(0, 0, tileSize, tileSize); + g.stroke(); + + // se estiver hover, desenha uma borda extra (efeito Tibia) + if (isHovered) { + g.setStrokeStyle({ + color: 0xffff00, // amarelo + width: 2, + }); + g.rect(1, 1, tileSize - 2, tileSize - 2); + g.stroke(); + } + }} + />, + ); + } + } + + return res; + }, [ + camera.cx, + camera.cy, + viewHeight, + viewWidth, + worldWidth, + worldHeight, + tileSize, + hoveredTile, + movePlayer, + ]); + + // player + const playerPixelX = player.tx * tileSize; + const playerPixelY = player.ty * tileSize; + + const drawPlayer = useCallback( + (g: PixiGraphics) => { + g.clear(); + g.setFillStyle({ color: 0xffffff }); + g.rect(4, 4, tileSize - 8, tileSize - 8); + g.fill(); + }, + [tileSize], + ); + + return ( + + {/* container raiz com zoom, como antes */} + + + {/* tiles interativos */} + {tiles} + + {/* player */} + + + + + ); +} diff --git a/apps/client/src/game/movementSystem.ts b/apps/client/src/game/movementSystem.ts new file mode 100644 index 0000000..bdddbdf --- /dev/null +++ b/apps/client/src/game/movementSystem.ts @@ -0,0 +1,25 @@ +import { Ticker } from "pixi.js"; +import { useGameStore } from "../store/game"; + +let started = false; + +export function startMovementSystem() { + if (started) return; + started = true; + + const ticker = Ticker.shared; + const stepIntervalMs = 120; // tempo por "sqm" + let accumulator = 0; + + ticker.add((delta) => { + // delta ~ 1 a 60 FPS + const dtMs = delta * (1000 / 60); + accumulator += dtMs; + + if (accumulator < stepIntervalMs) return; + accumulator -= stepIntervalMs; + + const { stepTowardsDestination } = useGameStore.getState(); + stepTowardsDestination(); + }); +} diff --git a/apps/client/src/global.css b/apps/client/src/global.css new file mode 100644 index 0000000..f1d8c73 --- /dev/null +++ b/apps/client/src/global.css @@ -0,0 +1 @@ +@import "tailwindcss"; diff --git a/apps/client/src/main.tsx b/apps/client/src/main.tsx new file mode 100644 index 0000000..16bd43b --- /dev/null +++ b/apps/client/src/main.tsx @@ -0,0 +1,13 @@ +import "./global.css"; +import React from "react"; +import ReactDOM from "react-dom/client"; +import App from "./App"; +import { startMovementSystem } from "./game/movementSystem"; + +startMovementSystem(); + +ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render( + + + , +); diff --git a/apps/client/src/store/game.ts b/apps/client/src/store/game.ts new file mode 100644 index 0000000..a3271f9 --- /dev/null +++ b/apps/client/src/store/game.ts @@ -0,0 +1,116 @@ +import { create } from "zustand"; + +type Player = { tx: number; ty: number }; +type Camera = { cx: number; cy: number }; + +type Destination = { tx: number; ty: number } | null; + +type GameState = { + tileSize: number; + worldWidth: number; + worldHeight: number; + viewWidth: number; + viewHeight: number; + + player: Player; + camera: Camera; + + zoom: number; + + destination: Destination; + + setDestination: (tx: number, ty: number) => void; + clearDestination: () => void; + + movePlayer: (dx: number, dy: number) => void; + stepTowardsDestination: () => void; +}; + +function clamp(v: number, min: number, max: number) { + return Math.min(max, Math.max(min, v)); +} + +export const useGameStore = create((set, get) => ({ + tileSize: 32, + worldWidth: 100, + worldHeight: 100, + viewWidth: 15, + viewHeight: 11, + + player: { tx: 50, ty: 50 }, + camera: { + cx: 50 - Math.floor(15 / 2), + cy: 50 - Math.floor(11 / 2), + }, + + zoom: 1, + + destination: null, + + setDestination: (tx, ty) => { + set({ destination: { tx, ty } }); + }, + + clearDestination: () => { + set({ destination: null }); + }, + + // anda 1 tile (dx,dy), atualiza camera igual de antes + movePlayer: (dx, dy) => { + const state = get(); + const { worldWidth, worldHeight, viewWidth, viewHeight, player } = state; + + const tx = clamp(player.tx + dx, 0, worldWidth - 1); + const ty = clamp(player.ty + dy, 0, worldHeight - 1); + + const halfW = Math.floor(viewWidth / 2); + const halfH = Math.floor(viewHeight / 2); + + let cx = tx - halfW; + let cy = ty - halfH; + + const maxCx = Math.max(0, worldWidth - viewWidth); + const maxCy = Math.max(0, worldHeight - viewHeight); + + cx = clamp(cx, 0, maxCx); + cy = clamp(cy, 0, maxCy); + + set({ + player: { tx, ty }, + camera: { cx, cy }, + }); + }, + + // anda 1 tile em direção ao destino (sem pathfinding, só linha “quebrada”) + stepTowardsDestination: () => { + const { destination, player, movePlayer, clearDestination } = get(); + if (!destination) return; + + const { tx: ptx, ty: pty } = player; + const { tx: dtx, ty: dty } = destination; + + // já chegou + if (ptx === dtx && pty === dty) { + clearDestination(); + return; + } + + let dx = 0; + let dy = 0; + + // anda no eixo X primeiro + if (dtx > ptx) dx = 1; + else if (dtx < ptx) dx = -1; + // se X já está alinhado, anda no Y + else if (dty > pty) dy = 1; + else if (dty < pty) dy = -1; + + movePlayer(dx, dy); + + // se chegou no destino depois do passo, limpa + const newPlayer = get().player; + if (newPlayer.tx === dtx && newPlayer.ty === dty) { + clearDestination(); + } + }, +})); diff --git a/apps/client/src/vite-env.d.ts b/apps/client/src/vite-env.d.ts new file mode 100644 index 0000000..11f02fe --- /dev/null +++ b/apps/client/src/vite-env.d.ts @@ -0,0 +1 @@ +/// diff --git a/apps/client/tsconfig.json b/apps/client/tsconfig.json new file mode 100644 index 0000000..aca4895 --- /dev/null +++ b/apps/client/tsconfig.json @@ -0,0 +1,25 @@ +{ + "compilerOptions": { + "target": "ES2020", + "useDefineForClassFields": true, + "lib": ["ES2020", "DOM", "DOM.Iterable"], + "module": "ESNext", + "skipLibCheck": true, + + /* Bundler mode */ + "moduleResolution": "bundler", + "allowImportingTsExtensions": true, + "resolveJsonModule": true, + "isolatedModules": true, + "noEmit": true, + "jsx": "react-jsx", + + /* Linting */ + "strict": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "noFallthroughCasesInSwitch": true + }, + "include": ["src"], + "references": [{ "path": "./tsconfig.node.json" }] +} diff --git a/apps/client/tsconfig.node.json b/apps/client/tsconfig.node.json new file mode 100644 index 0000000..eca6668 --- /dev/null +++ b/apps/client/tsconfig.node.json @@ -0,0 +1,10 @@ +{ + "compilerOptions": { + "composite": true, + "skipLibCheck": true, + "module": "ESNext", + "moduleResolution": "bundler", + "allowSyntheticDefaultImports": true + }, + "include": ["vite.config.ts"] +} diff --git a/apps/client/vite.config.ts b/apps/client/vite.config.ts new file mode 100644 index 0000000..33f6aad --- /dev/null +++ b/apps/client/vite.config.ts @@ -0,0 +1,32 @@ +import tailwindcss from "@tailwindcss/vite"; +import react from "@vitejs/plugin-react"; +import { defineConfig } from "vite"; + +const host = process.env.TAURI_DEV_HOST; + +// https://vite.dev/config/ +export default defineConfig(async () => ({ + plugins: [react(), tailwindcss()], + + // Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build` + // + // 1. prevent Vite from obscuring rust errors + clearScreen: false, + // 2. tauri expects a fixed port, fail if that port is not available + server: { + port: 1420, + strictPort: true, + host: host || false, + hmr: host + ? { + protocol: "ws", + host, + port: 1421, + } + : undefined, + watch: { + // 3. tell Vite to ignore watching `src-tauri` + ignored: ["**/src-tauri/**"], + }, + }, +})); diff --git a/apps/web/package.json b/apps/web/package.json index 50cc61a..19ab1ca 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -26,14 +26,14 @@ "@radix-ui/react-radio-group": "^1.3.8", "@radix-ui/react-slot": "^1.2.4", "@radix-ui/react-tooltip": "^1.2.8", - "@tailwindcss/vite": "^4.1.17", + "@tailwindcss/vite": "catalog:vite", "@tanstack/react-query": "^5.90.12", "@tanstack/react-query-devtools": "^5.91.1", "@tanstack/react-router": "^1.139.14", "@tanstack/react-router-devtools": "^1.139.14", "@tanstack/router-plugin": "^1.139.14", "class-variance-authority": "^0.7.1", - "clsx": "^2.1.1", + "clsx": "catalog:tailwind", "cmdk": "^1.1.1", "envalid": "^8.1.1", "input-otp": "^1.4.2", @@ -42,18 +42,18 @@ "react-hook-form": "^7.68.0", "react-qrcode-logo": "^4.0.0", "sonner": "^2.0.7", - "tailwind-merge": "^3.4.0", - "tailwindcss": "^4.1.17", - "tw-animate-css": "^1.4.0", + "tailwind-merge": "catalog:tailwind", + "tailwindcss": "catalog:tailwind", + "tw-animate-css": "catalog:tailwind", "usehooks-ts": "^3.1.1", "zod": "catalog:" }, "devDependencies": { "@types/react": "catalog:react", "@types/react-dom": "catalog:react", - "@vitejs/plugin-react": "^5.1.1", + "@vitejs/plugin-react": "catalog:vite", "rollup-plugin-visualizer": "^6.0.5", "typescript": "catalog:ts", - "vite": "^7.2.6" + "vite": "catalog:vite" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7b74a39..9807bb7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -37,6 +37,29 @@ catalogs: '@orpc/zod': specifier: ^1.12.2 version: 1.12.2 + tailwind: + clsx: + specifier: ^2.1.1 + version: 2.1.1 + tailwind-merge: + specifier: ^3.4.0 + version: 3.4.0 + tailwindcss: + specifier: ^4.1.18 + version: 4.1.18 + tw-animate-css: + specifier: ^1.4.0 + version: 1.4.0 + vite: + '@tailwindcss/vite': + specifier: ^4.1.18 + version: 4.1.18 + '@vitejs/plugin-react': + specifier: ^5.1.1 + version: 5.1.1 + vite: + specifier: ^7.2.6 + version: 7.2.6 overrides: '@types/react': ^19.2.7 @@ -204,6 +227,64 @@ importers: specifier: ^5.9.3 version: 5.9.3 + apps/client: + dependencies: + '@pixi/react': + specifier: ^8.0.5 + version: 8.0.5(@types/react@19.2.7)(pixi.js@8.14.3)(react@19.2.1) + '@tailwindcss/vite': + specifier: catalog:vite + version: 4.1.18(vite@7.2.6(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1)) + '@tauri-apps/api': + specifier: ^2.9.1 + version: 2.9.1 + '@tauri-apps/plugin-opener': + specifier: ^2.5.2 + version: 2.5.2 + clsx: + specifier: catalog:tailwind + version: 2.1.1 + pixi.js: + specifier: ^8.14.3 + version: 8.14.3 + react: + specifier: ^19.2.1 + version: 19.2.1 + react-dom: + specifier: ^19.2.1 + version: 19.2.1(react@19.2.1) + tailwind-merge: + specifier: catalog:tailwind + version: 3.4.0 + tailwindcss: + specifier: catalog:tailwind + version: 4.1.18 + tw-animate-css: + specifier: catalog:tailwind + version: 1.4.0 + zustand: + specifier: ^5.0.9 + version: 5.0.9(@types/react@19.2.7)(react@19.2.1)(use-sync-external-store@1.6.0(react@19.2.1)) + devDependencies: + '@tauri-apps/cli': + specifier: ^2.9.6 + version: 2.9.6 + '@types/react': + specifier: ^19.2.7 + version: 19.2.7 + '@types/react-dom': + specifier: ^19.2.3 + version: 19.2.3(@types/react@19.2.7) + '@vitejs/plugin-react': + specifier: catalog:vite + version: 5.1.1(vite@7.2.6(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1)) + typescript: + specifier: ^5.9.3 + version: 5.9.3 + vite: + specifier: catalog:vite + version: 7.2.6(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1) + apps/web: dependencies: '@hookform/resolvers': @@ -243,8 +324,8 @@ importers: specifier: ^1.2.8 version: 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) '@tailwindcss/vite': - specifier: ^4.1.17 - version: 4.1.17(vite@7.2.6(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1)) + specifier: catalog:vite + version: 4.1.18(vite@7.2.6(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1)) '@tanstack/react-query': specifier: ^5.90.12 version: 5.90.12(react@19.2.1) @@ -264,7 +345,7 @@ importers: specifier: ^0.7.1 version: 0.7.1 clsx: - specifier: ^2.1.1 + specifier: catalog:tailwind version: 2.1.1 cmdk: specifier: ^1.1.1 @@ -291,13 +372,13 @@ importers: specifier: ^2.0.7 version: 2.0.7(react-dom@19.2.1(react@19.2.1))(react@19.2.1) tailwind-merge: - specifier: ^3.4.0 + specifier: catalog:tailwind version: 3.4.0 tailwindcss: - specifier: ^4.1.17 - version: 4.1.17 + specifier: catalog:tailwind + version: 4.1.18 tw-animate-css: - specifier: ^1.4.0 + specifier: catalog:tailwind version: 1.4.0 usehooks-ts: specifier: ^3.1.1 @@ -313,7 +394,7 @@ importers: specifier: ^19.2.3 version: 19.2.3(@types/react@19.2.7) '@vitejs/plugin-react': - specifier: ^5.1.1 + specifier: catalog:vite version: 5.1.1(vite@7.2.6(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1)) rollup-plugin-visualizer: specifier: ^6.0.5 @@ -322,7 +403,7 @@ importers: specifier: ^5.9.3 version: 5.9.3 vite: - specifier: ^7.2.6 + specifier: catalog:vite version: 7.2.6(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1) packages/core: @@ -1669,6 +1750,15 @@ packages: '@oxc-project/types@0.95.0': resolution: {integrity: sha512-vACy7vhpMPhjEJhULNxrdR0D943TkA/MigMpJCHmBHvMXxRStRi/dPtTlfQ3uDwWSzRpT8z+7ImjZVf8JWBocQ==} + '@pixi/colord@2.9.6': + resolution: {integrity: sha512-nezytU2pw587fQstUu1AsJZDVEynjskwOL+kibwcdxsMBFqPsFFNA7xl0ii/gXuDi6M0xj3mfRJj8pBSc2jCfA==} + + '@pixi/react@8.0.5': + resolution: {integrity: sha512-Z1VRdnv9Gh+lTLzNKjpS7GaTNDjUxRVJNtIdtK2i0sCpigvjx5mvJ72EPLhBFgepB6j3ZCkL0YBb6BqgTGbhGA==} + peerDependencies: + pixi.js: ^8.2.6 + react: ^19.2.1 + '@prisma/adapter-mariadb@6.19.0': resolution: {integrity: sha512-Rvp/DipkVgg79fvWxRJ/G0C7QactfyLub1PNeRyotiwDrC3UGMUEpsb0uTaRU6Ji9PmLapcy21Lr0X0QX2X+3w==} @@ -2721,65 +2811,65 @@ packages: '@swc/helpers@0.5.15': resolution: {integrity: sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==} - '@tailwindcss/node@4.1.17': - resolution: {integrity: sha512-csIkHIgLb3JisEFQ0vxr2Y57GUNYh447C8xzwj89U/8fdW8LhProdxvnVH6U8M2Y73QKiTIH+LWbK3V2BBZsAg==} + '@tailwindcss/node@4.1.18': + resolution: {integrity: sha512-DoR7U1P7iYhw16qJ49fgXUlry1t4CpXeErJHnQ44JgTSKMaZUdf17cfn5mHchfJ4KRBZRFA/Coo+MUF5+gOaCQ==} - '@tailwindcss/oxide-android-arm64@4.1.17': - resolution: {integrity: sha512-BMqpkJHgOZ5z78qqiGE6ZIRExyaHyuxjgrJ6eBO5+hfrfGkuya0lYfw8fRHG77gdTjWkNWEEm+qeG2cDMxArLQ==} + '@tailwindcss/oxide-android-arm64@4.1.18': + resolution: {integrity: sha512-dJHz7+Ugr9U/diKJA0W6N/6/cjI+ZTAoxPf9Iz9BFRF2GzEX8IvXxFIi/dZBloVJX/MZGvRuFA9rqwdiIEZQ0Q==} engines: {node: '>= 10'} cpu: [arm64] os: [android] - '@tailwindcss/oxide-darwin-arm64@4.1.17': - resolution: {integrity: sha512-EquyumkQweUBNk1zGEU/wfZo2qkp/nQKRZM8bUYO0J+Lums5+wl2CcG1f9BgAjn/u9pJzdYddHWBiFXJTcxmOg==} + '@tailwindcss/oxide-darwin-arm64@4.1.18': + resolution: {integrity: sha512-Gc2q4Qhs660bhjyBSKgq6BYvwDz4G+BuyJ5H1xfhmDR3D8HnHCmT/BSkvSL0vQLy/nkMLY20PQ2OoYMO15Jd0A==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@tailwindcss/oxide-darwin-x64@4.1.17': - resolution: {integrity: sha512-gdhEPLzke2Pog8s12oADwYu0IAw04Y2tlmgVzIN0+046ytcgx8uZmCzEg4VcQh+AHKiS7xaL8kGo/QTiNEGRog==} + '@tailwindcss/oxide-darwin-x64@4.1.18': + resolution: {integrity: sha512-FL5oxr2xQsFrc3X9o1fjHKBYBMD1QZNyc1Xzw/h5Qu4XnEBi3dZn96HcHm41c/euGV+GRiXFfh2hUCyKi/e+yw==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@tailwindcss/oxide-freebsd-x64@4.1.17': - resolution: {integrity: sha512-hxGS81KskMxML9DXsaXT1H0DyA+ZBIbyG/sSAjWNe2EDl7TkPOBI42GBV3u38itzGUOmFfCzk1iAjDXds8Oh0g==} + '@tailwindcss/oxide-freebsd-x64@4.1.18': + resolution: {integrity: sha512-Fj+RHgu5bDodmV1dM9yAxlfJwkkWvLiRjbhuO2LEtwtlYlBgiAT4x/j5wQr1tC3SANAgD+0YcmWVrj8R9trVMA==} engines: {node: '>= 10'} cpu: [x64] os: [freebsd] - '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.17': - resolution: {integrity: sha512-k7jWk5E3ldAdw0cNglhjSgv501u7yrMf8oeZ0cElhxU6Y2o7f8yqelOp3fhf7evjIS6ujTI3U8pKUXV2I4iXHQ==} + '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.18': + resolution: {integrity: sha512-Fp+Wzk/Ws4dZn+LV2Nqx3IilnhH51YZoRaYHQsVq3RQvEl+71VGKFpkfHrLM/Li+kt5c0DJe/bHXK1eHgDmdiA==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@tailwindcss/oxide-linux-arm64-gnu@4.1.17': - resolution: {integrity: sha512-HVDOm/mxK6+TbARwdW17WrgDYEGzmoYayrCgmLEw7FxTPLcp/glBisuyWkFz/jb7ZfiAXAXUACfyItn+nTgsdQ==} + '@tailwindcss/oxide-linux-arm64-gnu@4.1.18': + resolution: {integrity: sha512-S0n3jboLysNbh55Vrt7pk9wgpyTTPD0fdQeh7wQfMqLPM/Hrxi+dVsLsPrycQjGKEQk85Kgbx+6+QnYNiHalnw==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tailwindcss/oxide-linux-arm64-musl@4.1.17': - resolution: {integrity: sha512-HvZLfGr42i5anKtIeQzxdkw/wPqIbpeZqe7vd3V9vI3RQxe3xU1fLjss0TjyhxWcBaipk7NYwSrwTwK1hJARMg==} + '@tailwindcss/oxide-linux-arm64-musl@4.1.18': + resolution: {integrity: sha512-1px92582HkPQlaaCkdRcio71p8bc8i/ap5807tPRDK/uw953cauQBT8c5tVGkOwrHMfc2Yh6UuxaH4vtTjGvHg==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tailwindcss/oxide-linux-x64-gnu@4.1.17': - resolution: {integrity: sha512-M3XZuORCGB7VPOEDH+nzpJ21XPvK5PyjlkSFkFziNHGLc5d6g3di2McAAblmaSUNl8IOmzYwLx9NsE7bplNkwQ==} + '@tailwindcss/oxide-linux-x64-gnu@4.1.18': + resolution: {integrity: sha512-v3gyT0ivkfBLoZGF9LyHmts0Isc8jHZyVcbzio6Wpzifg/+5ZJpDiRiUhDLkcr7f/r38SWNe7ucxmGW3j3Kb/g==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tailwindcss/oxide-linux-x64-musl@4.1.17': - resolution: {integrity: sha512-k7f+pf9eXLEey4pBlw+8dgfJHY4PZ5qOUFDyNf7SI6lHjQ9Zt7+NcscjpwdCEbYi6FI5c2KDTDWyf2iHcCSyyQ==} + '@tailwindcss/oxide-linux-x64-musl@4.1.18': + resolution: {integrity: sha512-bhJ2y2OQNlcRwwgOAGMY0xTFStt4/wyU6pvI6LSuZpRgKQwxTec0/3Scu91O8ir7qCR3AuepQKLU/kX99FouqQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tailwindcss/oxide-wasm32-wasi@4.1.17': - resolution: {integrity: sha512-cEytGqSSoy7zK4JRWiTCx43FsKP/zGr0CsuMawhH67ONlH+T79VteQeJQRO/X7L0juEUA8ZyuYikcRBf0vsxhg==} + '@tailwindcss/oxide-wasm32-wasi@4.1.18': + resolution: {integrity: sha512-LffYTvPjODiP6PT16oNeUQJzNVyJl1cjIebq/rWWBF+3eDst5JGEFSc5cWxyRCJ0Mxl+KyIkqRxk1XPEs9x8TA==} engines: {node: '>=14.0.0'} cpu: [wasm32] bundledDependencies: @@ -2790,24 +2880,24 @@ packages: - '@emnapi/wasi-threads' - tslib - '@tailwindcss/oxide-win32-arm64-msvc@4.1.17': - resolution: {integrity: sha512-JU5AHr7gKbZlOGvMdb4722/0aYbU+tN6lv1kONx0JK2cGsh7g148zVWLM0IKR3NeKLv+L90chBVYcJ8uJWbC9A==} + '@tailwindcss/oxide-win32-arm64-msvc@4.1.18': + resolution: {integrity: sha512-HjSA7mr9HmC8fu6bdsZvZ+dhjyGCLdotjVOgLA2vEqxEBZaQo9YTX4kwgEvPCpRh8o4uWc4J/wEoFzhEmjvPbA==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@tailwindcss/oxide-win32-x64-msvc@4.1.17': - resolution: {integrity: sha512-SKWM4waLuqx0IH+FMDUw6R66Hu4OuTALFgnleKbqhgGU30DY20NORZMZUKgLRjQXNN2TLzKvh48QXTig4h4bGw==} + '@tailwindcss/oxide-win32-x64-msvc@4.1.18': + resolution: {integrity: sha512-bJWbyYpUlqamC8dpR7pfjA0I7vdF6t5VpUGMWRkXVE3AXgIZjYUYAK7II1GNaxR8J1SSrSrppRar8G++JekE3Q==} engines: {node: '>= 10'} cpu: [x64] os: [win32] - '@tailwindcss/oxide@4.1.17': - resolution: {integrity: sha512-F0F7d01fmkQhsTjXezGBLdrl1KresJTcI3DB8EkScCldyKp3Msz4hub4uyYaVnk88BAS1g5DQjjF6F5qczheLA==} + '@tailwindcss/oxide@4.1.18': + resolution: {integrity: sha512-EgCR5tTS5bUSKQgzeMClT6iCY3ToqE1y+ZB0AKldj809QXk1Y+3jB0upOYZrn9aGIzPtUsP7sX4QQ4XtjBB95A==} engines: {node: '>= 10'} - '@tailwindcss/vite@4.1.17': - resolution: {integrity: sha512-4+9w8ZHOiGnpcGI6z1TVVfWaX/koK7fKeSYF3qlYg2xpBtbteP2ddBxiarL+HVgfSJGeK5RIxRQmKm4rTJJAwA==} + '@tailwindcss/vite@4.1.18': + resolution: {integrity: sha512-jVA+/UpKL1vRLg6Hkao5jldawNmRo7mQYrZtNHMIVpLfLhDml5nMRUo/8MwoX2vNXvnaXNNMedrMfMugAVX1nA==} peerDependencies: vite: ^5.2.0 || ^6 || ^7 @@ -2908,6 +2998,83 @@ packages: resolution: {integrity: sha512-9PImF1d1tovTUIpjFVa0W7Fwj/MHif7BaaczgJJfbv3sDt1Gh+oW9W9uCw9M3ndEJynnp5ZD/TTs0RGubH5ssg==} engines: {node: '>=12'} + '@tauri-apps/api@2.9.1': + resolution: {integrity: sha512-IGlhP6EivjXHepbBic618GOmiWe4URJiIeZFlB7x3czM0yDHHYviH1Xvoiv4FefdkQtn6v7TuwWCRfOGdnVUGw==} + + '@tauri-apps/cli-darwin-arm64@2.9.6': + resolution: {integrity: sha512-gf5no6N9FCk1qMrti4lfwP77JHP5haASZgVbBgpZG7BUepB3fhiLCXGUK8LvuOjP36HivXewjg72LTnPDScnQQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [darwin] + + '@tauri-apps/cli-darwin-x64@2.9.6': + resolution: {integrity: sha512-oWh74WmqbERwwrwcueJyY6HYhgCksUc6NT7WKeXyrlY/FPmNgdyQAgcLuTSkhRFuQ6zh4Np1HZpOqCTpeZBDcw==} + engines: {node: '>= 10'} + cpu: [x64] + os: [darwin] + + '@tauri-apps/cli-linux-arm-gnueabihf@2.9.6': + resolution: {integrity: sha512-/zde3bFroFsNXOHN204DC2qUxAcAanUjVXXSdEGmhwMUZeAQalNj5cz2Qli2elsRjKN/hVbZOJj0gQ5zaYUjSg==} + engines: {node: '>= 10'} + cpu: [arm] + os: [linux] + + '@tauri-apps/cli-linux-arm64-gnu@2.9.6': + resolution: {integrity: sha512-pvbljdhp9VOo4RnID5ywSxgBs7qiylTPlK56cTk7InR3kYSTJKYMqv/4Q/4rGo/mG8cVppesKIeBMH42fw6wjg==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + + '@tauri-apps/cli-linux-arm64-musl@2.9.6': + resolution: {integrity: sha512-02TKUndpodXBCR0oP//6dZWGYcc22Upf2eP27NvC6z0DIqvkBBFziQUcvi2n6SrwTRL0yGgQjkm9K5NIn8s6jw==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + + '@tauri-apps/cli-linux-riscv64-gnu@2.9.6': + resolution: {integrity: sha512-fmp1hnulbqzl1GkXl4aTX9fV+ubHw2LqlLH1PE3BxZ11EQk+l/TmiEongjnxF0ie4kV8DQfDNJ1KGiIdWe1GvQ==} + engines: {node: '>= 10'} + cpu: [riscv64] + os: [linux] + + '@tauri-apps/cli-linux-x64-gnu@2.9.6': + resolution: {integrity: sha512-vY0le8ad2KaV1PJr+jCd8fUF9VOjwwQP/uBuTJvhvKTloEwxYA/kAjKK9OpIslGA9m/zcnSo74czI6bBrm2sYA==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + + '@tauri-apps/cli-linux-x64-musl@2.9.6': + resolution: {integrity: sha512-TOEuB8YCFZTWVDzsO2yW0+zGcoMiPPwcUgdnW1ODnmgfwccpnihDRoks+ABT1e3fHb1ol8QQWsHSCovb3o2ENQ==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + + '@tauri-apps/cli-win32-arm64-msvc@2.9.6': + resolution: {integrity: sha512-ujmDGMRc4qRLAnj8nNG26Rlz9klJ0I0jmZs2BPpmNNf0gM/rcVHhqbEkAaHPTBVIrtUdf7bGvQAD2pyIiUrBHQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [win32] + + '@tauri-apps/cli-win32-ia32-msvc@2.9.6': + resolution: {integrity: sha512-S4pT0yAJgFX8QRCyKA1iKjZ9Q/oPjCZf66A/VlG5Yw54Nnr88J1uBpmenINbXxzyhduWrIXBaUbEY1K80ZbpMg==} + engines: {node: '>= 10'} + cpu: [ia32] + os: [win32] + + '@tauri-apps/cli-win32-x64-msvc@2.9.6': + resolution: {integrity: sha512-ldWuWSSkWbKOPjQMJoYVj9wLHcOniv7diyI5UAJ4XsBdtaFB0pKHQsqw/ItUma0VXGC7vB4E9fZjivmxur60aw==} + engines: {node: '>= 10'} + cpu: [x64] + os: [win32] + + '@tauri-apps/cli@2.9.6': + resolution: {integrity: sha512-3xDdXL5omQ3sPfBfdC8fCtDKcnyV7OqyzQgfyT5P3+zY6lcPqIYKQBvUasNvppi21RSdfhy44ttvJmftb0PCDw==} + engines: {node: '>= 10'} + hasBin: true + + '@tauri-apps/plugin-opener@2.5.2': + resolution: {integrity: sha512-ei/yRRoCklWHImwpCcDK3VhNXx+QXM9793aQ64YxpqVF0BDuuIlXhZgiAkc15wnPVav+IbkYhmDJIv5R326Mew==} + '@tybys/wasm-util@0.10.1': resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==} @@ -2935,9 +3102,15 @@ packages: '@types/cross-spawn@6.0.2': resolution: {integrity: sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==} + '@types/css-font-loading-module@0.0.12': + resolution: {integrity: sha512-x2tZZYkSxXqWvTDgveSynfjq/T2HyiZHXb00j/+gy19yp70PHCizM48XFdjBCWH7eHBD0R5i/pw9yMBP/BH5uA==} + '@types/debug@4.1.8': resolution: {integrity: sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ==} + '@types/earcut@3.0.0': + resolution: {integrity: sha512-k/9fOUGO39yd2sCjrbAJvGDEQvRwRnQIZlBz43roGwUZo5SHAmyVvSFyaVVZkicRVCaDXPKlbxrUcBuJoSWunQ==} + '@types/eslint-scope@3.7.7': resolution: {integrity: sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==} @@ -2985,6 +3158,11 @@ packages: peerDependencies: '@types/react': ^19.2.7 + '@types/react-reconciler@0.28.9': + resolution: {integrity: sha512-HHM3nxyUZ3zAylX8ZEyrDNd2XZOnQ0D5XfunJF5FLQnZbHHYq4UWvW1QfelQNXv1ICNkwYhfxjwfnqivYB6bFg==} + peerDependencies: + '@types/react': ^19.2.7 + '@types/react@19.2.7': resolution: {integrity: sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==} @@ -3052,6 +3230,13 @@ packages: '@webassemblyjs/wast-printer@1.14.1': resolution: {integrity: sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==} + '@webgpu/types@0.1.67': + resolution: {integrity: sha512-uk53+2ECGUkWoDFez/hymwpRfdgdIn6y1ref70fEecGMe5607f4sozNFgBk0oxlr7j2CRGWBEc3IBYMmFdGGTQ==} + + '@xmldom/xmldom@0.8.11': + resolution: {integrity: sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==} + engines: {node: '>=10.0.0'} + '@xtuc/ieee754@1.2.0': resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==} @@ -3735,6 +3920,9 @@ packages: resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==} engines: {node: '>= 0.4'} + earcut@3.0.2: + resolution: {integrity: sha512-X7hshQbLyMJ/3RPhyObLARM2sNxxmRALLKx1+NVFFnQ9gKzmCrxm9+uLIAdBcvc8FNLpctqlQ2V6AE92Ol9UDQ==} + eastasianwidth@0.2.0: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} @@ -4074,6 +4262,9 @@ packages: get-tsconfig@4.13.0: resolution: {integrity: sha512-1VKTZJCwBrvbd+Wn3AOgQP/2Av+TfTCOlE4AcRJE72W1ksZXbAx8PPBR9RzgTeSPzlPMHrbANMH3LbltH73wxQ==} + gifuct-js@2.1.2: + resolution: {integrity: sha512-rI2asw77u0mGgwhV3qA+OEgYqaDn5UNqgs+Bx0FGwSpuqfYn+Ir6RQY5ENNQ8SbIiG/m5gVa7CD5RriO4f4Lsg==} + giget@2.0.0: resolution: {integrity: sha512-L5bGsVkxJbJgdnwyuheIunkGatUF/zssUoxxjACCseZYAVbaqdh9Tsmmlkl8vYan09H7sbvKt4pS8GqKLBrEzA==} hasBin: true @@ -4390,6 +4581,14 @@ packages: isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} + ismobilejs@1.1.1: + resolution: {integrity: sha512-VaFW53yt8QO61k2WJui0dHf4SlL8lxBofUuUmwBo0ljPk0Drz2TiuDW4jo3wDcv41qy/SxrJ+VAzJ/qYqsmzRw==} + + its-fine@2.0.0: + resolution: {integrity: sha512-KLViCmWx94zOvpLwSlsx6yOCeMhZYaxrJV87Po5k/FoZzcPSahvK5qJ7fYhS61sZi5ikmh2S3Hz55A2l3U69ng==} + peerDependencies: + react: ^19.2.1 + jackspeak@4.1.1: resolution: {integrity: sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==} engines: {node: 20 || >=22} @@ -4410,6 +4609,9 @@ packages: resolution: {integrity: sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==} hasBin: true + js-binary-schema-parser@2.0.3: + resolution: {integrity: sha512-xezGJmOb4lk/M1ZZLTR/jaBHQ4gG/lqQnJqdIv4721DMggsa1bDVlHXNeHYogaIEHD9vCRv0fcL4hMA+Coarkg==} + js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} @@ -4428,9 +4630,6 @@ packages: json-schema-traverse@1.0.0: resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==} - json-schema-typed@8.0.1: - resolution: {integrity: sha512-XQmWYj2Sm4kn4WeTYvmpKEbyPsL7nBsb647c7pMe6l02/yx2+Jfc4dT6UZkEXnIUb5LhD55r2HPsJ1milQ4rDg==} - json-schema-typed@8.0.2: resolution: {integrity: sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==} @@ -5039,6 +5238,9 @@ packages: resolution: {integrity: sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==} engines: {node: '>=0.10.0'} + parse-svg-path@0.1.2: + resolution: {integrity: sha512-JyPSBnkTJ0AI8GGJLfMXvKq42cj5c006fnLz6fXy6zfoVjJizi8BNTpu8on8ziI1cKy9d9DGNuY17Ce7wuejpQ==} + parseley@0.12.1: resolution: {integrity: sha512-e6qHKe3a9HWr0oMRVDTRhKce+bRO8VGQR3NyVwcjwrbhMmFCX9KszEV35+rn4AdilFAq9VPxP/Fe1wC9Qjd2lw==} @@ -5106,6 +5308,9 @@ packages: resolution: {integrity: sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==} engines: {node: '>= 6'} + pixi.js@8.14.3: + resolution: {integrity: sha512-6xGYARV8D9E/fO1c2NmYn+k2dQ5oZldVm5tNlLQJ8obTlOQXdL5QpMc217qTpRyHVDFaw5eoFCLF1gr6p5ZcjQ==} + pkg-dir@4.2.0: resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==} engines: {node: '>=8'} @@ -5260,6 +5465,12 @@ packages: react: ^19.2.1 react-dom: ^19.2.1 + react-reconciler@0.31.0: + resolution: {integrity: sha512-7Ob7Z+URmesIsIVRjnLoDGwBEG/tVitidU0nMsqX/eeJaLY89RISO/10ERe0MqmzuKUUB1rmY+h1itMbUHg9BQ==} + engines: {node: '>=0.10.0'} + peerDependencies: + react: ^19.2.1 + react-refresh@0.18.0: resolution: {integrity: sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==} engines: {node: '>=0.10.0'} @@ -5482,6 +5693,9 @@ packages: safer-buffer@2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} + scheduler@0.25.0: + resolution: {integrity: sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==} + scheduler@0.27.0: resolution: {integrity: sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==} @@ -5806,8 +6020,8 @@ packages: tailwindcss@4.1.12: resolution: {integrity: sha512-DzFtxOi+7NsFf7DBtI3BJsynR+0Yp6etH+nRPTbpWnS2pZBaSksv/JGctNwSWzbFjp0vxSqknaUylseZqMDGrA==} - tailwindcss@4.1.17: - resolution: {integrity: sha512-j9Ee2YjuQqYT9bbRTfTZht9W/ytp5H+jJpZKiYdP/bpnXARAuELt9ofP0lPnmHjbga7SNQIxdTAXCmtKVYjN+Q==} + tailwindcss@4.1.18: + resolution: {integrity: sha512-4+Z+0yiYyEtUVCScyfHCxOYP06L5Ne+JiHhY2IjR2KWMIWhJOYZKLSGZaP5HkZ8+bY0cxfzwDE5uOmzFXyIwxw==} tapable@2.3.0: resolution: {integrity: sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==} @@ -5883,6 +6097,10 @@ packages: tiny-invariant@1.3.3: resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==} + tiny-lru@11.4.5: + resolution: {integrity: sha512-hkcz3FjNJfKXjV4mjQ1OrXSLAehg8Hw+cEZclOVT+5c/cWQWImQ9wolzTjth+dmmDe++p3bme3fTxz6Q4Etsqw==} + engines: {node: '>=12'} + tiny-warning@1.0.3: resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==} @@ -6309,6 +6527,24 @@ packages: zod@4.1.13: resolution: {integrity: sha512-AvvthqfqrAhNH9dnfmrfKzX5upOdjUVJYFqNSlkmGf64gRaTzlPwz99IHYnVs28qYAybvAlBV+H7pn0saFY4Ig==} + zustand@5.0.9: + resolution: {integrity: sha512-ALBtUj0AfjJt3uNRQoL1tL2tMvj6Gp/6e39dnfT6uzpelGru8v1tPOGBzayOWbPJvujM8JojDk3E1LxeFisBNg==} + engines: {node: '>=12.20.0'} + peerDependencies: + '@types/react': ^19.2.7 + immer: '>=9.0.6' + react: ^19.2.1 + use-sync-external-store: '>=1.2.0' + peerDependenciesMeta: + '@types/react': + optional: true + immer: + optional: true + react: + optional: true + use-sync-external-store: + optional: true + snapshots: '@alloc/quick-lru@5.2.0': {} @@ -7932,6 +8168,17 @@ snapshots: '@oxc-project/types@0.95.0': {} + '@pixi/colord@2.9.6': {} + + '@pixi/react@8.0.5(@types/react@19.2.7)(pixi.js@8.14.3)(react@19.2.1)': + dependencies: + its-fine: 2.0.0(@types/react@19.2.7)(react@19.2.1) + pixi.js: 8.14.3 + react: 19.2.1 + react-reconciler: 0.31.0(react@19.2.1) + transitivePeerDependencies: + - '@types/react' + '@prisma/adapter-mariadb@6.19.0': dependencies: '@prisma/driver-adapter-utils': 6.19.0 @@ -9140,7 +9387,7 @@ snapshots: dependencies: tslib: 2.8.1 - '@tailwindcss/node@4.1.17': + '@tailwindcss/node@4.1.18': dependencies: '@jridgewell/remapping': 2.3.5 enhanced-resolve: 5.18.3 @@ -9148,64 +9395,64 @@ snapshots: lightningcss: 1.30.2 magic-string: 0.30.21 source-map-js: 1.2.1 - tailwindcss: 4.1.17 + tailwindcss: 4.1.18 - '@tailwindcss/oxide-android-arm64@4.1.17': + '@tailwindcss/oxide-android-arm64@4.1.18': optional: true - '@tailwindcss/oxide-darwin-arm64@4.1.17': + '@tailwindcss/oxide-darwin-arm64@4.1.18': optional: true - '@tailwindcss/oxide-darwin-x64@4.1.17': + '@tailwindcss/oxide-darwin-x64@4.1.18': optional: true - '@tailwindcss/oxide-freebsd-x64@4.1.17': + '@tailwindcss/oxide-freebsd-x64@4.1.18': optional: true - '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.17': + '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.18': optional: true - '@tailwindcss/oxide-linux-arm64-gnu@4.1.17': + '@tailwindcss/oxide-linux-arm64-gnu@4.1.18': optional: true - '@tailwindcss/oxide-linux-arm64-musl@4.1.17': + '@tailwindcss/oxide-linux-arm64-musl@4.1.18': optional: true - '@tailwindcss/oxide-linux-x64-gnu@4.1.17': + '@tailwindcss/oxide-linux-x64-gnu@4.1.18': optional: true - '@tailwindcss/oxide-linux-x64-musl@4.1.17': + '@tailwindcss/oxide-linux-x64-musl@4.1.18': optional: true - '@tailwindcss/oxide-wasm32-wasi@4.1.17': + '@tailwindcss/oxide-wasm32-wasi@4.1.18': optional: true - '@tailwindcss/oxide-win32-arm64-msvc@4.1.17': + '@tailwindcss/oxide-win32-arm64-msvc@4.1.18': optional: true - '@tailwindcss/oxide-win32-x64-msvc@4.1.17': + '@tailwindcss/oxide-win32-x64-msvc@4.1.18': optional: true - '@tailwindcss/oxide@4.1.17': + '@tailwindcss/oxide@4.1.18': optionalDependencies: - '@tailwindcss/oxide-android-arm64': 4.1.17 - '@tailwindcss/oxide-darwin-arm64': 4.1.17 - '@tailwindcss/oxide-darwin-x64': 4.1.17 - '@tailwindcss/oxide-freebsd-x64': 4.1.17 - '@tailwindcss/oxide-linux-arm-gnueabihf': 4.1.17 - '@tailwindcss/oxide-linux-arm64-gnu': 4.1.17 - '@tailwindcss/oxide-linux-arm64-musl': 4.1.17 - '@tailwindcss/oxide-linux-x64-gnu': 4.1.17 - '@tailwindcss/oxide-linux-x64-musl': 4.1.17 - '@tailwindcss/oxide-wasm32-wasi': 4.1.17 - '@tailwindcss/oxide-win32-arm64-msvc': 4.1.17 - '@tailwindcss/oxide-win32-x64-msvc': 4.1.17 - - '@tailwindcss/vite@4.1.17(vite@7.2.6(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1))': - dependencies: - '@tailwindcss/node': 4.1.17 - '@tailwindcss/oxide': 4.1.17 - tailwindcss: 4.1.17 + '@tailwindcss/oxide-android-arm64': 4.1.18 + '@tailwindcss/oxide-darwin-arm64': 4.1.18 + '@tailwindcss/oxide-darwin-x64': 4.1.18 + '@tailwindcss/oxide-freebsd-x64': 4.1.18 + '@tailwindcss/oxide-linux-arm-gnueabihf': 4.1.18 + '@tailwindcss/oxide-linux-arm64-gnu': 4.1.18 + '@tailwindcss/oxide-linux-arm64-musl': 4.1.18 + '@tailwindcss/oxide-linux-x64-gnu': 4.1.18 + '@tailwindcss/oxide-linux-x64-musl': 4.1.18 + '@tailwindcss/oxide-wasm32-wasi': 4.1.18 + '@tailwindcss/oxide-win32-arm64-msvc': 4.1.18 + '@tailwindcss/oxide-win32-x64-msvc': 4.1.18 + + '@tailwindcss/vite@4.1.18(vite@7.2.6(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1))': + dependencies: + '@tailwindcss/node': 4.1.18 + '@tailwindcss/oxide': 4.1.18 + tailwindcss: 4.1.18 vite: 7.2.6(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1) '@tanstack/history@1.139.0': {} @@ -9332,7 +9579,7 @@ snapshots: optionalDependencies: '@tanstack/react-router': 1.139.14(react-dom@19.2.1(react@19.2.1))(react@19.2.1) vite: 7.2.6(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1) - webpack: 5.102.1(esbuild@0.25.10) + webpack: 5.102.1 transitivePeerDependencies: - supports-color @@ -9353,6 +9600,59 @@ snapshots: '@tanstack/virtual-file-routes@1.139.0': {} + '@tauri-apps/api@2.9.1': {} + + '@tauri-apps/cli-darwin-arm64@2.9.6': + optional: true + + '@tauri-apps/cli-darwin-x64@2.9.6': + optional: true + + '@tauri-apps/cli-linux-arm-gnueabihf@2.9.6': + optional: true + + '@tauri-apps/cli-linux-arm64-gnu@2.9.6': + optional: true + + '@tauri-apps/cli-linux-arm64-musl@2.9.6': + optional: true + + '@tauri-apps/cli-linux-riscv64-gnu@2.9.6': + optional: true + + '@tauri-apps/cli-linux-x64-gnu@2.9.6': + optional: true + + '@tauri-apps/cli-linux-x64-musl@2.9.6': + optional: true + + '@tauri-apps/cli-win32-arm64-msvc@2.9.6': + optional: true + + '@tauri-apps/cli-win32-ia32-msvc@2.9.6': + optional: true + + '@tauri-apps/cli-win32-x64-msvc@2.9.6': + optional: true + + '@tauri-apps/cli@2.9.6': + optionalDependencies: + '@tauri-apps/cli-darwin-arm64': 2.9.6 + '@tauri-apps/cli-darwin-x64': 2.9.6 + '@tauri-apps/cli-linux-arm-gnueabihf': 2.9.6 + '@tauri-apps/cli-linux-arm64-gnu': 2.9.6 + '@tauri-apps/cli-linux-arm64-musl': 2.9.6 + '@tauri-apps/cli-linux-riscv64-gnu': 2.9.6 + '@tauri-apps/cli-linux-x64-gnu': 2.9.6 + '@tauri-apps/cli-linux-x64-musl': 2.9.6 + '@tauri-apps/cli-win32-arm64-msvc': 2.9.6 + '@tauri-apps/cli-win32-ia32-msvc': 2.9.6 + '@tauri-apps/cli-win32-x64-msvc': 2.9.6 + + '@tauri-apps/plugin-opener@2.5.2': + dependencies: + '@tauri-apps/api': 2.9.1 + '@tybys/wasm-util@0.10.1': dependencies: tslib: 2.8.1 @@ -9395,10 +9695,14 @@ snapshots: dependencies: '@types/node': 24.10.0 + '@types/css-font-loading-module@0.0.12': {} + '@types/debug@4.1.8': dependencies: '@types/ms': 2.1.0 + '@types/earcut@3.0.0': {} + '@types/eslint-scope@3.7.7': dependencies: '@types/eslint': 9.6.1 @@ -9449,6 +9753,10 @@ snapshots: dependencies: '@types/react': 19.2.7 + '@types/react-reconciler@0.28.9(@types/react@19.2.7)': + dependencies: + '@types/react': 19.2.7 + '@types/react@19.2.7': dependencies: csstype: 3.2.3 @@ -9560,6 +9868,10 @@ snapshots: '@webassemblyjs/ast': 1.14.1 '@xtuc/long': 4.2.2 + '@webgpu/types@0.1.67': {} + + '@xmldom/xmldom@0.8.11': {} + '@xtuc/ieee754@1.2.0': {} '@xtuc/long@4.2.2': {} @@ -10027,7 +10339,7 @@ snapshots: debounce-fn: 6.0.0 dot-prop: 10.1.0 env-paths: 3.0.0 - json-schema-typed: 8.0.1 + json-schema-typed: 8.0.2 semver: 7.7.3 uint8array-extras: 1.5.0 @@ -10262,6 +10574,8 @@ snapshots: es-errors: 1.3.0 gopd: 1.2.0 + earcut@3.0.2: {} + eastasianwidth@0.2.0: {} ecdsa-sig-formatter@1.0.11: @@ -10651,6 +10965,10 @@ snapshots: dependencies: resolve-pkg-maps: 1.0.0 + gifuct-js@2.1.2: + dependencies: + js-binary-schema-parser: 2.0.3 + giget@2.0.0: dependencies: citty: 0.1.6 @@ -10965,6 +11283,15 @@ snapshots: isexe@2.0.0: {} + ismobilejs@1.1.1: {} + + its-fine@2.0.0(@types/react@19.2.7)(react@19.2.1): + dependencies: + '@types/react-reconciler': 0.28.9(@types/react@19.2.7) + react: 19.2.1 + transitivePeerDependencies: + - '@types/react' + jackspeak@4.1.1: dependencies: '@isaacs/cliui': 8.0.2 @@ -10981,6 +11308,8 @@ snapshots: jiti@2.6.1: {} + js-binary-schema-parser@2.0.3: {} + js-tokens@4.0.0: {} js-yaml@4.1.1: @@ -10993,8 +11322,6 @@ snapshots: json-schema-traverse@1.0.0: {} - json-schema-typed@8.0.1: {} - json-schema-typed@8.0.2: {} json5@2.2.3: {} @@ -11558,6 +11885,8 @@ snapshots: parse-passwd@1.0.0: {} + parse-svg-path@0.1.2: {} + parseley@0.12.1: dependencies: leac: 0.6.0 @@ -11600,6 +11929,20 @@ snapshots: pirates@4.0.7: {} + pixi.js@8.14.3: + dependencies: + '@pixi/colord': 2.9.6 + '@types/css-font-loading-module': 0.0.12 + '@types/earcut': 3.0.0 + '@webgpu/types': 0.1.67 + '@xmldom/xmldom': 0.8.11 + earcut: 3.0.2 + eventemitter3: 5.0.1 + gifuct-js: 2.1.2 + ismobilejs: 1.1.1 + parse-svg-path: 0.1.2 + tiny-lru: 11.4.5 + pkg-dir@4.2.0: dependencies: find-up: 4.1.0 @@ -11757,6 +12100,11 @@ snapshots: react: 19.2.1 react-dom: 19.2.1(react@19.2.1) + react-reconciler@0.31.0(react@19.2.1): + dependencies: + react: 19.2.1 + scheduler: 0.25.0 + react-refresh@0.18.0: {} react-remove-scroll-bar@2.3.8(@types/react@19.2.7)(react@19.2.1): @@ -12004,6 +12352,8 @@ snapshots: safer-buffer@2.1.2: {} + scheduler@0.25.0: {} + scheduler@0.27.0: {} schema-utils@4.3.3: @@ -12368,7 +12718,7 @@ snapshots: tailwindcss@4.1.12: {} - tailwindcss@4.1.17: {} + tailwindcss@4.1.18: {} tapable@2.3.0: {} @@ -12418,6 +12768,16 @@ snapshots: optionalDependencies: esbuild: 0.25.10 + terser-webpack-plugin@5.3.14(webpack@5.102.1): + dependencies: + '@jridgewell/trace-mapping': 0.3.31 + jest-worker: 27.5.1 + schema-utils: 4.3.3 + serialize-javascript: 6.0.2 + terser: 5.44.1 + webpack: 5.102.1 + optional: true + terser@5.44.1: dependencies: '@jridgewell/source-map': 0.3.11 @@ -12441,6 +12801,8 @@ snapshots: tiny-invariant@1.3.3: {} + tiny-lru@11.4.5: {} + tiny-warning@1.0.3: {} tinyexec@0.3.2: {} @@ -12685,6 +13047,39 @@ snapshots: webpack-virtual-modules@0.6.2: {} + webpack@5.102.1: + dependencies: + '@types/eslint-scope': 3.7.7 + '@types/estree': 1.0.8 + '@types/json-schema': 7.0.15 + '@webassemblyjs/ast': 1.14.1 + '@webassemblyjs/wasm-edit': 1.14.1 + '@webassemblyjs/wasm-parser': 1.14.1 + acorn: 8.15.0 + acorn-import-phases: 1.0.4(acorn@8.15.0) + browserslist: 4.28.0 + chrome-trace-event: 1.0.4 + enhanced-resolve: 5.18.3 + es-module-lexer: 1.7.0 + eslint-scope: 5.1.1 + events: 3.3.0 + glob-to-regexp: 0.4.1 + graceful-fs: 4.2.11 + json-parse-even-better-errors: 2.3.1 + loader-runner: 4.3.1 + mime-types: 2.1.35 + neo-async: 2.6.2 + schema-utils: 4.3.3 + tapable: 2.3.0 + terser-webpack-plugin: 5.3.14(webpack@5.102.1) + watchpack: 2.4.4 + webpack-sources: 3.3.3 + transitivePeerDependencies: + - '@swc/core' + - esbuild + - uglify-js + optional: true + webpack@5.102.1(esbuild@0.25.10): dependencies: '@types/eslint-scope': 3.7.7 @@ -12795,3 +13190,9 @@ snapshots: zod@4.1.12: {} zod@4.1.13: {} + + zustand@5.0.9(@types/react@19.2.7)(react@19.2.1)(use-sync-external-store@1.6.0(react@19.2.1)): + optionalDependencies: + '@types/react': 19.2.7 + react: 19.2.1 + use-sync-external-store: 1.6.0(react@19.2.1) diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 8cb2755..b1fafe0 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -8,6 +8,10 @@ catalog: zod: ^4.1.13 catalogs: + vite: + vite: ^7.2.6 + "@vitejs/plugin-react": ^5.1.1 + "@tailwindcss/vite": ^4.1.18 orpc: "@orpc/client": ^1.12.2 "@orpc/experimental-publisher": ^1.12.2 @@ -23,6 +27,11 @@ catalogs: react-dom: ^19.2.1 ts: typescript: ^5.9.3 + tailwind: + tailwindcss: ^4.1.18 + tailwind-merge: ^3.4.0 + tw-animate-css: ^1.4.0 + clsx: ^2.1.1 overrides: "@types/react": catalog:react diff --git a/turbo.json b/turbo.json index 1819f21..14f48aa 100644 --- a/turbo.json +++ b/turbo.json @@ -5,7 +5,7 @@ "build": { "dependsOn": ["^build"], "inputs": ["$TURBO_DEFAULT$", ".env*"], - "outputs": ["dist/**", "out/**"] + "outputs": ["dist/**", "out/**", "src-tauri/target/**"] }, "lint": { "dependsOn": ["^lint"] From 7fb5084a6e362c991d1a474b92c999847b25fd78 Mon Sep 17 00:00:00 2001 From: Guilherme Fontes Date: Mon, 22 Dec 2025 10:31:22 -0400 Subject: [PATCH 02/18] feat: start project ot_client --- apps/client/src/App.tsx | 2 +- apps/client/src/game/movementSystem.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/client/src/App.tsx b/apps/client/src/App.tsx index f5c258a..28cae9a 100644 --- a/apps/client/src/App.tsx +++ b/apps/client/src/App.tsx @@ -1,4 +1,4 @@ -import { invoke } from "@tauri-apps/api/core"; +// import { invoke } from "@tauri-apps/api/core"; import { GameStage } from "./game/GameStage"; export default function App() { diff --git a/apps/client/src/game/movementSystem.ts b/apps/client/src/game/movementSystem.ts index bdddbdf..6c0b7ee 100644 --- a/apps/client/src/game/movementSystem.ts +++ b/apps/client/src/game/movementSystem.ts @@ -13,7 +13,7 @@ export function startMovementSystem() { ticker.add((delta) => { // delta ~ 1 a 60 FPS - const dtMs = delta * (1000 / 60); + const dtMs = Number(delta) * (1000 / 60); accumulator += dtMs; if (accumulator < stepIntervalMs) return; From bf143606ef02abf890badb792340d6dfee312280 Mon Sep 17 00:00:00 2001 From: Guilherme Fontes Date: Mon, 22 Dec 2025 10:34:14 -0400 Subject: [PATCH 03/18] feat: add new labeler on workflow and options in issue template --- .github/ISSUE_TEMPLATE/bug.yaml | 3 +++ .github/ISSUE_TEMPLATE/request.yaml | 3 +++ .github/labeler.yml | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml index d9ada2b..22f4387 100644 --- a/.github/ISSUE_TEMPLATE/bug.yaml +++ b/.github/ISSUE_TEMPLATE/bug.yaml @@ -28,6 +28,9 @@ body: options: - label: api - label: web + - label: packages + - label: client + - label: docker - label: Other validations: required: true diff --git a/.github/ISSUE_TEMPLATE/request.yaml b/.github/ISSUE_TEMPLATE/request.yaml index 139ff5e..9bf14fe 100644 --- a/.github/ISSUE_TEMPLATE/request.yaml +++ b/.github/ISSUE_TEMPLATE/request.yaml @@ -25,6 +25,9 @@ body: options: - label: api - label: web + - label: packages + - label: client + - label: docker - label: Other validations: required: true diff --git a/.github/labeler.yml b/.github/labeler.yml index d71c1c9..e91cd3b 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -6,6 +6,10 @@ - changed-files: - any-glob-to-any-file: ["apps/api/**"] +"Area: Client": + - changed-files: + - any-glob-to-any-file: ["apps/client/**"] + "Area: Web": - changed-files: - any-glob-to-any-file: ["apps/web/**"] From 26fc1d7279a141f9d1dcf1d1907f928cc61e95c2 Mon Sep 17 00:00:00 2001 From: Guilherme Fontes Date: Tue, 23 Dec 2025 07:56:07 -0400 Subject: [PATCH 04/18] feat: first iteration of canvas with panels --- apps/client/package.json | 3 + apps/client/src-tauri/tauri.conf.json | 7 +- apps/client/src/App.tsx | 10 - .../src/components/game/Canvas/index.tsx | 21 ++ .../components/game/ResizeBridge/index.tsx | 30 +++ .../src/components/game/Shell/index.tsx | 206 ++++++++++++++++++ .../src/components/game/Stage/index.tsx | 28 +++ .../src/components/game/World/index.tsx | 101 +++++++++ apps/client/src/game/GameStage.tsx | 174 --------------- apps/client/src/game/movementSystem.ts | 25 --- apps/client/src/main.tsx | 10 +- apps/client/src/pages/_root.tsx | 11 + apps/client/src/pages/game/index.tsx | 10 + apps/client/src/pages/login/index.tsx | 0 apps/client/src/sdk/constants.ts | 6 + apps/client/src/sdk/hooks/useContainerSize.ts | 26 +++ apps/client/src/sdk/hooks/usePixiScreen.ts | 25 +++ apps/client/src/sdk/store/config.ts | 37 ++++ apps/client/src/sdk/store/game.ts | 101 +++++++++ apps/client/src/sdk/systems/movement.ts | 21 ++ apps/client/src/sdk/systems/tiles.ts | 26 +++ apps/client/src/sdk/types/position.ts | 5 + apps/client/src/sdk/types/tile.ts | 5 + apps/client/src/store/game.ts | 116 ---------- apps/client/tsconfig.json | 3 + apps/client/vite.config.ts | 6 + pnpm-lock.yaml | 142 ++++++++---- 27 files changed, 776 insertions(+), 379 deletions(-) delete mode 100644 apps/client/src/App.tsx create mode 100644 apps/client/src/components/game/Canvas/index.tsx create mode 100644 apps/client/src/components/game/ResizeBridge/index.tsx create mode 100644 apps/client/src/components/game/Shell/index.tsx create mode 100644 apps/client/src/components/game/Stage/index.tsx create mode 100644 apps/client/src/components/game/World/index.tsx delete mode 100644 apps/client/src/game/GameStage.tsx delete mode 100644 apps/client/src/game/movementSystem.ts create mode 100644 apps/client/src/pages/_root.tsx create mode 100644 apps/client/src/pages/game/index.tsx create mode 100644 apps/client/src/pages/login/index.tsx create mode 100644 apps/client/src/sdk/constants.ts create mode 100644 apps/client/src/sdk/hooks/useContainerSize.ts create mode 100644 apps/client/src/sdk/hooks/usePixiScreen.ts create mode 100644 apps/client/src/sdk/store/config.ts create mode 100644 apps/client/src/sdk/store/game.ts create mode 100644 apps/client/src/sdk/systems/movement.ts create mode 100644 apps/client/src/sdk/systems/tiles.ts create mode 100644 apps/client/src/sdk/types/position.ts create mode 100644 apps/client/src/sdk/types/tile.ts delete mode 100644 apps/client/src/store/game.ts diff --git a/apps/client/package.json b/apps/client/package.json index 029898c..a299a62 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -18,7 +18,10 @@ "clsx": "catalog:tailwind", "pixi.js": "^8.14.3", "react": "catalog:react", + "react-dnd": "^16.0.1", + "react-dnd-html5-backend": "^16.0.1", "react-dom": "catalog:react", + "react-resizable-panels": "^4.0.15", "tailwind-merge": "catalog:tailwind", "tailwindcss": "catalog:tailwind", "tw-animate-css": "catalog:tailwind", diff --git a/apps/client/src-tauri/tauri.conf.json b/apps/client/src-tauri/tauri.conf.json index 259bbd2..dfda6dd 100644 --- a/apps/client/src-tauri/tauri.conf.json +++ b/apps/client/src-tauri/tauri.conf.json @@ -13,8 +13,11 @@ "windows": [ { "title": "miclient", - "width": 800, - "height": 600 + "minWidth": 1020, + "minHeight": 680, + "width": 1020, + "height": 680 + } ], "security": { diff --git a/apps/client/src/App.tsx b/apps/client/src/App.tsx deleted file mode 100644 index 28cae9a..0000000 --- a/apps/client/src/App.tsx +++ /dev/null @@ -1,10 +0,0 @@ -// import { invoke } from "@tauri-apps/api/core"; -import { GameStage } from "./game/GameStage"; - -export default function App() { - return ( -
- -
- ); -} diff --git a/apps/client/src/components/game/Canvas/index.tsx b/apps/client/src/components/game/Canvas/index.tsx new file mode 100644 index 0000000..1cd1a23 --- /dev/null +++ b/apps/client/src/components/game/Canvas/index.tsx @@ -0,0 +1,21 @@ +import { useLayoutEffect, useRef, useState } from "react"; +import { GameStage } from "../Stage"; + +export function GameCanvas() { + const parentRef = useRef(null); + const [mounted, setMounted] = useState(false); + + // monta UMA vez quando o ref existir (evita remounts e perda de contexto) + useLayoutEffect(() => { + if (parentRef.current) setMounted(true); + }, []); + + return ( +
+ {mounted && } +
+ ); +} diff --git a/apps/client/src/components/game/ResizeBridge/index.tsx b/apps/client/src/components/game/ResizeBridge/index.tsx new file mode 100644 index 0000000..b66dd32 --- /dev/null +++ b/apps/client/src/components/game/ResizeBridge/index.tsx @@ -0,0 +1,30 @@ +import { useApplication } from "@pixi/react"; +import { useLayoutEffect } from "react"; + +export function ResizeBridge({ + resizeTo, +}: { + resizeTo: React.RefObject; +}) { + const { app } = useApplication(); + + useLayoutEffect(() => { + const element = resizeTo.current; + if (!element) return; + + const apply = () => { + const w = Math.max(1, element.clientWidth); + const h = Math.max(1, element.clientHeight); + app.renderer.resize(w, h); + }; + + apply(); // resize inicial + + const ro = new ResizeObserver(() => apply()); + ro.observe(element); + + return () => ro.disconnect(); + }, [app, resizeTo]); + + return null; +} diff --git a/apps/client/src/components/game/Shell/index.tsx b/apps/client/src/components/game/Shell/index.tsx new file mode 100644 index 0000000..2b5241f --- /dev/null +++ b/apps/client/src/components/game/Shell/index.tsx @@ -0,0 +1,206 @@ +import { useMemo } from "react"; +import { useContainerSize } from "@/sdk/hooks/useContainerSize"; +import { + type GameConfigPanels, + type PanelSlot, + useConfigStore, +} from "@/sdk/store/config"; + +const PANEL_WIDTH = 175; +const MIN_CANVAS_WIDTH = 240; + +// prioridade de exibição dos painéis (quais somem primeiro) +const COLUMN_PRIORITY: Array = [ + "left1", + "left2", + "right1", + "right2", + "right3", +]; + +export const GameShell = ({ children }: { children: React.ReactNode }) => { + const panels = useConfigStore((state) => state.panels); + + const { ref, size } = useContainerSize(); + const containerWidth = size.width || 0; + + // quantas colunas laterais cabem mantendo center >= 240px + const maxSideColumnsByWidth = useMemo(() => { + if (containerWidth <= 0) return 0; + + const availableForSides = containerWidth - MIN_CANVAS_WIDTH; + if (availableForSides <= 0) return 0; + + return Math.max(0, Math.floor(availableForSides / PANEL_WIDTH)); + }, [containerWidth]); + + // aplica o limite de largura em cima do que está habilitado + const effectiveColumns = useMemo(() => { + const enabledSlots = COLUMN_PRIORITY.filter((slot) => panels[slot]); + const allowedCount = Math.min(maxSideColumnsByWidth, enabledSlots.length); + const visibleSet = new Set(enabledSlots.slice(0, allowedCount)); + + return { + left1: visibleSet.has("left1"), + left2: visibleSet.has("left2"), + right1: visibleSet.has("right1"), + right2: visibleSet.has("right2"), + right3: visibleSet.has("right3"), + health: panels.health, + chat: panels.chat, + }; + }, [maxSideColumnsByWidth, panels]); + + // grid EXTERNO: só colunas, uma linha única que ocupa a tela inteira + const gridTemplateColumns = useMemo( + () => + [ + effectiveColumns.left1 ? `${PANEL_WIDTH}px` : "0px", + effectiveColumns.left2 ? `${PANEL_WIDTH}px` : "0px", + "minmax(240px, 1fr)", // centro sempre >= 240px + effectiveColumns.right1 ? `${PANEL_WIDTH}px` : "0px", + effectiveColumns.right2 ? `${PANEL_WIDTH}px` : "0px", + effectiveColumns.right3 ? `${PANEL_WIDTH}px` : "0px", + ].join(" "), + [effectiveColumns], + ); + + return ( +
+ {/* LEFT PANELS */} +
+ {effectiveColumns.left1 && ( +
+ Panel Left 1 +
+ )} +
+ +
+ {effectiveColumns.left2 && ( +
+ Panel Left 2 +
+ )} +
+ + {/* CENTER: grid INTERNO com health / game / bottom */} +
+ + {children} + +
+ {/* RIGHT PANELS */} +
+ {effectiveColumns.right1 && ( +
Right 1
+ )} +
+ +
+ {effectiveColumns.right2 && ( +
Right 2
+ )} +
+ +
+ {effectiveColumns.right3 && ( +
Right 3
+ )} +
+
+ ); +}; + +type CenterColumnProps = { + children: React.ReactNode; // aqui entra o GameCanvas + showHealth: boolean; + showBottom: boolean; +}; + +const MIN_HEALTH = 40; +const MAX_HEALTH = 60; + +const MIN_BOTTOM = 120; +const MAX_BOTTOM = 180; + +export function CenterColumn({ + children, + showHealth, + showBottom, +}: CenterColumnProps) { + const healthRow = showHealth + ? `minmax(${MIN_HEALTH}px, ${MAX_HEALTH}px)` + : "0px"; + const bottomRow = showBottom + ? `minmax(${MIN_BOTTOM}px, ${MAX_BOTTOM}px)` + : "0px"; + + return ( +
+
+ {showHealth && HP/MP bar aqui} +
+ +
+ {children} +
+ +
+ {showBottom && ( +
+
+ chat +
+
+ )} +
+
+ ); +} diff --git a/apps/client/src/components/game/Stage/index.tsx b/apps/client/src/components/game/Stage/index.tsx new file mode 100644 index 0000000..b91874e --- /dev/null +++ b/apps/client/src/components/game/Stage/index.tsx @@ -0,0 +1,28 @@ +import { Application, extend } from "@pixi/react"; +import { Container, Graphics as PixiGraphics, Sprite } from "pixi.js"; +import { ResizeBridge } from "@/components/game/ResizeBridge"; +import { World } from "@/components/game/World"; + +extend({ Container, Graphics: PixiGraphics, Sprite }); + +export function GameStage({ + resizeTo, +}: { + resizeTo: React.RefObject; +}) { + return ( + + + + + ); +} diff --git a/apps/client/src/components/game/World/index.tsx b/apps/client/src/components/game/World/index.tsx new file mode 100644 index 0000000..71b9747 --- /dev/null +++ b/apps/client/src/components/game/World/index.tsx @@ -0,0 +1,101 @@ +import { Color } from "pixi.js"; +import { useCallback, useEffect, useMemo } from "react"; +import { + MAX_SCALE, + TILE_SIZE_PX, + VIEW_TILES_X, + VIEW_TILES_Y, +} from "@/sdk/constants"; +import { usePixiScreen } from "@/sdk/hooks/usePixiScreen"; +import { useGameStore } from "@/sdk/store/game"; +import { startMovementSystem } from "@/sdk/systems/movement"; +import { getViewTiles } from "@/sdk/systems/tiles"; +import type { Position } from "@/sdk/types/position"; + +export function World() { + const tiles = useGameStore((s) => s.tiles); + const initTestMap = useGameStore((s) => s.initTestMap); + const playerPosition = useGameStore((s) => s.playerPosition); + const setMoveTarget = useGameStore((s) => s.setMoveTarget); + const moveTarget = useGameStore((s) => s.moveTarget); + + useEffect(() => { + if (tiles.size === 0) initTestMap(); + }, [initTestMap, tiles.size]); + + useEffect(() => { + startMovementSystem(); + }, []); + + const { width, height } = usePixiScreen(); + + const viewTiles = useMemo( + () => getViewTiles(playerPosition, tiles), + [playerPosition, tiles], + ); + + const handleTileClick = useCallback( + (position: Position) => setMoveTarget(position), + [setMoveTarget], + ); + + const logicalWidth = VIEW_TILES_X * TILE_SIZE_PX; // 480 + const logicalHeight = VIEW_TILES_Y * TILE_SIZE_PX; // 352 + + const scale = Math.min( + width / logicalWidth, + height / logicalHeight, + MAX_SCALE, + ); + const offsetX = (width - logicalWidth * scale) / 2; + const offsetY = (height - logicalHeight * scale) / 2; + + if (width <= 0 || height <= 0) return null; + + console.log("World render", { width, height, scale, offsetX, offsetY }); + + return ( + + {viewTiles.map((tile) => { + const isPlayerTile = + tile.position.x === playerPosition.x && + tile.position.y === playerPosition.y && + tile.position.z === playerPosition.z; + + const isTargetTile = + tile.position.x === moveTarget?.x && + tile.position.y === moveTarget?.y && + tile.position.z === moveTarget?.z; + + const vx = + tile.position.x - (playerPosition.x - Math.floor(VIEW_TILES_X / 2)); + const vy = + tile.position.y - (playerPosition.y - Math.floor(VIEW_TILES_Y / 2)); + + const x = vx * TILE_SIZE_PX; + const y = vy * TILE_SIZE_PX; + + return ( + { + g.clear(); + let color = 0x3b4048; + if (isPlayerTile) color = 0x2f3640; + if (isTargetTile) color = 0x40586b; + + g.rect(x, y, TILE_SIZE_PX, TILE_SIZE_PX) + .stroke({ + color: new Color("white").setAlpha(1), + pixelLine: true, + }) + .fill(color); + }} + onPointerDown={() => handleTileClick(tile.position)} + /> + ); + })} + + ); +} diff --git a/apps/client/src/game/GameStage.tsx b/apps/client/src/game/GameStage.tsx deleted file mode 100644 index e21e0e7..0000000 --- a/apps/client/src/game/GameStage.tsx +++ /dev/null @@ -1,174 +0,0 @@ -import { Application, extend } from "@pixi/react"; -import { Container, Graphics as PixiGraphics } from "pixi.js"; -import { type JSX, useCallback, useEffect, useMemo, useState } from "react"; -import { useGameStore } from "../store/game"; - -extend({ Container, Graphics: PixiGraphics }); - -type HoveredTile = { tx: number; ty: number } | null; - -export function GameStage() { - const { - tileSize, - worldWidth, - worldHeight, - viewWidth, - viewHeight, - player, - camera, - movePlayer, - setDestination, - } = useGameStore(); - - const [hoveredTile, setHoveredTile] = useState(null); - - const baseWidth = viewWidth * tileSize; - const baseHeight = viewHeight * tileSize; - - const worldOffsetX = -camera.cx * tileSize; - const worldOffsetY = -camera.cy * tileSize; - - // teclado (igual antes) - useEffect(() => { - const handler = (e: KeyboardEvent) => { - switch (e.key) { - case "w": - case "ArrowUp": - movePlayer(0, -1); - break; - case "s": - case "ArrowDown": - movePlayer(0, 1); - break; - case "a": - case "ArrowLeft": - movePlayer(-1, 0); - break; - case "d": - case "ArrowRight": - movePlayer(1, 0); - break; - } - }; - - window.addEventListener("keydown", handler); - return () => window.removeEventListener("keydown", handler); - }, [movePlayer]); - - // desenhar tiles visíveis, já com hover/click - const tiles = useMemo(() => { - const res: JSX.Element[] = []; - - for (let ty = camera.cy; ty < camera.cy + viewHeight; ty++) { - for (let tx = camera.cx; tx < camera.cx + viewWidth; tx++) { - if (tx < 0 || ty < 0 || tx >= worldWidth || ty >= worldHeight) continue; - - const x = tx * tileSize; - const y = ty * tileSize; - - const isHovered = hoveredTile?.tx === tx && hoveredTile?.ty === ty; - - res.push( - setHoveredTile({ tx, ty })} - onPointerOut={() => - setHoveredTile((current) => - current?.tx === tx && current?.ty === ty ? null : current, - ) - } - // click - onPointerTap={() => { - // aqui você manda o personagem ir até esse tile - setDestination(tx, ty); - }} - draw={(g: PixiGraphics) => { - g.clear(); - - const isOdd = (tx + ty) % 2 === 1; - const baseColor = isOdd ? 0x222222 : 0x333333; - - g.setFillStyle({ - color: baseColor, - }); - g.rect(0, 0, tileSize, tileSize); - g.fill(); - - // borda normal - g.setStrokeStyle({ - color: 0x444444, - width: 1, - }); - g.rect(0, 0, tileSize, tileSize); - g.stroke(); - - // se estiver hover, desenha uma borda extra (efeito Tibia) - if (isHovered) { - g.setStrokeStyle({ - color: 0xffff00, // amarelo - width: 2, - }); - g.rect(1, 1, tileSize - 2, tileSize - 2); - g.stroke(); - } - }} - />, - ); - } - } - - return res; - }, [ - camera.cx, - camera.cy, - viewHeight, - viewWidth, - worldWidth, - worldHeight, - tileSize, - hoveredTile, - movePlayer, - ]); - - // player - const playerPixelX = player.tx * tileSize; - const playerPixelY = player.ty * tileSize; - - const drawPlayer = useCallback( - (g: PixiGraphics) => { - g.clear(); - g.setFillStyle({ color: 0xffffff }); - g.rect(4, 4, tileSize - 8, tileSize - 8); - g.fill(); - }, - [tileSize], - ); - - return ( - - {/* container raiz com zoom, como antes */} - - - {/* tiles interativos */} - {tiles} - - {/* player */} - - - - - ); -} diff --git a/apps/client/src/game/movementSystem.ts b/apps/client/src/game/movementSystem.ts deleted file mode 100644 index 6c0b7ee..0000000 --- a/apps/client/src/game/movementSystem.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { Ticker } from "pixi.js"; -import { useGameStore } from "../store/game"; - -let started = false; - -export function startMovementSystem() { - if (started) return; - started = true; - - const ticker = Ticker.shared; - const stepIntervalMs = 120; // tempo por "sqm" - let accumulator = 0; - - ticker.add((delta) => { - // delta ~ 1 a 60 FPS - const dtMs = Number(delta) * (1000 / 60); - accumulator += dtMs; - - if (accumulator < stepIntervalMs) return; - accumulator -= stepIntervalMs; - - const { stepTowardsDestination } = useGameStore.getState(); - stepTowardsDestination(); - }); -} diff --git a/apps/client/src/main.tsx b/apps/client/src/main.tsx index 16bd43b..8714fe2 100644 --- a/apps/client/src/main.tsx +++ b/apps/client/src/main.tsx @@ -1,13 +1,7 @@ import "./global.css"; -import React from "react"; import ReactDOM from "react-dom/client"; -import App from "./App"; -import { startMovementSystem } from "./game/movementSystem"; - -startMovementSystem(); +import Root from "@/pages/_root"; ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render( - - - , + , ); diff --git a/apps/client/src/pages/_root.tsx b/apps/client/src/pages/_root.tsx new file mode 100644 index 0000000..70201d4 --- /dev/null +++ b/apps/client/src/pages/_root.tsx @@ -0,0 +1,11 @@ +import { DndProvider } from "react-dnd"; +import { HTML5Backend } from "react-dnd-html5-backend"; +import { GamePage } from "./game"; + +export default function RootPage() { + return ( + + + + ); +} diff --git a/apps/client/src/pages/game/index.tsx b/apps/client/src/pages/game/index.tsx new file mode 100644 index 0000000..f7b9ded --- /dev/null +++ b/apps/client/src/pages/game/index.tsx @@ -0,0 +1,10 @@ +import { GameCanvas } from "@/components/game/Canvas"; +import { GameShell } from "@/components/game/Shell"; + +export const GamePage = () => { + return ( + + + + ); +}; diff --git a/apps/client/src/pages/login/index.tsx b/apps/client/src/pages/login/index.tsx new file mode 100644 index 0000000..e69de29 diff --git a/apps/client/src/sdk/constants.ts b/apps/client/src/sdk/constants.ts new file mode 100644 index 0000000..d940023 --- /dev/null +++ b/apps/client/src/sdk/constants.ts @@ -0,0 +1,6 @@ +const TILE_SIZE_PX = 32; +const VIEW_TILES_X = 15; +const VIEW_TILES_Y = 11; +const MAX_SCALE = 2; + +export { TILE_SIZE_PX, VIEW_TILES_X, VIEW_TILES_Y, MAX_SCALE }; diff --git a/apps/client/src/sdk/hooks/useContainerSize.ts b/apps/client/src/sdk/hooks/useContainerSize.ts new file mode 100644 index 0000000..d3070fd --- /dev/null +++ b/apps/client/src/sdk/hooks/useContainerSize.ts @@ -0,0 +1,26 @@ +import { useEffect, useRef, useState } from "react"; + +export function useContainerSize() { + const ref = useRef(null); + const [size, setSize] = useState({ width: 0, height: 0 }); + + useEffect(() => { + if (!ref.current) return; + + const el = ref.current; + + function update() { + const rect = el.getBoundingClientRect(); + setSize({ width: rect.width, height: rect.height }); + } + + update(); + + const observer = new ResizeObserver(() => update()); + observer.observe(el); + + return () => observer.disconnect(); + }, []); + + return { ref, size }; +} diff --git a/apps/client/src/sdk/hooks/usePixiScreen.ts b/apps/client/src/sdk/hooks/usePixiScreen.ts new file mode 100644 index 0000000..0bf09ee --- /dev/null +++ b/apps/client/src/sdk/hooks/usePixiScreen.ts @@ -0,0 +1,25 @@ +import { useApplication } from "@pixi/react"; +import { useEffect, useState } from "react"; + +export function usePixiScreen() { + const { app } = useApplication(); + const [screen, setScreen] = useState(() => ({ + width: app.screen.width, + height: app.screen.height, + })); + + useEffect(() => { + const update = () => + setScreen({ width: app.screen.width, height: app.screen.height }); + + // Renderer emite resize quando o view muda + app?.renderer?.on("resize", update); + update(); + + return () => { + app?.renderer?.off("resize", update); + }; + }, [app]); + + return screen; +} diff --git a/apps/client/src/sdk/store/config.ts b/apps/client/src/sdk/store/config.ts new file mode 100644 index 0000000..0a88c10 --- /dev/null +++ b/apps/client/src/sdk/store/config.ts @@ -0,0 +1,37 @@ +import { create } from "zustand"; + +export type GameConfigPanels = { + left1: boolean; + left2: boolean; + right1: boolean; + right2: boolean; + right3: boolean; + health: boolean; + chat: boolean; +}; + +export type PanelSlot = keyof GameConfigPanels; + +type GameConfigState = { + panels: GameConfigPanels; + setPanelVisibility: ( + panel: keyof GameConfigState["panels"], + visible: boolean, + ) => void; +}; + +export const useConfigStore = create((set, get) => ({ + panels: { + left1: false, + left2: false, + right1: true, + right2: false, + right3: false, + health: false, + chat: true, + }, + setPanelVisibility: (panel, visible) => { + const panels = { ...get().panels, [panel]: visible }; + set({ panels }); + }, +})); diff --git a/apps/client/src/sdk/store/game.ts b/apps/client/src/sdk/store/game.ts new file mode 100644 index 0000000..73ff7a8 --- /dev/null +++ b/apps/client/src/sdk/store/game.ts @@ -0,0 +1,101 @@ +import { create } from "zustand"; +import type { Position } from "@/sdk/types/position"; +import type { Tile } from "@/sdk/types/tile"; + +export function positionKey(pos: Position): string { + return `${pos.x}:${pos.y}:${pos.z}`; +} + +type GameState = { + tiles: Map; + hoveredTile: Position | null; + playerPosition: Position; + moveTarget: Position | null; + stepDurationMs: number; + stepProgressMs: number; + initTestMap: () => void; + setHoveredTile: (pos: Position | null) => void; + setMoveTarget: (pos: Position) => void; + updateMovement: (deltaMs: number) => void; +}; + +export const useGameStore = create((set, get) => ({ + tiles: new Map(), + hoveredTile: null, + playerPosition: { x: 50, y: 50, z: 0 }, + + moveTarget: null, + stepDurationMs: 50, // duração de um passo em ms + stepProgressMs: 0, + + setHoveredTile: (pos: Position | null) => { + set({ hoveredTile: pos }); + }, + + initTestMap: () => { + const tiles = new Map(); + + for (let y = 0; y < 100; y++) { + for (let x = 0; x < 100; x++) { + const pos: Position = { x, y, z: 0 }; + const tile: Tile = { position: pos }; + tiles.set(positionKey(pos), tile); + } + } + + set({ tiles: tiles }); + }, + + setMoveTarget: (pos: Position) => { + set({ moveTarget: pos }); + }, + + updateMovement: (deltaMs: number) => { + const state = get(); + + const { moveTarget, playerPosition, stepDurationMs } = state; + + if (!moveTarget) return; + + if ( + playerPosition.x === moveTarget.x && + playerPosition.y === moveTarget.y && + playerPosition.z === moveTarget.z + ) { + set({ moveTarget: null, stepProgressMs: 0 }); + return; + } + + let stepProgressMs = state.stepProgressMs + deltaMs; + + if (stepProgressMs < stepDurationMs) { + // not enough time to move one tile yet + set({ stepProgressMs }); + return; + } + + stepProgressMs -= stepDurationMs; + + const dx = moveTarget.x - playerPosition.x; + const dy = moveTarget.y - playerPosition.y; + + let next: Position = playerPosition; + + if (Math.abs(dx) > 0) { + next = { + ...playerPosition, + x: playerPosition.x + Math.sign(dx), + }; + } else if (Math.abs(dy) > 0) { + next = { + ...playerPosition, + y: playerPosition.y + Math.sign(dy), + }; + } + + set({ + playerPosition: next, + stepProgressMs, + }); + }, +})); diff --git a/apps/client/src/sdk/systems/movement.ts b/apps/client/src/sdk/systems/movement.ts new file mode 100644 index 0000000..b454548 --- /dev/null +++ b/apps/client/src/sdk/systems/movement.ts @@ -0,0 +1,21 @@ +import { Ticker } from "pixi.js"; +import { useGameStore } from "@/sdk/store/game"; + +let started = false; + +export function startMovementSystem() { + if (started) return; + started = true; + + const ticker = Ticker.shared; + let lastTime = performance.now(); + + ticker.add(() => { + const now = performance.now(); + const deltaMs = now - lastTime; + lastTime = now; + + // update movement via zustand, fora do React + useGameStore.getState().updateMovement(deltaMs); + }); +} diff --git a/apps/client/src/sdk/systems/tiles.ts b/apps/client/src/sdk/systems/tiles.ts new file mode 100644 index 0000000..4a29bb3 --- /dev/null +++ b/apps/client/src/sdk/systems/tiles.ts @@ -0,0 +1,26 @@ +import { VIEW_TILES_X, VIEW_TILES_Y } from "@/sdk/constants"; +import type { Position } from "@/sdk/types/position"; +import type { Tile } from "@/sdk/types/tile"; + +export function getViewTiles( + playerPosition: Position, + tiles: Map, +) { + const halfViewX = Math.floor(VIEW_TILES_X / 2); + const halfViewY = Math.floor(VIEW_TILES_Y / 2); + + const startX = playerPosition.x - halfViewX; + const startY = playerPosition.y - halfViewY; + + const result: Tile[] = []; + for (let vy = 0; vy < VIEW_TILES_Y; vy++) { + for (let vx = 0; vx < VIEW_TILES_X; vx++) { + const x = startX + vx; + const y = startY + vy; + const pos: Position = { x, y, z: playerPosition.z }; + const key = `${x}:${y}:${playerPosition.z}`; + result.push(tiles.get(key) ?? { position: pos }); + } + } + return result; +} diff --git a/apps/client/src/sdk/types/position.ts b/apps/client/src/sdk/types/position.ts new file mode 100644 index 0000000..a8eca31 --- /dev/null +++ b/apps/client/src/sdk/types/position.ts @@ -0,0 +1,5 @@ +export type Position = { + x: number; // tile X (absoluto) + y: number; // tile Y (absoluto) + z: number; // floor +}; diff --git a/apps/client/src/sdk/types/tile.ts b/apps/client/src/sdk/types/tile.ts new file mode 100644 index 0000000..58204c7 --- /dev/null +++ b/apps/client/src/sdk/types/tile.ts @@ -0,0 +1,5 @@ +import type { Position } from "./position"; + +export type Tile = { + position: Position; +}; diff --git a/apps/client/src/store/game.ts b/apps/client/src/store/game.ts deleted file mode 100644 index a3271f9..0000000 --- a/apps/client/src/store/game.ts +++ /dev/null @@ -1,116 +0,0 @@ -import { create } from "zustand"; - -type Player = { tx: number; ty: number }; -type Camera = { cx: number; cy: number }; - -type Destination = { tx: number; ty: number } | null; - -type GameState = { - tileSize: number; - worldWidth: number; - worldHeight: number; - viewWidth: number; - viewHeight: number; - - player: Player; - camera: Camera; - - zoom: number; - - destination: Destination; - - setDestination: (tx: number, ty: number) => void; - clearDestination: () => void; - - movePlayer: (dx: number, dy: number) => void; - stepTowardsDestination: () => void; -}; - -function clamp(v: number, min: number, max: number) { - return Math.min(max, Math.max(min, v)); -} - -export const useGameStore = create((set, get) => ({ - tileSize: 32, - worldWidth: 100, - worldHeight: 100, - viewWidth: 15, - viewHeight: 11, - - player: { tx: 50, ty: 50 }, - camera: { - cx: 50 - Math.floor(15 / 2), - cy: 50 - Math.floor(11 / 2), - }, - - zoom: 1, - - destination: null, - - setDestination: (tx, ty) => { - set({ destination: { tx, ty } }); - }, - - clearDestination: () => { - set({ destination: null }); - }, - - // anda 1 tile (dx,dy), atualiza camera igual de antes - movePlayer: (dx, dy) => { - const state = get(); - const { worldWidth, worldHeight, viewWidth, viewHeight, player } = state; - - const tx = clamp(player.tx + dx, 0, worldWidth - 1); - const ty = clamp(player.ty + dy, 0, worldHeight - 1); - - const halfW = Math.floor(viewWidth / 2); - const halfH = Math.floor(viewHeight / 2); - - let cx = tx - halfW; - let cy = ty - halfH; - - const maxCx = Math.max(0, worldWidth - viewWidth); - const maxCy = Math.max(0, worldHeight - viewHeight); - - cx = clamp(cx, 0, maxCx); - cy = clamp(cy, 0, maxCy); - - set({ - player: { tx, ty }, - camera: { cx, cy }, - }); - }, - - // anda 1 tile em direção ao destino (sem pathfinding, só linha “quebrada”) - stepTowardsDestination: () => { - const { destination, player, movePlayer, clearDestination } = get(); - if (!destination) return; - - const { tx: ptx, ty: pty } = player; - const { tx: dtx, ty: dty } = destination; - - // já chegou - if (ptx === dtx && pty === dty) { - clearDestination(); - return; - } - - let dx = 0; - let dy = 0; - - // anda no eixo X primeiro - if (dtx > ptx) dx = 1; - else if (dtx < ptx) dx = -1; - // se X já está alinhado, anda no Y - else if (dty > pty) dy = 1; - else if (dty < pty) dy = -1; - - movePlayer(dx, dy); - - // se chegou no destino depois do passo, limpa - const newPlayer = get().player; - if (newPlayer.tx === dtx && newPlayer.ty === dty) { - clearDestination(); - } - }, -})); diff --git a/apps/client/tsconfig.json b/apps/client/tsconfig.json index aca4895..30819f1 100644 --- a/apps/client/tsconfig.json +++ b/apps/client/tsconfig.json @@ -5,6 +5,9 @@ "lib": ["ES2020", "DOM", "DOM.Iterable"], "module": "ESNext", "skipLibCheck": true, + "paths": { + "@/*": ["./src/*"] + }, /* Bundler mode */ "moduleResolution": "bundler", diff --git a/apps/client/vite.config.ts b/apps/client/vite.config.ts index 33f6aad..fedfb8b 100644 --- a/apps/client/vite.config.ts +++ b/apps/client/vite.config.ts @@ -1,3 +1,4 @@ +import path from "node:path"; import tailwindcss from "@tailwindcss/vite"; import react from "@vitejs/plugin-react"; import { defineConfig } from "vite"; @@ -7,6 +8,11 @@ const host = process.env.TAURI_DEV_HOST; // https://vite.dev/config/ export default defineConfig(async () => ({ plugins: [react(), tailwindcss()], + resolve: { + alias: { + "@": path.resolve(__dirname, "src"), + }, + }, // Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build` // diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9807bb7..53c1c66 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -250,9 +250,18 @@ importers: react: specifier: ^19.2.1 version: 19.2.1 + react-dnd: + specifier: ^16.0.1 + version: 16.0.1(@types/node@24.10.0)(@types/react@19.2.7)(react@19.2.1) + react-dnd-html5-backend: + specifier: ^16.0.1 + version: 16.0.1 react-dom: specifier: ^19.2.1 version: 19.2.1(react@19.2.1) + react-resizable-panels: + specifier: ^4.0.15 + version: 4.0.15(react-dom@19.2.1(react@19.2.1))(react@19.2.1) tailwind-merge: specifier: catalog:tailwind version: 3.4.0 @@ -2249,6 +2258,15 @@ packages: '@radix-ui/rect@1.1.1': resolution: {integrity: sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==} + '@react-dnd/asap@5.0.2': + resolution: {integrity: sha512-WLyfoHvxhs0V9U+GTsGilGgf2QsPl6ZZ44fnv0/b8T3nQyvzxidxsg/ZltbWssbsRDlYW8UKSQMTGotuTotZ6A==} + + '@react-dnd/invariant@4.0.2': + resolution: {integrity: sha512-xKCTqAK/FFauOM9Ta2pswIyT3D8AQlfrYdOi/toTPEhqCuAs1v5tcJ3Y08Izh1cJ5Jchwy9SeAXmMg6zrKs2iw==} + + '@react-dnd/shallowequal@4.0.2': + resolution: {integrity: sha512-/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA==} + '@react-email/body@0.2.0': resolution: {integrity: sha512-9GCWmVmKUAoRfloboCd+RKm6X17xn7eGL7HnpAZUnjBXBilWCxsKnLMTC/ixSHDKS/A/057M1Tx6ZUXd89sVBw==} peerDependencies: @@ -3874,6 +3892,9 @@ packages: dlv@1.1.3: resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==} + dnd-core@16.0.1: + resolution: {integrity: sha512-HK294sl7tbw6F6IeuK16YSBUoorvHpY8RHO+9yFfaJyCDVb6n7PRcezrOEOa2SBCqiYpemh5Jx20ZcjKdFAVng==} + dom-serializer@2.0.0: resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==} @@ -4368,6 +4389,9 @@ packages: resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==} hasBin: true + hoist-non-react-statics@3.3.2: + resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==} + homedir-polyfill@1.0.3: resolution: {integrity: sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==} engines: {node: '>=0.10.0'} @@ -5443,6 +5467,24 @@ packages: rc9@2.1.2: resolution: {integrity: sha512-btXCnMmRIBINM2LDZoEmOogIZU7Qe7zn4BpomSKZ/ykbLObuBdvG+mFq11DL6fjH1DRwHhrlgtYWG96bJiC7Cg==} + react-dnd-html5-backend@16.0.1: + resolution: {integrity: sha512-Wu3dw5aDJmOGw8WjH1I1/yTH+vlXEL4vmjk5p+MHxP8HuHJS1lAGeIdG/hze1AvNeXWo/JgULV87LyQOr+r5jw==} + + react-dnd@16.0.1: + resolution: {integrity: sha512-QeoM/i73HHu2XF9aKksIUuamHPDvRglEwdHL4jsp784BgUuWcg6mzfxT0QDdQz8Wj0qyRKx2eMg8iZtWvU4E2Q==} + peerDependencies: + '@types/hoist-non-react-statics': '>= 3.3.1' + '@types/node': '>= 12' + '@types/react': ^19.2.7 + react: ^19.2.1 + peerDependenciesMeta: + '@types/hoist-non-react-statics': + optional: true + '@types/node': + optional: true + '@types/react': + optional: true + react-dom@19.2.1: resolution: {integrity: sha512-ibrK8llX2a4eOskq1mXKu/TGZj9qzomO+sNfO98M6d9zIPOEhlBkMkBUBLd1vgS0gQsLDBzA+8jJBVXDnfHmJg==} peerDependencies: @@ -5459,6 +5501,9 @@ packages: peerDependencies: react: ^19.2.1 + react-is@16.13.1: + resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==} + react-qrcode-logo@4.0.0: resolution: {integrity: sha512-TcDdsJQe7P0OY7uA7Do4Z0DfIIjjqx81RbBGQY+90T2Ba42pUCx/cSI2UTwPPoH9WwE0StLb8A98mFgKIAI4JQ==} peerDependencies: @@ -5495,6 +5540,12 @@ packages: '@types/react': optional: true + react-resizable-panels@4.0.15: + resolution: {integrity: sha512-+ygM/EI2h4Qc/cl2fasQ2qwOgNfpQwXLNTU5PqhhPerliX+wnbf7ejcqran7lz3BqABzjddf0pJ3j3G/+A0v9Q==} + peerDependencies: + react: ^19.2.1 + react-dom: ^19.2.1 + react-style-singleton@2.2.3: resolution: {integrity: sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==} engines: {node: '>=10'} @@ -5554,6 +5605,9 @@ packages: resolution: {integrity: sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==} engines: {node: '>=4'} + redux@4.2.1: + resolution: {integrity: sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==} + reflect-metadata@0.2.2: resolution: {integrity: sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==} @@ -8773,6 +8827,12 @@ snapshots: '@radix-ui/rect@1.1.1': {} + '@react-dnd/asap@5.0.2': {} + + '@react-dnd/invariant@4.0.2': {} + + '@react-dnd/shallowequal@4.0.2': {} + '@react-email/body@0.2.0(react@19.2.1)': dependencies: react: 19.2.1 @@ -9579,7 +9639,7 @@ snapshots: optionalDependencies: '@tanstack/react-router': 1.139.14(react-dom@19.2.1(react@19.2.1))(react@19.2.1) vite: 7.2.6(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1) - webpack: 5.102.1 + webpack: 5.102.1(esbuild@0.25.10) transitivePeerDependencies: - supports-color @@ -10532,6 +10592,12 @@ snapshots: dlv@1.1.3: {} + dnd-core@16.0.1: + dependencies: + '@react-dnd/asap': 5.0.2 + '@react-dnd/invariant': 4.0.2 + redux: 4.2.1 + dom-serializer@2.0.0: dependencies: domelementtype: 2.3.0 @@ -11091,6 +11157,10 @@ snapshots: he@1.2.0: {} + hoist-non-react-statics@3.3.2: + dependencies: + react-is: 16.13.1 + homedir-polyfill@1.0.3: dependencies: parse-passwd: 1.0.0 @@ -12061,6 +12131,22 @@ snapshots: defu: 6.1.4 destr: 2.0.5 + react-dnd-html5-backend@16.0.1: + dependencies: + dnd-core: 16.0.1 + + react-dnd@16.0.1(@types/node@24.10.0)(@types/react@19.2.7)(react@19.2.1): + dependencies: + '@react-dnd/invariant': 4.0.2 + '@react-dnd/shallowequal': 4.0.2 + dnd-core: 16.0.1 + fast-deep-equal: 3.1.3 + hoist-non-react-statics: 3.3.2 + react: 19.2.1 + optionalDependencies: + '@types/node': 24.10.0 + '@types/react': 19.2.7 + react-dom@19.2.1(react@19.2.1): dependencies: react: 19.2.1 @@ -12094,6 +12180,8 @@ snapshots: dependencies: react: 19.2.1 + react-is@16.13.1: {} + react-qrcode-logo@4.0.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1): dependencies: qrcode-generator: 2.0.4 @@ -12126,6 +12214,11 @@ snapshots: optionalDependencies: '@types/react': 19.2.7 + react-resizable-panels@4.0.15(react-dom@19.2.1(react@19.2.1))(react@19.2.1): + dependencies: + react: 19.2.1 + react-dom: 19.2.1(react@19.2.1) + react-style-singleton@2.2.3(@types/react@19.2.7)(react@19.2.1): dependencies: get-nonce: 1.0.1 @@ -12200,6 +12293,10 @@ snapshots: dependencies: redis-errors: 1.2.0 + redux@4.2.1: + dependencies: + '@babel/runtime': 7.28.4 + reflect-metadata@0.2.2: {} replace-string@3.1.0: {} @@ -12768,16 +12865,6 @@ snapshots: optionalDependencies: esbuild: 0.25.10 - terser-webpack-plugin@5.3.14(webpack@5.102.1): - dependencies: - '@jridgewell/trace-mapping': 0.3.31 - jest-worker: 27.5.1 - schema-utils: 4.3.3 - serialize-javascript: 6.0.2 - terser: 5.44.1 - webpack: 5.102.1 - optional: true - terser@5.44.1: dependencies: '@jridgewell/source-map': 0.3.11 @@ -13047,39 +13134,6 @@ snapshots: webpack-virtual-modules@0.6.2: {} - webpack@5.102.1: - dependencies: - '@types/eslint-scope': 3.7.7 - '@types/estree': 1.0.8 - '@types/json-schema': 7.0.15 - '@webassemblyjs/ast': 1.14.1 - '@webassemblyjs/wasm-edit': 1.14.1 - '@webassemblyjs/wasm-parser': 1.14.1 - acorn: 8.15.0 - acorn-import-phases: 1.0.4(acorn@8.15.0) - browserslist: 4.28.0 - chrome-trace-event: 1.0.4 - enhanced-resolve: 5.18.3 - es-module-lexer: 1.7.0 - eslint-scope: 5.1.1 - events: 3.3.0 - glob-to-regexp: 0.4.1 - graceful-fs: 4.2.11 - json-parse-even-better-errors: 2.3.1 - loader-runner: 4.3.1 - mime-types: 2.1.35 - neo-async: 2.6.2 - schema-utils: 4.3.3 - tapable: 2.3.0 - terser-webpack-plugin: 5.3.14(webpack@5.102.1) - watchpack: 2.4.4 - webpack-sources: 3.3.3 - transitivePeerDependencies: - - '@swc/core' - - esbuild - - uglify-js - optional: true - webpack@5.102.1(esbuild@0.25.10): dependencies: '@types/eslint-scope': 3.7.7 From 18e41cf055df22eef884b1fae82f70d036098245 Mon Sep 17 00:00:00 2001 From: Guilherme Fontes Date: Tue, 23 Dec 2025 13:54:11 -0400 Subject: [PATCH 05/18] feat: add first iteration of movable entities --- apps/client/package.json | 3 - .../components/DragControllerLayer/index.tsx | 129 ++++++++++++++++ .../src/components/Zones/Inventory/index.tsx | 34 +++++ .../src/components/game/Canvas/index.tsx | 10 +- .../components/game/ResizeBridge/index.tsx | 38 ++++- .../src/components/game/Shell/index.tsx | 11 +- .../src/components/game/Stage/index.tsx | 5 +- .../src/components/game/World/index.tsx | 54 ++++++- .../src/components/panel/Surface/index.tsx | 17 +++ apps/client/src/pages/_root.tsx | 8 +- apps/client/src/pages/game/index.tsx | 3 + apps/client/src/sdk/constants.ts | 2 +- apps/client/src/sdk/drag/resolveDomTarget.ts | 31 ++++ apps/client/src/sdk/drag/rules.ts | 32 ++++ apps/client/src/sdk/drag/setupRules.ts | 90 +++++++++++ apps/client/src/sdk/drag/types.ts | 70 +++++++++ apps/client/src/sdk/game/screenToTile.ts | 44 ++++++ apps/client/src/sdk/store/config.ts | 2 +- apps/client/src/sdk/store/drag.ts | 72 +++++++++ apps/client/src/sdk/utils/cn.ts | 6 + pnpm-lock.yaml | 142 ++++++------------ 21 files changed, 677 insertions(+), 126 deletions(-) create mode 100644 apps/client/src/components/DragControllerLayer/index.tsx create mode 100644 apps/client/src/components/Zones/Inventory/index.tsx create mode 100644 apps/client/src/components/panel/Surface/index.tsx create mode 100644 apps/client/src/sdk/drag/resolveDomTarget.ts create mode 100644 apps/client/src/sdk/drag/rules.ts create mode 100644 apps/client/src/sdk/drag/setupRules.ts create mode 100644 apps/client/src/sdk/drag/types.ts create mode 100644 apps/client/src/sdk/game/screenToTile.ts create mode 100644 apps/client/src/sdk/store/drag.ts create mode 100644 apps/client/src/sdk/utils/cn.ts diff --git a/apps/client/package.json b/apps/client/package.json index a299a62..029898c 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -18,10 +18,7 @@ "clsx": "catalog:tailwind", "pixi.js": "^8.14.3", "react": "catalog:react", - "react-dnd": "^16.0.1", - "react-dnd-html5-backend": "^16.0.1", "react-dom": "catalog:react", - "react-resizable-panels": "^4.0.15", "tailwind-merge": "catalog:tailwind", "tailwindcss": "catalog:tailwind", "tw-animate-css": "catalog:tailwind", diff --git a/apps/client/src/components/DragControllerLayer/index.tsx b/apps/client/src/components/DragControllerLayer/index.tsx new file mode 100644 index 0000000..6ef3d07 --- /dev/null +++ b/apps/client/src/components/DragControllerLayer/index.tsx @@ -0,0 +1,129 @@ +import { useEffect } from "react"; +import { createPortal } from "react-dom"; +import { resolveDomTarget } from "@/sdk/drag/resolveDomTarget"; +import { resolveRule } from "@/sdk/drag/rules"; +import { AvailableZones, type WorldDropTarget } from "@/sdk/drag/types"; +import { screenToTile } from "@/sdk/game/screenToTile"; +import { useDragStore } from "@/sdk/store/drag"; +import { useGameStore } from "@/sdk/store/game"; + +export function DragControllerLayer() { + const dragging = useDragStore((s) => s.dragging); + const pointer = useDragStore((s) => s.pointer); + const preview = useDragStore((s) => s.preview); + + const worldEl = useDragStore((s) => s.worldEl); + const viewport = useDragStore((s) => s.viewport); + + const setPointer = useDragStore((s) => s.setPointer); + const setTarget = useDragStore((s) => s.setTarget); + const endDrag = useDragStore((s) => s.endDrag); + + const playerPosition = useGameStore((s) => s.playerPosition); + + useEffect(() => { + if (!dragging) return; + + const onMove = (event: PointerEvent) => { + const x = event.clientX; + const y = event.clientY; + setPointer({ x, y }); + + const domTarget = resolveDomTarget(x, y); + if (domTarget) { + const { canDrop } = domTarget + ? resolveRule(dragging, domTarget) + : { canDrop: false }; + setTarget(domTarget, canDrop); + return; + } + + if (!worldEl || !viewport) { + setTarget(null, false); + return; + } + + const rect = worldEl.getBoundingClientRect(); + const localX = x - rect.left; + const localY = y - rect.top; + + const tile = screenToTile({ + localX, + localY, + viewport, + player: playerPosition, + }); + + if (!tile) { + setTarget(null, false); + return; + } + + const worldTarget = { + zone: AvailableZones.WORLD, + tile, + } satisfies WorldDropTarget; + const { canDrop } = resolveRule(dragging, worldTarget); + setTarget(worldTarget, canDrop); + }; + + const onUp = () => { + const state = useDragStore.getState(); + const payload = state.dragging; + const target = state.target; + + if (payload && target) { + const response = resolveRule(payload, target); + + if (response.rule) { + response.rule.onDrop(payload, target); + } + } + + endDrag(); + }; + + const onKeyDown = (event: KeyboardEvent) => { + if (event.key === "Escape") { + endDrag(); + } + }; + + window.addEventListener("pointermove", onMove); + window.addEventListener("pointerup", onUp); + window.addEventListener("keydown", onKeyDown); + + return () => { + window.removeEventListener("pointermove", onMove); + window.removeEventListener("pointerup", onUp); + window.removeEventListener("keydown", onKeyDown); + }; + }, [ + dragging, + worldEl, + viewport, + playerPosition, + setPointer, + setTarget, + endDrag, + ]); + + if (!dragging || !pointer) return null; + + const ghost = ( +
+ {preview?.label ?? `${dragging.kind}`} +
+ ); + + return createPortal(ghost, document.body); +} diff --git a/apps/client/src/components/Zones/Inventory/index.tsx b/apps/client/src/components/Zones/Inventory/index.tsx new file mode 100644 index 0000000..8be9712 --- /dev/null +++ b/apps/client/src/components/Zones/Inventory/index.tsx @@ -0,0 +1,34 @@ +import { AvailableZones } from "@/sdk/drag/types"; +import { useDragStore } from "@/sdk/store/drag"; + +export function InventoryPanel() { + return ( +
+ Drop items here +
+ ); +} + +export function InventoryItem({ itemId }: { itemId: string }) { + const startDrag = useDragStore((s) => s.startDrag); + + return ( +
{ + e.preventDefault(); + startDrag( + { kind: "ITEM", itemId, from: AvailableZones.INVENTORY }, + { x: e.clientX, y: e.clientY }, + { label: `Item ${itemId}` }, + ); + }} + > + {itemId} +
+ ); +} diff --git a/apps/client/src/components/game/Canvas/index.tsx b/apps/client/src/components/game/Canvas/index.tsx index 1cd1a23..e1cc8f0 100644 --- a/apps/client/src/components/game/Canvas/index.tsx +++ b/apps/client/src/components/game/Canvas/index.tsx @@ -1,14 +1,20 @@ import { useLayoutEffect, useRef, useState } from "react"; +import { useDragStore } from "@/sdk/store/drag"; import { GameStage } from "../Stage"; export function GameCanvas() { const parentRef = useRef(null); const [mounted, setMounted] = useState(false); + const setWorldEl = useDragStore((s) => s.setWorldEl); // monta UMA vez quando o ref existir (evita remounts e perda de contexto) useLayoutEffect(() => { - if (parentRef.current) setMounted(true); - }, []); + if (parentRef.current) { + setMounted(true); + setWorldEl(parentRef.current); + } + return () => setWorldEl(null); + }, [setWorldEl]); return (
; }) { const { app } = useApplication(); + const last = useRef({ width: 0, height: 0 }); + const raf = useRef(null); useLayoutEffect(() => { const element = resizeTo.current; if (!element) return; - const apply = () => { - const w = Math.max(1, element.clientWidth); - const h = Math.max(1, element.clientHeight); - app.renderer.resize(w, h); + const measureAndApply = () => { + raf.current = null; + + const width = Math.max(1, element.clientWidth | 0); + const height = Math.max(1, element.clientHeight | 0); + + if (last.current.width === width && last.current.height === height) + return; + + last.current = { + width, + height, + }; + + app.renderer.resize(width, height); + app.render(); }; - apply(); // resize inicial + const schedule = () => { + if (raf.current !== null) cancelAnimationFrame(raf.current); + raf.current = requestAnimationFrame(measureAndApply); + }; + + schedule(); // initial - const ro = new ResizeObserver(() => apply()); + const ro = new ResizeObserver(() => schedule()); ro.observe(element); - return () => ro.disconnect(); + return () => { + ro.disconnect(); + if (raf.current !== null) cancelAnimationFrame(raf.current); + }; }, [app, resizeTo]); return null; diff --git a/apps/client/src/components/game/Shell/index.tsx b/apps/client/src/components/game/Shell/index.tsx index 2b5241f..5496d84 100644 --- a/apps/client/src/components/game/Shell/index.tsx +++ b/apps/client/src/components/game/Shell/index.tsx @@ -1,4 +1,5 @@ import { useMemo } from "react"; +import { InventoryItem, InventoryPanel } from "@/components/Zones/Inventory"; import { useContainerSize } from "@/sdk/hooks/useContainerSize"; import { type GameConfigPanels, @@ -117,7 +118,15 @@ export const GameShell = ({ children }: { children: React.ReactNode }) => { className="border-neutral-800 border-l" > {effectiveColumns.right1 && ( -
Right 1
+
+ + Right 1 +
+ + + +
+
)}
diff --git a/apps/client/src/components/game/Stage/index.tsx b/apps/client/src/components/game/Stage/index.tsx index b91874e..28b8213 100644 --- a/apps/client/src/components/game/Stage/index.tsx +++ b/apps/client/src/components/game/Stage/index.tsx @@ -1,7 +1,7 @@ import { Application, extend } from "@pixi/react"; import { Container, Graphics as PixiGraphics, Sprite } from "pixi.js"; -import { ResizeBridge } from "@/components/game/ResizeBridge"; import { World } from "@/components/game/World"; +import { ResizeBridge } from "../ResizeBridge"; extend({ Container, Graphics: PixiGraphics, Sprite }); @@ -12,7 +12,6 @@ export function GameStage({ }) { return ( - + ); } diff --git a/apps/client/src/components/game/World/index.tsx b/apps/client/src/components/game/World/index.tsx index 71b9747..60d52ce 100644 --- a/apps/client/src/components/game/World/index.tsx +++ b/apps/client/src/components/game/World/index.tsx @@ -7,6 +7,7 @@ import { VIEW_TILES_Y, } from "@/sdk/constants"; import { usePixiScreen } from "@/sdk/hooks/usePixiScreen"; +import { useDragStore } from "@/sdk/store/drag"; import { useGameStore } from "@/sdk/store/game"; import { startMovementSystem } from "@/sdk/systems/movement"; import { getViewTiles } from "@/sdk/systems/tiles"; @@ -18,6 +19,13 @@ export function World() { const playerPosition = useGameStore((s) => s.playerPosition); const setMoveTarget = useGameStore((s) => s.setMoveTarget); const moveTarget = useGameStore((s) => s.moveTarget); + const setViewport = useDragStore((s) => s.setViewport); + const startDrag = useDragStore((s) => s.startDrag); + const groundItem = { itemId: "A", vx: 7, vy: 5 }; + const target = useDragStore((s) => s.target); + const canDrop = useDragStore((s) => s.canDrop); + + const worldHover = target?.zone === "WORLD" ? target.tile : null; useEffect(() => { if (tiles.size === 0) initTestMap(); @@ -50,9 +58,17 @@ export function World() { const offsetX = (width - logicalWidth * scale) / 2; const offsetY = (height - logicalHeight * scale) / 2; - if (width <= 0 || height <= 0) return null; + useEffect(() => { + setViewport({ + stageW: width, + stageH: height, + scale, + offsetX, + offsetY, + }); + }, [width, height, scale, offsetX, offsetY, setViewport]); - console.log("World render", { width, height, scale, offsetX, offsetY }); + if (width <= 0 || height <= 0) return null; return ( @@ -96,6 +112,40 @@ export function World() { /> ); })} + { + g.clear(); + const x = groundItem.vx * TILE_SIZE_PX; + const y = groundItem.vy * TILE_SIZE_PX; + g.rect(x + 8, y + 8, 16, 16).fill(0xffcc00); + }} + onPointerDown={(e: any) => { + const oe = e.data.originalEvent as PointerEvent; + startDrag( + { kind: "ITEM", itemId: groundItem.itemId, from: "WORLD" }, + { x: oe.clientX, y: oe.clientY }, + { label: `WorldItem ${groundItem.itemId}` }, + ); + }} + /> + {worldHover && ( + { + g.clear(); + const x = worldHover.vx * TILE_SIZE_PX; + const y = worldHover.vy * TILE_SIZE_PX; + const strokeColor = canDrop ? 0x00ff66 : 0xff3355; + + g.rect(x, y, TILE_SIZE_PX, TILE_SIZE_PX).stroke({ + color: new Color(strokeColor).setAlpha(1), + pixelLine: true, + }); + }} + /> + )} ); } diff --git a/apps/client/src/components/panel/Surface/index.tsx b/apps/client/src/components/panel/Surface/index.tsx new file mode 100644 index 0000000..877e319 --- /dev/null +++ b/apps/client/src/components/panel/Surface/index.tsx @@ -0,0 +1,17 @@ +export function PanelSurface({ + children, + panelId, +}: { + panelId: string; + children: React.ReactNode; +}) { + return ( +
+ {children} +
+ ); +} diff --git a/apps/client/src/pages/_root.tsx b/apps/client/src/pages/_root.tsx index 70201d4..420742d 100644 --- a/apps/client/src/pages/_root.tsx +++ b/apps/client/src/pages/_root.tsx @@ -1,11 +1,5 @@ -import { DndProvider } from "react-dnd"; -import { HTML5Backend } from "react-dnd-html5-backend"; import { GamePage } from "./game"; export default function RootPage() { - return ( - - - - ); + return ; } diff --git a/apps/client/src/pages/game/index.tsx b/apps/client/src/pages/game/index.tsx index f7b9ded..5568f9f 100644 --- a/apps/client/src/pages/game/index.tsx +++ b/apps/client/src/pages/game/index.tsx @@ -1,10 +1,13 @@ +import { DragControllerLayer } from "@/components/DragControllerLayer"; import { GameCanvas } from "@/components/game/Canvas"; import { GameShell } from "@/components/game/Shell"; +import "@/sdk/drag/setupRules"; // registra rules (import side effect) export const GamePage = () => { return ( + ); }; diff --git a/apps/client/src/sdk/constants.ts b/apps/client/src/sdk/constants.ts index d940023..5159f2b 100644 --- a/apps/client/src/sdk/constants.ts +++ b/apps/client/src/sdk/constants.ts @@ -1,6 +1,6 @@ const TILE_SIZE_PX = 32; const VIEW_TILES_X = 15; const VIEW_TILES_Y = 11; -const MAX_SCALE = 2; +const MAX_SCALE = 2.3; export { TILE_SIZE_PX, VIEW_TILES_X, VIEW_TILES_Y, MAX_SCALE }; diff --git a/apps/client/src/sdk/drag/resolveDomTarget.ts b/apps/client/src/sdk/drag/resolveDomTarget.ts new file mode 100644 index 0000000..a8f96e8 --- /dev/null +++ b/apps/client/src/sdk/drag/resolveDomTarget.ts @@ -0,0 +1,31 @@ +import { AvailableZones, type DropTarget, type DropTargetZone } from "./types"; + +export function resolveDomTarget(clientX: number, clientY: number): DropTarget { + const element = document.elementFromPoint( + clientX, + clientY, + ) as HTMLElement | null; + + if (!element) return null; + + const zoneElement = element.closest("[data-dropzone]") as HTMLElement | null; + if (!zoneElement) return null; + + const zone = zoneElement.dataset.dropzone as DropTargetZone; + + if (zone === AvailableZones.INVENTORY) { + return { + zone: AvailableZones.INVENTORY, + panelId: zoneElement.dataset.panelId ?? "inventory", + }; + } + + if (zone === AvailableZones.PANEL) { + return { + zone: AvailableZones.PANEL, + panelId: zoneElement.dataset.panelId ?? "panel", + }; + } + + return null; +} diff --git a/apps/client/src/sdk/drag/rules.ts b/apps/client/src/sdk/drag/rules.ts new file mode 100644 index 0000000..7964d87 --- /dev/null +++ b/apps/client/src/sdk/drag/rules.ts @@ -0,0 +1,32 @@ +import type { DragPayload, DragPreview, DropTarget } from "./types"; + +type NonNullTarget = Exclude; + +export type Rule = { + kind: DragPayload["kind"]; + zone: NonNullTarget["zone"]; + canDrop?: (payload: DragPayload, target: NonNullTarget) => boolean; + onHover?: (payload: DragPayload, target: NonNullTarget) => void; + onDrop: (payload: DragPayload, target: NonNullTarget) => void; + + getPreview?: (payload: DragPayload) => DragPreview; +}; + +const rules: Rule[] = []; + +export function registerRule(rule: Rule) { + rules.push(rule); +} + +export function resolveRule(payload: DragPayload, target: NonNullTarget) { + const candidates = rules.filter( + (r) => r.kind === payload.kind && r.zone === target.zone, + ); + for (const r of candidates) { + const ok = r.canDrop ? r.canDrop(payload, target) : true; + if (ok) return { rule: r, canDrop: true }; + } + // se existe rule mas canDrop falhou, ainda queremos saber "não pode" + if (candidates.length) return { rule: null, canDrop: false }; + return { rule: null, canDrop: false }; +} diff --git a/apps/client/src/sdk/drag/setupRules.ts b/apps/client/src/sdk/drag/setupRules.ts new file mode 100644 index 0000000..502e566 --- /dev/null +++ b/apps/client/src/sdk/drag/setupRules.ts @@ -0,0 +1,90 @@ +import { registerRule } from "./rules"; +import { AvailableKinds, AvailableZones } from "./types"; + +// Inventory to World +registerRule({ + kind: AvailableKinds.ITEM, + zone: AvailableZones.WORLD, + canDrop: (payload) => { + return ( + payload.kind === AvailableKinds.ITEM && + payload.from === AvailableZones.INVENTORY + ); + }, + onDrop: (payload, target) => { + if ( + payload.kind === AvailableKinds.ITEM && + target.zone === AvailableZones.WORLD + ) { + console.log( + `Dropped item ${payload.itemId} onto world tile at (${target.tile.x}, ${target.tile.y}, ${target.tile.z})`, + ); + } + }, +}); + +// World to Inventory +registerRule({ + kind: AvailableKinds.ITEM, + zone: AvailableZones.INVENTORY, + canDrop: (payload) => { + return ( + payload.kind === AvailableKinds.ITEM && + payload.from === AvailableZones.WORLD + ); + }, + onDrop: (payload, target) => { + if ( + payload.kind === AvailableKinds.ITEM && + target.zone === AvailableZones.INVENTORY + ) { + console.log( + `Moved item ${payload.itemId} from world to inventory panel ${target.panelId}`, + ); + } + }, +}); + +// World to World +registerRule({ + kind: AvailableKinds.ITEM, + zone: AvailableZones.WORLD, + canDrop: (payload) => { + return ( + payload.kind === AvailableKinds.ITEM && + payload.from === AvailableZones.WORLD + ); + }, + onDrop: (payload, target) => { + if ( + payload.kind === AvailableKinds.ITEM && + target.zone === AvailableZones.WORLD + ) { + console.log( + `Moved item ${payload.itemId} within world to tile at (${target.tile.x}, ${target.tile.y}, ${target.tile.z})`, + ); + } + }, +}); + +// World to Panel +registerRule({ + kind: AvailableKinds.ITEM, + zone: AvailableZones.PANEL, + canDrop: (payload) => { + return ( + payload.kind === AvailableKinds.ITEM && + payload.from === AvailableZones.WORLD + ); + }, + onDrop: (payload, target) => { + if ( + payload.kind === AvailableKinds.ITEM && + target.zone === AvailableZones.PANEL + ) { + console.log( + `Dropped item ${payload.itemId} onto panel ${target.panelId}`, + ); + } + }, +}); diff --git a/apps/client/src/sdk/drag/types.ts b/apps/client/src/sdk/drag/types.ts new file mode 100644 index 0000000..0067ad0 --- /dev/null +++ b/apps/client/src/sdk/drag/types.ts @@ -0,0 +1,70 @@ +export const AvailableZones = { + WORLD: "WORLD", + PANEL: "PANEL", + INVENTORY: "INVENTORY", +} as const; + +export const AvailableKinds = { + ITEM: "ITEM", + WIDGET: "WIDGET", +} as const; + +export type WorldTile = { + vx: number; + vy: number; + x: number; + y: number; + z: number; +}; + +export type DragPayload = + | { + kind: typeof AvailableKinds.ITEM; + itemId: string; + from: + | typeof AvailableZones.PANEL + | typeof AvailableZones.WORLD + | typeof AvailableZones.INVENTORY; + } + | { + kind: typeof AvailableKinds.WIDGET; + widgetId: string; + fromPanelId: string; + }; + +export type WorldDropTarget = { + zone: typeof AvailableZones.WORLD; + tile: WorldTile; +}; + +export type PanelDropTarget = { + zone: typeof AvailableZones.PANEL; + panelId: string; +}; + +export type InventoryDropTarget = { + zone: typeof AvailableZones.INVENTORY; + panelId: string; +}; + +export type DropTarget = + | WorldDropTarget + | PanelDropTarget + | InventoryDropTarget + | null; + +export type DragPayloadKind = keyof typeof AvailableKinds; +export type DropTargetZone = keyof typeof AvailableZones; + +export type DragViewportTransform = { + stageW: number; + stageH: number; + scale: number; + offsetX: number; + offsetY: number; +}; + +export type DragPreview = { + label?: string; + iconUrl?: string; +}; diff --git a/apps/client/src/sdk/game/screenToTile.ts b/apps/client/src/sdk/game/screenToTile.ts new file mode 100644 index 0000000..363b7d0 --- /dev/null +++ b/apps/client/src/sdk/game/screenToTile.ts @@ -0,0 +1,44 @@ +import type { DragViewportTransform, WorldTile } from "@/sdk/drag/types"; +import { TILE_SIZE_PX, VIEW_TILES_X, VIEW_TILES_Y } from "../constants"; + +export function screenToTile(args: { + localX: number; + localY: number; + viewport: DragViewportTransform; + player: { x: number; y: number; z: number }; +}): WorldTile | null { + const { localX, localY, viewport, player } = args; + const { scale, offsetX, offsetY } = viewport; + + const logicalW = VIEW_TILES_X * TILE_SIZE_PX; + const logicalH = VIEW_TILES_Y * TILE_SIZE_PX; + + const mapLeft = offsetX; + const mapTop = offsetY; + const mapRight = offsetX + logicalW * scale; + const mapBottom = offsetY + logicalH * scale; + + if ( + localX < mapLeft || + localX >= mapRight || + localY < mapTop || + localY >= mapBottom + ) { + return null; // borda preta + } + + const worldPxX = (localX - offsetX) / scale; + const worldPxY = (localY - offsetY) / scale; + + const vx = Math.floor(worldPxX / TILE_SIZE_PX); + const vy = Math.floor(worldPxY / TILE_SIZE_PX); + + if (vx < 0 || vy < 0 || vx >= VIEW_TILES_X || vy >= VIEW_TILES_Y) return null; + + const halfX = Math.floor(VIEW_TILES_X / 2); + const halfY = Math.floor(VIEW_TILES_Y / 2); + const originX = player.x - halfX; + const originY = player.y - halfY; + + return { vx, vy, x: originX + vx, y: originY + vy, z: player.z }; +} diff --git a/apps/client/src/sdk/store/config.ts b/apps/client/src/sdk/store/config.ts index 0a88c10..bb02f45 100644 --- a/apps/client/src/sdk/store/config.ts +++ b/apps/client/src/sdk/store/config.ts @@ -22,7 +22,7 @@ type GameConfigState = { export const useConfigStore = create((set, get) => ({ panels: { - left1: false, + left1: true, left2: false, right1: true, right2: false, diff --git a/apps/client/src/sdk/store/drag.ts b/apps/client/src/sdk/store/drag.ts new file mode 100644 index 0000000..c3dfe0d --- /dev/null +++ b/apps/client/src/sdk/store/drag.ts @@ -0,0 +1,72 @@ +import { create } from "zustand"; +import type { + DragPayload, + DragPreview, + DragViewportTransform, + DropTarget, +} from "../drag/types"; + +type DragState = { + worldEl: HTMLDivElement | null; + setWorldEl: (el: HTMLDivElement | null) => void; + + viewport: DragViewportTransform | null; + setViewport: (v: DragViewportTransform) => void; + + dragging: DragPayload | null; + pointer: { x: number; y: number } | null; + target: DropTarget; + canDrop: boolean; + preview: DragPreview | null; + + startDrag: ( + payload: DragPayload, + startPointer: { x: number; y: number }, + preview?: DragPreview, + ) => void; + setPointer: (p: { x: number; y: number } | null) => void; + setTarget: (t: DropTarget, canDrop: boolean) => void; + endDrag: () => void; +}; + +export const useDragStore = create((set) => ({ + worldEl: null, + setWorldEl: (el) => set({ worldEl: el }), + + viewport: null, + setViewport: (v) => set({ viewport: v }), + + dragging: null, + pointer: null, + target: null, + canDrop: false, + preview: null, + + startDrag: (payload, startPointer, preview) => + set({ + dragging: payload, + pointer: startPointer, + target: null, + canDrop: false, + preview: preview ?? { label: payload.kind }, + }), + + setPointer: (p) => set({ pointer: p }), + + setTarget: (t, canDrop) => + set((s) => { + // evita re-render spam quando nada muda + const sameTarget = + JSON.stringify(s.target) === JSON.stringify(t) && s.canDrop === canDrop; + return sameTarget ? s : { ...s, target: t, canDrop }; + }), + + endDrag: () => + set({ + dragging: null, + pointer: null, + target: null, + canDrop: false, + preview: null, + }), +})); diff --git a/apps/client/src/sdk/utils/cn.ts b/apps/client/src/sdk/utils/cn.ts new file mode 100644 index 0000000..ac680b3 --- /dev/null +++ b/apps/client/src/sdk/utils/cn.ts @@ -0,0 +1,6 @@ +import { type ClassValue, clsx } from "clsx"; +import { twMerge } from "tailwind-merge"; + +export function cn(...inputs: ClassValue[]) { + return twMerge(clsx(inputs)); +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 53c1c66..9807bb7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -250,18 +250,9 @@ importers: react: specifier: ^19.2.1 version: 19.2.1 - react-dnd: - specifier: ^16.0.1 - version: 16.0.1(@types/node@24.10.0)(@types/react@19.2.7)(react@19.2.1) - react-dnd-html5-backend: - specifier: ^16.0.1 - version: 16.0.1 react-dom: specifier: ^19.2.1 version: 19.2.1(react@19.2.1) - react-resizable-panels: - specifier: ^4.0.15 - version: 4.0.15(react-dom@19.2.1(react@19.2.1))(react@19.2.1) tailwind-merge: specifier: catalog:tailwind version: 3.4.0 @@ -2258,15 +2249,6 @@ packages: '@radix-ui/rect@1.1.1': resolution: {integrity: sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==} - '@react-dnd/asap@5.0.2': - resolution: {integrity: sha512-WLyfoHvxhs0V9U+GTsGilGgf2QsPl6ZZ44fnv0/b8T3nQyvzxidxsg/ZltbWssbsRDlYW8UKSQMTGotuTotZ6A==} - - '@react-dnd/invariant@4.0.2': - resolution: {integrity: sha512-xKCTqAK/FFauOM9Ta2pswIyT3D8AQlfrYdOi/toTPEhqCuAs1v5tcJ3Y08Izh1cJ5Jchwy9SeAXmMg6zrKs2iw==} - - '@react-dnd/shallowequal@4.0.2': - resolution: {integrity: sha512-/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA==} - '@react-email/body@0.2.0': resolution: {integrity: sha512-9GCWmVmKUAoRfloboCd+RKm6X17xn7eGL7HnpAZUnjBXBilWCxsKnLMTC/ixSHDKS/A/057M1Tx6ZUXd89sVBw==} peerDependencies: @@ -3892,9 +3874,6 @@ packages: dlv@1.1.3: resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==} - dnd-core@16.0.1: - resolution: {integrity: sha512-HK294sl7tbw6F6IeuK16YSBUoorvHpY8RHO+9yFfaJyCDVb6n7PRcezrOEOa2SBCqiYpemh5Jx20ZcjKdFAVng==} - dom-serializer@2.0.0: resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==} @@ -4389,9 +4368,6 @@ packages: resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==} hasBin: true - hoist-non-react-statics@3.3.2: - resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==} - homedir-polyfill@1.0.3: resolution: {integrity: sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==} engines: {node: '>=0.10.0'} @@ -5467,24 +5443,6 @@ packages: rc9@2.1.2: resolution: {integrity: sha512-btXCnMmRIBINM2LDZoEmOogIZU7Qe7zn4BpomSKZ/ykbLObuBdvG+mFq11DL6fjH1DRwHhrlgtYWG96bJiC7Cg==} - react-dnd-html5-backend@16.0.1: - resolution: {integrity: sha512-Wu3dw5aDJmOGw8WjH1I1/yTH+vlXEL4vmjk5p+MHxP8HuHJS1lAGeIdG/hze1AvNeXWo/JgULV87LyQOr+r5jw==} - - react-dnd@16.0.1: - resolution: {integrity: sha512-QeoM/i73HHu2XF9aKksIUuamHPDvRglEwdHL4jsp784BgUuWcg6mzfxT0QDdQz8Wj0qyRKx2eMg8iZtWvU4E2Q==} - peerDependencies: - '@types/hoist-non-react-statics': '>= 3.3.1' - '@types/node': '>= 12' - '@types/react': ^19.2.7 - react: ^19.2.1 - peerDependenciesMeta: - '@types/hoist-non-react-statics': - optional: true - '@types/node': - optional: true - '@types/react': - optional: true - react-dom@19.2.1: resolution: {integrity: sha512-ibrK8llX2a4eOskq1mXKu/TGZj9qzomO+sNfO98M6d9zIPOEhlBkMkBUBLd1vgS0gQsLDBzA+8jJBVXDnfHmJg==} peerDependencies: @@ -5501,9 +5459,6 @@ packages: peerDependencies: react: ^19.2.1 - react-is@16.13.1: - resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==} - react-qrcode-logo@4.0.0: resolution: {integrity: sha512-TcDdsJQe7P0OY7uA7Do4Z0DfIIjjqx81RbBGQY+90T2Ba42pUCx/cSI2UTwPPoH9WwE0StLb8A98mFgKIAI4JQ==} peerDependencies: @@ -5540,12 +5495,6 @@ packages: '@types/react': optional: true - react-resizable-panels@4.0.15: - resolution: {integrity: sha512-+ygM/EI2h4Qc/cl2fasQ2qwOgNfpQwXLNTU5PqhhPerliX+wnbf7ejcqran7lz3BqABzjddf0pJ3j3G/+A0v9Q==} - peerDependencies: - react: ^19.2.1 - react-dom: ^19.2.1 - react-style-singleton@2.2.3: resolution: {integrity: sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==} engines: {node: '>=10'} @@ -5605,9 +5554,6 @@ packages: resolution: {integrity: sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==} engines: {node: '>=4'} - redux@4.2.1: - resolution: {integrity: sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==} - reflect-metadata@0.2.2: resolution: {integrity: sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==} @@ -8827,12 +8773,6 @@ snapshots: '@radix-ui/rect@1.1.1': {} - '@react-dnd/asap@5.0.2': {} - - '@react-dnd/invariant@4.0.2': {} - - '@react-dnd/shallowequal@4.0.2': {} - '@react-email/body@0.2.0(react@19.2.1)': dependencies: react: 19.2.1 @@ -9639,7 +9579,7 @@ snapshots: optionalDependencies: '@tanstack/react-router': 1.139.14(react-dom@19.2.1(react@19.2.1))(react@19.2.1) vite: 7.2.6(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1) - webpack: 5.102.1(esbuild@0.25.10) + webpack: 5.102.1 transitivePeerDependencies: - supports-color @@ -10592,12 +10532,6 @@ snapshots: dlv@1.1.3: {} - dnd-core@16.0.1: - dependencies: - '@react-dnd/asap': 5.0.2 - '@react-dnd/invariant': 4.0.2 - redux: 4.2.1 - dom-serializer@2.0.0: dependencies: domelementtype: 2.3.0 @@ -11157,10 +11091,6 @@ snapshots: he@1.2.0: {} - hoist-non-react-statics@3.3.2: - dependencies: - react-is: 16.13.1 - homedir-polyfill@1.0.3: dependencies: parse-passwd: 1.0.0 @@ -12131,22 +12061,6 @@ snapshots: defu: 6.1.4 destr: 2.0.5 - react-dnd-html5-backend@16.0.1: - dependencies: - dnd-core: 16.0.1 - - react-dnd@16.0.1(@types/node@24.10.0)(@types/react@19.2.7)(react@19.2.1): - dependencies: - '@react-dnd/invariant': 4.0.2 - '@react-dnd/shallowequal': 4.0.2 - dnd-core: 16.0.1 - fast-deep-equal: 3.1.3 - hoist-non-react-statics: 3.3.2 - react: 19.2.1 - optionalDependencies: - '@types/node': 24.10.0 - '@types/react': 19.2.7 - react-dom@19.2.1(react@19.2.1): dependencies: react: 19.2.1 @@ -12180,8 +12094,6 @@ snapshots: dependencies: react: 19.2.1 - react-is@16.13.1: {} - react-qrcode-logo@4.0.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1): dependencies: qrcode-generator: 2.0.4 @@ -12214,11 +12126,6 @@ snapshots: optionalDependencies: '@types/react': 19.2.7 - react-resizable-panels@4.0.15(react-dom@19.2.1(react@19.2.1))(react@19.2.1): - dependencies: - react: 19.2.1 - react-dom: 19.2.1(react@19.2.1) - react-style-singleton@2.2.3(@types/react@19.2.7)(react@19.2.1): dependencies: get-nonce: 1.0.1 @@ -12293,10 +12200,6 @@ snapshots: dependencies: redis-errors: 1.2.0 - redux@4.2.1: - dependencies: - '@babel/runtime': 7.28.4 - reflect-metadata@0.2.2: {} replace-string@3.1.0: {} @@ -12865,6 +12768,16 @@ snapshots: optionalDependencies: esbuild: 0.25.10 + terser-webpack-plugin@5.3.14(webpack@5.102.1): + dependencies: + '@jridgewell/trace-mapping': 0.3.31 + jest-worker: 27.5.1 + schema-utils: 4.3.3 + serialize-javascript: 6.0.2 + terser: 5.44.1 + webpack: 5.102.1 + optional: true + terser@5.44.1: dependencies: '@jridgewell/source-map': 0.3.11 @@ -13134,6 +13047,39 @@ snapshots: webpack-virtual-modules@0.6.2: {} + webpack@5.102.1: + dependencies: + '@types/eslint-scope': 3.7.7 + '@types/estree': 1.0.8 + '@types/json-schema': 7.0.15 + '@webassemblyjs/ast': 1.14.1 + '@webassemblyjs/wasm-edit': 1.14.1 + '@webassemblyjs/wasm-parser': 1.14.1 + acorn: 8.15.0 + acorn-import-phases: 1.0.4(acorn@8.15.0) + browserslist: 4.28.0 + chrome-trace-event: 1.0.4 + enhanced-resolve: 5.18.3 + es-module-lexer: 1.7.0 + eslint-scope: 5.1.1 + events: 3.3.0 + glob-to-regexp: 0.4.1 + graceful-fs: 4.2.11 + json-parse-even-better-errors: 2.3.1 + loader-runner: 4.3.1 + mime-types: 2.1.35 + neo-async: 2.6.2 + schema-utils: 4.3.3 + tapable: 2.3.0 + terser-webpack-plugin: 5.3.14(webpack@5.102.1) + watchpack: 2.4.4 + webpack-sources: 3.3.3 + transitivePeerDependencies: + - '@swc/core' + - esbuild + - uglify-js + optional: true + webpack@5.102.1(esbuild@0.25.10): dependencies: '@types/eslint-scope': 3.7.7 From 1e52a945a512a3b2bcf23ac53fca09cb35c7d100 Mon Sep 17 00:00:00 2001 From: Guilherme Fontes Date: Tue, 23 Dec 2025 17:07:00 -0400 Subject: [PATCH 06/18] feat: add test movement system using invoke and emit in rust --- Cargo.lock | 356 +++++++++--------- apps/client/src-tauri/Cargo.toml | 3 +- apps/client/src-tauri/src/lib.rs | 79 +++- .../components/dev/DevtoolsOverlay/index.tsx | 46 +++ .../dev/ReactPerfProfiler/index.tsx | 26 ++ .../components/game/PixiPerfBridge/index.tsx | 46 +++ .../src/components/game/Shell/index.tsx | 25 +- .../src/components/game/Stage/index.tsx | 8 +- .../src/components/game/World/index.tsx | 20 +- apps/client/src/pages/game/index.tsx | 23 +- apps/client/src/sdk/movement.ts | 24 ++ apps/client/src/sdk/store/devtools.ts | 70 ++++ apps/client/src/sdk/store/game.ts | 59 +++ biome.json | 2 +- 14 files changed, 583 insertions(+), 204 deletions(-) create mode 100644 apps/client/src/components/dev/DevtoolsOverlay/index.tsx create mode 100644 apps/client/src/components/dev/ReactPerfProfiler/index.tsx create mode 100644 apps/client/src/components/game/PixiPerfBridge/index.tsx create mode 100644 apps/client/src/sdk/movement.ts create mode 100644 apps/client/src/sdk/store/devtools.ts diff --git a/Cargo.lock b/Cargo.lock index 78ffbf2..5b16134 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.4.1" +version = "3.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc" +checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311" dependencies = [ "event-listener", "event-listener-strategy", @@ -249,22 +249,13 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block2" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" -dependencies = [ - "objc2 0.5.2", -] - [[package]] name = "block2" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" dependencies = [ - "objc2 0.6.3", + "objc2", ] [[package]] @@ -303,9 +294,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.19.0" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" +checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" [[package]] name = "bytemuck" @@ -355,9 +346,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609" +checksum = "e629a66d692cb9ff1a1c664e41771b3dcaf961985a9774c0eb0bd1b51cf60a48" dependencies = [ "serde_core", ] @@ -392,14 +383,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77" dependencies = [ "serde", - "toml 0.9.8", + "toml 0.9.10+spec-1.1.0", ] [[package]] name = "cc" -version = "1.2.48" +version = "1.2.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c481bdbf0ed3b892f6f806287d72acd515b352a4ec27a208489b8c1bc839633a" +checksum = "9f50d563227a1c37cc0a263f64eca3334388c01c5e4c4861a9def205c614383c" dependencies = [ "find-msvc-tools", "shlex", @@ -713,7 +704,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec" dependencies = [ "bitflags 2.10.0", - "objc2 0.6.3", + "objc2", ] [[package]] @@ -729,9 +720,9 @@ dependencies = [ [[package]] name = "dlopen2" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d65cde5fb0c42a3d5882d99807698b459f5928de035fa7f547c784fb7b34219" +checksum = "5e2c5bd4158e66d1e215c49b837e11d62f3267b30c92f1d171c4d3105e3dc4d4" dependencies = [ "dlopen2_derive", "libc", @@ -741,9 +732,9 @@ dependencies = [ [[package]] name = "dlopen2_derive" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95f4a04e1bfbfa4835a6073177aafb95ead4de0722dbb339195fdc7e0a09599b" +checksum = "0fbbb781877580993a8707ec48672673ec7b81eeba04cfd2310bd28c08e47c8f" dependencies = [ "proc-macro2", "quote", @@ -795,7 +786,7 @@ dependencies = [ "cc", "memchr", "rustc_version", - "toml 0.9.8", + "toml 0.9.10+spec-1.1.0", "vswhom", "winreg", ] @@ -1469,9 +1460,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e9a2a24dc5c6821e71a7030e1e14b7b632acac55c40e9d2e082c621261bb56" +checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" dependencies = [ "base64 0.22.1", "bytes", @@ -1573,9 +1564,9 @@ checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" +checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" dependencies = [ "icu_collections", "icu_locale_core", @@ -1587,9 +1578,9 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" +checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" [[package]] name = "icu_provider" @@ -1702,9 +1693,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "7ee5b5339afb4c41626dde77b7a611bd4f2c202b897852b4bcf5d03eddc61010" [[package]] name = "javascriptcore-rs" @@ -1854,9 +1845,9 @@ dependencies = [ [[package]] name = "libredox" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" +checksum = "df15f6eac291ed1cf25865b1ee60399f57e7c227e7f51bdbd4c5270396a9ed50" dependencies = [ "bitflags 2.10.0", "libc", @@ -1885,9 +1876,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "mac" @@ -1945,11 +1936,13 @@ dependencies = [ name = "miclient" version = "0.1.0" dependencies = [ + "rand 0.9.2", "serde", "serde_json", "tauri", "tauri-build", "tauri-plugin-opener", + "tokio", ] [[package]] @@ -1970,9 +1963,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" +checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" dependencies = [ "libc", "wasi 0.11.1+wasi-snapshot-preview1", @@ -1989,10 +1982,10 @@ dependencies = [ "dpi", "gtk", "keyboard-types", - "objc2 0.6.3", + "objc2", "objc2-app-kit", "objc2-core-foundation", - "objc2-foundation 0.3.2", + "objc2-foundation", "once_cell", "png", "serde", @@ -2092,22 +2085,6 @@ dependencies = [ "syn 2.0.111", ] -[[package]] -name = "objc-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" - -[[package]] -name = "objc2" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" -dependencies = [ - "objc-sys", - "objc2-encode", -] - [[package]] name = "objc2" version = "0.6.3" @@ -2125,9 +2102,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" dependencies = [ "bitflags 2.10.0", - "block2 0.6.2", + "block2", "libc", - "objc2 0.6.3", + "objc2", "objc2-cloud-kit", "objc2-core-data", "objc2-core-foundation", @@ -2135,8 +2112,8 @@ dependencies = [ "objc2-core-image", "objc2-core-text", "objc2-core-video", - "objc2-foundation 0.3.2", - "objc2-quartz-core 0.3.2", + "objc2-foundation", + "objc2-quartz-core", ] [[package]] @@ -2146,8 +2123,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c" dependencies = [ "bitflags 2.10.0", - "objc2 0.6.3", - "objc2-foundation 0.3.2", + "objc2", + "objc2-foundation", ] [[package]] @@ -2157,8 +2134,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa" dependencies = [ "bitflags 2.10.0", - "objc2 0.6.3", - "objc2-foundation 0.3.2", + "objc2", + "objc2-foundation", ] [[package]] @@ -2169,7 +2146,7 @@ checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ "bitflags 2.10.0", "dispatch2", - "objc2 0.6.3", + "objc2", ] [[package]] @@ -2180,7 +2157,7 @@ checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" dependencies = [ "bitflags 2.10.0", "dispatch2", - "objc2 0.6.3", + "objc2", "objc2-core-foundation", "objc2-io-surface", ] @@ -2191,8 +2168,8 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006" dependencies = [ - "objc2 0.6.3", - "objc2-foundation 0.3.2", + "objc2", + "objc2-foundation", ] [[package]] @@ -2202,7 +2179,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d" dependencies = [ "bitflags 2.10.0", - "objc2 0.6.3", + "objc2", "objc2-core-foundation", "objc2-core-graphics", ] @@ -2214,7 +2191,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6" dependencies = [ "bitflags 2.10.0", - "objc2 0.6.3", + "objc2", "objc2-core-foundation", "objc2-core-graphics", "objc2-io-surface", @@ -2235,18 +2212,6 @@ dependencies = [ "cc", ] -[[package]] -name = "objc2-foundation" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" -dependencies = [ - "bitflags 2.10.0", - "block2 0.5.1", - "libc", - "objc2 0.5.2", -] - [[package]] name = "objc2-foundation" version = "0.3.2" @@ -2254,9 +2219,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" dependencies = [ "bitflags 2.10.0", - "block2 0.6.2", + "block2", "libc", - "objc2 0.6.3", + "objc2", "objc2-core-foundation", ] @@ -2267,7 +2232,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d" dependencies = [ "bitflags 2.10.0", - "objc2 0.6.3", + "objc2", "objc2-core-foundation", ] @@ -2277,35 +2242,10 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a1e6550c4caed348956ce3370c9ffeca70bb1dbed4fa96112e7c6170e074586" dependencies = [ - "objc2 0.6.3", + "objc2", "objc2-core-foundation", ] -[[package]] -name = "objc2-metal" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" -dependencies = [ - "bitflags 2.10.0", - "block2 0.5.1", - "objc2 0.5.2", - "objc2-foundation 0.2.2", -] - -[[package]] -name = "objc2-quartz-core" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" -dependencies = [ - "bitflags 2.10.0", - "block2 0.5.1", - "objc2 0.5.2", - "objc2-foundation 0.2.2", - "objc2-metal", -] - [[package]] name = "objc2-quartz-core" version = "0.3.2" @@ -2313,8 +2253,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f" dependencies = [ "bitflags 2.10.0", - "objc2 0.6.3", - "objc2-foundation 0.3.2", + "objc2", + "objc2-core-foundation", + "objc2-foundation", ] [[package]] @@ -2324,7 +2265,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "709fe137109bd1e8b5a99390f77a7d8b2961dafc1a1c5db8f2e60329ad6d895a" dependencies = [ "bitflags 2.10.0", - "objc2 0.6.3", + "objc2", "objc2-core-foundation", ] @@ -2335,9 +2276,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22" dependencies = [ "bitflags 2.10.0", - "objc2 0.6.3", + "objc2", "objc2-core-foundation", - "objc2-foundation 0.3.2", + "objc2-foundation", ] [[package]] @@ -2347,11 +2288,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f" dependencies = [ "bitflags 2.10.0", - "block2 0.6.2", - "objc2 0.6.3", + "block2", + "objc2", "objc2-app-kit", "objc2-core-foundation", - "objc2-foundation 0.3.2", + "objc2-foundation", "objc2-javascript-core", "objc2-security", ] @@ -2715,7 +2656,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" dependencies = [ - "toml_edit 0.23.7", + "toml_edit 0.23.10+spec-1.0.0", ] [[package]] @@ -2806,6 +2747,16 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "rand" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.3", +] + [[package]] name = "rand_chacha" version = "0.2.2" @@ -2826,6 +2777,16 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.3", +] + [[package]] name = "rand_core" version = "0.5.1" @@ -2844,6 +2805,15 @@ dependencies = [ "getrandom 0.2.16", ] +[[package]] +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +dependencies = [ + "getrandom 0.3.4", +] + [[package]] name = "rand_hc" version = "0.2.0" @@ -2939,9 +2909,9 @@ checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "reqwest" -version = "0.12.24" +version = "0.12.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" +checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ "base64 0.22.1", "bytes", @@ -2983,9 +2953,9 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" +checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" dependencies = [ "bitflags 2.10.0", "errno", @@ -3002,9 +2972,9 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +checksum = "62049b2877bf12821e8f9ad256ee38fdc31db7387ec2d3b3f403024de2034aea" [[package]] name = "same-file" @@ -3155,9 +3125,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.145" +version = "1.0.146" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +checksum = "217ca874ae0207aac254aa02c957ded05585a90892cc8d87f9e5fa49669dadd8" dependencies = [ "itoa", "memchr", @@ -3188,9 +3158,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392" +checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" dependencies = [ "serde_core", ] @@ -3298,9 +3268,9 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" [[package]] name = "siphasher" @@ -3338,24 +3308,24 @@ dependencies = [ [[package]] name = "softbuffer" -version = "0.4.6" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18051cdd562e792cad055119e0cdb2cfc137e44e3987532e0f9659a77931bb08" +checksum = "aac18da81ebbf05109ab275b157c22a653bb3c12cf884450179942f81bcbf6c3" dependencies = [ "bytemuck", - "cfg_aliases", - "core-graphics", - "foreign-types", "js-sys", - "log", - "objc2 0.5.2", - "objc2-foundation 0.2.2", - "objc2-quartz-core 0.2.2", + "ndk", + "objc2", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-foundation", + "objc2-quartz-core", "raw-window-handle", "redox_syscall", + "tracing", "wasm-bindgen", "web-sys", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -3500,7 +3470,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3a753bdc39c07b192151523a3f77cd0394aa75413802c883a0f6f6a0e5ee2e7" dependencies = [ "bitflags 2.10.0", - "block2 0.6.2", + "block2", "core-foundation", "core-graphics", "crossbeam-channel", @@ -3517,9 +3487,9 @@ dependencies = [ "ndk", "ndk-context", "ndk-sys", - "objc2 0.6.3", + "objc2", "objc2-app-kit", - "objc2-foundation 0.3.2", + "objc2-foundation", "once_cell", "parking_lot", "raw-window-handle", @@ -3552,9 +3522,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.9.4" +version = "2.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15524fc7959bfcaa051ba6d0b3fb1ef18e978de2176c7c6acb977f7fd14d35c7" +checksum = "8a3868da5508446a7cd08956d523ac3edf0a8bc20bf7e4038f9a95c2800d2033" dependencies = [ "anyhow", "bytes", @@ -3572,9 +3542,9 @@ dependencies = [ "log", "mime", "muda", - "objc2 0.6.3", + "objc2", "objc2-app-kit", - "objc2-foundation 0.3.2", + "objc2-foundation", "objc2-ui-kit", "objc2-web-kit", "percent-encoding", @@ -3619,7 +3589,7 @@ dependencies = [ "serde_json", "tauri-utils", "tauri-winres", - "toml 0.9.8", + "toml 0.9.10+spec-1.1.0", "walkdir", ] @@ -3677,7 +3647,7 @@ dependencies = [ "serde", "serde_json", "tauri-utils", - "toml 0.9.8", + "toml 0.9.10+spec-1.1.0", "walkdir", ] @@ -3690,7 +3660,7 @@ dependencies = [ "dunce", "glob", "objc2-app-kit", - "objc2-foundation 0.3.2", + "objc2-foundation", "open", "schemars 0.8.22", "serde", @@ -3714,7 +3684,7 @@ dependencies = [ "gtk", "http", "jni", - "objc2 0.6.3", + "objc2", "objc2-ui-kit", "objc2-web-kit", "raw-window-handle", @@ -3730,17 +3700,17 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.9.2" +version = "2.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7950f3bde6bcca6655bc5e76d3d6ec587ceb81032851ab4ddbe1f508bdea2729" +checksum = "187a3f26f681bdf028f796ccf57cf478c1ee422c50128e5a0a6ebeb3f5910065" dependencies = [ "gtk", "http", "jni", "log", - "objc2 0.6.3", + "objc2", "objc2-app-kit", - "objc2-foundation 0.3.2", + "objc2-foundation", "once_cell", "percent-encoding", "raw-window-handle", @@ -3786,7 +3756,7 @@ dependencies = [ "serde_with", "swift-rs", "thiserror 2.0.17", - "toml 0.9.8", + "toml 0.9.10+spec-1.1.0", "url", "urlpattern", "uuid", @@ -3801,7 +3771,7 @@ checksum = "1087b111fe2b005e42dbdc1990fc18593234238d47453b0c99b7de1c9ab2c1e0" dependencies = [ "dunce", "embed-resource", - "toml 0.9.8", + "toml 0.9.10+spec-1.1.0", ] [[package]] @@ -3918,11 +3888,25 @@ dependencies = [ "bytes", "libc", "mio", + "parking_lot", "pin-project-lite", + "signal-hook-registry", "socket2", + "tokio-macros", "windows-sys 0.61.2", ] +[[package]] +name = "tokio-macros" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + [[package]] name = "tokio-util" version = "0.7.17" @@ -3950,14 +3934,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.8" +version = "0.9.10+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8" +checksum = "0825052159284a1a8b4d6c0c86cbc801f2da5afd2b225fa548c72f2e74002f48" dependencies = [ "indexmap 2.12.1", "serde_core", - "serde_spanned 1.0.3", - "toml_datetime 0.7.3", + "serde_spanned 1.0.4", + "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", "toml_writer", "winnow 0.7.14", @@ -3974,9 +3958,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.7.3" +version = "0.7.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533" +checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" dependencies = [ "serde_core", ] @@ -4007,30 +3991,30 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.23.7" +version = "0.23.10+spec-1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d" +checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" dependencies = [ "indexmap 2.12.1", - "toml_datetime 0.7.3", + "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", "winnow 0.7.14", ] [[package]] name = "toml_parser" -version = "1.0.4" +version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e" +checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" dependencies = [ "winnow 0.7.14", ] [[package]] name = "toml_writer" -version = "1.0.4" +version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2" +checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607" [[package]] name = "tower" @@ -4049,9 +4033,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf146f99d442e8e68e585f5d798ccd3cad9a7835b917e09728880a862706456" +checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ "bitflags 2.10.0", "bytes", @@ -4079,9 +4063,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ "pin-project-lite", "tracing-attributes", @@ -4101,9 +4085,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.35" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", ] @@ -4118,11 +4102,11 @@ dependencies = [ "dirs", "libappindicator", "muda", - "objc2 0.6.3", + "objc2", "objc2-app-kit", "objc2-core-foundation", "objc2-core-graphics", - "objc2-foundation 0.3.2", + "objc2-foundation", "once_cell", "png", "serde", @@ -4530,10 +4514,10 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c" dependencies = [ - "objc2 0.6.3", + "objc2", "objc2-app-kit", "objc2-core-foundation", - "objc2-foundation 0.3.2", + "objc2-foundation", "raw-window-handle", "windows-sys 0.59.0", "windows-version", @@ -4965,7 +4949,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "728b7d4c8ec8d81cab295e0b5b8a4c263c0d41a785fb8f8c4df284e5411140a2" dependencies = [ "base64 0.22.1", - "block2 0.6.2", + "block2", "cookie", "crossbeam-channel", "dirs", @@ -4980,10 +4964,10 @@ dependencies = [ "kuchikiki", "libc", "ndk", - "objc2 0.6.3", + "objc2", "objc2-app-kit", "objc2-core-foundation", - "objc2-foundation 0.3.2", + "objc2-foundation", "objc2-ui-kit", "objc2-web-kit", "once_cell", diff --git a/apps/client/src-tauri/Cargo.toml b/apps/client/src-tauri/Cargo.toml index 633851c..72cc9a8 100644 --- a/apps/client/src-tauri/Cargo.toml +++ b/apps/client/src-tauri/Cargo.toml @@ -22,4 +22,5 @@ tauri = { version = "2", features = [] } tauri-plugin-opener = "2" serde = { version = "1", features = ["derive"] } serde_json = "1" - +rand = "0.9.2" +tokio = { version = "1.48.0", features = ["full"] } diff --git a/apps/client/src-tauri/src/lib.rs b/apps/client/src-tauri/src/lib.rs index 4a277ef..1084b5b 100644 --- a/apps/client/src-tauri/src/lib.rs +++ b/apps/client/src-tauri/src/lib.rs @@ -1,14 +1,85 @@ -// Learn more about Tauri commands at https://tauri.app/develop/calling-rust/ +use rand::Rng; +use serde::{Deserialize, Serialize}; +use std::time::Duration; +use tauri::AppHandle; +use tauri::Emitter; + +#[derive(Debug, Clone, Serialize, Deserialize)] +struct Position { + x: i32, + y: i32, + z: i32, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "snake_case")] +enum Direction { + North, + South, + East, + West, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +struct MoveRequest { + request_id: String, + from: Position, + direction: Direction, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +struct MoveResultEvent { + request_id: String, + ok: bool, + position: Option, + error: Option, +} + +fn apply_dir(mut p: Position, dir: Direction) -> Position { + match dir { + Direction::North => p.y -= 1, + Direction::South => p.y += 1, + Direction::West => p.x -= 1, + Direction::East => p.x += 1, + } + p +} + #[tauri::command] -fn greet(name: &str) -> String { - format!("Hello, {}! You've been greeted from Rust!", name) +async fn request_move(app: AppHandle, req: MoveRequest) -> Result<(), String> { + tauri::async_runtime::spawn(async move { + tokio::time::sleep(Duration::from_millis(30)).await; + + let fail = rand::rng().random_bool(0.03); // 3% + let ev = if fail { + MoveResultEvent { + request_id: req.request_id, + ok: false, + position: None, + error: Some("simulated_error".to_string()), + } + } else { + let new_pos = apply_dir(req.from, req.direction); + MoveResultEvent { + request_id: req.request_id, + ok: true, + position: Some(new_pos), + error: None, + } + }; + + // emite pro front + let _ = app.emit("move_result", ev); + }); + + Ok(()) } #[cfg_attr(mobile, tauri::mobile_entry_point)] pub fn run() { tauri::Builder::default() .plugin(tauri_plugin_opener::init()) - .invoke_handler(tauri::generate_handler![greet]) + .invoke_handler(tauri::generate_handler![request_move]) .run(tauri::generate_context!()) .expect("error while running tauri application"); } diff --git a/apps/client/src/components/dev/DevtoolsOverlay/index.tsx b/apps/client/src/components/dev/DevtoolsOverlay/index.tsx new file mode 100644 index 0000000..9001467 --- /dev/null +++ b/apps/client/src/components/dev/DevtoolsOverlay/index.tsx @@ -0,0 +1,46 @@ +import { useEffect } from "react"; +import { useDevtoolsStore } from "@/sdk/store/devtools"; + +export function DevtoolsOverlay() { + const enabled = useDevtoolsStore((s) => s.enabled); + const toggle = useDevtoolsStore((s) => s.toggle); + const pixi = useDevtoolsStore((s) => s.pixi); + const react = useDevtoolsStore((s) => s.react); + + useEffect(() => { + const onKey = (e: KeyboardEvent) => { + // F2 toggle (bem comum em debug HUD) + if (e.key === "F2") toggle(); + }; + window.addEventListener("keydown", onKey); + return () => window.removeEventListener("keydown", onKey); + }, [toggle]); + + if (!enabled) return null; + + return ( +
+
DEVTOOLS (F2)
+ +
+
PIXI
+
FPS: {pixi ? pixi.fps.toFixed(1) : "-"}
+
Frame: {pixi ? pixi.frameMs.toFixed(2) : "-"} ms
+
+ Screen: {pixi ? `${pixi.width}×${pixi.height}` : "-"} (dpr{" "} + {pixi ? pixi.dpr.toFixed(2) : "-"}) +
+
+ +
+
REACT
+
Commits/s: {react ? react.commitsPerSec : "-"}
+
Avg commit: {react ? react.avgCommitMs.toFixed(2) : "-"} ms
+
Last commit: {react ? react.lastCommitMs.toFixed(2) : "-"} ms
+
+
+ ); +} diff --git a/apps/client/src/components/dev/ReactPerfProfiler/index.tsx b/apps/client/src/components/dev/ReactPerfProfiler/index.tsx new file mode 100644 index 0000000..8a65df6 --- /dev/null +++ b/apps/client/src/components/dev/ReactPerfProfiler/index.tsx @@ -0,0 +1,26 @@ +import { Profiler, type ReactNode, useEffect } from "react"; +import { useDevtoolsStore } from "@/sdk/store/devtools"; + +export function ReactPerfProfiler({ children }: { children: ReactNode }) { + const enabled = useDevtoolsStore((s) => s.enabled); + const note = useDevtoolsStore((s) => s.noteReactCommit); + const tick = useDevtoolsStore((s) => s.tickReactWindow); + + useEffect(() => { + if (!enabled) return; + const id = window.setInterval(() => tick(), 1000); + return () => window.clearInterval(id); + }, [enabled, tick]); + + return ( + { + if (!enabled) return; + note(actualDuration); + }} + > + {children} + + ); +} diff --git a/apps/client/src/components/game/PixiPerfBridge/index.tsx b/apps/client/src/components/game/PixiPerfBridge/index.tsx new file mode 100644 index 0000000..d58e9c0 --- /dev/null +++ b/apps/client/src/components/game/PixiPerfBridge/index.tsx @@ -0,0 +1,46 @@ +import { useApplication } from "@pixi/react"; +import { useEffect } from "react"; +import { useDevtoolsStore } from "@/sdk/store/devtools"; + +export function PixiPerfBridge() { + const { app } = useApplication(); + const enabled = useDevtoolsStore((s) => s.enabled); + const setPixi = useDevtoolsStore((s) => s.setPixi); + + useEffect(() => { + if (!enabled) return; + + let frames = 0; + let last = performance.now(); + + const onTick = () => { + frames += 1; + }; + + app.ticker.add(onTick); + + const id = window.setInterval(() => { + const now = performance.now(); + const dt = now - last; + const fps = dt > 0 ? (frames * 1000) / dt : 0; + + setPixi({ + fps, + frameMs: app.ticker.deltaMS, + width: app.renderer.width, + height: app.renderer.height, + dpr: app.renderer.resolution, + }); + + frames = 0; + last = now; + }, 500); + + return () => { + window.clearInterval(id); + app.ticker.remove(onTick); + }; + }, [app, enabled, setPixi]); + + return null; +} diff --git a/apps/client/src/components/game/Shell/index.tsx b/apps/client/src/components/game/Shell/index.tsx index 5496d84..7ae4581 100644 --- a/apps/client/src/components/game/Shell/index.tsx +++ b/apps/client/src/components/game/Shell/index.tsx @@ -1,3 +1,4 @@ +/** biome-ignore-all lint/a11y/useButtonType: */ import { useMemo } from "react"; import { InventoryItem, InventoryPanel } from "@/components/Zones/Inventory"; import { useContainerSize } from "@/sdk/hooks/useContainerSize"; @@ -6,6 +7,7 @@ import { type PanelSlot, useConfigStore, } from "@/sdk/store/config"; +import { useGameStore } from "@/sdk/store/game"; const PANEL_WIDTH = 175; const MIN_CANVAS_WIDTH = 240; @@ -163,6 +165,27 @@ const MAX_HEALTH = 60; const MIN_BOTTOM = 120; const MAX_BOTTOM = 180; +export function MoveTestButtons() { + const requestMove = useGameStore((s) => s.requestMove); + const pos = useGameStore((s) => s.playerPosition); + const pending = useGameStore((s) => s.pending); + + return ( +
+
+ pos: {pos.x},{pos.y},{pos.z} {pending ? "(pending)" : ""} +
+ +
+ + + + +
+
+ ); +} + export function CenterColumn({ children, showHealth, @@ -205,7 +228,7 @@ export function CenterColumn({ {showBottom && (
- chat +
)} diff --git a/apps/client/src/components/game/Stage/index.tsx b/apps/client/src/components/game/Stage/index.tsx index 28b8213..470dc55 100644 --- a/apps/client/src/components/game/Stage/index.tsx +++ b/apps/client/src/components/game/Stage/index.tsx @@ -1,10 +1,10 @@ import { Application, extend } from "@pixi/react"; -import { Container, Graphics as PixiGraphics, Sprite } from "pixi.js"; +import { Container, Graphics as PixiGraphics, Sprite, Text } from "pixi.js"; import { World } from "@/components/game/World"; +import { PixiPerfBridge } from "../PixiPerfBridge"; import { ResizeBridge } from "../ResizeBridge"; -extend({ Container, Graphics: PixiGraphics, Sprite }); - +extend({ Container, Graphics: PixiGraphics, Sprite, Text }); export function GameStage({ resizeTo, }: { @@ -16,11 +16,13 @@ export function GameStage({ autoStart sharedTicker powerPreference="high-performance" + preference="webgpu" backgroundColor={0x000000} resolution={window.devicePixelRatio} autoDensity > + ); diff --git a/apps/client/src/components/game/World/index.tsx b/apps/client/src/components/game/World/index.tsx index 60d52ce..846ccc3 100644 --- a/apps/client/src/components/game/World/index.tsx +++ b/apps/client/src/components/game/World/index.tsx @@ -91,9 +91,9 @@ export function World() { const x = vx * TILE_SIZE_PX; const y = vy * TILE_SIZE_PX; - return ( + return [ { g.clear(); @@ -109,8 +109,20 @@ export function World() { .fill(color); }} onPointerDown={() => handleTileClick(tile.position)} - /> - ); + />, + // , + ]; })} { + useEffect(() => { + const unlistenPromise = installMoveListener(); + + return () => { + void unlistenPromise.then((u) => u()); + }; + }, []); + return ( - - - - + + + + + + + ); }; diff --git a/apps/client/src/sdk/movement.ts b/apps/client/src/sdk/movement.ts new file mode 100644 index 0000000..1910164 --- /dev/null +++ b/apps/client/src/sdk/movement.ts @@ -0,0 +1,24 @@ +import { listen } from "@tauri-apps/api/event"; +import { useGameStore } from "@/sdk/store/game"; + +export type Position = { x: number; y: number; z: number }; +export type Direction = "north" | "south" | "east" | "west"; + +export function installMoveListener() { + return listen("move_result", (event) => { + useGameStore.getState().onMoveResult(event.payload as any); + }); +} + +export function applyDir(p: Position, dir: Direction): Position { + switch (dir) { + case "north": + return { ...p, y: p.y - 1 }; + case "south": + return { ...p, y: p.y + 1 }; + case "west": + return { ...p, x: p.x - 1 }; + case "east": + return { ...p, x: p.x + 1 }; + } +} diff --git a/apps/client/src/sdk/store/devtools.ts b/apps/client/src/sdk/store/devtools.ts new file mode 100644 index 0000000..6654d4a --- /dev/null +++ b/apps/client/src/sdk/store/devtools.ts @@ -0,0 +1,70 @@ +import { create } from "zustand"; + +type PixiPerf = { + fps: number; + frameMs: number; + width: number; + height: number; + dpr: number; +}; + +type ReactPerf = { + commitsPerSec: number; + avgCommitMs: number; + lastCommitMs: number; +}; + +type DevtoolsState = { + enabled: boolean; + toggle: () => void; + + pixi: PixiPerf | null; + react: ReactPerf | null; + + // internos (contadores) + _reactCommits: number; + _reactDurSum: number; + _reactLastMs: number; + + setPixi: (p: PixiPerf) => void; + noteReactCommit: (ms: number) => void; + tickReactWindow: () => void; +}; + +export const useDevtoolsStore = create((set, get) => ({ + enabled: true, + toggle: () => set((s) => ({ enabled: !s.enabled })), + + pixi: null, + react: { commitsPerSec: 0, avgCommitMs: 0, lastCommitMs: 0 }, + + _reactCommits: 0, + _reactDurSum: 0, + _reactLastMs: 0, + + setPixi: (p) => set({ pixi: p }), + + noteReactCommit: (ms) => + set((s) => ({ + _reactCommits: s._reactCommits + 1, + _reactDurSum: s._reactDurSum + ms, + _reactLastMs: ms, + })), + + tickReactWindow: () => { + const s = get(); + const commits = s._reactCommits; + const avg = commits > 0 ? s._reactDurSum / commits : 0; + + // janela de 1s (a gente vai chamar 1x por segundo) + set({ + react: { + commitsPerSec: commits, + avgCommitMs: avg, + lastCommitMs: s._reactLastMs, + }, + _reactCommits: 0, + _reactDurSum: 0, + }); + }, +})); diff --git a/apps/client/src/sdk/store/game.ts b/apps/client/src/sdk/store/game.ts index 73ff7a8..b6968b0 100644 --- a/apps/client/src/sdk/store/game.ts +++ b/apps/client/src/sdk/store/game.ts @@ -1,14 +1,31 @@ +import { invoke } from "@tauri-apps/api/core"; import { create } from "zustand"; import type { Position } from "@/sdk/types/position"; import type { Tile } from "@/sdk/types/tile"; +import { applyDir, type Direction } from "../movement"; export function positionKey(pos: Position): string { return `${pos.x}:${pos.y}:${pos.z}`; } +type PendingMove = { + requestId: string; + prev: Position; +}; + +type MoveResultEvent = { + request_id: string; + ok: boolean; + position?: Position | null; + error?: string | null; +}; + type GameState = { tiles: Map; hoveredTile: Position | null; + pending: PendingMove | null; + requestMove: (target: Direction) => void; + onMoveResult: (event: MoveResultEvent) => void; playerPosition: Position; moveTarget: Position | null; stepDurationMs: number; @@ -23,6 +40,7 @@ export const useGameStore = create((set, get) => ({ tiles: new Map(), hoveredTile: null, playerPosition: { x: 50, y: 50, z: 0 }, + pending: null, moveTarget: null, stepDurationMs: 50, // duração de um passo em ms @@ -32,6 +50,47 @@ export const useGameStore = create((set, get) => ({ set({ hoveredTile: pos }); }, + requestMove: (direction) => { + // trava 1 por vez (mais simples). Depois dá pra virar fila. + if (get().pending) return; + + const prev = get().playerPosition; + const predicted = applyDir(prev, direction); + const requestId = crypto.randomUUID(); + + // optimistic + set({ playerPosition: predicted, pending: { requestId, prev } }); + + // chama Rust (autoritativo) + void invoke("request_move", { + req: { + request_id: requestId, + from: prev, + direction: direction, // snake_case no Rust via serde rename_all + }, + }).catch((err) => { + // se der erro no invoke, rollback imediato + const pending = get().pending; + if (pending?.requestId === requestId) { + set({ playerPosition: pending.prev, pending: null }); + } + console.error("invoke request_move failed:", err); + }); + }, + + onMoveResult: (ev) => { + const pending = get().pending; + if (!pending) return; + if (ev.request_id !== pending.requestId) return; // ignora resposta velha + + if (ev.ok && ev.position) { + set({ playerPosition: ev.position, pending: null }); + } else { + // rollback + set({ playerPosition: pending.prev, pending: null }); + } + }, + initTestMap: () => { const tiles = new Map(); diff --git a/biome.json b/biome.json index 584a90a..1838967 100644 --- a/biome.json +++ b/biome.json @@ -1,5 +1,5 @@ { - "$schema": "https://biomejs.dev/schemas/2.3.4/schema.json", + "$schema": "https://biomejs.dev/schemas/2.3.8/schema.json", "vcs": { "enabled": false, "clientKind": "git", From c04b26b4725a6b4bc0fb7bbeef064bc83705320b Mon Sep 17 00:00:00 2001 From: Guilherme Fontes Date: Wed, 24 Dec 2025 13:30:42 -0400 Subject: [PATCH 07/18] refactor: remove pixi react and use only pixi with classes --- .vscode/settings.json | 1 + apps/client/public/textures/background.png | Bin 0 -> 14179 bytes .../public/textures/background_dark.png | Bin 0 -> 4999 bytes .../components/DragControllerLayer/index.tsx | 129 --------- apps/client/src/components/Panel/index.tsx | 3 + .../components/PointerHoverLayer/index.tsx | 37 +++ .../src/components/Zones/Inventory/index.tsx | 34 --- .../components/dev/DevtoolsOverlay/index.tsx | 46 ---- .../dev/ReactPerfProfiler/index.tsx | 26 -- .../src/components/game/Canvas/index.tsx | 33 +-- .../src/components/game/PixiHost/index.tsx | 110 ++++++++ .../components/game/PixiPerfBridge/index.tsx | 46 ---- .../components/game/ResizeBridge/index.tsx | 52 ---- .../src/components/game/Shell/index.tsx | 202 ++++---------- .../src/components/game/Stage/index.tsx | 29 -- .../src/components/game/World/index.tsx | 163 ------------ .../src/components/panel/Surface/index.tsx | 17 -- apps/client/src/components/ui/Panel/index.tsx | 35 +++ apps/client/src/global.css | 27 ++ apps/client/src/pages/game/index.tsx | 31 +-- apps/client/src/sdk/constants.ts | 17 +- apps/client/src/sdk/demo/demoMapLoader.ts | 72 +++++ apps/client/src/sdk/demo/demoTileGen.ts | 31 +++ apps/client/src/sdk/drag/resolveDomTarget.ts | 31 --- apps/client/src/sdk/drag/rules.ts | 32 --- apps/client/src/sdk/drag/setupRules.ts | 90 ------- apps/client/src/sdk/drag/types.ts | 70 ----- apps/client/src/sdk/game/screenToTile.ts | 60 ++--- apps/client/src/sdk/hooks/useContainerSize.ts | 26 -- apps/client/src/sdk/hooks/usePixiScreen.ts | 25 -- apps/client/src/sdk/movement.ts | 24 -- .../src/sdk/pixi/layers/CreatureLayer.ts | 84 ++++++ .../src/sdk/pixi/layers/DebugGridLayer.ts | 127 +++++++++ .../client/src/sdk/pixi/layers/GroundLayer.ts | 65 +++++ .../src/sdk/pixi/layers/OverlayLayer.ts | 40 +++ .../client/src/sdk/pixi/utils/ResizeBridge.ts | 56 ++++ apps/client/src/sdk/pixi/utils/SpritePool.ts | 39 +++ apps/client/src/sdk/pixi/world.ts | 248 ++++++++++++++++++ apps/client/src/sdk/store/config.ts | 37 --- apps/client/src/sdk/store/debug.ts | 13 + apps/client/src/sdk/store/devtools.ts | 70 ----- apps/client/src/sdk/store/drag.ts | 72 ----- apps/client/src/sdk/store/game.ts | 160 ----------- apps/client/src/sdk/store/movement.ts | 29 ++ apps/client/src/sdk/store/viewport.ts | 59 +++++ apps/client/src/sdk/store/world.ts | 68 +++++ apps/client/src/sdk/systems/movement.ts | 21 -- apps/client/src/sdk/systems/tiles.ts | 26 -- 48 files changed, 1255 insertions(+), 1458 deletions(-) create mode 100644 apps/client/public/textures/background.png create mode 100644 apps/client/public/textures/background_dark.png delete mode 100644 apps/client/src/components/DragControllerLayer/index.tsx create mode 100644 apps/client/src/components/Panel/index.tsx create mode 100644 apps/client/src/components/PointerHoverLayer/index.tsx delete mode 100644 apps/client/src/components/Zones/Inventory/index.tsx delete mode 100644 apps/client/src/components/dev/DevtoolsOverlay/index.tsx delete mode 100644 apps/client/src/components/dev/ReactPerfProfiler/index.tsx create mode 100644 apps/client/src/components/game/PixiHost/index.tsx delete mode 100644 apps/client/src/components/game/PixiPerfBridge/index.tsx delete mode 100644 apps/client/src/components/game/ResizeBridge/index.tsx delete mode 100644 apps/client/src/components/game/Stage/index.tsx delete mode 100644 apps/client/src/components/game/World/index.tsx delete mode 100644 apps/client/src/components/panel/Surface/index.tsx create mode 100644 apps/client/src/components/ui/Panel/index.tsx create mode 100644 apps/client/src/sdk/demo/demoMapLoader.ts create mode 100644 apps/client/src/sdk/demo/demoTileGen.ts delete mode 100644 apps/client/src/sdk/drag/resolveDomTarget.ts delete mode 100644 apps/client/src/sdk/drag/rules.ts delete mode 100644 apps/client/src/sdk/drag/setupRules.ts delete mode 100644 apps/client/src/sdk/drag/types.ts delete mode 100644 apps/client/src/sdk/hooks/useContainerSize.ts delete mode 100644 apps/client/src/sdk/hooks/usePixiScreen.ts delete mode 100644 apps/client/src/sdk/movement.ts create mode 100644 apps/client/src/sdk/pixi/layers/CreatureLayer.ts create mode 100644 apps/client/src/sdk/pixi/layers/DebugGridLayer.ts create mode 100644 apps/client/src/sdk/pixi/layers/GroundLayer.ts create mode 100644 apps/client/src/sdk/pixi/layers/OverlayLayer.ts create mode 100644 apps/client/src/sdk/pixi/utils/ResizeBridge.ts create mode 100644 apps/client/src/sdk/pixi/utils/SpritePool.ts create mode 100644 apps/client/src/sdk/pixi/world.ts delete mode 100644 apps/client/src/sdk/store/config.ts create mode 100644 apps/client/src/sdk/store/debug.ts delete mode 100644 apps/client/src/sdk/store/devtools.ts delete mode 100644 apps/client/src/sdk/store/drag.ts delete mode 100644 apps/client/src/sdk/store/game.ts create mode 100644 apps/client/src/sdk/store/movement.ts create mode 100644 apps/client/src/sdk/store/viewport.ts create mode 100644 apps/client/src/sdk/store/world.ts delete mode 100644 apps/client/src/sdk/systems/movement.ts delete mode 100644 apps/client/src/sdk/systems/tiles.ts diff --git a/.vscode/settings.json b/.vscode/settings.json index fd320aa..8a6d71e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -201,6 +201,7 @@ "tsyringe", "undelete", "unserialize", + "unsubs", "usecase", "usecases", "usehooks", diff --git a/apps/client/public/textures/background.png b/apps/client/public/textures/background.png new file mode 100644 index 0000000000000000000000000000000000000000..3b8800d0bee9eaddd59842cf8bf734aaa6d945e6 GIT binary patch literal 14179 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 geER9H-G8b2|4e3`REAdf7i6d_>)Ec4t2ety#WQ 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 z zWjM%LeNZrbaGH0&>Pk8mFf?qMx(27!VoxL7s|1L(astO-wwfzWF*R@C1izefhFowe z9hH{v+X-O;cimB*0^Ng}c~m+C_?{1z%)TbCB|PYTE>6&`Gz^2&&3^bS|LPlF1cHil zZ-FQ=kNw(UOoIabs-8cW^XY^dC6_-@x$`%Fyp;l5$N^AlV}H_mN~r;~|JoP5iJqNM z`N`L3Z9`5=V zlg)`xY}#Oam8K$rC<v>vs z1zJ&eKyw2S^q_8eH)X&o?iX>o!0WGKYi?)i*0#!ys4G$A8tH!X43<(zq|9@Z%AC;H zkRtYE?oz84Lyg;q>>_cR{=biX4<YKN2_W03PEqz)?gUVd= z{f0Dmq>Wbz$<32d)}6Y#xQVZ(Kj*CDeQtaw{+XIwV`i7K8w!>D-lse|>c5MG`*2f^ zI~x~kxxT~>DsCp3c7AS4xEQm%B$Hjs(bRDrfxJqqY~eF8h0KZlqSkSRXUBWKjIJ^k z=n@nQY*K7&T@Pb%xn8brx=B2%Re{Iow=96O<%a!RKX`$vAS+NGxnf|VduPV7nPA;xYz?a!Pr3};MDO-a}7-C>pW zQ;-+34|?=XU9&wDf{bNzv50qHRhU=wUFcUrAnuK52yFb5FCB`$7{gfZw~Ut96Pe^kw$U82XeU%nGR{3ao0n^nlZ#eN$K3Si44azo z6MjDPT@GA3ahaEClt0$HQ0j4vIRa#=D|8L*0q+HMhV(zp!a}Ab<(fSVM_49#?}Z>H zQ_1_DZuZwMczKqEjQS)j?t|dRK;g6Y7PsC9;)#31$Lo;U?FZ+u{^|n|=6=6k(U?+M z9b!BauCa*n@11#^LH4ryWHov(ZIjWf&AO#|7i$YrjxRQpV-D=S*J|AvpSr|tl&d@f z*^>9TG#dWcoDF84B;CAaSU_&eKsLCprF}E1U zHoh{xL)c`alCP-~vF*&k{E9J+XD&^_ZL}886C1G*#LDS_?7d|74wKLQKc{gvJ_Ur% zjHgv>JC_5a4)RCi(hNK>xQVYr8vVnAe@bTV$ar9c=Wnef_Ix!RU8&pjxbyO-SKE7a ziUj9w2JVpqa~{s_)$+owjpWDw+VhK`0#7ulv(&Da_mYYuBTt3qHDYL{2mj!L%P?kV zQ>lmw{$9ofmV`K-be-7M?0{VU&r4EPM!N%n0*L= z?4lR=I9L7t%Qr{;-q8O&@XqiK#P`UOk;lgWh*p|}g4)C>?`c^@<}FV;+77@D4xXj< zFznVF*Ff&R$=a2mXyv-Ru3^D;PeNCl*0=vwKmC8{F54$`E#uw9dQXe1ZQ522Y`{T> KBe2lUH|c)@jdgVZ literal 0 HcmV?d00001 diff --git a/apps/client/src/components/DragControllerLayer/index.tsx b/apps/client/src/components/DragControllerLayer/index.tsx deleted file mode 100644 index 6ef3d07..0000000 --- a/apps/client/src/components/DragControllerLayer/index.tsx +++ /dev/null @@ -1,129 +0,0 @@ -import { useEffect } from "react"; -import { createPortal } from "react-dom"; -import { resolveDomTarget } from "@/sdk/drag/resolveDomTarget"; -import { resolveRule } from "@/sdk/drag/rules"; -import { AvailableZones, type WorldDropTarget } from "@/sdk/drag/types"; -import { screenToTile } from "@/sdk/game/screenToTile"; -import { useDragStore } from "@/sdk/store/drag"; -import { useGameStore } from "@/sdk/store/game"; - -export function DragControllerLayer() { - const dragging = useDragStore((s) => s.dragging); - const pointer = useDragStore((s) => s.pointer); - const preview = useDragStore((s) => s.preview); - - const worldEl = useDragStore((s) => s.worldEl); - const viewport = useDragStore((s) => s.viewport); - - const setPointer = useDragStore((s) => s.setPointer); - const setTarget = useDragStore((s) => s.setTarget); - const endDrag = useDragStore((s) => s.endDrag); - - const playerPosition = useGameStore((s) => s.playerPosition); - - useEffect(() => { - if (!dragging) return; - - const onMove = (event: PointerEvent) => { - const x = event.clientX; - const y = event.clientY; - setPointer({ x, y }); - - const domTarget = resolveDomTarget(x, y); - if (domTarget) { - const { canDrop } = domTarget - ? resolveRule(dragging, domTarget) - : { canDrop: false }; - setTarget(domTarget, canDrop); - return; - } - - if (!worldEl || !viewport) { - setTarget(null, false); - return; - } - - const rect = worldEl.getBoundingClientRect(); - const localX = x - rect.left; - const localY = y - rect.top; - - const tile = screenToTile({ - localX, - localY, - viewport, - player: playerPosition, - }); - - if (!tile) { - setTarget(null, false); - return; - } - - const worldTarget = { - zone: AvailableZones.WORLD, - tile, - } satisfies WorldDropTarget; - const { canDrop } = resolveRule(dragging, worldTarget); - setTarget(worldTarget, canDrop); - }; - - const onUp = () => { - const state = useDragStore.getState(); - const payload = state.dragging; - const target = state.target; - - if (payload && target) { - const response = resolveRule(payload, target); - - if (response.rule) { - response.rule.onDrop(payload, target); - } - } - - endDrag(); - }; - - const onKeyDown = (event: KeyboardEvent) => { - if (event.key === "Escape") { - endDrag(); - } - }; - - window.addEventListener("pointermove", onMove); - window.addEventListener("pointerup", onUp); - window.addEventListener("keydown", onKeyDown); - - return () => { - window.removeEventListener("pointermove", onMove); - window.removeEventListener("pointerup", onUp); - window.removeEventListener("keydown", onKeyDown); - }; - }, [ - dragging, - worldEl, - viewport, - playerPosition, - setPointer, - setTarget, - endDrag, - ]); - - if (!dragging || !pointer) return null; - - const ghost = ( -
- {preview?.label ?? `${dragging.kind}`} -
- ); - - return createPortal(ghost, document.body); -} diff --git a/apps/client/src/components/Panel/index.tsx b/apps/client/src/components/Panel/index.tsx new file mode 100644 index 0000000..6a81197 --- /dev/null +++ b/apps/client/src/components/Panel/index.tsx @@ -0,0 +1,3 @@ +export const Panel = () => { + return <>; +}; diff --git a/apps/client/src/components/PointerHoverLayer/index.tsx b/apps/client/src/components/PointerHoverLayer/index.tsx new file mode 100644 index 0000000..3dd8713 --- /dev/null +++ b/apps/client/src/components/PointerHoverLayer/index.tsx @@ -0,0 +1,37 @@ +// components/PointerHoverLayer.tsx +import { useEffect } from "react"; +import { screenToTile } from "@/sdk/game/screenToTile"; +import { useViewportStore } from "@/sdk/store/viewport"; +import { useWorldStore } from "@/sdk/store/world"; + +export function PointerHoverLayer() { + const viewport = useViewportStore((s) => s.viewport); + const setHoveredTile = useViewportStore((s) => s.setHoveredTile); + const worldElement = useWorldStore((state) => state.worldElement); + + useEffect(() => { + const onMove = (e: PointerEvent) => { + if (!worldElement || !viewport) return; + + const rect = worldElement.getBoundingClientRect(); + const localX = e.clientX - rect.left; + const localY = e.clientY - rect.top; + + const tile = screenToTile({ localX, localY, viewport }); + + setHoveredTile(tile); + }; + + const onLeave = () => setHoveredTile(null); + + window.addEventListener("pointermove", onMove, { passive: true }); + window.addEventListener("blur", onLeave); + + return () => { + window.removeEventListener("pointermove", onMove); + window.removeEventListener("blur", onLeave); + }; + }, [worldElement, viewport, setHoveredTile]); + + return null; +} diff --git a/apps/client/src/components/Zones/Inventory/index.tsx b/apps/client/src/components/Zones/Inventory/index.tsx deleted file mode 100644 index 8be9712..0000000 --- a/apps/client/src/components/Zones/Inventory/index.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import { AvailableZones } from "@/sdk/drag/types"; -import { useDragStore } from "@/sdk/store/drag"; - -export function InventoryPanel() { - return ( -
- Drop items here -
- ); -} - -export function InventoryItem({ itemId }: { itemId: string }) { - const startDrag = useDragStore((s) => s.startDrag); - - return ( -
{ - e.preventDefault(); - startDrag( - { kind: "ITEM", itemId, from: AvailableZones.INVENTORY }, - { x: e.clientX, y: e.clientY }, - { label: `Item ${itemId}` }, - ); - }} - > - {itemId} -
- ); -} diff --git a/apps/client/src/components/dev/DevtoolsOverlay/index.tsx b/apps/client/src/components/dev/DevtoolsOverlay/index.tsx deleted file mode 100644 index 9001467..0000000 --- a/apps/client/src/components/dev/DevtoolsOverlay/index.tsx +++ /dev/null @@ -1,46 +0,0 @@ -import { useEffect } from "react"; -import { useDevtoolsStore } from "@/sdk/store/devtools"; - -export function DevtoolsOverlay() { - const enabled = useDevtoolsStore((s) => s.enabled); - const toggle = useDevtoolsStore((s) => s.toggle); - const pixi = useDevtoolsStore((s) => s.pixi); - const react = useDevtoolsStore((s) => s.react); - - useEffect(() => { - const onKey = (e: KeyboardEvent) => { - // F2 toggle (bem comum em debug HUD) - if (e.key === "F2") toggle(); - }; - window.addEventListener("keydown", onKey); - return () => window.removeEventListener("keydown", onKey); - }, [toggle]); - - if (!enabled) return null; - - return ( -
-
DEVTOOLS (F2)
- -
-
PIXI
-
FPS: {pixi ? pixi.fps.toFixed(1) : "-"}
-
Frame: {pixi ? pixi.frameMs.toFixed(2) : "-"} ms
-
- Screen: {pixi ? `${pixi.width}×${pixi.height}` : "-"} (dpr{" "} - {pixi ? pixi.dpr.toFixed(2) : "-"}) -
-
- -
-
REACT
-
Commits/s: {react ? react.commitsPerSec : "-"}
-
Avg commit: {react ? react.avgCommitMs.toFixed(2) : "-"} ms
-
Last commit: {react ? react.lastCommitMs.toFixed(2) : "-"} ms
-
-
- ); -} diff --git a/apps/client/src/components/dev/ReactPerfProfiler/index.tsx b/apps/client/src/components/dev/ReactPerfProfiler/index.tsx deleted file mode 100644 index 8a65df6..0000000 --- a/apps/client/src/components/dev/ReactPerfProfiler/index.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import { Profiler, type ReactNode, useEffect } from "react"; -import { useDevtoolsStore } from "@/sdk/store/devtools"; - -export function ReactPerfProfiler({ children }: { children: ReactNode }) { - const enabled = useDevtoolsStore((s) => s.enabled); - const note = useDevtoolsStore((s) => s.noteReactCommit); - const tick = useDevtoolsStore((s) => s.tickReactWindow); - - useEffect(() => { - if (!enabled) return; - const id = window.setInterval(() => tick(), 1000); - return () => window.clearInterval(id); - }, [enabled, tick]); - - return ( - { - if (!enabled) return; - note(actualDuration); - }} - > - {children} - - ); -} diff --git a/apps/client/src/components/game/Canvas/index.tsx b/apps/client/src/components/game/Canvas/index.tsx index e1cc8f0..6bc468e 100644 --- a/apps/client/src/components/game/Canvas/index.tsx +++ b/apps/client/src/components/game/Canvas/index.tsx @@ -1,27 +1,30 @@ -import { useLayoutEffect, useRef, useState } from "react"; -import { useDragStore } from "@/sdk/store/drag"; -import { GameStage } from "../Stage"; +import { useLayoutEffect, useRef } from "react"; +import { PixiHost } from "@/components/game/PixiHost"; +import { useWorldStore } from "@/sdk/store/world"; -export function GameCanvas() { +type Props = { gridArea?: string }; + +export function GameCanvas({ gridArea }: Props) { const parentRef = useRef(null); - const [mounted, setMounted] = useState(false); - const setWorldEl = useDragStore((s) => s.setWorldEl); + const setWorldElement = useWorldStore((s) => s.setWorldElement); - // monta UMA vez quando o ref existir (evita remounts e perda de contexto) useLayoutEffect(() => { - if (parentRef.current) { - setMounted(true); - setWorldEl(parentRef.current); - } - return () => setWorldEl(null); - }, [setWorldEl]); + setWorldElement(parentRef.current); + return () => setWorldElement(null); + }, [setWorldElement]); return (
- {mounted && } +
); } diff --git a/apps/client/src/components/game/PixiHost/index.tsx b/apps/client/src/components/game/PixiHost/index.tsx new file mode 100644 index 0000000..a6e13b7 --- /dev/null +++ b/apps/client/src/components/game/PixiHost/index.tsx @@ -0,0 +1,110 @@ +import { Application, TextureStyle } from "pixi.js"; +import { useEffect, useRef } from "react"; +import { ResizeBridge } from "@/sdk/pixi/utils/ResizeBridge"; +import { World } from "@/sdk/pixi/world"; + +export function PixiHost() { + const hostRef = useRef(null); + const bootTokenRef = useRef(0); + + useEffect(() => { + const host = hostRef.current; + if (!host) return; + + // invalida boots anteriores + bootTokenRef.current += 1; + const token = bootTokenRef.current; + + let ro: ResizeObserver | null = null; + let application: Application | null = null; + let world: World | null = null; + + // garante que não ficou canvas “antigo” no DOM + host.replaceChildren(); + + const cleanup = () => { + ro?.disconnect(); + ro = null; + + world?.destroy(); + world = null; + + // remove canvas do DOM também (não confia só no destroy) + if (application) { + try { + application.destroy(); + } finally { + application = null; + } + } + + // limpa o host (remove canvas caso ainda exista) + host.replaceChildren(); + }; + + (async () => { + TextureStyle.defaultOptions.scaleMode = "nearest"; + + application = new Application(); + + await application.init({ + backgroundAlpha: 0, + antialias: false, + autoDensity: true, + roundPixels: false, + resolution: window.devicePixelRatio, + sharedTicker: true, + powerPreference: "high-performance", + preference: "webgpu", + }); + + application.canvas.style.display = "block"; + + // se rolou HMR/StrictMode/cleanup enquanto init rodava, aborta + if (bootTokenRef.current !== token) { + application.destroy(); + return; + } + + // garante que só existe um canvas + host.replaceChildren(application.canvas); + + world = new World(application); + + ResizeBridge({ + application: application, + element: host, // a div container (ref.current) + onResize: (width, height) => { + world?.resize(width, height); + }, + }); + + application.ticker.add((t) => { + world?.update(performance.now(), t.deltaMS); + }); + })(); + + // ✅ Vite: quando o módulo for substituído via HMR, roda cleanup + if (import.meta.hot) { + import.meta.hot.dispose(() => { + // invalida token e limpa + bootTokenRef.current += 1; + cleanup(); + }); + } + + return () => { + // invalida esse boot e limpa + bootTokenRef.current += 1; + + cleanup(); + }; + }, []); + + return ( +
+ ); +} diff --git a/apps/client/src/components/game/PixiPerfBridge/index.tsx b/apps/client/src/components/game/PixiPerfBridge/index.tsx deleted file mode 100644 index d58e9c0..0000000 --- a/apps/client/src/components/game/PixiPerfBridge/index.tsx +++ /dev/null @@ -1,46 +0,0 @@ -import { useApplication } from "@pixi/react"; -import { useEffect } from "react"; -import { useDevtoolsStore } from "@/sdk/store/devtools"; - -export function PixiPerfBridge() { - const { app } = useApplication(); - const enabled = useDevtoolsStore((s) => s.enabled); - const setPixi = useDevtoolsStore((s) => s.setPixi); - - useEffect(() => { - if (!enabled) return; - - let frames = 0; - let last = performance.now(); - - const onTick = () => { - frames += 1; - }; - - app.ticker.add(onTick); - - const id = window.setInterval(() => { - const now = performance.now(); - const dt = now - last; - const fps = dt > 0 ? (frames * 1000) / dt : 0; - - setPixi({ - fps, - frameMs: app.ticker.deltaMS, - width: app.renderer.width, - height: app.renderer.height, - dpr: app.renderer.resolution, - }); - - frames = 0; - last = now; - }, 500); - - return () => { - window.clearInterval(id); - app.ticker.remove(onTick); - }; - }, [app, enabled, setPixi]); - - return null; -} diff --git a/apps/client/src/components/game/ResizeBridge/index.tsx b/apps/client/src/components/game/ResizeBridge/index.tsx deleted file mode 100644 index 5dd522e..0000000 --- a/apps/client/src/components/game/ResizeBridge/index.tsx +++ /dev/null @@ -1,52 +0,0 @@ -import { useApplication } from "@pixi/react"; -import { useLayoutEffect, useRef } from "react"; - -export function ResizeBridge({ - resizeTo, -}: { - resizeTo: React.RefObject; -}) { - const { app } = useApplication(); - const last = useRef({ width: 0, height: 0 }); - const raf = useRef(null); - - useLayoutEffect(() => { - const element = resizeTo.current; - if (!element) return; - - const measureAndApply = () => { - raf.current = null; - - const width = Math.max(1, element.clientWidth | 0); - const height = Math.max(1, element.clientHeight | 0); - - if (last.current.width === width && last.current.height === height) - return; - - last.current = { - width, - height, - }; - - app.renderer.resize(width, height); - app.render(); - }; - - const schedule = () => { - if (raf.current !== null) cancelAnimationFrame(raf.current); - raf.current = requestAnimationFrame(measureAndApply); - }; - - schedule(); // initial - - const ro = new ResizeObserver(() => schedule()); - ro.observe(element); - - return () => { - ro.disconnect(); - if (raf.current !== null) cancelAnimationFrame(raf.current); - }; - }, [app, resizeTo]); - - return null; -} diff --git a/apps/client/src/components/game/Shell/index.tsx b/apps/client/src/components/game/Shell/index.tsx index 7ae4581..622bc03 100644 --- a/apps/client/src/components/game/Shell/index.tsx +++ b/apps/client/src/components/game/Shell/index.tsx @@ -1,76 +1,30 @@ -/** biome-ignore-all lint/a11y/useButtonType: */ import { useMemo } from "react"; -import { InventoryItem, InventoryPanel } from "@/components/Zones/Inventory"; -import { useContainerSize } from "@/sdk/hooks/useContainerSize"; -import { - type GameConfigPanels, - type PanelSlot, - useConfigStore, -} from "@/sdk/store/config"; -import { useGameStore } from "@/sdk/store/game"; +import { Panel } from "@/components/ui/Panel"; +import { MIN_GAME_WIDTH, PANEL_WIDTH } from "@/sdk/constants"; +import { GameCanvas } from "../Canvas"; -const PANEL_WIDTH = 175; -const MIN_CANVAS_WIDTH = 240; +const LEFT1 = true; +const LEFT2 = true; +const RIGHT1 = false; +const RIGHT2 = true; +const RIGHT3 = true; -// prioridade de exibição dos painéis (quais somem primeiro) -const COLUMN_PRIORITY: Array = [ - "left1", - "left2", - "right1", - "right2", - "right3", -]; - -export const GameShell = ({ children }: { children: React.ReactNode }) => { - const panels = useConfigStore((state) => state.panels); - - const { ref, size } = useContainerSize(); - const containerWidth = size.width || 0; - - // quantas colunas laterais cabem mantendo center >= 240px - const maxSideColumnsByWidth = useMemo(() => { - if (containerWidth <= 0) return 0; - - const availableForSides = containerWidth - MIN_CANVAS_WIDTH; - if (availableForSides <= 0) return 0; - - return Math.max(0, Math.floor(availableForSides / PANEL_WIDTH)); - }, [containerWidth]); - - // aplica o limite de largura em cima do que está habilitado - const effectiveColumns = useMemo(() => { - const enabledSlots = COLUMN_PRIORITY.filter((slot) => panels[slot]); - const allowedCount = Math.min(maxSideColumnsByWidth, enabledSlots.length); - const visibleSet = new Set(enabledSlots.slice(0, allowedCount)); - - return { - left1: visibleSet.has("left1"), - left2: visibleSet.has("left2"), - right1: visibleSet.has("right1"), - right2: visibleSet.has("right2"), - right3: visibleSet.has("right3"), - health: panels.health, - chat: panels.chat, - }; - }, [maxSideColumnsByWidth, panels]); - - // grid EXTERNO: só colunas, uma linha única que ocupa a tela inteira +export const GameShell = () => { const gridTemplateColumns = useMemo( () => [ - effectiveColumns.left1 ? `${PANEL_WIDTH}px` : "0px", - effectiveColumns.left2 ? `${PANEL_WIDTH}px` : "0px", - "minmax(240px, 1fr)", // centro sempre >= 240px - effectiveColumns.right1 ? `${PANEL_WIDTH}px` : "0px", - effectiveColumns.right2 ? `${PANEL_WIDTH}px` : "0px", - effectiveColumns.right3 ? `${PANEL_WIDTH}px` : "0px", + LEFT1 ? `${PANEL_WIDTH}px` : "0px", + LEFT2 ? `${PANEL_WIDTH}px` : "0px", + `minmax(${MIN_GAME_WIDTH}px, 1fr)`, // centro sempre >= 240px + RIGHT1 ? `${PANEL_WIDTH}px` : "0px", + RIGHT2 ? `${PANEL_WIDTH}px` : "0px", + RIGHT3 ? `${PANEL_WIDTH}px` : "0px", ].join(" "), - [effectiveColumns], + [], ); return (
{ }} > {/* LEFT PANELS */} -
- {effectiveColumns.left1 && ( + + {LEFT1 && (
Panel Left 1
)} -
- -
- {effectiveColumns.left2 && ( + + + {LEFT2 && (
Panel Left 2
)} -
- + {/* CENTER: grid INTERNO com health / game / bottom */}
- - {children} + +
- {/* RIGHT PANELS */} -
- {effectiveColumns.right1 && ( + + + {RIGHT1 && (
- Right 1 -
- - - -
)} -
+ -
- {effectiveColumns.right2 && ( + + {RIGHT2 && (
Right 2
)} -
+ -
- {effectiveColumns.right3 && ( + + {RIGHT3 && (
Right 3
)} -
+
); }; -type CenterColumnProps = { - children: React.ReactNode; // aqui entra o GameCanvas - showHealth: boolean; - showBottom: boolean; -}; - const MIN_HEALTH = 40; const MAX_HEALTH = 60; const MIN_BOTTOM = 120; const MAX_BOTTOM = 180; -export function MoveTestButtons() { - const requestMove = useGameStore((s) => s.requestMove); - const pos = useGameStore((s) => s.playerPosition); - const pending = useGameStore((s) => s.pending); - - return ( -
-
- pos: {pos.x},{pos.y},{pos.z} {pending ? "(pending)" : ""} -
- -
- - - - -
-
- ); -} +type CenterColumnProps = { + showHealth: boolean; + showBottom: boolean; + children: React.ReactNode; +}; export function CenterColumn({ - children, showHealth, showBottom, + children, }: CenterColumnProps) { const healthRow = showHealth ? `minmax(${MIN_HEALTH}px, ${MAX_HEALTH}px)` @@ -207,32 +114,15 @@ export function CenterColumn({ gridTemplateAreas: '"health" "game" "bottom"', }} > -
+ {showHealth && HP/MP bar aqui} -
+ -
- {children} -
+ {children} -
- {showBottom && ( -
-
- -
-
- )} -
+ + {showBottom && Teste Bottom Panel} +
); } diff --git a/apps/client/src/components/game/Stage/index.tsx b/apps/client/src/components/game/Stage/index.tsx deleted file mode 100644 index 470dc55..0000000 --- a/apps/client/src/components/game/Stage/index.tsx +++ /dev/null @@ -1,29 +0,0 @@ -import { Application, extend } from "@pixi/react"; -import { Container, Graphics as PixiGraphics, Sprite, Text } from "pixi.js"; -import { World } from "@/components/game/World"; -import { PixiPerfBridge } from "../PixiPerfBridge"; -import { ResizeBridge } from "../ResizeBridge"; - -extend({ Container, Graphics: PixiGraphics, Sprite, Text }); -export function GameStage({ - resizeTo, -}: { - resizeTo: React.RefObject; -}) { - return ( - - - - - - ); -} diff --git a/apps/client/src/components/game/World/index.tsx b/apps/client/src/components/game/World/index.tsx deleted file mode 100644 index 846ccc3..0000000 --- a/apps/client/src/components/game/World/index.tsx +++ /dev/null @@ -1,163 +0,0 @@ -import { Color } from "pixi.js"; -import { useCallback, useEffect, useMemo } from "react"; -import { - MAX_SCALE, - TILE_SIZE_PX, - VIEW_TILES_X, - VIEW_TILES_Y, -} from "@/sdk/constants"; -import { usePixiScreen } from "@/sdk/hooks/usePixiScreen"; -import { useDragStore } from "@/sdk/store/drag"; -import { useGameStore } from "@/sdk/store/game"; -import { startMovementSystem } from "@/sdk/systems/movement"; -import { getViewTiles } from "@/sdk/systems/tiles"; -import type { Position } from "@/sdk/types/position"; - -export function World() { - const tiles = useGameStore((s) => s.tiles); - const initTestMap = useGameStore((s) => s.initTestMap); - const playerPosition = useGameStore((s) => s.playerPosition); - const setMoveTarget = useGameStore((s) => s.setMoveTarget); - const moveTarget = useGameStore((s) => s.moveTarget); - const setViewport = useDragStore((s) => s.setViewport); - const startDrag = useDragStore((s) => s.startDrag); - const groundItem = { itemId: "A", vx: 7, vy: 5 }; - const target = useDragStore((s) => s.target); - const canDrop = useDragStore((s) => s.canDrop); - - const worldHover = target?.zone === "WORLD" ? target.tile : null; - - useEffect(() => { - if (tiles.size === 0) initTestMap(); - }, [initTestMap, tiles.size]); - - useEffect(() => { - startMovementSystem(); - }, []); - - const { width, height } = usePixiScreen(); - - const viewTiles = useMemo( - () => getViewTiles(playerPosition, tiles), - [playerPosition, tiles], - ); - - const handleTileClick = useCallback( - (position: Position) => setMoveTarget(position), - [setMoveTarget], - ); - - const logicalWidth = VIEW_TILES_X * TILE_SIZE_PX; // 480 - const logicalHeight = VIEW_TILES_Y * TILE_SIZE_PX; // 352 - - const scale = Math.min( - width / logicalWidth, - height / logicalHeight, - MAX_SCALE, - ); - const offsetX = (width - logicalWidth * scale) / 2; - const offsetY = (height - logicalHeight * scale) / 2; - - useEffect(() => { - setViewport({ - stageW: width, - stageH: height, - scale, - offsetX, - offsetY, - }); - }, [width, height, scale, offsetX, offsetY, setViewport]); - - if (width <= 0 || height <= 0) return null; - - return ( - - {viewTiles.map((tile) => { - const isPlayerTile = - tile.position.x === playerPosition.x && - tile.position.y === playerPosition.y && - tile.position.z === playerPosition.z; - - const isTargetTile = - tile.position.x === moveTarget?.x && - tile.position.y === moveTarget?.y && - tile.position.z === moveTarget?.z; - - const vx = - tile.position.x - (playerPosition.x - Math.floor(VIEW_TILES_X / 2)); - const vy = - tile.position.y - (playerPosition.y - Math.floor(VIEW_TILES_Y / 2)); - - const x = vx * TILE_SIZE_PX; - const y = vy * TILE_SIZE_PX; - - return [ - { - g.clear(); - let color = 0x3b4048; - if (isPlayerTile) color = 0x2f3640; - if (isTargetTile) color = 0x40586b; - - g.rect(x, y, TILE_SIZE_PX, TILE_SIZE_PX) - .stroke({ - color: new Color("white").setAlpha(1), - pixelLine: true, - }) - .fill(color); - }} - onPointerDown={() => handleTileClick(tile.position)} - />, - // , - ]; - })} - { - g.clear(); - const x = groundItem.vx * TILE_SIZE_PX; - const y = groundItem.vy * TILE_SIZE_PX; - g.rect(x + 8, y + 8, 16, 16).fill(0xffcc00); - }} - onPointerDown={(e: any) => { - const oe = e.data.originalEvent as PointerEvent; - startDrag( - { kind: "ITEM", itemId: groundItem.itemId, from: "WORLD" }, - { x: oe.clientX, y: oe.clientY }, - { label: `WorldItem ${groundItem.itemId}` }, - ); - }} - /> - {worldHover && ( - { - g.clear(); - const x = worldHover.vx * TILE_SIZE_PX; - const y = worldHover.vy * TILE_SIZE_PX; - const strokeColor = canDrop ? 0x00ff66 : 0xff3355; - - g.rect(x, y, TILE_SIZE_PX, TILE_SIZE_PX).stroke({ - color: new Color(strokeColor).setAlpha(1), - pixelLine: true, - }); - }} - /> - )} - - ); -} diff --git a/apps/client/src/components/panel/Surface/index.tsx b/apps/client/src/components/panel/Surface/index.tsx deleted file mode 100644 index 877e319..0000000 --- a/apps/client/src/components/panel/Surface/index.tsx +++ /dev/null @@ -1,17 +0,0 @@ -export function PanelSurface({ - children, - panelId, -}: { - panelId: string; - children: React.ReactNode; -}) { - return ( -
- {children} -
- ); -} diff --git a/apps/client/src/components/ui/Panel/index.tsx b/apps/client/src/components/ui/Panel/index.tsx new file mode 100644 index 0000000..24ec52a --- /dev/null +++ b/apps/client/src/components/ui/Panel/index.tsx @@ -0,0 +1,35 @@ +import { forwardRef } from "react"; +import { cn } from "@/sdk/utils/cn"; + +type Props = { + area: string; + border?: "left" | "right" | "top" | "bottom"; +} & React.HTMLAttributes; + +export const Panel = forwardRef( + ({ className, style, area, ...rest }, ref) => { + return ( +
+ ); + }, +); diff --git a/apps/client/src/global.css b/apps/client/src/global.css index f1d8c73..09d5f93 100644 --- a/apps/client/src/global.css +++ b/apps/client/src/global.css @@ -1 +1,28 @@ @import "tailwindcss"; + +/* Nada selecionável por padrão */ +:root { + -webkit-user-select: none; /* Safari/WebKit */ + user-select: none; +} + +/* Evita highlight azul no mobile/touch (opcional) */ +html, +body { + -webkit-tap-highlight-color: transparent; +} + +/* Pode selecionar/copiá-lo */ +.allow-select, +.allow-select * { + -webkit-user-select: text; + user-select: text; +} + +/* Inputs/textarea sempre selecionáveis */ +input, +textarea, +[contenteditable="true"] { + -webkit-user-select: text; + user-select: text; +} diff --git a/apps/client/src/pages/game/index.tsx b/apps/client/src/pages/game/index.tsx index c80687c..30119bf 100644 --- a/apps/client/src/pages/game/index.tsx +++ b/apps/client/src/pages/game/index.tsx @@ -1,28 +1,11 @@ -import { DragControllerLayer } from "@/components/DragControllerLayer"; -import { GameCanvas } from "@/components/game/Canvas"; import { GameShell } from "@/components/game/Shell"; -import "@/sdk/drag/setupRules"; // registra rules (import side effect) -import { useEffect } from "react"; -import { DevtoolsOverlay } from "@/components/dev/DevtoolsOverlay"; -import { ReactPerfProfiler } from "@/components/dev/ReactPerfProfiler"; -import { installMoveListener } from "@/sdk/movement"; - -export const GamePage = () => { - useEffect(() => { - const unlistenPromise = installMoveListener(); - - return () => { - void unlistenPromise.then((u) => u()); - }; - }, []); +import { PointerHoverLayer } from "@/components/PointerHoverLayer"; +export function GamePage() { return ( - - - - - - - + <> + + + ); -}; +} diff --git a/apps/client/src/sdk/constants.ts b/apps/client/src/sdk/constants.ts index 5159f2b..848402d 100644 --- a/apps/client/src/sdk/constants.ts +++ b/apps/client/src/sdk/constants.ts @@ -1,6 +1,13 @@ -const TILE_SIZE_PX = 32; -const VIEW_TILES_X = 15; -const VIEW_TILES_Y = 11; -const MAX_SCALE = 2.3; +export const MIN_GAME_WIDTH = 240; +export const TILE_SIZE_PX = 32; +export const VIEW_TILES_X = 15; +export const VIEW_TILES_Y = 11; +export const MAX_SCALE = 2.1; -export { TILE_SIZE_PX, VIEW_TILES_X, VIEW_TILES_Y, MAX_SCALE }; +// buffer para walk scroll (OTClient-like) +export const RENDER_PAD = 1; +export const RENDER_TILES_X = VIEW_TILES_X + RENDER_PAD * 2; // 17 +export const RENDER_TILES_Y = VIEW_TILES_Y + RENDER_PAD * 2; // 13 + +// Panels +export const PANEL_WIDTH = 175; diff --git a/apps/client/src/sdk/demo/demoMapLoader.ts b/apps/client/src/sdk/demo/demoMapLoader.ts new file mode 100644 index 0000000..e3267ca --- /dev/null +++ b/apps/client/src/sdk/demo/demoMapLoader.ts @@ -0,0 +1,72 @@ +import { type Position, useWorldStore } from "@/sdk/store/world"; +import { demoTileAt } from "./demoTileGen"; + +const CHUNK = 32; + +const chunkKey = (cx: number, cy: number, z: number) => `${cx}:${cy}:${z}`; + +function worldToChunk(v: number) { + // floor pra funcionar com negativos + return Math.floor(v / CHUNK); +} + +export function createDemoMapLoader() { + const loaded = new Set(); + + function ensureChunk(cx: number, cy: number, z: number) { + const k = chunkKey(cx, cy, z); + if (loaded.has(k)) return; + + loaded.add(k); + + const patch: Array<{ pos: Position; tile: any }> = []; + + const startX = cx * CHUNK; + const startY = cy * CHUNK; + + for (let y = startY; y < startY + CHUNK; y++) { + for (let x = startX; x < startX + CHUNK; x++) { + patch.push({ + pos: { x, y, z }, + tile: demoTileAt(x, y, z), + }); + } + } + + useWorldStore.getState().applyTilePatch(patch); + } + + /** + * Garante que a janela 15×11 (originX/originY) tenha chunks carregados. + * “padding” carrega um pouco além pra reduzir pop-in ao andar. + */ + function ensureForView(args: { + originX: number; + originY: number; + z: number; + viewW: number; + viewH: number; + paddingTiles?: number; + }) { + const { originX, originY, z, viewW, viewH } = args; + const pad = args.paddingTiles ?? 16; + + const minX = originX - pad; + const minY = originY - pad; + const maxX = originX + (viewW - 1) + pad; + const maxY = originY + (viewH - 1) + pad; + + const cminX = worldToChunk(minX); + const cminY = worldToChunk(minY); + const cmaxX = worldToChunk(maxX); + const cmaxY = worldToChunk(maxY); + + for (let cy = cminY; cy <= cmaxY; cy++) { + for (let cx = cminX; cx <= cmaxX; cx++) { + ensureChunk(cx, cy, z); + } + } + } + + return { ensureForView }; +} diff --git a/apps/client/src/sdk/demo/demoTileGen.ts b/apps/client/src/sdk/demo/demoTileGen.ts new file mode 100644 index 0000000..e4002d4 --- /dev/null +++ b/apps/client/src/sdk/demo/demoTileGen.ts @@ -0,0 +1,31 @@ +import type { Tile } from "@/sdk/store/world"; + +// hash simples determinístico +function hash2(x: number, y: number, z: number) { + let h = 2166136261; + h = (h ^ (x * 73856093)) >>> 0; + h = (h ^ (y * 19349663)) >>> 0; + h = (h ^ (z * 83492791)) >>> 0; + h = Math.imul(h, 16777619) >>> 0; + return h; +} + +export function demoTileAt(x: number, y: number, z: number): Tile { + const h = hash2(x, y, z); + + // 3 “biomas” só pra ficar visual + const band = h % 3; + + let tint = 0x3b4048; // default + if (band === 0) tint = 0x2f3640; + if (band === 1) tint = 0x40586b; + if (band === 2) tint = 0x4b514a; + + // estradas (linhas) pra dar referência visual + if (x % 10 === 0 || y % 10 === 0) tint = 0x6b6f76; + + // “água” em manchas + if (h % 37 === 0) tint = 0x234b8a; + + return { groundTint: tint }; +} diff --git a/apps/client/src/sdk/drag/resolveDomTarget.ts b/apps/client/src/sdk/drag/resolveDomTarget.ts deleted file mode 100644 index a8f96e8..0000000 --- a/apps/client/src/sdk/drag/resolveDomTarget.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { AvailableZones, type DropTarget, type DropTargetZone } from "./types"; - -export function resolveDomTarget(clientX: number, clientY: number): DropTarget { - const element = document.elementFromPoint( - clientX, - clientY, - ) as HTMLElement | null; - - if (!element) return null; - - const zoneElement = element.closest("[data-dropzone]") as HTMLElement | null; - if (!zoneElement) return null; - - const zone = zoneElement.dataset.dropzone as DropTargetZone; - - if (zone === AvailableZones.INVENTORY) { - return { - zone: AvailableZones.INVENTORY, - panelId: zoneElement.dataset.panelId ?? "inventory", - }; - } - - if (zone === AvailableZones.PANEL) { - return { - zone: AvailableZones.PANEL, - panelId: zoneElement.dataset.panelId ?? "panel", - }; - } - - return null; -} diff --git a/apps/client/src/sdk/drag/rules.ts b/apps/client/src/sdk/drag/rules.ts deleted file mode 100644 index 7964d87..0000000 --- a/apps/client/src/sdk/drag/rules.ts +++ /dev/null @@ -1,32 +0,0 @@ -import type { DragPayload, DragPreview, DropTarget } from "./types"; - -type NonNullTarget = Exclude; - -export type Rule = { - kind: DragPayload["kind"]; - zone: NonNullTarget["zone"]; - canDrop?: (payload: DragPayload, target: NonNullTarget) => boolean; - onHover?: (payload: DragPayload, target: NonNullTarget) => void; - onDrop: (payload: DragPayload, target: NonNullTarget) => void; - - getPreview?: (payload: DragPayload) => DragPreview; -}; - -const rules: Rule[] = []; - -export function registerRule(rule: Rule) { - rules.push(rule); -} - -export function resolveRule(payload: DragPayload, target: NonNullTarget) { - const candidates = rules.filter( - (r) => r.kind === payload.kind && r.zone === target.zone, - ); - for (const r of candidates) { - const ok = r.canDrop ? r.canDrop(payload, target) : true; - if (ok) return { rule: r, canDrop: true }; - } - // se existe rule mas canDrop falhou, ainda queremos saber "não pode" - if (candidates.length) return { rule: null, canDrop: false }; - return { rule: null, canDrop: false }; -} diff --git a/apps/client/src/sdk/drag/setupRules.ts b/apps/client/src/sdk/drag/setupRules.ts deleted file mode 100644 index 502e566..0000000 --- a/apps/client/src/sdk/drag/setupRules.ts +++ /dev/null @@ -1,90 +0,0 @@ -import { registerRule } from "./rules"; -import { AvailableKinds, AvailableZones } from "./types"; - -// Inventory to World -registerRule({ - kind: AvailableKinds.ITEM, - zone: AvailableZones.WORLD, - canDrop: (payload) => { - return ( - payload.kind === AvailableKinds.ITEM && - payload.from === AvailableZones.INVENTORY - ); - }, - onDrop: (payload, target) => { - if ( - payload.kind === AvailableKinds.ITEM && - target.zone === AvailableZones.WORLD - ) { - console.log( - `Dropped item ${payload.itemId} onto world tile at (${target.tile.x}, ${target.tile.y}, ${target.tile.z})`, - ); - } - }, -}); - -// World to Inventory -registerRule({ - kind: AvailableKinds.ITEM, - zone: AvailableZones.INVENTORY, - canDrop: (payload) => { - return ( - payload.kind === AvailableKinds.ITEM && - payload.from === AvailableZones.WORLD - ); - }, - onDrop: (payload, target) => { - if ( - payload.kind === AvailableKinds.ITEM && - target.zone === AvailableZones.INVENTORY - ) { - console.log( - `Moved item ${payload.itemId} from world to inventory panel ${target.panelId}`, - ); - } - }, -}); - -// World to World -registerRule({ - kind: AvailableKinds.ITEM, - zone: AvailableZones.WORLD, - canDrop: (payload) => { - return ( - payload.kind === AvailableKinds.ITEM && - payload.from === AvailableZones.WORLD - ); - }, - onDrop: (payload, target) => { - if ( - payload.kind === AvailableKinds.ITEM && - target.zone === AvailableZones.WORLD - ) { - console.log( - `Moved item ${payload.itemId} within world to tile at (${target.tile.x}, ${target.tile.y}, ${target.tile.z})`, - ); - } - }, -}); - -// World to Panel -registerRule({ - kind: AvailableKinds.ITEM, - zone: AvailableZones.PANEL, - canDrop: (payload) => { - return ( - payload.kind === AvailableKinds.ITEM && - payload.from === AvailableZones.WORLD - ); - }, - onDrop: (payload, target) => { - if ( - payload.kind === AvailableKinds.ITEM && - target.zone === AvailableZones.PANEL - ) { - console.log( - `Dropped item ${payload.itemId} onto panel ${target.panelId}`, - ); - } - }, -}); diff --git a/apps/client/src/sdk/drag/types.ts b/apps/client/src/sdk/drag/types.ts deleted file mode 100644 index 0067ad0..0000000 --- a/apps/client/src/sdk/drag/types.ts +++ /dev/null @@ -1,70 +0,0 @@ -export const AvailableZones = { - WORLD: "WORLD", - PANEL: "PANEL", - INVENTORY: "INVENTORY", -} as const; - -export const AvailableKinds = { - ITEM: "ITEM", - WIDGET: "WIDGET", -} as const; - -export type WorldTile = { - vx: number; - vy: number; - x: number; - y: number; - z: number; -}; - -export type DragPayload = - | { - kind: typeof AvailableKinds.ITEM; - itemId: string; - from: - | typeof AvailableZones.PANEL - | typeof AvailableZones.WORLD - | typeof AvailableZones.INVENTORY; - } - | { - kind: typeof AvailableKinds.WIDGET; - widgetId: string; - fromPanelId: string; - }; - -export type WorldDropTarget = { - zone: typeof AvailableZones.WORLD; - tile: WorldTile; -}; - -export type PanelDropTarget = { - zone: typeof AvailableZones.PANEL; - panelId: string; -}; - -export type InventoryDropTarget = { - zone: typeof AvailableZones.INVENTORY; - panelId: string; -}; - -export type DropTarget = - | WorldDropTarget - | PanelDropTarget - | InventoryDropTarget - | null; - -export type DragPayloadKind = keyof typeof AvailableKinds; -export type DropTargetZone = keyof typeof AvailableZones; - -export type DragViewportTransform = { - stageW: number; - stageH: number; - scale: number; - offsetX: number; - offsetY: number; -}; - -export type DragPreview = { - label?: string; - iconUrl?: string; -}; diff --git a/apps/client/src/sdk/game/screenToTile.ts b/apps/client/src/sdk/game/screenToTile.ts index 363b7d0..dcb0743 100644 --- a/apps/client/src/sdk/game/screenToTile.ts +++ b/apps/client/src/sdk/game/screenToTile.ts @@ -1,44 +1,40 @@ -import type { DragViewportTransform, WorldTile } from "@/sdk/drag/types"; -import { TILE_SIZE_PX, VIEW_TILES_X, VIEW_TILES_Y } from "../constants"; +import type { ViewportTransform, WorldTile } from "@/sdk/store/viewport"; export function screenToTile(args: { - localX: number; + localX: number; // coordenada dentro do worldEl (DOM) localY: number; - viewport: DragViewportTransform; - player: { x: number; y: number; z: number }; + viewport: ViewportTransform; }): WorldTile | null { - const { localX, localY, viewport, player } = args; - const { scale, offsetX, offsetY } = viewport; + const { localX, localY, viewport } = args; - const logicalW = VIEW_TILES_X * TILE_SIZE_PX; - const logicalH = VIEW_TILES_Y * TILE_SIZE_PX; + // 1) remove letterbox (offset) e volta pro espaço lógico (antes do scale) + const x = (localX - viewport.offsetX) / viewport.scale; + const y = (localY - viewport.offsetY) / viewport.scale; - const mapLeft = offsetX; - const mapTop = offsetY; - const mapRight = offsetX + logicalW * scale; - const mapBottom = offsetY + logicalH * scale; + // 2) recorte 15x11 (mask). Se estiver na borda preta, null + if (x < 0 || y < 0 || x >= viewport.viewW || y >= viewport.viewH) return null; + + // 3) desfaz camera scroll (camera move o mundo) + const worldPxX = x - viewport.cameraX; + const worldPxY = y - viewport.cameraY; + + const vx = Math.floor(worldPxX / viewport.tileSize); + const vy = Math.floor(worldPxY / viewport.tileSize); if ( - localX < mapLeft || - localX >= mapRight || - localY < mapTop || - localY >= mapBottom + vx < 0 || + vy < 0 || + vx >= viewport.viewTilesX || + vy >= viewport.viewTilesY ) { - return null; // borda preta + return null; } - const worldPxX = (localX - offsetX) / scale; - const worldPxY = (localY - offsetY) / scale; - - const vx = Math.floor(worldPxX / TILE_SIZE_PX); - const vy = Math.floor(worldPxY / TILE_SIZE_PX); - - if (vx < 0 || vy < 0 || vx >= VIEW_TILES_X || vy >= VIEW_TILES_Y) return null; - - const halfX = Math.floor(VIEW_TILES_X / 2); - const halfY = Math.floor(VIEW_TILES_Y / 2); - const originX = player.x - halfX; - const originY = player.y - halfY; - - return { vx, vy, x: originX + vx, y: originY + vy, z: player.z }; + return { + vx, + vy, + x: viewport.originX + vx, + y: viewport.originY + vy, + z: viewport.z, + }; } diff --git a/apps/client/src/sdk/hooks/useContainerSize.ts b/apps/client/src/sdk/hooks/useContainerSize.ts deleted file mode 100644 index d3070fd..0000000 --- a/apps/client/src/sdk/hooks/useContainerSize.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { useEffect, useRef, useState } from "react"; - -export function useContainerSize() { - const ref = useRef(null); - const [size, setSize] = useState({ width: 0, height: 0 }); - - useEffect(() => { - if (!ref.current) return; - - const el = ref.current; - - function update() { - const rect = el.getBoundingClientRect(); - setSize({ width: rect.width, height: rect.height }); - } - - update(); - - const observer = new ResizeObserver(() => update()); - observer.observe(el); - - return () => observer.disconnect(); - }, []); - - return { ref, size }; -} diff --git a/apps/client/src/sdk/hooks/usePixiScreen.ts b/apps/client/src/sdk/hooks/usePixiScreen.ts deleted file mode 100644 index 0bf09ee..0000000 --- a/apps/client/src/sdk/hooks/usePixiScreen.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { useApplication } from "@pixi/react"; -import { useEffect, useState } from "react"; - -export function usePixiScreen() { - const { app } = useApplication(); - const [screen, setScreen] = useState(() => ({ - width: app.screen.width, - height: app.screen.height, - })); - - useEffect(() => { - const update = () => - setScreen({ width: app.screen.width, height: app.screen.height }); - - // Renderer emite resize quando o view muda - app?.renderer?.on("resize", update); - update(); - - return () => { - app?.renderer?.off("resize", update); - }; - }, [app]); - - return screen; -} diff --git a/apps/client/src/sdk/movement.ts b/apps/client/src/sdk/movement.ts deleted file mode 100644 index 1910164..0000000 --- a/apps/client/src/sdk/movement.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { listen } from "@tauri-apps/api/event"; -import { useGameStore } from "@/sdk/store/game"; - -export type Position = { x: number; y: number; z: number }; -export type Direction = "north" | "south" | "east" | "west"; - -export function installMoveListener() { - return listen("move_result", (event) => { - useGameStore.getState().onMoveResult(event.payload as any); - }); -} - -export function applyDir(p: Position, dir: Direction): Position { - switch (dir) { - case "north": - return { ...p, y: p.y - 1 }; - case "south": - return { ...p, y: p.y + 1 }; - case "west": - return { ...p, x: p.x - 1 }; - case "east": - return { ...p, x: p.x + 1 }; - } -} diff --git a/apps/client/src/sdk/pixi/layers/CreatureLayer.ts b/apps/client/src/sdk/pixi/layers/CreatureLayer.ts new file mode 100644 index 0000000..0ba55db --- /dev/null +++ b/apps/client/src/sdk/pixi/layers/CreatureLayer.ts @@ -0,0 +1,84 @@ +import { Container, Sprite, Texture } from "pixi.js"; +import { RENDER_PAD, TILE_SIZE_PX } from "@/sdk/constants"; +import { useWorldStore } from "@/sdk/store/world"; +import { SpritePool } from "../utils/SpritePool"; + +export class CreatureLayer { + private readonly tileSize: number = TILE_SIZE_PX; + private readonly renderPad: number = RENDER_PAD; + + container = new Container(); + private pool: SpritePool; + + constructor() { + this.container.sortableChildren = true; + + this.pool = new SpritePool(() => { + const s = new Sprite(Texture.WHITE); + s.width = this.tileSize; + s.height = this.tileSize; + s.visible = false; + return s; + }, 64); + } + + /** + * originX/originY são do viewport visível (15x11). + * viewX/viewY aqui são os RENDER_TILES_* (ex: 17x13) e pad = 1. + */ + update( + originX: number, + originY: number, + z: number, + viewX: number, + viewY: number, + ) { + const creatures = useWorldStore.getState().creatures; + + // janelas renderizáveis em relação ao origin visível + const minRelX = -this.renderPad; + const minRelY = -this.renderPad; + const maxRelX = viewX - 1 - this.renderPad; // ex 16-1=15 + const maxRelY = viewY - 1 - this.renderPad; // ex 12-1=11 + + const alive = new Set(); + + for (const c of creatures.values()) { + if (c.position.z !== z) continue; + + const relX = c.position.x - originX; + const relY = c.position.y - originY; + + if ( + relX < minRelX || + relY < minRelY || + relX > maxRelX || + relY > maxRelY + ) { + continue; + } + + alive.add(c.id); + + const sprite = this.pool.acquire(c.id); + + // posição em pixels no "mundo lógico" (antes do scale/rootView) + sprite.x = relX * this.tileSize; + sprite.y = relY * this.tileSize; + // y-sort simples + sprite.zIndex = sprite.y; + + // placeholder visual + sprite.tint = 0xffdddd; + + if (!sprite.parent) this.container.addChild(sprite); + } + + this.pool.releaseMissing(alive); + } + + destroy() { + this.container.destroy({ children: true }); + this.pool.destroy(); + } +} diff --git a/apps/client/src/sdk/pixi/layers/DebugGridLayer.ts b/apps/client/src/sdk/pixi/layers/DebugGridLayer.ts new file mode 100644 index 0000000..bc1e8e4 --- /dev/null +++ b/apps/client/src/sdk/pixi/layers/DebugGridLayer.ts @@ -0,0 +1,127 @@ +import { Container, Graphics, Text, TextStyle } from "pixi.js"; +import { TILE_SIZE_PX, VIEW_TILES_X, VIEW_TILES_Y } from "@/sdk/constants"; + +export class DebugGridLayer { + private readonly viewX: number = VIEW_TILES_X; + private readonly viewY: number = VIEW_TILES_Y; + private readonly tileSize: number = TILE_SIZE_PX; + + container = new Container(); + + private grid = new Graphics(); + private center = new Graphics(); + private labels: Text[] = []; + + private lastOriginX = Number.NaN; + private lastOriginY = Number.NaN; + private lastZ = Number.NaN; + private lastVisible = true; + + private style = new TextStyle({ + fontFamily: "monospace", + fontSize: 10, + fill: 0xffffff, + align: "left", + }); + + constructor() { + this.container.addChild(this.grid); + this.container.addChild(this.center); + + // labels (opcional, mas útil) + const total = this.viewX * this.viewY; + for (let i = 0; i < total; i++) { + const text = new Text({ text: "", style: this.style, scale: 0.6 }); + text.alpha = 0.6; + text.visible = false; // só mostra se enabled + this.labels.push(text); + this.container.addChild(text); + } + + this.drawGridLines(); + this.drawCenterTile(); + } + + setVisible(v: boolean) { + if (this.lastVisible === v) return; + this.lastVisible = v; + this.container.visible = v; + } + + /** Atualiza os textos de coordenadas (só quando a janela muda) */ + update(originX: number, originY: number, z: number) { + if ( + originX === this.lastOriginX && + originY === this.lastOriginY && + z === this.lastZ + ) { + return; + } + + this.lastOriginX = originX; + this.lastOriginY = originY; + this.lastZ = z; + + for (let vy = 0; vy < this.viewY; vy++) { + for (let vx = 0; vx < this.viewX; vx++) { + const idx = vy * this.viewX + vx; + const label = this.labels[idx]; + + const wx = originX + vx; + const wy = originY + vy; + + label.visible = true; + label.text = `${wx},${wy}`; + label.x = vx * this.tileSize + 2; + label.y = vy * this.tileSize + 1; + } + } + } + + destroy() { + this.container.destroy({ children: true }); + this.labels = []; + } + + private drawGridLines() { + const w = this.viewX * this.tileSize; + const h = this.viewY * this.tileSize; + + this.grid.clear(); + + // contorno DENTRO da área visível + this.grid.rect(0.5, 0.5, w - 1, h - 1); + + // linhas internas (sem desenhar na borda) + for (let i = 1; i < this.viewX; i++) { + const x = i * this.tileSize + 0.5; + this.grid.moveTo(x, 0.5).lineTo(x, h - 0.5); + } + + for (let i = 1; i < this.viewY; i++) { + const y = i * this.tileSize + 0.5; + this.grid.moveTo(0.5, y).lineTo(w - 0.5, y); + } + + this.grid.stroke({ + color: 0xffffff, + width: 1, + alpha: 0.15, + pixelLine: true, + }); + } + + private drawCenterTile() { + this.center.clear(); + + const cx = Math.floor(this.viewX / 2); + const cy = Math.floor(this.viewY / 2); + + const x = cx * this.tileSize; + const y = cy * this.tileSize; + + this.center + .rect(x, y, this.tileSize, this.tileSize) + .stroke({ color: 0x00ff88, width: 1, alpha: 0.9, pixelLine: true }); + } +} diff --git a/apps/client/src/sdk/pixi/layers/GroundLayer.ts b/apps/client/src/sdk/pixi/layers/GroundLayer.ts new file mode 100644 index 0000000..d7cabb3 --- /dev/null +++ b/apps/client/src/sdk/pixi/layers/GroundLayer.ts @@ -0,0 +1,65 @@ +import { Container, Sprite, Texture } from "pixi.js"; +import { + RENDER_PAD, + RENDER_TILES_X, + RENDER_TILES_Y, + TILE_SIZE_PX, +} from "@/sdk/constants"; +import { useWorldStore } from "@/sdk/store/world"; + +export class GroundLayer { + private readonly tileSize: number = TILE_SIZE_PX; + private readonly viewX: number = RENDER_TILES_X; + private readonly viewY: number = RENDER_TILES_Y; + private readonly pad: number = RENDER_PAD; + + container = new Container(); + private sprites: Sprite[] = []; + + constructor() { + const total = this.viewX * this.viewY; + + for (let i = 0; i < total; i++) { + const sprite = new Sprite(Texture.WHITE); + sprite.width = this.tileSize; + sprite.height = this.tileSize; + + const vx = i % this.viewX; + const vy = Math.floor(i / this.viewX); + + // 🔥 render buffer: desloca a grade pra existir "fora" do viewport visível + sprite.x = (vx - this.pad) * this.tileSize; + sprite.y = (vy - this.pad) * this.tileSize; + sprite.tint = 0x000000; + + this.sprites.push(sprite); + this.container.addChild(sprite); + } + } + + /** + * originX/originY são do viewport visível (15x11), centrado no player. + * A layer renderiza viewX/viewY (ex: 17x13) usando pad. + */ + update(originX: number, originY: number, z: number) { + const tiles = useWorldStore.getState().tiles; + + for (let vy = 0; vy < this.viewY; vy++) { + for (let vx = 0; vx < this.viewX; vx++) { + const idx = vy * this.viewX + vx; + const sprite = this.sprites[idx]; + + const worldX = originX + (vx - this.pad); + const worldY = originY + (vy - this.pad); + + const tile = tiles.get(`${worldX}:${worldY}:${z}`); + sprite.tint = tile?.groundTint ?? 0x000000; + } + } + } + + destroy() { + this.container.destroy({ children: true }); + this.sprites = []; + } +} diff --git a/apps/client/src/sdk/pixi/layers/OverlayLayer.ts b/apps/client/src/sdk/pixi/layers/OverlayLayer.ts new file mode 100644 index 0000000..7b5f5a6 --- /dev/null +++ b/apps/client/src/sdk/pixi/layers/OverlayLayer.ts @@ -0,0 +1,40 @@ +import { Container, Graphics } from "pixi.js"; +import { TILE_SIZE_PX } from "@/sdk/constants"; +import { useViewportStore } from "@/sdk/store/viewport"; + +export class OverlayLayer { + container = new Container(); + private graphic = new Graphics(); + + constructor() { + this.container.addChild(this.graphic); + } + + update() { + const hovered = useViewportStore.getState().hoveredTile; + + this.graphic.clear(); + + if (!hovered) return; + + const x = hovered.vx * TILE_SIZE_PX; + const y = hovered.vy * TILE_SIZE_PX; + + this.graphic.rect(x, y, TILE_SIZE_PX, TILE_SIZE_PX).fill({ + color: 0xffff00, + alpha: 0.1, + }); + + this.graphic + .rect(x + 0.5, y + 0.5, TILE_SIZE_PX - 1, TILE_SIZE_PX - 1) + .stroke({ + color: 0xffd400, + width: 1, + pixelLine: true, + }); + } + + destroy() { + this.container.destroy({ children: true }); + } +} diff --git a/apps/client/src/sdk/pixi/utils/ResizeBridge.ts b/apps/client/src/sdk/pixi/utils/ResizeBridge.ts new file mode 100644 index 0000000..9518309 --- /dev/null +++ b/apps/client/src/sdk/pixi/utils/ResizeBridge.ts @@ -0,0 +1,56 @@ +import type { Application } from "pixi.js"; + +export function ResizeBridge(args: { + application: Application; + element: HTMLElement; + onResize?: (w: number, h: number) => void; // ex: world.resize +}) { + const { application, element, onResize } = args; + + let raf: number | null = null; + let lastWidth = 0; + let lastHeight = 0; + let lastDpr = 0; + + const measureAndApply = () => { + raf = null; + + const rect = element.getBoundingClientRect(); + const width = Math.max(1, Math.round(rect.width)); + const height = Math.max(1, Math.round(rect.height)); + const dpr = window.devicePixelRatio || 1; + + // evita resize repetido (isso é o que mais causa piscar) + if (width === lastWidth && height === lastHeight && dpr === lastDpr) return; + + lastWidth = width; + lastHeight = height; + lastDpr = dpr; + + // se você usa autoDensity+resolution, atualiza DPR também + application.renderer.resolution = dpr; + + application.renderer.resize(width, height); + + // atualiza seu mundo (scale/offset/hitArea etc) + onResize?.(width, height); + + // render IMEDIATO (evita 1 frame “limpo”/preto) + application.render(); + }; + + const schedule = () => { + if (raf !== null) cancelAnimationFrame(raf); + raf = requestAnimationFrame(measureAndApply); + }; + + schedule(); // initial + + const ro = new ResizeObserver(schedule); + ro.observe(element); + + return () => { + ro.disconnect(); + if (raf !== null) cancelAnimationFrame(raf); + }; +} diff --git a/apps/client/src/sdk/pixi/utils/SpritePool.ts b/apps/client/src/sdk/pixi/utils/SpritePool.ts new file mode 100644 index 0000000..5e3fa7c --- /dev/null +++ b/apps/client/src/sdk/pixi/utils/SpritePool.ts @@ -0,0 +1,39 @@ +import type { Sprite } from "pixi.js"; + +export class SpritePool { + private free: Sprite[] = []; + private used = new Map(); + + constructor( + private factory: () => Sprite, + prewarm = 0, + ) { + for (let i = 0; i < prewarm; i++) this.free.push(this.factory()); + } + + acquire(id: string) { + const existing = this.used.get(id); + if (existing) return existing; + + const s = this.free.pop() ?? this.factory(); + this.used.set(id, s); + s.visible = true; + return s; + } + + releaseMissing(alive: Set) { + for (const [id, s] of this.used) { + if (alive.has(id)) continue; + this.used.delete(id); + s.visible = false; + this.free.push(s); + } + } + + destroy() { + for (const s of this.free) s.destroy(); + for (const s of this.used.values()) s.destroy(); + this.free = []; + this.used.clear(); + } +} diff --git a/apps/client/src/sdk/pixi/world.ts b/apps/client/src/sdk/pixi/world.ts new file mode 100644 index 0000000..2cfc533 --- /dev/null +++ b/apps/client/src/sdk/pixi/world.ts @@ -0,0 +1,248 @@ +// sdk/pixi/World.ts +import { type Application, Container, Graphics, Rectangle } from "pixi.js"; +import { createDemoMapLoader } from "@/sdk/demo/demoMapLoader"; +import { + MAX_SCALE, + RENDER_PAD, + RENDER_TILES_X, + RENDER_TILES_Y, + TILE_SIZE_PX, + VIEW_TILES_X, + VIEW_TILES_Y, +} from "../constants"; +import { useDebugStore } from "../store/debug"; +import { useMovementStore } from "../store/movement"; +import { useViewportStore } from "../store/viewport"; +import { makeKeyFromPosition, useWorldStore } from "../store/world"; +import { CreatureLayer } from "./layers/CreatureLayer"; +import { DebugGridLayer } from "./layers/DebugGridLayer"; +import { GroundLayer } from "./layers/GroundLayer"; +import { OverlayLayer } from "./layers/OverlayLayer"; + +const demo = createDemoMapLoader(); + +export class World { + private app: Application; + + private rootView = new Container(); + private clip = new Container(); + private clipMask = new Graphics(); + private camera = new Container(); + + private scale = 1; + private offsetX = 0; + private offsetY = 0; + + private ground: GroundLayer; + private creatures: CreatureLayer; + private overlay: OverlayLayer; + private debug: DebugGridLayer; + + private tilesDirty = true; + private creaturesDirty = true; + private viewDirty = true; + private unsubs: Array<() => void> = []; + + constructor(app: Application) { + this.app = app; + + this.app.stage.addChild(this.rootView); + this.rootView.addChild(this.clipMask); + this.rootView.addChild(this.clip); + this.clip.mask = this.clipMask; + this.clip.addChild(this.camera); + + this.ground = new GroundLayer(); + + this.creatures = new CreatureLayer(); + + this.overlay = new OverlayLayer(); + this.debug = new DebugGridLayer(); + + // ordem: chão -> criaturas -> overlay -> debug + this.camera.addChild(this.ground.container); + this.camera.addChild(this.creatures.container); + this.camera.addChild(this.overlay.container); + this.camera.addChild(this.debug.container); + + this.app.stage.eventMode = "static"; + this.app.stage.hitArea = new Rectangle( + 0, + 0, + this.app.screen.width, + this.app.screen.height, + ); + + this.unsubs.push( + useWorldStore.subscribe((s, p) => { + if (s.tilesVersion !== p.tilesVersion) this.tilesDirty = true; + if (s.creaturesVersion !== p.creaturesVersion) + this.creaturesDirty = true; + }), + ); + + this.unsubs.push( + useMovementStore.subscribe((s, p) => { + const a = makeKeyFromPosition(s.playerTile); + const b = makeKeyFromPosition(p.playerTile); + if (a !== b) this.viewDirty = true; + }), + ); + } + + resize(width: number, height: number) { + this.app.stage.hitArea = new Rectangle(0, 0, width, height); + + const viewW = VIEW_TILES_X * TILE_SIZE_PX; + const viewH = VIEW_TILES_Y * TILE_SIZE_PX; + + this.scale = Math.min(width / viewW, height / viewH, MAX_SCALE); + + this.offsetX = (width - viewW * this.scale) / 2; + this.offsetY = (height - viewH * this.scale) / 2; + + this.rootView.position.set( + Math.round(this.offsetX), + Math.round(this.offsetY), + ); + this.rootView.scale.set(this.scale); + + this.clipMask.clear().rect(0, 0, viewW, viewH).fill(0xffffff); + + const player = useMovementStore.getState().playerTile; + const halfX = Math.floor(VIEW_TILES_X / 2); + const halfY = Math.floor(VIEW_TILES_Y / 2); + const originX = player.x - halfX; + const originY = player.y - halfY; + + useViewportStore.getState().setViewport({ + stageWidth: width, + stageHeight: height, + + scale: this.scale, + offsetX: this.offsetX, + offsetY: this.offsetY, + + cameraX: this.camera.x, + cameraY: this.camera.y, + + originX, + originY, + z: player.z, + + viewW, + viewH, + viewTilesX: VIEW_TILES_X, + viewTilesY: VIEW_TILES_Y, + tileSize: TILE_SIZE_PX, + }); + + this.viewDirty = true; + } + + update(nowMs: number, _deltaMs: number) { + this.applyWalkScroll(nowMs); + + const player = useMovementStore.getState().playerTile; + + const halfX = Math.floor(VIEW_TILES_X / 2); + const halfY = Math.floor(VIEW_TILES_Y / 2); + const originX = player.x - halfX; + const originY = player.y - halfY; + + useViewportStore.getState().patchViewport({ + originX, + originY, + z: player.z, + }); + + demo.ensureForView({ + originX: originX - RENDER_PAD, + originY: originY - RENDER_PAD, + z: player.z, + viewW: VIEW_TILES_X + RENDER_PAD * 2, + viewH: VIEW_TILES_Y + RENDER_PAD * 2, + paddingTiles: 16, + }); + + const show = useDebugStore.getState().showGrid; + this.debug.setVisible(show); + + if (show && (this.viewDirty || this.tilesDirty || this.creaturesDirty)) { + this.debug.update(originX, originY, player.z); + } + + if (this.tilesDirty || this.viewDirty) { + this.ground.update(originX, originY, player.z); + this.tilesDirty = false; + } + + if (this.creaturesDirty || this.viewDirty) { + this.creatures.update( + originX, + originY, + player.z, + RENDER_TILES_X, + RENDER_TILES_Y, + ); + this.creaturesDirty = false; + } + + // overlay é barato, pode atualizar sempre + this.overlay.update(); + + this.viewDirty = false; + } + + destroy() { + this.unsubs.forEach((fn) => { + fn(); + }); + this.unsubs = []; + + this.ground.destroy(); + + this.creatures.destroy(); + this.overlay.destroy(); + this.debug.destroy(); + + this.rootView.destroy({ children: true }); + } + + private applyWalkScroll(nowMs: number) { + const anim = useMovementStore.getState().walkAnim; + + if (!anim) { + if (this.camera.x !== 0 || this.camera.y !== 0) { + this.camera.x = 0; + this.camera.y = 0; + this.publishCamera(); + } + return; + } + + const t = Math.max( + 0, + Math.min(1, (nowMs - anim.startMs) / anim.durationMs), + ); + const dx = anim.to.x - anim.from.x; + const dy = anim.to.y - anim.from.y; + + this.camera.x = -dx * TILE_SIZE_PX * t; + this.camera.y = -dy * TILE_SIZE_PX * t; + + this.publishCamera(); + } + + private publishCamera() { + const vp = useViewportStore.getState().viewport; + if (!vp) return; + + if (vp.cameraX === this.camera.x && vp.cameraY === this.camera.y) return; + + useViewportStore.getState().patchViewport({ + cameraX: this.camera.x, + cameraY: this.camera.y, + }); + } +} diff --git a/apps/client/src/sdk/store/config.ts b/apps/client/src/sdk/store/config.ts deleted file mode 100644 index bb02f45..0000000 --- a/apps/client/src/sdk/store/config.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { create } from "zustand"; - -export type GameConfigPanels = { - left1: boolean; - left2: boolean; - right1: boolean; - right2: boolean; - right3: boolean; - health: boolean; - chat: boolean; -}; - -export type PanelSlot = keyof GameConfigPanels; - -type GameConfigState = { - panels: GameConfigPanels; - setPanelVisibility: ( - panel: keyof GameConfigState["panels"], - visible: boolean, - ) => void; -}; - -export const useConfigStore = create((set, get) => ({ - panels: { - left1: true, - left2: false, - right1: true, - right2: false, - right3: false, - health: false, - chat: true, - }, - setPanelVisibility: (panel, visible) => { - const panels = { ...get().panels, [panel]: visible }; - set({ panels }); - }, -})); diff --git a/apps/client/src/sdk/store/debug.ts b/apps/client/src/sdk/store/debug.ts new file mode 100644 index 0000000..0cf7e93 --- /dev/null +++ b/apps/client/src/sdk/store/debug.ts @@ -0,0 +1,13 @@ +import { create } from "zustand"; + +type State = { + showGrid: boolean; + toggleGrid: () => void; + setShowGrid: (v: boolean) => void; +}; + +export const useDebugStore = create((set) => ({ + showGrid: false, + toggleGrid: () => set((s) => ({ showGrid: !s.showGrid })), + setShowGrid: (v) => set({ showGrid: v }), +})); diff --git a/apps/client/src/sdk/store/devtools.ts b/apps/client/src/sdk/store/devtools.ts deleted file mode 100644 index 6654d4a..0000000 --- a/apps/client/src/sdk/store/devtools.ts +++ /dev/null @@ -1,70 +0,0 @@ -import { create } from "zustand"; - -type PixiPerf = { - fps: number; - frameMs: number; - width: number; - height: number; - dpr: number; -}; - -type ReactPerf = { - commitsPerSec: number; - avgCommitMs: number; - lastCommitMs: number; -}; - -type DevtoolsState = { - enabled: boolean; - toggle: () => void; - - pixi: PixiPerf | null; - react: ReactPerf | null; - - // internos (contadores) - _reactCommits: number; - _reactDurSum: number; - _reactLastMs: number; - - setPixi: (p: PixiPerf) => void; - noteReactCommit: (ms: number) => void; - tickReactWindow: () => void; -}; - -export const useDevtoolsStore = create((set, get) => ({ - enabled: true, - toggle: () => set((s) => ({ enabled: !s.enabled })), - - pixi: null, - react: { commitsPerSec: 0, avgCommitMs: 0, lastCommitMs: 0 }, - - _reactCommits: 0, - _reactDurSum: 0, - _reactLastMs: 0, - - setPixi: (p) => set({ pixi: p }), - - noteReactCommit: (ms) => - set((s) => ({ - _reactCommits: s._reactCommits + 1, - _reactDurSum: s._reactDurSum + ms, - _reactLastMs: ms, - })), - - tickReactWindow: () => { - const s = get(); - const commits = s._reactCommits; - const avg = commits > 0 ? s._reactDurSum / commits : 0; - - // janela de 1s (a gente vai chamar 1x por segundo) - set({ - react: { - commitsPerSec: commits, - avgCommitMs: avg, - lastCommitMs: s._reactLastMs, - }, - _reactCommits: 0, - _reactDurSum: 0, - }); - }, -})); diff --git a/apps/client/src/sdk/store/drag.ts b/apps/client/src/sdk/store/drag.ts deleted file mode 100644 index c3dfe0d..0000000 --- a/apps/client/src/sdk/store/drag.ts +++ /dev/null @@ -1,72 +0,0 @@ -import { create } from "zustand"; -import type { - DragPayload, - DragPreview, - DragViewportTransform, - DropTarget, -} from "../drag/types"; - -type DragState = { - worldEl: HTMLDivElement | null; - setWorldEl: (el: HTMLDivElement | null) => void; - - viewport: DragViewportTransform | null; - setViewport: (v: DragViewportTransform) => void; - - dragging: DragPayload | null; - pointer: { x: number; y: number } | null; - target: DropTarget; - canDrop: boolean; - preview: DragPreview | null; - - startDrag: ( - payload: DragPayload, - startPointer: { x: number; y: number }, - preview?: DragPreview, - ) => void; - setPointer: (p: { x: number; y: number } | null) => void; - setTarget: (t: DropTarget, canDrop: boolean) => void; - endDrag: () => void; -}; - -export const useDragStore = create((set) => ({ - worldEl: null, - setWorldEl: (el) => set({ worldEl: el }), - - viewport: null, - setViewport: (v) => set({ viewport: v }), - - dragging: null, - pointer: null, - target: null, - canDrop: false, - preview: null, - - startDrag: (payload, startPointer, preview) => - set({ - dragging: payload, - pointer: startPointer, - target: null, - canDrop: false, - preview: preview ?? { label: payload.kind }, - }), - - setPointer: (p) => set({ pointer: p }), - - setTarget: (t, canDrop) => - set((s) => { - // evita re-render spam quando nada muda - const sameTarget = - JSON.stringify(s.target) === JSON.stringify(t) && s.canDrop === canDrop; - return sameTarget ? s : { ...s, target: t, canDrop }; - }), - - endDrag: () => - set({ - dragging: null, - pointer: null, - target: null, - canDrop: false, - preview: null, - }), -})); diff --git a/apps/client/src/sdk/store/game.ts b/apps/client/src/sdk/store/game.ts deleted file mode 100644 index b6968b0..0000000 --- a/apps/client/src/sdk/store/game.ts +++ /dev/null @@ -1,160 +0,0 @@ -import { invoke } from "@tauri-apps/api/core"; -import { create } from "zustand"; -import type { Position } from "@/sdk/types/position"; -import type { Tile } from "@/sdk/types/tile"; -import { applyDir, type Direction } from "../movement"; - -export function positionKey(pos: Position): string { - return `${pos.x}:${pos.y}:${pos.z}`; -} - -type PendingMove = { - requestId: string; - prev: Position; -}; - -type MoveResultEvent = { - request_id: string; - ok: boolean; - position?: Position | null; - error?: string | null; -}; - -type GameState = { - tiles: Map; - hoveredTile: Position | null; - pending: PendingMove | null; - requestMove: (target: Direction) => void; - onMoveResult: (event: MoveResultEvent) => void; - playerPosition: Position; - moveTarget: Position | null; - stepDurationMs: number; - stepProgressMs: number; - initTestMap: () => void; - setHoveredTile: (pos: Position | null) => void; - setMoveTarget: (pos: Position) => void; - updateMovement: (deltaMs: number) => void; -}; - -export const useGameStore = create((set, get) => ({ - tiles: new Map(), - hoveredTile: null, - playerPosition: { x: 50, y: 50, z: 0 }, - pending: null, - - moveTarget: null, - stepDurationMs: 50, // duração de um passo em ms - stepProgressMs: 0, - - setHoveredTile: (pos: Position | null) => { - set({ hoveredTile: pos }); - }, - - requestMove: (direction) => { - // trava 1 por vez (mais simples). Depois dá pra virar fila. - if (get().pending) return; - - const prev = get().playerPosition; - const predicted = applyDir(prev, direction); - const requestId = crypto.randomUUID(); - - // optimistic - set({ playerPosition: predicted, pending: { requestId, prev } }); - - // chama Rust (autoritativo) - void invoke("request_move", { - req: { - request_id: requestId, - from: prev, - direction: direction, // snake_case no Rust via serde rename_all - }, - }).catch((err) => { - // se der erro no invoke, rollback imediato - const pending = get().pending; - if (pending?.requestId === requestId) { - set({ playerPosition: pending.prev, pending: null }); - } - console.error("invoke request_move failed:", err); - }); - }, - - onMoveResult: (ev) => { - const pending = get().pending; - if (!pending) return; - if (ev.request_id !== pending.requestId) return; // ignora resposta velha - - if (ev.ok && ev.position) { - set({ playerPosition: ev.position, pending: null }); - } else { - // rollback - set({ playerPosition: pending.prev, pending: null }); - } - }, - - initTestMap: () => { - const tiles = new Map(); - - for (let y = 0; y < 100; y++) { - for (let x = 0; x < 100; x++) { - const pos: Position = { x, y, z: 0 }; - const tile: Tile = { position: pos }; - tiles.set(positionKey(pos), tile); - } - } - - set({ tiles: tiles }); - }, - - setMoveTarget: (pos: Position) => { - set({ moveTarget: pos }); - }, - - updateMovement: (deltaMs: number) => { - const state = get(); - - const { moveTarget, playerPosition, stepDurationMs } = state; - - if (!moveTarget) return; - - if ( - playerPosition.x === moveTarget.x && - playerPosition.y === moveTarget.y && - playerPosition.z === moveTarget.z - ) { - set({ moveTarget: null, stepProgressMs: 0 }); - return; - } - - let stepProgressMs = state.stepProgressMs + deltaMs; - - if (stepProgressMs < stepDurationMs) { - // not enough time to move one tile yet - set({ stepProgressMs }); - return; - } - - stepProgressMs -= stepDurationMs; - - const dx = moveTarget.x - playerPosition.x; - const dy = moveTarget.y - playerPosition.y; - - let next: Position = playerPosition; - - if (Math.abs(dx) > 0) { - next = { - ...playerPosition, - x: playerPosition.x + Math.sign(dx), - }; - } else if (Math.abs(dy) > 0) { - next = { - ...playerPosition, - y: playerPosition.y + Math.sign(dy), - }; - } - - set({ - playerPosition: next, - stepProgressMs, - }); - }, -})); diff --git a/apps/client/src/sdk/store/movement.ts b/apps/client/src/sdk/store/movement.ts new file mode 100644 index 0000000..0918f56 --- /dev/null +++ b/apps/client/src/sdk/store/movement.ts @@ -0,0 +1,29 @@ +import { create } from "zustand"; + +export type Position = { x: number; y: number; z: number }; + +export type WalkAnim = { + from: Position; + to: Position; + startMs: number; + durationMs: number; +}; + +type State = { + playerTile: Position; + walkAnim: WalkAnim | null; + + // esses 2 são chamados pelo handler do evento do Rust: + startWalkAnim: (from: Position, to: Position, durationMs: number) => void; + commitPlayerTile: (to: Position) => void; +}; + +export const useMovementStore = create((set) => ({ + playerTile: { x: 50, y: 50, z: 0 }, + walkAnim: null, + + startWalkAnim: (from, to, durationMs) => + set({ walkAnim: { from, to, startMs: performance.now(), durationMs } }), + + commitPlayerTile: (to) => set({ playerTile: to, walkAnim: null }), +})); diff --git a/apps/client/src/sdk/store/viewport.ts b/apps/client/src/sdk/store/viewport.ts new file mode 100644 index 0000000..8721933 --- /dev/null +++ b/apps/client/src/sdk/store/viewport.ts @@ -0,0 +1,59 @@ +import { create } from "zustand"; + +export type WorldTile = { + vx: number; // 0..VIEW_TILES_X-1 + vy: number; // 0..VIEW_TILES_Y-1 + x: number; // world tile + y: number; // world tile + z: number; +}; + +export type ViewportTransform = { + // tamanho do container/canvas (px DOM) + stageWidth: number; + stageHeight: number; + + // rootView (letterbox) + scale: number; + offsetX: number; // px DOM dentro do container + offsetY: number; + + // camera (walk scroll) em px lógicos (antes do scale) + cameraX: number; + cameraY: number; + + // janela visível (15x11) no mundo + originX: number; + originY: number; + z: number; + + // dimensões lógicas do viewport visível (antes do scale) + viewW: number; // VIEW_TILES_X * TILE_SIZE_PX + viewH: number; // VIEW_TILES_Y * TILE_SIZE_PX + viewTilesX: number; // VIEW_TILES_X + viewTilesY: number; // VIEW_TILES_Y + tileSize: number; // TILE_SIZE_PX +}; + +type State = { + viewport: ViewportTransform | null; + setViewport: (v: ViewportTransform) => void; + patchViewport: (patch: Partial) => void; + + hoveredTile: WorldTile | null; + setHoveredTile: (t: WorldTile | null) => void; +}; + +export const useViewportStore = create((set, get) => ({ + viewport: null, + setViewport: (v) => set({ viewport: v }), + patchViewport: (patch) => { + const vp = get().viewport; + if (!vp) return; + const next = { ...vp, ...patch }; + set({ viewport: next }); + }, + + hoveredTile: null, + setHoveredTile: (t) => set({ hoveredTile: t }), +})); diff --git a/apps/client/src/sdk/store/world.ts b/apps/client/src/sdk/store/world.ts new file mode 100644 index 0000000..4068270 --- /dev/null +++ b/apps/client/src/sdk/store/world.ts @@ -0,0 +1,68 @@ +import { create } from "zustand"; + +export type Position = { + x: number; + y: number; + z: number; +}; + +export type Tile = { + groundTint?: number; + groundTexture?: string; // atlas id +}; + +export type Creature = { + id: string; + position: Position; + texture?: string; // atlas id +}; + +type State = { + worldElement: HTMLElement | null; + setWorldElement: (el: HTMLElement | null) => void; + + tiles: Map; + tilesVersion: number; + + creatures: Map; + creaturesVersion: number; + + applyTilePatch: (patch: Array<{ pos: Position; tile: Tile | null }>) => void; + applyCreaturePatch: ( + patch: Array<{ id: string; creature: Creature | null }>, + ) => void; +}; + +export const makeKeyFromPosition = (p: Position) => `${p.x}:${p.y}:${p.z}`; + +export const useWorldStore = create((set) => ({ + worldElement: null, + tiles: new Map([]), + tilesVersion: 0, + + creatures: new Map([]), + creaturesVersion: 0, + + setWorldElement: (el) => set({ worldElement: el }), + + applyTilePatch: (patch) => + set((s) => { + const next = new Map(s.tiles); + for (const { pos, tile } of patch) { + const key = makeKeyFromPosition(pos); + if (!tile) next.delete(key); + else next.set(key, tile); + } + return { tiles: next, tilesVersion: s.tilesVersion + 1 }; + }), + + applyCreaturePatch: (patch) => + set((s) => { + const next = new Map(s.creatures); + for (const { id, creature } of patch) { + if (!creature) next.delete(id); + else next.set(id, creature); + } + return { creatures: next, creaturesVersion: s.creaturesVersion + 1 }; + }), +})); diff --git a/apps/client/src/sdk/systems/movement.ts b/apps/client/src/sdk/systems/movement.ts deleted file mode 100644 index b454548..0000000 --- a/apps/client/src/sdk/systems/movement.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { Ticker } from "pixi.js"; -import { useGameStore } from "@/sdk/store/game"; - -let started = false; - -export function startMovementSystem() { - if (started) return; - started = true; - - const ticker = Ticker.shared; - let lastTime = performance.now(); - - ticker.add(() => { - const now = performance.now(); - const deltaMs = now - lastTime; - lastTime = now; - - // update movement via zustand, fora do React - useGameStore.getState().updateMovement(deltaMs); - }); -} diff --git a/apps/client/src/sdk/systems/tiles.ts b/apps/client/src/sdk/systems/tiles.ts deleted file mode 100644 index 4a29bb3..0000000 --- a/apps/client/src/sdk/systems/tiles.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { VIEW_TILES_X, VIEW_TILES_Y } from "@/sdk/constants"; -import type { Position } from "@/sdk/types/position"; -import type { Tile } from "@/sdk/types/tile"; - -export function getViewTiles( - playerPosition: Position, - tiles: Map, -) { - const halfViewX = Math.floor(VIEW_TILES_X / 2); - const halfViewY = Math.floor(VIEW_TILES_Y / 2); - - const startX = playerPosition.x - halfViewX; - const startY = playerPosition.y - halfViewY; - - const result: Tile[] = []; - for (let vy = 0; vy < VIEW_TILES_Y; vy++) { - for (let vx = 0; vx < VIEW_TILES_X; vx++) { - const x = startX + vx; - const y = startY + vy; - const pos: Position = { x, y, z: playerPosition.z }; - const key = `${x}:${y}:${playerPosition.z}`; - result.push(tiles.get(key) ?? { position: pos }); - } - } - return result; -} From 997295e80ec9d188558f4fd4d64f44af64851145 Mon Sep 17 00:00:00 2001 From: Guilherme Fontes Date: Wed, 24 Dec 2025 14:30:34 -0400 Subject: [PATCH 08/18] feat: add first drag iteration using widgets --- apps/client/src-tauri/tauri.conf.json | 4 +- .../components/Drag/ControllerLayer/index.tsx | 86 +++++++++++++++++++ apps/client/src/components/Panel/index.tsx | 60 ++++++++++++- apps/client/src/components/Widget/index.tsx | 52 +++++++++++ .../src/components/game/Shell/index.tsx | 32 ++++--- apps/client/src/pages/game/index.tsx | 11 +-- .../src/sdk/drag/computePanelInsertIndex.ts | 20 +++++ apps/client/src/sdk/drag/register.ts | 1 + apps/client/src/sdk/drag/resolveDomTarget.ts | 19 ++++ apps/client/src/sdk/drag/rules.ts | 29 +++++++ apps/client/src/sdk/drag/rules/widgets.ts | 28 ++++++ apps/client/src/sdk/drag/types.ts | 26 ++++++ .../hooks/usePointerHoverLayer.ts} | 9 +- apps/client/src/sdk/store/drag.ts | 73 ++++++++++++++++ apps/client/src/sdk/store/layout.ts | 79 +++++++++++++++++ 15 files changed, 497 insertions(+), 32 deletions(-) create mode 100644 apps/client/src/components/Drag/ControllerLayer/index.tsx create mode 100644 apps/client/src/components/Widget/index.tsx create mode 100644 apps/client/src/sdk/drag/computePanelInsertIndex.ts create mode 100644 apps/client/src/sdk/drag/register.ts create mode 100644 apps/client/src/sdk/drag/resolveDomTarget.ts create mode 100644 apps/client/src/sdk/drag/rules.ts create mode 100644 apps/client/src/sdk/drag/rules/widgets.ts create mode 100644 apps/client/src/sdk/drag/types.ts rename apps/client/src/{components/PointerHoverLayer/index.tsx => sdk/hooks/usePointerHoverLayer.ts} (81%) create mode 100644 apps/client/src/sdk/store/drag.ts create mode 100644 apps/client/src/sdk/store/layout.ts diff --git a/apps/client/src-tauri/tauri.conf.json b/apps/client/src-tauri/tauri.conf.json index dfda6dd..7968d2f 100644 --- a/apps/client/src-tauri/tauri.conf.json +++ b/apps/client/src-tauri/tauri.conf.json @@ -16,8 +16,8 @@ "minWidth": 1020, "minHeight": 680, "width": 1020, - "height": 680 - + "height": 680, + "maximized": true } ], "security": { diff --git a/apps/client/src/components/Drag/ControllerLayer/index.tsx b/apps/client/src/components/Drag/ControllerLayer/index.tsx new file mode 100644 index 0000000..3beb72a --- /dev/null +++ b/apps/client/src/components/Drag/ControllerLayer/index.tsx @@ -0,0 +1,86 @@ +import { useEffect } from "react"; +import { createPortal } from "react-dom"; +import { resolveDomTarget } from "@/sdk/drag/resolveDomTarget"; +import { resolveRule } from "@/sdk/drag/rules"; +import { useDragStore } from "@/sdk/store/drag"; + +export function DragControllerLayer() { + const dragging = useDragStore((s) => s.dragging); + const pointer = useDragStore((s) => s.pointer); + const preview = useDragStore((s) => s.preview); + + const setPointer = useDragStore((s) => s.setPointer); + const setTarget = useDragStore((s) => s.setTarget); + const endDrag = useDragStore((s) => s.endDrag); + + useEffect(() => { + const onMove = (event: PointerEvent) => { + const x = event.clientX; + const y = event.clientY; + setPointer({ x, y }); + + const domTarget = resolveDomTarget(x, y); + if (!domTarget) { + setTarget(null, false); + return; + } + + if (!dragging) { + setTarget(null, false); + return; + } + + const { canDrop } = resolveRule(dragging, domTarget); + setTarget(domTarget, canDrop); + }; + + const onUp = (_event: PointerEvent) => { + const state = useDragStore.getState(); + const payload = state.dragging; + const target = state.target; + const canDrop = state.canDrop; + + if (payload && target && canDrop) { + const { rule } = resolveRule(payload, target); + rule?.onDrop(payload, target); + } + + endDrag(); + }; + + const onKeyDown = (event: KeyboardEvent) => { + if (event.key === "Escape" && dragging) { + endDrag(); + } + }; + + window.addEventListener("pointermove", onMove); + window.addEventListener("pointerup", onUp); + window.addEventListener("keydown", onKeyDown); + + return () => { + window.removeEventListener("pointermove", onMove); + window.removeEventListener("pointerup", onUp); + window.removeEventListener("keydown", onKeyDown); + }; + }, [dragging, setPointer, setTarget, endDrag]); + + if (!dragging || !pointer) return null; + + const ghost = ( +
+ {preview?.label ?? dragging.kind} +
+ ); + + return createPortal(ghost, document.body); +} diff --git a/apps/client/src/components/Panel/index.tsx b/apps/client/src/components/Panel/index.tsx index 6a81197..f0aea3b 100644 --- a/apps/client/src/components/Panel/index.tsx +++ b/apps/client/src/components/Panel/index.tsx @@ -1,3 +1,57 @@ -export const Panel = () => { - return <>; -}; +import { Fragment } from "react"; +import { Widget } from "@/components/Widget"; +import { useDragStore } from "@/sdk/store/drag"; +import type { PanelId } from "@/sdk/store/layout"; +import { useLayoutStore } from "@/sdk/store/layout"; +import { cn } from "@/sdk/utils/cn"; + +function InsertIndicator({ ok }: { ok: boolean }) { + return ( +
+ ); +} + +export function Panel({ panelId, title }: { panelId: PanelId; title: string }) { + const ids = useLayoutStore((s) => s.panels[panelId]); + + const dragging = useDragStore((s) => s.dragging); + const target = useDragStore((s) => s.target); + const canDrop = useDragStore((s) => s.canDrop); + + const active = + dragging && target?.zone === "PANEL" && target.panelId === panelId; + + const insertIndex = active && target?.zone === "PANEL" ? target.index : -1; + + return ( +
+
{title}
+ +
+ {ids.map((id, i) => ( + + {active && insertIndex === i && } + + + ))} + + {active && insertIndex === ids.length && ( + + )} +
+
+ ); +} diff --git a/apps/client/src/components/Widget/index.tsx b/apps/client/src/components/Widget/index.tsx new file mode 100644 index 0000000..2ae61b1 --- /dev/null +++ b/apps/client/src/components/Widget/index.tsx @@ -0,0 +1,52 @@ +import { Kinds, Zones } from "@/sdk/drag/types"; +import { useDragStore } from "@/sdk/store/drag"; +import type { PanelId } from "@/sdk/store/layout"; +import { useLayoutStore } from "@/sdk/store/layout"; + +export function Widget({ + panelId, + index, + widgetId, +}: { + panelId: PanelId; + index: number; + widgetId: string; +}) { + const def = useLayoutStore((s) => s.widgets[widgetId]); + const startDrag = useDragStore((s) => s.startDrag); + + return ( +
+
{ + e.preventDefault(); + + // opcional: captura o pointer (bom pra não “perder” o drag) + (e.currentTarget as HTMLElement).setPointerCapture?.(e.pointerId); + + startDrag( + { + kind: Kinds.WIDGET, + widgetId, + from: Zones.PANEL, + fromPanelId: panelId, + fromIndex: index, + }, + { x: e.clientX, y: e.clientY }, + { label: def?.title ?? "Widget" }, + ); + }} + > + {def?.title ?? widgetId} +
+ + {/* body do widget */} +
conteúdo...
+
+ ); +} diff --git a/apps/client/src/components/game/Shell/index.tsx b/apps/client/src/components/game/Shell/index.tsx index 622bc03..9ca7b59 100644 --- a/apps/client/src/components/game/Shell/index.tsx +++ b/apps/client/src/components/game/Shell/index.tsx @@ -1,8 +1,12 @@ import { useMemo } from "react"; +import { DragControllerLayer } from "@/components/Drag/ControllerLayer"; +import { Panel as PanelSlot } from "@/components/Panel"; import { Panel } from "@/components/ui/Panel"; import { MIN_GAME_WIDTH, PANEL_WIDTH } from "@/sdk/constants"; import { GameCanvas } from "../Canvas"; +import "@/sdk/drag/register"; + const LEFT1 = true; const LEFT2 = true; const RIGHT1 = false; @@ -34,20 +38,19 @@ export const GameShell = () => { }} > {/* LEFT PANELS */} - - {LEFT1 && ( -
- Panel Left 1 -
- )} - - - {LEFT2 && ( -
- Panel Left 2 -
- )} - +
+ +
+
+ +
+ {/* CENTER: grid INTERNO com health / game / bottom */}
{
Right 3
)} +
); }; diff --git a/apps/client/src/pages/game/index.tsx b/apps/client/src/pages/game/index.tsx index 30119bf..5b0e728 100644 --- a/apps/client/src/pages/game/index.tsx +++ b/apps/client/src/pages/game/index.tsx @@ -1,11 +1,8 @@ import { GameShell } from "@/components/game/Shell"; -import { PointerHoverLayer } from "@/components/PointerHoverLayer"; +import { usePointerHoverLayer } from "@/sdk/hooks/usePointerHoverLayer"; export function GamePage() { - return ( - <> - - - - ); + usePointerHoverLayer(); + + return ; } diff --git a/apps/client/src/sdk/drag/computePanelInsertIndex.ts b/apps/client/src/sdk/drag/computePanelInsertIndex.ts new file mode 100644 index 0000000..a138646 --- /dev/null +++ b/apps/client/src/sdk/drag/computePanelInsertIndex.ts @@ -0,0 +1,20 @@ +export function computePanelInsertIndex( + panelElement: HTMLElement, + clientY: number, +) { + const widgets = Array.from( + panelElement.querySelectorAll("[data-widget-root='true']"), + ); + + // painel vazio => insere no começo + if (widgets.length === 0) return 0; + + for (let i = 0; i < widgets.length; i++) { + const r = widgets[i].getBoundingClientRect(); + const mid = r.top + r.height / 2; + if (clientY < mid) return i; + } + + // abaixo de todos => insere no fim + return widgets.length; +} diff --git a/apps/client/src/sdk/drag/register.ts b/apps/client/src/sdk/drag/register.ts new file mode 100644 index 0000000..2aac868 --- /dev/null +++ b/apps/client/src/sdk/drag/register.ts @@ -0,0 +1 @@ +import "./rules/widgets"; diff --git a/apps/client/src/sdk/drag/resolveDomTarget.ts b/apps/client/src/sdk/drag/resolveDomTarget.ts new file mode 100644 index 0000000..99a7d15 --- /dev/null +++ b/apps/client/src/sdk/drag/resolveDomTarget.ts @@ -0,0 +1,19 @@ +import type { DropTarget } from "@/sdk/drag/types"; +import { Zones } from "@/sdk/drag/types"; +import { computePanelInsertIndex } from "./computePanelInsertIndex"; + +export function resolveDomTarget(clientX: number, clientY: number): DropTarget { + const el = document.elementFromPoint(clientX, clientY) as HTMLElement | null; + if (!el) return null; + + // agora o dropzone é o painel inteiro + const panel = el.closest("[data-dropzone='PANEL']") as HTMLElement | null; + if (!panel) return null; + + const panelId = panel.dataset.panelId; + if (!panelId) return null; + + const index = computePanelInsertIndex(panel, clientY); + + return { zone: Zones.PANEL, panelId, index }; +} diff --git a/apps/client/src/sdk/drag/rules.ts b/apps/client/src/sdk/drag/rules.ts new file mode 100644 index 0000000..f16ef14 --- /dev/null +++ b/apps/client/src/sdk/drag/rules.ts @@ -0,0 +1,29 @@ +import type { DragPayload, DragPreview, DropTarget } from "./types"; + +type NonNullTarget = Exclude; + +export type Rule = { + kind: DragPayload["kind"]; + zone: NonNullTarget["zone"]; + canDrop?: (payload: DragPayload, target: NonNullTarget) => boolean; + onDrop: (payload: DragPayload, target: NonNullTarget) => void; + getPreview?: (payload: DragPayload) => DragPreview; +}; + +const rules: Rule[] = []; + +export function registerRule(rule: Rule) { + rules.push(rule); +} + +export function resolveRule(payload: DragPayload, target: NonNullTarget) { + const candidates = rules.filter( + (r) => r.kind === payload.kind && r.zone === target.zone, + ); + for (const r of candidates) { + const ok = r.canDrop ? r.canDrop(payload, target) : true; + if (ok) return { rule: r, canDrop: true }; + } + if (candidates.length) return { rule: null, canDrop: false }; + return { rule: null, canDrop: false }; +} diff --git a/apps/client/src/sdk/drag/rules/widgets.ts b/apps/client/src/sdk/drag/rules/widgets.ts new file mode 100644 index 0000000..2728dfc --- /dev/null +++ b/apps/client/src/sdk/drag/rules/widgets.ts @@ -0,0 +1,28 @@ +import { registerRule } from "@/sdk/drag/rules"; +import { Kinds, Zones } from "@/sdk/drag/types"; +import { type PanelId, useLayoutStore } from "@/sdk/store/layout"; + +registerRule({ + kind: Kinds.WIDGET, + zone: Zones.PANEL, + canDrop: (payload, target) => { + return payload.kind === Kinds.WIDGET && target.zone === Zones.PANEL; + }, + onDrop: (payload, target) => { + if (payload.kind !== Kinds.WIDGET) return; + if (target.zone !== Zones.PANEL) return; + + useLayoutStore.getState().moveWidget({ + widgetId: payload.widgetId, + fromPanelId: payload.fromPanelId as PanelId, + fromIndex: payload.fromIndex, + toPanelId: target.panelId as PanelId, + toIndex: target.index, + }); + }, + getPreview: (payload) => { + if (payload.kind !== Kinds.WIDGET) return { label: "Widget" }; + const widget = useLayoutStore.getState().widgets[payload.widgetId]; + return { label: widget.title ?? "Widget" }; + }, +}); diff --git a/apps/client/src/sdk/drag/types.ts b/apps/client/src/sdk/drag/types.ts new file mode 100644 index 0000000..616f479 --- /dev/null +++ b/apps/client/src/sdk/drag/types.ts @@ -0,0 +1,26 @@ +export const Zones = { + PANEL: "PANEL", +} as const; + +export const Kinds = { + WIDGET: "WIDGET", +} as const; + +export type KeyedZone = (typeof Zones)[keyof typeof Zones]; +export type KeyedKind = (typeof Kinds)[keyof typeof Kinds]; + +export type DropTarget = { + zone: typeof Zones.PANEL; + panelId: string; + index: number; +} | null; + +export type DragPayload = { + kind: typeof Kinds.WIDGET; + widgetId: string; + from: typeof Zones.PANEL; + fromPanelId: string; + fromIndex: number; +}; + +export type DragPreview = { label?: string }; diff --git a/apps/client/src/components/PointerHoverLayer/index.tsx b/apps/client/src/sdk/hooks/usePointerHoverLayer.ts similarity index 81% rename from apps/client/src/components/PointerHoverLayer/index.tsx rename to apps/client/src/sdk/hooks/usePointerHoverLayer.ts index 3dd8713..49172ed 100644 --- a/apps/client/src/components/PointerHoverLayer/index.tsx +++ b/apps/client/src/sdk/hooks/usePointerHoverLayer.ts @@ -1,12 +1,11 @@ -// components/PointerHoverLayer.tsx import { useEffect } from "react"; import { screenToTile } from "@/sdk/game/screenToTile"; import { useViewportStore } from "@/sdk/store/viewport"; import { useWorldStore } from "@/sdk/store/world"; -export function PointerHoverLayer() { - const viewport = useViewportStore((s) => s.viewport); - const setHoveredTile = useViewportStore((s) => s.setHoveredTile); +export function usePointerHoverLayer() { + const viewport = useViewportStore((state) => state.viewport); + const setHoveredTile = useViewportStore((state) => state.setHoveredTile); const worldElement = useWorldStore((state) => state.worldElement); useEffect(() => { @@ -32,6 +31,4 @@ export function PointerHoverLayer() { window.removeEventListener("blur", onLeave); }; }, [worldElement, viewport, setHoveredTile]); - - return null; } diff --git a/apps/client/src/sdk/store/drag.ts b/apps/client/src/sdk/store/drag.ts new file mode 100644 index 0000000..853e7b6 --- /dev/null +++ b/apps/client/src/sdk/store/drag.ts @@ -0,0 +1,73 @@ +import { create } from "zustand"; +import type { DragPayload, DragPreview, DropTarget } from "../drag/types"; + +function targetKey(t: DropTarget) { + if (!t) return ""; + return `P:${t.panelId}:${t.index}`; +} + +type DragState = { + dragging: DragPayload | null; + pointer: { x: number; y: number } | null; + + target: DropTarget; + canDrop: boolean; + preview: DragPreview | null; + + startDrag: ( + payload: DragPayload, + startPointer: { x: number; y: number }, + preview?: DragPreview, + ) => void; + + setPointer: (p: { x: number; y: number } | null) => void; + setTarget: (t: DropTarget, canDrop: boolean) => void; + endDrag: () => void; +}; + +export const useDragStore = create((set) => ({ + dragging: null, + pointer: null, + + target: null, + canDrop: false, + preview: null, + + startDrag: (payload, startPointer, preview) => + set(() => { + return { + dragging: payload, + pointer: startPointer, + target: null, + canDrop: false, + preview: preview ?? { label: payload.kind }, + }; + }), + + setPointer: (p) => + set(() => ({ + pointer: p, + })), + + setTarget: (t, canDrop) => + set((state) => { + const same = + targetKey(state.target) === targetKey(t) && state.canDrop === canDrop; + + if (same) return {}; + + return { + target: t, + canDrop, + }; + }), + + endDrag: () => + set(() => ({ + dragging: null, + pointer: null, + target: null, + canDrop: false, + preview: null, + })), +})); diff --git a/apps/client/src/sdk/store/layout.ts b/apps/client/src/sdk/store/layout.ts new file mode 100644 index 0000000..f8f180d --- /dev/null +++ b/apps/client/src/sdk/store/layout.ts @@ -0,0 +1,79 @@ +import { create } from "zustand"; + +export type PanelId = "left1" | "left2" | "right1" | "right2" | "right3"; +export type WidgetId = string; + +export type WidgetDef = { + id: WidgetId; + title: string; +}; + +type LayoutState = { + widgets: Record; + panels: Record; + + moveWidget: (args: { + widgetId: WidgetId; + fromPanelId: PanelId; + fromIndex: number; + toPanelId: PanelId; + toIndex: number; + }) => void; +}; + +export const useLayoutStore = create((set) => ({ + widgets: { + "widget-1": { id: "widget-1", title: "Widget 1" }, + "widget-2": { id: "widget-2", title: "Widget 2" }, + "widget-3": { id: "widget-3", title: "Widget 3" }, + }, + + panels: { + left1: ["widget-1", "widget-2"], + left2: ["widget-3"], + right1: [], + right2: [], + right3: [], + }, + + moveWidget: ({ fromIndex, fromPanelId, toIndex, toPanelId, widgetId }) => + set((state) => { + const fromArray = [...state.panels[fromPanelId]]; + const toArray = + fromPanelId === toPanelId ? fromArray : [...state.panels[toPanelId]]; + + const at = fromArray.indexOf(widgetId); + const removeIndex = at >= 0 ? at : fromIndex; + if (removeIndex >= 0) { + fromArray.splice(removeIndex, 1); + } + + let insertIndex = toIndex; + if (fromPanelId === toPanelId) { + if (removeIndex < insertIndex) insertIndex -= 1; + + insertIndex = Math.max(0, Math.min(insertIndex, fromArray.length)); + fromArray.splice(insertIndex, 0, widgetId); + + return { + ...state, + panels: { + ...state.panels, + [fromPanelId]: fromArray, + }, + }; + } + + insertIndex = Math.max(0, Math.min(insertIndex, toArray.length)); + toArray.splice(insertIndex, 0, widgetId); + + return { + ...state, + panels: { + ...state.panels, + [fromPanelId]: fromArray, + [toPanelId]: toArray, + }, + }; + }), +})); From a47e57ef114a7b77a445e7044f62445dd53ade80 Mon Sep 17 00:00:00 2001 From: Guilherme Fontes Date: Wed, 24 Dec 2025 15:49:48 -0400 Subject: [PATCH 09/18] refactor: widgets preview render using ghost pattern --- apps/client/src/components/Panel/index.tsx | 83 +++++++------- apps/client/src/components/Widget/index.tsx | 52 --------- .../src/components/Widgets/Ghost/index.tsx | 50 +++++++++ .../src/components/Widgets/Renderer/index.tsx | 19 ++++ .../src/components/Widgets/Shell/index.tsx | 74 +++++++++++++ .../src/components/game/Shell/index.tsx | 7 +- apps/client/src/pages/game/index.tsx | 10 +- .../src/sdk/drag/computePanelInsertIndex.ts | 20 ---- apps/client/src/sdk/drag/resolveDomTarget.ts | 46 ++++++-- apps/client/src/sdk/drag/rules/widgets.ts | 25 ++--- apps/client/src/sdk/drag/types.ts | 33 +++--- .../hooks/useDragControllerLayer.ts} | 55 +++------ apps/client/src/sdk/store/drag.ts | 47 +++----- apps/client/src/sdk/store/layout.ts | 104 +++++++++--------- 14 files changed, 343 insertions(+), 282 deletions(-) delete mode 100644 apps/client/src/components/Widget/index.tsx create mode 100644 apps/client/src/components/Widgets/Ghost/index.tsx create mode 100644 apps/client/src/components/Widgets/Renderer/index.tsx create mode 100644 apps/client/src/components/Widgets/Shell/index.tsx delete mode 100644 apps/client/src/sdk/drag/computePanelInsertIndex.ts rename apps/client/src/{components/Drag/ControllerLayer/index.tsx => sdk/hooks/useDragControllerLayer.ts} (52%) diff --git a/apps/client/src/components/Panel/index.tsx b/apps/client/src/components/Panel/index.tsx index f0aea3b..69c1c20 100644 --- a/apps/client/src/components/Panel/index.tsx +++ b/apps/client/src/components/Panel/index.tsx @@ -1,57 +1,54 @@ -import { Fragment } from "react"; -import { Widget } from "@/components/Widget"; +import { AvailableZones } from "@/sdk/drag/types"; import { useDragStore } from "@/sdk/store/drag"; -import type { PanelId } from "@/sdk/store/layout"; -import { useLayoutStore } from "@/sdk/store/layout"; +import { type PanelId, useLayoutStore } from "@/sdk/store/layout"; import { cn } from "@/sdk/utils/cn"; +import { WidgetShell } from "../Widgets/Shell"; + +export function PanelTargetOutline({ panelId }: { panelId: string }) { + const dragging = useDragStore((s) => s.dragging); + const target = useDragStore((s) => s.target); + const canDrop = useDragStore((s) => s.canDrop); + + const isTarget = + !!dragging && + !!target && + target.zone === AvailableZones.PANEL && + target.panelId === panelId; + + const isStartingPanel = + dragging?.from === AvailableZones.PANEL && + dragging?.fromPanelId === panelId; + + if (isStartingPanel) return null; + + if (!isTarget) return null; -function InsertIndicator({ ok }: { ok: boolean }) { return (
); } -export function Panel({ panelId, title }: { panelId: PanelId; title: string }) { - const ids = useLayoutStore((s) => s.panels[panelId]); - - const dragging = useDragStore((s) => s.dragging); - const target = useDragStore((s) => s.target); - const canDrop = useDragStore((s) => s.canDrop); - - const active = - dragging && target?.zone === "PANEL" && target.panelId === panelId; - - const insertIndex = active && target?.zone === "PANEL" ? target.index : -1; +export function Panel({ panelId }: { panelId: PanelId }) { + const widgetIds = useLayoutStore((s) => s.panels[panelId]); return ( -
-
{title}
- -
- {ids.map((id, i) => ( - - {active && insertIndex === i && } - - - ))} - - {active && insertIndex === ids.length && ( - - )} -
+
+ + {widgetIds.map((id, idx) => ( + + ))}
); } diff --git a/apps/client/src/components/Widget/index.tsx b/apps/client/src/components/Widget/index.tsx deleted file mode 100644 index 2ae61b1..0000000 --- a/apps/client/src/components/Widget/index.tsx +++ /dev/null @@ -1,52 +0,0 @@ -import { Kinds, Zones } from "@/sdk/drag/types"; -import { useDragStore } from "@/sdk/store/drag"; -import type { PanelId } from "@/sdk/store/layout"; -import { useLayoutStore } from "@/sdk/store/layout"; - -export function Widget({ - panelId, - index, - widgetId, -}: { - panelId: PanelId; - index: number; - widgetId: string; -}) { - const def = useLayoutStore((s) => s.widgets[widgetId]); - const startDrag = useDragStore((s) => s.startDrag); - - return ( -
-
{ - e.preventDefault(); - - // opcional: captura o pointer (bom pra não “perder” o drag) - (e.currentTarget as HTMLElement).setPointerCapture?.(e.pointerId); - - startDrag( - { - kind: Kinds.WIDGET, - widgetId, - from: Zones.PANEL, - fromPanelId: panelId, - fromIndex: index, - }, - { x: e.clientX, y: e.clientY }, - { label: def?.title ?? "Widget" }, - ); - }} - > - {def?.title ?? widgetId} -
- - {/* body do widget */} -
conteúdo...
-
- ); -} diff --git a/apps/client/src/components/Widgets/Ghost/index.tsx b/apps/client/src/components/Widgets/Ghost/index.tsx new file mode 100644 index 0000000..44bbab8 --- /dev/null +++ b/apps/client/src/components/Widgets/Ghost/index.tsx @@ -0,0 +1,50 @@ +import { createPortal } from "react-dom"; +import { useDragStore } from "@/sdk/store/drag"; +import { WidgetRenderer } from "../Renderer"; + +export function WidgetDragGhost() { + const dragging = useDragStore((s) => s.dragging); + const pointer = useDragStore((s) => s.pointer); + const preview = useDragStore((s) => s.preview); + const canDrop = useDragStore((s) => s.canDrop); + + if (!dragging || !pointer || !preview) return null; + if (preview.type !== "WIDGET") return null; + + const ghost = ( +
+
+
+ {/* pode mostrar title real se quiser */} + Widget +
+ + {/* ✅ aparece, mas não interage */} +
+ +
+
+
+ ); + + return createPortal(ghost, document.body); +} diff --git a/apps/client/src/components/Widgets/Renderer/index.tsx b/apps/client/src/components/Widgets/Renderer/index.tsx new file mode 100644 index 0000000..cc79005 --- /dev/null +++ b/apps/client/src/components/Widgets/Renderer/index.tsx @@ -0,0 +1,19 @@ +import { useLayoutStore } from "@/sdk/store/layout"; + +export function WidgetRenderer({ widgetId }: { widgetId: string }) { + const widget = useLayoutStore((s) => s.widgets[widgetId]); + if (!widget) return null; + + if (widget.type === "skills") + return
Skills content…
; + if (widget.type === "battleList") + return
Battle list…
; + if (widget.type === "backpack") + return ( +
+ Backpack: {widget.containerId} +
+ ); + + return null; +} diff --git a/apps/client/src/components/Widgets/Shell/index.tsx b/apps/client/src/components/Widgets/Shell/index.tsx new file mode 100644 index 0000000..d4942e1 --- /dev/null +++ b/apps/client/src/components/Widgets/Shell/index.tsx @@ -0,0 +1,74 @@ +import { AvailableKinds } from "@/sdk/drag/types"; +import { useDragStore } from "@/sdk/store/drag"; +import { type PanelId, useLayoutStore } from "@/sdk/store/layout"; +import { cn } from "@/sdk/utils/cn"; +import { WidgetRenderer } from "../Renderer"; + +export function WidgetShell({ + widgetId, + panelId, + index, +}: { + widgetId: string; + panelId: string; + index: number; +}) { + const widget = useLayoutStore((s) => s.widgets[widgetId]); + + const startDrag = useDragStore((s) => s.startDrag); + const dragging = useDragStore((s) => s.dragging); + + const isDraggingThis = + dragging?.kind === AvailableKinds.WIDGET && dragging.widgetId === widgetId; + + const onHeaderPointerDown = (e: React.PointerEvent) => { + e.preventDefault(); + + const widgetElement = (e.currentTarget as HTMLElement).closest( + "[data-widget-id]", + ) as HTMLElement | null; + + const rect = widgetElement?.getBoundingClientRect(); + + startDrag( + { + kind: AvailableKinds.WIDGET, + widgetId, + from: "PANEL", + fromPanelId: panelId as PanelId, + fromIndex: index, + }, + { x: e.clientX, y: e.clientY }, + { + type: "WIDGET", + widgetId, + height: rect?.height || 120, + width: rect?.width || 175, + }, + ); + }; + + return ( +
+ {/* drag handle */} +
+ {widget?.title ?? widgetId} +
+ +
+
+ +
+
+
+ ); +} diff --git a/apps/client/src/components/game/Shell/index.tsx b/apps/client/src/components/game/Shell/index.tsx index 9ca7b59..1604f57 100644 --- a/apps/client/src/components/game/Shell/index.tsx +++ b/apps/client/src/components/game/Shell/index.tsx @@ -1,5 +1,5 @@ import { useMemo } from "react"; -import { DragControllerLayer } from "@/components/Drag/ControllerLayer"; + import { Panel as PanelSlot } from "@/components/Panel"; import { Panel } from "@/components/ui/Panel"; import { MIN_GAME_WIDTH, PANEL_WIDTH } from "@/sdk/constants"; @@ -42,13 +42,13 @@ export const GameShell = () => { style={{ gridArea: "left1" }} className="border-neutral-800 border-r" > - +
- +
{/* CENTER: grid INTERNO com health / game / bottom */} @@ -80,7 +80,6 @@ export const GameShell = () => {
Right 3
)} -
); }; diff --git a/apps/client/src/pages/game/index.tsx b/apps/client/src/pages/game/index.tsx index 5b0e728..c7f79b0 100644 --- a/apps/client/src/pages/game/index.tsx +++ b/apps/client/src/pages/game/index.tsx @@ -1,8 +1,16 @@ import { GameShell } from "@/components/game/Shell"; +import { WidgetDragGhost } from "@/components/Widgets/Ghost"; +import { useDragControllerLayer } from "@/sdk/hooks/useDragControllerLayer"; import { usePointerHoverLayer } from "@/sdk/hooks/usePointerHoverLayer"; export function GamePage() { usePointerHoverLayer(); + useDragControllerLayer(); - return ; + return ( + <> + + + + ); } diff --git a/apps/client/src/sdk/drag/computePanelInsertIndex.ts b/apps/client/src/sdk/drag/computePanelInsertIndex.ts deleted file mode 100644 index a138646..0000000 --- a/apps/client/src/sdk/drag/computePanelInsertIndex.ts +++ /dev/null @@ -1,20 +0,0 @@ -export function computePanelInsertIndex( - panelElement: HTMLElement, - clientY: number, -) { - const widgets = Array.from( - panelElement.querySelectorAll("[data-widget-root='true']"), - ); - - // painel vazio => insere no começo - if (widgets.length === 0) return 0; - - for (let i = 0; i < widgets.length; i++) { - const r = widgets[i].getBoundingClientRect(); - const mid = r.top + r.height / 2; - if (clientY < mid) return i; - } - - // abaixo de todos => insere no fim - return widgets.length; -} diff --git a/apps/client/src/sdk/drag/resolveDomTarget.ts b/apps/client/src/sdk/drag/resolveDomTarget.ts index 99a7d15..c5ba628 100644 --- a/apps/client/src/sdk/drag/resolveDomTarget.ts +++ b/apps/client/src/sdk/drag/resolveDomTarget.ts @@ -1,19 +1,45 @@ -import type { DropTarget } from "@/sdk/drag/types"; -import { Zones } from "@/sdk/drag/types"; -import { computePanelInsertIndex } from "./computePanelInsertIndex"; +import type { PanelId } from "@/sdk/store/layout"; +import { AvailableZones, type DropTarget, type PanelDropTarget } from "./types"; + +function getInsertIndex(panelEl: HTMLElement, clientY: number) { + const items = Array.from( + panelEl.querySelectorAll("[data-widget-id]"), + ); + + // se painel vazio -> 0 + if (items.length === 0) return 0; + + // encontra o primeiro item cujo midpoint é > mouseY + for (let i = 0; i < items.length; i++) { + const r = items[i].getBoundingClientRect(); + const mid = r.top + r.height / 2; + if (clientY < mid) return i; + } + + // senão entra no final + return items.length; +} export function resolveDomTarget(clientX: number, clientY: number): DropTarget { const el = document.elementFromPoint(clientX, clientY) as HTMLElement | null; if (!el) return null; - // agora o dropzone é o painel inteiro - const panel = el.closest("[data-dropzone='PANEL']") as HTMLElement | null; - if (!panel) return null; + const zoneEl = el.closest("[data-dropzone]") as HTMLElement | null; + if (!zoneEl) return null; + + const zone = zoneEl.dataset.dropzone; - const panelId = panel.dataset.panelId; - if (!panelId) return null; + if (zone === AvailableZones.PANEL) { + const panelId = (zoneEl.dataset.panelId ?? "right3") as PanelId; + const insertIndex = getInsertIndex(zoneEl, clientY); - const index = computePanelInsertIndex(panel, clientY); + const target: PanelDropTarget = { + zone: AvailableZones.PANEL, + panelId, + insertIndex, + }; + return target; + } - return { zone: Zones.PANEL, panelId, index }; + return null; } diff --git a/apps/client/src/sdk/drag/rules/widgets.ts b/apps/client/src/sdk/drag/rules/widgets.ts index 2728dfc..6f3ed80 100644 --- a/apps/client/src/sdk/drag/rules/widgets.ts +++ b/apps/client/src/sdk/drag/rules/widgets.ts @@ -1,28 +1,19 @@ import { registerRule } from "@/sdk/drag/rules"; -import { Kinds, Zones } from "@/sdk/drag/types"; +import { AvailableKinds, AvailableZones } from "@/sdk/drag/types"; import { type PanelId, useLayoutStore } from "@/sdk/store/layout"; registerRule({ - kind: Kinds.WIDGET, - zone: Zones.PANEL, - canDrop: (payload, target) => { - return payload.kind === Kinds.WIDGET && target.zone === Zones.PANEL; - }, + kind: AvailableKinds.WIDGET, + zone: AvailableZones.PANEL, + canDrop: (payload) => payload.kind === AvailableKinds.WIDGET, onDrop: (payload, target) => { - if (payload.kind !== Kinds.WIDGET) return; - if (target.zone !== Zones.PANEL) return; + if (payload.kind !== AvailableKinds.WIDGET) return; + if (target.zone !== AvailableZones.PANEL) return; useLayoutStore.getState().moveWidget({ widgetId: payload.widgetId, - fromPanelId: payload.fromPanelId as PanelId, - fromIndex: payload.fromIndex, - toPanelId: target.panelId as PanelId, - toIndex: target.index, + toPanelId: target.panelId, + toIndex: target.insertIndex, }); }, - getPreview: (payload) => { - if (payload.kind !== Kinds.WIDGET) return { label: "Widget" }; - const widget = useLayoutStore.getState().widgets[payload.widgetId]; - return { label: widget.title ?? "Widget" }; - }, }); diff --git a/apps/client/src/sdk/drag/types.ts b/apps/client/src/sdk/drag/types.ts index 616f479..341dcef 100644 --- a/apps/client/src/sdk/drag/types.ts +++ b/apps/client/src/sdk/drag/types.ts @@ -1,26 +1,29 @@ -export const Zones = { +import type { PanelId } from "@/sdk/store/layout"; + +export const AvailableZones = { PANEL: "PANEL", } as const; -export const Kinds = { +export const AvailableKinds = { WIDGET: "WIDGET", } as const; -export type KeyedZone = (typeof Zones)[keyof typeof Zones]; -export type KeyedKind = (typeof Kinds)[keyof typeof Kinds]; - -export type DropTarget = { - zone: typeof Zones.PANEL; - panelId: string; - index: number; -} | null; - export type DragPayload = { - kind: typeof Kinds.WIDGET; + kind: typeof AvailableKinds.WIDGET; widgetId: string; - from: typeof Zones.PANEL; - fromPanelId: string; + from: typeof AvailableZones.PANEL; + fromPanelId: PanelId; fromIndex: number; }; -export type DragPreview = { label?: string }; +export type PanelDropTarget = { + zone: typeof AvailableZones.PANEL; + panelId: PanelId; + insertIndex: number; // <- onde vai entrar +}; + +export type DropTarget = PanelDropTarget | null; + +export type DragPreview = + | { type: "LABEL"; label: string } + | { type: "WIDGET"; widgetId: string; width: number; height: number }; diff --git a/apps/client/src/components/Drag/ControllerLayer/index.tsx b/apps/client/src/sdk/hooks/useDragControllerLayer.ts similarity index 52% rename from apps/client/src/components/Drag/ControllerLayer/index.tsx rename to apps/client/src/sdk/hooks/useDragControllerLayer.ts index 3beb72a..8008689 100644 --- a/apps/client/src/components/Drag/ControllerLayer/index.tsx +++ b/apps/client/src/sdk/hooks/useDragControllerLayer.ts @@ -1,22 +1,21 @@ import { useEffect } from "react"; -import { createPortal } from "react-dom"; import { resolveDomTarget } from "@/sdk/drag/resolveDomTarget"; import { resolveRule } from "@/sdk/drag/rules"; import { useDragStore } from "@/sdk/store/drag"; -export function DragControllerLayer() { +export function useDragControllerLayer() { const dragging = useDragStore((s) => s.dragging); - const pointer = useDragStore((s) => s.pointer); - const preview = useDragStore((s) => s.preview); - const setPointer = useDragStore((s) => s.setPointer); const setTarget = useDragStore((s) => s.setTarget); const endDrag = useDragStore((s) => s.endDrag); useEffect(() => { - const onMove = (event: PointerEvent) => { - const x = event.clientX; - const y = event.clientY; + if (!dragging) return; + + const onMove = (e: PointerEvent) => { + const x = e.clientX; + const y = e.clientY; + setPointer({ x, y }); const domTarget = resolveDomTarget(x, y); @@ -25,33 +24,24 @@ export function DragControllerLayer() { return; } - if (!dragging) { - setTarget(null, false); - return; - } - const { canDrop } = resolveRule(dragging, domTarget); setTarget(domTarget, canDrop); }; - const onUp = (_event: PointerEvent) => { + const onUp = () => { const state = useDragStore.getState(); const payload = state.dragging; const target = state.target; - const canDrop = state.canDrop; - if (payload && target && canDrop) { - const { rule } = resolveRule(payload, target); - rule?.onDrop(payload, target); + if (payload && target) { + const res = resolveRule(payload, target); + if (res.rule) res.rule.onDrop(payload, target); } - endDrag(); }; - const onKeyDown = (event: KeyboardEvent) => { - if (event.key === "Escape" && dragging) { - endDrag(); - } + const onKeyDown = (ev: KeyboardEvent) => { + if (ev.key === "Escape") endDrag(); }; window.addEventListener("pointermove", onMove); @@ -64,23 +54,4 @@ export function DragControllerLayer() { window.removeEventListener("keydown", onKeyDown); }; }, [dragging, setPointer, setTarget, endDrag]); - - if (!dragging || !pointer) return null; - - const ghost = ( -
- {preview?.label ?? dragging.kind} -
- ); - - return createPortal(ghost, document.body); } diff --git a/apps/client/src/sdk/store/drag.ts b/apps/client/src/sdk/store/drag.ts index 853e7b6..483e93c 100644 --- a/apps/client/src/sdk/store/drag.ts +++ b/apps/client/src/sdk/store/drag.ts @@ -1,9 +1,9 @@ import { create } from "zustand"; -import type { DragPayload, DragPreview, DropTarget } from "../drag/types"; +import type { DragPayload, DragPreview, DropTarget } from "@/sdk/drag/types"; function targetKey(t: DropTarget) { if (!t) return ""; - return `P:${t.panelId}:${t.index}`; + return `P:${t.panelId}:${t.insertIndex}`; } type DragState = { @@ -25,7 +25,7 @@ type DragState = { endDrag: () => void; }; -export const useDragStore = create((set) => ({ +export const useDragStore = create((set, get) => ({ dragging: null, pointer: null, @@ -34,40 +34,29 @@ export const useDragStore = create((set) => ({ preview: null, startDrag: (payload, startPointer, preview) => - set(() => { - return { - dragging: payload, - pointer: startPointer, - target: null, - canDrop: false, - preview: preview ?? { label: payload.kind }, - }; + set({ + dragging: payload, + pointer: startPointer, + target: null, + canDrop: false, + preview: preview ?? { type: "LABEL", label: payload.kind }, }), - setPointer: (p) => - set(() => ({ - pointer: p, - })), - - setTarget: (t, canDrop) => - set((state) => { - const same = - targetKey(state.target) === targetKey(t) && state.canDrop === canDrop; + setPointer: (p) => set({ pointer: p }), - if (same) return {}; - - return { - target: t, - canDrop, - }; - }), + setTarget: (t, canDrop) => { + const s = get(); + const same = targetKey(s.target) === targetKey(t) && s.canDrop === canDrop; + if (same) return; + set({ target: t, canDrop }); + }, endDrag: () => - set(() => ({ + set({ dragging: null, pointer: null, target: null, canDrop: false, preview: null, - })), + }), })); diff --git a/apps/client/src/sdk/store/layout.ts b/apps/client/src/sdk/store/layout.ts index f8f180d..e7bd6f1 100644 --- a/apps/client/src/sdk/store/layout.ts +++ b/apps/client/src/sdk/store/layout.ts @@ -1,79 +1,85 @@ import { create } from "zustand"; export type PanelId = "left1" | "left2" | "right1" | "right2" | "right3"; -export type WidgetId = string; -export type WidgetDef = { - id: WidgetId; +export type WidgetType = "skills" | "battleList" | "backpack"; + +export type WidgetModel = { + id: string; + type: WidgetType; title: string; + // pra backpack, exemplo: + containerId?: string; }; type LayoutState = { - widgets: Record; - panels: Record; + widgets: Record; + panels: Record; // lista de widgetIds por painel + + findWidget: (widgetId: string) => { panelId: PanelId; index: number } | null; moveWidget: (args: { - widgetId: WidgetId; - fromPanelId: PanelId; - fromIndex: number; + widgetId: string; toPanelId: PanelId; toIndex: number; }) => void; }; -export const useLayoutStore = create((set) => ({ +export const useLayoutStore = create((set, get) => ({ widgets: { - "widget-1": { id: "widget-1", title: "Widget 1" }, - "widget-2": { id: "widget-2", title: "Widget 2" }, - "widget-3": { id: "widget-3", title: "Widget 3" }, + skills: { id: "skills", type: "skills", title: "Skills" }, + battle: { id: "battle", type: "battleList", title: "Battle" }, + bp1: { + id: "bp1", + type: "backpack", + title: "Backpack", + containerId: "bp:1", + }, }, panels: { - left1: ["widget-1", "widget-2"], - left2: ["widget-3"], + left1: ["skills", "battle"], + left2: ["bp1"], right1: [], right2: [], right3: [], }, - moveWidget: ({ fromIndex, fromPanelId, toIndex, toPanelId, widgetId }) => - set((state) => { - const fromArray = [...state.panels[fromPanelId]]; - const toArray = - fromPanelId === toPanelId ? fromArray : [...state.panels[toPanelId]]; + findWidget: (widgetId) => { + const panels = get().panels; + for (const panelId of Object.keys(panels) as PanelId[]) { + const idx = panels[panelId].indexOf(widgetId); + if (idx !== -1) return { panelId, index: idx }; + } + return null; + }, - const at = fromArray.indexOf(widgetId); - const removeIndex = at >= 0 ? at : fromIndex; - if (removeIndex >= 0) { - fromArray.splice(removeIndex, 1); - } + moveWidget: ({ widgetId, toPanelId, toIndex }) => { + set((s) => { + const from = get().findWidget(widgetId); + if (!from) return s; + + const nextPanels: LayoutState["panels"] = structuredClone(s.panels); + // remove do painel origem + nextPanels[from.panelId].splice(from.index, 1); + + // ajusta índice se for o mesmo painel e a remoção foi antes do destino let insertIndex = toIndex; - if (fromPanelId === toPanelId) { - if (removeIndex < insertIndex) insertIndex -= 1; - - insertIndex = Math.max(0, Math.min(insertIndex, fromArray.length)); - fromArray.splice(insertIndex, 0, widgetId); - - return { - ...state, - panels: { - ...state.panels, - [fromPanelId]: fromArray, - }, - }; + if (from.panelId === toPanelId && from.index < toIndex) { + insertIndex = Math.max(0, toIndex - 1); } - insertIndex = Math.max(0, Math.min(insertIndex, toArray.length)); - toArray.splice(insertIndex, 0, widgetId); - - return { - ...state, - panels: { - ...state.panels, - [fromPanelId]: fromArray, - [toPanelId]: toArray, - }, - }; - }), + // clamp + insertIndex = Math.max( + 0, + Math.min(insertIndex, nextPanels[toPanelId].length), + ); + + // insere no destino + nextPanels[toPanelId].splice(insertIndex, 0, widgetId); + + return { ...s, panels: nextPanels }; + }); + }, })); From 1c7643e4363ea62634ef9442867a18a803a7547c Mon Sep 17 00:00:00 2001 From: Guilherme Fontes Date: Wed, 24 Dec 2025 17:19:13 -0400 Subject: [PATCH 10/18] feat: add performance profiler and improvement in grid debug --- .../src/components/game/PixiHost/index.tsx | 7 + .../components/performance/Overlay/index.tsx | 41 +++ .../components/performance/Profiler/index.tsx | 30 ++ apps/client/src/pages/game/index.tsx | 16 +- apps/client/src/sdk/game/screenToTile.ts | 62 +++-- apps/client/src/sdk/movement/bridge.ts | 55 ++++ apps/client/src/sdk/movement/movementInput.ts | 31 +++ .../src/sdk/pixi/layers/CreatureLayer.ts | 4 + .../src/sdk/pixi/layers/DebugGridLayer.ts | 52 ++-- .../client/src/sdk/pixi/layers/GroundLayer.ts | 4 + .../src/sdk/pixi/utils/AttachPerformance.ts | 45 +++ .../src/sdk/pixi/utils/WorldPerfSamples.ts | 92 +++++++ apps/client/src/sdk/pixi/world.ts | 83 +++--- apps/client/src/sdk/store/debug.ts | 2 +- apps/client/src/sdk/store/movement.ts | 256 +++++++++++++++++- apps/client/src/sdk/store/performance.ts | 130 +++++++++ apps/client/src/sdk/types/movement.ts | 24 ++ 17 files changed, 825 insertions(+), 109 deletions(-) create mode 100644 apps/client/src/components/performance/Overlay/index.tsx create mode 100644 apps/client/src/components/performance/Profiler/index.tsx create mode 100644 apps/client/src/sdk/movement/bridge.ts create mode 100644 apps/client/src/sdk/movement/movementInput.ts create mode 100644 apps/client/src/sdk/pixi/utils/AttachPerformance.ts create mode 100644 apps/client/src/sdk/pixi/utils/WorldPerfSamples.ts create mode 100644 apps/client/src/sdk/store/performance.ts create mode 100644 apps/client/src/sdk/types/movement.ts diff --git a/apps/client/src/components/game/PixiHost/index.tsx b/apps/client/src/components/game/PixiHost/index.tsx index a6e13b7..a2fb3d8 100644 --- a/apps/client/src/components/game/PixiHost/index.tsx +++ b/apps/client/src/components/game/PixiHost/index.tsx @@ -1,5 +1,6 @@ import { Application, TextureStyle } from "pixi.js"; import { useEffect, useRef } from "react"; +import { attachPixiPerf } from "@/sdk/pixi/utils/AttachPerformance"; import { ResizeBridge } from "@/sdk/pixi/utils/ResizeBridge"; import { World } from "@/sdk/pixi/world"; @@ -18,6 +19,7 @@ export function PixiHost() { let ro: ResizeObserver | null = null; let application: Application | null = null; let world: World | null = null; + let detachPerf: null | (() => void) = null; // garante que não ficou canvas “antigo” no DOM host.replaceChildren(); @@ -29,6 +31,9 @@ export function PixiHost() { world?.destroy(); world = null; + detachPerf?.(); + detachPerf = null; + // remove canvas do DOM também (não confia só no destroy) if (application) { try { @@ -58,6 +63,8 @@ export function PixiHost() { preference: "webgpu", }); + detachPerf = attachPixiPerf(application); + application.canvas.style.display = "block"; // se rolou HMR/StrictMode/cleanup enquanto init rodava, aborta diff --git a/apps/client/src/components/performance/Overlay/index.tsx b/apps/client/src/components/performance/Overlay/index.tsx new file mode 100644 index 0000000..bc6fa8e --- /dev/null +++ b/apps/client/src/components/performance/Overlay/index.tsx @@ -0,0 +1,41 @@ +import { useEffect } from "react"; +import { usePerfStore } from "@/sdk/store/performance"; + +function fmt(n: number, digits = 1) { + return Number.isFinite(n) ? n.toFixed(digits) : "-"; +} + +export function PerfOverlay() { + const enabled = usePerfStore((s) => s.enabled); + const pixi = usePerfStore((s) => s.pixi); + const react = usePerfStore((s) => s.react); + const toggle = usePerfStore((s) => s.toggle); + const world = usePerfStore((s) => s.world); + const c = usePerfStore((s) => s.counts); + + useEffect(() => { + const onKeyDown = (e: KeyboardEvent) => { + // Ctrl+Shift+P pra ligar/desligar + if (e.ctrlKey && e.shiftKey && e.key.toLowerCase() === "p") toggle(); + }; + window.addEventListener("keydown", onKeyDown); + return () => window.removeEventListener("keydown", onKeyDown); + }, [toggle]); + + if (!enabled) return null; + + return ( +
+ 
+				{`PIXI   ${fmt(pixi.fps, 0)} fps | ${fmt(pixi.frameMs, 1)} ms | ${pixi.screenW}x${pixi.screenH} dpr ${fmt(pixi.resolution, 2)}
+WORLD  avg ${fmt(world.worldAvgMs, 2)} ms  max ${fmt(world.worldMaxMs, 2)} ms
+LAYERS ground ${fmt(world.groundAvgMs, 2)} / ${fmt(world.groundMaxMs, 2)}  | creatures ${fmt(world.creaturesAvgMs, 2)} / ${fmt(world.creaturesMaxMs, 2)}
+       overlay ${fmt(world.overlayAvgMs, 2)} / ${fmt(world.overlayMaxMs, 2)} | debug ${fmt(world.debugAvgMs, 2)} / ${fmt(world.debugMaxMs, 2)}
+REACT  ${fmt(react.commitsPerSec, 0)}/s | last ${fmt(react.lastCommitMs, 1)} ms | avg ${fmt(react.avgCommitMs, 1)} ms
+
+COUNTS tiles ${c.tilesInCache} | groundSprites ${c.groundSprites} | creatures ${c.creaturesVisible}/${c.creaturesTotal}
+DIRTY  view:${c.viewDirty ? "Y" : "n"} tiles:${c.tilesDirty ? "Y" : "n"} creatures:${c.creaturesDirty ? "Y" : "n"}`}
+
+
+ ); +} diff --git a/apps/client/src/components/performance/Profiler/index.tsx b/apps/client/src/components/performance/Profiler/index.tsx new file mode 100644 index 0000000..3b0ed23 --- /dev/null +++ b/apps/client/src/components/performance/Profiler/index.tsx @@ -0,0 +1,30 @@ +import { Profiler, type ReactNode } from "react"; +import { usePerfStore } from "@/sdk/store/performance"; + +export function ReactPerfProfiler({ + id, + children, +}: { + id: string; + children: ReactNode; +}) { + const push = usePerfStore((s) => s.pushReactCommit); + + return ( + { + push(actualDuration, commitTime); + }} + > + {children} + + ); +} diff --git a/apps/client/src/pages/game/index.tsx b/apps/client/src/pages/game/index.tsx index c7f79b0..1913951 100644 --- a/apps/client/src/pages/game/index.tsx +++ b/apps/client/src/pages/game/index.tsx @@ -1,16 +1,28 @@ +import { useEffect } from "react"; import { GameShell } from "@/components/game/Shell"; +import { PerfOverlay } from "@/components/performance/Overlay"; +import { ReactPerfProfiler } from "@/components/performance/Profiler"; import { WidgetDragGhost } from "@/components/Widgets/Ghost"; import { useDragControllerLayer } from "@/sdk/hooks/useDragControllerLayer"; import { usePointerHoverLayer } from "@/sdk/hooks/usePointerHoverLayer"; +import { startMovementInput } from "@/sdk/movement/movementInput"; export function GamePage() { usePointerHoverLayer(); useDragControllerLayer(); + useEffect(() => { + const stop = startMovementInput(); + return () => stop(); + }, []); + return ( <> - - + + + + + ); } diff --git a/apps/client/src/sdk/game/screenToTile.ts b/apps/client/src/sdk/game/screenToTile.ts index dcb0743..8ce1c87 100644 --- a/apps/client/src/sdk/game/screenToTile.ts +++ b/apps/client/src/sdk/game/screenToTile.ts @@ -1,40 +1,60 @@ import type { ViewportTransform, WorldTile } from "@/sdk/store/viewport"; +import { RENDER_PAD } from "../constants"; export function screenToTile(args: { - localX: number; // coordenada dentro do worldEl (DOM) + localX: number; // dentro do worldEl localY: number; viewport: ViewportTransform; }): WorldTile | null { const { localX, localY, viewport } = args; + const pad = RENDER_PAD; - // 1) remove letterbox (offset) e volta pro espaço lógico (antes do scale) - const x = (localX - viewport.offsetX) / viewport.scale; - const y = (localY - viewport.offsetY) / viewport.scale; + const { + offsetX, + offsetY, + scale, + viewW, + viewH, + cameraX, + cameraY, + tileSize, + viewTilesX, + viewTilesY, + originX, + originY, + z, + } = viewport; - // 2) recorte 15x11 (mask). Se estiver na borda preta, null - if (x < 0 || y < 0 || x >= viewport.viewW || y >= viewport.viewH) return null; + // 1) -> espaço lógico do rootView (antes do scale) + const x = (localX - offsetX) / scale; + const y = (localY - offsetY) / scale; + + // 2) clip 15x11: se tá na borda preta, null + if (x < 0 || y < 0 || x >= viewW || y >= viewH) return null; // 3) desfaz camera scroll (camera move o mundo) - const worldPxX = x - viewport.cameraX; - const worldPxY = y - viewport.cameraY; + // screen = camera + worldLocal => worldLocal = screen - camera + const worldLocalX = x - cameraX; + const worldLocalY = y - cameraY; + + // 4) tile indices (com epsilon pra não “pular” por float) + const eps = 1e-6; + const vx = Math.floor((worldLocalX + eps) / tileSize); + const vy = Math.floor((worldLocalY + eps) / tileSize); - const vx = Math.floor(worldPxX / viewport.tileSize); - const vy = Math.floor(worldPxY / viewport.tileSize); + // 5) bounds com PAD (permite pegar tile entrando/saindo no walk scroll) + const minX = -pad; + const minY = -pad; + const maxX = viewTilesX + pad - 1; + const maxY = viewTilesY + pad - 1; - if ( - vx < 0 || - vy < 0 || - vx >= viewport.viewTilesX || - vy >= viewport.viewTilesY - ) { - return null; - } + if (vx < minX || vy < minY || vx > maxX || vy > maxY) return null; return { vx, vy, - x: viewport.originX + vx, - y: viewport.originY + vy, - z: viewport.z, + x: originX + vx, + y: originY + vy, + z, }; } diff --git a/apps/client/src/sdk/movement/bridge.ts b/apps/client/src/sdk/movement/bridge.ts new file mode 100644 index 0000000..d5fc9dd --- /dev/null +++ b/apps/client/src/sdk/movement/bridge.ts @@ -0,0 +1,55 @@ +import type { MoveCommand, MoveDir, MoveResult } from "../types/movement"; +import type { Position } from "../types/position"; + +export type MoveBridge = { + sendMove: (cmd: MoveCommand) => Promise; +}; + +function applyDir(from: Position, dir: MoveDir): Position { + if (dir === "N") return { ...from, y: from.y - 1 }; + if (dir === "S") return { ...from, y: from.y + 1 }; + if (dir === "W") return { ...from, x: from.x - 1 }; + return { ...from, x: from.x + 1 }; // "E" +} + +export function createFakeRustBridge(args?: { + latencyMs?: number; + errorRate?: number; // 0..1 +}): MoveBridge { + const latencyMs = args?.latencyMs ?? 30; + const errorRate = args?.errorRate ?? 0; + + return { + async sendMove(cmd: MoveCommand): Promise { + await new Promise((r) => setTimeout(r, latencyMs)); + + const rolledBack = Math.random() < errorRate; + + if (rolledBack) { + return { + reqId: cmd.reqId, + ok: false, + position: cmd.from, // nega o move + reason: "simulated_rollback", + }; + } + + return { + reqId: cmd.reqId, + ok: true, + position: applyDir(cmd.from, cmd.dir), + }; + }, + }; +} + +// --- ponte global (pra você trocar por Tauri depois) --- +let bridge: MoveBridge = createFakeRustBridge(); + +export function setMoveBridge(b: MoveBridge) { + bridge = b; +} + +export function getMoveBridge() { + return bridge; +} diff --git a/apps/client/src/sdk/movement/movementInput.ts b/apps/client/src/sdk/movement/movementInput.ts new file mode 100644 index 0000000..4f91885 --- /dev/null +++ b/apps/client/src/sdk/movement/movementInput.ts @@ -0,0 +1,31 @@ +import { useMovementStore } from "@/sdk/store/movement"; +import type { MoveDir } from "../types/movement"; + +function isTypingInInput() { + const el = document.activeElement as HTMLElement | null; + if (!el) return false; + const tag = el.tagName.toLowerCase(); + return tag === "input" || tag === "textarea" || el.isContentEditable; +} + +function keyToDir(key: string): MoveDir | null { + if (key === "ArrowUp" || key === "w" || key === "W") return "N"; + if (key === "ArrowDown" || key === "s" || key === "S") return "S"; + if (key === "ArrowLeft" || key === "a" || key === "A") return "W"; + if (key === "ArrowRight" || key === "d" || key === "D") return "E"; + return null; +} + +export function startMovementInput() { + const onKeyDown = (e: KeyboardEvent) => { + if (isTypingInInput()) return; + const dir = keyToDir(e.key); + if (!dir) return; + e.preventDefault(); + useMovementStore.getState().enqueueMove(dir); + }; + + window.addEventListener("keydown", onKeyDown, { passive: false }); + + return () => window.removeEventListener("keydown", onKeyDown); +} diff --git a/apps/client/src/sdk/pixi/layers/CreatureLayer.ts b/apps/client/src/sdk/pixi/layers/CreatureLayer.ts index 0ba55db..f484fd0 100644 --- a/apps/client/src/sdk/pixi/layers/CreatureLayer.ts +++ b/apps/client/src/sdk/pixi/layers/CreatureLayer.ts @@ -77,6 +77,10 @@ export class CreatureLayer { this.pool.releaseMissing(alive); } + getTotalCreatures() { + return useWorldStore.getState().creatures.size; // ou o que você usa + } + destroy() { this.container.destroy({ children: true }); this.pool.destroy(); diff --git a/apps/client/src/sdk/pixi/layers/DebugGridLayer.ts b/apps/client/src/sdk/pixi/layers/DebugGridLayer.ts index bc1e8e4..74da5d3 100644 --- a/apps/client/src/sdk/pixi/layers/DebugGridLayer.ts +++ b/apps/client/src/sdk/pixi/layers/DebugGridLayer.ts @@ -1,41 +1,43 @@ -import { Container, Graphics, Text, TextStyle } from "pixi.js"; +import { BitmapText, Container, Graphics } from "pixi.js"; import { TILE_SIZE_PX, VIEW_TILES_X, VIEW_TILES_Y } from "@/sdk/constants"; export class DebugGridLayer { - private readonly viewX: number = VIEW_TILES_X; - private readonly viewY: number = VIEW_TILES_Y; - private readonly tileSize: number = TILE_SIZE_PX; + private readonly viewX = VIEW_TILES_X; + private readonly viewY = VIEW_TILES_Y; + private readonly tileSize = TILE_SIZE_PX; container = new Container(); private grid = new Graphics(); private center = new Graphics(); - private labels: Text[] = []; + private labels: BitmapText[] = []; private lastOriginX = Number.NaN; private lastOriginY = Number.NaN; private lastZ = Number.NaN; private lastVisible = true; - private style = new TextStyle({ - fontFamily: "monospace", - fontSize: 10, - fill: 0xffffff, - align: "left", - }); - constructor() { this.container.addChild(this.grid); this.container.addChild(this.center); - // labels (opcional, mas útil) const total = this.viewX * this.viewY; + for (let i = 0; i < total; i++) { - const text = new Text({ text: "", style: this.style, scale: 0.6 }); - text.alpha = 0.6; - text.visible = false; // só mostra se enabled - this.labels.push(text); - this.container.addChild(text); + const t = new BitmapText({ + text: "", + style: { + fontFamily: "DebugMono", // mesmo nome definido no .fnt + fontSize: 8, + fill: "#ffffff", + }, + }); + + t.alpha = 0.6; + t.visible = false; + + this.labels.push(t); + this.container.addChild(t); } this.drawGridLines(); @@ -48,7 +50,6 @@ export class DebugGridLayer { this.container.visible = v; } - /** Atualiza os textos de coordenadas (só quando a janela muda) */ update(originX: number, originY: number, z: number) { if ( originX === this.lastOriginX && @@ -88,11 +89,8 @@ export class DebugGridLayer { const h = this.viewY * this.tileSize; this.grid.clear(); - - // contorno DENTRO da área visível this.grid.rect(0.5, 0.5, w - 1, h - 1); - // linhas internas (sem desenhar na borda) for (let i = 1; i < this.viewX; i++) { const x = i * this.tileSize + 0.5; this.grid.moveTo(x, 0.5).lineTo(x, h - 0.5); @@ -117,11 +115,13 @@ export class DebugGridLayer { const cx = Math.floor(this.viewX / 2); const cy = Math.floor(this.viewY / 2); - const x = cx * this.tileSize; - const y = cy * this.tileSize; - this.center - .rect(x, y, this.tileSize, this.tileSize) + .rect( + cx * this.tileSize, + cy * this.tileSize, + this.tileSize, + this.tileSize, + ) .stroke({ color: 0x00ff88, width: 1, alpha: 0.9, pixelLine: true }); } } diff --git a/apps/client/src/sdk/pixi/layers/GroundLayer.ts b/apps/client/src/sdk/pixi/layers/GroundLayer.ts index d7cabb3..f588ddd 100644 --- a/apps/client/src/sdk/pixi/layers/GroundLayer.ts +++ b/apps/client/src/sdk/pixi/layers/GroundLayer.ts @@ -58,6 +58,10 @@ export class GroundLayer { } } + getSpriteCount() { + return this.sprites.length; + } + destroy() { this.container.destroy({ children: true }); this.sprites = []; diff --git a/apps/client/src/sdk/pixi/utils/AttachPerformance.ts b/apps/client/src/sdk/pixi/utils/AttachPerformance.ts new file mode 100644 index 0000000..9a8f4de --- /dev/null +++ b/apps/client/src/sdk/pixi/utils/AttachPerformance.ts @@ -0,0 +1,45 @@ +import type * as PIXI from "pixi.js"; +import type { Application } from "pixi.js"; +import { usePerfStore } from "@/sdk/store/performance"; + +export function attachPixiPerf(app: Application) { + let lastUpdate = performance.now(); + let frames = 0; + let accDelta = 0; + + const intervalMs = 250; + + const tick = (t: PIXI.Ticker) => { + const deltaMS = + typeof t?.deltaMS === "number" + ? t.deltaMS + : typeof t === "number" + ? t * (1000 / 60) + : 16.6667; + + frames += 1; + accDelta += deltaMS; + + const now = performance.now(); + if (now - lastUpdate < intervalMs) return; + + const elapsed = now - lastUpdate; + const fps = (frames * 1000) / Math.max(1, elapsed); + const frameMs = accDelta / Math.max(1, frames); + + usePerfStore.getState().setPixi({ + fps, + frameMs, + screenW: app.screen.width, + screenH: app.screen.height, + resolution: app.renderer.resolution ?? window.devicePixelRatio ?? 1, + }); + + frames = 0; + accDelta = 0; + lastUpdate = now; + }; + + app.ticker.add(tick); + return () => app.ticker.remove(tick); +} diff --git a/apps/client/src/sdk/pixi/utils/WorldPerfSamples.ts b/apps/client/src/sdk/pixi/utils/WorldPerfSamples.ts new file mode 100644 index 0000000..eca341b --- /dev/null +++ b/apps/client/src/sdk/pixi/utils/WorldPerfSamples.ts @@ -0,0 +1,92 @@ +import { usePerfStore } from "@/sdk/store/performance"; + +type Key = "world" | "ground" | "creatures" | "overlay" | "debug"; + +export class WorldPerfSampler { + private intervalMs: number; + private lastFlush = performance.now(); + + private frames = 0; + + private sum: Record = { + world: 0, + ground: 0, + creatures: 0, + overlay: 0, + debug: 0, + }; + + private max: Record = { + world: 0, + ground: 0, + creatures: 0, + overlay: 0, + debug: 0, + }; + + constructor(intervalMs = 250) { + this.intervalMs = intervalMs; + } + + begin(): number { + return performance.now(); + } + + end(key: Key, start: number) { + const dt = performance.now() - start; + this.sum[key] += dt; + if (dt > this.max[key]) this.max[key] = dt; + } + + frame() { + this.frames += 1; + } + + flushIfDue(extraCounts?: Record) { + const enabled = usePerfStore.getState().enabled; + if (!enabled) return; + + const now = performance.now(); + if (now - this.lastFlush < this.intervalMs) return; + + const div = Math.max(1, this.frames); + + usePerfStore.getState().setWorld({ + worldAvgMs: this.sum.world / div, + worldMaxMs: this.max.world, + + groundAvgMs: this.sum.ground / div, + groundMaxMs: this.max.ground, + + creaturesAvgMs: this.sum.creatures / div, + creaturesMaxMs: this.max.creatures, + + overlayAvgMs: this.sum.overlay / div, + overlayMaxMs: this.max.overlay, + + debugAvgMs: this.sum.debug / div, + debugMaxMs: this.max.debug, + }); + + if (extraCounts) { + usePerfStore.getState().setCounts(extraCounts as any); + } + + // reset + this.frames = 0; + this.sum.world = + this.sum.ground = + this.sum.creatures = + this.sum.overlay = + this.sum.debug = + 0; + this.max.world = + this.max.ground = + this.max.creatures = + this.max.overlay = + this.max.debug = + 0; + + this.lastFlush = now; + } +} diff --git a/apps/client/src/sdk/pixi/world.ts b/apps/client/src/sdk/pixi/world.ts index 2cfc533..ba0fc02 100644 --- a/apps/client/src/sdk/pixi/world.ts +++ b/apps/client/src/sdk/pixi/world.ts @@ -1,4 +1,3 @@ -// sdk/pixi/World.ts import { type Application, Container, Graphics, Rectangle } from "pixi.js"; import { createDemoMapLoader } from "@/sdk/demo/demoMapLoader"; import { @@ -18,12 +17,15 @@ import { CreatureLayer } from "./layers/CreatureLayer"; import { DebugGridLayer } from "./layers/DebugGridLayer"; import { GroundLayer } from "./layers/GroundLayer"; import { OverlayLayer } from "./layers/OverlayLayer"; +import { WorldPerfSampler } from "./utils/WorldPerfSamples"; const demo = createDemoMapLoader(); export class World { private app: Application; + private perf = new WorldPerfSampler(250); + private rootView = new Container(); private clip = new Container(); private clipMask = new Graphics(); @@ -98,20 +100,22 @@ export class World { this.scale = Math.min(width / viewW, height / viewH, MAX_SCALE); - this.offsetX = (width - viewW * this.scale) / 2; - this.offsetY = (height - viewH * this.scale) / 2; + const rawOffsetX = (width - viewW * this.scale) / 2; + const rawOffsetY = (height - viewH * this.scale) / 2; - this.rootView.position.set( - Math.round(this.offsetX), - Math.round(this.offsetY), - ); + this.offsetX = Math.round(rawOffsetX); + this.offsetY = Math.round(rawOffsetY); + + this.rootView.position.set(this.offsetX, this.offsetY); this.rootView.scale.set(this.scale); this.clipMask.clear().rect(0, 0, viewW, viewH).fill(0xffffff); + const cam = useMovementStore.getState().cameraPx; const player = useMovementStore.getState().playerTile; const halfX = Math.floor(VIEW_TILES_X / 2); const halfY = Math.floor(VIEW_TILES_Y / 2); + const originX = player.x - halfX; const originY = player.y - halfY; @@ -123,8 +127,8 @@ export class World { offsetX: this.offsetX, offsetY: this.offsetY, - cameraX: this.camera.x, - cameraY: this.camera.y, + cameraX: cam.x, + cameraY: cam.y, originX, originY, @@ -141,9 +145,16 @@ export class World { } update(nowMs: number, _deltaMs: number) { - this.applyWalkScroll(nowMs); + this.perf.frame(); + const tWorld = this.perf.begin(); + useMovementStore.getState().tick(nowMs); - const player = useMovementStore.getState().playerTile; + const playerTile = useMovementStore.getState().playerTile; + const player = playerTile; + const cameraPx = useMovementStore.getState().cameraPx; + + this.camera.x = cameraPx.x; + this.camera.y = cameraPx.y; const halfX = Math.floor(VIEW_TILES_X / 2); const halfY = Math.floor(VIEW_TILES_Y / 2); @@ -154,6 +165,8 @@ export class World { originX, originY, z: player.z, + cameraX: this.camera.x, + cameraY: this.camera.y, }); demo.ensureForView({ @@ -192,6 +205,17 @@ export class World { this.overlay.update(); this.viewDirty = false; + this.perf.end("world", tWorld); + this.perf.flushIfDue({ + groundSprites: this.ground.getSpriteCount?.() ?? 0, + creaturesTotal: this.creatures.getTotalCreatures?.() ?? 0, + creaturesVisible: 0, + tilesInCache: useWorldStore.getState().tiles.size, + + viewDirty: this.viewDirty, + tilesDirty: this.tilesDirty, + creaturesDirty: this.creaturesDirty, + }); } destroy() { @@ -208,41 +232,4 @@ export class World { this.rootView.destroy({ children: true }); } - - private applyWalkScroll(nowMs: number) { - const anim = useMovementStore.getState().walkAnim; - - if (!anim) { - if (this.camera.x !== 0 || this.camera.y !== 0) { - this.camera.x = 0; - this.camera.y = 0; - this.publishCamera(); - } - return; - } - - const t = Math.max( - 0, - Math.min(1, (nowMs - anim.startMs) / anim.durationMs), - ); - const dx = anim.to.x - anim.from.x; - const dy = anim.to.y - anim.from.y; - - this.camera.x = -dx * TILE_SIZE_PX * t; - this.camera.y = -dy * TILE_SIZE_PX * t; - - this.publishCamera(); - } - - private publishCamera() { - const vp = useViewportStore.getState().viewport; - if (!vp) return; - - if (vp.cameraX === this.camera.x && vp.cameraY === this.camera.y) return; - - useViewportStore.getState().patchViewport({ - cameraX: this.camera.x, - cameraY: this.camera.y, - }); - } } diff --git a/apps/client/src/sdk/store/debug.ts b/apps/client/src/sdk/store/debug.ts index 0cf7e93..7b1ecc0 100644 --- a/apps/client/src/sdk/store/debug.ts +++ b/apps/client/src/sdk/store/debug.ts @@ -7,7 +7,7 @@ type State = { }; export const useDebugStore = create((set) => ({ - showGrid: false, + showGrid: true, toggleGrid: () => set((s) => ({ showGrid: !s.showGrid })), setShowGrid: (v) => set({ showGrid: v }), })); diff --git a/apps/client/src/sdk/store/movement.ts b/apps/client/src/sdk/store/movement.ts index 0918f56..79f66f0 100644 --- a/apps/client/src/sdk/store/movement.ts +++ b/apps/client/src/sdk/store/movement.ts @@ -1,29 +1,263 @@ import { create } from "zustand"; +import { TILE_SIZE_PX } from "@/sdk/constants"; +import { getMoveBridge } from "@/sdk/movement/bridge"; +import type { MoveDir, MoveResult, WalkAnim } from "../types/movement"; +import type { Position } from "../types/position"; -export type Position = { x: number; y: number; z: number }; +const WALK_DURATION_MS = 20; // tempo do walk tile-to-tile +const ROLLBACK_DURATION_MS = 90; // tempo do “snap back” suave +const QUEUE_MAX = 2; // OTClient-like (buffer pequeno) -export type WalkAnim = { +function uuid() { + return ( + globalThis.crypto?.randomUUID?.() ?? + `req_${Math.random().toString(16).slice(2)}` + ); +} + +function applyDir(from: Position, dir: MoveDir): Position { + if (dir === "N") return { ...from, y: from.y - 1 }; + if (dir === "S") return { ...from, y: from.y + 1 }; + if (dir === "W") return { ...from, x: from.x - 1 }; + return { ...from, x: from.x + 1 }; +} + +function sameTile(a: Position, b: Position) { + return a.x === b.x && a.y === b.y && a.z === b.z; +} + +type Pending = { from: Position; - to: Position; + expectedTo: Position; + dir: MoveDir; +}; + +type RollbackAnim = { startMs: number; durationMs: number; + fromCamX: number; + fromCamY: number; }; -type State = { +type MovementState = { playerTile: Position; + + // câmera em px “lógico” (antes do scale) + cameraPx: { x: number; y: number }; + + // animação atual (map scroll) walkAnim: WalkAnim | null; - // esses 2 são chamados pelo handler do evento do Rust: - startWalkAnim: (from: Position, to: Position, durationMs: number) => void; - commitPlayerTile: (to: Position) => void; + // rollback suave (quando server nega) + rollbackAnim: RollbackAnim | null; + + // input buffer + queue: MoveDir[]; + + // tracking de requests + pendingByReq: Record; + + enqueueMove: (dir: MoveDir) => void; + tick: (nowMs: number) => void; + + onServerMoveResult: (res: MoveResult, nowMs: number) => void; + + setPlayerTile: (t: Position) => void; }; -export const useMovementStore = create((set) => ({ +export const useMovementStore = create((set, get) => ({ playerTile: { x: 50, y: 50, z: 0 }, + + cameraPx: { x: 0, y: 0 }, + walkAnim: null, + rollbackAnim: null, + + queue: [], + pendingByReq: {}, + + setPlayerTile: (t) => set({ playerTile: t }), + + enqueueMove: (dir) => { + const s = get(); + + // se está em rollback, só bufferiza + if (s.rollbackAnim) { + if (s.queue.length < QUEUE_MAX) set({ queue: [...s.queue, dir] }); + return; + } + + // se já está andando, bufferiza + if (s.walkAnim) { + if (s.queue.length >= QUEUE_MAX) return; + set({ queue: [...s.queue, dir] }); + return; + } + + // se está idle, começa já + startMove(dir); + }, + + tick: (nowMs) => { + const s = get(); + + // 1) rollback suave tem prioridade + if (s.rollbackAnim) { + const r = s.rollbackAnim; + const t = Math.max(0, Math.min(1, (nowMs - r.startMs) / r.durationMs)); + + // interp linear até 0 + const camX = r.fromCamX * (1 - t); + const camY = r.fromCamY * (1 - t); - startWalkAnim: (from, to, durationMs) => - set({ walkAnim: { from, to, startMs: performance.now(), durationMs } }), + set({ cameraPx: { x: camX, y: camY } }); - commitPlayerTile: (to) => set({ playerTile: to, walkAnim: null }), + if (t >= 1) { + set({ rollbackAnim: null, cameraPx: { x: 0, y: 0 } }); + + // terminou rollback: se tiver fila, começa o próximo já + const after = get(); + if (!after.walkAnim && after.queue.length > 0) { + const [dir, ...rest] = after.queue; + set({ queue: rest }); + startMove(dir); + } + } + return; + } + + // 2) walk normal + if (s.walkAnim) { + const anim = s.walkAnim; + const t = Math.max( + 0, + Math.min(1, (nowMs - anim.startMs) / anim.durationMs), + ); + + const dx = anim.to.x - anim.from.x; + const dy = anim.to.y - anim.from.y; + + // scroll oposto do movimento (OTClient) + const camX = -dx * TILE_SIZE_PX * t; + const camY = -dy * TILE_SIZE_PX * t; + + set({ cameraPx: { x: camX, y: camY } }); + + if (t >= 1) { + // commit do tile no fim + set({ playerTile: anim.to, walkAnim: null, cameraPx: { x: 0, y: 0 } }); + + // start next from queue imediatamente + const after = get(); + if (after.queue.length > 0) { + const [dir, ...rest] = after.queue; + set({ queue: rest }); + startMove(dir); + } + } + return; + } + + // 3) idle + if (s.cameraPx.x !== 0 || s.cameraPx.y !== 0) { + set({ cameraPx: { x: 0, y: 0 } }); + } + + // se idle e tem fila (caso raro), start + if (s.queue.length > 0) { + const [dir, ...rest] = s.queue; + set({ queue: rest }); + startMove(dir); + } + }, + + onServerMoveResult: (res, nowMs) => { + const s = get(); + const pending = s.pendingByReq[res.reqId]; + if (!pending) return; + + // remove pending + const nextPending = { ...s.pendingByReq }; + delete nextPending[res.reqId]; + + // caso: server negou -> rollback suave + cancela walk + if (!res.ok) { + const fromCam = s.cameraPx; + + set({ + pendingByReq: nextPending, + + // cancela walk e limpa buffer (opcional, OTClient costuma limpar) + walkAnim: null, + queue: [], + + // volta pro tile autoritativo (geralmente pending.from) + playerTile: res.position, + + // inicia rollback anim da câmera atual até 0 + rollbackAnim: { + startMs: nowMs, + durationMs: ROLLBACK_DURATION_MS, + fromCamX: fromCam.x, + fromCamY: fromCam.y, + }, + }); + + return; + } + + // server ok: se posição autoritativa diferente da esperada -> correction + // (em protótipo: snap tile + zera câmera; é o mais seguro) + if (!sameTile(res.position, pending.expectedTo)) { + set({ + pendingByReq: nextPending, + walkAnim: null, + queue: [], + playerTile: res.position, + cameraPx: { x: 0, y: 0 }, + rollbackAnim: null, + }); + return; + } + + // ok e bateu: só confirma pending, animação segue normal + set({ pendingByReq: nextPending }); + }, })); + +function startMove(dir: MoveDir) { + const nowMs = performance.now(); + const s = useMovementStore.getState(); + + const from = s.playerTile; + const to = applyDir(from, dir); + const reqId = uuid(); + + useMovementStore.setState({ + walkAnim: { + reqId, + from, + to, + startMs: nowMs, + durationMs: WALK_DURATION_MS, + }, + pendingByReq: { + ...s.pendingByReq, + [reqId]: { from, expectedTo: to, dir }, + }, + }); + + getMoveBridge() + .sendMove({ reqId, from, dir }) + .then((res) => + useMovementStore.getState().onServerMoveResult(res, performance.now()), + ) + .catch(() => { + useMovementStore + .getState() + .onServerMoveResult( + { reqId, ok: false, position: from, reason: "bridge_error" }, + performance.now(), + ); + }); +} diff --git a/apps/client/src/sdk/store/performance.ts b/apps/client/src/sdk/store/performance.ts new file mode 100644 index 0000000..eea6427 --- /dev/null +++ b/apps/client/src/sdk/store/performance.ts @@ -0,0 +1,130 @@ +import { create } from "zustand"; + +type PixiPerf = { + fps: number; + frameMs: number; + screenW: number; + screenH: number; + resolution: number; +}; + +type ReactPerf = { + lastCommitMs: number; + avgCommitMs: number; + commitsPerSec: number; +}; + +type WorldPerf = { + worldAvgMs: number; + worldMaxMs: number; + + groundAvgMs: number; + groundMaxMs: number; + + creaturesAvgMs: number; + creaturesMaxMs: number; + + overlayAvgMs: number; + overlayMaxMs: number; + + debugAvgMs: number; + debugMaxMs: number; +}; + +type Counters = { + groundSprites: number; + creaturesTotal: number; + creaturesVisible: number; + tilesInCache: number; + + // opcional + viewDirty: boolean; + tilesDirty: boolean; + creaturesDirty: boolean; +}; + +type PerfState = { + enabled: boolean; + toggle: () => void; + setEnabled: (v: boolean) => void; + + pixi: PixiPerf; + setPixi: (p: Partial) => void; + + react: ReactPerf; + pushReactCommit: (durationMs: number, commitTimeMs: number) => void; + + world: WorldPerf; + setWorld: (p: Partial) => void; + + counts: Counters; + setCounts: (p: Partial) => void; +}; + +export const usePerfStore = create((set) => { + const reactTimes: number[] = []; + const reactDurations: number[] = []; + + function recomputeReact(commitTimeMs: number) { + while (reactTimes.length && commitTimeMs - reactTimes[0] > 1000) { + reactTimes.shift(); + } + const commitsPerSec = reactTimes.length; + + const slice = reactDurations.slice(-30); + const avg = + slice.length === 0 ? 0 : slice.reduce((a, b) => a + b, 0) / slice.length; + + return { commitsPerSec, avgCommitMs: avg }; + } + + return { + enabled: true, + toggle: () => set((s) => ({ enabled: !s.enabled })), + setEnabled: (v) => set({ enabled: v }), + + pixi: { fps: 0, frameMs: 0, screenW: 0, screenH: 0, resolution: 1 }, + setPixi: (p) => set((s) => ({ pixi: { ...s.pixi, ...p } })), + + react: { lastCommitMs: 0, avgCommitMs: 0, commitsPerSec: 0 }, + pushReactCommit: (durationMs, commitTimeMs) => { + reactTimes.push(commitTimeMs); + reactDurations.push(durationMs); + const next = recomputeReact(commitTimeMs); + + set((s) => ({ + react: { + ...s.react, + lastCommitMs: durationMs, + avgCommitMs: next.avgCommitMs, + commitsPerSec: next.commitsPerSec, + }, + })); + }, + + world: { + worldAvgMs: 0, + worldMaxMs: 0, + groundAvgMs: 0, + groundMaxMs: 0, + creaturesAvgMs: 0, + creaturesMaxMs: 0, + overlayAvgMs: 0, + overlayMaxMs: 0, + debugAvgMs: 0, + debugMaxMs: 0, + }, + setWorld: (p) => set((s) => ({ world: { ...s.world, ...p } })), + + counts: { + groundSprites: 0, + creaturesTotal: 0, + creaturesVisible: 0, + tilesInCache: 0, + viewDirty: false, + tilesDirty: false, + creaturesDirty: false, + }, + setCounts: (p) => set((s) => ({ counts: { ...s.counts, ...p } })), + }; +}); diff --git a/apps/client/src/sdk/types/movement.ts b/apps/client/src/sdk/types/movement.ts new file mode 100644 index 0000000..f509f40 --- /dev/null +++ b/apps/client/src/sdk/types/movement.ts @@ -0,0 +1,24 @@ +import type { Position } from "./position"; + +export type MoveDir = "N" | "S" | "W" | "E"; + +export type MoveCommand = { + reqId: string; + from: Position; + dir: MoveDir; +}; + +export type MoveResult = { + reqId: string; + ok: boolean; + position: Position; // posição autoritativa do "server" + reason?: string; +}; + +export type WalkAnim = { + reqId: string; + from: Position; + to: Position; + startMs: number; + durationMs: number; +}; From edaea0593e9b2b9df7e0ac1d606026626e84fcbb Mon Sep 17 00:00:00 2001 From: Guilherme Fontes Date: Thu, 25 Dec 2025 13:52:11 -0400 Subject: [PATCH 11/18] feat: add first iteration of move using rust --- .vscode/settings.json | 7 +- Cargo.lock | 220 ++++++-- Cargo.toml | 5 + apps/client/src-tauri/Cargo.lock | 500 ++++++++++++------- apps/client/src-tauri/Cargo.toml | 7 +- apps/client/src-tauri/src/game/commands.rs | 61 +++ apps/client/src-tauri/src/game/events.rs | 1 + apps/client/src-tauri/src/game/mod.rs | 26 + apps/client/src-tauri/src/game/types.rs | 61 +++ apps/client/src-tauri/src/game/worker.rs | 169 +++++++ apps/client/src-tauri/src/lib.rs | 85 +--- apps/client/src/pages/game/index.tsx | 73 ++- apps/client/src/sdk/game/events.ts | 9 + apps/client/src/sdk/movement/bridge.tauri.ts | 61 +++ 14 files changed, 982 insertions(+), 303 deletions(-) create mode 100644 apps/client/src-tauri/src/game/commands.rs create mode 100644 apps/client/src-tauri/src/game/events.rs create mode 100644 apps/client/src-tauri/src/game/mod.rs create mode 100644 apps/client/src-tauri/src/game/types.rs create mode 100644 apps/client/src-tauri/src/game/worker.rs create mode 100644 apps/client/src/sdk/game/events.ts create mode 100644 apps/client/src/sdk/movement/bridge.tauri.ts diff --git a/.vscode/settings.json b/.vscode/settings.json index 8a6d71e..0d21214 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -156,6 +156,7 @@ "ownerid", "permissioned", "Permissioned", + "pkcs", "playdata", "poppins", "posx", @@ -168,12 +169,14 @@ "quickloot", "quintenary", "raceid", + "recv", "remainingdailytournamentplaytime", "Repliable", "requirepass", "restrictedstore", "retrohardcore", "returnernotification", + "rngs", "roboto", "safelist", "serverinfo", @@ -200,6 +203,7 @@ "tsqp", "tsyringe", "undelete", + "unlisten", "unserialize", "unsubs", "usecase", @@ -215,6 +219,7 @@ "warid", "wheeldata", "worldid", - "xpboost" + "xpboost", + "xtea" ], } \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 5b16134..5ab4292 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -225,6 +225,12 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64ct" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e050f626429857a27ddccb31e0aca21356bfa709c04041aefddac081a8f068a" + [[package]] name = "bitflags" version = "1.3.2" @@ -466,6 +472,12 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "convert_case" version = "0.4.0" @@ -637,6 +649,17 @@ dependencies = [ "syn 2.0.111", ] +[[package]] +name = "der" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + [[package]] name = "deranged" version = "0.5.5" @@ -667,6 +690,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", + "const-oid", "crypto-common", ] @@ -1802,6 +1826,9 @@ name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin", +] [[package]] name = "libappindicator" @@ -1843,6 +1870,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "libm" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" + [[package]] name = "libredox" version = "0.1.11" @@ -1936,7 +1969,12 @@ dependencies = [ name = "miclient" version = "0.1.0" dependencies = [ - "rand 0.9.2", + "anyhow", + "hex", + "num-bigint", + "rand 0.8.5", + "rand_core 0.6.4", + "rsa", "serde", "serde_json", "tauri", @@ -2048,12 +2086,58 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7" +dependencies = [ + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.5", + "smallvec", + "zeroize", +] + [[package]] name = "num-conv" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -2061,6 +2145,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -2391,6 +2476,15 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.3.2" @@ -2554,6 +2648,27 @@ dependencies = [ "futures-io", ] +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + [[package]] name = "pkg-config" version = "0.3.32" @@ -2747,16 +2862,6 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "rand" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" -dependencies = [ - "rand_chacha 0.9.0", - "rand_core 0.9.3", -] - [[package]] name = "rand_chacha" version = "0.2.2" @@ -2777,16 +2882,6 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "rand_chacha" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" -dependencies = [ - "ppv-lite86", - "rand_core 0.9.3", -] - [[package]] name = "rand_core" version = "0.5.1" @@ -2805,15 +2900,6 @@ dependencies = [ "getrandom 0.2.16", ] -[[package]] -name = "rand_core" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" -dependencies = [ - "getrandom 0.3.4", -] - [[package]] name = "rand_hc" version = "0.2.0" @@ -2942,6 +3028,26 @@ dependencies = [ "web-sys", ] +[[package]] +name = "rsa" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40a0376c50d0358279d9d643e4bf7b7be212f1f4ff1da9070a7b54d22ef75c88" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core 0.6.4", + "signature", + "spki", + "subtle", + "zeroize", +] + [[package]] name = "rustc_version" version = "0.4.1" @@ -3125,15 +3231,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.146" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "217ca874ae0207aac254aa02c957ded05585a90892cc8d87f9e5fa49669dadd8" +checksum = "6af14725505314343e673e9ecb7cd7e8a36aa9791eb936235a3567cc31447ae4" dependencies = [ "itoa", "memchr", - "ryu", "serde", "serde_core", + "zmij", ] [[package]] @@ -3266,6 +3372,16 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core 0.6.4", +] + [[package]] name = "simd-adler32" version = "0.3.8" @@ -3354,6 +3470,22 @@ dependencies = [ "system-deps", ] +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + [[package]] name = "stable_deref_trait" version = "1.2.1" @@ -3397,6 +3529,12 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + [[package]] name = "swift-rs" version = "1.0.7" @@ -3776,9 +3914,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.23.0" +version = "3.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" +checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c" dependencies = [ "fastrand", "getrandom 0.3.4", @@ -5133,6 +5271,12 @@ dependencies = [ "synstructure", ] +[[package]] +name = "zeroize" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" + [[package]] name = "zerotrie" version = "0.2.3" @@ -5166,6 +5310,12 @@ dependencies = [ "syn 2.0.111", ] +[[package]] +name = "zmij" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1dccf46b25b205e4bebe1d5258a991df1cc17801017a845cb5b3fe0269781aa" + [[package]] name = "zvariant" version = "5.8.0" diff --git a/Cargo.toml b/Cargo.toml index 12d5ef4..aa4e0fb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,9 @@ [workspace] resolver = "2" + members = ["apps/client/src-tauri"] + +[workspace.dependencies] +rand = "0.8" +rand_core = "0.6" diff --git a/apps/client/src-tauri/Cargo.lock b/apps/client/src-tauri/Cargo.lock index 78ffbf2..0337146 100644 --- a/apps/client/src-tauri/Cargo.lock +++ b/apps/client/src-tauri/Cargo.lock @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.4.1" +version = "3.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc" +checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311" dependencies = [ "event-listener", "event-listener-strategy", @@ -225,6 +225,12 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64ct" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e050f626429857a27ddccb31e0aca21356bfa709c04041aefddac081a8f068a" + [[package]] name = "bitflags" version = "1.3.2" @@ -249,22 +255,13 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block2" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" -dependencies = [ - "objc2 0.5.2", -] - [[package]] name = "block2" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" dependencies = [ - "objc2 0.6.3", + "objc2", ] [[package]] @@ -303,9 +300,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.19.0" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" +checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" [[package]] name = "bytemuck" @@ -355,9 +352,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609" +checksum = "e629a66d692cb9ff1a1c664e41771b3dcaf961985a9774c0eb0bd1b51cf60a48" dependencies = [ "serde_core", ] @@ -392,14 +389,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77" dependencies = [ "serde", - "toml 0.9.8", + "toml 0.9.10+spec-1.1.0", ] [[package]] name = "cc" -version = "1.2.48" +version = "1.2.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c481bdbf0ed3b892f6f806287d72acd515b352a4ec27a208489b8c1bc839633a" +checksum = "9f50d563227a1c37cc0a263f64eca3334388c01c5e4c4861a9def205c614383c" dependencies = [ "find-msvc-tools", "shlex", @@ -475,6 +472,12 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "convert_case" version = "0.4.0" @@ -646,6 +649,17 @@ dependencies = [ "syn 2.0.111", ] +[[package]] +name = "der" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + [[package]] name = "deranged" version = "0.5.5" @@ -676,6 +690,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", + "const-oid", "crypto-common", ] @@ -713,7 +728,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec" dependencies = [ "bitflags 2.10.0", - "objc2 0.6.3", + "objc2", ] [[package]] @@ -729,9 +744,9 @@ dependencies = [ [[package]] name = "dlopen2" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d65cde5fb0c42a3d5882d99807698b459f5928de035fa7f547c784fb7b34219" +checksum = "5e2c5bd4158e66d1e215c49b837e11d62f3267b30c92f1d171c4d3105e3dc4d4" dependencies = [ "dlopen2_derive", "libc", @@ -741,9 +756,9 @@ dependencies = [ [[package]] name = "dlopen2_derive" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95f4a04e1bfbfa4835a6073177aafb95ead4de0722dbb339195fdc7e0a09599b" +checksum = "0fbbb781877580993a8707ec48672673ec7b81eeba04cfd2310bd28c08e47c8f" dependencies = [ "proc-macro2", "quote", @@ -795,7 +810,7 @@ dependencies = [ "cc", "memchr", "rustc_version", - "toml 0.9.8", + "toml 0.9.10+spec-1.1.0", "vswhom", "winreg", ] @@ -1469,9 +1484,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e9a2a24dc5c6821e71a7030e1e14b7b632acac55c40e9d2e082c621261bb56" +checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" dependencies = [ "base64 0.22.1", "bytes", @@ -1573,9 +1588,9 @@ checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" +checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" dependencies = [ "icu_collections", "icu_locale_core", @@ -1587,9 +1602,9 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" +checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" [[package]] name = "icu_provider" @@ -1702,9 +1717,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "7ee5b5339afb4c41626dde77b7a611bd4f2c202b897852b4bcf5d03eddc61010" [[package]] name = "javascriptcore-rs" @@ -1811,6 +1826,9 @@ name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin", +] [[package]] name = "libappindicator" @@ -1852,11 +1870,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "libm" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" + [[package]] name = "libredox" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" +checksum = "df15f6eac291ed1cf25865b1ee60399f57e7c227e7f51bdbd4c5270396a9ed50" dependencies = [ "bitflags 2.10.0", "libc", @@ -1885,9 +1909,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "mac" @@ -1945,11 +1969,16 @@ dependencies = [ name = "miclient" version = "0.1.0" dependencies = [ + "anyhow", + "rand 0.8.5", + "rand_core 0.6.4", + "rsa", "serde", "serde_json", "tauri", "tauri-build", "tauri-plugin-opener", + "tokio", ] [[package]] @@ -1970,9 +1999,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" +checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" dependencies = [ "libc", "wasi 0.11.1+wasi-snapshot-preview1", @@ -1989,10 +2018,10 @@ dependencies = [ "dpi", "gtk", "keyboard-types", - "objc2 0.6.3", + "objc2", "objc2-app-kit", "objc2-core-foundation", - "objc2-foundation 0.3.2", + "objc2-foundation", "once_cell", "png", "serde", @@ -2055,12 +2084,48 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" +[[package]] +name = "num-bigint-dig" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7" +dependencies = [ + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.5", + "smallvec", + "zeroize", +] + [[package]] name = "num-conv" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -2068,6 +2133,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -2092,22 +2158,6 @@ dependencies = [ "syn 2.0.111", ] -[[package]] -name = "objc-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" - -[[package]] -name = "objc2" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" -dependencies = [ - "objc-sys", - "objc2-encode", -] - [[package]] name = "objc2" version = "0.6.3" @@ -2125,9 +2175,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" dependencies = [ "bitflags 2.10.0", - "block2 0.6.2", + "block2", "libc", - "objc2 0.6.3", + "objc2", "objc2-cloud-kit", "objc2-core-data", "objc2-core-foundation", @@ -2135,8 +2185,8 @@ dependencies = [ "objc2-core-image", "objc2-core-text", "objc2-core-video", - "objc2-foundation 0.3.2", - "objc2-quartz-core 0.3.2", + "objc2-foundation", + "objc2-quartz-core", ] [[package]] @@ -2146,8 +2196,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c" dependencies = [ "bitflags 2.10.0", - "objc2 0.6.3", - "objc2-foundation 0.3.2", + "objc2", + "objc2-foundation", ] [[package]] @@ -2157,8 +2207,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa" dependencies = [ "bitflags 2.10.0", - "objc2 0.6.3", - "objc2-foundation 0.3.2", + "objc2", + "objc2-foundation", ] [[package]] @@ -2169,7 +2219,7 @@ checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ "bitflags 2.10.0", "dispatch2", - "objc2 0.6.3", + "objc2", ] [[package]] @@ -2180,7 +2230,7 @@ checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" dependencies = [ "bitflags 2.10.0", "dispatch2", - "objc2 0.6.3", + "objc2", "objc2-core-foundation", "objc2-io-surface", ] @@ -2191,8 +2241,8 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006" dependencies = [ - "objc2 0.6.3", - "objc2-foundation 0.3.2", + "objc2", + "objc2-foundation", ] [[package]] @@ -2202,7 +2252,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d" dependencies = [ "bitflags 2.10.0", - "objc2 0.6.3", + "objc2", "objc2-core-foundation", "objc2-core-graphics", ] @@ -2214,7 +2264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6" dependencies = [ "bitflags 2.10.0", - "objc2 0.6.3", + "objc2", "objc2-core-foundation", "objc2-core-graphics", "objc2-io-surface", @@ -2235,18 +2285,6 @@ dependencies = [ "cc", ] -[[package]] -name = "objc2-foundation" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" -dependencies = [ - "bitflags 2.10.0", - "block2 0.5.1", - "libc", - "objc2 0.5.2", -] - [[package]] name = "objc2-foundation" version = "0.3.2" @@ -2254,9 +2292,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" dependencies = [ "bitflags 2.10.0", - "block2 0.6.2", + "block2", "libc", - "objc2 0.6.3", + "objc2", "objc2-core-foundation", ] @@ -2267,7 +2305,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d" dependencies = [ "bitflags 2.10.0", - "objc2 0.6.3", + "objc2", "objc2-core-foundation", ] @@ -2277,35 +2315,10 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a1e6550c4caed348956ce3370c9ffeca70bb1dbed4fa96112e7c6170e074586" dependencies = [ - "objc2 0.6.3", + "objc2", "objc2-core-foundation", ] -[[package]] -name = "objc2-metal" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" -dependencies = [ - "bitflags 2.10.0", - "block2 0.5.1", - "objc2 0.5.2", - "objc2-foundation 0.2.2", -] - -[[package]] -name = "objc2-quartz-core" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" -dependencies = [ - "bitflags 2.10.0", - "block2 0.5.1", - "objc2 0.5.2", - "objc2-foundation 0.2.2", - "objc2-metal", -] - [[package]] name = "objc2-quartz-core" version = "0.3.2" @@ -2313,8 +2326,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f" dependencies = [ "bitflags 2.10.0", - "objc2 0.6.3", - "objc2-foundation 0.3.2", + "objc2", + "objc2-core-foundation", + "objc2-foundation", ] [[package]] @@ -2324,7 +2338,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "709fe137109bd1e8b5a99390f77a7d8b2961dafc1a1c5db8f2e60329ad6d895a" dependencies = [ "bitflags 2.10.0", - "objc2 0.6.3", + "objc2", "objc2-core-foundation", ] @@ -2335,9 +2349,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22" dependencies = [ "bitflags 2.10.0", - "objc2 0.6.3", + "objc2", "objc2-core-foundation", - "objc2-foundation 0.3.2", + "objc2-foundation", ] [[package]] @@ -2347,11 +2361,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f" dependencies = [ "bitflags 2.10.0", - "block2 0.6.2", - "objc2 0.6.3", + "block2", + "objc2", "objc2-app-kit", "objc2-core-foundation", - "objc2-foundation 0.3.2", + "objc2-foundation", "objc2-javascript-core", "objc2-security", ] @@ -2450,6 +2464,15 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.3.2" @@ -2613,6 +2636,27 @@ dependencies = [ "futures-io", ] +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + [[package]] name = "pkg-config" version = "0.3.32" @@ -2715,7 +2759,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" dependencies = [ - "toml_edit 0.23.7", + "toml_edit 0.23.10+spec-1.0.0", ] [[package]] @@ -2939,9 +2983,9 @@ checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "reqwest" -version = "0.12.24" +version = "0.12.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" +checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ "base64 0.22.1", "bytes", @@ -2972,6 +3016,26 @@ dependencies = [ "web-sys", ] +[[package]] +name = "rsa" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40a0376c50d0358279d9d643e4bf7b7be212f1f4ff1da9070a7b54d22ef75c88" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core 0.6.4", + "signature", + "spki", + "subtle", + "zeroize", +] + [[package]] name = "rustc_version" version = "0.4.1" @@ -2983,9 +3047,9 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" +checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" dependencies = [ "bitflags 2.10.0", "errno", @@ -3002,9 +3066,9 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +checksum = "62049b2877bf12821e8f9ad256ee38fdc31db7387ec2d3b3f403024de2034aea" [[package]] name = "same-file" @@ -3155,15 +3219,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.145" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +checksum = "6af14725505314343e673e9ecb7cd7e8a36aa9791eb936235a3567cc31447ae4" dependencies = [ "itoa", "memchr", - "ryu", "serde", "serde_core", + "zmij", ] [[package]] @@ -3188,9 +3252,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392" +checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" dependencies = [ "serde_core", ] @@ -3296,11 +3360,21 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core 0.6.4", +] + [[package]] name = "simd-adler32" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" [[package]] name = "siphasher" @@ -3338,24 +3412,24 @@ dependencies = [ [[package]] name = "softbuffer" -version = "0.4.6" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18051cdd562e792cad055119e0cdb2cfc137e44e3987532e0f9659a77931bb08" +checksum = "aac18da81ebbf05109ab275b157c22a653bb3c12cf884450179942f81bcbf6c3" dependencies = [ "bytemuck", - "cfg_aliases", - "core-graphics", - "foreign-types", "js-sys", - "log", - "objc2 0.5.2", - "objc2-foundation 0.2.2", - "objc2-quartz-core 0.2.2", + "ndk", + "objc2", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-foundation", + "objc2-quartz-core", "raw-window-handle", "redox_syscall", + "tracing", "wasm-bindgen", "web-sys", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -3384,6 +3458,22 @@ dependencies = [ "system-deps", ] +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + [[package]] name = "stable_deref_trait" version = "1.2.1" @@ -3427,6 +3517,12 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + [[package]] name = "swift-rs" version = "1.0.7" @@ -3500,7 +3596,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3a753bdc39c07b192151523a3f77cd0394aa75413802c883a0f6f6a0e5ee2e7" dependencies = [ "bitflags 2.10.0", - "block2 0.6.2", + "block2", "core-foundation", "core-graphics", "crossbeam-channel", @@ -3517,9 +3613,9 @@ dependencies = [ "ndk", "ndk-context", "ndk-sys", - "objc2 0.6.3", + "objc2", "objc2-app-kit", - "objc2-foundation 0.3.2", + "objc2-foundation", "once_cell", "parking_lot", "raw-window-handle", @@ -3552,9 +3648,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.9.4" +version = "2.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15524fc7959bfcaa051ba6d0b3fb1ef18e978de2176c7c6acb977f7fd14d35c7" +checksum = "8a3868da5508446a7cd08956d523ac3edf0a8bc20bf7e4038f9a95c2800d2033" dependencies = [ "anyhow", "bytes", @@ -3572,9 +3668,9 @@ dependencies = [ "log", "mime", "muda", - "objc2 0.6.3", + "objc2", "objc2-app-kit", - "objc2-foundation 0.3.2", + "objc2-foundation", "objc2-ui-kit", "objc2-web-kit", "percent-encoding", @@ -3619,7 +3715,7 @@ dependencies = [ "serde_json", "tauri-utils", "tauri-winres", - "toml 0.9.8", + "toml 0.9.10+spec-1.1.0", "walkdir", ] @@ -3677,7 +3773,7 @@ dependencies = [ "serde", "serde_json", "tauri-utils", - "toml 0.9.8", + "toml 0.9.10+spec-1.1.0", "walkdir", ] @@ -3690,7 +3786,7 @@ dependencies = [ "dunce", "glob", "objc2-app-kit", - "objc2-foundation 0.3.2", + "objc2-foundation", "open", "schemars 0.8.22", "serde", @@ -3714,7 +3810,7 @@ dependencies = [ "gtk", "http", "jni", - "objc2 0.6.3", + "objc2", "objc2-ui-kit", "objc2-web-kit", "raw-window-handle", @@ -3730,17 +3826,17 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.9.2" +version = "2.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7950f3bde6bcca6655bc5e76d3d6ec587ceb81032851ab4ddbe1f508bdea2729" +checksum = "187a3f26f681bdf028f796ccf57cf478c1ee422c50128e5a0a6ebeb3f5910065" dependencies = [ "gtk", "http", "jni", "log", - "objc2 0.6.3", + "objc2", "objc2-app-kit", - "objc2-foundation 0.3.2", + "objc2-foundation", "once_cell", "percent-encoding", "raw-window-handle", @@ -3786,7 +3882,7 @@ dependencies = [ "serde_with", "swift-rs", "thiserror 2.0.17", - "toml 0.9.8", + "toml 0.9.10+spec-1.1.0", "url", "urlpattern", "uuid", @@ -3801,14 +3897,14 @@ checksum = "1087b111fe2b005e42dbdc1990fc18593234238d47453b0c99b7de1c9ab2c1e0" dependencies = [ "dunce", "embed-resource", - "toml 0.9.8", + "toml 0.9.10+spec-1.1.0", ] [[package]] name = "tempfile" -version = "3.23.0" +version = "3.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" +checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c" dependencies = [ "fastrand", "getrandom 0.3.4", @@ -3918,11 +4014,25 @@ dependencies = [ "bytes", "libc", "mio", + "parking_lot", "pin-project-lite", + "signal-hook-registry", "socket2", + "tokio-macros", "windows-sys 0.61.2", ] +[[package]] +name = "tokio-macros" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + [[package]] name = "tokio-util" version = "0.7.17" @@ -3950,14 +4060,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.8" +version = "0.9.10+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8" +checksum = "0825052159284a1a8b4d6c0c86cbc801f2da5afd2b225fa548c72f2e74002f48" dependencies = [ "indexmap 2.12.1", "serde_core", - "serde_spanned 1.0.3", - "toml_datetime 0.7.3", + "serde_spanned 1.0.4", + "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", "toml_writer", "winnow 0.7.14", @@ -3974,9 +4084,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.7.3" +version = "0.7.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533" +checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" dependencies = [ "serde_core", ] @@ -4007,30 +4117,30 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.23.7" +version = "0.23.10+spec-1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d" +checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" dependencies = [ "indexmap 2.12.1", - "toml_datetime 0.7.3", + "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", "winnow 0.7.14", ] [[package]] name = "toml_parser" -version = "1.0.4" +version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e" +checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" dependencies = [ "winnow 0.7.14", ] [[package]] name = "toml_writer" -version = "1.0.4" +version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2" +checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607" [[package]] name = "tower" @@ -4049,9 +4159,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf146f99d442e8e68e585f5d798ccd3cad9a7835b917e09728880a862706456" +checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ "bitflags 2.10.0", "bytes", @@ -4079,9 +4189,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ "pin-project-lite", "tracing-attributes", @@ -4101,9 +4211,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.35" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", ] @@ -4118,11 +4228,11 @@ dependencies = [ "dirs", "libappindicator", "muda", - "objc2 0.6.3", + "objc2", "objc2-app-kit", "objc2-core-foundation", "objc2-core-graphics", - "objc2-foundation 0.3.2", + "objc2-foundation", "once_cell", "png", "serde", @@ -4530,10 +4640,10 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c" dependencies = [ - "objc2 0.6.3", + "objc2", "objc2-app-kit", "objc2-core-foundation", - "objc2-foundation 0.3.2", + "objc2-foundation", "raw-window-handle", "windows-sys 0.59.0", "windows-version", @@ -4965,7 +5075,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "728b7d4c8ec8d81cab295e0b5b8a4c263c0d41a785fb8f8c4df284e5411140a2" dependencies = [ "base64 0.22.1", - "block2 0.6.2", + "block2", "cookie", "crossbeam-channel", "dirs", @@ -4980,10 +5090,10 @@ dependencies = [ "kuchikiki", "libc", "ndk", - "objc2 0.6.3", + "objc2", "objc2-app-kit", "objc2-core-foundation", - "objc2-foundation 0.3.2", + "objc2-foundation", "objc2-ui-kit", "objc2-web-kit", "once_cell", @@ -5149,6 +5259,12 @@ dependencies = [ "synstructure", ] +[[package]] +name = "zeroize" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" + [[package]] name = "zerotrie" version = "0.2.3" @@ -5182,6 +5298,12 @@ dependencies = [ "syn 2.0.111", ] +[[package]] +name = "zmij" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1dccf46b25b205e4bebe1d5258a991df1cc17801017a845cb5b3fe0269781aa" + [[package]] name = "zvariant" version = "5.8.0" diff --git a/apps/client/src-tauri/Cargo.toml b/apps/client/src-tauri/Cargo.toml index 72cc9a8..2b0134b 100644 --- a/apps/client/src-tauri/Cargo.toml +++ b/apps/client/src-tauri/Cargo.toml @@ -22,5 +22,10 @@ tauri = { version = "2", features = [] } tauri-plugin-opener = "2" serde = { version = "1", features = ["derive"] } serde_json = "1" -rand = "0.9.2" +rand = { workspace = true } +rand_core = { workspace = true } tokio = { version = "1.48.0", features = ["full"] } +anyhow = "1.0.100" +rsa = "0.9" +num-bigint = "0.4" +hex = "0.4.3" diff --git a/apps/client/src-tauri/src/game/commands.rs b/apps/client/src-tauri/src/game/commands.rs new file mode 100644 index 0000000..bd95bc5 --- /dev/null +++ b/apps/client/src-tauri/src/game/commands.rs @@ -0,0 +1,61 @@ +use tauri::{AppHandle, State}; +use tokio::sync::mpsc; + +use crate::game::{ + mod_state::{GameHandle, GameState}, + types::UiCommand, + worker::{run_worker, WorkerCommand}, +}; + +#[tauri::command] +pub async fn game_connect( + app: AppHandle, + state: State<'_, GameState>, + ip: String, + port: u16, + session_key: String, + character_name: String, +) -> Result<(), String> { + let mut guard = state.handle.lock().await; + + if guard.is_some() { + return Err("already connected".into()); + } + + let (tx, rx) = mpsc::channel::(256); + + tokio::spawn(async move { + if let Err(e) = run_worker(app, ip, port, session_key, character_name, rx).await { + eprintln!("worker error: {e:?}") + } + }); + + *guard = Some(GameHandle { tx }); + + Ok(()) +} + +#[tauri::command] +pub async fn game_disconnect(state: State<'_, GameState>) -> Result<(), String> { + let mut guard = state.handle.lock().await; + + if let Some(game_handle) = guard.take() { + let _ = game_handle.tx.send(WorkerCommand::Stop).await; + } + + Ok(()) +} + +#[tauri::command] +pub async fn game_command(state: State<'_, GameState>, command: UiCommand) -> Result<(), String> { + let guard = state.handle.lock().await; + let game_handle = guard.as_ref().ok_or("not connected")?; + + game_handle + .tx + .send(WorkerCommand::Ui(command)) + .await + .map_err(|_| "send failed".to_string())?; + + Ok(()) +} diff --git a/apps/client/src-tauri/src/game/events.rs b/apps/client/src-tauri/src/game/events.rs new file mode 100644 index 0000000..cfd9504 --- /dev/null +++ b/apps/client/src-tauri/src/game/events.rs @@ -0,0 +1 @@ +pub const GAME_EVENT: &str = "game:event"; diff --git a/apps/client/src-tauri/src/game/mod.rs b/apps/client/src-tauri/src/game/mod.rs new file mode 100644 index 0000000..4a657d1 --- /dev/null +++ b/apps/client/src-tauri/src/game/mod.rs @@ -0,0 +1,26 @@ +pub mod commands; +pub mod events; +pub mod types; +pub mod worker; + +pub mod mod_state { + use tokio::sync::{mpsc, Mutex}; + + use crate::game::worker::WorkerCommand; + + pub struct GameState { + pub handle: Mutex>, + } + + pub struct GameHandle { + pub tx: mpsc::Sender, + } + + impl GameState { + pub fn new() -> Self { + Self { + handle: Mutex::new(None), + } + } + } +} diff --git a/apps/client/src-tauri/src/game/types.rs b/apps/client/src-tauri/src/game/types.rs new file mode 100644 index 0000000..7a533f5 --- /dev/null +++ b/apps/client/src-tauri/src/game/types.rs @@ -0,0 +1,61 @@ +use serde::{Deserialize, Serialize}; + +#[derive(Clone, Copy, Debug, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct Position { + pub x: i32, + pub y: i32, + pub z: i32, +} + +#[derive(Clone, Copy, Debug, Serialize, Deserialize)] +pub enum MoveDir { + N, + S, + W, + E, +} + +#[derive(Clone, Debug, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct MoveCommand { + pub req_id: String, + pub from: Position, + pub dir: MoveDir, +} + +#[derive(Clone, Debug, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct MoveResult { + pub req_id: String, + pub ok: bool, + pub position: Position, + #[serde(skip_serializing_if = "Option::is_none")] + pub reason: Option, +} + +#[derive(Debug, Deserialize)] +#[serde(tag = "type", content = "data")] +pub enum UiCommand { + Log { message: String }, + Move(MoveCommand), +} + +#[derive(Clone, Debug, Serialize)] +#[serde(tag = "type", content = "data")] +pub enum GameEvent { + State { + state: String, + }, + Log { + level: String, + message: String, + ts_ms: u128, + }, + Tick { + n: u64, + ts_ms: u128, + }, + MoveResult(MoveResult), + PlayerPosition(Position), +} diff --git a/apps/client/src-tauri/src/game/worker.rs b/apps/client/src-tauri/src/game/worker.rs new file mode 100644 index 0000000..87d0f7a --- /dev/null +++ b/apps/client/src-tauri/src/game/worker.rs @@ -0,0 +1,169 @@ +use std::time::{Duration, SystemTime, UNIX_EPOCH}; + +use tauri::{AppHandle, Emitter}; +use tokio::{sync::mpsc, time::interval}; + +use crate::game::{ + events, + types::{GameEvent, MoveDir, MoveResult, Position, UiCommand}, +}; + +#[derive(Debug)] +pub enum WorkerCommand { + Stop, + Ui(UiCommand), +} + +fn now_ms() -> u128 { + SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap_or_default() + .as_millis() +} + +fn emit(app: &AppHandle, event: GameEvent) { + let _ = app.emit(events::GAME_EVENT, event); +} + +fn apply_dir(from: Position, dir: MoveDir) -> Position { + match dir { + MoveDir::N => Position { + y: from.y - 1, + ..from + }, + MoveDir::S => Position { + y: from.y + 1, + ..from + }, + MoveDir::W => Position { + x: from.x - 1, + ..from + }, + MoveDir::E => Position { + x: from.x + 1, + ..from + }, + } +} + +pub async fn run_worker( + app: AppHandle, + ip: String, + port: u16, + session_key: String, + character_name: String, + mut rx: mpsc::Receiver, +) -> anyhow::Result<()> { + emit( + &app, + GameEvent::State { + state: "connected".into(), + }, + ); + emit( + &app, + GameEvent::Log { + level: "info".into(), + message: format!( + "worker started (ip={ip} port={port} character={character_name} session_key_len={})", + session_key.len() + ), + ts_ms: now_ms(), + }, + ); + + // ✅ estado autoritativo do "server fake" vive aqui + let mut player_pos = Position { + x: 100, + y: 100, + z: 7, + }; + + emit(&app, GameEvent::PlayerPosition(player_pos)); + + // ✅ config fake (deixa fixo aqui também) + let latency_ms: u64 = 30; + let error_rate: f32 = 0.01; // 1% rollback + + let mut tick = interval(Duration::from_secs(1)); + let mut n: u64 = 0; + + loop { + tokio::select! { + _ = tick.tick() => { + n += 1; + emit(&app, GameEvent::Tick { n, ts_ms: now_ms() }); + } + + command = rx.recv() => { + match command { + Some(WorkerCommand::Ui(ui)) => { + handle_ui_command(&app, ui, &mut player_pos, latency_ms, error_rate).await; + } + Some(WorkerCommand::Stop) | None => { + emit(&app, GameEvent::Log { + level: "warn".into(), + message: "worker stopping".into(), + ts_ms: now_ms() + }); + emit(&app, GameEvent::State { state: "disconnected".into() }); + break; + } + } + } + } + } + + Ok(()) +} + +async fn handle_ui_command( + app: &AppHandle, + command: UiCommand, + player_pos: &mut Position, + latency_ms: u64, + error_rate: f32, +) { + match command { + UiCommand::Log { message } => { + emit( + app, + GameEvent::Log { + level: "info".into(), + message: format!("received UiCommand::Log: {message}"), + ts_ms: now_ms(), + }, + ); + } + + UiCommand::Move(move_command) => { + tokio::time::sleep(Duration::from_millis(latency_ms)).await; + + let rolled_back = rand::random::() < error_rate; + + if rolled_back { + emit( + app, + GameEvent::MoveResult(MoveResult { + req_id: move_command.req_id, + ok: false, + position: *player_pos, // manda a posição autoritativa atual + reason: Some("simulated_rollback".into()), + }), + ); + } else { + *player_pos = apply_dir(*player_pos, move_command.dir); + + emit( + app, + GameEvent::MoveResult(MoveResult { + req_id: move_command.req_id, + ok: true, + position: *player_pos, + reason: None, + }), + ); + } + } + } +} diff --git a/apps/client/src-tauri/src/lib.rs b/apps/client/src-tauri/src/lib.rs index 1084b5b..4c2ab51 100644 --- a/apps/client/src-tauri/src/lib.rs +++ b/apps/client/src-tauri/src/lib.rs @@ -1,85 +1,18 @@ -use rand::Rng; -use serde::{Deserialize, Serialize}; -use std::time::Duration; -use tauri::AppHandle; -use tauri::Emitter; +use crate::game::commands::{game_command, game_connect, game_disconnect}; +use crate::game::mod_state::GameState; -#[derive(Debug, Clone, Serialize, Deserialize)] -struct Position { - x: i32, - y: i32, - z: i32, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "snake_case")] -enum Direction { - North, - South, - East, - West, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -struct MoveRequest { - request_id: String, - from: Position, - direction: Direction, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -struct MoveResultEvent { - request_id: String, - ok: bool, - position: Option, - error: Option, -} - -fn apply_dir(mut p: Position, dir: Direction) -> Position { - match dir { - Direction::North => p.y -= 1, - Direction::South => p.y += 1, - Direction::West => p.x -= 1, - Direction::East => p.x += 1, - } - p -} - -#[tauri::command] -async fn request_move(app: AppHandle, req: MoveRequest) -> Result<(), String> { - tauri::async_runtime::spawn(async move { - tokio::time::sleep(Duration::from_millis(30)).await; - - let fail = rand::rng().random_bool(0.03); // 3% - let ev = if fail { - MoveResultEvent { - request_id: req.request_id, - ok: false, - position: None, - error: Some("simulated_error".to_string()), - } - } else { - let new_pos = apply_dir(req.from, req.direction); - MoveResultEvent { - request_id: req.request_id, - ok: true, - position: Some(new_pos), - error: None, - } - }; - - // emite pro front - let _ = app.emit("move_result", ev); - }); - - Ok(()) -} +pub mod game; #[cfg_attr(mobile, tauri::mobile_entry_point)] pub fn run() { tauri::Builder::default() .plugin(tauri_plugin_opener::init()) - .invoke_handler(tauri::generate_handler![request_move]) + .manage(GameState::new()) + .invoke_handler(tauri::generate_handler![ + game_connect, + game_disconnect, + game_command + ]) .run(tauri::generate_context!()) .expect("error while running tauri application"); } diff --git a/apps/client/src/pages/game/index.tsx b/apps/client/src/pages/game/index.tsx index 1913951..7798a40 100644 --- a/apps/client/src/pages/game/index.tsx +++ b/apps/client/src/pages/game/index.tsx @@ -1,23 +1,94 @@ -import { useEffect } from "react"; +import { invoke } from "@tauri-apps/api/core"; +import { listen } from "@tauri-apps/api/event"; +import { useCallback, useEffect } from "react"; import { GameShell } from "@/components/game/Shell"; import { PerfOverlay } from "@/components/performance/Overlay"; import { ReactPerfProfiler } from "@/components/performance/Profiler"; import { WidgetDragGhost } from "@/components/Widgets/Ghost"; +import type { GameEvent } from "@/sdk/game/events"; import { useDragControllerLayer } from "@/sdk/hooks/useDragControllerLayer"; import { usePointerHoverLayer } from "@/sdk/hooks/usePointerHoverLayer"; +import { setMoveBridge } from "@/sdk/movement/bridge"; +import { createTauriMoveBridge } from "@/sdk/movement/bridge.tauri"; import { startMovementInput } from "@/sdk/movement/movementInput"; +import { useMovementStore } from "@/sdk/store/movement"; export function GamePage() { usePointerHoverLayer(); useDragControllerLayer(); + useEffect(() => { + console.log("Setting Tauri Move Bridge"); + setMoveBridge(createTauriMoveBridge()); + }, []); + useEffect(() => { const stop = startMovementInput(); return () => stop(); }, []); + useEffect(() => { + const unlisten = listen("game:event", (e) => { + const ev = e.payload; + + if (ev.type === "PlayerPosition") { + useMovementStore.getState().setPlayerTile(ev.data); + return; + } + + console.log("EVENT:", ev.type, ev.data); + }); + + return () => { + unlisten.then((f) => f()); + }; + }, []); + + const handleLogin = useCallback(async () => { + await invoke("game_connect", { + ip: "10.1.1.251", + port: 7172, + sessionKey: "god@god.com\ngod", + characterName: "GOD", + }); + }, []); + + const handleLogger = useCallback(async () => { + await invoke("game_command", { + command: { type: "Log", data: { message: "oi worker" } }, + }); + }, []); + + const handleDisconnect = useCallback(async () => { + await invoke("game_disconnect"); + }, []); + return ( <> +
+ + + +
+ diff --git a/apps/client/src/sdk/game/events.ts b/apps/client/src/sdk/game/events.ts new file mode 100644 index 0000000..b78d6f9 --- /dev/null +++ b/apps/client/src/sdk/game/events.ts @@ -0,0 +1,9 @@ +import type { MoveResult } from "../types/movement"; +import type { Position } from "../types/position"; + +export type GameEvent = + | { type: "Log"; data: { level: string; message: string; tsMs: number } } + | { type: "State"; data: { state: string } } + | { type: "Tick"; data: { n: number; tsMs: number } } + | { type: "PlayerPosition"; data: Position } + | { type: "MoveResult"; data: MoveResult }; diff --git a/apps/client/src/sdk/movement/bridge.tauri.ts b/apps/client/src/sdk/movement/bridge.tauri.ts new file mode 100644 index 0000000..687a4c8 --- /dev/null +++ b/apps/client/src/sdk/movement/bridge.tauri.ts @@ -0,0 +1,61 @@ +import { invoke } from "@tauri-apps/api/core"; +import { listen } from "@tauri-apps/api/event"; +import type { MoveBridge } from "@/sdk/movement/bridge"; +import type { MoveCommand, MoveResult } from "@/sdk/types/movement"; +import type { GameEvent } from "../game/events"; + +const pending = new Map< + string, + { + resolve: (r: MoveResult) => void; + reject: (e: unknown) => void; + timeoutId: number; + } +>(); + +let started = false; + +async function ensureListener() { + if (started) return; + started = true; + + await listen("game:event", (e) => { + if (e.payload.type !== "MoveResult") return; + + const res = e.payload.data; + const p = pending.get(res.reqId); + if (!p) return; + + clearTimeout(p.timeoutId); + pending.delete(res.reqId); + p.resolve(res); + }); +} + +export function createTauriMoveBridge(): MoveBridge { + return { + async sendMove(cmd: MoveCommand): Promise { + await ensureListener(); + + return new Promise((resolve, reject) => { + const timeoutId = window.setTimeout(() => { + pending.delete(cmd.reqId); + reject(new Error("move timeout")); + }, 2000); + + pending.set(cmd.reqId, { resolve, reject, timeoutId }); + + invoke("game_command", { + command: { type: "Move", data: cmd }, + }).catch((err) => { + const p = pending.get(cmd.reqId); + if (p) { + clearTimeout(p.timeoutId); + pending.delete(cmd.reqId); + } + reject(err); + }); + }); + }, + }; +} From 88c2fbf64995f6e6f90df66a4675bf80c92f19c2 Mon Sep 17 00:00:00 2001 From: Guilherme Fontes Date: Thu, 25 Dec 2025 16:27:38 -0400 Subject: [PATCH 12/18] feat: add xtea and event to test key and enabled to use or not --- apps/client/src-tauri/src/codec/mod.rs | 22 +++++ apps/client/src-tauri/src/game/types.rs | 20 ++++ apps/client/src-tauri/src/game/worker.rs | 120 +++++++++++++++++------ apps/client/src-tauri/src/lib.rs | 6 +- apps/client/src-tauri/src/xtea/mod.rs | 79 +++++++++++++++ apps/client/src/pages/game/index.tsx | 14 +++ apps/client/src/sdk/game/events.ts | 15 ++- 7 files changed, 242 insertions(+), 34 deletions(-) create mode 100644 apps/client/src-tauri/src/codec/mod.rs create mode 100644 apps/client/src-tauri/src/xtea/mod.rs diff --git a/apps/client/src-tauri/src/codec/mod.rs b/apps/client/src-tauri/src/codec/mod.rs new file mode 100644 index 0000000..aa0d57f --- /dev/null +++ b/apps/client/src-tauri/src/codec/mod.rs @@ -0,0 +1,22 @@ +pub fn pack_body(payload: &[u8]) -> Vec { + let mut body = Vec::with_capacity(1 + payload.len() + 8); + body.push(0); // padByte placeholder + body.extend_from_slice(payload); + + let pad = (8 - (body.len() % 8)) % 8; + body[0] = pad as u8; + body.extend(std::iter::repeat(0u8).take(pad)); + body +} + +pub fn unpack_body(body: &[u8]) -> Option> { + if body.is_empty() { + return None; + } + let pad = body[0] as usize; + if pad + 1 > body.len() { + return None; + } + let end = body.len().checked_sub(pad)?; + Some(body[1..end].to_vec()) +} diff --git a/apps/client/src-tauri/src/game/types.rs b/apps/client/src-tauri/src/game/types.rs index 7a533f5..cef1acd 100644 --- a/apps/client/src-tauri/src/game/types.rs +++ b/apps/client/src-tauri/src/game/types.rs @@ -16,6 +16,13 @@ pub enum MoveDir { E, } +#[derive(Clone, Copy, Debug, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct CryptoState { + pub xtea_enabled: bool, + pub xtea_key: Option<[u32; 4]>, +} + #[derive(Clone, Debug, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] pub struct MoveCommand { @@ -39,6 +46,7 @@ pub struct MoveResult { pub enum UiCommand { Log { message: String }, Move(MoveCommand), + SendRaw { payload: Vec }, } #[derive(Clone, Debug, Serialize)] @@ -58,4 +66,16 @@ pub enum GameEvent { }, MoveResult(MoveResult), PlayerPosition(Position), + CryptoState(CryptoState), + RawTx { + payload_hex: String, + body_hex: String, + len: usize, + xtea: bool, + }, + RawRx { + payload_hex: String, + len: usize, + xtea: bool, + }, } diff --git a/apps/client/src-tauri/src/game/worker.rs b/apps/client/src-tauri/src/game/worker.rs index 87d0f7a..5dbffda 100644 --- a/apps/client/src-tauri/src/game/worker.rs +++ b/apps/client/src-tauri/src/game/worker.rs @@ -3,9 +3,13 @@ use std::time::{Duration, SystemTime, UNIX_EPOCH}; use tauri::{AppHandle, Emitter}; use tokio::{sync::mpsc, time::interval}; -use crate::game::{ - events, - types::{GameEvent, MoveDir, MoveResult, Position, UiCommand}, +use crate::{ + codec::{pack_body, unpack_body}, + game::{ + events, + types::{CryptoState, GameEvent, MoveDir, MoveResult, Position, UiCommand}, + }, + xtea::{generate_xtea_key_bytes, xtea_decrypt, xtea_encrypt, xtea_key_from_bytes_le}, }; #[derive(Debug)] @@ -14,6 +18,12 @@ pub enum WorkerCommand { Ui(UiCommand), } +#[derive(Debug)] +struct WorkerState { + crypto: CryptoState, + player_position: Position, +} + fn now_ms() -> u128 { SystemTime::now() .duration_since(UNIX_EPOCH) @@ -54,6 +64,20 @@ pub async fn run_worker( character_name: String, mut rx: mpsc::Receiver, ) -> anyhow::Result<()> { + let key_bytes = generate_xtea_key_bytes(); + + let mut state = WorkerState { + crypto: CryptoState { + xtea_enabled: true, + xtea_key: Some(xtea_key_from_bytes_le(key_bytes)), + }, + player_position: Position { + x: 100, + y: 100, + z: 7, + }, + }; + emit( &app, GameEvent::State { @@ -65,25 +89,23 @@ pub async fn run_worker( GameEvent::Log { level: "info".into(), message: format!( - "worker started (ip={ip} port={port} character={character_name} session_key_len={})", - session_key.len() - ), + "worker started (ip={ip} port={port} character={character_name} session_key_len={})", + session_key.len() + ), ts_ms: now_ms(), }, ); - - // ✅ estado autoritativo do "server fake" vive aqui - let mut player_pos = Position { - x: 100, - y: 100, - z: 7, - }; - - emit(&app, GameEvent::PlayerPosition(player_pos)); - - // ✅ config fake (deixa fixo aqui também) - let latency_ms: u64 = 30; - let error_rate: f32 = 0.01; // 1% rollback + emit( + &app, + GameEvent::Log { + level: "info".into(), + message: "Login simulated: XTEA enabled + key stored in worker state".into(), + ts_ms: now_ms(), + }, + ); + emit(&app, GameEvent::CryptoState(state.crypto)); + emit(&app, GameEvent::PlayerPosition(state.player_position)); + emit(&app, GameEvent::CryptoState(state.crypto)); let mut tick = interval(Duration::from_secs(1)); let mut n: u64 = 0; @@ -98,7 +120,7 @@ pub async fn run_worker( command = rx.recv() => { match command { Some(WorkerCommand::Ui(ui)) => { - handle_ui_command(&app, ui, &mut player_pos, latency_ms, error_rate).await; + handle_ui_command(&app, ui, &mut state).await; } Some(WorkerCommand::Stop) | None => { emit(&app, GameEvent::Log { @@ -117,14 +139,50 @@ pub async fn run_worker( Ok(()) } -async fn handle_ui_command( - app: &AppHandle, - command: UiCommand, - player_pos: &mut Position, - latency_ms: u64, - error_rate: f32, -) { +async fn handle_ui_command(app: &AppHandle, command: UiCommand, state: &mut WorkerState) { + // ✅ config fake (deixa fixo aqui também) + let latency_ms: u64 = 30; + let error_rate: f32 = 0.01; // 1% rollback + match command { + UiCommand::SendRaw { payload } => { + let xtea = state.crypto.xtea_enabled; + let key = state.crypto.xtea_key; + + let payload_hex = hex::encode(&payload); + let mut body = pack_body(&payload); + + if xtea { + let k = key.expect("xtea_enabled but no key has generated"); + xtea_encrypt(&mut body, k); + } + + emit( + app, + GameEvent::RawTx { + payload_hex, + body_hex: hex::encode(&body), + len: body.len(), + xtea, + }, + ); + + if xtea { + let k = key.unwrap(); + xtea_decrypt(&mut body, k); + } + + let unpacked = unpack_body(&body).unwrap(); + + emit( + app, + GameEvent::RawRx { + payload_hex: hex::encode(&unpacked), + len: unpacked.len(), + xtea, + }, + ); + } UiCommand::Log { message } => { emit( app, @@ -135,11 +193,11 @@ async fn handle_ui_command( }, ); } - UiCommand::Move(move_command) => { tokio::time::sleep(Duration::from_millis(latency_ms)).await; let rolled_back = rand::random::() < error_rate; + let player_position = state.player_position; if rolled_back { emit( @@ -147,19 +205,19 @@ async fn handle_ui_command( GameEvent::MoveResult(MoveResult { req_id: move_command.req_id, ok: false, - position: *player_pos, // manda a posição autoritativa atual + position: player_position, // manda a posição autoritativa atual reason: Some("simulated_rollback".into()), }), ); } else { - *player_pos = apply_dir(*player_pos, move_command.dir); + state.player_position = apply_dir(player_position, move_command.dir); emit( app, GameEvent::MoveResult(MoveResult { req_id: move_command.req_id, ok: true, - position: *player_pos, + position: player_position, reason: None, }), ); diff --git a/apps/client/src-tauri/src/lib.rs b/apps/client/src-tauri/src/lib.rs index 4c2ab51..4c1984c 100644 --- a/apps/client/src-tauri/src/lib.rs +++ b/apps/client/src-tauri/src/lib.rs @@ -1,8 +1,10 @@ +pub mod codec; +pub mod game; +pub mod xtea; + use crate::game::commands::{game_command, game_connect, game_disconnect}; use crate::game::mod_state::GameState; -pub mod game; - #[cfg_attr(mobile, tauri::mobile_entry_point)] pub fn run() { tauri::Builder::default() diff --git a/apps/client/src-tauri/src/xtea/mod.rs b/apps/client/src-tauri/src/xtea/mod.rs new file mode 100644 index 0000000..365017b --- /dev/null +++ b/apps/client/src-tauri/src/xtea/mod.rs @@ -0,0 +1,79 @@ +use rand::RngCore; +use rand_core::OsRng; + +const XTEA_DELTA: u32 = 0x9E37_79B9; +const XTEA_ROUNDS: usize = 32; + +pub fn generate_xtea_key_bytes() -> [u8; 16] { + let mut raw = [0u8; 16]; + OsRng.fill_bytes(&mut raw); + raw +} + +pub fn xtea_key_from_bytes_le(raw: [u8; 16]) -> [u32; 4] { + [ + u32::from_le_bytes(raw[0..4].try_into().unwrap()), + u32::from_le_bytes(raw[4..8].try_into().unwrap()), + u32::from_le_bytes(raw[8..12].try_into().unwrap()), + u32::from_le_bytes(raw[12..16].try_into().unwrap()), + ] +} + +/** + * Cria uma cifra com tamanho que seja múltiplo de 8 + */ + +pub fn xtea_encrypt(buffer: &mut [u8], key: [u32; 4]) { + assert!(buffer.len() % 8 == 0, "buffer must be multiple of 8"); + + for chunk in buffer.chunks_exact_mut(8) { + let mut v0 = u32::from_le_bytes(chunk[0..4].try_into().unwrap()); + let mut v1 = u32::from_le_bytes(chunk[4..8].try_into().unwrap()); + + let mut sum: u32 = 0; + + for _ in 0..XTEA_ROUNDS { + v0 = v0.wrapping_add( + (((v1 << 4) ^ (v1 >> 5)).wrapping_add(v1)) + ^ (sum.wrapping_add(key[(sum & 3) as usize])), + ); + + sum = sum.wrapping_add(XTEA_DELTA); + v1 = v1.wrapping_add( + (((v0 << 4) ^ (v0 >> 5)).wrapping_add(v0)) + ^ (sum.wrapping_add(key[((sum >> 11) & 3) as usize])), + ); + } + + chunk[0..4].copy_from_slice(&v0.to_le_bytes()); + chunk[4..8].copy_from_slice(&v1.to_le_bytes()); + } +} + +/** + * Faz o decrypt usando uma chave. + */ +pub fn xtea_decrypt(buffer: &mut [u8], key: [u32; 4]) { + assert!(buffer.len() % 8 == 0, "buf must be multiple of 8"); + + for chunk in buffer.chunks_exact_mut(8) { + let mut v0 = u32::from_le_bytes(chunk[0..4].try_into().unwrap()); + let mut v1 = u32::from_le_bytes(chunk[4..8].try_into().unwrap()); + + let mut sum: u32 = XTEA_DELTA.wrapping_mul(XTEA_ROUNDS as u32); + for _ in 0..XTEA_ROUNDS { + v1 = v1.wrapping_sub( + (((v0 << 4) ^ (v0 >> 5)).wrapping_add(v0)) + ^ (sum.wrapping_add(key[((sum >> 11) & 3) as usize])), + ); + sum = sum.wrapping_sub(XTEA_DELTA); + v0 = v0.wrapping_sub( + (((v1 << 4) ^ (v1 >> 5)).wrapping_add(v1)) + ^ (sum.wrapping_add(key[(sum & 3) as usize])), + ); + } + + chunk[0..4].copy_from_slice(&v0.to_le_bytes()); + chunk[4..8].copy_from_slice(&v1.to_le_bytes()); + } +} diff --git a/apps/client/src/pages/game/index.tsx b/apps/client/src/pages/game/index.tsx index 7798a40..515a062 100644 --- a/apps/client/src/pages/game/index.tsx +++ b/apps/client/src/pages/game/index.tsx @@ -63,9 +63,23 @@ export function GamePage() { await invoke("game_disconnect"); }, []); + const sendRawDataXtea = useCallback(async () => { + const payload = Array.from(new TextEncoder().encode("ping")); + await invoke("game_command", { + command: { type: "SendRaw", data: { payload } }, + }); + }, []); + return ( <>
+