diff --git a/.forgejo/workflows/dependency-builds.yml b/.forgejo/workflows/dependency-builds.yml index fdc778f..709c75b 100644 --- a/.forgejo/workflows/dependency-builds.yml +++ b/.forgejo/workflows/dependency-builds.yml @@ -37,18 +37,6 @@ jobs: - run: nix develop .#electron --command pnpm run build:packages - run: nix develop .#electron --command pnpm run build:desktop - native-mtp: - if: ${{ github.actor == 'rasensprenger' }} - name: Test native MTP - runs-on: nixos - steps: - - run: nix profile add nixpkgs#nodejs_24 - - uses: https://data.forgejo.org/actions/checkout@v4 - with: - persist-credentials: false - - run: git submodule update --init --recursive - - run: nix develop .#electron --command bash -lc 'cd apps/tauri/src-tauri && cargo test' - mobile: if: ${{ github.actor == 'rasensprenger' }} name: Build mobile diff --git a/apps/tauri/src-tauri/Cargo.lock b/apps/tauri/src-tauri/Cargo.lock index d404d61..b1b1c0b 100644 --- a/apps/tauri/src-tauri/Cargo.lock +++ b/apps/tauri/src-tauri/Cargo.lock @@ -674,6 +674,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 = "const-oid" version = "0.10.2" @@ -883,6 +889,7 @@ dependencies = [ "cfg-if", "cpufeatures 0.2.17", "curve25519-dalek-derive", + "digest 0.10.7", "fiat-crypto 0.2.9", "rustc_version", "subtle", @@ -967,14 +974,25 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "der" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" +dependencies = [ + "const-oid 0.9.6", + "pem-rfc7468 0.7.0", + "zeroize", +] + [[package]] name = "der" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a69dedd701da44b0536442edf09c81a64b0ab97a7a4a5e3d1971f00027cbc63d" dependencies = [ - "const-oid", - "pem-rfc7468", + "const-oid 0.10.2", + "pem-rfc7468 1.0.0", "zeroize", ] @@ -1039,7 +1057,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" dependencies = [ "block-buffer 0.12.1", - "const-oid", + "const-oid 0.10.2", "crypto-common 0.2.2", "ctutils", ] @@ -1186,14 +1204,38 @@ version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" +[[package]] +name = "ed25519" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +dependencies = [ + "pkcs8 0.10.2", + "signature 2.2.0", +] + [[package]] name = "ed25519" version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29fcf32e6c73d1079f83ab4d782de2d81620346a5f38c6237a86a22f8368980a" dependencies = [ - "pkcs8", - "signature", + "pkcs8 0.11.0", + "signature 3.0.0", +] + +[[package]] +name = "ed25519-dalek" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9" +dependencies = [ + "curve25519-dalek 4.1.3", + "ed25519 2.2.3", + "serde", + "sha2 0.10.9", + "subtle", + "zeroize", ] [[package]] @@ -1203,10 +1245,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ebaa1a2bf1290ab3bfe5a7b771d050ebffab2711c19a81691c683a5144a25de" dependencies = [ "curve25519-dalek 5.0.0", - "ed25519", + "ed25519 3.0.0", "serde", "sha2 0.11.0", - "signature", + "signature 3.0.0", "subtle", "zeroize", ] @@ -2695,14 +2737,14 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "add6b9d92e496f16f4526d68ff29da1483aba4b119baeab8bed3b9e3544a6f3d" dependencies = [ - "const-oid", + "const-oid 0.10.2", "crypto-common 0.2.2", "ctutils", "hybrid-array", "module-lattice", - "pkcs8", + "pkcs8 0.11.0", "shake", - "signature", + "signature 3.0.0", ] [[package]] @@ -2744,50 +2786,72 @@ dependencies = [ [[package]] name = "mtp" -version = "0.3.0" -source = "git+https://git.methanium.net/Methanium/mtp.git?rev=a5c8d4f0c898c78351e9d54124886c86e789a22a#a5c8d4f0c898c78351e9d54124886c86e789a22a" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22#7182272e3edb0079d7b74b45b2f62a298d2fee22" dependencies = [ "mtp-client", - "mtp-codec", - "mtp-common", - "mtp-crypto", + "mtp-codec 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "mtp-common 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "mtp-crypto 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", "mtp-host", - "mtp-transport", - "mtp-type-map", + "mtp-transport 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "mtp-type-map 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", "mtp-webserver", ] [[package]] name = "mtp-client" -version = "0.3.0" -source = "git+https://git.methanium.net/Methanium/mtp.git?rev=a5c8d4f0c898c78351e9d54124886c86e789a22a#a5c8d4f0c898c78351e9d54124886c86e789a22a" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22#7182272e3edb0079d7b74b45b2f62a298d2fee22" dependencies = [ - "mtp-codec", - "mtp-common", - "mtp-crypto", - "mtp-transport", + "mtp-codec 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "mtp-common 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "mtp-crypto 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "mtp-transport 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", "rand 0.10.2", "tokio", ] [[package]] name = "mtp-codec" -version = "0.3.0" -source = "git+https://git.methanium.net/Methanium/mtp.git?rev=a5c8d4f0c898c78351e9d54124886c86e789a22a#a5c8d4f0c898c78351e9d54124886c86e789a22a" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22#7182272e3edb0079d7b74b45b2f62a298d2fee22" dependencies = [ "base64 0.23.1", "byteorder", - "mtp-common", - "mtp-crypto", - "mtp-type-map", + "mtp-common 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "mtp-crypto 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "mtp-type-map 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "rand 0.10.2", +] + +[[package]] +name = "mtp-codec" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=b067614a684eb1856bc5db7b3fd82148c036ce6b#b067614a684eb1856bc5db7b3fd82148c036ce6b" +dependencies = [ + "base64 0.23.1", + "byteorder", + "mtp-common 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=b067614a684eb1856bc5db7b3fd82148c036ce6b)", + "mtp-type-map 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=b067614a684eb1856bc5db7b3fd82148c036ce6b)", "rand 0.10.2", - "thiserror 2.0.19", ] [[package]] name = "mtp-common" -version = "0.3.0" -source = "git+https://git.methanium.net/Methanium/mtp.git?rev=a5c8d4f0c898c78351e9d54124886c86e789a22a#a5c8d4f0c898c78351e9d54124886c86e789a22a" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22#7182272e3edb0079d7b74b45b2f62a298d2fee22" +dependencies = [ + "quinn", + "rustls", + "thiserror 2.0.19", + "wtransport", +] + +[[package]] +name = "mtp-common" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=b067614a684eb1856bc5db7b3fd82148c036ce6b#b067614a684eb1856bc5db7b3fd82148c036ce6b" dependencies = [ "quinn", "rustls", @@ -2797,18 +2861,18 @@ dependencies = [ [[package]] name = "mtp-crypto" -version = "0.3.0" -source = "git+https://git.methanium.net/Methanium/mtp.git?rev=a5c8d4f0c898c78351e9d54124886c86e789a22a#a5c8d4f0c898c78351e9d54124886c86e789a22a" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22#7182272e3edb0079d7b74b45b2f62a298d2fee22" dependencies = [ - "base64 0.22.1", + "base64 0.23.1", "chacha20poly1305", - "ed25519-dalek", + "ed25519-dalek 2.2.0", "getrandom 0.4.3", "hkdf", "ml-dsa", "mlkem-tls", "rand 0.10.2", - "rand_core 0.6.4", + "rand_core 0.10.1", "rustls", "serde", "sha2 0.11.0", @@ -2818,31 +2882,67 @@ dependencies = [ ] [[package]] -name = "mtp-host" -version = "0.3.0" -source = "git+https://git.methanium.net/Methanium/mtp.git?rev=a5c8d4f0c898c78351e9d54124886c86e789a22a#a5c8d4f0c898c78351e9d54124886c86e789a22a" +name = "mtp-crypto" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=b067614a684eb1856bc5db7b3fd82148c036ce6b#b067614a684eb1856bc5db7b3fd82148c036ce6b" dependencies = [ - "mtp-codec", - "mtp-common", - "mtp-crypto", - "mtp-transport", + "base64 0.23.1", + "chacha20poly1305", + "ed25519-dalek 3.0.0", + "getrandom 0.4.3", + "hkdf", + "ml-dsa", "rand 0.10.2", + "rand_core 0.10.1", + "rustls", + "sha2 0.11.0", "thiserror 2.0.19", "tokio", + "zeroize", +] + +[[package]] +name = "mtp-host" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22#7182272e3edb0079d7b74b45b2f62a298d2fee22" +dependencies = [ + "mtp-codec 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "mtp-common 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "mtp-crypto 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "mtp-transport 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "rand 0.10.2", + "tokio", "tracing", "wtransport", ] [[package]] name = "mtp-transport" -version = "0.3.0" -source = "git+https://git.methanium.net/Methanium/mtp.git?rev=a5c8d4f0c898c78351e9d54124886c86e789a22a#a5c8d4f0c898c78351e9d54124886c86e789a22a" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22#7182272e3edb0079d7b74b45b2f62a298d2fee22" dependencies = [ "async-trait", - "mtp-codec", - "mtp-common", - "mtp-crypto", - "rand 0.10.2", + "mtp-codec 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "mtp-common 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "mtp-crypto 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "rcgen", + "rustls", + "rustls-native-certs", + "sha2 0.11.0", + "tokio", + "tracing", + "wtransport", +] + +[[package]] +name = "mtp-transport" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=b067614a684eb1856bc5db7b3fd82148c036ce6b#b067614a684eb1856bc5db7b3fd82148c036ce6b" +dependencies = [ + "async-trait", + "mtp-codec 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=b067614a684eb1856bc5db7b3fd82148c036ce6b)", + "mtp-common 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=b067614a684eb1856bc5db7b3fd82148c036ce6b)", + "mtp-crypto 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=b067614a684eb1856bc5db7b3fd82148c036ce6b)", "rcgen", "rustls", "rustls-native-certs", @@ -2850,13 +2950,21 @@ dependencies = [ "tokio", "tracing", "wtransport", - "zeroize", ] [[package]] name = "mtp-type-map" -version = "0.3.0" -source = "git+https://git.methanium.net/Methanium/mtp.git?rev=a5c8d4f0c898c78351e9d54124886c86e789a22a#a5c8d4f0c898c78351e9d54124886c86e789a22a" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22#7182272e3edb0079d7b74b45b2f62a298d2fee22" +dependencies = [ + "serde", + "serde_yaml", +] + +[[package]] +name = "mtp-type-map" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=b067614a684eb1856bc5db7b3fd82148c036ce6b#b067614a684eb1856bc5db7b3fd82148c036ce6b" dependencies = [ "serde", "serde_yaml", @@ -2864,8 +2972,8 @@ dependencies = [ [[package]] name = "mtp-webserver" -version = "0.3.0" -source = "git+https://git.methanium.net/Methanium/mtp.git?rev=a5c8d4f0c898c78351e9d54124886c86e789a22a#a5c8d4f0c898c78351e9d54124886c86e789a22a" +version = "0.2.0" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22#7182272e3edb0079d7b74b45b2f62a298d2fee22" dependencies = [ "async-trait", "bytes", @@ -2876,12 +2984,13 @@ dependencies = [ "http-body-util", "hyper", "hyper-util", - "mtp-codec", - "mtp-common", - "mtp-crypto", + "mtp-codec 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "mtp-common 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", + "mtp-crypto 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", "mtp-host", - "mtp-transport", + "mtp-transport 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=7182272e3edb0079d7b74b45b2f62a298d2fee22)", "quinn", + "rand 0.10.2", "rustls", "thiserror 2.0.19", "tokio", @@ -3383,6 +3492,15 @@ dependencies = [ "serde_core", ] +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + [[package]] name = "pem-rfc7468" version = "1.0.0" @@ -3468,14 +3586,24 @@ dependencies = [ "futures-io", ] +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der 0.7.10", + "spki 0.7.3", +] + [[package]] name = "pkcs8" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451913da69c775a56034ea8d9003d27ee8948e12443eae7c038ba100a4f21cb7" dependencies = [ - "der", - "spki", + "der 0.8.1", + "spki 0.8.0", ] [[package]] @@ -4464,6 +4592,15 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "rand_core 0.6.4", +] + [[package]] name = "signature" version = "3.0.0" @@ -4572,6 +4709,16 @@ dependencies = [ "system-deps", ] +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der 0.7.10", +] + [[package]] name = "spki" version = "0.8.0" @@ -4579,7 +4726,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d9efca8738c78ee9484207732f728b1ef517bbb1833d6fc0879ca898a522f6f" dependencies = [ "base64ct", - "der", + "der 0.8.1", ] [[package]] @@ -5142,6 +5289,7 @@ dependencies = [ "base64 0.22.1", "jni 0.22.4", "mtp", + "mtp-transport 0.2.0 (git+https://git.methanium.net/methanium/mtp.git?rev=b067614a684eb1856bc5db7b3fd82148c036ce6b)", "reqwest", "serde", "serde_json", diff --git a/apps/tauri/src-tauri/Cargo.toml b/apps/tauri/src-tauri/Cargo.toml index 2a68e95..08a66d5 100644 --- a/apps/tauri/src-tauri/Cargo.toml +++ b/apps/tauri/src-tauri/Cargo.toml @@ -24,7 +24,8 @@ serde_json = "1" base64 = "0.22" reqwest = { version = "0.13", default-features = false, features = ["json", "rustls"] } tokio = { version = "1", features = ["rt-multi-thread", "sync", "time"] } -mtp = { git = "https://git.methanium.net/Methanium/mtp.git", rev = "a5c8d4f0c898c78351e9d54124886c86e789a22a", features = ["client", "crypto"] } +mtp = { git = "https://git.methanium.net/methanium/mtp.git", rev = "7182272e3edb0079d7b74b45b2f62a298d2fee22", features = ["client", "crypto"] } +mtp-transport = { git = "https://git.methanium.net/methanium/mtp.git", rev = "b067614a684eb1856bc5db7b3fd82148c036ce6b" } webpki-root-certs = "1" tauri-plugin-deep-link = "2" tauri-plugin-notification = "2" @@ -35,11 +36,6 @@ version = "2" features = [] default-features = true -[target.'cfg(not(target_os = "android"))'.dependencies.tauri] -version = "2" -features = [] -default-features = true - [target.'cfg(target_os = "android")'.dependencies] jni = "0.22" diff --git a/apps/tauri/src-tauri/src/main.rs b/apps/tauri/src-tauri/src/main.rs index 272583a..e78a26a 100644 --- a/apps/tauri/src-tauri/src/main.rs +++ b/apps/tauri/src-tauri/src/main.rs @@ -1,6 +1,9 @@ // Prevents additional console window on Windows in release, DO NOT REMOVE!! #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] +use lib::log; + fn main() { mobile_lib::run(); + log("Test test 123") } diff --git a/apps/tauri/src-tauri/src/mtp_backend.rs b/apps/tauri/src-tauri/src/mtp_backend.rs index 14365b8..b343337 100644 --- a/apps/tauri/src-tauri/src/mtp_backend.rs +++ b/apps/tauri/src-tauri/src/mtp_backend.rs @@ -2,7 +2,7 @@ use std::sync::{ atomic::{AtomicBool, AtomicU64, Ordering}, Arc, Mutex, OnceLock, RwLock, }; -use std::time::{Duration, SystemTime, UNIX_EPOCH}; +use std::time::Duration; use base64::{ engine::general_purpose::{STANDARD, STANDARD_NO_PAD}, @@ -16,7 +16,6 @@ use mtp::crypto::{ use serde::{Deserialize, Serialize}; use serde_json::{Map, Value}; use tauri::{AppHandle, Emitter}; -use tokio::sync::mpsc; const EVENT_NAME: &str = "mtp://event"; const DISCONNECTED: u8 = 0; @@ -25,9 +24,6 @@ const CONNECTED: u8 = 2; const CHAT_SECRET_SALT: &[u8] = b"tensamin-chat-secret-v1"; const CHAT_MESSAGE_SALT: &[u8] = b"tensamin-chat-message-v1"; const CHAT_SECRET_SCHEME: &str = "mtp-chat-secret-kem-chacha20poly1305-hkdf-sha256-v1"; -const INITIAL_SYNC_TIMEOUT: Duration = Duration::from_secs(30); -const MAX_BUFFERED_INITIAL_FRAMES: usize = 1_000; -const NOTIFICATION_QUEUE_CAPACITY: usize = 32; #[cfg(target_os = "android")] const ROOT_YE_PEM: &[u8] = b"-----BEGIN CERTIFICATE-----\n\ MIIB2TCCAWCgAwIBAgIRAKQCa6LvbHwg1AR+XmWmk4AwCgYIKoZIzj0EAwMwLjEL\n\ @@ -99,7 +95,7 @@ enum MtpEvent { pub struct MtpManager { runtime: tokio::runtime::Runtime, config: RwLock>, - connection: RwLock>>, + connection: RwLock>>, snapshot: RwLock, generation: AtomicU64, enabled: AtomicBool, @@ -108,46 +104,6 @@ pub struct MtpManager { start_lock: Mutex<()>, } -struct RequestIdAllocator { - next: AtomicU64, -} - -impl RequestIdAllocator { - fn new() -> Self { - Self { - next: AtomicU64::new(1), - } - } - - fn next(&self) -> Result { - let value = self.next.fetch_add(1, Ordering::Relaxed); - u32::try_from(value) - .map_err(|_| "MTP request ID space exhausted for this connection".to_string()) - } -} - -struct ManagedConnection { - mtp: Arc, - request_ids: RequestIdAllocator, -} - -impl ManagedConnection { - async fn next_request_id(&self) -> Result { - let id = self.request_ids.next(); - if id.is_err() { - self.mtp.sender.close().await; - } - id - } -} - -struct PreparedConnection { - connection: MTPConnection, - request_ids: RequestIdAllocator, - initial_state: Value, - buffered_frames: Vec, -} - static MANAGER: OnceLock = OnceLock::new(); pub fn manager() -> &'static MtpManager { @@ -193,7 +149,7 @@ impl MtpManager { .take() { self.runtime - .spawn(async move { connection.mtp.sender.close().await }); + .spawn(async move { connection.sender.close().await }); } self.set_snapshot(MtpSnapshot { generation, @@ -215,7 +171,7 @@ impl MtpManager { .take() { self.runtime - .spawn(async move { connection.mtp.sender.close().await }); + .spawn(async move { connection.sender.close().await }); } self.set_snapshot(MtpSnapshot { generation: self.generation.load(Ordering::SeqCst), @@ -275,16 +231,20 @@ impl MtpManager { self.enabled.load(Ordering::SeqCst) && self.generation.load(Ordering::SeqCst) == generation } - async fn request(&self, type_name: &str, data: Value) -> Result { + async fn request( + &self, + type_name: &str, + data: Value, + id: Option, + ) -> Result { let connection = self .connection .read() .map_err(|_| "MTP connection lock is unavailable")? .clone() .ok_or_else(|| "MTP is not connected".to_string())?; - let request = json_to_frame(type_name, data, connection.next_request_id().await?)?; + let request = json_to_frame(type_name, data, id)?; let response = connection - .mtp .request(&request, None) .await .map_err(|error| error.to_string())?; @@ -301,12 +261,9 @@ async fn supervise(generation: u64) { manager.log(2, "Starting native MTP connection", None); android_status("Connecting"); match connect(&config).await { - Ok(prepared) => { + Ok((connection, state)) => { delay = Duration::from_secs(1); - let connection = Arc::new(ManagedConnection { - mtp: Arc::new(prepared.connection), - request_ids: prepared.request_ids, - }); + let connection = Arc::new(connection); let stale = { let _guard = manager.start_lock.lock().expect("start lock poisoned"); let mut current = manager @@ -322,47 +279,22 @@ async fn supervise(generation: u64) { generation, ready_state: CONNECTED, identified: true, - state: Some(prepared.initial_state), + state: Some(state), error: None, }); false } }; if stale { - connection.mtp.sender.close().await; + connection.sender.close().await; break; } android_status("Connected"); manager.log(2, "Native MTP connection established", None); - let (notification_tx, mut notification_rx) = - mpsc::channel(NOTIFICATION_QUEUE_CAPACITY); - let notification_connection = connection.clone(); - let notification_config = config.clone(); - let notification_worker = tokio::spawn(async move { - while let Some(frame) = notification_rx.recv().await { - if !manager().is_current(generation) { - break; - } - if let Err(error) = notify_message( - ¬ification_config, - notification_connection.clone(), - &frame, - ) - .await - { - eprintln!("failed to create background message notification: {error}"); - } - } - }); - - for frame in prepared.buffered_frames { - handle_push(generation, ¬ification_tx, frame).await; - } - while manager.is_current(generation) { - match connection.mtp.receive().await { - Ok(frame) => handle_push(generation, ¬ification_tx, frame).await, + match connection.receive().await { + Ok(frame) => handle_push(generation, connection.clone(), frame).await, Err(error) => { let _guard = manager.start_lock.lock().expect("start lock poisoned"); if manager.is_current(generation) { @@ -378,13 +310,6 @@ async fn supervise(generation: u64) { } } } - drop(notification_tx); - notification_worker.abort(); - if let Err(error) = notification_worker.await { - if !error.is_cancelled() { - eprintln!("background notification worker failed: {error}"); - } - } let mut current = manager .connection .write() @@ -414,21 +339,12 @@ async fn supervise(generation: u64) { break; } android_status("Reconnecting"); - tokio::time::sleep(jittered_retry_delay(delay)).await; + tokio::time::sleep(delay).await; delay = (delay * 2).min(Duration::from_secs(60)); } } -fn jittered_retry_delay(delay: Duration) -> Duration { - let entropy = SystemTime::now() - .duration_since(UNIX_EPOCH) - .map(|duration| duration.subsec_nanos()) - .unwrap_or_default(); - let percent = 80 + entropy % 41; - delay.mul_f64(percent as f64 / 100.0) -} - -async fn connect(config: &MtpConfig) -> Result { +async fn connect(config: &MtpConfig) -> Result<(MTPConnection, Value), String> { let (url, public_key) = resolve_endpoint(config) .await .map_err(|error| format!("endpoint discovery failed: {error}"))?; @@ -465,10 +381,39 @@ async fn connect(config: &MtpConfig) -> Result { .map_err(|error| format!("transport authentication failed: {error}"))?; manager().log(2, "Native MTP authentication completed", None); - let (state, buffered_frames) = await_initial_state(&connection).await?; - let request_ids = RequestIdAllocator::new(); - let (initial_state, ack) = prepare_initial_state_ack(&state, &request_ids)?; - let response = tokio::time::timeout(INITIAL_SYNC_TIMEOUT, connection.request(&ack, None)) + let connected = CommunicationValue::new(CommunicationType::ClientConnected) + .add_typed_default( + DataType::SessionId, + DataValue::UnsignedNumber(current_millis() as u128), + ) + .add_typed_default(DataType::VersionNumber, DataValue::UnsignedNumber(0)) + .add_typed_default(DataType::CacheValid, DataValue::BoolFalse) + .add_typed_default(DataType::CacheSchemaVersion, DataValue::UnsignedNumber(0)); + let state = tokio::time::timeout( + Duration::from_secs(30), + connection.request(&connected, None), + ) + .await + .map_err(|_| "initial state synchronization timed out".to_string())? + .map_err(|error| format!("initial state synchronization failed: {error}"))?; + if !state.is_type(CommunicationType::ClientStateSync) { + return Err(format!( + "expected ClientStateSync, received {}", + state.get_type_name().unwrap_or("unknown") + )); + } + let session_id = state + .get_data(DataType::SessionId) + .as_number() + .ok_or("ClientStateSync omitted SessionId")?; + let version = state + .get_data(DataType::VersionNumber) + .as_number() + .ok_or("ClientStateSync omitted VersionNumber")?; + let ack = CommunicationValue::new(CommunicationType::ClientStateAck) + .add_typed_default(DataType::SessionId, number_to_data(session_id)) + .add_typed_default(DataType::VersionNumber, number_to_data(version)); + let response = tokio::time::timeout(Duration::from_secs(30), connection.request(&ack, None)) .await .map_err(|_| "state acknowledgement timed out".to_string())? .map_err(|error| format!("state acknowledgement failed: {error}"))?; @@ -478,182 +423,7 @@ async fn connect(config: &MtpConfig) -> Result { { return Err(format!("ClientStateAck failed: {response}")); } - Ok(PreparedConnection { - connection, - request_ids, - initial_state, - buffered_frames, - }) -} - -fn prepare_initial_state_ack( - state: &CommunicationValue, - request_ids: &RequestIdAllocator, -) -> Result<(Value, CommunicationValue), String> { - let initial_state = frame_data_to_json(state)?; - validate_client_state_sync(&initial_state)?; - let data = initial_state - .as_object() - .ok_or("ClientStateSync payload is not an object")?; - let session_id = required_integer(data, "SessionId")?; - let version = required_integer(data, "VersionNumber")?; - let ack = CommunicationValue::new(CommunicationType::ClientStateAck) - .with_id(request_ids.next()?) - .add_typed_default(DataType::SessionId, number_to_data(session_id)) - .add_typed_default(DataType::VersionNumber, number_to_data(version)); - Ok((initial_state, ack)) -} - -fn validate_client_state_sync(state: &Value) -> Result<(), String> { - let data = state - .as_object() - .ok_or("ClientStateSync payload is not an object")?; - if required_integer(data, "SessionId")? <= 0 { - return Err("ClientStateSync SessionId must be a positive integer".into()); - } - for field in ["VersionNumber", "CacheSchemaVersion"] { - if required_integer(data, field)? < 0 { - return Err(format!("ClientStateSync {field} must be nonnegative")); - } - } - match data.get("SyncMode").and_then(Value::as_str) { - Some("full" | "delta") => {} - _ => return Err("ClientStateSync SyncMode must be 'full' or 'delta'".into()), - } - for field in ["Contacts", "Communities", "Calls", "Messages"] { - if !data.get(field).is_some_and(Value::is_array) { - return Err(format!("ClientStateSync {field} must be an array")); - } - } - for field in ["DeletedMessageIds", "DeletedContactIds"] { - if let Some(value) = data.get(field) { - let values = value - .as_array() - .ok_or_else(|| format!("ClientStateSync {field} must be an array"))?; - if values.iter().any(|value| !value.is_number()) { - return Err(format!("ClientStateSync {field} must contain numbers")); - } - } - } - validate_object_array(data, "Communities", |_| Ok(()))?; - validate_object_array(data, "Contacts", validate_contact)?; - validate_object_array(data, "Calls", validate_call)?; - validate_object_array(data, "Messages", validate_message)?; - Ok(()) -} - -fn validate_object_array( - data: &Map, - field: &str, - validate: impl Fn(&Map) -> Result<(), String>, -) -> Result<(), String> { - let values = data - .get(field) - .and_then(Value::as_array) - .ok_or_else(|| format!("ClientStateSync {field} must be an array"))?; - for value in values { - let object = value - .as_object() - .ok_or_else(|| format!("ClientStateSync {field} entries must be objects"))?; - validate(object)?; - } - Ok(()) -} - -fn validate_contact(contact: &Map) -> Result<(), String> { - if !contact.get("UserId").is_some_and(Value::is_number) { - return Err("ClientStateSync contact omitted numeric UserId".into()); - } - if let Some(messages) = contact.get("Messages") { - let messages = messages - .as_array() - .ok_or("ClientStateSync contact Messages must be an array")?; - for message in messages { - validate_message( - message - .as_object() - .ok_or("ClientStateSync contact message must be an object")?, - )?; - } - } - Ok(()) -} - -fn validate_call(call: &Map) -> Result<(), String> { - if !call.get("CallId").is_some_and(Value::is_string) { - return Err("ClientStateSync call omitted string CallId".into()); - } - let members = call - .get("CallMembers") - .and_then(Value::as_array) - .ok_or("ClientStateSync call omitted CallMembers array")?; - if members.iter().any(|member| !member.is_number()) { - return Err("ClientStateSync CallMembers must contain numbers".into()); - } - Ok(()) -} - -fn validate_message(message: &Map) -> Result<(), String> { - for field in ["SenderId", "SendTime"] { - if !message.get(field).is_some_and(Value::is_number) { - return Err(format!("ClientStateSync message omitted numeric {field}")); - } - } - let content = message - .get("Content") - .and_then(Value::as_str) - .ok_or("ClientStateSync message omitted string Content")?; - STANDARD - .decode(content) - .or_else(|_| STANDARD_NO_PAD.decode(content)) - .map_err(|_| "ClientStateSync message Content must be base64".to_string())?; - if let Some(state) = message.get("MessageState") { - match state.as_str() { - Some("read" | "received" | "sent" | "sending" | "awaiting") => {} - _ => return Err("ClientStateSync message has invalid MessageState".into()), - } - } - Ok(()) -} - -fn required_integer(data: &Map, field: &str) -> Result { - let value = data - .get(field) - .ok_or_else(|| format!("ClientStateSync omitted {field}"))?; - if let Some(value) = value.as_i64() { - return Ok(value as i128); - } - value - .as_u64() - .map(|value| value as i128) - .ok_or_else(|| format!("ClientStateSync {field} must be an integer")) -} - -async fn await_initial_state( - connection: &MTPConnection, -) -> Result<(CommunicationValue, Vec), String> { - let mut buffered = Vec::new(); - let deadline = tokio::time::Instant::now() + INITIAL_SYNC_TIMEOUT; - - loop { - let frame = tokio::time::timeout_at(deadline, connection.receive()) - .await - .map_err(|_| "initial state synchronization timed out".to_string())? - .map_err(|error| format!("initial state synchronization failed: {error}"))?; - - if frame.is_type(CommunicationType::ErrorNoIota) { - return Err("No Iota is currently connected".into()); - } - - if frame.is_type(CommunicationType::ClientStateSync) { - return Ok((frame, buffered)); - } - - if buffered.len() == MAX_BUFFERED_INITIAL_FRAMES { - return Err("initial state synchronization buffered too many frames".into()); - } - buffered.push(frame); - } + Ok((connection, frame_data_to_json(&state)?)) } async fn resolve_endpoint(config: &MtpConfig) -> Result<(String, String), String> { @@ -695,11 +465,7 @@ async fn resolve_endpoint(config: &MtpConfig) -> Result<(String, String), String )) } -async fn handle_push( - generation: u64, - notification_tx: &mpsc::Sender, - frame: CommunicationValue, -) { +async fn handle_push(generation: u64, connection: Arc, frame: CommunicationValue) { let manager = manager(); if let Ok(message) = frame_to_json(&frame) { manager.emit(MtpEvent::Message { @@ -712,7 +478,7 @@ async fn handle_push( { if let Some(partner_id) = frame .get_data(DataType::ChatPartnerId) - .and_then(DataValue::as_number) + .as_number() .and_then(|value| u64::try_from(value).ok()) { if let Err(error) = android_cancel_notification(partner_id) { @@ -721,39 +487,40 @@ async fn handle_push( } } if frame.is_type(CommunicationType::MessageLive) && !manager.ui_visible.load(Ordering::SeqCst) { - if notification_tx.try_send(frame).is_err() { - eprintln!("background message notification queue is full"); + if let Err(error) = notify_message(connection, &frame).await { + eprintln!("failed to create background message notification: {error}"); } } } async fn notify_message( - config: &MtpConfig, - connection: Arc, + connection: Arc, frame: &CommunicationValue, ) -> Result<(), String> { let sender_id = frame .get_data(DataType::SenderId) - .and_then(DataValue::as_number) + .as_number() .and_then(|value| u64::try_from(value).ok()) .ok_or("MessageLive omitted SenderId")?; - let message = frame - .get_data(DataType::Message) - .ok_or("MessageLive omitted Message")?; - let content = container_value(message, DataType::AppContent) + let message = frame.get_data(DataType::Message); + let content = container_value(message, DataType::Content) .and_then(DataValue::as_str) .ok_or("MessageLive omitted Content")?; + let config = manager() + .config + .read() + .expect("config lock poisoned") + .clone() + .ok_or("missing config")?; let keyring_bytes = decode_browser_base64(&config.keyring)?; let keyring = Keyring::from_bytes(&keyring_bytes).map_err(|error| error.to_string())?; let chat_id = derive_chat_id(config.user_id, sender_id); let secret_id = format!("chat:{chat_id}:main"); let secret_request = CommunicationValue::new(CommunicationType::GetChatSecret) - .with_id(connection.next_request_id().await?) .add_typed_default(DataType::UserId, DataValue::Str(config.user_id.to_string())) .add_typed_default(DataType::ChatId, DataValue::Str(chat_id.clone())) .add_typed_default(DataType::SecretId, DataValue::Str(secret_id.clone())); let secret = connection - .mtp .request(&secret_request, None) .await .map_err(|error| error.to_string())?; @@ -765,7 +532,7 @@ async fn notify_message( } let version = secret .get_data(DataType::VersionNumber) - .and_then(DataValue::as_number) + .as_number() .ok_or("missing secret version")?; let encrypted_secret = secret .get_bytes(DataType::EncryptedSecret) @@ -793,14 +560,11 @@ async fn notify_message( .decrypt(&ciphertext, b"") .map_err(|error| error.to_string())?; - let user_request = CommunicationValue::new(CommunicationType::GetUserData) - .with_id(connection.next_request_id().await?) - .add_typed_default( - DataType::UserId, - DataValue::UnsignedNumber(sender_id as u128), - ); + let user_request = CommunicationValue::new(CommunicationType::GetUserData).add_typed_default( + DataType::UserId, + DataValue::UnsignedNumber(sender_id as u128), + ); let user = connection - .mtp .request(&user_request, None) .await .map_err(|error| error.to_string())?; @@ -888,42 +652,24 @@ fn container_value(value: &DataValue, field: DataType) -> Option<&DataValue> { value.get_field(id) } -fn wire_field_name(name: &str) -> &str { - match name { - "Content" => "AppContent", - "CreatedAt" => "AppCreatedAt", - "MessageId" => "AppMessageId", - _ => name, - } -} - -fn application_field_name(name: &str) -> &str { - match name { - "AppContent" => "Content", - "AppCreatedAt" => "CreatedAt", - "AppMessageId" => "MessageId", - _ => name, - } -} - -fn json_to_frame(type_name: &str, data: Value, id: u32) -> Result { +fn json_to_frame( + type_name: &str, + data: Value, + id: Option, +) -> Result { let comm_type = CommunicationType::from_name(type_name) .ok_or_else(|| format!("unknown communication type: {type_name}"))?; - let mut frame = CommunicationValue::new(comm_type).with_id(id); + let mut frame = CommunicationValue::new(comm_type); + if let Some(id) = id { + frame = frame.with_id(id); + } let Value::Object(fields) = data else { return Err("MTP request data must be an object".into()); }; - let mut translated_fields = std::collections::HashSet::::with_capacity(fields.len()); for (name, value) in fields { - let wire_name = wire_field_name(&name).to_owned(); - if !translated_fields.insert(wire_name.clone()) { - return Err(format!( - "duplicate MTP field after translation: {wire_name}" - )); - } let data_type = - DataType::from_name(&wire_name).ok_or_else(|| format!("unknown data type: {name}"))?; - frame = frame.add_typed_default(data_type, json_to_data(&wire_name, value)?); + DataType::from_name(&name).ok_or_else(|| format!("unknown data type: {name}"))?; + frame = frame.add_typed_default(data_type, json_to_data(&name, value)?); } Ok(frame) } @@ -961,21 +707,13 @@ fn json_to_data(field: &str, value: Value) -> Result { ), Value::Object(fields) => { let mut entries = Vec::with_capacity(fields.len()); - let mut translated_fields = - std::collections::HashSet::::with_capacity(fields.len()); for (name, value) in fields { - let wire_name = wire_field_name(&name).to_owned(); - if !translated_fields.insert(wire_name.clone()) { - return Err(format!( - "duplicate MTP field after translation: {wire_name}" - )); - } - let data_type = DataType::from_name(&wire_name) + let data_type = DataType::from_name(&name) .ok_or_else(|| format!("unknown nested data type: {name}"))?; let id = data_type .try_to_id(&TypeMap::latest()) .ok_or_else(|| format!("unmapped data type: {name}"))?; - entries.push((id, json_to_data(&wire_name, value)?)); + entries.push((id, json_to_data(&name, value)?)); } DataValue::Container(entries) } @@ -999,8 +737,8 @@ fn is_bytes_field(field: &str) -> bool { fn frame_to_json(frame: &CommunicationValue) -> Result { let mut result = Map::new(); - if let Some(id) = frame.id() { - result.insert("id".into(), Value::from(id)); + if frame.get_id() != 0 { + result.insert("id".into(), Value::from(frame.get_id())); } result.insert( "type".into(), @@ -1013,20 +751,11 @@ fn frame_to_json(frame: &CommunicationValue) -> Result { fn frame_data_to_json(frame: &CommunicationValue) -> Result { let map = frame.type_map().cloned().unwrap_or_else(TypeMap::latest); let mut result = Map::new(); - let entries = frame - .data() - .ok_or("MTP frame payload is not a data container")?; - for (id, value) in entries { + for (id, value) in frame.data() { let name = map .data_type_name(id.0) .ok_or_else(|| format!("unknown data type id: {}", id.0))?; - let application_name = application_field_name(name); - if result.contains_key(application_name) { - return Err(format!( - "duplicate MTP field after translation: {application_name}" - )); - } - result.insert(application_name.to_owned(), data_to_json(value, &map)?); + result.insert(name.to_owned(), data_to_json(value, &map)?); } Ok(Value::Object(result)) } @@ -1057,13 +786,7 @@ fn data_to_json(value: &DataValue, map: &TypeMap) -> Result { let name = map .data_type_name(id.0) .ok_or_else(|| format!("unknown nested data type id: {}", id.0))?; - let application_name = application_field_name(name); - if object.contains_key(application_name) { - return Err(format!( - "duplicate MTP field after translation: {application_name}" - )); - } - object.insert(application_name.to_owned(), data_to_json(value, map)?); + object.insert(name.to_owned(), data_to_json(value, map)?); } Value::Object(object) } @@ -1078,15 +801,16 @@ fn number_to_json(value: i128) -> Result { .map_err(|_| "number exceeds JSON range".into()) } +fn current_millis() -> u64 { + std::time::SystemTime::now() + .duration_since(std::time::UNIX_EPOCH) + .unwrap_or_default() + .as_millis() as u64 +} + #[cfg(test)] mod tests { - use mtp::codec::{CommunicationType, CommunicationValue, DataType, DataValue}; - use serde_json::json; - - use super::{ - container_value, decode_browser_base64, decode_sdk_bytes, frame_to_json, - jittered_retry_delay, json_to_frame, prepare_initial_state_ack, RequestIdAllocator, - }; + use super::{decode_browser_base64, decode_sdk_bytes}; #[test] fn browser_base64_accepts_file_whitespace_and_missing_padding() { @@ -1099,148 +823,11 @@ mod tests { assert_eq!(decode_sdk_bytes("0x01:02-ff").unwrap(), [1, 2, 255]); assert_eq!(decode_sdk_bytes("AQI=").unwrap(), [1, 2]); } - - #[test] - fn request_ids_are_nonzero_and_monotonic() { - let ids = RequestIdAllocator::new(); - - assert_eq!(ids.next().unwrap(), 1); - assert_eq!(ids.next().unwrap(), 2); - } - - #[test] - fn retry_jitter_stays_within_policy_bounds() { - let delay = jittered_retry_delay(std::time::Duration::from_secs(10)); - - assert!(delay >= std::time::Duration::from_secs(8)); - assert!(delay <= std::time::Duration::from_secs(12)); - } - - #[test] - fn json_content_uses_app_content_wire_type() { - let frame = json_to_frame( - "MessageEdit", - json!({ - "Content": "ciphertext", - "ChatPartnerId": 42, - "SendTime": 10, - }), - 1, - ) - .unwrap(); - - assert_eq!( - frame - .get_data(DataType::AppContent) - .and_then(DataValue::as_str), - Some("ciphertext") - ); - } - - #[test] - fn nested_json_content_uses_app_content_wire_type() { - let frame = json_to_frame( - "MessageEdit", - json!({ - "Message": { "Content": "ciphertext" }, - }), - 1, - ) - .unwrap(); - let message = frame.get_data(DataType::Message).unwrap(); - - assert_eq!( - container_value(message, DataType::AppContent).and_then(DataValue::as_str), - Some("ciphertext") - ); - } - - #[test] - fn app_content_is_exposed_as_content_to_frontend() { - let frame = CommunicationValue::new(CommunicationType::MessageEditLive) - .with_id(1) - .add_typed_default(DataType::AppContent, DataValue::Str("ciphertext".into())); - - let json = frame_to_json(&frame).unwrap(); - - assert_eq!(json["data"]["Content"], "ciphertext"); - assert!(json["data"].get("AppContent").is_none()); - } - - #[test] - fn translated_field_collisions_are_rejected() { - assert!(json_to_frame( - "MessageEdit", - json!({ "Content": "a", "AppContent": "b" }), - 1, - ) - .is_err()); - } - - fn valid_initial_state() -> CommunicationValue { - CommunicationValue::new(CommunicationType::ClientStateSync) - .add_typed_default(DataType::SessionId, DataValue::UnsignedNumber(1)) - .add_typed_default(DataType::VersionNumber, DataValue::UnsignedNumber(0)) - .add_typed_default(DataType::CacheSchemaVersion, DataValue::UnsignedNumber(0)) - .add_typed_default(DataType::SyncMode, DataValue::Str("full".into())) - .add_typed_default(DataType::Contacts, DataValue::Array(vec![])) - .add_typed_default(DataType::Communities, DataValue::Array(vec![])) - .add_typed_default(DataType::Calls, DataValue::Array(vec![])) - .add_typed_default(DataType::Messages, DataValue::Array(vec![])) - } - - #[test] - fn valid_initial_state_is_prepared_before_ack() { - let ids = RequestIdAllocator::new(); - let (state, ack) = prepare_initial_state_ack(&valid_initial_state(), &ids).unwrap(); - - assert_eq!(state["SyncMode"], "full"); - assert!(ack.is_type(CommunicationType::ClientStateAck)); - assert_eq!(ack.id(), Some(1)); - } - - #[test] - fn malformed_initial_state_does_not_prepare_ack() { - let ids = RequestIdAllocator::new(); - let malformed = valid_initial_state() - .add_typed_default(DataType::SyncMode, DataValue::Str("invalid".into())); - - assert!(prepare_initial_state_ack(&malformed, &ids).is_err()); - assert_eq!( - ids.next().unwrap(), - 1, - "no acknowledgement ID was allocated" - ); - } - - #[test] - fn malformed_nested_initial_state_does_not_prepare_ack() { - let ids = RequestIdAllocator::new(); - let malformed = CommunicationValue::new(CommunicationType::ClientStateSync) - .add_typed_default(DataType::SessionId, DataValue::UnsignedNumber(1)) - .add_typed_default(DataType::VersionNumber, DataValue::UnsignedNumber(0)) - .add_typed_default(DataType::CacheSchemaVersion, DataValue::UnsignedNumber(0)) - .add_typed_default(DataType::SyncMode, DataValue::Str("full".into())) - .add_typed_default( - DataType::Contacts, - DataValue::Array(vec![DataValue::Container(vec![])]), - ) - .add_typed_default(DataType::Communities, DataValue::Array(vec![])) - .add_typed_default(DataType::Calls, DataValue::Array(vec![])) - .add_typed_default(DataType::Messages, DataValue::Array(vec![])); - - assert!(prepare_initial_state_ack(&malformed, &ids).is_err()); - assert_eq!( - ids.next().unwrap(), - 1, - "no acknowledgement ID was allocated" - ); - } } #[tauri::command] -pub async fn mtp_request(type_name: String, data: Value) -> Result { - manager().request(&type_name, data).await +pub async fn mtp_request(type_name: String, data: Value, id: Option) -> Result { + manager().request(&type_name, data, id).await } #[tauri::command] diff --git a/apps/web/package.json b/apps/web/package.json index a6b3951..f608fcb 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -55,7 +55,6 @@ "esbuild": "^0.28.1", "eslint": "^10.8.0", "globals": "^17.9.0", - "mtp": "*", "typescript": "~6.0.3", "typescript-eslint": "^8.66.0", "vite": "^8.2.1" diff --git a/flake.nix b/flake.nix index 6a29551..d91a817 100644 --- a/flake.nix +++ b/flake.nix @@ -63,7 +63,6 @@ pipewire systemd wayland - webkitgtk_4_1 libX11 libXScrnSaver libXcomposite @@ -185,7 +184,6 @@ pipewire systemd wayland - webkitgtk_4_1 libX11 libXScrnSaver libXcomposite diff --git a/package.json b/package.json index 051f699..05856f5 100644 --- a/package.json +++ b/package.json @@ -29,22 +29,22 @@ }, "devDependencies": { "@eslint/js": "^10.0.1", - "@types/node": "^26.2.0", + "@types/node": "^26.1.2", "@types/react": "^19.2.18", "@types/react-dom": "^19.2.4", - "@typescript-eslint/parser": "^8.67.0", - "eslint": "^10.8.1", + "@typescript-eslint/parser": "^8.66.0", + "eslint": "^10.8.0", "eslint-plugin-react-hooks": "^7.1.1", - "fallow": "^3.17.0", - "globals": "^17.11.0", + "fallow": "^3.14.0", + "globals": "^17.9.0", "prettier": "^3.9.6", "typescript": "^6.0.3", - "typescript-eslint": "^8.67.0", - "vitest": "^4.1.11" + "typescript-eslint": "^8.66.0", + "vitest": "^4.1.10" }, "dependencies": { - "@methanium/ui": "https://git.methanium.net/methanium/ui/releases/download/0.0.29/methanium-ui.tgz", - "mtp": "https://git.methanium.net/methanium/mtp/releases/download/0.3.0-b331b9f6a3/mtp-0.3.0.tgz", - "sonner": "^2.0.8" + "@methanium/ui": "*", + "mtp": "*", + "sonner": "^2.0.7" } } diff --git a/packages/call/package.json b/packages/call/package.json index 7171f50..d4f7c10 100644 --- a/packages/call/package.json +++ b/packages/call/package.json @@ -28,7 +28,6 @@ "deepfilternet3-noise-filter": "1.3.0", "livekit-client": "^2.21.0", "lucide-react": "^1.29.0", - "mtp": "*", "react": "^19.2.8", "react-dom": "^19.2.8", "recharts": "^3.10.1", diff --git a/packages/call/src/mediaShare/index.ts b/packages/call/src/mediaShare/index.ts index 9706d4d..6d2c47f 100644 --- a/packages/call/src/mediaShare/index.ts +++ b/packages/call/src/mediaShare/index.ts @@ -19,6 +19,7 @@ export function getMediaShareAdapter(): MediaShareAdapter { export type { MediaShareAdapter, + MediaShareCapabilities, MediaShareKind, MediaShareRequest, MediaShareSession, diff --git a/packages/crypto/package.json b/packages/crypto/package.json index 2b40fdf..62580df 100644 --- a/packages/crypto/package.json +++ b/packages/crypto/package.json @@ -15,7 +15,6 @@ "build": "tsc -p tsconfig.json --noEmit" }, "dependencies": { - "mtp": "*", "react": "^19.2.8", "react-dom": "^19.2.8" } diff --git a/packages/crypto/src/callSecret.ts b/packages/crypto/src/callSecret.ts index 556d131..97ef318 100644 --- a/packages/crypto/src/callSecret.ts +++ b/packages/crypto/src/callSecret.ts @@ -13,13 +13,11 @@ export function deriveCallSecretId(callId: string): string { } export function ownKemPublicKeyFromKeyring(keyring: string): Uint8Array { - return crypto.keyringToKeys({ value: keyring, encoding: "base64" }) - .kemPublicKey; + return crypto.keyringToKeys(keyring).kemPublicKey; } export function kemPublicKeyFromPublicKeyBundle(publicKey: string): Uint8Array { - return crypto.publicKeyBundleToKeys({ value: publicKey, encoding: "base64" }) - .kemPublicKey; + return crypto.publicKeyBundleToKeys(publicKey).kemPublicKey; } export async function wrapCallSecret(args: { @@ -74,10 +72,7 @@ export async function unwrapCallSecret(args: { ); } - const ownKeys = crypto.keyringToKeys({ - value: args.keyring, - encoding: "base64", - }); + const ownKeys = crypto.keyringToKeys(args.keyring); const sharedSecret = crypto.decapsulate( ownKeys.kemSecretKey, args.kemCiphertext, diff --git a/packages/crypto/src/chatSecret.ts b/packages/crypto/src/chatSecret.ts index cbac59a..e6e836c 100644 --- a/packages/crypto/src/chatSecret.ts +++ b/packages/crypto/src/chatSecret.ts @@ -23,13 +23,11 @@ export function randomChatSecret(): Uint8Array { } export function ownKemPublicKeyFromKeyring(keyring: string): Uint8Array { - return crypto.keyringToKeys({ value: keyring, encoding: "base64" }) - .kemPublicKey; + return crypto.keyringToKeys(keyring).kemPublicKey; } export function kemPublicKeyFromPublicKeyBundle(publicKey: string): Uint8Array { - return crypto.publicKeyBundleToKeys({ value: publicKey, encoding: "base64" }) - .kemPublicKey; + return crypto.publicKeyBundleToKeys(publicKey).kemPublicKey; } export async function wrapChatSecret(args: { @@ -81,10 +79,7 @@ export async function unwrapChatSecret(args: { ); } - const ownKeys = crypto.keyringToKeys({ - value: args.keyring, - encoding: "base64", - }); + const ownKeys = crypto.keyringToKeys(args.keyring); const sharedSecret = crypto.decapsulate( ownKeys.kemSecretKey, args.kemCiphertext, diff --git a/packages/mtp/package.json b/packages/mtp/package.json index e036029..982593a 100644 --- a/packages/mtp/package.json +++ b/packages/mtp/package.json @@ -9,8 +9,7 @@ "scripts": { "format": "pnpm exec prettier --write .", "lint": "eslint src --ext .ts,.tsx", - "test": "vitest run", - "build": "pnpm run test && tsc -p tsconfig.json --noEmit" + "build": "tsc -p tsconfig.json --noEmit" }, "dependencies": { "@methanium/ui": "*", diff --git a/packages/mtp/src/context.test.tsx b/packages/mtp/src/context.test.tsx index b15043a..7f50aba 100644 --- a/packages/mtp/src/context.test.tsx +++ b/packages/mtp/src/context.test.tsx @@ -1,62 +1,6 @@ -import { afterEach, describe, expect, it, vi } from "vitest"; +import { describe, expect, it } from "vitest"; -import { RequestIdAllocator } from "./requestIds"; - -vi.mock("@methanium/ui", () => ({ - toast: { - dismiss: vi.fn(), - error: vi.fn(), - loading: vi.fn(), - }, -})); - -vi.mock("@tensamin/shared/log", () => ({ log: vi.fn() })); -vi.mock("@tensamin/storage/context", () => ({ - useStorage: () => ({ load: vi.fn() }), -})); - -const { completeInitialSynchronization, isPushType, validateResponse } = - await import("./context"); - -const validState = { - SessionId: 7, - VersionNumber: 2, - CacheSchemaVersion: 0, - SyncMode: "full", - Contacts: [], - Communities: [], - Calls: [], - Messages: [], - DeletedMessageIds: [], - DeletedContactIds: [], -}; - -function mockInitialSyncClient( - state: { type: string; data: unknown } = { - type: "ClientStateSync", - data: validState, - }, - acknowledgement: unknown = { type: "ClientStateAck", data: {} }, -) { - const handlers = new Map void>(); - const request = vi.fn().mockResolvedValue(acknowledgement); - const client = { - auth: vi.fn(async () => { - handlers.get(state.type)?.(state as never); - }), - subscribe: vi.fn((type: string, handler: (message: never) => void) => { - handlers.set(type, handler); - return () => handlers.delete(type); - }), - request, - disconnect: vi.fn(), - } as unknown as Parameters[0]; - return { client, handlers, request }; -} - -afterEach(() => { - vi.useRealTimers(); -}); +import { isPushType, validateResponse } from "./context"; describe("MTP protocol dispatch", () => { it("preserves protocol errors for the request layer", () => { @@ -75,146 +19,3 @@ describe("MTP protocol dispatch", () => { expect(isPushType("UnknownMessage")).toBe(false); }); }); - -describe("browser initial synchronization", () => { - it("validates state, sends a nonzero acknowledgement, then resolves", async () => { - const { client, request } = mockInitialSyncClient(); - - const state = await completeInitialSynchronization( - client, - new RequestIdAllocator(), - new AbortController().signal, - ); - - expect(state.data).toEqual(validState); - expect(request).toHaveBeenCalledWith( - "ClientStateAck", - { SessionId: 7, VersionNumber: 2 }, - { id: 1 }, - ); - }); - - it("does not acknowledge malformed state", async () => { - const { client, request } = mockInitialSyncClient({ - type: "ClientStateSync", - data: { ...validState, SyncMode: "invalid" }, - }); - - await expect( - completeInitialSynchronization( - client, - new RequestIdAllocator(), - new AbortController().signal, - ), - ).rejects.toThrow("Response validation failed"); - expect(request).not.toHaveBeenCalled(); - }); - - it("rejects ErrorNoIota during initial synchronization", async () => { - const { client, request } = mockInitialSyncClient({ - type: "ErrorNoIota", - data: {}, - }); - - await expect( - completeInitialSynchronization( - client, - new RequestIdAllocator(), - new AbortController().signal, - ), - ).rejects.toThrow("No Iota is currently connected"); - expect(request).not.toHaveBeenCalled(); - }); - - it("rejects an acknowledgement protocol error", async () => { - const { client } = mockInitialSyncClient(undefined, { - type: "ErrorInvalidData", - data: {}, - }); - - await expect( - completeInitialSynchronization( - client, - new RequestIdAllocator(), - new AbortController().signal, - ), - ).rejects.toThrow("State acknowledgement failed: ErrorInvalidData"); - }); - - it("times out a missing acknowledgement", async () => { - vi.useFakeTimers(); - const { client } = mockInitialSyncClient(); - vi.mocked(client.request).mockReturnValue(new Promise(() => {})); - const result = completeInitialSynchronization( - client, - new RequestIdAllocator(), - new AbortController().signal, - 100, - 10, - ); - const assertion = expect(result).rejects.toThrow( - "State acknowledgement timed out", - ); - - await vi.advanceTimersByTimeAsync(10); - await assertion; - }); - - it("stops immediately when the connection attempt is cancelled", async () => { - const { client } = mockInitialSyncClient(); - vi.mocked(client.auth).mockImplementation(() => new Promise(() => {})); - const controller = new AbortController(); - const result = completeInitialSynchronization( - client, - new RequestIdAllocator(), - controller.signal, - ); - - controller.abort(new Error("MTP connection lost")); - await expect(result).rejects.toThrow("MTP connection lost"); - }); - - it("times out authentication while waiting for initial state", async () => { - vi.useFakeTimers(); - const { client, handlers } = mockInitialSyncClient(); - vi.mocked(client.auth).mockImplementation(() => { - handlers.get("ClientStateSync")?.({ - type: "ClientStateSync", - data: validState, - } as never); - return new Promise(() => {}); - }); - const result = completeInitialSynchronization( - client, - new RequestIdAllocator(), - new AbortController().signal, - 100, - 10, - ); - const assertion = expect(result).rejects.toThrow( - "MTP authentication timed out", - ); - - await vi.advanceTimersByTimeAsync(100); - await assertion; - }); - - it("uses a fresh request ID namespace for each connection", async () => { - const first = mockInitialSyncClient(); - const second = mockInitialSyncClient(); - - await completeInitialSynchronization( - first.client, - new RequestIdAllocator(), - new AbortController().signal, - ); - await completeInitialSynchronization( - second.client, - new RequestIdAllocator(), - new AbortController().signal, - ); - - expect(first.request.mock.calls[0]?.[2]).toEqual({ id: 1 }); - expect(second.request.mock.calls[0]?.[2]).toEqual({ id: 1 }); - }); -}); diff --git a/packages/mtp/src/context.tsx b/packages/mtp/src/context.tsx index 53c1862..af06ee0 100644 --- a/packages/mtp/src/context.tsx +++ b/packages/mtp/src/context.tsx @@ -27,20 +27,7 @@ import { log } from "@tensamin/shared/log"; import { ProtocolError } from "@tensamin/shared/errors"; import { useStorage } from "@tensamin/storage/context"; -import { fromWireMessage, toWireData } from "./protocolFields"; -import { RequestIdAllocator } from "./requestIds"; -import { - DISCOVERY_TIMEOUT, - INITIAL_SYNC_TIMEOUT, - RECONNECT_JITTER, - RECONNECT_LONG_INTERVAL, - RECONNECT_RESET, - RECONNECT_TRIES, - RETRY_INTERVAL, - STATE_ACK_TIMEOUT, -} from "./values"; - -type BrowserMtpClient = Awaited>; +import { RECONNECT_RESET, RECONNECT_TRIES, RETRY_INTERVAL } from "./values"; function base64ToUint8Array(b64: string) { const bin = atob(b64); @@ -64,6 +51,7 @@ export type ProtocolMessage< export type BoundSendFn = ( type: T, data?: z.infer, + options?: { id?: number }, ) => Promise>; export type PushHandler = (message: ProtocolMessage) => void | Promise; @@ -84,29 +72,6 @@ export function isPushType(type: string): boolean { return (PUSH_TYPES as readonly string[]).includes(type); } -function normalizeMtpMessage(message: T): T { - return fromWireMessage(message); -} - -async function requestWithId( - client: BrowserMtpClient, - ids: RequestIdAllocator, - type: string, - data: Record, -) { - let id: number; - try { - id = ids.allocate(); - } catch (error) { - client.disconnect(); - throw error; - } - - return client.request(type, toWireData(data) as Record, { - id, - }); -} - function removeMissingContacts( contacts: Contacts, message: ProtocolMessage, @@ -196,120 +161,6 @@ export function validateResponse( } as ProtocolMessage; } -function abortError(signal: AbortSignal): Error { - return signal.reason instanceof Error - ? signal.reason - : new Error("Initial state synchronization was cancelled"); -} - -function withDeadline( - promise: Promise, - timeoutMs: number, - timeoutMessage: string, - signal: AbortSignal, -): Promise { - return new Promise((resolve, reject) => { - if (signal.aborted) { - reject(abortError(signal)); - return; - } - let settled = false; - const finish = (complete: () => void) => { - if (settled) return; - settled = true; - clearTimeout(timeout); - signal.removeEventListener("abort", onAbort); - complete(); - }; - const timeout = setTimeout( - () => finish(() => reject(new Error(timeoutMessage))), - timeoutMs, - ); - const onAbort = () => finish(() => reject(abortError(signal))); - signal.addEventListener("abort", onAbort, { once: true }); - promise.then( - (value) => finish(() => resolve(value)), - (error: unknown) => finish(() => reject(error)), - ); - }); -} - -export async function completeInitialSynchronization( - client: BrowserMtpClient, - ids: RequestIdAllocator, - signal: AbortSignal, - syncTimeoutMs = INITIAL_SYNC_TIMEOUT, - ackTimeoutMs = STATE_ACK_TIMEOUT, -): Promise> { - const stateSync = new Promise>( - (resolve, reject) => { - let unsubscribeStateSync = () => {}; - let unsubscribeNoIota = () => {}; - const cleanup = () => { - clearTimeout(timeout); - unsubscribeStateSync(); - unsubscribeNoIota(); - signal.removeEventListener("abort", onAbort); - }; - const onAbort = () => { - cleanup(); - reject(abortError(signal)); - }; - const timeout = setTimeout(() => { - cleanup(); - reject(new Error("Initial state synchronization timed out")); - }, syncTimeoutMs); - signal.addEventListener("abort", onAbort, { once: true }); - if (signal.aborted) { - onAbort(); - return; - } - unsubscribeStateSync = client.subscribe("ClientStateSync", (message) => { - cleanup(); - try { - resolve( - validateResponse("ClientStateSync", normalizeMtpMessage(message)), - ); - } catch (error) { - reject(error); - } - }); - unsubscribeNoIota = client.subscribe("ErrorNoIota", () => { - cleanup(); - reject(new Error("No Iota is currently connected")); - }); - }, - ); - const [, state] = await Promise.all([ - withDeadline( - client.auth(), - syncTimeoutMs, - "MTP authentication timed out", - signal, - ), - stateSync, - ]); - if (state.type.startsWith("Error")) { - throw new Error(`State synchronization failed: ${state.type}`); - } - const acknowledgement = normalizeMtpMessage( - await withDeadline( - requestWithId(client, ids, "ClientStateAck", { - SessionId: state.data.SessionId, - VersionNumber: state.data.VersionNumber, - }), - ackTimeoutMs, - "State acknowledgement timed out", - signal, - ), - ); - if (acknowledgement.type.startsWith("Error")) { - throw new Error(`State acknowledgement failed: ${acknowledgement.type}`); - } - if (signal.aborted) throw abortError(signal); - return state; -} - function useMessageHandlers() { const interceptorsRef = useRef(new Set()); const pushHandlersRef = useRef(new Set()); @@ -354,7 +205,6 @@ function BrowserProvider(props: { const clientRef = useRef> | null>( null, ); - const requestIdsRef = useRef(null); const { addInterceptor, interceptorsRef, @@ -373,24 +223,19 @@ function BrowserProvider(props: { // Validation override functions const send: BoundSendFn = useMemo( - () => async (type, data) => { + () => async (type, data, options) => { const client = clientRef.current; - const ids = requestIdsRef.current; if (!client) { throw new Error("mtp is not connected"); } - if (!ids) { - throw new Error("MTP request allocator is unavailable"); - } - const rawMessage = await requestWithId( - client, - ids, + const message = await client.request( type, (data ?? {}) as Record, + options, ); - const response = validateResponse(type, normalizeMtpMessage(rawMessage)); + const response = validateResponse(type, message); setFreshContacts((contacts) => removeMissingContacts(contacts, response)); if (response.type.startsWith("Error")) { const errorData = response.data as Record; @@ -415,7 +260,7 @@ function BrowserProvider(props: { } return client.subscribe(type, (message) => { - handler(validateResponse(type, normalizeMtpMessage(message))); + handler(validateResponse(type, message)); }); }, []); @@ -446,39 +291,33 @@ function BrowserProvider(props: { const scheduleReconnect = (error: unknown) => { if (disposed || reconnectScheduled) return; - attempts += 1; - const shortRetry = attempts <= RECONNECT_TRIES; - if (!shortRetry) { + if (attempts >= RECONNECT_TRIES) { log(0, "mtp", "red", "Reconnection attempts exhausted", error); sonnerToast.error("Connection failed", { id: "mtp-connection-toast", description: error instanceof Error - ? `${error.message.split(":")[0]}. Retrying in the background.` - : "Connection lost. Retrying in the background.", + ? error.message.split(":")[0] + : "Connection lost", icon: null, duration: Infinity, closeButton: true, promise: null, } as unknown as Parameters[1]); - } else { - sonnerToast.loading( - `Reconnecting to server... (attempt ${attempts} of ${RECONNECT_TRIES})`, - { id: "mtp-connection-toast" }, - ); + return; } - const baseDelay = shortRetry ? RETRY_INTERVAL : RECONNECT_LONG_INTERVAL; - const jitter = 1 + (Math.random() * 2 - 1) * RECONNECT_JITTER; - reconnectScheduled = true; - reconnectTimer = setTimeout( - () => { - reconnectScheduled = false; - reconnectTimer = null; - void connect(); - }, - Math.round(baseDelay * jitter), + attempts += 1; + sonnerToast.loading( + `Reconnecting to server... (attempt ${attempts} of ${RECONNECT_TRIES})`, + { id: "mtp-connection-toast" }, ); + reconnectScheduled = true; + reconnectTimer = setTimeout(() => { + reconnectScheduled = false; + reconnectTimer = null; + void connect(); + }, RETRY_INTERVAL); }; async function connect() { @@ -487,16 +326,10 @@ function BrowserProvider(props: { const generation = ++connectionGeneration; let client: Awaited> | null = null; let failed = false; - let connectionReady = false; - const attemptAbort = new AbortController(); const cleanup = () => { - attemptAbort.abort( - new Error("Initial state synchronization was cancelled"), - ); client?.disconnect(); if (clientRef.current === client) { clientRef.current = null; - requestIdsRef.current = null; } clearReconnectResetTimer(); if (generation === connectionGeneration) { @@ -526,18 +359,19 @@ function BrowserProvider(props: { omikronPublicKey = forcedOmikronPublicKey; } else { log(2, "mtp", "purple", "Fetching Omikron data."); - const data = await fetch(`${mtpUrl}api/get/omikron/${userId}`, { - signal: AbortSignal.any([ - attemptAbort.signal, - AbortSignal.timeout(DISCOVERY_TIMEOUT), - ]), - }); + const data = await fetch(`${mtpUrl}api/get/omikron/${userId}`); if (data.status === 404) { - throw new Error("No Omikron assignment is currently available"); - } - if (!data.ok) { - throw new Error(`Omikron discovery failed: HTTP ${data.status}`); + sonnerToast.error("We couldn't reach your Iota", { + description: + "Check your network connection and try restarting your Iota", + icon: null, + duration: Infinity, + closeButton: true, + }); + resolveConnectionRef.current?.(); + cleanup(); + return; } const omikronData = (await data.json()) as { id: number; @@ -570,10 +404,7 @@ function BrowserProvider(props: { clientId: userId, keyring: base64ToUint8Array(keyring), }, - hostPublicKey: { - value: omikronPublicKey, - encoding: "base64", - }, + hostPublicKey: omikronPublicKey, descriptor: "client", pings: true, logger: (event) => { @@ -587,12 +418,10 @@ function BrowserProvider(props: { !failed ) { failed = true; - const error = new Error("MTP connection lost"); - attemptAbort.abort(error); - if (connectionReady) { - cleanup(); - scheduleReconnect(error); - } + clientRef.current = null; + setIdentified(false); + setIdentifying(false); + scheduleReconnect(new Error("MTP connection lost")); } } @@ -627,12 +456,11 @@ function BrowserProvider(props: { const activeClient = client; clientRef.current = activeClient; - requestIdsRef.current = new RequestIdAllocator(); for (const type of PUSH_TYPES) { activeClient.subscribe(type, (message) => { let validated: ProtocolMessage; try { - validated = validateResponse(type, normalizeMtpMessage(message)); + validated = validateResponse(type, message); } catch (error) { log(1, "mtp", "red", "Failed to validate push message", error, { type, @@ -654,45 +482,80 @@ function BrowserProvider(props: { if (validated.type === "GetStates") { lastInitialStateRef.current = validated; } - if ( - validated.type === "ErrorNoIota" && - clientRef.current === activeClient && - !failed - ) { - failed = true; - const error = new Error("No Iota is currently connected"); - attemptAbort.abort(error); - cleanup(); - scheduleReconnect(error); - } }); } + setReadyState(activeClient.state); + + clearReconnectTimer(); + + // Schedule reconnect reset + clearReconnectResetTimer(); + reconnectResetTimer = setTimeout(() => { + attempts = 0; + reconnectResetTimer = null; + }, RECONNECT_RESET * 1_000); + setReadyState(activeClient.state); setIdentifying(true); - const ids = requestIdsRef.current; - if (!ids) throw new Error("MTP request allocator is unavailable"); - const finalResponse = await completeInitialSynchronization( - activeClient, - ids, - attemptAbort.signal, + const stateSync = new Promise>( + (resolve, reject) => { + let unsubscribeStateSync = () => {}; + let unsubscribeNoIota = () => {}; + const cleanupStateSync = () => { + clearTimeout(timeout); + unsubscribeStateSync(); + unsubscribeNoIota(); + }; + const timeout = setTimeout(() => { + cleanupStateSync(); + reject(new Error("Initial state synchronization timed out")); + }, 120_000); + unsubscribeStateSync = activeClient.subscribe( + "ClientStateSync", + (message) => { + cleanupStateSync(); + try { + resolve(validateResponse("ClientStateSync", message)); + } catch (error) { + reject(error); + } + }, + ); + unsubscribeNoIota = activeClient.subscribe("ErrorNoIota", () => { + cleanupStateSync(); + reject(new Error("No Iota is currently connected")); + }); + }, ); + const [, finalResponse] = await Promise.all([ + activeClient.auth(), + stateSync, + ]); + + if (finalResponse.type.startsWith("Error")) { + throw new Error( + `State synchronization failed: ${finalResponse.type}`, + ); + } + + const acknowledgement = await activeClient.request("ClientStateAck", { + SessionId: finalResponse.data.SessionId, + VersionNumber: finalResponse.data.VersionNumber, + }); + if (acknowledgement.type.startsWith("Error")) { + throw new Error( + `State acknowledgement failed: ${acknowledgement.type}`, + ); + } if (disposed || clientRef.current !== activeClient) return; setFreshContacts(finalResponse.data.Contacts); setFreshCommunities(finalResponse.data.Communities); setFreshCalls(finalResponse.data.Calls); - connectionReady = true; setIdentifying(false); setIdentified(true); - - clearReconnectTimer(); - clearReconnectResetTimer(); - reconnectResetTimer = setTimeout(() => { - attempts = 0; - reconnectResetTimer = null; - }, RECONNECT_RESET * 1_000); resolveConnectionRef.current?.(); } catch (connectError) { if (disposed || generation !== connectionGeneration) { @@ -726,7 +589,6 @@ function BrowserProvider(props: { clientRef.current?.disconnect(); clientRef.current = null; - requestIdsRef.current = null; setReadyState(ConnectionState.Disconnected); setIdentified(false); setIdentifying(false); @@ -788,9 +650,9 @@ function BrowserProvider(props: { }, [connected, identified, mtpUrl, send, subscribe, subscribePush, mtpRef]); const sendQueued: BoundSendFn = useMemo( - () => async (type, data) => { + () => async (type, data, options) => { const mtp = await mtpRef.get(); - const response = await mtp.send(type, data); + const response = await mtp.send(type, data, options); for (const interceptor of interceptorsRef.current) { void Promise.resolve( interceptor({ type, data, response: response as ProtocolMessage }), @@ -862,32 +724,16 @@ function TauriProvider(props: { if (next.error) { log(0, "android", "orange", "MTP connection failed", next.error); } - if (!next.identified) { - setSnapshot(next); - return; - } - if (next.state === undefined) { - setSnapshot({ - ...next, - identified: false, - error: "Native MTP connection omitted initial state", - }); - return; - } + setSnapshot(next); + if (!next.identified || next.state === undefined) return; const parsed = schemas.ClientStateSync.response.safeParse(next.state); if (!parsed.success) { log(0, "mtp", "red", "Invalid native MTP state", parsed.error); - setSnapshot({ - ...next, - identified: false, - error: "Invalid ClientStateSync payload", - }); return; } setFreshContacts(parsed.data.Contacts); setFreshCommunities(parsed.data.Communities); setFreshCalls(parsed.data.Calls); - setSnapshot(next); }, []); const dispatchMessage = useCallback( @@ -898,7 +744,7 @@ function TauriProvider(props: { try { validated = validateResponse( message.type as keyof Schemas & string, - normalizeMtpMessage(message), + message, ); } catch (error) { log(1, "mtp", "red", "Failed to validate native MTP message", error); @@ -1000,12 +846,13 @@ function TauriProvider(props: { }, [props.blockConnection]); const send = useCallback( - async (type, data) => { + async (type, data, options) => { const response = await invoke("mtp_request", { typeName: type, data: data ?? {}, + id: options?.id, }); - const validated = validateResponse(type, normalizeMtpMessage(response)); + const validated = validateResponse(type, response); setFreshContacts((contacts) => removeMissingContacts(contacts, validated), ); diff --git a/packages/mtp/src/index.ts b/packages/mtp/src/index.ts index 19f5acd..39bce46 100644 --- a/packages/mtp/src/index.ts +++ b/packages/mtp/src/index.ts @@ -1,5 +1,4 @@ export { Provider, useMTP } from "./context"; -export { RequestIdAllocator } from "./requestIds"; export type { BoundSendFn, MTPExchange, diff --git a/packages/mtp/src/protocolFields.test.ts b/packages/mtp/src/protocolFields.test.ts deleted file mode 100644 index ef0c18f..0000000 --- a/packages/mtp/src/protocolFields.test.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { describe, expect, it } from "vitest"; - -import { fromWireData, toWireData } from "./protocolFields"; - -describe("MTP protocol field translation", () => { - it("maps application message fields to MTP wire fields", () => { - expect( - toWireData({ - Messages: [{ Content: "abc", MessageId: 4 }], - }), - ).toEqual({ - Messages: [{ AppContent: "abc", AppMessageId: 4 }], - }); - }); - - it("maps MTP wire fields back to application fields", () => { - expect( - fromWireData({ - AppCreatedAt: 123, - Message: { AppContent: "abc", AppMessageId: 4 }, - }), - ).toEqual({ - CreatedAt: 123, - Message: { Content: "abc", MessageId: 4 }, - }); - }); - - it("preserves byte arrays and unrelated fields", () => { - const bytes = new Uint8Array([1, 2, 3]); - const translated = toWireData({ Payload: bytes, Other: "value" }) as { - Payload: Uint8Array; - Other: string; - }; - - expect(translated.Payload).toBe(bytes); - expect(translated.Other).toBe("value"); - }); - - it("rejects field mapping collisions", () => { - expect(() => toWireData({ Content: "a", AppContent: "b" })).toThrow( - "MTP field translation collision", - ); - }); -}); diff --git a/packages/mtp/src/protocolFields.ts b/packages/mtp/src/protocolFields.ts deleted file mode 100644 index 3ec3d5d..0000000 --- a/packages/mtp/src/protocolFields.ts +++ /dev/null @@ -1,58 +0,0 @@ -const APPLICATION_TO_WIRE_FIELDS = { - Content: "AppContent", - CreatedAt: "AppCreatedAt", - MessageId: "AppMessageId", -} as const; - -const WIRE_TO_APPLICATION_FIELDS = { - AppContent: "Content", - AppCreatedAt: "CreatedAt", - AppMessageId: "MessageId", -} as const; - -function mapProtocolFields( - value: unknown, - fieldMap: Readonly>, -): unknown { - if ( - value === null || - typeof value !== "object" || - value instanceof Uint8Array - ) { - return value; - } - - if (Array.isArray(value)) { - return value.map((item) => mapProtocolFields(item, fieldMap)); - } - - const source = value as Record; - const target: Record = {}; - - for (const [key, child] of Object.entries(source)) { - const mappedKey = fieldMap[key] ?? key; - - if (mappedKey in target) { - throw new Error(`MTP field translation collision for ${mappedKey}`); - } - - target[mappedKey] = mapProtocolFields(child, fieldMap); - } - - return target; -} - -export function toWireData(value: unknown): unknown { - return mapProtocolFields(value, APPLICATION_TO_WIRE_FIELDS); -} - -export function fromWireData(value: unknown): unknown { - return mapProtocolFields(value, WIRE_TO_APPLICATION_FIELDS); -} - -export function fromWireMessage(message: T): T { - return { - ...message, - data: fromWireData(message.data), - }; -} diff --git a/packages/mtp/src/requestIds.test.ts b/packages/mtp/src/requestIds.test.ts deleted file mode 100644 index 82fd508..0000000 --- a/packages/mtp/src/requestIds.test.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { describe, expect, it } from "vitest"; - -import { RequestIdAllocator } from "./requestIds"; - -describe("MTP request ID allocation", () => { - it("allocates nonzero request IDs monotonically", () => { - const ids = new RequestIdAllocator(); - - expect(ids.allocate()).toBe(1); - expect(ids.allocate()).toBe(2); - expect(new RequestIdAllocator().allocate()).toBe(1); - }); - - it("does not wrap exhausted request IDs", () => { - const ids = new RequestIdAllocator(0x1_0000_0000); - - expect(() => ids.allocate()).toThrow("MTP request ID space exhausted"); - }); - - it("rejects invalid allocator states", () => { - expect(() => new RequestIdAllocator(0)).toThrow( - "invalid MTP request ID allocator state", - ); - }); -}); diff --git a/packages/mtp/src/requestIds.ts b/packages/mtp/src/requestIds.ts deleted file mode 100644 index 5581e8a..0000000 --- a/packages/mtp/src/requestIds.ts +++ /dev/null @@ -1,24 +0,0 @@ -const MAX_MTP_REQUEST_ID = 0xffff_ffff; - -export class RequestIdAllocator { - #next: number; - - constructor(next = 1) { - if ( - !Number.isSafeInteger(next) || - next <= 0 || - next > MAX_MTP_REQUEST_ID + 1 - ) { - throw new RangeError("invalid MTP request ID allocator state"); - } - this.#next = next; - } - - allocate(): number { - if (this.#next > MAX_MTP_REQUEST_ID) { - throw new Error("MTP request ID space exhausted for this connection"); - } - - return this.#next++; - } -} diff --git a/packages/mtp/src/values.ts b/packages/mtp/src/values.ts index c5ba321..d9f6cd4 100644 --- a/packages/mtp/src/values.ts +++ b/packages/mtp/src/values.ts @@ -1,8 +1,3 @@ export const RETRY_INTERVAL = 3_000; export const RECONNECT_TRIES = 3; export const RECONNECT_RESET = 6; -export const RECONNECT_LONG_INTERVAL = 60_000; -export const RECONNECT_JITTER = 0.2; -export const DISCOVERY_TIMEOUT = 20_000; -export const INITIAL_SYNC_TIMEOUT = 120_000; -export const STATE_ACK_TIMEOUT = 30_000; diff --git a/packages/notifications/src/context.tsx b/packages/notifications/src/context.tsx index 7a8b32a..1835dc1 100644 --- a/packages/notifications/src/context.tsx +++ b/packages/notifications/src/context.tsx @@ -87,9 +87,15 @@ export default function Provider(props: { children: React.ReactNode }) { moveUserIdToTop(data.SenderId); if (await load("settings.receive_confirmations")) { - void send("MessageState", { - MessageState: "received", - }); + void send( + "MessageState", + { + MessageState: "received", + }, + { + id: data.Message.SendTime, + }, + ); } } diff --git a/packages/settings/src/layout.tsx b/packages/settings/src/layout.tsx index 5d49f0b..53759cd 100644 --- a/packages/settings/src/layout.tsx +++ b/packages/settings/src/layout.tsx @@ -1,8 +1,8 @@ -import { Outlet, useLocation } from "@tanstack/react-router"; -import { Button, useIsMobile } from "@methanium/ui"; +import { Outlet, useLocation, useNavigate } from "@tanstack/react-router"; +import { Button, ClearStorageButton, cn, useIsMobile } from "@methanium/ui"; import { ArrowLeft } from "lucide-react"; -import { SettingsSidebar } from "./sidebar"; +import { settingsNavigation } from "./manifest"; export default function SettingsLayout() { const isMobile = useIsMobile(); @@ -36,3 +36,47 @@ export default function SettingsLayout() { ); } + +export function SettingsSidebar({ + mobile = false, + className, +}: { + mobile?: boolean; + className?: string; +}) { + const navigate = useNavigate(); + const categories = [ + ...new Set(settingsNavigation.map((page) => page.category)), + ]; + + return ( +
+ {categories.map((category) => ( +
+

{category}

+ {settingsNavigation + .filter((page) => page.category === category) + .map((page) => ( + + ))} +
+ ))} +
+ +
+
+ ); +} diff --git a/packages/settings/src/manifest.ts b/packages/settings/src/manifest.ts index 1afdd5a..41fe14a 100644 --- a/packages/settings/src/manifest.ts +++ b/packages/settings/src/manifest.ts @@ -8,24 +8,46 @@ import Profile from "./pages/profile"; import Security from "./pages/security"; import Theme from "./pages/theme"; import Hotkeys from "./pages/hotkeys"; -import { settingsNavigation } from "./navigation"; - -const pageComponents = { - profile: Profile, - security: Security, - chat: Chat, - call: Call, - cache: Cache, - theme: Theme, - accessibility: Accessibility, - hotkeys: Hotkeys, - licenses: Licenses, -} as const; export const settingsPages = [ { path: "/", component: Index }, - ...settingsNavigation.map((page) => ({ - ...page, - component: pageComponents[page.path], - })), + { + category: "account", + path: "profile", + label: "Profile", + component: Profile, + }, + { + category: "account", + path: "security", + label: "Security", + component: Security, + }, + { category: "general", path: "chat", label: "Chat", component: Chat }, + { category: "general", path: "call", label: "Call", component: Call }, + { category: "application", path: "cache", label: "Cache", component: Cache }, + { category: "application", path: "theme", label: "Theme", component: Theme }, + { + category: "application", + path: "accessibility", + label: "Accessibility", + component: Accessibility, + }, + { + category: "application", + path: "hotkeys", + label: "Hotkeys", + component: Hotkeys, + }, + { + category: "application", + path: "licenses", + label: "Licenses", + component: Licenses, + }, ] as const; + +export const settingsNavigation = settingsPages.filter( + (page): page is Exclude<(typeof settingsPages)[number], { path: "/" }> => + page.path !== "/", +); diff --git a/packages/settings/src/navigation.ts b/packages/settings/src/navigation.ts deleted file mode 100644 index b47fae9..0000000 --- a/packages/settings/src/navigation.ts +++ /dev/null @@ -1,31 +0,0 @@ -export const settingsNavigation = [ - { - category: "account", - path: "profile", - label: "Profile", - }, - { - category: "account", - path: "security", - label: "Security", - }, - { category: "general", path: "chat", label: "Chat" }, - { category: "general", path: "call", label: "Call" }, - { category: "application", path: "cache", label: "Cache" }, - { category: "application", path: "theme", label: "Theme" }, - { - category: "application", - path: "accessibility", - label: "Accessibility", - }, - { - category: "application", - path: "hotkeys", - label: "Hotkeys", - }, - { - category: "application", - path: "licenses", - label: "Licenses", - }, -] as const; diff --git a/packages/settings/src/pages/index.tsx b/packages/settings/src/pages/index.tsx index b5d04e3..803a0c1 100644 --- a/packages/settings/src/pages/index.tsx +++ b/packages/settings/src/pages/index.tsx @@ -1,4 +1,4 @@ -import { SettingsSidebar } from "../sidebar"; +import { SettingsSidebar } from "../layout"; export default function Page() { return ( diff --git a/packages/settings/src/sidebar.tsx b/packages/settings/src/sidebar.tsx deleted file mode 100644 index 3a2155e..0000000 --- a/packages/settings/src/sidebar.tsx +++ /dev/null @@ -1,48 +0,0 @@ -import { Button, ClearStorageButton, cn } from "@methanium/ui"; -import { useNavigate } from "@tanstack/react-router"; - -import { settingsNavigation } from "./navigation"; - -export function SettingsSidebar({ - mobile = false, - className, -}: { - mobile?: boolean; - className?: string; -}) { - const navigate = useNavigate(); - const categories = [ - ...new Set(settingsNavigation.map((page) => page.category)), - ]; - - return ( -
- {categories.map((category) => ( -
-

{category}

- {settingsNavigation - .filter((page) => page.category === category) - .map((page) => ( - - ))} -
- ))} -
- -
-
- ); -} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0cbdd6e..faff301 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,7 +6,7 @@ settings: overrides: '@methanium/ui': https://git.methanium.net/methanium/ui/releases/download/0.0.29/methanium-ui.tgz - mtp: https://git.methanium.net/methanium/mtp/releases/download/0.3.0-b331b9f6a3/mtp-0.3.0.tgz + mtp: https://git.methanium.net/methanium/mtp/releases/download/0.2.0-dev-a692bed/mtp-0.2.0.tgz importers: @@ -16,17 +16,17 @@ importers: specifier: https://git.methanium.net/methanium/ui/releases/download/0.0.29/methanium-ui.tgz version: https://git.methanium.net/methanium/ui/releases/download/0.0.29/methanium-ui.tgz(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(emojibase@17.0.0)(react-dom@19.2.8(react@19.2.8))(react-is@19.2.8)(react@19.2.8)(redux@5.0.1)(supports-color@7.2.0)(typescript@6.0.3) mtp: - specifier: https://git.methanium.net/methanium/mtp/releases/download/0.3.0-b331b9f6a3/mtp-0.3.0.tgz - version: https://git.methanium.net/methanium/mtp/releases/download/0.3.0-b331b9f6a3/mtp-0.3.0.tgz + specifier: https://git.methanium.net/methanium/mtp/releases/download/0.2.0-dev-a692bed/mtp-0.2.0.tgz + version: https://git.methanium.net/methanium/mtp/releases/download/0.2.0-dev-a692bed/mtp-0.2.0.tgz sonner: - specifier: ^2.0.8 - version: 2.0.8(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8) + specifier: ^2.0.7 + version: 2.0.7(react-dom@19.2.8(react@19.2.8))(react@19.2.8) devDependencies: '@eslint/js': specifier: ^10.0.1 version: 10.0.1(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0)) '@types/node': - specifier: ^26.2.0 + specifier: ^26.1.2 version: 26.2.0 '@types/react': specifier: ^19.2.18 @@ -35,20 +35,20 @@ importers: specifier: ^19.2.4 version: 19.2.4(@types/react@19.2.18) '@typescript-eslint/parser': - specifier: ^8.67.0 - version: 8.67.0(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3) + specifier: ^8.66.0 + version: 8.66.0(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3) eslint: - specifier: ^10.8.1 + specifier: ^10.8.0 version: 10.8.1(jiti@2.7.0)(supports-color@7.2.0) eslint-plugin-react-hooks: specifier: ^7.1.1 version: 7.1.1(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0) fallow: - specifier: ^3.17.0 - version: 3.17.0 + specifier: ^3.14.0 + version: 3.14.0 globals: - specifier: ^17.11.0 - version: 17.11.0 + specifier: ^17.9.0 + version: 17.9.0 prettier: specifier: ^3.9.6 version: 3.9.6 @@ -56,11 +56,11 @@ importers: specifier: ^6.0.3 version: 6.0.3 typescript-eslint: - specifier: ^8.67.0 - version: 8.67.0(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3) + specifier: ^8.66.0 + version: 8.66.0(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3) vitest: - specifier: ^4.1.11 - version: 4.1.11(@types/node@26.2.0)(vite@8.2.1(@types/node@26.2.0)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.50.0)(yaml@2.9.0)) + specifier: ^4.1.10 + version: 4.1.10(@types/node@26.2.0)(vite@8.2.1(@types/node@26.2.0)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.50.0)(yaml@2.9.0)) apps/electron: devDependencies: @@ -98,8 +98,8 @@ importers: specifier: workspace:* version: link:../../packages/storage mtp: - specifier: https://git.methanium.net/methanium/mtp/releases/download/0.3.0-b331b9f6a3/mtp-0.3.0.tgz - version: https://git.methanium.net/methanium/mtp/releases/download/0.3.0-b331b9f6a3/mtp-0.3.0.tgz + specifier: https://git.methanium.net/methanium/mtp/releases/download/0.2.0-dev-a692bed/mtp-0.2.0.tgz + version: https://git.methanium.net/methanium/mtp/releases/download/0.2.0-dev-a692bed/mtp-0.2.0.tgz react: specifier: ^19.2.8 version: 19.2.8 @@ -289,9 +289,6 @@ importers: globals: specifier: ^17.9.0 version: 17.9.0 - mtp: - specifier: https://git.methanium.net/methanium/mtp/releases/download/0.3.0-b331b9f6a3/mtp-0.3.0.tgz - version: https://git.methanium.net/methanium/mtp/releases/download/0.3.0-b331b9f6a3/mtp-0.3.0.tgz typescript: specifier: ~6.0.3 version: 6.0.3 @@ -355,9 +352,6 @@ importers: lucide-react: specifier: ^1.29.0 version: 1.30.0(react@19.2.8) - mtp: - specifier: https://git.methanium.net/methanium/mtp/releases/download/0.3.0-b331b9f6a3/mtp-0.3.0.tgz - version: https://git.methanium.net/methanium/mtp/releases/download/0.3.0-b331b9f6a3/mtp-0.3.0.tgz react: specifier: ^19.2.8 version: 19.2.8 @@ -430,9 +424,6 @@ importers: packages/crypto: dependencies: - mtp: - specifier: https://git.methanium.net/methanium/mtp/releases/download/0.3.0-b331b9f6a3/mtp-0.3.0.tgz - version: https://git.methanium.net/methanium/mtp/releases/download/0.3.0-b331b9f6a3/mtp-0.3.0.tgz react: specifier: ^19.2.8 version: 19.2.8 @@ -477,8 +468,8 @@ importers: specifier: workspace:* version: link:../storage mtp: - specifier: https://git.methanium.net/methanium/mtp/releases/download/0.3.0-b331b9f6a3/mtp-0.3.0.tgz - version: https://git.methanium.net/methanium/mtp/releases/download/0.3.0-b331b9f6a3/mtp-0.3.0.tgz + specifier: https://git.methanium.net/methanium/mtp/releases/download/0.2.0-dev-a692bed/mtp-0.2.0.tgz + version: https://git.methanium.net/methanium/mtp/releases/download/0.2.0-dev-a692bed/mtp-0.2.0.tgz react: specifier: ^19.2.8 version: 19.2.8 @@ -1273,8 +1264,8 @@ packages: '@codemirror/autocomplete@6.20.3': resolution: {integrity: sha512-tlosUqb+3BbxCxZdu4tKeRghPFC+QM7q4X5YhKV2eCmPG+1r2F3f4AaSz5sCrFqUtX4Jh20VFTKecl16MgiV9g==} - '@codemirror/commands@6.11.0': - resolution: {integrity: sha512-/K4Rl5BN0OtTiPWmJCdqODu38XnDMsDxKY5rgrPnCkutPTJf2wVbkoixLfealF5Kwse/s8P8M5jAiURiwSwnFA==} + '@codemirror/commands@6.10.4': + resolution: {integrity: sha512-Ryk9y9T0FFVF0cUGhAknveAyUOl/A1qReTFi+qPKtOh2Z9F4AUBz3XOrYD4ZEgZirdugVzHvd/2/Wcwy5OliTg==} '@codemirror/lang-css@6.3.1': resolution: {integrity: sha512-kr5fwBGiGtmz6l0LSJIbno9QrifNMUusivHbnA1H6Dmqy4HZFte3UAICix1VuKo0lMPKQr2rqB+0BkKi/S3Ejg==} @@ -1297,8 +1288,8 @@ packages: '@codemirror/state@6.7.1': resolution: {integrity: sha512-9QzNDgE4EYDnAHfrTlR2lwiPciiOymLtwKK+8yHQzCc7GXhAP9xdEbEJFy2IWB1j9UGUl9BsgMmTo/ImA02T7A==} - '@codemirror/view@6.43.9': - resolution: {integrity: sha512-sTuUzTpPMFebRhg6dawChoKKgndIwfjmJgKVxBefPElcU2NwQ6AFroupk0SFqEerQyZOGRfDNnSN8Dw/lMAsXw==} + '@codemirror/view@6.43.8': + resolution: {integrity: sha512-qtItTDssZ/5GFfi94hrILu9j/VUeFPDPkhovEfmWFj2ipTxnzPB8DdHgfbb8HYTzLTYhrndKmyQxXUz/PDLenw==} '@dotenvx/dotenvx@1.75.1': resolution: {integrity: sha512-/BITOC9dmS/edY2zQwZNicQ059O6RKabtQfyEafV0nGtfYRNHYy1DIPiYVcov40+tob9hfmBnbR963dS+EQ1DQ==} @@ -1546,43 +1537,43 @@ packages: resolution: {integrity: sha512-+CNAzxglkrpNf/kKywqQfk74QjtceuOE7Qm+AF8miRvPF/wmmK5+OJOgVh3AVTT3RP2mH3+FOaxlE5v72owk0A==} engines: {node: ^20.19.0 || ^22.13.0 || >=24} - '@fallow-cli/darwin-arm64@3.17.0': - resolution: {integrity: sha512-u9O4aQaTSdaZaa4MAVEZEiwOx6QQzChymyQPrxV6KvDcVbcl0oYSekJKdvN4gEqUY8ClMze9gWS1tbn/W3N4dQ==} + '@fallow-cli/darwin-arm64@3.14.0': + resolution: {integrity: sha512-seaix3OqADcq90PkPOOPrN8Jl7QZDGjFziHA85Ikp+lGSHVjJ2IMyGh/QKLhvi9Q6Ha3Y//F0+PFFGNd0Gi4mw==} cpu: [arm64] os: [darwin] - '@fallow-cli/darwin-x64@3.17.0': - resolution: {integrity: sha512-l3tZJovnCa8j+im4qTl4GVSfrx4gisJYeHDwb5TbcdTGaWYz42gHriAaz5MhOR8S24q3xRegX8QrI8PA4XXU4g==} + '@fallow-cli/darwin-x64@3.14.0': + resolution: {integrity: sha512-qgYZHHTFobuJCtON7aVe/tXCUjiF/9nKT4tNLVfUPH4Qe9KwieO4rAuknDOnxkjzsWPO4MfHyCbcVdslf4JMnw==} cpu: [x64] os: [darwin] - '@fallow-cli/linux-arm64-gnu@3.17.0': - resolution: {integrity: sha512-IAjS6qR4tHcRo1y5lzYT6mktN/ATPyPNrJ6yjwTORwwQV1YfMO58A5zGBfJlPBY+lUmaMZ9w37ftvH9a2AS4dQ==} + '@fallow-cli/linux-arm64-gnu@3.14.0': + resolution: {integrity: sha512-FwmIG391lMViBXh1cAvOcwQxbI2sLjEYkugFauVbmntjuJt6xVxQXAxjybdFXSL/jjfFnbAzPKy9oHlhq3sA6A==} cpu: [arm64] os: [linux] - '@fallow-cli/linux-arm64-musl@3.17.0': - resolution: {integrity: sha512-Oe1dvk5Wt5Bmnxfc6HufJTaFY9SEwDVrZpnSdVQlv+nvz7DzrTK1r91cR3Ip477ANSLa9XD/MHPMpfqqo0dlZg==} + '@fallow-cli/linux-arm64-musl@3.14.0': + resolution: {integrity: sha512-x4R9aNT2kIoSHRIZ5s2MZ+swyb3uutV6SSYCwWhPSE5UI/oCEYWNWiYS7uKMLM0cTuMPVcsm2qMTd4iYA3ACLw==} cpu: [arm64] os: [linux] - '@fallow-cli/linux-x64-gnu@3.17.0': - resolution: {integrity: sha512-XgLU2a51zuky7gifjVDHuiJGToAReDsVCDcyDF84TQz/h3bqO0iRkpDL8dh7+HODku84+EffpK5ZHY19n6Ij0w==} + '@fallow-cli/linux-x64-gnu@3.14.0': + resolution: {integrity: sha512-8kBxy9FkwKjiH1C19T0nSkmbtldwVyWLQWajIqvyHE0x4rurHhve7RQrwEDPzNMFu7OgYCMU1nXr/AMIJ6Kg9w==} cpu: [x64] os: [linux] - '@fallow-cli/linux-x64-musl@3.17.0': - resolution: {integrity: sha512-GnDZx2kbLKKdYAp05NSKv6CZHgzEKvhRd0btCKFMMpUEhdzmr4uh2Qb4UzKDBg/q2r1EhkzN4b/qC+tbFCmtwA==} + '@fallow-cli/linux-x64-musl@3.14.0': + resolution: {integrity: sha512-9TAdXSpYvk9WkKy2GR8T/PHbq7QCTO/SYUmiZ+EAJUMzXBvSfnpj8cCGQpeAD000Nb+o7rL94lIAPJMAqMKO3Q==} cpu: [x64] os: [linux] - '@fallow-cli/win32-arm64-msvc@3.17.0': - resolution: {integrity: sha512-u9n5WzPuKuC1PKegKQknWtngAUJ2szQaRXsbY54s7UMqeFNyC+W04LV5D+sEZywU7L0kzL+Kck9LxFLXBQcgvA==} + '@fallow-cli/win32-arm64-msvc@3.14.0': + resolution: {integrity: sha512-xc495cracyJL+0UKwcqNhofIz2K5XiJbb+YFhxrbSrrbm+EVDnQKpCOzzOJYbm7RPxF6XOxJpATn7ciBy7Rqrw==} cpu: [arm64] os: [win32] - '@fallow-cli/win32-x64-msvc@3.17.0': - resolution: {integrity: sha512-/OcyxHuCKabzQ9hKIjM/CFJ9fr30n0Mw5MK6nzi5rn26mbYUgh073UZq4FONOpPJ/FqHtC726rxpgBtR4qS+gg==} + '@fallow-cli/win32-x64-msvc@3.14.0': + resolution: {integrity: sha512-ihyCZ5GMoYGnzlPP6b5pZBBcGZhDHDW2u1YEGkZEuf3pbW6E45U7Hhf213cE2CCheScXOirK6AKWnLM/Qj4c2A==} cpu: [x64] os: [win32] @@ -1607,8 +1598,8 @@ packages: '@fontsource-variable/public-sans@5.3.0': resolution: {integrity: sha512-AVfkmAt50BMXWpOO21FAntiJFKGX6xTc2dSL8dxtDteONe9IuRXJWGbs0EbG955vAMCq23ENeuopuW87cGWDSQ==} - '@hono/node-server@2.1.1': - resolution: {integrity: sha512-ELuehkj5VCBdgEw9zs+ivkKwyzzUCSQuE96YmiPvn1ECBoZCczbFXJLeEGMTYjphP6gydh4pHMqEYPVMYUVgQg==} + '@hono/node-server@2.1.0': + resolution: {integrity: sha512-XovyyCCnBzW+zKu+z/zq8hwNs4KOR5rEMAOxo2f40Q5xoOI37IMm6MIg2COOUtUApo0i6850MTBKH2u4QLGIqg==} engines: {node: '>=20'} peerDependencies: hono: ^4 @@ -2235,32 +2226,32 @@ packages: '@sec-ant/readable-stream@0.4.1': resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==} - '@shikijs/core@4.4.3': - resolution: {integrity: sha512-QCR4q2ZO/ILJEuwiBMel4wdcTDb1JGwfjKTxPDF6x8ixOaluPrVqIn06C99AcRPhmYlBR56d/Fb+GN58GzExpg==} + '@shikijs/core@4.4.2': + resolution: {integrity: sha512-StyzbAyxg2/tBGf78gwbBkGyeQ73lf8UiJArFaQhTQIDqQOCKPCQFanvrs4/Yv3Yfyc+ONInJM6K+FMIf+P+kA==} engines: {node: '>=20'} - '@shikijs/engine-javascript@4.4.3': - resolution: {integrity: sha512-FbOjFJp9VLdo1Wevs10BBtVxiTWwNLqZh5Gkhjgda/ioL15YOgeSl9n+6XMa3qRlPQzfhFNe641SrynFHYG0nQ==} + '@shikijs/engine-javascript@4.4.2': + resolution: {integrity: sha512-MnIkeqWdVPUWsxlx8gKLVCJFTsqrQJgpTPBPpQwaFeJ56lOnJxj5aN2LUFnfxUEcvOQuNocmbaMnVrCEln6rkw==} engines: {node: '>=20'} - '@shikijs/engine-oniguruma@4.4.3': - resolution: {integrity: sha512-EcOQkxdxGQrc1Row/cC2c96/v1dbZqGnEVu1qTuT/MJmp6+cXCvQussowVmCv5Tqr3KuY3c7IbM6HTW3LJ1k9w==} + '@shikijs/engine-oniguruma@4.4.2': + resolution: {integrity: sha512-GLhowz1+jixjz+wiZ3wMnOn1jTxiFCGl2PkXufivbnwPHKuyw1AYqu5/hbWhZZ2oAb0NP05WUJhYeigY14drnw==} engines: {node: '>=20'} - '@shikijs/langs@4.4.3': - resolution: {integrity: sha512-ePic0yfAJGOF83D5wBHK/00EjK65oahBYxFk5epgq33WRv7X9UuxLEV8PtR0szC0z8dl7INIpIodB99JRFlR+A==} + '@shikijs/langs@4.4.2': + resolution: {integrity: sha512-8DfeusD+Zdv/eYIDdXyJTUnSMHt+aAWjAOCXV20HNGAHRlInXpG8wh421v6B91WOm9TFwRLN+b/LG5F2NAIojg==} engines: {node: '>=20'} - '@shikijs/primitive@4.4.3': - resolution: {integrity: sha512-m0wBeLDQDeIxRdUmrCPdQqfuUamDwRL5isCfYbguKD6NiaKpVbsv+3J81DyIKgNW5h4WAIIr8T4EkgQrBBxvaQ==} + '@shikijs/primitive@4.4.2': + resolution: {integrity: sha512-l6fQQKsOMlz72n38fztmSgZ76MO6KSWuw8o+GJ+FhmqrpC9pIOJNQNXGgbb5yX2AwpzlEHwsaLPnk/8o4Fm+rA==} engines: {node: '>=20'} - '@shikijs/themes@4.4.3': - resolution: {integrity: sha512-w8UHjeUnIR965KMWJHUPXOc2mNJUnK3vpVLYLvw5IYU2mnTTJ89E24OrJDBNiJDQ0qzb0tc4l7mrIXx5cFeIyw==} + '@shikijs/themes@4.4.2': + resolution: {integrity: sha512-H0CFoL07ddDC2Dd6EdrPYNkRhUR6YCkJlnuYFceYYUJJA5TIm2b5B33qqiDYryBExgbKMndFJPb2u1gTuqO37g==} engines: {node: '>=20'} - '@shikijs/types@4.4.3': - resolution: {integrity: sha512-UEJxmRR++MAGR6hugn0vgVS2W/6lWAts84FFSrnlH9sP0LNol7E5+NQ792pH8liWUhyMyjhTgSUH3k7iD7tc5g==} + '@shikijs/types@4.4.2': + resolution: {integrity: sha512-PFYitV4vpDr/iPCIhnHp+Q4ftic5N5VeNJ3KQ1O8gn3h2ar8qgwMAXF7tq4m1CWaMS60fV4VqF6vfnWH4F7vqQ==} engines: {node: '>=20'} '@shikijs/vscode-textmate@10.0.2': @@ -2661,14 +2652,6 @@ packages: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/eslint-plugin@8.67.0': - resolution: {integrity: sha512-Un7Heoyj65NREbKAyIrFxeM143NZpExWmy1Nep4DLeQOeLlTeumPjoNKnBrU5D5moWXbPJgRa5Uwcdu0faVNGQ==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - '@typescript-eslint/parser': ^8.67.0 - eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 - typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/parser@8.66.0': resolution: {integrity: sha512-X6ypGChaWYk6PBtUg2BwuTZEFFcHJAtGTVJ9/lCTOufhZ4i9fNolQNnktq+kkMCwMj7V8Svsq7+TxSDslmhE0g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -2676,45 +2659,22 @@ packages: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/parser@8.67.0': - resolution: {integrity: sha512-fUBfTuuEulWqX6V8+O3PtScV01tzYYRUDTAirHFKoRAt7nOzoGiPt0M/bB47wWNy0coOOcgEwAMUtBpykMxl6w==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 - typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/project-service@8.66.0': resolution: {integrity: sha512-7MthGPTt4BP69lSryqpqq8HQqxuzynssckL/jyDyk3+TNMQ3y2jFWkptCrktWvBrP+EH787Nl5N5Qpw7WZg+5g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/project-service@8.67.0': - resolution: {integrity: sha512-cvE8c7ulYeXN9fYuszhCeCsbzyVEXuhrRCybnBre7TUmqb5nRmBfQAwCj0O3WJFDeyAZt4VYv51vMCC9LHSdYw==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/scope-manager@8.66.0': resolution: {integrity: sha512-8TGcH25j9zqJ/IULB/ppyhRvxA8QYfFEZ7nfbg6/BN9spDgb8fPWQXlE5l8TWBL50EtUx007uZ1o9VOwrq2/9g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/scope-manager@8.67.0': - resolution: {integrity: sha512-EgvsleTwS4E+WzzSvem8fAUubLwatMNF1B5hHSLQxcvs7q2dtRhGyujHwLJSYlG41niJ7GP24Aha2+0mb1b2kg==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/tsconfig-utils@8.66.0': resolution: {integrity: sha512-9D5gLYZG4rOjcoag8MQ/fWI8WqA9wcPDyOGyWtWFhvM1lHRbliqUSPIY5J3zqCU1tvSwzXxnnjhQhz5Ne7mJ4g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/tsconfig-utils@8.67.0': - resolution: {integrity: sha512-vV+LUSv5njUWsknE71fqKTlXUva+R76SaeORd6Zojcunk/6DvKFXONU3BrAs2H49mbygUXt6gbYunzwqNwlhdg==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/type-utils@8.66.0': resolution: {integrity: sha512-LG2dWfjZQQp0ADtAu/EWJVayefGL2UEZ3CDeI44D9v3rXB/WYUqE/jpO28KrEKul5AySrmI+Zh1v6v+xW2U9+g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -2722,33 +2682,16 @@ packages: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/type-utils@8.67.0': - resolution: {integrity: sha512-aVWDXbRmdXO9siTfX4ditQI1T9+zVcNazT48EJCD0v40/9RIFoUgZ05CmGEq9H2gixRpjUn/iplwvlcvutJW/Q==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 - typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/types@8.66.0': resolution: {integrity: sha512-H6gcYaSDOyvL3AD/jHUtUFo2jqGgn/F6nuyuZSu0QTesxL+cP4dQoIMrODRofuJC09g64+WgZ6tE19Y1N2YIFQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/types@8.67.0': - resolution: {integrity: sha512-sBtgslww8nsMYUjhdPBiSyUqSzT8uR6g93A2QXnQC8+cGdjz0CyaOdqHDRJb1AtORbZCNUJBBeFA/tNR2uQmww==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.66.0': resolution: {integrity: sha512-8/x4INiiQb10jGgXYD7116/zQ+OL84ZIFn0za68wwFHCanT/VLbBEroWht8RV8fn0/ZCAoazHLQgwUC0UQcDfg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/typescript-estree@8.67.0': - resolution: {integrity: sha512-EKQBCE9yNlRJYm7jdTW5AhDacDUmSwQb0FAJAmK2EKYrNXIsa2vxcSZx6PvJ/dEdI6lS+Y9W+EXckLj0iPFGcw==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/utils@8.66.0': resolution: {integrity: sha512-jasearZPolBw5NJNYGMwxzHMF83niVWmMU1VdHzG1CyfI2VS7f7nZltnKtHcg20hW+7Uo5GfK4MeDPoU3qI8EA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -2756,21 +2699,10 @@ packages: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/utils@8.67.0': - resolution: {integrity: sha512-U9D1FdwEWBwok3hxxSdhclMb0twvt9QnjIQ0VfQ1AiX2epnpSgv2ubVDsayOFyY8K6FX+AQ7E0FKWVG3iKsj1A==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 - typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/visitor-keys@8.66.0': resolution: {integrity: sha512-dkKR8q+lKciskj1Y3vthHktl+3cMLWGyVUP23bRiPZ5O9BRT++4EqDDV+TVeIKBL1VXVEqrJlz8MYbcnvJcAlg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/visitor-keys@8.67.0': - resolution: {integrity: sha512-fkv8dHRDqfGtTHuJeebdrQ7cX6Ad4WAS00rgHh9UGvMycF1mjBfsxry1XsLIFhWZ6Judlh6UdzK+TYlbpCXgnA==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript/typescript-aix-ppc64@7.0.2': resolution: {integrity: sha512-MTKKkWB7p/0E9xi1d1tHtZ5PiLkGEMIq88pK2CubZjOsLtYTLqhgIgi6zepFa+9GHZ6h05NMCkQxGKiPXMxXtQ==} engines: {node: '>=16.20.0'} @@ -2907,11 +2839,11 @@ packages: babel-plugin-react-compiler: optional: true - '@vitest/expect@4.1.11': - resolution: {integrity: sha512-VX2x5vNJXET47KAFzwERI+KRMtTTCSWTfSMKsW7JsUsXV4psq++e3DvZpuTDOpHcxytiDs6p2nhVb2tVDiiUYw==} + '@vitest/expect@4.1.10': + resolution: {integrity: sha512-YsCn+qAk1GWjQOWFEsEcL2gNQ0zmVmQu3T03qP6UyjhtmdtwtbuI+DASn/7iQB3HGTXkdBwGddzxPlmiql5vlA==} - '@vitest/mocker@4.1.11': - resolution: {integrity: sha512-2XJVD55d1o5AZous5CCGKS74g/riOj9odEt2bQpCVZeblHyHdnMeFl4jl0XjU21stf4mbjUkew2eXQZt65g5CQ==} + '@vitest/mocker@4.1.10': + resolution: {integrity: sha512-v0xaezt+DKEmKfaxg133ldzADrwLGd7Ze1MfQQTYfvs8OqZIwbxyxaYURivwV7sWy5fqn3rH5uOrSp07bp44Ow==} peerDependencies: msw: ^2.4.9 vite: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -2921,20 +2853,20 @@ packages: vite: optional: true - '@vitest/pretty-format@4.1.11': - resolution: {integrity: sha512-yiZzPbGTS9Sr/JpFl8zHrcIkAofNbFV6k21vIgQN/cY/oxZeXhJv5sc/MBJ5jFKWmWs+oJHw0UXLZjmf931+Vw==} + '@vitest/pretty-format@4.1.10': + resolution: {integrity: sha512-W1HsjSH4MXQ9YfmmhLAoIYf1HRfekQCGngeIgcei6MP5QQGWUe0gkopdZQaVCFO+JDJMrAJGwa5pRpNpvy4P8Q==} - '@vitest/runner@4.1.11': - resolution: {integrity: sha512-LztvUgdwMNJMIkj3hQnnxiC2Xy1zNxq928W/xhjCLaNCzqTZOudjwbQf6v9IntZGPw132i2Lq2rgTRZHD3JHNw==} + '@vitest/runner@4.1.10': + resolution: {integrity: sha512-IKI6kpIH+LmpROplyLwBBaCfMgOZOMsygVa6BARD6ahA04VRuJSa6OaVG7kRvSEMD870Vd91rSSw0eegtWyLGg==} - '@vitest/snapshot@4.1.11': - resolution: {integrity: sha512-pN7ikn1ON7h8ee4gIAp4AzyK+zBtJPzVbqOgu5LCEh4VaJVbPQcgYQYJIMGQPXVeJJq1fnfazis7a5pFNPahog==} + '@vitest/snapshot@4.1.10': + resolution: {integrity: sha512-xRkfOT1qpTAi/Ti4Y1LtfRc3kEuqxGw59eN2jN9pRWMtS/XDevekhcFSqvQqjUNGksfjMJu3Y+oJ+4Ypn2OaJw==} - '@vitest/spy@4.1.11': - resolution: {integrity: sha512-apNa/prQy2qCeywhnixOHPRCgGNhvg7T4Dapfl1GahLp/R+uhBm5cPyFoNVyqsNd2h1nJxL6BqqdIjiABL60YA==} + '@vitest/spy@4.1.10': + resolution: {integrity: sha512-PLf/Ugvoq5wO/b4rwYCR1h2PSIdXz7wnkQFMiUpLdtM7l6pqVFcQIBEHyT1+l+cj7mNwAfZHzqXqDyjvOuwbDw==} - '@vitest/utils@4.1.11': - resolution: {integrity: sha512-zTCVGpyFsGWBhllOyKlTw/vnr6D9qxsfSDyfbyZmTyjHw5N/VuvzHpHoQjm2ZJzn4RJgx5w4r7V0er69CmLgPQ==} + '@vitest/utils@4.1.10': + resolution: {integrity: sha512-fy9am/HWxbaGt/Sawrp90vt6Y6jQwf1RX77cz3uwoJwJVMli/e1IEwRPnMNJ7vKfPTwo0diXifkpPvwH9v7nGA==} '@xmldom/xmldom@0.8.13': resolution: {integrity: sha512-KRYzxepc14G/CEpEGc3Yn+JKaAeT63smlDr+vjB8jRfgTBBI9wRj/nkQEO+ucV8p8I9bfKLWp37uHgFrbntPvw==} @@ -2993,8 +2925,8 @@ packages: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} - ansi-regex@6.3.0: - resolution: {integrity: sha512-WpDfL7NO6j7tH88IDBNVdUJxDh9nmCteAVW9dsep846XdwF4naCBK+/tGLX3KJgcpgMRXCFlTM2hKGoK9FsdrQ==} + ansi-regex@6.2.2: + resolution: {integrity: sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==} engines: {node: '>=12'} ansi-styles@4.3.0: @@ -3092,8 +3024,8 @@ packages: base64-js@1.5.1: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} - baseline-browser-mapping@2.11.15: - resolution: {integrity: sha512-FwMjJJ7HnyZpWe+oWxegG0fezZyBZUagI5LZEoO3GCbtbKNwRfMH9Ue5d5v01PNePBy1QSfPSDTTeVL0Hb9EzA==} + baseline-browser-mapping@2.11.12: + resolution: {integrity: sha512-r7WnVImvVCeFpf2DOXfy41aPWzeNg3H/A2X4dKmy1QL0MSyyk/e7z8ihJ3N6Nn2PsdhkVlqnEfnUE4a05P2aTA==} engines: {node: '>=6.0.0'} hasBin: true @@ -3122,8 +3054,8 @@ packages: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} - browserslist@4.28.8: - resolution: {integrity: sha512-V2NpofLblG64mfOtSgDhOJESZEGogzDMBv/q+W6oc4LXWP/q75eOXoOaaOu1EOadB9U4Bwx/e0yzbvwKH8zalA==} + browserslist@4.28.7: + resolution: {integrity: sha512-JxV13hNrFxqjOc8alRbq9dK1MM79NEXYpma2B2J4wAtpWS5zIEIKqWPGCl7N4o7Uc7B7itylh7SuDujATRyyTw==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true @@ -3310,8 +3242,8 @@ packages: resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==} engines: {node: '>= 0.6'} - content-type@2.1.0: - resolution: {integrity: sha512-mj7UPXE0jaqaOsukNZRUEfEi2AcL7C/vwmwcHV0O97eO1E1pxBZuyjlZrx5seTaNBg1U6+o35wpa35Qfcc+7ag==} + content-type@2.0.0: + resolution: {integrity: sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==} engines: {node: '>=18'} convert-source-map@2.0.0: @@ -3474,8 +3406,8 @@ packages: resolution: {integrity: sha512-x1VCxdX4t+8wVfd1so/9w+vQ4vx7lKd2Qp5tDRutErwmR85OgmfX7RlLRMWafRMY7hbEiXIbudNrjOAPa/hL8Q==} engines: {node: '>=18'} - default-browser@5.5.1: - resolution: {integrity: sha512-m1pAzaJgZ/gssEqlOhJkPJp8Xly7QyW6xcrkUa2KKcDeDSEMP7X8xipU3snUcfisTQx0w1AGae+9UtJSfVnXGw==} + default-browser@5.5.0: + resolution: {integrity: sha512-H9LMLr5zwIbSxrmvikGuI/5KGhZ8E2zH3stkMgM5LpOWDutGM2JZaj460Udnf1a+946zc7YBgrqEWwbk7zHvGw==} engines: {node: '>=18'} defer-to-connect@2.0.1: @@ -3575,8 +3507,8 @@ packages: electron-publish@26.15.3: resolution: {integrity: sha512-g/2bn8YTavY4cuS5F+jOS7zmZbXXBV8KZ8yHKfJjFPoKtzBqrpCdNPxBd3tqdBwP7BVd0lGzf7Bk2s0KesWZ4Q==} - electron-to-chromium@1.5.411: - resolution: {integrity: sha512-gglkxzokjHfawpGxq75XdBV2/l3BAPzrsMs70qgaZdTW5rpV1tC4MdgJVP9fN126bODA4ZJQkn1wryEzJyQXIg==} + electron-to-chromium@1.5.402: + resolution: {integrity: sha512-/oOpMaPT6Yg+6/1XQhyIPlzgj7Ye9zf+nNM2Uh6OcE2G2oNptWazFa+qB2Pdqqbsc9KnIDzgAntoYN0dbwOXwA==} electron-winstaller@5.4.0: resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==} @@ -3664,8 +3596,8 @@ packages: resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==} engines: {node: '>= 0.4'} - es-module-lexer@2.3.2: - resolution: {integrity: sha512-poHGpORABojJJucnV9KbOavETW8lBVnphkW77ER5/BQ5Fz7oXSoCNek7IH3vR5nRjdsEz926ibFYX8KtLQmdyw==} + es-module-lexer@2.3.1: + resolution: {integrity: sha512-shc1dbU90Yl/xq1QrC7QRtfcwURZuVRfPhZbDoldJ1cn1gzDvBaBWlv0eFolj5+0znnPJz5TXLxsN77X/12KTA==} es-object-atoms@1.1.2: resolution: {integrity: sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==} @@ -3782,8 +3714,8 @@ packages: resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==} engines: {node: '>=0.8.x'} - eventsource-parser@3.1.1: - resolution: {integrity: sha512-EKN1vKAMcZ8MlYMpaNuxN6R9yakzH6uajHcHVTqWJzvu5pWw9DyhbP35HH8MVBQ+dZjAfDxk+A8NiR9KWaXiyQ==} + eventsource-parser@3.1.0: + resolution: {integrity: sha512-kJezFj9YFAMLeORyi7aCLxLbD5/qWMQnoMVlVPyHIll7lgRJCc3JVln9Vgl9nwQi0YkMnhdGTMNn7CkRRAptMg==} engines: {node: '>=18.0.0'} eventsource@3.0.7: @@ -3818,13 +3750,13 @@ packages: extend@3.0.2: resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==} - fallow-type-aware@3.17.0: - resolution: {integrity: sha512-DFtZUK5oqP56tSsrBWPzjrTIwPPxwlBV8QoSaGghMru347Nqj8ZBY6u9HFa/TIPcxvFU/zIZMRF8xS/XAWQTzg==} + fallow-type-aware@3.14.0: + resolution: {integrity: sha512-D8+bNELjmoVV2dKpmHplQ1YzuheHltmZKaOVJ//hx7h8vFNyp5H3hcJV8rR26ofBU51z9K5eyA7FpgP3hebjwg==} engines: {node: '>=20'} hasBin: true - fallow@3.17.0: - resolution: {integrity: sha512-tbLuvsPq3I2CzpoF/9MgSQ7hWzOqlj3avFUAmCr1J9OERE6z714SlDmA38NVvNy/zuK/70utXB3/b33xC9z29g==} + fallow@3.14.0: + resolution: {integrity: sha512-hse+sChmWkrffLiZDPGdNSyiLybVEhgoiYCIYgqLwdYhfTCO+f2PS1g+gMhGAJdLlYpZ75tFwRoMBFmZjN3Q6g==} engines: {node: '>=22'} hasBin: true @@ -4042,10 +3974,6 @@ packages: resolution: {integrity: sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==} engines: {node: '>=10.0'} - globals@17.11.0: - resolution: {integrity: sha512-Z2I8hM+PbJDXQDq3Icgpzv+mPdwr68iZUU9d5WW4FuXfDUQfkZaZuvjMv42/5crNyw154+9+VWXbYrUgDXbxNw==} - engines: {node: '>=18'} - globals@17.9.0: resolution: {integrity: sha512-m/MvAW61QVU5VDNF1Vj8axt016h8w7L5TU1e9zlab7XIttAT2YAlCwl75K1fOqvMM9apmD7lbCIRhpfkhmxhCg==} engines: {node: '>=18'} @@ -4137,8 +4065,8 @@ packages: hermes-parser@0.25.1: resolution: {integrity: sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==} - hono@4.13.3: - resolution: {integrity: sha512-r8AO2mYHoLxSHkgafNeC/BXyb2vWRxD3jem4Ts+ptav8oTG5FIRifAjuJEmZI4bSvvc2ns0GxmIYiZnHqN3mMw==} + hono@4.13.1: + resolution: {integrity: sha512-kdJoFVv2xmayw6cY09H7AbMJMt8Jn5jdlEdXsP7AGBdF2DIptVlKlOLKXP41yPip4/a3yQPv9gVcJYI8YY04dw==} engines: {node: '>=16.9.0'} hosted-git-info@4.1.0: @@ -4214,8 +4142,8 @@ packages: inline-style-parser@0.2.7: resolution: {integrity: sha512-Nb2ctOyNR8DqQoR0OwRG95uNWIC0C1lCgf5Naz5H6Ji72KZ8OcFZLz2P5sNgwlyoJ8Yif11oMuYs5pBQa86csA==} - input-otp@1.5.0: - resolution: {integrity: sha512-3AcfdW1sNG0FmSA5hHMBXG7jNW5CdcdKs8ln8JOmn6S2SRkoXoJx+2UwC+ZvjflfnOdHJx0SfQ9/YjlxVYLtGQ==} + input-otp@1.4.2: + resolution: {integrity: sha512-l3jWwYNvrEa6NTCt7BECfCm48GvwuZzkoeG3gBL2w4CHeOXW3eKFmf9UNYkNfYc3mxMrthMnxjIE07MT0zLBQA==} peerDependencies: react: ^16.8 || ^17.0 || ^18.0 || ^19.0.0 || ^19.0.0-rc react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0.0 || ^19.0.0-rc @@ -4228,8 +4156,8 @@ packages: resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==} engines: {node: '>=12'} - ip-address@10.5.0: - resolution: {integrity: sha512-R5SnVLJmgYYvf2F2ZgwSBnelz5G4q5AxIC277GDfUaNbrZKNANcBC7RHqYYePlszf4kBolVkJauG0ZjHHFh55g==} + ip-address@10.4.0: + resolution: {integrity: sha512-oSK96Grm3aP6OrS263xVxbNDGVL7rzBtYdpGqlDG8iQdoenDoTs/nkki+DflYbAEE8Xl6o5YxhxlrKvI3nqKXQ==} engines: {node: '>= 12'} ipaddr.js@1.9.1: @@ -4481,9 +4409,6 @@ packages: jose@6.2.8: resolution: {integrity: sha512-Bsdjwm3Qsd/P0jR+BHDe3LytDfY7WBq2HmCCLIwuVRHMuEC9ae7/R474GIUdF1NgCyZjzVo/A9DOiOBtXq8ZoQ==} - jose@6.2.9: - resolution: {integrity: sha512-XrchZOFZUl/T3vTwRe8XK+cJrGtMF4th1ARnDfwbBXFKThGhlsxEE4Zu03AD/bjJSt/9jT/mxrOCkJWOg77aPA==} - js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} @@ -4770,8 +4695,8 @@ packages: peerDependencies: react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0 - lucide-react@1.32.0: - resolution: {integrity: sha512-txX56hMFnRxPi1f9/nH69YN8uvAO6a7Y1KSWKjCDAtdD9+soEgmWuCt6iRm1pkxUZo2+YntSdsE1L6bIuKoY8Q==} + lucide-react@1.31.0: + resolution: {integrity: sha512-G8u2eEtoHUnUa9f8lbvqDhCiORMnYLdUEo06EEG9MQvHQrInKcX3Pa2TH39MM5qyzRcWETxB0+aOwAPI1g1kEg==} peerDependencies: react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0 @@ -5037,9 +4962,9 @@ packages: ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - mtp@https://git.methanium.net/methanium/mtp/releases/download/0.3.0-b331b9f6a3/mtp-0.3.0.tgz: - resolution: {integrity: sha512-rI+xskgAp93o9EdBO/b7HnA0PZTQQPTYuF4Snon/hTvayN+x9O40oad4n/ZUF0ahS6grw00MPKPe89Mfe3BHnw==, tarball: https://git.methanium.net/methanium/mtp/releases/download/0.3.0-b331b9f6a3/mtp-0.3.0.tgz} - version: 0.3.0 + mtp@https://git.methanium.net/methanium/mtp/releases/download/0.2.0-dev-a692bed/mtp-0.2.0.tgz: + resolution: {integrity: sha512-WcXHd53aDM0zQfO8eaUnK5tpnRP73GlWjwAMMcstcVAIWrvyFGuINkCRNEkb2RsNk9h57UMhxElCZeBkFrVmCg==, tarball: https://git.methanium.net/methanium/mtp/releases/download/0.2.0-dev-a692bed/mtp-0.2.0.tgz} + version: 0.2.0 nanoid@3.3.18: resolution: {integrity: sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==} @@ -5140,8 +5065,8 @@ packages: oniguruma-to-es@4.3.6: resolution: {integrity: sha512-csuQ9x3Yr0cEIs/Zgx/OEt9iBw9vqIunAPQkx19R/fiMq2oGVTgcMqO/V3Ybqefr1TBvosI6jU539ksaBULJyA==} - open@11.0.1: - resolution: {integrity: sha512-NzwMUB6C1D0+Kd+9iMS/H4k+Ck3cTX6Ckyfr/gAGlmvSE1LUQZnEZvWBi4PYmMwH/S5SMeTXnE+9uAz8uF+pWw==} + open@11.0.0: + resolution: {integrity: sha512-smsWv2LzFjP03xmvFoJ331ss6h+jixfA4UUV/Bsiyuu4YJPfN+FIQGOIiv4w9/+MoHkfkJ22UIaQWRVFRfH6Vw==} engines: {node: '>=20'} open@8.4.2: @@ -5297,10 +5222,6 @@ packages: resolution: {integrity: sha512-dM0jVuXJPsDN6DvRpea484tCUaMiXWjuCn++HGTqUWzGDjv5tZkEZldAJ/UMlqRYGFrD/etByo4/xOuC/snX2A==} engines: {node: '>=20'} - powershell-utils@0.2.0: - resolution: {integrity: sha512-ZlsFlG7MtSFCoc5xreOvBAozCJ6Pf06opgJjh9ONEv418xpZSAzNjstD36C6+JwOnfSqOW/9uDkqKjezTdxZhw==} - engines: {node: '>=20'} - prelude-ls@1.2.1: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} @@ -5430,8 +5351,8 @@ packages: '@types/react': optional: true - react-resizable-panels@4.12.3: - resolution: {integrity: sha512-GHMJWnDXui/3RX4bT+cgBP+N3N2nkwcoZATr/2xLFpqQQe7TlBrE0cGM0dUa9ceT7A90tUrSRsiqgRG+g0/2AA==} + react-resizable-panels@4.12.2: + resolution: {integrity: sha512-NwY5LCo4WrxVvDh0xoMML6EMLPONP/8ckKcIdpnojxexoatZdjLiRqLJQjQK5CPkd4SYiB/2M5BVrjZBQtOO7Q==} peerDependencies: react: ^18.0.0 || ^19.0.0 react-dom: ^18.0.0 || ^19.0.0 @@ -5457,8 +5378,8 @@ packages: readable-stream@2.3.8: resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==} - recast@0.23.21: - resolution: {integrity: sha512-mFAyJq9vUbSTARLZUvAEf1z3YxlvAwswbmxMx2mPA/MSm4KmpwvwvhsH/NIrZhyOuwD60Lzyw2qh83uCbgTPYw==} + recast@0.23.19: + resolution: {integrity: sha512-T98lym7kH+pnZmRaD8yDRdaNqyUbwnbEBx0MuchrzMFOEMray4AO3ZJoTUZ5r78Ao78X/OhzW0DL8GB85w/I2w==} engines: {node: '>= 4'} recharts@3.10.1: @@ -5711,8 +5632,8 @@ packages: setprototypeof@1.2.0: resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==} - shadcn@4.18.0: - resolution: {integrity: sha512-tUFZgkYmfVNQVm3xX7lhSzOvDsp+O14ac5dwgXIr5mIsr79ISueb/Mu+ZtWMz0DH6v77u4eYyvbQ9TTMpSn3aw==} + shadcn@4.16.2: + resolution: {integrity: sha512-M1AvZKFWcCzWRDoyApIqJMSLIpY8Ev4uBGuiPLSFmiTbixXhPmzotSTvLzFmBrfoIxG9aIg2dZOETblEaXGUnQ==} engines: {node: '>=20.18.1'} hasBin: true @@ -5724,8 +5645,8 @@ packages: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} - shiki@4.4.3: - resolution: {integrity: sha512-Mb/GvXPHBAXdgGIcnfU5L3ldpn1XcxrGkPHwqgRx17/I2XRfqlFKk2vGkHWINn1kdXvzJZeuO3is6I9KLPFm0g==} + shiki@4.4.2: + resolution: {integrity: sha512-P8F/dFhRevaw2uSdeIYlq/5SXZNY85DPtmXQ947gD1Zj2JqO5AkNvVVBar0Me9JkFx3uzVud/qOtP5ek9NEQGA==} engines: {node: '>=20'} side-channel-list@1.0.1: @@ -5761,18 +5682,10 @@ packages: sisteransi@1.0.5: resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} - smart-buffer@4.2.0: - resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==} - engines: {node: '>= 6.0.0', npm: '>= 3.0.0'} - smob@1.6.2: resolution: {integrity: sha512-RQsvleCbF8cVHEv+xuDGaA4pOizFqJ0GgjtMSRo6oP8pnN7WsigHgVGey6aILRBKv4W2YOMHLqbKdnB6hpB9fw==} engines: {node: '>=20.0.0'} - socks@2.8.9: - resolution: {integrity: sha512-LJhUYUvItdQ0LkJTmPeaEObWXAqFyfmP85x0tch/ez9cahmhlBBLbIqDFnvBnUJGagb0JbIQrkBs1wJ+yRYpEw==} - engines: {node: '>= 10.0.0', npm: '>= 3.0.0'} - sonner@2.0.7: resolution: {integrity: sha512-W6ZN4p58k8aDKA4XPcx2hpIQXBRAgyiWVkYhT7CvK6D3iAu7xjvVyhQHg2/iaKJZ1XVJ4r7XuwGL+WGEK37i9w==} peerDependencies: @@ -6066,13 +5979,6 @@ packages: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - typescript-eslint@8.67.0: - resolution: {integrity: sha512-S2udFs8tCKEKffuJ4TB1idGUZiXdCPGi3IPBGWXarbLQ5UPXORV8QEVzJ4gCRduURMb5EkpNCdjbk0eDIuI8Yg==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 - typescript: '>=4.8.4 <6.1.0' - typescript@6.0.3: resolution: {integrity: sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==} engines: {node: '>=14.17'} @@ -6168,8 +6074,8 @@ packages: resolution: {integrity: sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==} engines: {node: '>=4'} - update-browserslist-db@1.3.1: - resolution: {integrity: sha512-ZZ61DsRsOnakl74HAmp3oSN4aXUmEWXf+i/yv0h7tIBfICc3VdrFErQKUUKPgu3AMsTUMbcongALEN4l6GSUrQ==} + update-browserslist-db@1.3.0: + resolution: {integrity: sha512-x/M6q3w4Ybp91CNaS4S69UnliqR3BzRpOT6LWbksjth0S/+jhfaPJsWjt/TewpT8j9eLIojUf5jr29WextHroA==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' @@ -6295,20 +6201,20 @@ packages: yaml: optional: true - vitest@4.1.11: - resolution: {integrity: sha512-fhACrNXUidIbGSBr5FlbuBkO7VWC1ZyLl0DO4CU2DrQoAPxX84Ysxs+HeGQpii5lZWV1Q4gBZTTu49mF+A6Edw==} + vitest@4.1.10: + resolution: {integrity: sha512-R9jUTe5S4Qb0HCd4TNqpC7oGcrMssMRGXLW80ubjWsW9VH5GF8y1Y0SFLY9AbqSk6nt0PnOx4H4WNJYZ13GUPw==} engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@opentelemetry/api': ^1.9.0 '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0 - '@vitest/browser-playwright': 4.1.11 - '@vitest/browser-preview': 4.1.11 - '@vitest/browser-webdriverio': 4.1.11 - '@vitest/coverage-istanbul': 4.1.11 - '@vitest/coverage-v8': 4.1.11 - '@vitest/ui': 4.1.11 + '@vitest/browser-playwright': 4.1.10 + '@vitest/browser-preview': 4.1.10 + '@vitest/browser-webdriverio': 4.1.10 + '@vitest/coverage-istanbul': 4.1.10 + '@vitest/coverage-v8': 4.1.10 + '@vitest/ui': 4.1.10 happy-dom: '*' jsdom: '*' vite: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -6450,8 +6356,8 @@ packages: wrappy@1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} - wsl-utils@1.0.0: - resolution: {integrity: sha512-Hl0ZOAs672vg+06kfujwRhoS6/jehvULrlFkuF2dRu6pHgA8U06h3xqNIqNNU1LTXPcedxByAR4GS6pwQK0mgA==} + wsl-utils@0.3.1: + resolution: {integrity: sha512-g/eziiSUNBSsdDJtCLB8bdYEUMj4jR7AGeUo96p/3dTafgjHhpF4RiCFPiRILwjQoDXx5MqkBr4fwWtR3Ky4Wg==} engines: {node: '>=20'} xmlbuilder@15.1.1: @@ -6587,7 +6493,7 @@ snapshots: dependencies: '@babel/compat-data': 7.29.7 '@babel/helper-validator-option': 7.29.7 - browserslist: 4.28.8 + browserslist: 4.28.7 lru-cache: 5.1.1 semver: 6.3.1 @@ -7267,14 +7173,14 @@ snapshots: dependencies: '@codemirror/language': 6.12.4 '@codemirror/state': 6.7.1 - '@codemirror/view': 6.43.9 + '@codemirror/view': 6.43.8 '@lezer/common': 1.5.2 - '@codemirror/commands@6.11.0': + '@codemirror/commands@6.10.4': dependencies: '@codemirror/language': 6.12.4 '@codemirror/state': 6.7.1 - '@codemirror/view': 6.43.9 + '@codemirror/view': 6.43.8 '@lezer/common': 1.5.2 '@codemirror/lang-css@6.3.1': @@ -7292,7 +7198,7 @@ snapshots: '@codemirror/lang-javascript': 6.2.5 '@codemirror/language': 6.12.4 '@codemirror/state': 6.7.1 - '@codemirror/view': 6.43.9 + '@codemirror/view': 6.43.8 '@lezer/common': 1.5.2 '@lezer/css': 1.3.6 '@lezer/html': 1.3.13 @@ -7303,7 +7209,7 @@ snapshots: '@codemirror/language': 6.12.4 '@codemirror/lint': 6.9.7 '@codemirror/state': 6.7.1 - '@codemirror/view': 6.43.9 + '@codemirror/view': 6.43.8 '@lezer/common': 1.5.2 '@lezer/javascript': 1.5.4 @@ -7313,14 +7219,14 @@ snapshots: '@codemirror/lang-html': 6.4.12 '@codemirror/language': 6.12.4 '@codemirror/state': 6.7.1 - '@codemirror/view': 6.43.9 + '@codemirror/view': 6.43.8 '@lezer/common': 1.5.2 '@lezer/markdown': 1.7.2 '@codemirror/language@6.12.4': dependencies: '@codemirror/state': 6.7.1 - '@codemirror/view': 6.43.9 + '@codemirror/view': 6.43.8 '@lezer/common': 1.5.2 '@lezer/highlight': 1.2.3 '@lezer/lr': 1.4.10 @@ -7329,14 +7235,14 @@ snapshots: '@codemirror/lint@6.9.7': dependencies: '@codemirror/state': 6.7.1 - '@codemirror/view': 6.43.9 + '@codemirror/view': 6.43.8 crelt: 1.0.7 '@codemirror/state@6.7.1': dependencies: '@marijn/find-cluster-break': 1.0.3 - '@codemirror/view@6.43.9': + '@codemirror/view@6.43.8': dependencies: '@codemirror/state': 6.7.1 crelt: 1.0.7 @@ -7570,28 +7476,28 @@ snapshots: '@eslint/core': 1.2.1 levn: 0.4.1 - '@fallow-cli/darwin-arm64@3.17.0': + '@fallow-cli/darwin-arm64@3.14.0': optional: true - '@fallow-cli/darwin-x64@3.17.0': + '@fallow-cli/darwin-x64@3.14.0': optional: true - '@fallow-cli/linux-arm64-gnu@3.17.0': + '@fallow-cli/linux-arm64-gnu@3.14.0': optional: true - '@fallow-cli/linux-arm64-musl@3.17.0': + '@fallow-cli/linux-arm64-musl@3.14.0': optional: true - '@fallow-cli/linux-x64-gnu@3.17.0': + '@fallow-cli/linux-x64-gnu@3.14.0': optional: true - '@fallow-cli/linux-x64-musl@3.17.0': + '@fallow-cli/linux-x64-musl@3.14.0': optional: true - '@fallow-cli/win32-arm64-msvc@3.17.0': + '@fallow-cli/win32-arm64-msvc@3.14.0': optional: true - '@fallow-cli/win32-x64-msvc@3.17.0': + '@fallow-cli/win32-x64-msvc@3.14.0': optional: true '@floating-ui/core@1.8.0': @@ -7618,9 +7524,9 @@ snapshots: '@fontsource-variable/public-sans@5.3.0': {} - '@hono/node-server@2.1.1(hono@4.13.3)': + '@hono/node-server@2.1.0(hono@4.13.1)': dependencies: - hono: 4.13.3 + hono: 4.13.1 '@humanfs/core@0.19.2': dependencies: @@ -7746,12 +7652,12 @@ snapshots: dependencies: '@base-ui/react': 1.7.0(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8) '@codemirror/autocomplete': 6.20.3 - '@codemirror/commands': 6.11.0 + '@codemirror/commands': 6.10.4 '@codemirror/lang-markdown': 6.5.2 '@codemirror/language': 6.12.4 '@codemirror/state': 6.7.1 - '@codemirror/view': 6.43.9 - '@shikijs/langs': 4.4.3 + '@codemirror/view': 6.43.8 + '@shikijs/langs': 4.4.2 '@tauri-apps/api': 2.11.1 class-variance-authority: 0.7.1 clsx: 2.1.1 @@ -7759,14 +7665,14 @@ snapshots: embla-carousel-react: 8.6.0(react@19.2.8) emojibase-data: 17.0.0(emojibase@17.0.0) hast-util-to-jsx-runtime: 2.3.6(supports-color@7.2.0) - input-otp: 1.5.0(react-dom@19.2.8(react@19.2.8))(react@19.2.8) + input-otp: 1.4.2(react-dom@19.2.8(react@19.2.8))(react@19.2.8) katex: 0.18.4 - lucide-react: 1.32.0(react@19.2.8) + lucide-react: 1.31.0(react@19.2.8) next-themes: 0.4.6(react-dom@19.2.8(react@19.2.8))(react@19.2.8) react: 19.2.8 react-dom: 19.2.8(react@19.2.8) react-markdown: 10.1.0(@types/react@19.2.18)(react@19.2.8)(supports-color@7.2.0) - react-resizable-panels: 4.12.3(react-dom@19.2.8(react@19.2.8))(react@19.2.8) + react-resizable-panels: 4.12.2(react-dom@19.2.8(react@19.2.8))(react@19.2.8) recharts: 3.10.1(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react-is@19.2.8)(react@19.2.8)(redux@5.0.1) rehype-autolink-headings: 7.1.0 rehype-katex: 7.0.1 @@ -7774,8 +7680,8 @@ snapshots: remark-breaks: 4.0.0 remark-gfm: 4.0.1(supports-color@7.2.0) remark-math: 6.0.0(supports-color@7.2.0) - shadcn: 4.18.0(supports-color@7.2.0)(typescript@6.0.3) - shiki: 4.4.3 + shadcn: 4.16.2(supports-color@7.2.0)(typescript@6.0.3) + shiki: 4.4.2 sonner: 2.0.8(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8) tailwind-merge: 3.6.0 tw-animate-css: 1.4.0 @@ -7796,18 +7702,18 @@ snapshots: '@modelcontextprotocol/sdk@1.30.0(supports-color@7.2.0)(zod@3.25.76)': dependencies: - '@hono/node-server': 2.1.1(hono@4.13.3) + '@hono/node-server': 2.1.0(hono@4.13.1) ajv: 8.20.0 ajv-formats: 3.0.1(ajv@8.20.0) content-type: 1.0.5 cors: 2.8.6 cross-spawn: 7.0.6 eventsource: 3.0.7 - eventsource-parser: 3.1.1 + eventsource-parser: 3.1.0 express: 5.2.1(supports-color@7.2.0) express-rate-limit: 8.6.2(express@5.2.1(supports-color@7.2.0))(supports-color@7.2.0) - hono: 4.13.3 - jose: 6.2.9 + hono: 4.13.1 + jose: 6.2.8 json-schema-typed: 8.0.2 pkce-challenge: 5.0.1 raw-body: 3.0.2 @@ -8172,40 +8078,40 @@ snapshots: '@sec-ant/readable-stream@0.4.1': {} - '@shikijs/core@4.4.3': + '@shikijs/core@4.4.2': dependencies: - '@shikijs/primitive': 4.4.3 - '@shikijs/types': 4.4.3 + '@shikijs/primitive': 4.4.2 + '@shikijs/types': 4.4.2 '@shikijs/vscode-textmate': 10.0.2 '@types/hast': 3.0.5 hast-util-to-html: 9.0.5 - '@shikijs/engine-javascript@4.4.3': + '@shikijs/engine-javascript@4.4.2': dependencies: - '@shikijs/types': 4.4.3 + '@shikijs/types': 4.4.2 '@shikijs/vscode-textmate': 10.0.2 oniguruma-to-es: 4.3.6 - '@shikijs/engine-oniguruma@4.4.3': + '@shikijs/engine-oniguruma@4.4.2': dependencies: - '@shikijs/types': 4.4.3 + '@shikijs/types': 4.4.2 '@shikijs/vscode-textmate': 10.0.2 - '@shikijs/langs@4.4.3': + '@shikijs/langs@4.4.2': dependencies: - '@shikijs/types': 4.4.3 + '@shikijs/types': 4.4.2 - '@shikijs/primitive@4.4.3': + '@shikijs/primitive@4.4.2': dependencies: - '@shikijs/types': 4.4.3 + '@shikijs/types': 4.4.2 '@shikijs/vscode-textmate': 10.0.2 '@types/hast': 3.0.5 - '@shikijs/themes@4.4.3': + '@shikijs/themes@4.4.2': dependencies: - '@shikijs/types': 4.4.3 + '@shikijs/types': 4.4.2 - '@shikijs/types@4.4.3': + '@shikijs/types@4.4.2': dependencies: '@shikijs/vscode-textmate': 10.0.2 '@types/hast': 3.0.5 @@ -8559,22 +8465,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/eslint-plugin@8.67.0(@typescript-eslint/parser@8.67.0(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3))(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3)': - dependencies: - '@eslint-community/regexpp': 4.12.2 - '@typescript-eslint/parser': 8.67.0(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3) - '@typescript-eslint/scope-manager': 8.67.0 - '@typescript-eslint/type-utils': 8.67.0(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3) - '@typescript-eslint/utils': 8.67.0(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3) - '@typescript-eslint/visitor-keys': 8.67.0 - eslint: 10.8.1(jiti@2.7.0)(supports-color@7.2.0) - ignore: 7.0.6 - natural-compare: 1.4.0 - ts-api-utils: 2.5.0(typescript@6.0.3) - typescript: 6.0.3 - transitivePeerDependencies: - - supports-color - '@typescript-eslint/parser@8.66.0(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3)': dependencies: '@typescript-eslint/scope-manager': 8.66.0 @@ -8587,18 +8477,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.67.0(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3)': - dependencies: - '@typescript-eslint/scope-manager': 8.67.0 - '@typescript-eslint/types': 8.67.0 - '@typescript-eslint/typescript-estree': 8.67.0(supports-color@7.2.0)(typescript@6.0.3) - '@typescript-eslint/visitor-keys': 8.67.0 - debug: 4.4.3(supports-color@7.2.0) - eslint: 10.8.1(jiti@2.7.0)(supports-color@7.2.0) - typescript: 6.0.3 - transitivePeerDependencies: - - supports-color - '@typescript-eslint/project-service@8.66.0(supports-color@7.2.0)(typescript@6.0.3)': dependencies: '@typescript-eslint/tsconfig-utils': 8.66.0(typescript@6.0.3) @@ -8608,33 +8486,15 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/project-service@8.67.0(supports-color@7.2.0)(typescript@6.0.3)': - dependencies: - '@typescript-eslint/tsconfig-utils': 8.67.0(typescript@6.0.3) - '@typescript-eslint/types': 8.67.0 - debug: 4.4.3(supports-color@7.2.0) - typescript: 6.0.3 - transitivePeerDependencies: - - supports-color - '@typescript-eslint/scope-manager@8.66.0': dependencies: '@typescript-eslint/types': 8.66.0 '@typescript-eslint/visitor-keys': 8.66.0 - '@typescript-eslint/scope-manager@8.67.0': - dependencies: - '@typescript-eslint/types': 8.67.0 - '@typescript-eslint/visitor-keys': 8.67.0 - '@typescript-eslint/tsconfig-utils@8.66.0(typescript@6.0.3)': dependencies: typescript: 6.0.3 - '@typescript-eslint/tsconfig-utils@8.67.0(typescript@6.0.3)': - dependencies: - typescript: 6.0.3 - '@typescript-eslint/type-utils@8.66.0(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3)': dependencies: '@typescript-eslint/types': 8.66.0 @@ -8647,22 +8507,8 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/type-utils@8.67.0(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3)': - dependencies: - '@typescript-eslint/types': 8.67.0 - '@typescript-eslint/typescript-estree': 8.67.0(supports-color@7.2.0)(typescript@6.0.3) - '@typescript-eslint/utils': 8.67.0(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3) - debug: 4.4.3(supports-color@7.2.0) - eslint: 10.8.1(jiti@2.7.0)(supports-color@7.2.0) - ts-api-utils: 2.5.0(typescript@6.0.3) - typescript: 6.0.3 - transitivePeerDependencies: - - supports-color - '@typescript-eslint/types@8.66.0': {} - '@typescript-eslint/types@8.67.0': {} - '@typescript-eslint/typescript-estree@8.66.0(supports-color@7.2.0)(typescript@6.0.3)': dependencies: '@typescript-eslint/project-service': 8.66.0(supports-color@7.2.0)(typescript@6.0.3) @@ -8678,21 +8524,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@8.67.0(supports-color@7.2.0)(typescript@6.0.3)': - dependencies: - '@typescript-eslint/project-service': 8.67.0(supports-color@7.2.0)(typescript@6.0.3) - '@typescript-eslint/tsconfig-utils': 8.67.0(typescript@6.0.3) - '@typescript-eslint/types': 8.67.0 - '@typescript-eslint/visitor-keys': 8.67.0 - debug: 4.4.3(supports-color@7.2.0) - minimatch: 10.2.6 - semver: 7.8.5 - tinyglobby: 0.2.17 - ts-api-utils: 2.5.0(typescript@6.0.3) - typescript: 6.0.3 - transitivePeerDependencies: - - supports-color - '@typescript-eslint/utils@8.66.0(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3)': dependencies: '@eslint-community/eslint-utils': 4.10.1(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0)) @@ -8704,27 +8535,11 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.67.0(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3)': - dependencies: - '@eslint-community/eslint-utils': 4.10.1(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0)) - '@typescript-eslint/scope-manager': 8.67.0 - '@typescript-eslint/types': 8.67.0 - '@typescript-eslint/typescript-estree': 8.67.0(supports-color@7.2.0)(typescript@6.0.3) - eslint: 10.8.1(jiti@2.7.0)(supports-color@7.2.0) - typescript: 6.0.3 - transitivePeerDependencies: - - supports-color - '@typescript-eslint/visitor-keys@8.66.0': dependencies: '@typescript-eslint/types': 8.66.0 eslint-visitor-keys: 5.0.1 - '@typescript-eslint/visitor-keys@8.67.0': - dependencies: - '@typescript-eslint/types': 8.67.0 - eslint-visitor-keys: 5.0.1 - '@typescript/typescript-aix-ppc64@7.0.2': optional: true @@ -8792,44 +8607,44 @@ snapshots: '@rolldown/pluginutils': 1.0.1 vite: 8.2.1(@types/node@26.2.0)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.50.0)(yaml@2.9.0) - '@vitest/expect@4.1.11': + '@vitest/expect@4.1.10': dependencies: '@standard-schema/spec': 1.1.0 '@types/chai': 5.2.3 - '@vitest/spy': 4.1.11 - '@vitest/utils': 4.1.11 + '@vitest/spy': 4.1.10 + '@vitest/utils': 4.1.10 chai: 6.2.2 tinyrainbow: 3.1.1 - '@vitest/mocker@4.1.11(vite@8.2.1(@types/node@26.2.0)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.50.0)(yaml@2.9.0))': + '@vitest/mocker@4.1.10(vite@8.2.1(@types/node@26.2.0)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.50.0)(yaml@2.9.0))': dependencies: - '@vitest/spy': 4.1.11 + '@vitest/spy': 4.1.10 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: vite: 8.2.1(@types/node@26.2.0)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.50.0)(yaml@2.9.0) - '@vitest/pretty-format@4.1.11': + '@vitest/pretty-format@4.1.10': dependencies: tinyrainbow: 3.1.1 - '@vitest/runner@4.1.11': + '@vitest/runner@4.1.10': dependencies: - '@vitest/utils': 4.1.11 + '@vitest/utils': 4.1.10 pathe: 2.0.3 - '@vitest/snapshot@4.1.11': + '@vitest/snapshot@4.1.10': dependencies: - '@vitest/pretty-format': 4.1.11 - '@vitest/utils': 4.1.11 + '@vitest/pretty-format': 4.1.10 + '@vitest/utils': 4.1.10 magic-string: 0.30.21 pathe: 2.0.3 - '@vitest/spy@4.1.11': {} + '@vitest/spy@4.1.10': {} - '@vitest/utils@4.1.11': + '@vitest/utils@4.1.10': dependencies: - '@vitest/pretty-format': 4.1.11 + '@vitest/pretty-format': 4.1.10 convert-source-map: 2.0.0 tinyrainbow: 3.1.1 @@ -8876,7 +8691,7 @@ snapshots: ansi-regex@5.0.1: {} - ansi-regex@6.3.0: {} + ansi-regex@6.2.2: {} ansi-styles@4.3.0: dependencies: @@ -9013,14 +8828,14 @@ snapshots: base64-js@1.5.1: {} - baseline-browser-mapping@2.11.15: {} + baseline-browser-mapping@2.11.12: {} bluebird@3.7.2: {} body-parser@2.3.0(supports-color@7.2.0): dependencies: bytes: 3.1.2 - content-type: 2.1.0 + content-type: 2.0.0 debug: 4.4.3(supports-color@7.2.0) http-errors: 2.0.1 iconv-lite: 0.7.3 @@ -9051,13 +8866,13 @@ snapshots: dependencies: fill-range: 7.1.1 - browserslist@4.28.8: + browserslist@4.28.7: dependencies: - baseline-browser-mapping: 2.11.15 + baseline-browser-mapping: 2.11.12 caniuse-lite: 1.0.30001809 - electron-to-chromium: 1.5.411 + electron-to-chromium: 1.5.402 node-releases: 2.0.53 - update-browserslist-db: 1.3.1(browserslist@4.28.8) + update-browserslist-db: 1.3.0(browserslist@4.28.7) buffer-from@1.1.2: {} @@ -9239,7 +9054,7 @@ snapshots: content-type@1.0.5: {} - content-type@2.1.0: {} + content-type@2.0.0: {} convert-source-map@2.0.0: {} @@ -9251,7 +9066,7 @@ snapshots: core-js-compat@3.50.0: dependencies: - browserslist: 4.28.8 + browserslist: 4.28.7 core-util-is@1.0.3: {} @@ -9374,7 +9189,7 @@ snapshots: default-browser-id@5.0.1: {} - default-browser@5.5.1: + default-browser@5.5.0: dependencies: bundle-name: 4.1.0 default-browser-id: 5.0.1 @@ -9498,7 +9313,7 @@ snapshots: transitivePeerDependencies: - supports-color - electron-to-chromium@1.5.411: {} + electron-to-chromium@1.5.402: {} electron-winstaller@5.4.0(supports-color@7.2.0): dependencies: @@ -9638,7 +9453,7 @@ snapshots: es-errors@1.3.0: {} - es-module-lexer@2.3.2: {} + es-module-lexer@2.3.1: {} es-object-atoms@1.1.2: dependencies: @@ -9797,11 +9612,11 @@ snapshots: events@3.3.0: {} - eventsource-parser@3.1.1: {} + eventsource-parser@3.1.0: {} eventsource@3.0.7: dependencies: - eventsource-parser: 3.1.1 + eventsource-parser: 3.1.0 execa@5.1.1: dependencies: @@ -9838,7 +9653,7 @@ snapshots: dependencies: debug: 4.4.3(supports-color@7.2.0) express: 5.2.1(supports-color@7.2.0) - ip-address: 10.5.0 + ip-address: 10.4.0 transitivePeerDependencies: - supports-color @@ -9877,24 +9692,24 @@ snapshots: extend@3.0.2: {} - fallow-type-aware@3.17.0: + fallow-type-aware@3.14.0: dependencies: typescript: 7.0.2 optional: true - fallow@3.17.0: + fallow@3.14.0: dependencies: detect-libc: 2.1.2 optionalDependencies: - '@fallow-cli/darwin-arm64': 3.17.0 - '@fallow-cli/darwin-x64': 3.17.0 - '@fallow-cli/linux-arm64-gnu': 3.17.0 - '@fallow-cli/linux-arm64-musl': 3.17.0 - '@fallow-cli/linux-x64-gnu': 3.17.0 - '@fallow-cli/linux-x64-musl': 3.17.0 - '@fallow-cli/win32-arm64-msvc': 3.17.0 - '@fallow-cli/win32-x64-msvc': 3.17.0 - fallow-type-aware: 3.17.0 + '@fallow-cli/darwin-arm64': 3.14.0 + '@fallow-cli/darwin-x64': 3.14.0 + '@fallow-cli/linux-arm64-gnu': 3.14.0 + '@fallow-cli/linux-arm64-musl': 3.14.0 + '@fallow-cli/linux-x64-gnu': 3.14.0 + '@fallow-cli/linux-x64-musl': 3.14.0 + '@fallow-cli/win32-arm64-msvc': 3.14.0 + '@fallow-cli/win32-x64-msvc': 3.14.0 + fallow-type-aware: 3.14.0 fast-deep-equal@3.1.3: {} @@ -10140,8 +9955,6 @@ snapshots: serialize-error: 7.0.1 optional: true - globals@17.11.0: {} - globals@17.9.0: {} globalthis@1.0.4: @@ -10297,7 +10110,7 @@ snapshots: dependencies: hermes-estree: 0.25.1 - hono@4.13.3: {} + hono@4.13.1: {} hosted-git-info@4.1.0: dependencies: @@ -10368,7 +10181,7 @@ snapshots: inline-style-parser@0.2.7: {} - input-otp@1.5.0(react-dom@19.2.8(react@19.2.8))(react@19.2.8): + input-otp@1.4.2(react-dom@19.2.8(react@19.2.8))(react@19.2.8): dependencies: react: 19.2.8 react-dom: 19.2.8(react@19.2.8) @@ -10381,7 +10194,7 @@ snapshots: internmap@2.0.3: {} - ip-address@10.5.0: {} + ip-address@10.4.0: {} ipaddr.js@1.9.1: {} @@ -10586,8 +10399,6 @@ snapshots: jose@6.2.8: {} - jose@6.2.9: {} - js-tokens@4.0.0: {} js-yaml@4.3.1: @@ -10805,7 +10616,7 @@ snapshots: dependencies: react: 19.2.8 - lucide-react@1.32.0(react@19.2.8): + lucide-react@1.31.0(react@19.2.8): dependencies: react: 19.2.8 @@ -11274,7 +11085,7 @@ snapshots: ms@2.1.3: {} - mtp@https://git.methanium.net/methanium/mtp/releases/download/0.3.0-b331b9f6a3/mtp-0.3.0.tgz: + mtp@https://git.methanium.net/methanium/mtp/releases/download/0.2.0-dev-a692bed/mtp-0.2.0.tgz: dependencies: yaml: 2.9.0 @@ -11372,14 +11183,14 @@ snapshots: regex: 6.1.0 regex-recursion: 6.0.2 - open@11.0.1: + open@11.0.0: dependencies: - default-browser: 5.5.1 + default-browser: 5.5.0 define-lazy-prop: 3.0.0 is-in-ssh: 1.0.0 is-inside-container: 1.0.0 - powershell-utils: 0.2.0 - wsl-utils: 1.0.0 + powershell-utils: 0.1.0 + wsl-utils: 0.3.1 open@8.4.2: dependencies: @@ -11538,8 +11349,6 @@ snapshots: powershell-utils@0.1.0: {} - powershell-utils@0.2.0: {} - prelude-ls@1.2.1: {} prettier@3.9.6: {} @@ -11665,7 +11474,7 @@ snapshots: optionalDependencies: '@types/react': 19.2.18 - react-resizable-panels@4.12.3(react-dom@19.2.8(react@19.2.8))(react@19.2.8): + react-resizable-panels@4.12.2(react-dom@19.2.8(react@19.2.8))(react@19.2.8): dependencies: react: 19.2.8 react-dom: 19.2.8(react@19.2.8) @@ -11696,7 +11505,7 @@ snapshots: string_decoder: 1.1.1 util-deprecate: 1.0.2 - recast@0.23.21: + recast@0.23.19: dependencies: ast-types: 0.16.1 esprima: 4.0.1 @@ -12085,7 +11894,7 @@ snapshots: setprototypeof@1.2.0: {} - shadcn@4.18.0(supports-color@7.2.0)(typescript@6.0.3): + shadcn@4.16.2(supports-color@7.2.0)(typescript@6.0.3): dependencies: '@babel/core': 7.29.7(supports-color@7.2.0) '@babel/parser': 7.29.8 @@ -12094,7 +11903,7 @@ snapshots: '@dotenvx/dotenvx': 1.75.1 '@modelcontextprotocol/sdk': 1.30.0(supports-color@7.2.0)(zod@3.25.76) '@types/validate-npm-package-name': 4.0.2 - browserslist: 4.28.8 + browserslist: 4.28.7 commander: 14.0.3 cosmiconfig: 9.0.2(typescript@6.0.3) dedent: 1.7.2 @@ -12105,13 +11914,12 @@ snapshots: fs-extra: 11.4.0 fuzzysort: 3.1.0 kleur: 4.1.5 - open: 11.0.1 + open: 11.0.0 ora: 8.2.0 postcss: 8.5.26 postcss-selector-parser: 7.1.5 prompts: 2.4.2 - recast: 0.23.21 - socks: 2.8.9 + recast: 0.23.19 stringify-object: 5.0.0 tailwind-merge: 3.6.0 ts-morph: 26.0.0 @@ -12132,14 +11940,14 @@ snapshots: shebang-regex@3.0.0: {} - shiki@4.4.3: + shiki@4.4.2: dependencies: - '@shikijs/core': 4.4.3 - '@shikijs/engine-javascript': 4.4.3 - '@shikijs/engine-oniguruma': 4.4.3 - '@shikijs/langs': 4.4.3 - '@shikijs/themes': 4.4.3 - '@shikijs/types': 4.4.3 + '@shikijs/core': 4.4.2 + '@shikijs/engine-javascript': 4.4.2 + '@shikijs/engine-oniguruma': 4.4.2 + '@shikijs/langs': 4.4.2 + '@shikijs/themes': 4.4.2 + '@shikijs/types': 4.4.2 '@shikijs/vscode-textmate': 10.0.2 '@types/hast': 3.0.5 @@ -12183,15 +11991,8 @@ snapshots: sisteransi@1.0.5: {} - smart-buffer@4.2.0: {} - smob@1.6.2: {} - socks@2.8.9: - dependencies: - ip-address: 10.5.0 - smart-buffer: 4.2.0 - sonner@2.0.7(react-dom@19.2.8(react@19.2.8))(react@19.2.8): dependencies: react: 19.2.8 @@ -12314,7 +12115,7 @@ snapshots: strip-ansi@7.2.0: dependencies: - ansi-regex: 6.3.0 + ansi-regex: 6.2.2 strip-bom@3.0.0: {} @@ -12459,7 +12260,7 @@ snapshots: type-is@2.1.0: dependencies: - content-type: 2.1.0 + content-type: 2.0.0 media-typer: 1.1.1 mime-types: 3.0.2 @@ -12511,17 +12312,6 @@ snapshots: transitivePeerDependencies: - supports-color - typescript-eslint@8.67.0(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3): - dependencies: - '@typescript-eslint/eslint-plugin': 8.67.0(@typescript-eslint/parser@8.67.0(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3))(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3) - '@typescript-eslint/parser': 8.67.0(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3) - '@typescript-eslint/typescript-estree': 8.67.0(supports-color@7.2.0)(typescript@6.0.3) - '@typescript-eslint/utils': 8.67.0(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3) - eslint: 10.8.1(jiti@2.7.0)(supports-color@7.2.0) - typescript: 6.0.3 - transitivePeerDependencies: - - supports-color - typescript@6.0.3: {} typescript@7.0.2: @@ -12639,9 +12429,9 @@ snapshots: upath@1.2.0: {} - update-browserslist-db@1.3.1(browserslist@4.28.8): + update-browserslist-db@1.3.0(browserslist@4.28.7): dependencies: - browserslist: 4.28.8 + browserslist: 4.28.7 escalade: 3.2.0 picocolors: 1.1.1 @@ -12748,16 +12538,16 @@ snapshots: terser: 5.50.0 yaml: 2.9.0 - vitest@4.1.11(@types/node@26.2.0)(vite@8.2.1(@types/node@26.2.0)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.50.0)(yaml@2.9.0)): + vitest@4.1.10(@types/node@26.2.0)(vite@8.2.1(@types/node@26.2.0)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.50.0)(yaml@2.9.0)): dependencies: - '@vitest/expect': 4.1.11 - '@vitest/mocker': 4.1.11(vite@8.2.1(@types/node@26.2.0)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.50.0)(yaml@2.9.0)) - '@vitest/pretty-format': 4.1.11 - '@vitest/runner': 4.1.11 - '@vitest/snapshot': 4.1.11 - '@vitest/spy': 4.1.11 - '@vitest/utils': 4.1.11 - es-module-lexer: 2.3.2 + '@vitest/expect': 4.1.10 + '@vitest/mocker': 4.1.10(vite@8.2.1(@types/node@26.2.0)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.50.0)(yaml@2.9.0)) + '@vitest/pretty-format': 4.1.10 + '@vitest/runner': 4.1.10 + '@vitest/snapshot': 4.1.10 + '@vitest/spy': 4.1.10 + '@vitest/utils': 4.1.10 + es-module-lexer: 2.3.1 expect-type: 1.4.0 magic-string: 0.30.21 obug: 2.1.4 @@ -12976,7 +12766,7 @@ snapshots: wrappy@1.0.2: {} - wsl-utils@1.0.0: + wsl-utils@0.3.1: dependencies: is-wsl: 3.1.1 powershell-utils: 0.1.0 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index f713a2d..ee3c57a 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -7,4 +7,4 @@ allowBuilds: esbuild: true overrides: "@methanium/ui": "https://git.methanium.net/methanium/ui/releases/download/0.0.29/methanium-ui.tgz" - mtp: "https://git.methanium.net/methanium/mtp/releases/download/0.3.0-b331b9f6a3/mtp-0.3.0.tgz" + mtp: "https://git.methanium.net/methanium/mtp/releases/download/0.2.0-dev-a692bed/mtp-0.2.0.tgz" diff --git a/utils/scripts/build-packages.ts b/utils/scripts/build-packages.ts index 1f1f4fd..9518c49 100644 --- a/utils/scripts/build-packages.ts +++ b/utils/scripts/build-packages.ts @@ -15,14 +15,7 @@ function getPackageDirs(dir: string): string[] { for (const entry of entries) { const fullPath = join(dir, entry); - if (entry === "node_modules" || entry.startsWith(".")) continue; - let stats; - try { - stats = statSync(fullPath); - } catch { - continue; - } - if (!stats.isDirectory()) continue; + if (!statSync(fullPath).isDirectory()) continue; if (existsSync(join(fullPath, "package.json"))) { dirs.push(fullPath); diff --git a/utils/scripts/lint-packages.ts b/utils/scripts/lint-packages.ts index c84e0e0..0aea8c3 100644 --- a/utils/scripts/lint-packages.ts +++ b/utils/scripts/lint-packages.ts @@ -16,14 +16,7 @@ function getPackageDirs(dir: string): string[] { for (const entry of entries) { const fullPath = join(dir, entry); - if (entry === "node_modules" || entry.startsWith(".")) continue; - let stats; - try { - stats = statSync(fullPath); - } catch { - continue; - } - if (!stats.isDirectory()) continue; + if (!statSync(fullPath).isDirectory()) continue; if (existsSync(join(fullPath, "package.json"))) { dirs.push(fullPath); diff --git a/utils/scripts/update-packages.ts b/utils/scripts/update-packages.ts index 90b3b0c..22b258f 100644 --- a/utils/scripts/update-packages.ts +++ b/utils/scripts/update-packages.ts @@ -15,14 +15,7 @@ function getPackageDirs(dir: string): string[] { for (const entry of entries) { const fullPath = join(dir, entry); - if (entry === "node_modules" || entry.startsWith(".")) continue; - let stats; - try { - stats = statSync(fullPath); - } catch { - continue; - } - if (!stats.isDirectory()) continue; + if (!statSync(fullPath).isDirectory()) continue; if (existsSync(join(fullPath, "package.json"))) { dirs.push(fullPath);