diff --git a/Cargo.lock b/Cargo.lock index 011bd04..7ab8ed6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -24,6 +24,16 @@ dependencies = [ "generic-array", ] +[[package]] +name = "aead" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1973cfbc1a2daf9cf550e74e1f088c28e7f7d8c1e1418fb6c9dc5184b7e84c99" +dependencies = [ + "crypto-common 0.2.2", + "inout 0.2.2", +] + [[package]] name = "aho-corasick" version = "1.1.5" @@ -147,7 +157,7 @@ dependencies = [ "rustc-hash", "serde", "serde_derive", - "syn 3.0.8", + "syn 3.0.9", ] [[package]] @@ -180,7 +190,7 @@ checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.9", ] [[package]] @@ -214,7 +224,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "auth" -version = "3.0.4" +version = "3.0.5" dependencies = [ "anyhow", "block2", @@ -261,7 +271,6 @@ dependencies = [ "axum-core", "base64 0.22.1", "bytes", - "form_urlencoded", "futures-util", "http", "http-body", @@ -275,9 +284,6 @@ dependencies = [ "percent-encoding", "pin-project-lite", "serde_core", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", "sha1 0.10.7", "sync_wrapper", "tokio", @@ -285,7 +291,6 @@ dependencies = [ "tower", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -304,7 +309,6 @@ dependencies = [ "sync_wrapper", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -383,15 +387,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "blake2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" -dependencies = [ - "digest 0.10.7", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -440,7 +435,7 @@ dependencies = [ "proc-macro-crate 3.5.0", "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.9", ] [[package]] @@ -466,7 +461,7 @@ dependencies = [ [[package]] name = "browser-launcher" -version = "3.0.4" +version = "3.0.5" dependencies = [ "anyhow", "log", @@ -635,7 +630,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", - "cipher", + "cipher 0.4.4", "cpufeatures 0.2.17", ] @@ -646,8 +641,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06" dependencies = [ "cfg-if", + "cipher 0.5.2", "cpufeatures 0.3.1", "rand_core 0.10.1", + "zeroize", ] [[package]] @@ -656,10 +653,23 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ - "aead", + "aead 0.5.2", "chacha20 0.9.1", - "cipher", - "poly1305", + "cipher 0.4.4", + "poly1305 0.8.0", + "zeroize", +] + +[[package]] +name = "chacha20poly1305" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b89e1c441e926b9c82a8d023f6e1b7ae0adcfaa7d621814e4d60789bac751cb" +dependencies = [ + "aead 0.6.1", + "chacha20 0.10.2", + "cipher 0.5.2", + "poly1305 0.9.1", "zeroize", ] @@ -690,10 +700,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ "crypto-common 0.1.7", - "inout", + "inout 0.1.4", "zeroize", ] +[[package]] +name = "cipher" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf2a2c93cd704877c0858356ed03480ff301ee950b43f1cbe4573b088bfa6c" +dependencies = [ + "block-buffer 0.12.1", + "crypto-common 0.2.2", + "inout 0.2.2", +] + [[package]] name = "clap" version = "4.6.7" @@ -735,7 +756,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.9", ] [[package]] @@ -744,6 +765,12 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c133bc6a41be0d194c306b5506d15e6feeea7b1d6604bd3f8310dfb2ca96486" +[[package]] +name = "cmov" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a" + [[package]] name = "colorchoice" version = "1.0.5" @@ -762,22 +789,32 @@ dependencies = [ [[package]] name = "common" -version = "3.0.4" +version = "3.0.5" dependencies = [ "tempfile", ] [[package]] name = "compile-time" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55ede5279d4d7c528906853743abeb26353ae1e6c440fcd6d18316c2c2dd903" +checksum = "72196c3ad358618b77e0c8395b977786e89482d97761d28f4a6c719c28c2e1af" dependencies = [ - "once_cell", + "compile-time-macros", + "time", +] + +[[package]] +name = "compile-time-macros" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5319cbb7d6ce9f683e79149506f5786db2b785c8d2818987bbd38a751fc478" +dependencies = [ + "macro-string", "proc-macro2", "quote", "rustc_version", - "semver", + "syn 3.0.9", "time", ] @@ -957,7 +994,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", - "rand_core 0.6.4", "typenum", ] @@ -967,7 +1003,9 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453" dependencies = [ + "getrandom 0.4.3", "hybrid-array", + "rand_core 0.10.1", ] [[package]] @@ -990,7 +1028,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d045de693cb712d0b22c6a64be5b953f67b3ce00ab5ad3dd5d8b441886ab8e1a" dependencies = [ "quote", - "syn 3.0.8", + "syn 3.0.9", ] [[package]] @@ -999,6 +1037,15 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "914a755b7c2d4af2bdcff7ce1739e2db9a1b81a9b07123d8015786ae03c0980d" +[[package]] +name = "ctutils" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03bb0e1cc970d482d121d9a1744999169b69a07470b3d644a7894e53fcaf4574" +dependencies = [ + "cmov", +] + [[package]] name = "curve25519-dalek" version = "4.1.3" @@ -1044,7 +1091,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 3.0.8", + "syn 3.0.9", ] [[package]] @@ -1055,7 +1102,7 @@ checksum = "2ac7135c3ef02b2f7833bbeb1be5ba7f966dcde8a87c6b87f65a778d71a02785" dependencies = [ "darling_core", "quote", - "syn 3.0.8", + "syn 3.0.9", ] [[package]] @@ -1145,7 +1192,6 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", "crypto-common 0.1.7", - "subtle", ] [[package]] @@ -1209,7 +1255,7 @@ checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.9", ] [[package]] @@ -1494,7 +1540,7 @@ checksum = "ea5190182e6915eb873ddbc16e23b711b6eb1f9c00a0d0a3a91b5f6228475225" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.9", ] [[package]] @@ -1532,7 +1578,6 @@ checksum = "9a31d2a3fbaaeb2af2368bbdd904aa8e812d3c04a1ee10d3171f52d556e5d0a3" dependencies = [ "futures-channel", "futures-core", - "futures-executor", "futures-io", "futures-sink", "futures-task", @@ -1580,7 +1625,7 @@ checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.9", ] [[package]] @@ -1863,11 +1908,11 @@ dependencies = [ [[package]] name = "gpapi" -version = "3.0.4" +version = "3.0.5" dependencies = [ "anyhow", - "base64 0.22.1", - "chacha20poly1305", + "base64 0.23.1", + "chacha20poly1305 0.11.0", "chrono", "clap", "clap-verbosity-flag", @@ -1893,7 +1938,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sha2", + "sha2 0.11.1", "sha256", "snow", "socket2", @@ -1915,7 +1960,7 @@ dependencies = [ [[package]] name = "gpauth" -version = "3.0.4" +version = "3.0.5" dependencies = [ "anyhow", "auth", @@ -1934,7 +1979,7 @@ dependencies = [ [[package]] name = "gpclient" -version = "3.0.4" +version = "3.0.5" dependencies = [ "anyhow", "clap", @@ -1961,7 +2006,7 @@ dependencies = [ [[package]] name = "gpgui-helper" -version = "3.0.4" +version = "3.0.5" dependencies = [ "anyhow", "clap", @@ -1982,7 +2027,7 @@ dependencies = [ [[package]] name = "gphip" -version = "3.0.4" +version = "3.0.5" dependencies = [ "anyhow", "askama", @@ -1999,11 +2044,11 @@ dependencies = [ [[package]] name = "gpservice" -version = "3.0.4" +version = "3.0.5" dependencies = [ "anyhow", "axum", - "base64 0.22.1", + "base64 0.23.1", "clap", "common", "compile-time", @@ -2143,9 +2188,9 @@ dependencies = [ [[package]] name = "html-escape" -version = "0.2.15" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9356095b4b41197bba32173600e1582792cda618f65d12f68e2e77d273413c5" +checksum = "491194d601b4fa9fac3c9571e014070a0ad1bc3392d1bc10419695196a8b3cc3" [[package]] name = "html5ever" @@ -2481,6 +2526,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "inout" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4250ce6452e92010fdf7268ccc5d14faa80bb12fc741938534c58f16804e03c7" +dependencies = [ + "hybrid-array", +] + [[package]] name = "inquire" version = "0.9.4" @@ -2807,9 +2861,9 @@ checksum = "47d9d19d1d6efa0109d2f65ff4c85cddd50bd572e5a00127ab10987290bcefae" [[package]] name = "litrs" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" +checksum = "4744e383959f0db86ede514b809b1c53251889093803c05267acc7d4e7030d70" [[package]] name = "lock_api" @@ -2862,6 +2916,17 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "macro-string" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e7b3a5bbb2f63aaa223a671ea1bd0e7bc16bd30ce387324cf63995deaddbbd2" +dependencies = [ + "proc-macro2", + "quote", + "syn 3.0.9", +] + [[package]] name = "markup5ever" version = "0.39.0" @@ -3131,6 +3196,15 @@ dependencies = [ "syn 2.0.119", ] +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + [[package]] name = "objc2" version = "0.6.5" @@ -3403,7 +3477,7 @@ dependencies = [ [[package]] name = "openconnect" -version = "3.0.4" +version = "3.0.5" dependencies = [ "autotools", "cc", @@ -3538,11 +3612,11 @@ dependencies = [ [[package]] name = "pem" -version = "3.0.6" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be" +checksum = "d354a98a3d1251555de99e8fdd8afda05573c31b82f59063a7b0a29b5527f120" dependencies = [ - "base64 0.22.1", + "base64 0.23.1", "serde_core", ] @@ -3664,7 +3738,17 @@ checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ "cpufeatures 0.2.17", "opaque-debug", - "universal-hash", + "universal-hash 0.5.1", +] + +[[package]] +name = "poly1305" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2d0073b297041425c7c3df6eb4792d598a15323fe63346852b092eca02904c" +dependencies = [ + "cpufeatures 0.3.1", + "universal-hash 0.6.1", ] [[package]] @@ -3861,15 +3945,6 @@ dependencies = [ "rand_core 0.9.5", ] -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.17", -] - [[package]] name = "rand_core" version = "0.9.5" @@ -3970,7 +4045,7 @@ checksum = "92ecd8964f8453721699a1ed72037b0db49ce2f5a5138486ee89bed6f67cdf3a" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.9", ] [[package]] @@ -4191,9 +4266,9 @@ dependencies = [ [[package]] name = "schemars" -version = "1.2.2" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "687274d293b6cdc6e73e0fee520bf2049650090d7164f87672d212a3c530cf4a" +checksum = "ab508826f74a77ca9d5aba6ff19b522583ee3eaf28a19384ff3d0e5835fadf6e" dependencies = [ "dyn-clone", "ref-cast", @@ -4310,7 +4385,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.9", ] [[package]] @@ -4337,17 +4412,6 @@ dependencies = [ "zmij", ] -[[package]] -name = "serde_path_to_error" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457" -dependencies = [ - "itoa", - "serde", - "serde_core", -] - [[package]] name = "serde_regex" version = "1.2.0" @@ -4366,7 +4430,7 @@ checksum = "8d3b1629de253c70a0508c3899572da79ca359fdab27c7920ff00406df418906" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.9", ] [[package]] @@ -4413,7 +4477,7 @@ dependencies = [ "indexmap 2.14.2", "jiff", "schemars 0.9.0", - "schemars 1.2.2", + "schemars 1.2.3", "serde_core", "serde_json", "serde_with_macros", @@ -4429,7 +4493,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.9", ] [[package]] @@ -4502,6 +4566,17 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sha2" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47d7069beb7d6ac7b9acd1039986e73443f24234f41074da099d6f994ac9ad19" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.1", + "digest 0.11.3", +] + [[package]] name = "sha256" version = "1.6.0" @@ -4511,8 +4586,7 @@ dependencies = [ "async-trait", "bytes", "hex", - "sha2", - "tokio", + "sha2 0.10.9", ] [[package]] @@ -4598,13 +4672,11 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "599b506ccc4aff8cf7844bc42cf783009a434c1e26c964432560fb6d6ad02d82" dependencies = [ - "blake2", - "chacha20poly1305", + "chacha20poly1305 0.10.1", "curve25519-dalek", "getrandom 0.3.4", - "ring", "rustc_version", - "sha2", + "sha2 0.10.9", "subtle", ] @@ -4765,9 +4837,9 @@ dependencies = [ [[package]] name = "syn" -version = "3.0.8" +version = "3.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01016da373cd8f7ef12624f796309f5c31ba8d646dd08856c02cd741d823c622" +checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b" dependencies = [ "proc-macro2", "quote", @@ -4791,7 +4863,7 @@ checksum = "901704edd0dfe137f1987838ee4f259e4e063c31371bdb423f7ae38ec6f77f02" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.9", ] [[package]] @@ -4997,7 +5069,7 @@ dependencies = [ "semver", "serde", "serde_json", - "sha2", + "sha2 0.10.9", "syn 2.0.119", "tauri-utils", "thiserror 2.0.21", @@ -5180,7 +5252,7 @@ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.9", ] [[package]] @@ -5199,7 +5271,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb87b95ec50ddfa440816d227a17b2ccbdda963a316a727fda0fc4334f7d134" dependencies = [ "deranged", + "libc", "num-conv", + "num_threads", "powerfmt", "serde_core", "time-core", @@ -5274,7 +5348,7 @@ checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.9", ] [[package]] @@ -5444,7 +5518,6 @@ dependencies = [ "tokio", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -5483,7 +5556,6 @@ version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ - "log", "pin-project-lite", "tracing-core", ] @@ -5603,6 +5675,16 @@ dependencies = [ "subtle", ] +[[package]] +name = "universal-hash" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4987bdc12753382e0bec4a65c50738ffaabc998b9cdd1f952fb5f39b0048a96" +dependencies = [ + "crypto-common 0.2.2", + "ctutils", +] + [[package]] name = "untrusted" version = "0.9.0" @@ -5817,7 +5899,7 @@ dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.9", "wasm-bindgen-shared", ] @@ -6386,7 +6468,7 @@ dependencies = [ "once_cell", "percent-encoding", "raw-window-handle", - "sha2", + "sha2 0.10.9", "soup3", "tao-macros", "thiserror 2.0.21", @@ -6475,7 +6557,7 @@ checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.9", "synstructure", ] @@ -6516,7 +6598,7 @@ checksum = "f75b4683f6c7f45248d4d64056a24298c6281e0993356d7d1b4a1a962ef10d4a" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.9", "synstructure", ] @@ -6559,7 +6641,7 @@ checksum = "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.9", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index f6f3d9a..4f8dd06 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ members = [ [workspace.package] rust-version = "1.91" -version = "3.0.4" +version = "3.0.5" authors = ["Kevin Yue "] homepage = "https://github.com/yuezk/GlobalProtect-openconnect" edition = "2024" @@ -19,8 +19,8 @@ license = "GPL-3.0" [workspace.dependencies] anyhow = "1.0" -askama = "0.16" -base64 = "0.22" +askama = { version = "0.16", default-features = false, features = ["std", "derive", "config"] } +base64 = { version = "0.23", default-features = false, features = ["std"] } chrono = "0.4" clap = { version = "4", features = ["derive"] } clap-verbosity-flag = "3" @@ -33,33 +33,33 @@ log = "0.4" regex = "1" reqwest = { version = "0.13", default-features = false, features = ["native-tls", "charset", "http2", "system-proxy", "json", "form", "query"] } openssl = "0.10" -pem = "3" +pem = "4" xmltree = { version = "0.12", features = ["attribute-order"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" # The 0.39 series requires Rust 1.95, above the workspace minimum. -sysinfo = "0.38.4" +sysinfo = { version = "0.38.4", default-features = false, features = ["system"] } tempfile = "3.8" tokio = { version = "1" } tokio-util = "0.7" url = "2.4" urlencoding = "2.1.3" -axum = "0.8" -futures = "0.3" +axum = { version = "0.8", default-features = false, features = ["http1", "tokio"] } +futures = { version = "0.3", default-features = false, features = ["std"] } futures-util = "0.3" uzers = "0.12" whoami = "2" thiserror = "2" redact-engine = "0.1" -compile-time = "0.2" +compile-time = "0.4" serde_urlencoded = "0.7" md5 = "0.8" -sha256 = "1" +sha256 = { version = "1", default-features = false } which = "8" uuid = "1" netdev = "0.46.3" humantime = "2" -snow = { version = "0.10", default-features = false, features = ["std", "use-getrandom", "use-curve25519", "use-chacha20poly1305", "use-sha2"] } +snow = { version = "0.10", default-features = false, features = ["use-getrandom", "use-curve25519", "use-chacha20poly1305", "use-sha2"] } zeroize = "1" # Tauri dependencies diff --git a/apps/gpauth/icons/128x128.png b/apps/gpauth/icons/128x128.png index 59e4e65..f695805 100644 Binary files a/apps/gpauth/icons/128x128.png and b/apps/gpauth/icons/128x128.png differ diff --git a/apps/gpauth/icons/128x128@2x.png b/apps/gpauth/icons/128x128@2x.png index d10ef05..28fca23 100644 Binary files a/apps/gpauth/icons/128x128@2x.png and b/apps/gpauth/icons/128x128@2x.png differ diff --git a/apps/gpauth/icons/32x32.png b/apps/gpauth/icons/32x32.png index 3143943..8cebbbb 100644 Binary files a/apps/gpauth/icons/32x32.png and b/apps/gpauth/icons/32x32.png differ diff --git a/apps/gpauth/icons/icon.icns b/apps/gpauth/icons/icon.icns index 08a0806..a01cd91 100644 Binary files a/apps/gpauth/icons/icon.icns and b/apps/gpauth/icons/icon.icns differ diff --git a/apps/gpauth/icons/icon.ico b/apps/gpauth/icons/icon.ico index 5957434..58c4cc2 100644 Binary files a/apps/gpauth/icons/icon.ico and b/apps/gpauth/icons/icon.ico differ diff --git a/apps/gpauth/icons/icon.png b/apps/gpauth/icons/icon.png index ef7a367..79084fa 100644 Binary files a/apps/gpauth/icons/icon.png and b/apps/gpauth/icons/icon.png differ diff --git a/apps/gpgui-helper/dist/assets/icon-small-B3qZg5R1.svg b/apps/gpgui-helper/dist/assets/icon-small-BO4dlTNl.svg similarity index 96% rename from apps/gpgui-helper/dist/assets/icon-small-B3qZg5R1.svg rename to apps/gpgui-helper/dist/assets/icon-small-BO4dlTNl.svg index 362d5ff..592bec9 100644 --- a/apps/gpgui-helper/dist/assets/icon-small-B3qZg5R1.svg +++ b/apps/gpgui-helper/dist/assets/icon-small-BO4dlTNl.svg @@ -20,7 +20,7 @@ - + diff --git a/apps/gpgui-helper/dist/assets/main-B-fzjiz0.js b/apps/gpgui-helper/dist/assets/main-BU3mus1z.js similarity index 99% rename from apps/gpgui-helper/dist/assets/main-B-fzjiz0.js rename to apps/gpgui-helper/dist/assets/main-BU3mus1z.js index 17b2964..af4e003 100644 --- a/apps/gpgui-helper/dist/assets/main-B-fzjiz0.js +++ b/apps/gpgui-helper/dist/assets/main-BU3mus1z.js @@ -6,4 +6,4 @@ var e=(e,t)=>()=>(t||(e((t={exports:{}}).exports,t),e=null),t.exports);(function `+c[r].replace(` at new `,` at `);return e.displayName&&u.includes(``)&&(u=u.replace(``,e.displayName)),u}while(1<=r&&0<=i);break}}}finally{He=!1,Error.prepareStackTrace=n}return(n=e?e.displayName||e.name:``)?Ve(n):``}function We(e,t){switch(e.tag){case 26:case 27:case 5:return Ve(e.type);case 16:return Ve(`Lazy`);case 13:return e.child!==t&&t!==null?Ve(`Suspense Fallback`):Ve(`Suspense`);case 19:return Ve(`SuspenseList`);case 0:case 15:return Ue(e.type,!1);case 11:return Ue(e.type.render,!1);case 1:return Ue(e.type,!0);case 31:return Ve(`Activity`);case 30:return Ve(`ViewTransition`);default:return``}}function Ge(e){try{var t=``,n=null;do t+=We(e,n),n=e,e=e.return;while(e);return t}catch(e){return` Error generating stack: `+e.message+` `+e.stack}}var Ke=Object.prototype.hasOwnProperty,qe=t.unstable_scheduleCallback,Je=t.unstable_cancelCallback,Ye=t.unstable_shouldYield,Xe=t.unstable_requestPaint,Ze=t.unstable_now,Qe=t.unstable_getCurrentPriorityLevel,$e=t.unstable_ImmediatePriority,et=t.unstable_UserBlockingPriority,tt=t.unstable_NormalPriority,nt=t.unstable_LowPriority,rt=t.unstable_IdlePriority,it=t.log,at=t.unstable_setDisableYieldValue,ot=null,st=null;function ct(e){if(typeof it==`function`&&at(e),st&&typeof st.setStrictMode==`function`)try{st.setStrictMode(ot,e)}catch{}}var lt=Math.clz32?Math.clz32:ft,ut=Math.log,dt=Math.LN2;function ft(e){return e>>>=0,e===0?32:31-(ut(e)/dt|0)|0}var pt=256,mt=262144,ht=4194304;function gt(e){var t=e&42;if(t!==0)return t;switch(e&-e){case 1:return 1;case 2:return 2;case 4:return 4;case 8:return 8;case 16:return 16;case 32:return 32;case 64:return 64;case 128:return 128;case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:return e&-e;case 262144:case 524288:case 1048576:case 2097152:return e&3932160;case 4194304:case 8388608:case 16777216:case 33554432:return e&62914560;case 67108864:return 67108864;case 134217728:return 134217728;case 268435456:return 268435456;case 536870912:return 536870912;case 1073741824:return 0;default:return e}}function _t(e,t,n){var r=e.pendingLanes;if(r===0)return 0;var i=0,a=e.suspendedLanes,o=e.pingedLanes;e=e.warmLanes;var s=r&134217727;return s===0?(s=r&~a,s===0?o===0?n||(n=r&~e,n!==0&&(i=gt(n))):i=gt(o):i=gt(s)):(r=s&~a,r===0?(o&=s,o===0?n||(n=s&~e,n!==0&&(i=gt(n))):i=gt(o)):i=gt(r)),i===0?0:t!==0&&t!==i&&(t&a)===0&&(a=i&-i,n=t&-t,a>=n||a===32&&n&4194048)?t:i}function vt(e,t){return(e.pendingLanes&~(e.suspendedLanes&~e.pingedLanes)&t)===0}function yt(e,t){t&8&&(t|=t&32);var n=e.entangledLanes;if(n!==0)for(e=e.entanglements,n&=t;0n;n++)t.push(e);return t}function Ct(e,t){e.pendingLanes|=t,t!==268435456&&(e.suspendedLanes=0,e.pingedLanes=0,e.warmLanes=0)}function wt(e,t,n,r,i,a){var o=e.pendingLanes;e.pendingLanes=n,e.suspendedLanes=0,e.pingedLanes=0,e.warmLanes=0,e.expiredLanes&=n,e.entangledLanes&=n,e.errorRecoveryDisabledLanes&=n,e.shellSuspendCounter=0;var s=e.entanglements,c=e.expirationTimes,l=e.hiddenUpdates;for(n=o&~n;0=Cr),Er=` `,Dr=!1;function Or(e,t){switch(e){case`keyup`:return xr.indexOf(t.keyCode)!==-1;case`keydown`:return t.keyCode!==229;case`keypress`:case`mousedown`:case`focusout`:return!0;default:return!1}}function kr(e){return e=e.detail,typeof e==`object`&&`data`in e?e.data:null}var Ar=!1;function jr(e,t){switch(e){case`compositionend`:return kr(t);case`keypress`:return t.which===32?(Dr=!0,Er):null;case`textInput`:return e=t.data,e===Er&&Dr?null:e;default:return null}}function Mr(e,t){if(Ar)return e===`compositionend`||!Sr&&Or(e,t)?(e=Wn(),Un=Hn=Vn=null,Ar=!1,e):null;switch(e){case`paste`:return null;case`keypress`:if(!(t.ctrlKey||t.altKey||t.metaKey)||t.ctrlKey&&t.altKey){if(t.char&&1=t)return{node:n,offset:t-e};e=r}a:{for(;n;){if(n.nextSibling){n=n.nextSibling;break a}n=n.parentNode}n=void 0}n=ti(n)}}function ri(e,t){return e&&t?e===t?!0:e&&e.nodeType===3?!1:t&&t.nodeType===3?ri(e,t.parentNode):`contains`in e?e.contains(t):e.compareDocumentPosition?!!(e.compareDocumentPosition(t)&16):!1:!1}function ii(e){e=e!=null&&e.ownerDocument!=null&&e.ownerDocument.defaultView!=null?e.ownerDocument.defaultView:window;for(var t=ei(e.document);t instanceof e.HTMLIFrameElement;){try{var n=typeof t.contentWindow.location.href==`string`}catch{n=!1}if(n)e=t.contentWindow;else break;t=ei(e.document)}return t}function ai(e){var t=e&&e.nodeName&&e.nodeName.toLowerCase();return t&&(t===`input`&&(e.type===`text`||e.type===`search`||e.type===`tel`||e.type===`url`||e.type===`password`)||t===`textarea`||e.contentEditable===`true`)}var oi=Rn&&`documentMode`in document&&11>=document.documentMode,si=null,ci=null,li=null,ui=!1;function di(e,t,n){var r=n.window===n?n.document:n.nodeType===9?n:n.ownerDocument;ui||si==null||si!==ei(r)||(r=si,`selectionStart`in r&&ai(r)?r={start:r.selectionStart,end:r.selectionEnd}:(r=(r.ownerDocument&&r.ownerDocument.defaultView||window).getSelection(),r={anchorNode:r.anchorNode,anchorOffset:r.anchorOffset,focusNode:r.focusNode,focusOffset:r.focusOffset}),li&&$r(li,r)||(li=r,r=Jf(ci,`onSelect`),0>=o,i-=o,sa=1<<32-lt(t)+i|n<h?(g=d,d=null):g=d.sibling;var _=p(i,d,s[h],c);if(_===null){d===null&&(d=g);break}e&&d&&_.alternate===null&&t(i,d),o=a(_,o,h),u===null?l=_:u.sibling=_,u=_,d=g}if(h===s.length)return n(i,d),A&&la(i,h),l;if(d===null){for(;hg?(_=h,h=null):_=h.sibling;var y=p(i,h,v.value,l);if(y===null){h===null&&(h=_);break}e&&h&&y.alternate===null&&t(i,h),o=a(y,o,g),d===null?u=y:d.sibling=y,d=y,h=_}if(v.done)return n(i,h),A&&la(i,g),u;if(h===null){for(;!v.done;g++,v=c.next())v=f(i,v.value,l),v!==null&&(o=a(v,o,g),d===null?u=v:d.sibling=v,d=v);return A&&la(i,g),u}for(h=r(h);!v.done;g++,v=c.next())v=m(h,i,g,v.value,l),v!==null&&(e&&(_=v.alternate,_!==null&&h.delete(_.key===null?g:_.key)),o=a(v,o,g),d===null?u=v:d.sibling=v,d=v);return e&&h.forEach(function(e){return t(i,e)}),A&&la(i,g),u}function _(e,r,a,c){if(typeof a==`object`&&a&&a.type===se&&a.key===null&&a.props.ref===void 0&&(a=a.props.children),typeof a==`object`&&a){switch(a.$$typeof){case ae:a:{for(var l=a.key;r!==null;){if(r.key===l){if(l=a.type,l===se){if(r.tag===7){n(e,r.sibling),c=i(r,a.props.children),vo(c,a),c.return=e,e=c;break a}}else if(r.elementType===l||typeof l==`object`&&l&&l.$$typeof===ge&&uo(l)===r.type){n(e,r.sibling),c=i(r,a.props),vo(c,a),c.return=e,e=c;break a}n(e,r);break}t(e,r),r=r.sibling}a.type===se?(c=Ji(a.props.children,e.mode,c,a.key),vo(c,a),c.return=e,e=c):(c=qi(a.type,a.key,a.props,null,e.mode,c),vo(c,a),c.return=e,e=c)}return o(e);case oe:a:{for(l=a.key;r!==null;){if(r.key===l){if(r.tag===4&&r.stateNode.containerInfo===a.containerInfo&&r.stateNode.implementation===a.implementation){n(e,r.sibling),c=i(r,a.children||[]),c.return=e,e=c;break a}n(e,r);break}t(e,r),r=r.sibling}c=Zi(a,e.mode,c),c.return=e,e=c}return o(e);case ge:return a=uo(a),_(e,r,a,c)}if(Te(a))return h(e,r,a,c);if(Se(a)){if(l=Se(a),typeof l!=`function`)throw Error(s(150));return a=l.call(a),g(e,r,a,c)}if(typeof a.then==`function`)return _(e,r,_o(a),c);if(a.$$typeof===de)return _(e,r,Ia(e,a),c);yo(e,a)}return typeof a==`string`&&a!==``||typeof a==`number`||typeof a==`bigint`?(a=``+a,r!==null&&r.tag===6?(n(e,r.sibling),c=i(r,a),c.return=e,e=c):(n(e,r),c=Yi(a,e.mode,c),c.return=e,e=c),o(e)):n(e,r)}return function(e,t,n,r){try{go=0;var i=_(e,t,n,r);return ho=null,i}catch(t){if(t===io||t===oo)throw t;var a=Ui(29,t,null,e.mode);return a.lanes=r,a.return=e,a}}}var xo=bo(!0),So=bo(!1),Co=!1;function wo(e){e.updateQueue={baseState:e.memoizedState,firstBaseUpdate:null,lastBaseUpdate:null,shared:{pending:null,lanes:0,hiddenCallbacks:null},callbacks:null}}function To(e,t){e=e.updateQueue,t.updateQueue===e&&(t.updateQueue={baseState:e.baseState,firstBaseUpdate:e.firstBaseUpdate,lastBaseUpdate:e.lastBaseUpdate,shared:e.shared,callbacks:null})}function Eo(e){return{lane:e,tag:0,payload:null,callback:null,next:null}}function Do(e,t,n){var r=e.updateQueue;if(r===null)return null;if(r=r.shared,W&2){var i=r.pending;return i===null?t.next=t:(t.next=i.next,i.next=t),r.pending=t,t=Bi(e),zi(e,null,n),t}return Ii(e,r,t,n),Bi(e)}function Oo(e,t,n){if(t=t.updateQueue,t!==null&&(t=t.shared,n&4194048)){var r=t.lanes;r&=e.pendingLanes,n|=r,t.lanes=n,Et(e,n)}}function ko(e,t){var n=e.updateQueue,r=e.alternate;if(r!==null&&(r=r.updateQueue,n===r)){var i=null,a=null;if(n=n.firstBaseUpdate,n!==null){do{var o={lane:n.lane,tag:n.tag,payload:n.payload,callback:null,next:null};a===null?i=a=o:a=a.next=o,n=n.next}while(n!==null);a===null?i=a=t:a=a.next=t}else i=a=t;n={baseState:r.baseState,firstBaseUpdate:i,lastBaseUpdate:a,shared:r.shared,callbacks:r.callbacks},e.updateQueue=n}else e=n.lastBaseUpdate,e===null?n.firstBaseUpdate=t:e.next=t,n.lastBaseUpdate=t}var Ao=!1;function jo(){if(Ao){var e=Ya;if(e!==null)throw e}}function Mo(e,t,n,r){Ao=!1;var i=e.updateQueue;Co=!1;var a=i.firstBaseUpdate,o=i.lastBaseUpdate,s=i.shared.pending;if(s!==null){i.shared.pending=null;var c=s,l=c.next;c.next=null,o===null?a=l:o.next=l,o=c;var u=e.alternate;u!==null&&(u=u.updateQueue,s=u.lastBaseUpdate,s!==o&&(s===null?u.firstBaseUpdate=l:s.next=l,u.lastBaseUpdate=c))}if(a!==null){var d=i.baseState;o=0,u=l=c=null,s=a;do{var f=s.lane&-536870913,p=f!==s.lane;if(p?(q&f)===f:(r&f)===f){f!==0&&f===Ja&&(Ao=!0),u!==null&&(u=u.next={lane:0,tag:s.tag,payload:s.payload,callback:null,next:null});a:{var m=e,h=s;f=t;var g=n;switch(h.tag){case 1:if(m=h.payload,typeof m==`function`){d=m.call(g,d,f);break a}d=m;break a;case 3:m.flags=m.flags&-65537|128;case 0:if(m=h.payload,f=typeof m==`function`?m.call(g,d,f):m,f==null)break a;d=C({},d,f);break a;case 2:Co=!0}}f=s.callback,f!==null&&(e.flags|=64,p&&(e.flags|=8192),p=i.callbacks,p===null?i.callbacks=[f]:p.push(f))}else p={lane:f,tag:s.tag,payload:s.payload,callback:s.callback,next:null},u===null?(l=u=p,c=d):u=u.next=p,o|=f;if(s=s.next,s===null){if(s=i.shared.pending,s===null)break;p=s,s=p.next,p.next=null,i.lastBaseUpdate=p,i.shared.pending=null}}while(1);u===null&&(c=d),i.baseState=c,i.firstBaseUpdate=l,i.lastBaseUpdate=u,a===null&&(i.shared.lanes=0),sd|=o,e.lanes=o,e.memoizedState=d}}function No(e,t){if(typeof e!=`function`)throw Error(s(191,e));e.call(t)}function Po(e,t){var n=e.callbacks;if(n!==null)for(e.callbacks=null,e=0;ea?a:8;var o=T.T,s={};s.types=o===null?null:o.types,T.T=s,_c(e,!1,t,n);try{var c=i(),l=T.S;l!==null&&l(s,c),typeof c==`object`&&c&&typeof c.then==`function`?gc(e,t,Qa(c,r),jd(e)):gc(e,t,r,jd(e))}catch(n){gc(e,t,{then:function(){},status:`rejected`,reason:n},jd())}finally{E.p=a,o!==null&&s.types!==null&&(o.types=s.types),T.T=o}}function oc(){}function sc(e,t,n,r){if(e.tag!==5)throw Error(s(476));var i=cc(e).queue;ac(e,i,t,Ee,n===null?oc:function(){return lc(e),n(r)})}function cc(e){var t=e.memoizedState;if(t!==null)return t;t={memoizedState:Ee,baseState:Ee,baseQueue:null,queue:{pending:null,lanes:0,dispatch:null,lastRenderedReducer:vs,lastRenderedState:Ee},next:null};var n={};return t.next={memoizedState:n,baseState:n,baseQueue:null,queue:{pending:null,lanes:0,dispatch:null,lastRenderedReducer:vs,lastRenderedState:n},next:null},e.memoizedState=t,e=e.alternate,e!==null&&(e.memoizedState=t),t}function lc(e){var t=cc(e);t.next===null&&(t=e.alternate.memoizedState),gc(e,t.next.queue,{},jd())}function uc(){return Fa(sh)}function dc(){return I().memoizedState}function fc(){return I().memoizedState}function pc(e){for(var t=e.return;t!==null;){switch(t.tag){case 24:case 3:var n=jd();e=Eo(n);var r=Do(t,e,n);r!==null&&(Pd(r,t,n),Oo(r,t,n)),t={cache:Va()},e.payload=t;return}t=t.return}}function mc(e,t,n){var r=jd();n={lane:r,revertLane:0,gesture:null,action:n,hasEagerState:!1,eagerState:null,next:null},vc(e)?yc(t,n):(n=Li(e,t,n,r),n!==null&&(Pd(n,e,r),bc(n,t,r)))}function hc(e,t,n){gc(e,t,n,jd())}function gc(e,t,n,r){var i={lane:r,revertLane:0,gesture:null,action:n,hasEagerState:!1,eagerState:null,next:null};if(vc(e))yc(t,i);else{var a=e.alternate;if(e.lanes===0&&(a===null||a.lanes===0)&&(a=t.lastRenderedReducer,a!==null))try{var o=t.lastRenderedState,s=a(o,n);if(i.hasEagerState=!0,i.eagerState=s,Qr(s,o))return Ii(e,t,i,0),G===null&&Fi(),!1}catch{}if(n=Li(e,t,i,r),n!==null)return Pd(n,e,r),bc(n,t,r),!0}return!1}function _c(e,t,n,r){if(r={lane:2,revertLane:Pf(),gesture:null,action:r,hasEagerState:!1,eagerState:null,next:null},vc(e)){if(t)throw Error(s(479))}else t=Li(e,n,r,2),t!==null&&Pd(t,e,2)}function vc(e){var t=e.alternate;return e===M||t!==null&&t===M}function yc(e,t){$o=Qo=!0;var n=e.pending;n===null?t.next=t:(t.next=n.next,n.next=t),e.pending=t}function bc(e,t,n){if(n&4194048){var r=t.lanes;r&=e.pendingLanes,n|=r,t.lanes=n,Et(e,n)}}var xc={readContext:Fa,use:gs,useCallback:F,useContext:F,useEffect:F,useImperativeHandle:F,useLayoutEffect:F,useInsertionEffect:F,useMemo:F,useReducer:F,useRef:F,useState:F,useDebugValue:F,useDeferredValue:F,useTransition:F,useSyncExternalStore:F,useId:F,useHostTransitionStatus:F,useFormState:F,useActionState:F,useOptimistic:F,useMemoCache:F,useCacheRefresh:F,useEffectEvent:F},Sc={readContext:Fa,use:gs,useCallback:function(e,t){return ps().memoizedState=[e,t===void 0?null:t],e},useContext:Fa,useEffect:Ks,useImperativeHandle:function(e,t,n){n=n==null?null:n.concat([e]),Ws(4194308,4,Qs.bind(null,t,e),n)},useLayoutEffect:function(e,t){return Ws(4194308,4,e,t)},useInsertionEffect:function(e,t){Ws(4,2,e,t)},useMemo:function(e,t){var n=ps();t=t===void 0?null:t;var r=e();if(es){ct(!0);try{e()}finally{ct(!1)}}return n.memoizedState=[r,t],r},useReducer:function(e,t,n){var r=ps();if(n!==void 0){var i=n(t);if(es){ct(!0);try{n(t)}finally{ct(!1)}}}else i=t;return r.memoizedState=r.baseState=i,e={pending:null,lanes:0,dispatch:null,lastRenderedReducer:e,lastRenderedState:i},r.queue=e,e=e.dispatch=mc.bind(null,M,e),[r.memoizedState,e]},useRef:function(e){var t=ps();return e={current:e},t.memoizedState=e},useState:function(e){e=Os(e);var t=e.queue,n=hc.bind(null,M,t);return t.dispatch=n,[e.memoizedState,n]},useDebugValue:ec,useDeferredValue:function(e,t){return rc(ps(),e,t)},useTransition:function(){var e=Os(!1);return e=ac.bind(null,M,e.queue,!0,!1),ps().memoizedState=e,[!1,e]},useSyncExternalStore:function(e,t,n){var r=M,i=ps();if(A){if(n===void 0)throw Error(s(407));n=n()}else{if(n=t(),G===null)throw Error(s(349));q&127||Cs(r,t,n)}i.memoizedState=n;var a={value:n,getSnapshot:t};return i.queue=a,Ks(Ts.bind(null,r,a,e),[e]),r.flags|=2048,Hs(9,{destroy:void 0},ws.bind(null,r,a,n,t),null),n},useId:function(){var e=ps(),t=G.identifierPrefix;if(A){var n=ca,r=sa;n=(r&~(1<<32-lt(r)-1)).toString(32)+n,t=`_`+t+`R_`+n,n=ts++,0<\/script>`,a=a.removeChild(a.firstChild);break;case`select`:a=typeof r.is==`string`?o.createElement(`select`,{is:r.is}):o.createElement(`select`),r.multiple?a.multiple=!0:r.size&&(a.size=r.size);break;default:a=typeof r.is==`string`?o.createElement(i,{is:r.is}):o.createElement(i)}}a[Nt]=t,a[Pt]=r;a:for(o=t.child;o!==null;){if(o.tag===5||o.tag===6)a.appendChild(o.stateNode);else if(o.tag!==4&&o.tag!==27&&o.child!==null){o.child.return=o,o=o.child;continue}if(o===t)break a;for(;o.sibling===null;){if(o.return===null||o.return===t)break a;o=o.return}o.sibling.return=o.return,o=o.sibling}t.stateNode=a;a:switch(np(a,i,r),i){case`button`:case`input`:case`select`:case`textarea`:r=!!r.autoFocus;break a;case`img`:r=!0;break a;default:r=!1}r&&vl(t)}}return z(t),t.subtreeFlags&=-33554433,yl(t,t.type,e===null?null:e.memoizedProps,t.pendingProps,n),null;case 6:if(e&&t.stateNode!=null)e.memoizedProps!==r&&vl(t);else{if(typeof r!=`string`&&t.stateNode===null)throw Error(s(166));if(e=Ne.current,xa(t)){if(e=t.stateNode,n=t.memoizedProps,r=null,i=ma,i!==null)switch(i.tag){case 27:case 5:r=i.memoizedProps}e[Nt]=t,e=!!(e.nodeValue===n||r!==null&&!0===r.suppressHydrationWarning||ep(e.nodeValue,n)),e||va(t,!0)}else e=lp(e).createTextNode(r),e[Nt]=t,t.stateNode=e}return z(t),null;case 31:if(n=t.memoizedState,e===null||e.memoizedState!==null){if(r=xa(t),n!==null){if(e===null){if(!r)throw Error(s(318));if(e=t.memoizedState,e=e===null?null:e.dehydrated,!e)throw Error(s(557));e[Nt]=t}else Sa(),!(t.flags&128)&&(t.memoizedState=null),t.flags|=4;z(t),e=!1}else n=Ca(),e!==null&&e.memoizedState!==null&&(e.memoizedState.hydrationErrors=n),e=!0;if(!e)return t.flags&256?(Ko(t),t):(Ko(t),null);if(t.flags&128)throw Error(s(558))}return z(t),null;case 13:if(r=t.memoizedState,e===null||e.memoizedState!==null&&e.memoizedState.dehydrated!==null){if(i=xa(t),r!==null&&r.dehydrated!==null){if(e===null){if(!i)throw Error(s(318));if(i=t.memoizedState,i=i===null?null:i.dehydrated,!i)throw Error(s(317));i[Nt]=t}else Sa(),!(t.flags&128)&&(t.memoizedState=null),t.flags|=4;z(t),i=!1}else i=Ca(),e!==null&&e.memoizedState!==null&&(e.memoizedState.hydrationErrors=i),i=!0;if(!i)return t.flags&256?(Ko(t),t):(Ko(t),null)}return Ko(t),t.flags&128?(t.lanes=n,t):(n=r!==null,e=e!==null&&e.memoizedState!==null,n&&(r=t.child,i=null,r.alternate!==null&&r.alternate.memoizedState!==null&&r.alternate.memoizedState.cachePool!==null&&(i=r.alternate.memoizedState.cachePool.pool),a=null,r.memoizedState!==null&&r.memoizedState.cachePool!==null&&(a=r.memoizedState.cachePool.pool),a!==i&&(r.flags|=2048)),n!==e&&n&&(t.child.flags|=8192),xl(t,t.updateQueue),z(t),null);case 4:return Ie(),e===null&&Wf(t.stateNode.containerInfo),t.flags|=67108864,z(t),null;case 10:return ka(t.type),z(t),null;case 19:if(Yo(t),r=t.memoizedState,r===null)return z(t),null;if(i=!!(t.flags&128),a=r.rendering,a===null){if(i)Sl(r,!1);else{if(Y!==0||e!==null&&e.flags&128)for(e=t.child;e!==null;){if(a=Xo(e),a!==null){for(t.flags|=128,Sl(r,!1),e=a.updateQueue,t.updateQueue=e,xl(t,e),t.subtreeFlags=0,e=n,n=t.child;n!==null;)Ki(n,e),n=n.sibling;return Jo(t,qo.current&1|2),A&&la(t,r.treeForkCount),t.child}e=e.sibling}r.tail!==null&&Ze()>_d&&(t.flags|=128,i=!0,Sl(r,!1),t.lanes=4194304)}}else{if(!i){if(e=Xo(a),e!==null){if(t.flags|=128,i=!0,e=e.updateQueue,t.updateQueue=e,xl(t,e),Sl(r,!0),r.tail===null&&r.tailMode!==`collapsed`&&r.tailMode!==`visible`&&!a.alternate&&!A)return z(t),null}else 2*Ze()-r.renderingStartTime>_d&&n!==536870912&&(t.flags|=128,i=!0,Sl(r,!1),t.lanes=4194304)}r.isBackwards?(a.sibling=t.child,t.child=a):(e=r.last,e===null?t.child=a:e.sibling=a,r.last=a)}if(r.tail!==null){e=r.tail;a:{for(n=e;n!==null;){if(n.alternate!==null){n=!1;break a}n=n.sibling}n=!0}return r.rendering=e,r.tail=e.sibling,r.renderingStartTime=Ze(),e.sibling=null,a=qo.current,a=i?a&1|2:a&1,r.tailMode===`visible`||r.tailMode===`collapsed`||!n||A?Jo(t,a):(n=a,D(Bo,t),D(qo,n),Vo===null&&(Vo=t)),A&&la(t,r.treeForkCount),e}return z(t),null;case 22:case 23:return Ko(t),zo(),r=t.memoizedState!==null,e===null?r&&(t.flags|=8192):e.memoizedState!==null!==r&&(t.flags|=8192),r?n&536870912&&!(t.flags&128)&&(z(t),t.subtreeFlags&6&&(t.flags|=8192)):z(t),n=t.updateQueue,n!==null&&xl(t,n.retryQueue),n=null,e!==null&&e.memoizedState!==null&&e.memoizedState.cachePool!==null&&(n=e.memoizedState.cachePool.pool),r=null,t.memoizedState!==null&&t.memoizedState.cachePool!==null&&(r=t.memoizedState.cachePool.pool),r!==n&&(t.flags|=2048),e!==null&&Ae(eo),null;case 24:return n=null,e!==null&&(n=e.memoizedState.cache),t.memoizedState.cache!==n&&(t.flags|=2048),ka(j),z(t),null;case 25:return null;case 30:return t.flags|=33554432,z(t),null}throw Error(s(156,t.tag))}function wl(e,t){switch(fa(t),t.tag){case 1:return e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 3:return ka(j),Ie(),e=t.flags,e&65536&&!(e&128)?(t.flags=e&-65537|128,t):null;case 26:case 27:case 5:return Re(t),null;case 31:if(t.memoizedState!==null){if(Ko(t),t.alternate===null)throw Error(s(340));Sa()}return e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 13:if(Ko(t),e=t.memoizedState,e!==null&&e.dehydrated!==null){if(t.alternate===null)throw Error(s(340));Sa()}return e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 19:return Yo(t),e=t.flags,e&65536?(t.flags=e&-65537|128,e=t.memoizedState,e!==null&&(e.rendering=null,e.tail=null),t.flags|=4,t):null;case 4:return Ie(),null;case 10:return ka(t.type),null;case 22:case 23:return Ko(t),zo(),e!==null&&Ae(eo),e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 24:return ka(j),null;case 25:return null;default:return null}}function Tl(e,t){switch(fa(t),t.tag){case 3:ka(j),Ie();break;case 26:case 27:case 5:Re(t);break;case 4:Ie();break;case 31:t.memoizedState!==null&&Ko(t);break;case 13:Ko(t);break;case 19:Yo(t);break;case 10:ka(t.type);break;case 22:case 23:Ko(t),zo(),e!==null&&Ae(eo);break;case 24:ka(j)}}function El(e,t){try{var n=t.updateQueue,r=n===null?null:n.lastEffect;if(r!==null){var i=r.next;n=i;do{if((n.tag&e)===e){r=void 0;var a=n.create,o=n.inst;r=a(),o.destroy=r}n=n.next}while(n!==i)}}catch(e){Z(t,t.return,e)}}function Dl(e,t,n){try{var r=t.updateQueue,i=r===null?null:r.lastEffect;if(i!==null){var a=i.next;r=a;do{if((r.tag&e)===e){var o=r.inst,s=o.destroy;if(s!==void 0){o.destroy=void 0,i=t;var c=n,l=s;try{l()}catch(e){Z(i,c,e)}}}r=r.next}while(r!==a)}}catch(e){Z(t,t.return,e)}}function Ol(e){var t=e.updateQueue;if(t!==null){var n=e.stateNode;try{Po(t,n)}catch(t){Z(e,e.return,t)}}}function kl(e,t,n){n.props=kc(e.type,e.memoizedProps),n.state=e.memoizedState;try{n.componentWillUnmount()}catch(n){Z(e,t,n)}}function Al(e,t){try{var n=e.ref;if(n!==null){switch(e.tag){case 26:case 27:case 5:var r=e.stateNode;break;case 30:var i=e.stateNode,a=Oi(e.memoizedProps,i);(i.ref===null||i.ref.name!==a)&&(i.ref=Pp(a)),r=i.ref;break;case 7:if(e.stateNode===null){var o=new Fp(e);h(e.child,!1,Qp,o,void 0,void 0),e.stateNode=o}r=e.stateNode;break;default:r=e.stateNode}typeof n==`function`?e.refCleanup=n(r):n.current=r}}catch(n){Z(e,t,n)}}function jl(e,t){var n=e.ref,r=e.refCleanup;if(n!==null){if(typeof r==`function`)try{r()}catch(n){Z(e,t,n)}finally{e.refCleanup=null,e=e.alternate,e!=null&&(e.refCleanup=null)}else if(typeof n==`function`)try{n(null)}catch(n){Z(e,t,n)}else n.current=null}}function Ml(e,t){if((e.tag===5||e.tag===27||e.tag===6)&&e.alternate===null&&t!==null)for(var n=0;n title`))),np(r,t,n),r[Nt]=e,qt(r),t=r;break a;case`link`:if(a=Gm(`link`,`href`,i).get(t+(n.href||``))){for(o=0;og&&(o=g,g=h,h=o);var _=ni(s,h),v=ni(s,g);if(_&&v&&(p.rangeCount!==1||p.anchorNode!==_.node||p.anchorOffset!==_.offset||p.focusNode!==v.node||p.focusOffset!==v.offset)){var y=d.createRange();y.setStart(_.node,_.offset),p.removeAllRanges(),h>g?(p.addRange(y),p.extend(v.node,v.offset)):(y.setEnd(v.node,v.offset),p.addRange(y))}}}}for(d=[],p=s;p=p.parentNode;)p.nodeType===1&&d.push({element:p,left:p.scrollLeft,top:p.scrollTop});for(typeof s.focus==`function`&&s.focus(),s=0;sn?32:n,T.T=null,n=wd,wd=null;var a=bd,o=Sd;if(X=0,xd=bd=null,Sd=0,W&6)throw Error(s(331));var c=W;if(W|=4,Zu(a.current),Uu(a,a.current,o,n),W=c,Df(0,!1),st&&typeof st.onPostCommitFiberRoot==`function`)try{st.onPostCommitFiberRoot(ot,a)}catch{}return!0}finally{E.p=i,T.T=r,uf(e,t)}}function pf(e,t,n){t=$i(n,t),t=Fc(e.stateNode,t,2),e=Do(e,t,2),e!==null&&(Ct(e,2),Ef(e))}function Z(e,t,n){if(e.tag===3)pf(e,e,n);else for(;t!==null;){if(t.tag===3){pf(t,e,n);break}if(t.tag===1){var r=t.stateNode;if(typeof t.type.getDerivedStateFromError==`function`||typeof r.componentDidCatch==`function`&&(yd===null||!yd.has(r))){e=$i(n,e),n=Ic(2),r=Do(t,n,2),r!==null&&(Lc(n,r,t,e),Ct(r,2),Ef(r));break}}t=t.return}}function mf(e,t,n){var r=e.pingCache;if(r===null){r=e.pingCache=new td;var i=new Set;r.set(t,i)}else i=r.get(t),i===void 0&&(i=new Set,r.set(t,i));i.has(n)||(ad=!0,i.add(n),e=hf.bind(null,e,t,n),t.then(e,e))}function hf(e,t,n){var r=e.pingCache;r!==null&&r.delete(t),e.pingedLanes|=e.suspendedLanes&n,e.warmLanes&=~n,G===e&&(q&n)===n&&(Y===4||Y===3&&(q&62914560)===q&&300>Ze()-hd?W&2?ld|=n:Vd(e,0):ld|=n,dd===q&&(dd=0)),Ef(e)}function gf(e,t){t===0&&(t=xt()),e=Ri(e,t),e!==null&&(Ct(e,t),Ef(e))}function _f(e){var t=e.memoizedState,n=0;t!==null&&(n=t.retryLane),gf(e,n)}function vf(e,t){var n=0;switch(e.tag){case 31:case 13:var r=e.stateNode,i=e.memoizedState;i!==null&&(n=i.retryLane);break;case 19:r=e.stateNode;break;case 22:r=e.stateNode._retryCache;break;default:throw Error(s(314))}r!==null&&r.delete(t),gf(e,n)}function yf(e,t){return qe(e,t)}var bf=null,xf=null,Sf=!1,Cf=!1,wf=!1,Tf=0;function Ef(e){e!==xf&&e.next===null&&(xf===null?bf=xf=e:xf=xf.next=e),Cf=!0,Sf||(Sf=!0,Nf())}function Df(e,t){if(!wf&&Cf){wf=!0;do for(var n=!1,r=bf;r!==null;){if(!t){if(e!==0){var i=r.pendingLanes;if(i===0)var a=0;else{var o=r.suspendedLanes,s=r.pingedLanes;a=(1<<31-lt(42|e)+1)-1,a&=i&~(o&~s),a=a&201326741?a&201326741|1:a?a|2:0}a!==0&&(n=!0,Mf(r,a))}else a=q,a=_t(r,r===G?a:0,r.cancelPendingCommit!==null||r.timeoutHandle!==-1),!(a&3)||vt(r,a)||(n=!0,Mf(r,a))}r=r.next}while(n);wf=!1}}function Of(){kf()}function kf(){Cf=Sf=!1;var e=0;Tf!==0&&hp()&&(e=Tf);for(var t=Ze(),n=null,r=bf;r!==null;){var i=r.next,a=Af(r,t);a===0?(r.next=null,n===null?bf=i:n.next=i,i===null&&(xf=n)):(n=r,(e!==0||a&3)&&(Cf=!0)),r=i}X!==0&&X!==5||Df(e,!1),Tf!==0&&(Tf=0)}function Af(e,t){for(var n=e.suspendedLanes,r=e.pingedLanes,i=e.expirationTimes,a=e.pendingLanes&-62914561;0s)break;var u=c.transferSize,d=c.initiatorType;u&&ap(d)&&(c=c.responseEnd,o+=u*(c$m){s.length=o;break}f=new Promise(jp.bind(f)),s.push(f)}}}if(0`u`?null:document;function Tm(e,t,n){var r=wm;if(r&&typeof t==`string`&&t){var i=mn(t);i=`link[rel="`+e+`"][href="`+i+`"]`,typeof n==`string`&&(i+=`[crossorigin="`+n+`"]`),ym.has(i)||(ym.add(i),e={rel:e,crossOrigin:n,href:t},r.querySelector(i)===null&&(t=r.createElement(`link`),np(t,`link`,e),qt(t),r.head.appendChild(t)))}}function Em(e){xm.D(e),Tm(`dns-prefetch`,e,null)}function Dm(e,t){xm.C(e,t),Tm(`preconnect`,e,t)}function Om(e,t,n){xm.L(e,t,n);var r=wm;if(r&&e&&t){var i=`link[rel="preload"][as="`+mn(t)+`"]`;t===`image`&&n&&n.imageSrcSet?(i+=`[imagesrcset="`+mn(n.imageSrcSet)+`"]`,typeof n.imageSizes==`string`&&(i+=`[imagesizes="`+mn(n.imageSizes)+`"]`)):i+=`[href="`+mn(e)+`"]`;var a=i;switch(t){case`style`:a=Pm(e);break;case`script`:a=Rm(e)}if(!(vm.has(a)||(e=C({rel:`preload`,href:t===`image`&&n&&n.imageSrcSet?void 0:e,as:t},n),vm.set(a,e),r.querySelector(i)!==null||t===`style`&&r.querySelector(Fm(a))||t===`script`&&r.querySelector(zm(a))))){var o=r.createElement(`link`);np(o,`link`,e),t===`style`&&(o[Vt]=!0,o.onload=o.onerror=function(){Jt(o)}),qt(o),r.head.appendChild(o)}}}function km(e,t){xm.m(e,t);var n=wm;if(n&&e){var r=t&&typeof t.as==`string`?t.as:`script`,i=`link[rel="modulepreload"][as="`+mn(r)+`"][href="`+mn(e)+`"]`,a=i;switch(r){case`audioworklet`:case`paintworklet`:case`serviceworker`:case`sharedworker`:case`worker`:case`script`:a=Rm(e)}if(!vm.has(a)&&(e=C({rel:`modulepreload`,href:e},t),vm.set(a,e),n.querySelector(i)===null)){switch(r){case`audioworklet`:case`paintworklet`:case`serviceworker`:case`sharedworker`:case`worker`:case`script`:if(n.querySelector(zm(a)))return}r=n.createElement(`link`),np(r,`link`,e),qt(r),n.head.appendChild(r)}}}function Am(e,t,n){xm.S(e,t,n);var r=wm;if(r&&e){var i=Kt(r).hoistableStyles,a=Pm(e);t||=`default`;var o=i.get(a);if(!o){var s={loading:0,preload:null};if(o=r.querySelector(Fm(a)))s.loading=5;else{e=C({rel:`stylesheet`,href:e,"data-precedence":t},n),(n=vm.get(a))&&Hm(e,n);var c=o=r.createElement(`link`);qt(c),np(c,`link`,e),c._p=new Promise(function(e,t){c.onload=e,c.onerror=t}),c.addEventListener(`load`,function(){s.loading|=1}),c.addEventListener(`error`,function(){s.loading|=2}),s.loading|=4,Vm(o,t,r)}o={type:`stylesheet`,instance:o,count:1,state:s},i.set(a,o)}}}function jm(e,t){xm.X(e,t);var n=wm;if(n&&e){var r=Kt(n).hoistableScripts,i=Rm(e),a=r.get(i);a||(a=n.querySelector(zm(i)),a||(e=C({src:e,async:!0},t),(t=vm.get(i))&&Um(e,t),a=n.createElement(`script`),qt(a),np(a,`link`,e),n.head.appendChild(a)),a={type:`script`,instance:a,count:1,state:null},r.set(i,a))}}function Mm(e,t){xm.M(e,t);var n=wm;if(n&&e){var r=Kt(n).hoistableScripts,i=Rm(e),a=r.get(i);a||(a=n.querySelector(zm(i)),a||(e=C({src:e,async:!0,type:`module`},t),(t=vm.get(i))&&Um(e,t),a=n.createElement(`script`),qt(a),np(a,`link`,e),n.head.appendChild(a)),a={type:`script`,instance:a,count:1,state:null},r.set(i,a))}}function Nm(e,t,n,r){var i=(i=Ne.current)?bm(i):null;if(!i)throw Error(s(446));switch(e){case`meta`:case`title`:return null;case`style`:return typeof n.precedence==`string`&&typeof n.href==`string`?(n=Pm(n.href),t=Kt(i).hoistableStyles,r=t.get(n),r||(r={type:`style`,instance:null,count:0,state:null},t.set(n,r)),r):{type:`void`,instance:null,count:0,state:null};case`link`:if(n.rel===`stylesheet`&&typeof n.href==`string`&&typeof n.precedence==`string`){e=Pm(n.href);var a=Kt(i).hoistableStyles,o=a.get(e);if(o||(i=i.ownerDocument||i,o={type:`stylesheet`,instance:null,count:0,state:{loading:0,preload:null}},a.set(e,o),(a=i.querySelector(Fm(e)))?a._p||(o.instance=a,o.state.loading=5):(a=vm.get(e),a||(a={rel:`preload`,as:`style`,href:n.href,crossOrigin:n.crossOrigin,integrity:n.integrity,media:n.media,hrefLang:n.hrefLang,referrerPolicy:n.referrerPolicy},vm.set(e,a)),Lm(i,e,a,o.state))),t&&r===null)throw Error(s(528,``));return o}if(t&&r!==null)throw Error(s(529,``));return null;case`script`:return t=n.async,n=n.src,typeof n==`string`&&t&&typeof t!=`function`&&typeof t!=`symbol`?(n=Rm(n),t=Kt(i).hoistableScripts,r=t.get(n),r||(r={type:`script`,instance:null,count:0,state:null},t.set(n,r)),r):{type:`void`,instance:null,count:0,state:null};default:throw Error(s(444,e))}}function Pm(e){return`href="`+mn(e)+`"`}function Fm(e){return`link[rel="stylesheet"][`+e+`]`}function Im(e){return C({},e,{"data-precedence":e.precedence,precedence:null})}function Lm(e,t,n,r){if(t=e.querySelector(`link[rel="preload"][as="style"][`+t+`]`)){if(!0!==t[Vt]){r.loading=1;return}}else t=e.createElement(`link`),t[Vt]=!0,t.onload=t.onerror=Jt.bind(null,t),np(t,`link`,n),qt(t),e.head.appendChild(t);r.preload=t,t.addEventListener(`load`,function(){return r.loading|=1}),t.addEventListener(`error`,function(){return r.loading|=2})}function Rm(e){return`[src="`+mn(e)+`"]`}function zm(e){return`script[async]`+e}function Bm(e,t,n){if(t.count++,t.instance===null)switch(t.type){case`style`:var r=e.querySelector(`style[data-href~="`+mn(n.href)+`"]`);if(r)return t.instance=r,qt(r),r;var i=C({},n,{"data-href":n.href,"data-precedence":n.precedence,href:null,precedence:null});return r=(e.ownerDocument||e).createElement(`style`),qt(r),np(r,`style`,i),Vm(r,n.precedence,e),t.instance=r;case`stylesheet`:i=Pm(n.href);var a=e.querySelector(Fm(i));if(a)return t.state.loading|=4,t.instance=a,qt(a),a;r=Im(n),(i=vm.get(i))&&Hm(r,i),a=(e.ownerDocument||e).createElement(`link`),qt(a);var o=a;return o._p=new Promise(function(e,t){o.onload=e,o.onerror=t}),np(a,`link`,r),t.state.loading|=4,Vm(a,n.precedence,e),t.instance=a;case`script`:return a=Rm(n.src),(i=e.querySelector(zm(a)))?(t.instance=i,qt(i),i):(r=n,(i=vm.get(a))&&(r=C({},n),Um(r,i)),e=e.ownerDocument||e,i=e.createElement(`script`),qt(i),np(i,`link`,r),e.head.appendChild(i),t.instance=i);case`void`:return null;default:throw Error(s(443,t.type))}else t.type===`stylesheet`&&!(t.state.loading&4)&&(r=t.instance,t.state.loading|=4,Vm(r,n.precedence,e));return t.instance}function Vm(e,t,n){for(var r=n.querySelectorAll(`link[rel="stylesheet"][data-precedence],style[data-precedence]`),i=r.length?r[r.length-1]:null,a=i,o=0;o title`):null)}function qm(e,t,n){if(n===1||t.itemProp!=null)return!1;switch(e){case`meta`:case`title`:return!0;case`style`:if(typeof t.precedence!=`string`||typeof t.href!=`string`||t.href===``)break;return!0;case`link`:if(typeof t.rel!=`string`||typeof t.href!=`string`||t.href===``||t.onLoad||t.onError)break;switch(t.rel){case`stylesheet`:return e=t.disabled,typeof t.precedence==`string`&&e==null;default:return!0}case`script`:if(t.async&&typeof t.async!=`function`&&typeof t.async!=`symbol`&&!t.onLoad&&!t.onError&&t.src&&typeof t.src==`string`)return!0}return!1}function Jm(e,t){return e===`img`&&t.src!=null&&t.src!==``&&t.onLoad==null&&t.loading!==`lazy`}function Ym(e){return!(e.type===`stylesheet`&&!(e.state.loading&3))}function Xm(e){return(e.width||100)*(e.height||100)*(typeof devicePixelRatio==`number`?devicePixelRatio:1)*.25}function Zm(e,t){typeof t.decode==`function`&&(e.imgCount++,t.complete||(e.imgBytes+=Xm(t),e.suspenseyImages.push(t)),e=rh.bind(e),t.decode().then(e,e))}function Qm(e,t,n,r){if(n.type===`stylesheet`&&(typeof r.media!=`string`||!1!==matchMedia(r.media).matches)&&!(n.state.loading&4)){if(n.instance===null){var i=Pm(r.href),a=t.querySelector(Fm(i));if(a){t=a._p,typeof t==`object`&&t&&typeof t.then==`function`&&(e.count++,e=nh.bind(e),t.then(e,e)),n.state.loading|=4,n.instance=a,qt(a);return}a=t.ownerDocument||t,r=Im(r),(i=vm.get(i))&&Hm(r,i),a=a.createElement(`link`),qt(a);var o=a;o._p=new Promise(function(e,t){o.onload=e,o.onerror=t}),np(a,`link`,r),n.instance=a}e.stylesheets===null&&(e.stylesheets=new Map),e.stylesheets.set(n,t),(t=n.state.preload)&&!(n.state.loading&3)&&(e.count++,n=nh.bind(e),t.addEventListener(`load`,n),t.addEventListener(`error`,n))}}var $m=0;function eh(e,t){return e.stylesheets&&e.count===0&&ah(e,e.stylesheets),0$m?50:800)+t);return e.unsuspend=n,function(){e.unsuspend=null,clearTimeout(r),clearTimeout(i)}}:null}function th(e){if(e.count===0&&(e.imgCount===0||!e.waitingForImages)){if(e.stylesheets)ah(e,e.stylesheets);else if(e.unsuspend){var t=e.unsuspend;e.unsuspend=null,t()}}}function nh(){this.count--,th(this)}function rh(){this.imgCount--,th(this)}var ih=null;function ah(e,t){e.stylesheets=null,e.unsuspend!==null&&(e.count++,ih=new Map,t.forEach(oh,e),ih=null,nh.call(e))}function oh(e,t){if(!(t.state.loading&4)){var n=ih.get(e);if(n)var r=n.get(null);else{n=new Map,ih.set(e,n);for(var i=e.querySelectorAll(`link[data-precedence],style[data-precedence]`),a=0;a{function n(){if(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__<`u`&&typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE==`function`)try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(n)}catch(e){console.error(e)}}n(),t.exports=s()}))();function l(e,t,n,r){if(n===`a`&&!r)throw TypeError(`Private accessor was defined without a getter`);if(typeof t==`function`?e!==t||!r:!t.has(e))throw TypeError(`Cannot read private member from an object whose class did not declare it`);return n===`m`?r:n===`a`?r.call(e):r?r.value:t.get(e)}function u(e,t,n,r,i){if(r===`m`)throw TypeError(`Private method is not writable`);if(r===`a`&&!i)throw TypeError(`Private accessor was defined without a setter`);if(typeof t==`function`?e!==t||!i:!t.has(e))throw TypeError(`Cannot write private member to an object whose class did not declare it`);return r===`a`?i.call(e,n):i?i.value=n:t.set(e,n),n}var d,f=`__TAURI_TO_IPC_KEY__`;function p(e,t=!1){return window.__TAURI_INTERNALS__.transformCallback(e,t)}async function m(e,t={},n){return window.__TAURI_INTERNALS__.invoke(e,t,n)}var h=class{get rid(){return l(this,d,`f`)}constructor(e){d.set(this,void 0),u(this,d,e,`f`)}async close(){return m(`plugin:resources|close`,{rid:this.rid})}async[(d=new WeakMap,Symbol.asyncDispose)](){await this.close()}},g=class{constructor(...e){this.type=`Logical`,e.length===1?`Logical`in e[0]?(this.width=e[0].Logical.width,this.height=e[0].Logical.height):(this.width=e[0].width,this.height=e[0].height):(this.width=e[0],this.height=e[1])}toPhysical(e){return new _(this.width*e,this.height*e)}[f](){return{width:this.width,height:this.height}}toJSON(){return this[f]()}},_=class{constructor(...e){this.type=`Physical`,e.length===1?`Physical`in e[0]?(this.width=e[0].Physical.width,this.height=e[0].Physical.height):(this.width=e[0].width,this.height=e[0].height):(this.width=e[0],this.height=e[1])}toLogical(e){return new g(this.width/e,this.height/e)}[f](){return{width:this.width,height:this.height}}toJSON(){return this[f]()}},v=class{constructor(e){this.size=e}toLogical(e){return this.size instanceof g?this.size:this.size.toLogical(e)}toPhysical(e){return this.size instanceof _?this.size:this.size.toPhysical(e)}[f](){return{[`${this.size.type}`]:{width:this.size.width,height:this.size.height}}}toJSON(){return this[f]()}},y=class{constructor(...e){this.type=`Logical`,e.length===1?`Logical`in e[0]?(this.x=e[0].Logical.x,this.y=e[0].Logical.y):(this.x=e[0].x,this.y=e[0].y):(this.x=e[0],this.y=e[1])}toPhysical(e){return new b(this.x*e,this.y*e)}[f](){return{x:this.x,y:this.y}}toJSON(){return this[f]()}},b=class{constructor(...e){this.type=`Physical`,e.length===1?`Physical`in e[0]?(this.x=e[0].Physical.x,this.y=e[0].Physical.y):(this.x=e[0].x,this.y=e[0].y):(this.x=e[0],this.y=e[1])}toLogical(e){return new y(this.x/e,this.y/e)}[f](){return{x:this.x,y:this.y}}toJSON(){return this[f]()}},ee=class{constructor(e){this.position=e}toLogical(e){return this.position instanceof y?this.position:this.position.toLogical(e)}toPhysical(e){return this.position instanceof b?this.position:this.position.toPhysical(e)}[f](){return{[`${this.position.type}`]:{x:this.position.x,y:this.position.y}}}toJSON(){return this[f]()}},x;(function(e){e.WINDOW_RESIZED=`tauri://resize`,e.WINDOW_MOVED=`tauri://move`,e.WINDOW_CLOSE_REQUESTED=`tauri://close-requested`,e.WINDOW_DESTROYED=`tauri://destroyed`,e.WINDOW_FOCUS=`tauri://focus`,e.WINDOW_BLUR=`tauri://blur`,e.WINDOW_SCALE_FACTOR_CHANGED=`tauri://scale-change`,e.WINDOW_THEME_CHANGED=`tauri://theme-changed`,e.WINDOW_CREATED=`tauri://window-created`,e.WINDOW_SUSPENDED=`tauri://suspended`,e.WINDOW_RESUMED=`tauri://resumed`,e.WEBVIEW_CREATED=`tauri://webview-created`,e.DRAG_ENTER=`tauri://drag-enter`,e.DRAG_OVER=`tauri://drag-over`,e.DRAG_DROP=`tauri://drag-drop`,e.DRAG_LEAVE=`tauri://drag-leave`})(x||={});async function te(e,t){window.__TAURI_EVENT_PLUGIN_INTERNALS__.unregisterListener(e,t),await m(`plugin:event|unlisten`,{event:e,eventId:t})}async function ne(e,t,n){return m(`plugin:event|listen`,{event:e,target:typeof n?.target==`string`?{kind:`AnyLabel`,label:n.target}:n?.target??{kind:`Any`},handler:p(t)}).then(t=>async()=>te(e,t))}async function S(e,t,n){return ne(e,n=>{te(e,n.id),t(n)},n)}async function re(e,t){await m(`plugin:event|emit`,{event:e,payload:t})}async function C(e,t,n){await m(`plugin:event|emit_to`,{target:typeof e==`string`?{kind:`AnyLabel`,label:e}:e,event:t,payload:n})}var ie=class e extends h{constructor(e){super(e)}static async new(t,n,r){return m(`plugin:image|new`,{rgba:t,width:n,height:r}).then(t=>new e(t))}static async fromBytes(t){return m(`plugin:image|from_bytes`,{bytes:t}).then(t=>new e(t))}static async fromPath(t){return m(`plugin:image|from_path`,{path:t}).then(t=>new e(t))}async rgba(){return m(`plugin:image|rgba`,{rid:this.rid}).then(e=>new Uint8Array(e))}async size(){return m(`plugin:image|size`,{rid:this.rid})}};function ae(e){return e==null?null:typeof e==`string`?e:e instanceof ie?e.rid:e}var oe;(function(e){e[e.Critical=1]=`Critical`,e[e.Informational=2]=`Informational`})(oe||={});var se=class{constructor(e){this._preventDefault=!1,this.event=e.event,this.id=e.id}preventDefault(){this._preventDefault=!0}isPreventDefault(){return this._preventDefault}},ce;(function(e){e.None=`none`,e.Normal=`normal`,e.Indeterminate=`indeterminate`,e.Paused=`paused`,e.Error=`error`})(ce||={});function le(){return new fe(window.__TAURI_INTERNALS__.metadata.currentWindow.label,{skip:!0})}async function ue(){return m(`plugin:window|get_all_windows`).then(e=>e.map(e=>new fe(e,{skip:!0})))}var de=[`tauri://created`,`tauri://error`],fe=class{constructor(e,t={}){this.label=e,this.listeners=Object.create(null),t?.skip||m(`plugin:window|create`,{options:{...t,parent:typeof t.parent==`string`?t.parent:t.parent?.label,label:e}}).then(async()=>this.emit(`tauri://created`)).catch(async e=>this.emit(`tauri://error`,e))}static async getByLabel(e){return(await ue()).find(t=>t.label===e)??null}static getCurrent(){return le()}static async getAll(){return ue()}static async getFocusedWindow(){for(let e of await ue())if(await e.isFocused())return e;return null}async listen(e,t){return this._handleTauriEvent(e,t)?()=>{let n=this.listeners[e];n.splice(n.indexOf(t),1)}:ne(e,t,{target:{kind:`Window`,label:this.label}})}async once(e,t){return this._handleTauriEvent(e,t)?()=>{let n=this.listeners[e];n.splice(n.indexOf(t),1)}:S(e,t,{target:{kind:`Window`,label:this.label}})}async emit(e,t){if(de.includes(e))for(let n of this.listeners[e]||[])n({event:e,id:-1,payload:t});else return re(e,t)}async emitTo(e,t,n){if(de.includes(t))for(let e of this.listeners[t]||[])e({event:t,id:-1,payload:n});else return C(e,t,n)}_handleTauriEvent(e,t){return de.includes(e)?(e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t],!0):!1}async scaleFactor(){return m(`plugin:window|scale_factor`,{label:this.label})}async innerPosition(){return m(`plugin:window|inner_position`,{label:this.label}).then(e=>new b(e))}async outerPosition(){return m(`plugin:window|outer_position`,{label:this.label}).then(e=>new b(e))}async innerSize(){return m(`plugin:window|inner_size`,{label:this.label}).then(e=>new _(e))}async outerSize(){return m(`plugin:window|outer_size`,{label:this.label}).then(e=>new _(e))}async isFullscreen(){return m(`plugin:window|is_fullscreen`,{label:this.label})}async isMinimized(){return m(`plugin:window|is_minimized`,{label:this.label})}async isMaximized(){return m(`plugin:window|is_maximized`,{label:this.label})}async isFocused(){return m(`plugin:window|is_focused`,{label:this.label})}async isDecorated(){return m(`plugin:window|is_decorated`,{label:this.label})}async isResizable(){return m(`plugin:window|is_resizable`,{label:this.label})}async isMaximizable(){return m(`plugin:window|is_maximizable`,{label:this.label})}async isMinimizable(){return m(`plugin:window|is_minimizable`,{label:this.label})}async isClosable(){return m(`plugin:window|is_closable`,{label:this.label})}async isVisible(){return m(`plugin:window|is_visible`,{label:this.label})}async title(){return m(`plugin:window|title`,{label:this.label})}async theme(){return m(`plugin:window|theme`,{label:this.label})}async isAlwaysOnTop(){return m(`plugin:window|is_always_on_top`,{label:this.label})}async activityName(){return m(`plugin:window|activity_name`,{label:this.label})}async sceneIdentifier(){return m(`plugin:window|scene_identifier`,{label:this.label})}async center(){return m(`plugin:window|center`,{label:this.label})}async requestUserAttention(e){let t=null;return e&&(t=e===oe.Critical?{type:`Critical`}:{type:`Informational`}),m(`plugin:window|request_user_attention`,{label:this.label,value:t})}async setResizable(e){return m(`plugin:window|set_resizable`,{label:this.label,value:e})}async setEnabled(e){return m(`plugin:window|set_enabled`,{label:this.label,value:e})}async isEnabled(){return m(`plugin:window|is_enabled`,{label:this.label})}async setMaximizable(e){return m(`plugin:window|set_maximizable`,{label:this.label,value:e})}async setMinimizable(e){return m(`plugin:window|set_minimizable`,{label:this.label,value:e})}async setClosable(e){return m(`plugin:window|set_closable`,{label:this.label,value:e})}async setTitle(e){return m(`plugin:window|set_title`,{label:this.label,value:e})}async maximize(){return m(`plugin:window|maximize`,{label:this.label})}async unmaximize(){return m(`plugin:window|unmaximize`,{label:this.label})}async toggleMaximize(){return m(`plugin:window|toggle_maximize`,{label:this.label})}async minimize(){return m(`plugin:window|minimize`,{label:this.label})}async unminimize(){return m(`plugin:window|unminimize`,{label:this.label})}async show(){return m(`plugin:window|show`,{label:this.label})}async hide(){return m(`plugin:window|hide`,{label:this.label})}async close(){return m(`plugin:window|close`,{label:this.label})}async destroy(){return m(`plugin:window|destroy`,{label:this.label})}async setDecorations(e){return m(`plugin:window|set_decorations`,{label:this.label,value:e})}async setShadow(e){return m(`plugin:window|set_shadow`,{label:this.label,value:e})}async setEffects(e){return m(`plugin:window|set_effects`,{label:this.label,value:e})}async clearEffects(){return m(`plugin:window|set_effects`,{label:this.label,value:null})}async setAlwaysOnTop(e){return m(`plugin:window|set_always_on_top`,{label:this.label,value:e})}async setAlwaysOnBottom(e){return m(`plugin:window|set_always_on_bottom`,{label:this.label,value:e})}async setContentProtected(e){return m(`plugin:window|set_content_protected`,{label:this.label,value:e})}async setSize(e){return m(`plugin:window|set_size`,{label:this.label,value:e instanceof v?e:new v(e)})}async setMinSize(e){return m(`plugin:window|set_min_size`,{label:this.label,value:e instanceof v?e:e?new v(e):null})}async setMaxSize(e){return m(`plugin:window|set_max_size`,{label:this.label,value:e instanceof v?e:e?new v(e):null})}async setSizeConstraints(e){function t(e){return e?{Logical:e}:null}return m(`plugin:window|set_size_constraints`,{label:this.label,value:{minWidth:t(e?.minWidth),minHeight:t(e?.minHeight),maxWidth:t(e?.maxWidth),maxHeight:t(e?.maxHeight)}})}async setPosition(e){return m(`plugin:window|set_position`,{label:this.label,value:e instanceof ee?e:new ee(e)})}async setFullscreen(e){return m(`plugin:window|set_fullscreen`,{label:this.label,value:e})}async setFullscreenOnMonitor(e){return m(`plugin:window|set_fullscreen_on_monitor`,{label:this.label,value:e})}async setSimpleFullscreen(e){return m(`plugin:window|set_simple_fullscreen`,{label:this.label,value:e})}async setFocus(){return m(`plugin:window|set_focus`,{label:this.label})}async setFocusable(e){return m(`plugin:window|set_focusable`,{label:this.label,value:e})}async setIcon(e){return m(`plugin:window|set_icon`,{label:this.label,value:ae(e)})}async setSkipTaskbar(e){return m(`plugin:window|set_skip_taskbar`,{label:this.label,value:e})}async setCursorGrab(e){return m(`plugin:window|set_cursor_grab`,{label:this.label,value:e})}async setCursorVisible(e){return m(`plugin:window|set_cursor_visible`,{label:this.label,value:e})}async setCursorIcon(e){return m(`plugin:window|set_cursor_icon`,{label:this.label,value:e})}async setBackgroundColor(e){return m(`plugin:window|set_background_color`,{label:this.label,value:e})}async setCursorPosition(e){return m(`plugin:window|set_cursor_position`,{label:this.label,value:e instanceof ee?e:new ee(e)})}async setIgnoreCursorEvents(e){return m(`plugin:window|set_ignore_cursor_events`,{label:this.label,value:e})}async startDragging(){return m(`plugin:window|start_dragging`,{label:this.label})}async startResizeDragging(e){return m(`plugin:window|start_resize_dragging`,{label:this.label,value:e})}async setBadgeCount(e){return m(`plugin:window|set_badge_count`,{label:this.label,value:e})}async setBadgeLabel(e){return m(`plugin:window|set_badge_label`,{label:this.label,value:e})}async setOverlayIcon(e){return m(`plugin:window|set_overlay_icon`,{label:this.label,value:e?ae(e):void 0})}async setProgressBar(e){return m(`plugin:window|set_progress_bar`,{label:this.label,value:e})}async setVisibleOnAllWorkspaces(e){return m(`plugin:window|set_visible_on_all_workspaces`,{label:this.label,value:e})}async setTitleBarStyle(e){return m(`plugin:window|set_title_bar_style`,{label:this.label,value:e})}async setTheme(e){return m(`plugin:window|set_theme`,{label:this.label,value:e})}async onResized(e){return this.listen(x.WINDOW_RESIZED,t=>{t.payload=new _(t.payload),e(t)})}async onMoved(e){return this.listen(x.WINDOW_MOVED,t=>{t.payload=new b(t.payload),e(t)})}async onCloseRequested(e){return this.listen(x.WINDOW_CLOSE_REQUESTED,async t=>{let n=new se(t);await e(n),n.isPreventDefault()||await this.destroy()})}async onDragDropEvent(e){let t=await this.listen(x.DRAG_ENTER,t=>{e({...t,payload:{type:`enter`,paths:t.payload.paths,position:new b(t.payload.position)}})}),n=await this.listen(x.DRAG_OVER,t=>{e({...t,payload:{type:`over`,position:new b(t.payload.position)}})}),r=await this.listen(x.DRAG_DROP,t=>{e({...t,payload:{type:`drop`,paths:t.payload.paths,position:new b(t.payload.position)}})}),i=await this.listen(x.DRAG_LEAVE,t=>{e({...t,payload:{type:`leave`}})});return async()=>{await Promise.all([t(),r(),n(),i()])}}async onFocusChanged(e){let t=await this.listen(x.WINDOW_FOCUS,t=>{e({...t,payload:!0})}),n=await this.listen(x.WINDOW_BLUR,t=>{e({...t,payload:!1})});return async()=>{await Promise.all([t(),n()])}}async onScaleChanged(e){return this.listen(x.WINDOW_SCALE_FACTOR_CHANGED,e)}async onThemeChanged(e){return this.listen(x.WINDOW_THEME_CHANGED,e)}},pe;(function(e){e.Disabled=`disabled`,e.Throttle=`throttle`,e.Suspend=`suspend`})(pe||={});var me;(function(e){e.Default=`default`,e.FluentOverlay=`fluentOverlay`})(me||={});var he;(function(e){e.AppearanceBased=`appearanceBased`,e.Light=`light`,e.Dark=`dark`,e.MediumLight=`mediumLight`,e.UltraDark=`ultraDark`,e.Titlebar=`titlebar`,e.Selection=`selection`,e.Menu=`menu`,e.Popover=`popover`,e.Sidebar=`sidebar`,e.HeaderView=`headerView`,e.Sheet=`sheet`,e.WindowBackground=`windowBackground`,e.HudWindow=`hudWindow`,e.FullScreenUI=`fullScreenUI`,e.Tooltip=`tooltip`,e.ContentBackground=`contentBackground`,e.UnderWindowBackground=`underWindowBackground`,e.UnderPageBackground=`underPageBackground`,e.LiquidGlassRegular=`liquidGlassRegular`,e.LiquidGlassClear=`liquidGlassClear`,e.Mica=`mica`,e.Blur=`blur`,e.Acrylic=`acrylic`,e.Tabbed=`tabbed`,e.TabbedDark=`tabbedDark`,e.TabbedLight=`tabbedLight`})(he||={});var ge;(function(e){e.FollowsWindowActiveState=`followsWindowActiveState`,e.Active=`active`,e.Inactive=`inactive`})(ge||={});var _e=`/assets/icon-small-B3qZg5R1.svg`,ve=i(),ye=e((e=>{var t=Symbol.for(`react.transitional.element`),n=Symbol.for(`react.fragment`);function r(e,n,r){var i=null;if(r!==void 0&&(i=``+r),n.key!==void 0&&(i=``+n.key),`key`in n)for(var a in r={},n)a!==`key`&&(r[a]=n[a]);else r=n;return n=r.ref,{$$typeof:t,type:e,key:i,ref:n===void 0?null:n,props:r}}e.Fragment=n,e.jsx=r,e.jsxs=r})),w=e(((e,t)=>{t.exports=ye()}))(),be=le();function xe(){let[e,t]=(0,ve.useState)(!1),[n,r]=(0,ve.useState)(null);return(0,ve.useEffect)(()=>{let e=[],n=!1;return(async()=>{let i=await be.listen(`app://update-progress`,e=>{r(e.payload)}),a=await be.listen(`app://update-error`,()=>{t(!0)});n?(i(),a()):(e.push(i,a),await be.emit(`app://update`))})(),()=>{n=!0,e.forEach(e=>e())}},[]),(0,w.jsxs)(`div`,{className:`update-window`,"data-tauri-drag-region":!0,children:[(0,w.jsx)(`img`,{src:_e,alt:``,className:`update-logo`,"data-tauri-drag-region":!0}),(0,w.jsx)(`div`,{className:`update-content`,"data-tauri-drag-region":!0,children:e?(0,w.jsx)(Ce,{onRetry:()=>{t(!1),r(null),be.emit(`app://update`)}}):(0,w.jsx)(Se,{progress:n})})]})}function Se({progress:e}){return(0,w.jsxs)(`div`,{className:`update-status`,"data-tauri-drag-region":!0,children:[(0,w.jsx)(`h1`,{className:`update-title`,"data-tauri-drag-region":!0,children:`Getting GP Connect ready`}),(0,w.jsx)(we,{value:e})]})}function Ce({onRetry:e}){return(0,w.jsxs)(`div`,{className:`update-status error-status`,"data-tauri-drag-region":!0,children:[(0,w.jsxs)(`div`,{className:`error-copy`,role:`alert`,"data-tauri-drag-region":!0,children:[(0,w.jsx)(`h1`,{className:`update-title`,"data-tauri-drag-region":!0,children:`Couldn’t get GP Connect ready`}),(0,w.jsx)(`p`,{className:`update-description`,"data-tauri-drag-region":!0,children:`Please try again.`})]}),(0,w.jsx)(`button`,{type:`button`,onClick:e,className:`retry-button`,children:`Retry`})]})}function we({value:e}){let t=e!==null;return(0,w.jsxs)(w.Fragment,{children:[(0,w.jsxs)(`div`,{className:`progress-summary`,"data-tauri-drag-region":!0,children:[(0,w.jsx)(`p`,{className:`update-description`,"data-tauri-drag-region":!0,children:`This should only take a moment.`}),(0,w.jsx)(`span`,{className:`progress-label`,"aria-hidden":`true`,children:t?`${Math.round(e)}%`:`In progress`})]}),(0,w.jsx)(`div`,{className:`progress-bar${t?``:` progress-bar-indeterminate`}`,role:`progressbar`,"aria-label":`Update progress`,"aria-valuemin":t?0:void 0,"aria-valuemax":t?100:void 0,"aria-valuenow":t?Math.round(e):void 0,children:(0,w.jsx)(`div`,{className:`progress-fill`,style:t?{width:`${e}%`}:void 0})})]})}(0,c.createRoot)(document.getElementById(`root`)).render((0,w.jsx)(xe,{})); \ No newline at end of file +`).replace(Qf,``)}function ep(e,t){return t=$f(t),$f(e)===t}function $(e,t,n,r,i,a){switch(n){case`children`:if(typeof r==`string`)t===`body`||t===`textarea`&&r===``||xn(e,r);else if(typeof r==`number`||typeof r==`bigint`)t!==`body`&&xn(e,``+r);else return;break;case`className`:on(e,`class`,r);break;case`tabIndex`:on(e,`tabindex`,r);break;case`dir`:case`role`:case`viewBox`:case`width`:case`height`:on(e,n,r);break;case`style`:wn(e,r,a);return;case`data`:if(t!==`object`){on(e,`data`,r);break}case`src`:case`href`:if(r===``&&(t!==`a`||n!==`href`)||r==null||typeof r==`function`||typeof r==`symbol`||typeof r==`boolean`){e.removeAttribute(n);break}r=On(r),e.setAttribute(n,r);break;case`action`:case`formAction`:if(typeof r==`function`){e.setAttribute(n,`javascript:throw new Error('A React form was unexpectedly submitted. If you called form.submit() manually, consider using form.requestSubmit() instead. If you\\'re trying to use event.stopPropagation() in a submit event handler, consider also calling event.preventDefault().')`);break}if(typeof a==`function`&&(n===`formAction`?(t!==`input`&&$(e,t,`name`,i.name,i,null),$(e,t,`formEncType`,i.formEncType,i,null),$(e,t,`formMethod`,i.formMethod,i,null),$(e,t,`formTarget`,i.formTarget,i,null)):($(e,t,`encType`,i.encType,i,null),$(e,t,`method`,i.method,i,null),$(e,t,`target`,i.target,i,null))),r==null||typeof r==`symbol`||typeof r==`boolean`){e.removeAttribute(n);break}r=On(r),e.setAttribute(n,r);break;case`onClick`:r!=null&&(e.onclick=kn);return;case`onScroll`:r!=null&&Q(`scroll`,e);return;case`onScrollEnd`:r!=null&&Q(`scrollend`,e);return;case`dangerouslySetInnerHTML`:if(r!=null){if(typeof r!=`object`||!(`__html`in r))throw Error(s(61));if(n=r.__html,n!=null){if(i.children!=null)throw Error(s(60));a?.__html!==n&&(e.innerHTML=n)}}break;case`multiple`:e.multiple=r&&typeof r!=`function`&&typeof r!=`symbol`;break;case`muted`:e.muted=r&&typeof r!=`function`&&typeof r!=`symbol`;break;case`suppressContentEditableWarning`:case`suppressHydrationWarning`:case`defaultValue`:case`defaultChecked`:case`innerHTML`:case`ref`:break;case`autoFocus`:break;case`xlinkHref`:if(r==null||typeof r==`function`||typeof r==`boolean`||typeof r==`symbol`){e.removeAttribute(`xlink:href`);break}n=On(r),e.setAttributeNS(`http://www.w3.org/1999/xlink`,`xlink:href`,n);break;case`contentEditable`:case`spellCheck`:case`draggable`:case`value`:case`autoReverse`:case`externalResourcesRequired`:case`focusable`:case`preserveAlpha`:r!=null&&typeof r!=`function`&&typeof r!=`symbol`?e.setAttribute(n,r):e.removeAttribute(n);break;case`inert`:case`allowFullScreen`:case`async`:case`autoPlay`:case`controls`:case`credentialless`:case`default`:case`defer`:case`disabled`:case`disablePictureInPicture`:case`disableRemotePlayback`:case`formNoValidate`:case`hidden`:case`loop`:case`noModule`:case`noValidate`:case`open`:case`playsInline`:case`readOnly`:case`required`:case`reversed`:case`scoped`:case`seamless`:case`itemScope`:r&&typeof r!=`function`&&typeof r!=`symbol`?e.setAttribute(n,``):e.removeAttribute(n);break;case`capture`:case`download`:!0===r?e.setAttribute(n,``):!1!==r&&r!=null&&typeof r!=`function`&&typeof r!=`symbol`?e.setAttribute(n,r):e.removeAttribute(n);break;case`cols`:case`rows`:case`size`:case`span`:r!=null&&typeof r!=`function`&&typeof r!=`symbol`&&!isNaN(r)&&1<=r?e.setAttribute(n,r):e.removeAttribute(n);break;case`rowSpan`:case`start`:r==null||typeof r==`function`||typeof r==`symbol`||isNaN(r)?e.removeAttribute(n):e.setAttribute(n,r);break;case`popover`:Q(`beforetoggle`,e),Q(`toggle`,e),an(e,`popover`,r);break;case`xlinkActuate`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:actuate`,r);break;case`xlinkArcrole`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:arcrole`,r);break;case`xlinkRole`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:role`,r);break;case`xlinkShow`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:show`,r);break;case`xlinkTitle`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:title`,r);break;case`xlinkType`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:type`,r);break;case`xmlBase`:sn(e,`http://www.w3.org/XML/1998/namespace`,`xml:base`,r);break;case`xmlLang`:sn(e,`http://www.w3.org/XML/1998/namespace`,`xml:lang`,r);break;case`xmlSpace`:sn(e,`http://www.w3.org/XML/1998/namespace`,`xml:space`,r);break;case`is`:an(e,`is`,r);break;case`innerText`:case`textContent`:return;default:if(!(2s)break;var u=c.transferSize,d=c.initiatorType;u&&ap(d)&&(c=c.responseEnd,o+=u*(c$m){s.length=o;break}f=new Promise(jp.bind(f)),s.push(f)}}}if(0`u`?null:document;function Tm(e,t,n){var r=wm;if(r&&typeof t==`string`&&t){var i=mn(t);i=`link[rel="`+e+`"][href="`+i+`"]`,typeof n==`string`&&(i+=`[crossorigin="`+n+`"]`),ym.has(i)||(ym.add(i),e={rel:e,crossOrigin:n,href:t},r.querySelector(i)===null&&(t=r.createElement(`link`),np(t,`link`,e),qt(t),r.head.appendChild(t)))}}function Em(e){xm.D(e),Tm(`dns-prefetch`,e,null)}function Dm(e,t){xm.C(e,t),Tm(`preconnect`,e,t)}function Om(e,t,n){xm.L(e,t,n);var r=wm;if(r&&e&&t){var i=`link[rel="preload"][as="`+mn(t)+`"]`;t===`image`&&n&&n.imageSrcSet?(i+=`[imagesrcset="`+mn(n.imageSrcSet)+`"]`,typeof n.imageSizes==`string`&&(i+=`[imagesizes="`+mn(n.imageSizes)+`"]`)):i+=`[href="`+mn(e)+`"]`;var a=i;switch(t){case`style`:a=Pm(e);break;case`script`:a=Rm(e)}if(!(vm.has(a)||(e=C({rel:`preload`,href:t===`image`&&n&&n.imageSrcSet?void 0:e,as:t},n),vm.set(a,e),r.querySelector(i)!==null||t===`style`&&r.querySelector(Fm(a))||t===`script`&&r.querySelector(zm(a))))){var o=r.createElement(`link`);np(o,`link`,e),t===`style`&&(o[Vt]=!0,o.onload=o.onerror=function(){Jt(o)}),qt(o),r.head.appendChild(o)}}}function km(e,t){xm.m(e,t);var n=wm;if(n&&e){var r=t&&typeof t.as==`string`?t.as:`script`,i=`link[rel="modulepreload"][as="`+mn(r)+`"][href="`+mn(e)+`"]`,a=i;switch(r){case`audioworklet`:case`paintworklet`:case`serviceworker`:case`sharedworker`:case`worker`:case`script`:a=Rm(e)}if(!vm.has(a)&&(e=C({rel:`modulepreload`,href:e},t),vm.set(a,e),n.querySelector(i)===null)){switch(r){case`audioworklet`:case`paintworklet`:case`serviceworker`:case`sharedworker`:case`worker`:case`script`:if(n.querySelector(zm(a)))return}r=n.createElement(`link`),np(r,`link`,e),qt(r),n.head.appendChild(r)}}}function Am(e,t,n){xm.S(e,t,n);var r=wm;if(r&&e){var i=Kt(r).hoistableStyles,a=Pm(e);t||=`default`;var o=i.get(a);if(!o){var s={loading:0,preload:null};if(o=r.querySelector(Fm(a)))s.loading=5;else{e=C({rel:`stylesheet`,href:e,"data-precedence":t},n),(n=vm.get(a))&&Hm(e,n);var c=o=r.createElement(`link`);qt(c),np(c,`link`,e),c._p=new Promise(function(e,t){c.onload=e,c.onerror=t}),c.addEventListener(`load`,function(){s.loading|=1}),c.addEventListener(`error`,function(){s.loading|=2}),s.loading|=4,Vm(o,t,r)}o={type:`stylesheet`,instance:o,count:1,state:s},i.set(a,o)}}}function jm(e,t){xm.X(e,t);var n=wm;if(n&&e){var r=Kt(n).hoistableScripts,i=Rm(e),a=r.get(i);a||(a=n.querySelector(zm(i)),a||(e=C({src:e,async:!0},t),(t=vm.get(i))&&Um(e,t),a=n.createElement(`script`),qt(a),np(a,`link`,e),n.head.appendChild(a)),a={type:`script`,instance:a,count:1,state:null},r.set(i,a))}}function Mm(e,t){xm.M(e,t);var n=wm;if(n&&e){var r=Kt(n).hoistableScripts,i=Rm(e),a=r.get(i);a||(a=n.querySelector(zm(i)),a||(e=C({src:e,async:!0,type:`module`},t),(t=vm.get(i))&&Um(e,t),a=n.createElement(`script`),qt(a),np(a,`link`,e),n.head.appendChild(a)),a={type:`script`,instance:a,count:1,state:null},r.set(i,a))}}function Nm(e,t,n,r){var i=(i=Ne.current)?bm(i):null;if(!i)throw Error(s(446));switch(e){case`meta`:case`title`:return null;case`style`:return typeof n.precedence==`string`&&typeof n.href==`string`?(n=Pm(n.href),t=Kt(i).hoistableStyles,r=t.get(n),r||(r={type:`style`,instance:null,count:0,state:null},t.set(n,r)),r):{type:`void`,instance:null,count:0,state:null};case`link`:if(n.rel===`stylesheet`&&typeof n.href==`string`&&typeof n.precedence==`string`){e=Pm(n.href);var a=Kt(i).hoistableStyles,o=a.get(e);if(o||(i=i.ownerDocument||i,o={type:`stylesheet`,instance:null,count:0,state:{loading:0,preload:null}},a.set(e,o),(a=i.querySelector(Fm(e)))?a._p||(o.instance=a,o.state.loading=5):(a=vm.get(e),a||(a={rel:`preload`,as:`style`,href:n.href,crossOrigin:n.crossOrigin,integrity:n.integrity,media:n.media,hrefLang:n.hrefLang,referrerPolicy:n.referrerPolicy},vm.set(e,a)),Lm(i,e,a,o.state))),t&&r===null)throw Error(s(528,``));return o}if(t&&r!==null)throw Error(s(529,``));return null;case`script`:return t=n.async,n=n.src,typeof n==`string`&&t&&typeof t!=`function`&&typeof t!=`symbol`?(n=Rm(n),t=Kt(i).hoistableScripts,r=t.get(n),r||(r={type:`script`,instance:null,count:0,state:null},t.set(n,r)),r):{type:`void`,instance:null,count:0,state:null};default:throw Error(s(444,e))}}function Pm(e){return`href="`+mn(e)+`"`}function Fm(e){return`link[rel="stylesheet"][`+e+`]`}function Im(e){return C({},e,{"data-precedence":e.precedence,precedence:null})}function Lm(e,t,n,r){if(t=e.querySelector(`link[rel="preload"][as="style"][`+t+`]`)){if(!0!==t[Vt]){r.loading=1;return}}else t=e.createElement(`link`),t[Vt]=!0,t.onload=t.onerror=Jt.bind(null,t),np(t,`link`,n),qt(t),e.head.appendChild(t);r.preload=t,t.addEventListener(`load`,function(){return r.loading|=1}),t.addEventListener(`error`,function(){return r.loading|=2})}function Rm(e){return`[src="`+mn(e)+`"]`}function zm(e){return`script[async]`+e}function Bm(e,t,n){if(t.count++,t.instance===null)switch(t.type){case`style`:var r=e.querySelector(`style[data-href~="`+mn(n.href)+`"]`);if(r)return t.instance=r,qt(r),r;var i=C({},n,{"data-href":n.href,"data-precedence":n.precedence,href:null,precedence:null});return r=(e.ownerDocument||e).createElement(`style`),qt(r),np(r,`style`,i),Vm(r,n.precedence,e),t.instance=r;case`stylesheet`:i=Pm(n.href);var a=e.querySelector(Fm(i));if(a)return t.state.loading|=4,t.instance=a,qt(a),a;r=Im(n),(i=vm.get(i))&&Hm(r,i),a=(e.ownerDocument||e).createElement(`link`),qt(a);var o=a;return o._p=new Promise(function(e,t){o.onload=e,o.onerror=t}),np(a,`link`,r),t.state.loading|=4,Vm(a,n.precedence,e),t.instance=a;case`script`:return a=Rm(n.src),(i=e.querySelector(zm(a)))?(t.instance=i,qt(i),i):(r=n,(i=vm.get(a))&&(r=C({},n),Um(r,i)),e=e.ownerDocument||e,i=e.createElement(`script`),qt(i),np(i,`link`,r),e.head.appendChild(i),t.instance=i);case`void`:return null;default:throw Error(s(443,t.type))}else t.type===`stylesheet`&&!(t.state.loading&4)&&(r=t.instance,t.state.loading|=4,Vm(r,n.precedence,e));return t.instance}function Vm(e,t,n){for(var r=n.querySelectorAll(`link[rel="stylesheet"][data-precedence],style[data-precedence]`),i=r.length?r[r.length-1]:null,a=i,o=0;o title`):null)}function qm(e,t,n){if(n===1||t.itemProp!=null)return!1;switch(e){case`meta`:case`title`:return!0;case`style`:if(typeof t.precedence!=`string`||typeof t.href!=`string`||t.href===``)break;return!0;case`link`:if(typeof t.rel!=`string`||typeof t.href!=`string`||t.href===``||t.onLoad||t.onError)break;switch(t.rel){case`stylesheet`:return e=t.disabled,typeof t.precedence==`string`&&e==null;default:return!0}case`script`:if(t.async&&typeof t.async!=`function`&&typeof t.async!=`symbol`&&!t.onLoad&&!t.onError&&t.src&&typeof t.src==`string`)return!0}return!1}function Jm(e,t){return e===`img`&&t.src!=null&&t.src!==``&&t.onLoad==null&&t.loading!==`lazy`}function Ym(e){return!(e.type===`stylesheet`&&!(e.state.loading&3))}function Xm(e){return(e.width||100)*(e.height||100)*(typeof devicePixelRatio==`number`?devicePixelRatio:1)*.25}function Zm(e,t){typeof t.decode==`function`&&(e.imgCount++,t.complete||(e.imgBytes+=Xm(t),e.suspenseyImages.push(t)),e=rh.bind(e),t.decode().then(e,e))}function Qm(e,t,n,r){if(n.type===`stylesheet`&&(typeof r.media!=`string`||!1!==matchMedia(r.media).matches)&&!(n.state.loading&4)){if(n.instance===null){var i=Pm(r.href),a=t.querySelector(Fm(i));if(a){t=a._p,typeof t==`object`&&t&&typeof t.then==`function`&&(e.count++,e=nh.bind(e),t.then(e,e)),n.state.loading|=4,n.instance=a,qt(a);return}a=t.ownerDocument||t,r=Im(r),(i=vm.get(i))&&Hm(r,i),a=a.createElement(`link`),qt(a);var o=a;o._p=new Promise(function(e,t){o.onload=e,o.onerror=t}),np(a,`link`,r),n.instance=a}e.stylesheets===null&&(e.stylesheets=new Map),e.stylesheets.set(n,t),(t=n.state.preload)&&!(n.state.loading&3)&&(e.count++,n=nh.bind(e),t.addEventListener(`load`,n),t.addEventListener(`error`,n))}}var $m=0;function eh(e,t){return e.stylesheets&&e.count===0&&ah(e,e.stylesheets),0$m?50:800)+t);return e.unsuspend=n,function(){e.unsuspend=null,clearTimeout(r),clearTimeout(i)}}:null}function th(e){if(e.count===0&&(e.imgCount===0||!e.waitingForImages)){if(e.stylesheets)ah(e,e.stylesheets);else if(e.unsuspend){var t=e.unsuspend;e.unsuspend=null,t()}}}function nh(){this.count--,th(this)}function rh(){this.imgCount--,th(this)}var ih=null;function ah(e,t){e.stylesheets=null,e.unsuspend!==null&&(e.count++,ih=new Map,t.forEach(oh,e),ih=null,nh.call(e))}function oh(e,t){if(!(t.state.loading&4)){var n=ih.get(e);if(n)var r=n.get(null);else{n=new Map,ih.set(e,n);for(var i=e.querySelectorAll(`link[data-precedence],style[data-precedence]`),a=0;a{function n(){if(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__<`u`&&typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE==`function`)try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(n)}catch(e){console.error(e)}}n(),t.exports=s()}))();function l(e,t,n,r){if(n===`a`&&!r)throw TypeError(`Private accessor was defined without a getter`);if(typeof t==`function`?e!==t||!r:!t.has(e))throw TypeError(`Cannot read private member from an object whose class did not declare it`);return n===`m`?r:n===`a`?r.call(e):r?r.value:t.get(e)}function u(e,t,n,r,i){if(r===`m`)throw TypeError(`Private method is not writable`);if(r===`a`&&!i)throw TypeError(`Private accessor was defined without a setter`);if(typeof t==`function`?e!==t||!i:!t.has(e))throw TypeError(`Cannot write private member to an object whose class did not declare it`);return r===`a`?i.call(e,n):i?i.value=n:t.set(e,n),n}var d,f=`__TAURI_TO_IPC_KEY__`;function p(e,t=!1){return window.__TAURI_INTERNALS__.transformCallback(e,t)}async function m(e,t={},n){return window.__TAURI_INTERNALS__.invoke(e,t,n)}var h=class{get rid(){return l(this,d,`f`)}constructor(e){d.set(this,void 0),u(this,d,e,`f`)}async close(){return m(`plugin:resources|close`,{rid:this.rid})}async[(d=new WeakMap,Symbol.asyncDispose)](){await this.close()}},g=class{constructor(...e){this.type=`Logical`,e.length===1?`Logical`in e[0]?(this.width=e[0].Logical.width,this.height=e[0].Logical.height):(this.width=e[0].width,this.height=e[0].height):(this.width=e[0],this.height=e[1])}toPhysical(e){return new _(this.width*e,this.height*e)}[f](){return{width:this.width,height:this.height}}toJSON(){return this[f]()}},_=class{constructor(...e){this.type=`Physical`,e.length===1?`Physical`in e[0]?(this.width=e[0].Physical.width,this.height=e[0].Physical.height):(this.width=e[0].width,this.height=e[0].height):(this.width=e[0],this.height=e[1])}toLogical(e){return new g(this.width/e,this.height/e)}[f](){return{width:this.width,height:this.height}}toJSON(){return this[f]()}},v=class{constructor(e){this.size=e}toLogical(e){return this.size instanceof g?this.size:this.size.toLogical(e)}toPhysical(e){return this.size instanceof _?this.size:this.size.toPhysical(e)}[f](){return{[`${this.size.type}`]:{width:this.size.width,height:this.size.height}}}toJSON(){return this[f]()}},y=class{constructor(...e){this.type=`Logical`,e.length===1?`Logical`in e[0]?(this.x=e[0].Logical.x,this.y=e[0].Logical.y):(this.x=e[0].x,this.y=e[0].y):(this.x=e[0],this.y=e[1])}toPhysical(e){return new b(this.x*e,this.y*e)}[f](){return{x:this.x,y:this.y}}toJSON(){return this[f]()}},b=class{constructor(...e){this.type=`Physical`,e.length===1?`Physical`in e[0]?(this.x=e[0].Physical.x,this.y=e[0].Physical.y):(this.x=e[0].x,this.y=e[0].y):(this.x=e[0],this.y=e[1])}toLogical(e){return new y(this.x/e,this.y/e)}[f](){return{x:this.x,y:this.y}}toJSON(){return this[f]()}},ee=class{constructor(e){this.position=e}toLogical(e){return this.position instanceof y?this.position:this.position.toLogical(e)}toPhysical(e){return this.position instanceof b?this.position:this.position.toPhysical(e)}[f](){return{[`${this.position.type}`]:{x:this.position.x,y:this.position.y}}}toJSON(){return this[f]()}},x;(function(e){e.WINDOW_RESIZED=`tauri://resize`,e.WINDOW_MOVED=`tauri://move`,e.WINDOW_CLOSE_REQUESTED=`tauri://close-requested`,e.WINDOW_DESTROYED=`tauri://destroyed`,e.WINDOW_FOCUS=`tauri://focus`,e.WINDOW_BLUR=`tauri://blur`,e.WINDOW_SCALE_FACTOR_CHANGED=`tauri://scale-change`,e.WINDOW_THEME_CHANGED=`tauri://theme-changed`,e.WINDOW_CREATED=`tauri://window-created`,e.WINDOW_SUSPENDED=`tauri://suspended`,e.WINDOW_RESUMED=`tauri://resumed`,e.WEBVIEW_CREATED=`tauri://webview-created`,e.DRAG_ENTER=`tauri://drag-enter`,e.DRAG_OVER=`tauri://drag-over`,e.DRAG_DROP=`tauri://drag-drop`,e.DRAG_LEAVE=`tauri://drag-leave`})(x||={});async function te(e,t){window.__TAURI_EVENT_PLUGIN_INTERNALS__.unregisterListener(e,t),await m(`plugin:event|unlisten`,{event:e,eventId:t})}async function ne(e,t,n){return m(`plugin:event|listen`,{event:e,target:typeof n?.target==`string`?{kind:`AnyLabel`,label:n.target}:n?.target??{kind:`Any`},handler:p(t)}).then(t=>async()=>te(e,t))}async function S(e,t,n){return ne(e,n=>{te(e,n.id),t(n)},n)}async function re(e,t){await m(`plugin:event|emit`,{event:e,payload:t})}async function C(e,t,n){await m(`plugin:event|emit_to`,{target:typeof e==`string`?{kind:`AnyLabel`,label:e}:e,event:t,payload:n})}var ie=class e extends h{constructor(e){super(e)}static async new(t,n,r){return m(`plugin:image|new`,{rgba:t,width:n,height:r}).then(t=>new e(t))}static async fromBytes(t){return m(`plugin:image|from_bytes`,{bytes:t}).then(t=>new e(t))}static async fromPath(t){return m(`plugin:image|from_path`,{path:t}).then(t=>new e(t))}async rgba(){return m(`plugin:image|rgba`,{rid:this.rid}).then(e=>new Uint8Array(e))}async size(){return m(`plugin:image|size`,{rid:this.rid})}};function ae(e){return e==null?null:typeof e==`string`?e:e instanceof ie?e.rid:e}var oe;(function(e){e[e.Critical=1]=`Critical`,e[e.Informational=2]=`Informational`})(oe||={});var se=class{constructor(e){this._preventDefault=!1,this.event=e.event,this.id=e.id}preventDefault(){this._preventDefault=!0}isPreventDefault(){return this._preventDefault}},ce;(function(e){e.None=`none`,e.Normal=`normal`,e.Indeterminate=`indeterminate`,e.Paused=`paused`,e.Error=`error`})(ce||={});function le(){return new fe(window.__TAURI_INTERNALS__.metadata.currentWindow.label,{skip:!0})}async function ue(){return m(`plugin:window|get_all_windows`).then(e=>e.map(e=>new fe(e,{skip:!0})))}var de=[`tauri://created`,`tauri://error`],fe=class{constructor(e,t={}){this.label=e,this.listeners=Object.create(null),t?.skip||m(`plugin:window|create`,{options:{...t,parent:typeof t.parent==`string`?t.parent:t.parent?.label,label:e}}).then(async()=>this.emit(`tauri://created`)).catch(async e=>this.emit(`tauri://error`,e))}static async getByLabel(e){return(await ue()).find(t=>t.label===e)??null}static getCurrent(){return le()}static async getAll(){return ue()}static async getFocusedWindow(){for(let e of await ue())if(await e.isFocused())return e;return null}async listen(e,t){return this._handleTauriEvent(e,t)?()=>{let n=this.listeners[e];n.splice(n.indexOf(t),1)}:ne(e,t,{target:{kind:`Window`,label:this.label}})}async once(e,t){return this._handleTauriEvent(e,t)?()=>{let n=this.listeners[e];n.splice(n.indexOf(t),1)}:S(e,t,{target:{kind:`Window`,label:this.label}})}async emit(e,t){if(de.includes(e))for(let n of this.listeners[e]||[])n({event:e,id:-1,payload:t});else return re(e,t)}async emitTo(e,t,n){if(de.includes(t))for(let e of this.listeners[t]||[])e({event:t,id:-1,payload:n});else return C(e,t,n)}_handleTauriEvent(e,t){return de.includes(e)?(e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t],!0):!1}async scaleFactor(){return m(`plugin:window|scale_factor`,{label:this.label})}async innerPosition(){return m(`plugin:window|inner_position`,{label:this.label}).then(e=>new b(e))}async outerPosition(){return m(`plugin:window|outer_position`,{label:this.label}).then(e=>new b(e))}async innerSize(){return m(`plugin:window|inner_size`,{label:this.label}).then(e=>new _(e))}async outerSize(){return m(`plugin:window|outer_size`,{label:this.label}).then(e=>new _(e))}async isFullscreen(){return m(`plugin:window|is_fullscreen`,{label:this.label})}async isMinimized(){return m(`plugin:window|is_minimized`,{label:this.label})}async isMaximized(){return m(`plugin:window|is_maximized`,{label:this.label})}async isFocused(){return m(`plugin:window|is_focused`,{label:this.label})}async isDecorated(){return m(`plugin:window|is_decorated`,{label:this.label})}async isResizable(){return m(`plugin:window|is_resizable`,{label:this.label})}async isMaximizable(){return m(`plugin:window|is_maximizable`,{label:this.label})}async isMinimizable(){return m(`plugin:window|is_minimizable`,{label:this.label})}async isClosable(){return m(`plugin:window|is_closable`,{label:this.label})}async isVisible(){return m(`plugin:window|is_visible`,{label:this.label})}async title(){return m(`plugin:window|title`,{label:this.label})}async theme(){return m(`plugin:window|theme`,{label:this.label})}async isAlwaysOnTop(){return m(`plugin:window|is_always_on_top`,{label:this.label})}async activityName(){return m(`plugin:window|activity_name`,{label:this.label})}async sceneIdentifier(){return m(`plugin:window|scene_identifier`,{label:this.label})}async center(){return m(`plugin:window|center`,{label:this.label})}async requestUserAttention(e){let t=null;return e&&(t=e===oe.Critical?{type:`Critical`}:{type:`Informational`}),m(`plugin:window|request_user_attention`,{label:this.label,value:t})}async setResizable(e){return m(`plugin:window|set_resizable`,{label:this.label,value:e})}async setEnabled(e){return m(`plugin:window|set_enabled`,{label:this.label,value:e})}async isEnabled(){return m(`plugin:window|is_enabled`,{label:this.label})}async setMaximizable(e){return m(`plugin:window|set_maximizable`,{label:this.label,value:e})}async setMinimizable(e){return m(`plugin:window|set_minimizable`,{label:this.label,value:e})}async setClosable(e){return m(`plugin:window|set_closable`,{label:this.label,value:e})}async setTitle(e){return m(`plugin:window|set_title`,{label:this.label,value:e})}async maximize(){return m(`plugin:window|maximize`,{label:this.label})}async unmaximize(){return m(`plugin:window|unmaximize`,{label:this.label})}async toggleMaximize(){return m(`plugin:window|toggle_maximize`,{label:this.label})}async minimize(){return m(`plugin:window|minimize`,{label:this.label})}async unminimize(){return m(`plugin:window|unminimize`,{label:this.label})}async show(){return m(`plugin:window|show`,{label:this.label})}async hide(){return m(`plugin:window|hide`,{label:this.label})}async close(){return m(`plugin:window|close`,{label:this.label})}async destroy(){return m(`plugin:window|destroy`,{label:this.label})}async setDecorations(e){return m(`plugin:window|set_decorations`,{label:this.label,value:e})}async setShadow(e){return m(`plugin:window|set_shadow`,{label:this.label,value:e})}async setEffects(e){return m(`plugin:window|set_effects`,{label:this.label,value:e})}async clearEffects(){return m(`plugin:window|set_effects`,{label:this.label,value:null})}async setAlwaysOnTop(e){return m(`plugin:window|set_always_on_top`,{label:this.label,value:e})}async setAlwaysOnBottom(e){return m(`plugin:window|set_always_on_bottom`,{label:this.label,value:e})}async setContentProtected(e){return m(`plugin:window|set_content_protected`,{label:this.label,value:e})}async setSize(e){return m(`plugin:window|set_size`,{label:this.label,value:e instanceof v?e:new v(e)})}async setMinSize(e){return m(`plugin:window|set_min_size`,{label:this.label,value:e instanceof v?e:e?new v(e):null})}async setMaxSize(e){return m(`plugin:window|set_max_size`,{label:this.label,value:e instanceof v?e:e?new v(e):null})}async setSizeConstraints(e){function t(e){return e?{Logical:e}:null}return m(`plugin:window|set_size_constraints`,{label:this.label,value:{minWidth:t(e?.minWidth),minHeight:t(e?.minHeight),maxWidth:t(e?.maxWidth),maxHeight:t(e?.maxHeight)}})}async setPosition(e){return m(`plugin:window|set_position`,{label:this.label,value:e instanceof ee?e:new ee(e)})}async setFullscreen(e){return m(`plugin:window|set_fullscreen`,{label:this.label,value:e})}async setFullscreenOnMonitor(e){return m(`plugin:window|set_fullscreen_on_monitor`,{label:this.label,value:e})}async setSimpleFullscreen(e){return m(`plugin:window|set_simple_fullscreen`,{label:this.label,value:e})}async setFocus(){return m(`plugin:window|set_focus`,{label:this.label})}async setFocusable(e){return m(`plugin:window|set_focusable`,{label:this.label,value:e})}async setIcon(e){return m(`plugin:window|set_icon`,{label:this.label,value:ae(e)})}async setSkipTaskbar(e){return m(`plugin:window|set_skip_taskbar`,{label:this.label,value:e})}async setCursorGrab(e){return m(`plugin:window|set_cursor_grab`,{label:this.label,value:e})}async setCursorVisible(e){return m(`plugin:window|set_cursor_visible`,{label:this.label,value:e})}async setCursorIcon(e){return m(`plugin:window|set_cursor_icon`,{label:this.label,value:e})}async setBackgroundColor(e){return m(`plugin:window|set_background_color`,{label:this.label,value:e})}async setCursorPosition(e){return m(`plugin:window|set_cursor_position`,{label:this.label,value:e instanceof ee?e:new ee(e)})}async setIgnoreCursorEvents(e){return m(`plugin:window|set_ignore_cursor_events`,{label:this.label,value:e})}async startDragging(){return m(`plugin:window|start_dragging`,{label:this.label})}async startResizeDragging(e){return m(`plugin:window|start_resize_dragging`,{label:this.label,value:e})}async setBadgeCount(e){return m(`plugin:window|set_badge_count`,{label:this.label,value:e})}async setBadgeLabel(e){return m(`plugin:window|set_badge_label`,{label:this.label,value:e})}async setOverlayIcon(e){return m(`plugin:window|set_overlay_icon`,{label:this.label,value:e?ae(e):void 0})}async setProgressBar(e){return m(`plugin:window|set_progress_bar`,{label:this.label,value:e})}async setVisibleOnAllWorkspaces(e){return m(`plugin:window|set_visible_on_all_workspaces`,{label:this.label,value:e})}async setTitleBarStyle(e){return m(`plugin:window|set_title_bar_style`,{label:this.label,value:e})}async setTheme(e){return m(`plugin:window|set_theme`,{label:this.label,value:e})}async onResized(e){return this.listen(x.WINDOW_RESIZED,t=>{t.payload=new _(t.payload),e(t)})}async onMoved(e){return this.listen(x.WINDOW_MOVED,t=>{t.payload=new b(t.payload),e(t)})}async onCloseRequested(e){return this.listen(x.WINDOW_CLOSE_REQUESTED,async t=>{let n=new se(t);await e(n),n.isPreventDefault()||await this.destroy()})}async onDragDropEvent(e){let t=await this.listen(x.DRAG_ENTER,t=>{e({...t,payload:{type:`enter`,paths:t.payload.paths,position:new b(t.payload.position)}})}),n=await this.listen(x.DRAG_OVER,t=>{e({...t,payload:{type:`over`,position:new b(t.payload.position)}})}),r=await this.listen(x.DRAG_DROP,t=>{e({...t,payload:{type:`drop`,paths:t.payload.paths,position:new b(t.payload.position)}})}),i=await this.listen(x.DRAG_LEAVE,t=>{e({...t,payload:{type:`leave`}})});return async()=>{await Promise.all([t(),r(),n(),i()])}}async onFocusChanged(e){let t=await this.listen(x.WINDOW_FOCUS,t=>{e({...t,payload:!0})}),n=await this.listen(x.WINDOW_BLUR,t=>{e({...t,payload:!1})});return async()=>{await Promise.all([t(),n()])}}async onScaleChanged(e){return this.listen(x.WINDOW_SCALE_FACTOR_CHANGED,e)}async onThemeChanged(e){return this.listen(x.WINDOW_THEME_CHANGED,e)}},pe;(function(e){e.Disabled=`disabled`,e.Throttle=`throttle`,e.Suspend=`suspend`})(pe||={});var me;(function(e){e.Default=`default`,e.FluentOverlay=`fluentOverlay`})(me||={});var he;(function(e){e.AppearanceBased=`appearanceBased`,e.Light=`light`,e.Dark=`dark`,e.MediumLight=`mediumLight`,e.UltraDark=`ultraDark`,e.Titlebar=`titlebar`,e.Selection=`selection`,e.Menu=`menu`,e.Popover=`popover`,e.Sidebar=`sidebar`,e.HeaderView=`headerView`,e.Sheet=`sheet`,e.WindowBackground=`windowBackground`,e.HudWindow=`hudWindow`,e.FullScreenUI=`fullScreenUI`,e.Tooltip=`tooltip`,e.ContentBackground=`contentBackground`,e.UnderWindowBackground=`underWindowBackground`,e.UnderPageBackground=`underPageBackground`,e.LiquidGlassRegular=`liquidGlassRegular`,e.LiquidGlassClear=`liquidGlassClear`,e.Mica=`mica`,e.Blur=`blur`,e.Acrylic=`acrylic`,e.Tabbed=`tabbed`,e.TabbedDark=`tabbedDark`,e.TabbedLight=`tabbedLight`})(he||={});var ge;(function(e){e.FollowsWindowActiveState=`followsWindowActiveState`,e.Active=`active`,e.Inactive=`inactive`})(ge||={});var _e=`/assets/icon-small-BO4dlTNl.svg`,ve=i(),ye=e((e=>{var t=Symbol.for(`react.transitional.element`),n=Symbol.for(`react.fragment`);function r(e,n,r){var i=null;if(r!==void 0&&(i=``+r),n.key!==void 0&&(i=``+n.key),`key`in n)for(var a in r={},n)a!==`key`&&(r[a]=n[a]);else r=n;return n=r.ref,{$$typeof:t,type:e,key:i,ref:n===void 0?null:n,props:r}}e.Fragment=n,e.jsx=r,e.jsxs=r})),w=e(((e,t)=>{t.exports=ye()}))(),be=le();function xe(){let[e,t]=(0,ve.useState)(!1),[n,r]=(0,ve.useState)(null);return(0,ve.useEffect)(()=>{let e=[],n=!1;return(async()=>{let i=await be.listen(`app://update-progress`,e=>{r(e.payload)}),a=await be.listen(`app://update-error`,()=>{t(!0)});n?(i(),a()):(e.push(i,a),await be.emit(`app://update`))})(),()=>{n=!0,e.forEach(e=>e())}},[]),(0,w.jsxs)(`div`,{className:`update-window`,"data-tauri-drag-region":!0,children:[(0,w.jsx)(`img`,{src:_e,alt:``,className:`update-logo`,"data-tauri-drag-region":!0}),(0,w.jsx)(`div`,{className:`update-content`,"data-tauri-drag-region":!0,children:e?(0,w.jsx)(Ce,{onRetry:()=>{t(!1),r(null),be.emit(`app://update`)}}):(0,w.jsx)(Se,{progress:n})})]})}function Se({progress:e}){return(0,w.jsxs)(`div`,{className:`update-status`,"data-tauri-drag-region":!0,children:[(0,w.jsx)(`h1`,{className:`update-title`,"data-tauri-drag-region":!0,children:`Getting GP Connect ready`}),(0,w.jsx)(we,{value:e})]})}function Ce({onRetry:e}){return(0,w.jsxs)(`div`,{className:`update-status error-status`,"data-tauri-drag-region":!0,children:[(0,w.jsxs)(`div`,{className:`error-copy`,role:`alert`,"data-tauri-drag-region":!0,children:[(0,w.jsx)(`h1`,{className:`update-title`,"data-tauri-drag-region":!0,children:`Couldn’t get GP Connect ready`}),(0,w.jsx)(`p`,{className:`update-description`,"data-tauri-drag-region":!0,children:`Please try again.`})]}),(0,w.jsx)(`button`,{type:`button`,onClick:e,className:`retry-button`,children:`Retry`})]})}function we({value:e}){let t=e!==null;return(0,w.jsxs)(w.Fragment,{children:[(0,w.jsxs)(`div`,{className:`progress-summary`,"data-tauri-drag-region":!0,children:[(0,w.jsx)(`p`,{className:`update-description`,"data-tauri-drag-region":!0,children:`This should only take a moment.`}),(0,w.jsx)(`span`,{className:`progress-label`,"aria-hidden":`true`,children:t?`${Math.round(e)}%`:`In progress`})]}),(0,w.jsx)(`div`,{className:`progress-bar${t?``:` progress-bar-indeterminate`}`,role:`progressbar`,"aria-label":`Update progress`,"aria-valuemin":t?0:void 0,"aria-valuemax":t?100:void 0,"aria-valuenow":t?Math.round(e):void 0,children:(0,w.jsx)(`div`,{className:`progress-fill`,style:t?{width:`${e}%`}:void 0})})]})}(0,c.createRoot)(document.getElementById(`root`)).render((0,w.jsx)(xe,{})); \ No newline at end of file diff --git a/apps/gpgui-helper/dist/index.html b/apps/gpgui-helper/dist/index.html index d6d6e3c..8cd7054 100644 --- a/apps/gpgui-helper/dist/index.html +++ b/apps/gpgui-helper/dist/index.html @@ -2,10 +2,10 @@ - + GPGUI Downloader - + diff --git a/apps/gpgui-helper/package.json b/apps/gpgui-helper/package.json index 2422b94..0c16dd2 100644 --- a/apps/gpgui-helper/package.json +++ b/apps/gpgui-helper/package.json @@ -18,14 +18,14 @@ "@types/node": "^26.6.5", "@types/react": "^19.3.0", "@types/react-dom": "^19.3.0", - "@typescript-eslint/eslint-plugin": "^8.71.1", - "@typescript-eslint/parser": "^8.71.1", + "@typescript-eslint/eslint-plugin": "^8.71.2", + "@typescript-eslint/parser": "^8.71.2", "@vitejs/plugin-react": "^6.1.2", "eslint": "^9.39.5", "eslint-config-prettier": "^10.1.8", "eslint-plugin-react": "^7.37.5", "eslint-plugin-react-hooks": "^7.1.1", - "prettier": "3.9.9", + "prettier": "3.9.10", "typescript": "^6.0.3", "vite": "^8.3.4" }, diff --git a/apps/gpgui-helper/pnpm-lock.yaml b/apps/gpgui-helper/pnpm-lock.yaml index 0d4ef0d..55b0681 100644 --- a/apps/gpgui-helper/pnpm-lock.yaml +++ b/apps/gpgui-helper/pnpm-lock.yaml @@ -31,11 +31,11 @@ importers: specifier: ^19.3.0 version: 19.3.0(@types/react@19.3.0) '@typescript-eslint/eslint-plugin': - specifier: ^8.71.1 - version: 8.71.1(@typescript-eslint/parser@8.71.1(eslint@9.39.5)(typescript@6.0.3))(eslint@9.39.5)(typescript@6.0.3) + specifier: ^8.71.2 + version: 8.71.2(@typescript-eslint/parser@8.71.2(eslint@9.39.5)(typescript@6.0.3))(eslint@9.39.5)(typescript@6.0.3) '@typescript-eslint/parser': - specifier: ^8.71.1 - version: 8.71.1(eslint@9.39.5)(typescript@6.0.3) + specifier: ^8.71.2 + version: 8.71.2(eslint@9.39.5)(typescript@6.0.3) '@vitejs/plugin-react': specifier: ^6.1.2 version: 6.1.2(vite@8.3.4(@types/node@26.6.5)(esbuild@0.27.2)) @@ -52,8 +52,8 @@ importers: specifier: ^7.1.1 version: 7.1.1(eslint@9.39.5) prettier: - specifier: 3.9.9 - version: 3.9.9 + specifier: 3.9.10 + version: 3.9.10 typescript: specifier: ^6.0.3 version: 6.0.3 @@ -547,63 +547,63 @@ packages: '@types/react@19.3.0': resolution: {integrity: sha512-N0rFCuH9YoxG9/m61l9MfpJKfmLOVU0em7ipIz6TRgSSkvReLB9vL85GB+yr8Bs5leqpvg96JSwF4ZS1s4viQg==} - '@typescript-eslint/eslint-plugin@8.71.1': - resolution: {integrity: sha512-nNlBf6HuotqMgZvSkWD5hNdemiBIxQ2NmrlgfcUIeZRs+BbakjscCQRq/Hb74EFVnFiSWWdL12JruqwBy3ERDw==} + '@typescript-eslint/eslint-plugin@8.71.2': + resolution: {integrity: sha512-K72/pvT7qpm8q3k8G5u93NCSN1RcLxX5h7Gw0bQpbMXviBHeY6Nx1WEwmk9wP+eKTSQ8ecxvcgt/ZX/rB938xQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - '@typescript-eslint/parser': ^8.71.1 + '@typescript-eslint/parser': ^8.71.2 eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/parser@8.71.1': - resolution: {integrity: sha512-oM/5sAqz/l1v/zYK1qTOPrn2+JIrBGC1V6uNYucRO5gh6eT9vWJ/RhPbGE59byvZEUQ4VP6XkLBaS5Jti5jpvw==} + '@typescript-eslint/parser@8.71.2': + resolution: {integrity: sha512-aTtmZjp/x3gsGHkDs04/1I8kNogBJkpQaeGaN0PfiG43NzDEmW2n+OP5im9wfsvyX0yP1UZWBrAGtDBfH9jEVw==} 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.71.1': - resolution: {integrity: sha512-Oijc9RUsohHjncg6iGi7gCtjnEjYt9FWv9u6ygK8uKcHK5eLjLAkqERQ9BaytbpceOFdk6kifPCS/zAZE+A99g==} + '@typescript-eslint/project-service@8.71.2': + resolution: {integrity: sha512-Pd68GsLVh5ZXlcEccFPdhSOvtHZ/2WU0XsA8zmXOS3F158lVlcTLhfQ6qvtL1RzbMie0Kp8xtbVwAg4nejKPHw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/scope-manager@8.71.1': - resolution: {integrity: sha512-1YUDZXdTnXLlob03SFHBipdyMBsDVm7zoSz0ytTJ39dk5J1TgsTK03VlR/dLXG/RLLUrPcYbD4rp23BmHxHP0w==} + '@typescript-eslint/scope-manager@8.71.2': + resolution: {integrity: sha512-YF4wgg5iUX5Obywoac27B56FhozMNFhdJSbh11H5GBAwmBtfyRhmgTQqW9tRNNmHDvsZ2CX6UGzoz+YfYn2Leg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/tsconfig-utils@8.71.1': - resolution: {integrity: sha512-oTvkml5SxXhgg+WWKhod5qWQICDXtOB+/Hi9VdPKFAANJ2b7YOgMffgvzXuqog7R6A/JtrzRf128dsxummyWhg==} + '@typescript-eslint/tsconfig-utils@8.71.2': + resolution: {integrity: sha512-jz49TAWokm/7yWD9/o837nYax9DyALxIPOImdImvVzo6canBCZYzin8zJyqNR5k1j9K1DE0bVvr0XYB+99uAdg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/type-utils@8.71.1': - resolution: {integrity: sha512-kH3t3jZCYv2PZSBEWPKTariLrCaoF1CLoPitYFBJOhAGEwWnSRAtGEifrfrpBa4K9JlwWNZotgA5w3/wLSk/FQ==} + '@typescript-eslint/type-utils@8.71.2': + resolution: {integrity: sha512-cC8UaalCViJkb3rH/xLIvidEwoFRtMZMUqDjjJMGEKaTFwYRHYBcoczlEGHuvkHEO8svRDrgZ0yQgOArFmwang==} 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.71.1': - resolution: {integrity: sha512-ybYnPTUwg3VQQOFEiBPLs8Jxl1ry2vXdn1kVKguomBbvxpetdu3MKTNDqFNUrlG8ylP9MpZosmXMFYlGQHk1oQ==} + '@typescript-eslint/types@8.71.2': + resolution: {integrity: sha512-y5Ukl3oVp7e/VGxqIoEXoeb/Roj71PAJ4WG/N/RGj+eeDvKRLM15kGr9MijLbN0i03S52zxu31Z98E5gWChJKw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.71.1': - resolution: {integrity: sha512-pSKSEK1JJpHs6KiKVtABCE4iJK5d7FLFzDXQNBQ2oRY7LEd3UwOt3TZemTgu9syTIf56dJWlTn/pdmrO9oKUXQ==} + '@typescript-eslint/typescript-estree@8.71.2': + resolution: {integrity: sha512-DgNOEsl4pdYzwSL+N/Cl33tX1Hlw3FvId73LnKXfq7jnrF2viOEn7X+P7RBkkSWCVm92gnWd28GIC5vJuLREeA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/utils@8.71.1': - resolution: {integrity: sha512-CBjT6gfAz3DW2j9Q4moFnqt208Aq+506sVGXfpRcyAeqn0EpayL0mjdWoCO2t3RC7GewNrFxdeehuEaPg6DMzQ==} + '@typescript-eslint/utils@8.71.2': + resolution: {integrity: sha512-RyKa1G1M9rKHDhrk+HJtiF1MvLD5Ux2JW3TSkzw+02pRALdpJb+QzG1Y5em+LvCgzGwgg8H7mBRFKljNz7ImPw==} 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.71.1': - resolution: {integrity: sha512-0GxiUGqMU0qXJt58cBsiG3DP8lUmBaFo2vChtUX+CT7PnR3v/VGLLrzVP4K9r1lNiZXjHYefMBbPunplr09v6w==} + '@typescript-eslint/visitor-keys@8.71.2': + resolution: {integrity: sha512-zozlN0UA32bSG2zkKAgQyRYSbEISVoyU6vvkKYo2aSny74D8Jh4e+POkJ6Lk0dlezZi5x7TtD+88Xb06IB8nhg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@vitejs/plugin-react@6.1.2': @@ -1386,8 +1386,8 @@ packages: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} - prettier@3.9.9: - resolution: {integrity: sha512-Z/CJHIkdujO/OtN7nXUii0Rf3VT5SRuhjBA82Xvu2XhBUgX3nhP67T0LHceBdQLex7OOFGTox+Q5Yg8Jk2Qivg==} + prettier@3.9.10: + resolution: {integrity: sha512-skGHTH1Yb9QvaTC4hWnRTzEYtCpApF0UMBPz+t/0ZPzP8ihefo/btKd+QA7pUE0fEwA1SbS/NmhyEcstdXOIdA==} engines: {node: '>=14'} hasBin: true @@ -2041,14 +2041,14 @@ snapshots: dependencies: csstype: 3.2.3 - '@typescript-eslint/eslint-plugin@8.71.1(@typescript-eslint/parser@8.71.1(eslint@9.39.5)(typescript@6.0.3))(eslint@9.39.5)(typescript@6.0.3)': + '@typescript-eslint/eslint-plugin@8.71.2(@typescript-eslint/parser@8.71.2(eslint@9.39.5)(typescript@6.0.3))(eslint@9.39.5)(typescript@6.0.3)': dependencies: '@eslint-community/regexpp': 4.12.2 - '@typescript-eslint/parser': 8.71.1(eslint@9.39.5)(typescript@6.0.3) - '@typescript-eslint/scope-manager': 8.71.1 - '@typescript-eslint/type-utils': 8.71.1(eslint@9.39.5)(typescript@6.0.3) - '@typescript-eslint/utils': 8.71.1(eslint@9.39.5)(typescript@6.0.3) - '@typescript-eslint/visitor-keys': 8.71.1 + '@typescript-eslint/parser': 8.71.2(eslint@9.39.5)(typescript@6.0.3) + '@typescript-eslint/scope-manager': 8.71.2 + '@typescript-eslint/type-utils': 8.71.2(eslint@9.39.5)(typescript@6.0.3) + '@typescript-eslint/utils': 8.71.2(eslint@9.39.5)(typescript@6.0.3) + '@typescript-eslint/visitor-keys': 8.71.2 eslint: 9.39.5 ignore: 7.0.12 natural-compare: 1.4.0 @@ -2057,41 +2057,41 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.71.1(eslint@9.39.5)(typescript@6.0.3)': + '@typescript-eslint/parser@8.71.2(eslint@9.39.5)(typescript@6.0.3)': dependencies: - '@typescript-eslint/scope-manager': 8.71.1 - '@typescript-eslint/types': 8.71.1 - '@typescript-eslint/typescript-estree': 8.71.1(typescript@6.0.3) - '@typescript-eslint/visitor-keys': 8.71.1 + '@typescript-eslint/scope-manager': 8.71.2 + '@typescript-eslint/types': 8.71.2 + '@typescript-eslint/typescript-estree': 8.71.2(typescript@6.0.3) + '@typescript-eslint/visitor-keys': 8.71.2 debug: 4.4.3 eslint: 9.39.5 typescript: 6.0.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/project-service@8.71.1(typescript@6.0.3)': + '@typescript-eslint/project-service@8.71.2(typescript@6.0.3)': dependencies: - '@typescript-eslint/tsconfig-utils': 8.71.1(typescript@6.0.3) - '@typescript-eslint/types': 8.71.1 + '@typescript-eslint/tsconfig-utils': 8.71.2(typescript@6.0.3) + '@typescript-eslint/types': 8.71.2 debug: 4.4.3 typescript: 6.0.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@8.71.1': + '@typescript-eslint/scope-manager@8.71.2': dependencies: - '@typescript-eslint/types': 8.71.1 - '@typescript-eslint/visitor-keys': 8.71.1 + '@typescript-eslint/types': 8.71.2 + '@typescript-eslint/visitor-keys': 8.71.2 - '@typescript-eslint/tsconfig-utils@8.71.1(typescript@6.0.3)': + '@typescript-eslint/tsconfig-utils@8.71.2(typescript@6.0.3)': dependencies: typescript: 6.0.3 - '@typescript-eslint/type-utils@8.71.1(eslint@9.39.5)(typescript@6.0.3)': + '@typescript-eslint/type-utils@8.71.2(eslint@9.39.5)(typescript@6.0.3)': dependencies: - '@typescript-eslint/types': 8.71.1 - '@typescript-eslint/typescript-estree': 8.71.1(typescript@6.0.3) - '@typescript-eslint/utils': 8.71.1(eslint@9.39.5)(typescript@6.0.3) + '@typescript-eslint/types': 8.71.2 + '@typescript-eslint/typescript-estree': 8.71.2(typescript@6.0.3) + '@typescript-eslint/utils': 8.71.2(eslint@9.39.5)(typescript@6.0.3) debug: 4.4.3 eslint: 9.39.5 ts-api-utils: 2.5.0(typescript@6.0.3) @@ -2099,14 +2099,14 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/types@8.71.1': {} + '@typescript-eslint/types@8.71.2': {} - '@typescript-eslint/typescript-estree@8.71.1(typescript@6.0.3)': + '@typescript-eslint/typescript-estree@8.71.2(typescript@6.0.3)': dependencies: - '@typescript-eslint/project-service': 8.71.1(typescript@6.0.3) - '@typescript-eslint/tsconfig-utils': 8.71.1(typescript@6.0.3) - '@typescript-eslint/types': 8.71.1 - '@typescript-eslint/visitor-keys': 8.71.1 + '@typescript-eslint/project-service': 8.71.2(typescript@6.0.3) + '@typescript-eslint/tsconfig-utils': 8.71.2(typescript@6.0.3) + '@typescript-eslint/types': 8.71.2 + '@typescript-eslint/visitor-keys': 8.71.2 debug: 4.4.3 minimatch: 10.2.6 semver: 7.8.5 @@ -2116,20 +2116,20 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.71.1(eslint@9.39.5)(typescript@6.0.3)': + '@typescript-eslint/utils@8.71.2(eslint@9.39.5)(typescript@6.0.3)': dependencies: '@eslint-community/eslint-utils': 4.10.1(eslint@9.39.5) - '@typescript-eslint/scope-manager': 8.71.1 - '@typescript-eslint/types': 8.71.1 - '@typescript-eslint/typescript-estree': 8.71.1(typescript@6.0.3) + '@typescript-eslint/scope-manager': 8.71.2 + '@typescript-eslint/types': 8.71.2 + '@typescript-eslint/typescript-estree': 8.71.2(typescript@6.0.3) eslint: 9.39.5 typescript: 6.0.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/visitor-keys@8.71.1': + '@typescript-eslint/visitor-keys@8.71.2': dependencies: - '@typescript-eslint/types': 8.71.1 + '@typescript-eslint/types': 8.71.2 eslint-visitor-keys: 5.0.1 '@vitejs/plugin-react@6.1.2(vite@8.3.4(@types/node@26.6.5)(esbuild@0.27.2))': @@ -3048,7 +3048,7 @@ snapshots: prelude-ls@1.2.1: {} - prettier@3.9.9: {} + prettier@3.9.10: {} prop-types@15.8.1: dependencies: diff --git a/apps/gpgui-helper/src-tauri/icons/128x128.png b/apps/gpgui-helper/src-tauri/icons/128x128.png index 59e4e65..f695805 100644 Binary files a/apps/gpgui-helper/src-tauri/icons/128x128.png and b/apps/gpgui-helper/src-tauri/icons/128x128.png differ diff --git a/apps/gpgui-helper/src-tauri/icons/128x128@2x.png b/apps/gpgui-helper/src-tauri/icons/128x128@2x.png index d10ef05..28fca23 100644 Binary files a/apps/gpgui-helper/src-tauri/icons/128x128@2x.png and b/apps/gpgui-helper/src-tauri/icons/128x128@2x.png differ diff --git a/apps/gpgui-helper/src-tauri/icons/32x32.png b/apps/gpgui-helper/src-tauri/icons/32x32.png index 3143943..8cebbbb 100644 Binary files a/apps/gpgui-helper/src-tauri/icons/32x32.png and b/apps/gpgui-helper/src-tauri/icons/32x32.png differ diff --git a/apps/gpgui-helper/src-tauri/icons/icon.icns b/apps/gpgui-helper/src-tauri/icons/icon.icns index 08a0806..a01cd91 100644 Binary files a/apps/gpgui-helper/src-tauri/icons/icon.icns and b/apps/gpgui-helper/src-tauri/icons/icon.icns differ diff --git a/apps/gpgui-helper/src-tauri/icons/icon.ico b/apps/gpgui-helper/src-tauri/icons/icon.ico index 5957434..58c4cc2 100644 Binary files a/apps/gpgui-helper/src-tauri/icons/icon.ico and b/apps/gpgui-helper/src-tauri/icons/icon.ico differ diff --git a/apps/gpgui-helper/src-tauri/icons/icon.png b/apps/gpgui-helper/src-tauri/icons/icon.png index ef7a367..79084fa 100644 Binary files a/apps/gpgui-helper/src-tauri/icons/icon.png and b/apps/gpgui-helper/src-tauri/icons/icon.png differ diff --git a/apps/gpgui-helper/src-tauri/icons/icon.svg b/apps/gpgui-helper/src-tauri/icons/icon.svg index 1cc17fa..bc99f0a 100644 --- a/apps/gpgui-helper/src-tauri/icons/icon.svg +++ b/apps/gpgui-helper/src-tauri/icons/icon.svg @@ -26,7 +26,7 @@ - + diff --git a/apps/gpgui-helper/src/assets/icon-small.svg b/apps/gpgui-helper/src/assets/icon-small.svg index 362d5ff..592bec9 100644 --- a/apps/gpgui-helper/src/assets/icon-small.svg +++ b/apps/gpgui-helper/src/assets/icon-small.svg @@ -20,7 +20,7 @@ - + diff --git a/changelog.md b/changelog.md index d2148d0..dd6beb0 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,16 @@ # Changelog +## 3.0.5 + +### Added + +- Added adaptive macOS app icons for light and dark appearances. + +### Fixed + +- Fixed macOS browser sign-in by automatically selecting the installed callback handler. +- Improved app icon proportions in Finder and across the app, installer, and website. + ## 3.0.4 ### Added diff --git a/crates/auth/Cargo.toml b/crates/auth/Cargo.toml index c270f54..372e8b7 100644 --- a/crates/auth/Cargo.toml +++ b/crates/auth/Cargo.toml @@ -25,7 +25,7 @@ uzers = { workspace = true, optional = true } tauri = { workspace = true, optional = true } regex = { workspace = true, optional = true } tokio-util = { workspace = true, optional = true } -html-escape = { version = "0.2.13", optional = true } +html-escape = { version = "0.3", optional = true } [target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))'.dependencies] webkit2gtk = { version = "2", optional = true } diff --git a/crates/auth/src/callback/macos.rs b/crates/auth/src/callback/macos.rs index 4516a03..c8f34db 100644 --- a/crates/auth/src/callback/macos.rs +++ b/crates/auth/src/callback/macos.rs @@ -1,8 +1,9 @@ -use std::{ffi::OsStr, os::raw::c_void, path::PathBuf, thread, time::Duration}; +use std::{ffi::OsStr, os::raw::c_void, path::PathBuf, sync::mpsc}; use anyhow::{Context, bail}; +use block2::RcBlock; use objc2_app_kit::NSWorkspace; -use objc2_foundation::{NSBundle, NSString, NSURL}; +use objc2_foundation::{NSBundle, NSDate, NSError, NSRunLoop, NSString, NSURL}; const CALLBACK_SCHEME: &str = "globalprotectcallback"; const CALLBACK_URL: &str = "globalprotectcallback:"; @@ -15,18 +16,19 @@ unsafe extern "C" { } pub(super) fn ensure_auth_callback_handler() -> anyhow::Result<()> { + set_auth_callback_handler().map_err(|error| { + log::warn!("Failed to set up browser sign-in: {error:#}"); + anyhow::anyhow!("Couldn’t set up browser sign-in. Please try again.") + }) +} + +fn set_auth_callback_handler() -> anyhow::Result<()> { let workspace = NSWorkspace::sharedWorkspace(); let app_paths = callback_app_paths(); - let selected_handler = current_handler(&workspace); - match selected_handler.as_ref() { - Some((handler, path)) - if handler == HANDLER_BUNDLE_ID && app_paths.iter().any(|candidate| same_path(candidate, path)) => - { - return Ok(()); - } - Some((handler, _)) if handler == HANDLER_BUNDLE_ID => {} - None => {} - Some((handler, _)) => bail!("The globalprotectcallback URL scheme is owned by {handler}"), + if current_handler(&workspace).is_some_and(|(handler, path)| { + handler == HANDLER_BUNDLE_ID && app_paths.iter().any(|candidate| same_path(candidate, &path)) + }) { + return Ok(()); } let app_path = app_paths @@ -34,21 +36,40 @@ pub(super) fn ensure_auth_callback_handler() -> anyhow::Result<()> { .context("GP Connect Login.app is required for external-browser authentication; install GP Connect")?; let app_url = file_url(app_path); register_app(&app_url)?; + let (sender, receiver) = mpsc::channel(); + let completion = RcBlock::new(move |error: *mut NSError| { + // The error is valid for the duration of Apple's completion callback. + let result = match unsafe { error.as_ref() } { + Some(error) => Err(anyhow::anyhow!("{}", error.localizedDescription())), + None => Ok(()), + }; + let _ = sender.send(result); + }); workspace.setDefaultApplicationAtURL_toOpenURLsWithScheme_completionHandler( &app_url, &NSString::from_str(CALLBACK_SCHEME), - None, + Some(&completion), ); - for _ in 0..50 { - if current_handler(&workspace) - .is_some_and(|(handler, path)| handler == HANDLER_BUNDLE_ID && same_path(app_path, &path)) - { - return Ok(()); + // macOS may ask for consent. Keep its run loop active until the operation + // completes rather than imposing a deadline on the user's response. + let run_loop = NSRunLoop::currentRunLoop(); + loop { + match receiver.try_recv() { + Ok(result) => { + result?; + break; + } + Err(mpsc::TryRecvError::Empty) => run_loop.runUntilDate(&NSDate::dateWithTimeIntervalSinceNow(0.1)), + Err(mpsc::TryRecvError::Disconnected) => bail!("The URL handler setup completion was lost"), } - thread::sleep(Duration::from_millis(100)); } + if current_handler(&workspace) + .is_some_and(|(handler, path)| handler == HANDLER_BUNDLE_ID && same_path(app_path, &path)) + { + return Ok(()); + } bail!("The globalprotectcallback URL handler registration did not take effect") } diff --git a/crates/gpapi/Cargo.toml b/crates/gpapi/Cargo.toml index de64aa9..3318901 100644 --- a/crates/gpapi/Cargo.toml +++ b/crates/gpapi/Cargo.toml @@ -20,13 +20,13 @@ xmltree.workspace = true serde.workspace = true specta = { workspace = true, features = ["derive", "uuid"] } urlencoding.workspace = true -tokio = { workspace = true, features = ["process", "signal", "macros"] } +tokio = { workspace = true, features = ["fs", "process", "signal", "macros"] } tokio-util.workspace = true serde_json.workspace = true whoami.workspace = true tempfile.workspace = true thiserror.workspace = true -chacha20poly1305 = { version = "0.10", features = ["std"] } +chacha20poly1305 = { version = "0.11", features = ["zeroize"] } redact-engine.workspace = true url.workspace = true regex.workspace = true @@ -34,7 +34,7 @@ uzers.workspace = true serde_urlencoded.workspace = true md5.workspace = true sha256.workspace = true -sha2 = "0.10" +sha2 = { version = "0.11", default-features = false } uuid = { workspace = true, features = ["v4", "v5", "serde"] } chrono.workspace = true humantime.workspace = true diff --git a/crates/gpapi/src/utils/crypto.rs b/crates/gpapi/src/utils/crypto.rs index e27d8ed..de7e117 100644 --- a/crates/gpapi/src/utils/crypto.rs +++ b/crates/gpapi/src/utils/crypto.rs @@ -1,11 +1,11 @@ use chacha20poly1305::{ - AeadCore, ChaCha20Poly1305, Key, KeyInit, - aead::{Aead, OsRng}, + ChaCha20Poly1305, Key, KeyInit, Nonce, + aead::{Aead, Generate}, }; use serde::{Serialize, de::DeserializeOwned}; pub fn generate_key() -> Key { - ChaCha20Poly1305::generate_key(&mut OsRng) + Key::generate() } pub fn encrypt(key: &Key, value: &T) -> anyhow::Result> @@ -13,7 +13,7 @@ where T: Serialize, { let cipher = ChaCha20Poly1305::new(key); - let nonce = ChaCha20Poly1305::generate_nonce(&mut OsRng); + let nonce = Nonce::generate(); let data = serde_json::to_vec(value)?; let cipher_text = cipher.encrypt(&nonce, data.as_ref())?; @@ -34,7 +34,7 @@ where let nonce = &encrypted[..12]; let cipher_text = &encrypted[12..]; - let plaintext = cipher.decrypt(nonce.into(), cipher_text)?; + let plaintext = cipher.decrypt(nonce.try_into()?, cipher_text)?; let value = serde_json::from_slice(&plaintext)?; @@ -52,14 +52,14 @@ impl Crypto { pub fn encrypt(&self, plain: T) -> anyhow::Result> { let key: &[u8] = &self.key; - let encrypted_data = encrypt(key.into(), &plain)?; + let encrypted_data = encrypt(key.try_into()?, &plain)?; Ok(encrypted_data) } pub fn decrypt(&self, encrypted: Vec) -> anyhow::Result { let key: &[u8] = &self.key; - decrypt(key.into(), encrypted) + decrypt(key.try_into()?, encrypted) } pub fn encrypt_to(&self, path: &std::path::Path, plain: T) -> anyhow::Result<()> { @@ -105,4 +105,25 @@ mod tests { Ok(()) } + + #[test] + fn decrypts_settings_written_with_chacha20poly1305_0_10() -> anyhow::Result<()> { + // Fixed key and ciphertext are test data produced with version 0.10.1. + let key = [7_u8; 32]; + let encrypted = + crate::utils::base64::decode_to_vec("AwMDAwMDAwMDAwMDkIQjBvvxesN7T/Suv8tEE53zfpGGup/QlB6Dbj1ah+NIXCDMOv/4eg==")?; + let user: User = decrypt((&key).into(), encrypted.clone())?; + assert_eq!(user.name, "test"); + assert_eq!(user.age, 18); + + // The nonce prefix and appended authentication tag retain their existing format. + let cipher = ChaCha20Poly1305::new((&key).into()); + let ciphertext = cipher.encrypt(encrypted[..12].try_into()?, serde_json::to_vec(&user)?.as_slice())?; + assert_eq!(ciphertext, encrypted[12..]); + + let mut tampered = encrypted; + *tampered.last_mut().unwrap() ^= 1; + assert!(decrypt::((&key).into(), tampered).is_err()); + Ok(()) + } } diff --git a/packaging/files/usr/share/icons/hicolor/128x128/apps/gpgui.png b/packaging/files/usr/share/icons/hicolor/128x128/apps/gpgui.png index 59e4e65..f695805 100644 Binary files a/packaging/files/usr/share/icons/hicolor/128x128/apps/gpgui.png and b/packaging/files/usr/share/icons/hicolor/128x128/apps/gpgui.png differ diff --git a/packaging/files/usr/share/icons/hicolor/256x256/apps/gpgui.png b/packaging/files/usr/share/icons/hicolor/256x256/apps/gpgui.png index d10ef05..28fca23 100644 Binary files a/packaging/files/usr/share/icons/hicolor/256x256/apps/gpgui.png and b/packaging/files/usr/share/icons/hicolor/256x256/apps/gpgui.png differ diff --git a/packaging/files/usr/share/icons/hicolor/256x256@2/apps/gpgui.png b/packaging/files/usr/share/icons/hicolor/256x256@2/apps/gpgui.png index ef7a367..79084fa 100644 Binary files a/packaging/files/usr/share/icons/hicolor/256x256@2/apps/gpgui.png and b/packaging/files/usr/share/icons/hicolor/256x256@2/apps/gpgui.png differ diff --git a/packaging/files/usr/share/icons/hicolor/32x32/apps/gpgui.png b/packaging/files/usr/share/icons/hicolor/32x32/apps/gpgui.png index 3143943..8cebbbb 100644 Binary files a/packaging/files/usr/share/icons/hicolor/32x32/apps/gpgui.png and b/packaging/files/usr/share/icons/hicolor/32x32/apps/gpgui.png differ diff --git a/packaging/files/usr/share/icons/hicolor/scalable/apps/gpgui.svg b/packaging/files/usr/share/icons/hicolor/scalable/apps/gpgui.svg index 1cc17fa..bc99f0a 100644 --- a/packaging/files/usr/share/icons/hicolor/scalable/apps/gpgui.svg +++ b/packaging/files/usr/share/icons/hicolor/scalable/apps/gpgui.svg @@ -26,7 +26,7 @@ - +