diff --git a/.gitignore b/.gitignore index 6d553be..b4f26ac 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,6 @@ gen # Nix files result + +# Packages & test assets +*.ipa diff --git a/Cargo.lock b/Cargo.lock index 292838e..c30de18 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -31,7 +31,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1973cfbc1a2daf9cf550e74e1f088c28e7f7d8c1e1418fb6c9dc5184b7e84c99" dependencies = [ "crypto-common 0.2.2", - "inout 0.2.2", + "inout 0.2.5", ] [[package]] @@ -222,6 +222,45 @@ dependencies = [ "winnow 1.0.4", ] +[[package]] +name = "asn1-rs" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7f43a50ac4fdca5df8e885c21b835997f0a1cdee65494a6847694a98652d9d8" +dependencies = [ + "asn1-rs-derive", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror 2.0.21", + "time", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3109e49b1e4909e9db6515a30c633684d68cdeaa252f215214cb4fa1a5bfee2c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", + "synstructure 0.13.2", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "atk" version = "0.18.2" @@ -253,7 +292,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "auth" -version = "3.2.0" +version = "3.3.0" dependencies = [ "anyhow", "block2", @@ -487,9 +526,9 @@ dependencies = [ [[package]] name = "brotli" -version = "9.0.0" +version = "9.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8b851b75c23ca7873623d612fe49bd1989aeb03d08fb9432187eb253d3d4c6b" +checksum = "627b7cfb0578f0eafce087a90fcd40add1231900b69e4d4de2d456260a4f5d81" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -498,9 +537,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "6.0.1" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941cd9bd4ddab83cb46fa5a2d428f1c857b24ac78cb876cf7beb710840934bd7" +checksum = "34c6783f42c21c952ad7112b354f0ba2f10760e9decea5b1b60523d6e270faaf" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -508,7 +547,7 @@ dependencies = [ [[package]] name = "browser-launcher" -version = "3.2.0" +version = "3.3.0" dependencies = [ "anyhow", "log", @@ -647,9 +686,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6651c9ed80effdc7db0ff72512157f901af5e3549e341e24b1dd4887d836d838" +checksum = "86e055fa6e3e40ad6187ba25b6855eeb635d5271f8e0f0e1e9a5826b8d75bea0" dependencies = [ "find-msvc-tools", "shlex", @@ -783,7 +822,7 @@ checksum = "e8cf2a2c93cd704877c0858356ed03480ff301ee950b43f1cbe4573b088bfa6c" dependencies = [ "block-buffer 0.12.1", "crypto-common 0.2.2", - "inout 0.2.2", + "inout 0.2.5", ] [[package]] @@ -842,6 +881,18 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a" +[[package]] +name = "cms" +version = "0.3.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "758d5272932ff167e96ec9641a04d96ab1901cccc5ea9f47c15b4cbaa6f9ea53" +dependencies = [ + "const-oid", + "der", + "spki", + "x509-cert", +] + [[package]] name = "colorchoice" version = "1.0.5" @@ -850,9 +901,9 @@ checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" [[package]] name = "combine" -version = "4.6.8" +version = "4.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc320937d09e6de266b31b9afb480f197d7a861be86be7cb2ea7e5d1bfffc5e" +checksum = "4356eba6976435498d05a311ee9fc486da3bc81c200d3f0d7dd9703b41913f92" dependencies = [ "bytes", "memchr", @@ -860,7 +911,7 @@ dependencies = [ [[package]] name = "common" -version = "3.2.0" +version = "3.3.0" dependencies = [ "tempfile", ] @@ -1010,9 +1061,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.5.2" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a7799fd6b852db0e61728dde9a204c423b44d689dbd432522543614b490e78" +checksum = "5f97d3416d5337d15c4b0d78c8c91df922ca143f57ec20e2d1c188333047ef04" dependencies = [ "cfg-if", ] @@ -1121,9 +1172,9 @@ dependencies = [ [[package]] name = "ctutils" -version = "0.4.3" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03bb0e1cc970d482d121d9a1744999169b69a07470b3d644a7894e53fcaf4574" +checksum = "a2376ffd6f96d8a9db59875b4b6b0237d6900b5baf64279714e05493ce64828a" dependencies = [ "cmov", ] @@ -1206,9 +1257,9 @@ dependencies = [ [[package]] name = "defmt" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2953bfe4f93bbd20cc71198842756f77d161884c99ebbabc41d80231ded88d1" +checksum = "e4a0795ac740cb54d7b3775c9c17345f6aaecf884c01733b39d6017738e0e3e1" dependencies = [ "bitflags 1.3.2", "defmt-macros", @@ -1216,30 +1267,30 @@ dependencies = [ [[package]] name = "defmt-macros" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad9c72e7ca2137e0dc3813245a0d282fd6daad32fd800af018306a9169b5fe8" +checksum = "840bb056bd99c495c9188198a258ab787c79f306d864db3e6e8451442d6d8366" dependencies = [ "defmt-parser", "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.9", ] [[package]] name = "defmt-parser" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e" +checksum = "71958f69fb2de856c5dd51ac9377e986ca1aa5919f931bf5395a807277f889a0" dependencies = [ "thiserror 2.0.21", ] [[package]] name = "der" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a878c850e9e421b20262e9b41f9c860e4785fa07541c266b62ff9d1ef998a80a" +checksum = "6a996a108feb8b427a6e12fcf6af4aa83409b79d72c15337d7741368131ee004" dependencies = [ "const-oid", "der_derive", @@ -1248,6 +1299,20 @@ dependencies = [ "zeroize", ] +[[package]] +name = "der-parser" +version = "10.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07da5016415d5a3c4dd39b11ed26f915f52fc4e0dc197d87908bc916e51bc1a6" +dependencies = [ + "asn1-rs", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + [[package]] name = "der_derive" version = "0.8.0" @@ -1261,9 +1326,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" +checksum = "9e9de72ce2ad1f90dc62fa25f0f430ef85eb4b0d8fa0be4f30373bc40a21d28e" dependencies = [ "serde_core", ] @@ -1497,9 +1562,9 @@ checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" [[package]] name = "encoding_rs" -version = "0.8.42" +version = "0.8.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e985e0451871ad22fb8d2b6b076e2028a502a0d3950998c2c5c0a4f9b5d9679" +checksum = "89253175e704ab869b04f9db224d38630e0211a53841a79181deae0889e169f5" dependencies = [ "cfg-if", "core_detect", @@ -1534,15 +1599,15 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" +checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826" [[package]] name = "erased-serde" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2add8a07dd6a8d93ff627029c51de145e12686fbc36ecb298ac22e74cf02dec" +checksum = "1e59b668157f32d3459d4bd634861a06ffa2503a461ca5f0916b9f0252605e66" dependencies = [ "serde", "serde_core", @@ -1613,9 +1678,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aedcfb3409746eddb02b9e19ebda1c3394f759a152e48ee875a0844d1b955484" +checksum = "1c66915cc5391097de7a2b0b972e8505aa33c0df401fd3a6811dbdb32881ba48" [[package]] name = "flagset" @@ -2050,35 +2115,41 @@ dependencies = [ [[package]] name = "gpapi" -version = "3.2.0" +version = "3.3.0" dependencies = [ "anyhow", "base64 0.23.1", + "cc", "chacha20poly1305 0.11.0", "chrono", "clap", "clap-verbosity-flag", "common", + "directories", "dns-lookup", "env_logger", "getrandom 0.4.3", "gtk", "humantime", + "libloading 0.9.0", "log", "log-reload", "md5", - "native-tls", "netdev", "nix", "openssl", "os_info", "oslog", + "p12-keystore", "pem", "pkcs8", + "pkg-config", "proptest", "regex", "reqwest", - "security-framework", + "rustls", + "rustls-pemfile", + "sec1", "serde", "serde_json", "serde_urlencoded", @@ -2095,7 +2166,6 @@ dependencies = [ "urlencoding", "uuid", "uzers", - "version-compare", "whoami", "x509-cert", "xmltree", @@ -2104,7 +2174,7 @@ dependencies = [ [[package]] name = "gpauth" -version = "3.2.0" +version = "3.3.0" dependencies = [ "anyhow", "auth", @@ -2123,7 +2193,7 @@ dependencies = [ [[package]] name = "gpclient" -version = "3.2.0" +version = "3.3.0" dependencies = [ "anyhow", "clap", @@ -2141,7 +2211,6 @@ dependencies = [ "nix", "openconnect", "ratatui", - "reqwest", "serde", "serde_json", "strip-ansi-escapes", @@ -2155,7 +2224,7 @@ dependencies = [ [[package]] name = "gpgui-helper" -version = "3.2.0" +version = "3.3.0" dependencies = [ "anyhow", "clap", @@ -2176,7 +2245,7 @@ dependencies = [ [[package]] name = "gphip" -version = "3.2.0" +version = "3.3.0" dependencies = [ "anyhow", "askama", @@ -2193,7 +2262,7 @@ dependencies = [ [[package]] name = "gpservice" -version = "3.2.0" +version = "3.3.0" dependencies = [ "anyhow", "axum", @@ -2219,7 +2288,7 @@ dependencies = [ "tempfile", "thiserror 2.0.21", "tokio", - "tokio-tungstenite 0.29.0", + "tokio-tungstenite 0.30.0", "tokio-util", "uuid", "xz2", @@ -2228,7 +2297,7 @@ dependencies = [ [[package]] name = "gptunnel" -version = "3.2.0" +version = "3.3.0" dependencies = [ "gpapi", "log", @@ -2240,7 +2309,7 @@ dependencies = [ [[package]] name = "gpvpnc" -version = "3.2.0" +version = "3.3.0" dependencies = [ "log", ] @@ -2482,22 +2551,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - [[package]] name = "hyper-util" version = "0.1.21" @@ -2550,19 +2603,19 @@ dependencies = [ [[package]] name = "ico" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e795dff5605e0f04bff85ca41b51a96b83e80b281e96231bcaaf1ac35103371" +checksum = "d75e94d66081e4d8dcd098bd8dc5254800fea14a26389b298410158d834de167" dependencies = [ "byteorder", - "png 0.17.16", + "png", ] [[package]] name = "icu_collections" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa68d21081c4a05d5a901a1c62add574c77048b6a1c67be3b50ce0b60d4ca513" +checksum = "fe090a42a0d3140fed8c63263ed1fecc02422cb2f4bfe55cd8de2de1b8e105dd" dependencies = [ "displaydoc", "potential_utf", @@ -2574,9 +2627,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56e28588da92eee5c3201a6eff33fabdd49b62269c8938d4ff050ce4d900deb" +checksum = "25d29b57c17c6528d0dc4c2141cfa2d08200465acb537a3909c8b9b8a4a984c0" dependencies = [ "displaydoc", "litemap", @@ -2587,9 +2640,9 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f9cf5f235641ed274641dd81c3f28d870e276763d0797aeeab72317b1c646f" +checksum = "404a3b8c486f205c87fe7f23ab6894d84a4ad76d6e4671ae1981ba7def87c599" dependencies = [ "icu_collections", "icu_normalizer_data", @@ -2601,15 +2654,15 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1563da1ed3e0b3bf3d74c9b85917ac9c56464d2f57242270c09c9e752f8021a0" +checksum = "20f0088bfb7441f7a37fa0c9e20cb1e9cba1cac6b9ce8cd2a6dc44294f8e8cbc" [[package]] name = "icu_properties" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e7ca276ad3145661a65914e6daf131ca5120cd3dcee8f8f3214b8875184a148" +checksum = "2ea83d991c56158f7cf898bf86436c1dfe7c07ee82fe88951f2695c9f37a379f" dependencies = [ "displaydoc", "icu_collections", @@ -2622,15 +2675,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e590f038c1464a96894fd6d10127e90a8be4509f56ff7ecef851b15cee0b7caa" +checksum = "b98f29af82d02b163fe50161388350e743bb3107cc8e8c2f7314cb505faddfcf" [[package]] name = "icu_provider" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d27bbb9d3abbefac45d55f647c9de1d44aafcd1186eb91879afef17c396c3e73" +checksum = "413099315636c588ee8f011190b329b971a09a8fae9d157e01dcae8379468514" dependencies = [ "displaydoc", "icu_locale_core", @@ -2720,9 +2773,9 @@ dependencies = [ [[package]] name = "inout" -version = "0.2.2" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4250ce6452e92010fdf7268ccc5d14faa80bb12fc741938534c58f16804e03c7" +checksum = "3b5cf4372d022092674a83b8febf5865f7a573cc0c5baec5e49c879b6a20978f" dependencies = [ "block-padding", "hybrid-array", @@ -2963,9 +3016,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.106" +version = "0.3.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7883d941dae510fb2d978fc3fe018c71c9e2892fd38854de3e8b92c2e5ad9cc5" +checksum = "8dc09d2154098bbf4ef54eab6b117a3c24cbbffe94046b16ee6d6d4510584d3a" dependencies = [ "cfg-if", "futures-util", @@ -3015,6 +3068,12 @@ dependencies = [ "serde", ] +[[package]] +name = "lazy_static" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20870f649af7073d53e38067b2a84312175d56ea15217e1b15bc83506ec50afb" + [[package]] name = "libappindicator" version = "0.9.0" @@ -3035,15 +3094,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" dependencies = [ "gtk-sys", - "libloading", + "libloading 0.7.4", "once_cell", ] [[package]] name = "libc" -version = "0.2.190" +version = "0.2.191" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce5d3ddc6d3fa000eb1536d85e147bfe31aacaba692ed6a876f95cb7c855be78" +checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a" [[package]] name = "libdbus-sys" @@ -3064,6 +3123,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "libloading" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "754ca22de805bb5744484a5b151a9e1a8e837d5dc232c2d7d8c2e3492edc8b60" +dependencies = [ + "cfg-if", + "windows-link", +] + [[package]] name = "libm" version = "0.2.16" @@ -3117,9 +3186,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.34" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" +checksum = "5d15f86d12da44cd8d4ec3c73984537eb7f4cadcb9776a575a0a8a05ca11005c" [[package]] name = "log-reload" @@ -3221,6 +3290,12 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "miniz_oxide" version = "0.8.9" @@ -3268,7 +3343,7 @@ dependencies = [ "objc2-core-foundation", "objc2-foundation", "once_cell", - "png 0.18.1", + "png", "serde", "thiserror 2.0.21", "windows-sys 0.61.2", @@ -3280,23 +3355,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "743fb55ba31b18fb1ecef6bdc9aa2743314978ac084044301a7eee33fb99a20d" -[[package]] -name = "native-tls" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "ndk" version = "0.9.0" @@ -3329,9 +3387,9 @@ dependencies = [ [[package]] name = "netdev" -version = "0.46.3" +version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52c2584961c68f5a6e3356797344061f818c93b8acc9cd6d7e284795e563e" +checksum = "98a4d13f8061600697d721c5fd45262aba533a7d4a7670e7c64fd02d68e4a9fb" dependencies = [ "block2", "dispatch2", @@ -3400,6 +3458,16 @@ dependencies = [ "memoffset", ] +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + [[package]] name = "ntapi" version = "0.4.3" @@ -3409,12 +3477,31 @@ dependencies = [ "winapi", ] +[[package]] +name = "num-bigint" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c89e69e7e0f03bea5ef08013795c25018e101932225a656383bd384495ecc367" +dependencies = [ + "num-integer", + "num-traits", +] + [[package]] name = "num-conv" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" +[[package]] +name = "num-integer" +version = "0.1.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ce2d95d4b3734dc35aa2f45e1aa22cd416814592a4f9d9205e11affd5b8e10b" +dependencies = [ + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -3448,9 +3535,9 @@ dependencies = [ [[package]] name = "num_threads" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +checksum = "cabcc654086861f9e1bc5115258de62ef92c79b20f4615a1b0cc57c4e82027d4" dependencies = [ "libc", ] @@ -3697,6 +3784,15 @@ dependencies = [ "objc2-security", ] +[[package]] +name = "oid-registry" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f40cff3dde1b6087cc5d5f5d4d65712f34016a03ed60e9c08dcc392736b5b7" +dependencies = [ + "asn1-rs", +] + [[package]] name = "once_cell" version = "1.21.4" @@ -3717,9 +3813,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "open" -version = "5.4.4" +version = "5.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa576c76302b7b808eecc68061e67336c47833ef9d22caa74dda10fa9675eebc" +checksum = "8d8c8b8e725ad26404d6896eb2f064294a0a7b4f1d9120210d85544684c4ca95" dependencies = [ "is-wsl", "libc", @@ -3727,7 +3823,7 @@ dependencies = [ [[package]] name = "openconnect" -version = "3.2.0" +version = "3.3.0" dependencies = [ "autotools", "cc", @@ -3741,9 +3837,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.81" +version = "0.10.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45" +checksum = "4de8111e94a56adca7ebfe6c365b6d42f99deb69b74b6becacd4204e2f193aa2" dependencies = [ "bitflags 2.13.2", "cfg-if", @@ -3766,15 +3862,15 @@ dependencies = [ [[package]] name = "openssl-probe" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" +checksum = "7e036b411754132fd6b74e94b74e9a13c5cf606fa93d1885c35860d3060820b1" [[package]] name = "openssl-sys" -version = "0.9.117" +version = "0.9.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b47e7e6bb2c38cd930d25a23b40fa52e068c10e85f3e03a7f5ba5aaca5713695" +checksum = "19c413d6ec9ebaf5e1c829d355cb3e9f783778d700f135be0921d52fce3c60ae" dependencies = [ "cc", "libc", @@ -3812,6 +3908,29 @@ dependencies = [ "cc", ] +[[package]] +name = "p12-keystore" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c2ed4fa0ec7ec58b657d4184680c57da9e203e97771d29a566028869a5193e0" +dependencies = [ + "cbc", + "cms", + "der", + "des", + "hex", + "hmac", + "pkcs12", + "pkcs5", + "pkcs8", + "rand 0.10.3", + "rc2", + "sha1 0.11.0", + "sha2 0.11.1", + "thiserror 2.0.21", + "x509-parser", +] + [[package]] name = "palette" version = "0.7.7" @@ -3987,6 +4106,21 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" +[[package]] +name = "pkcs12" +version = "0.2.0-pre.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8059bd79345d1d1c125656025814704bab5cdd204b1cefd5fab59b0fdd7476d2" +dependencies = [ + "cms", + "const-oid", + "der", + "digest 0.11.3", + "spki", + "x509-cert", + "zeroize", +] + [[package]] name = "pkcs5" version = "0.8.1" @@ -4026,9 +4160,9 @@ checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "plist" -version = "1.10.1" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2896bade328c13f7042a297ea5ac5b0951f6cf989dea5f32c2fd98da398195cb" +checksum = "327a4cb2ad49dc48adfdc9da89e22c64d488b508c67a044d71ba729e4521a285" dependencies = [ "base64 0.23.1", "indexmap 2.14.2", @@ -4037,19 +4171,6 @@ dependencies = [ "time", ] -[[package]] -name = "png" -version = "0.17.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide 0.8.9", -] - [[package]] name = "png" version = "0.18.1" @@ -4385,6 +4506,15 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" +[[package]] +name = "rc2" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ceda21af1ae61033b63175653a1af86cae399d79cd03ca80ba347eb3a6c4a7fe" +dependencies = [ + "cipher 0.5.2", +] + [[package]] name = "redox_syscall" version = "0.5.18" @@ -4470,21 +4600,21 @@ dependencies = [ "http-body-util", "hyper", "hyper-rustls", - "hyper-tls", "hyper-util", "js-sys", "log", "mime", - "native-tls", "percent-encoding", "pin-project-lite", + "rustls", "rustls-pki-types", + "rustls-platform-verifier", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", "tokio", - "tokio-native-tls", + "tokio-rustls", "tokio-util", "tower", "tower-http", @@ -4526,10 +4656,19 @@ dependencies = [ ] [[package]] -name = "rustix" -version = "1.1.5" +name = "rusticata-macros" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891efababe418670775f199f0d233d84843c227a0949a883ce15b37c78d6629d" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + +[[package]] +name = "rustix" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5e76742e5294153d4dde1207dbec5bdd81eef6fabdc0d2118babadabfd858aa" dependencies = [ "bitflags 2.13.2", "errno", @@ -4540,17 +4679,39 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.45" +version = "0.23.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634" +checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf" dependencies = [ "once_cell", + "ring", "rustls-pki-types", "rustls-webpki", "subtle", "zeroize", ] +[[package]] +name = "rustls-native-certs" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a073f5dc7469f984c52ad2752b63b0807745133b6de880b7b64c1ac4c48aec4" +dependencies = [ + "openssl-probe", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "rustls-pki-types" version = "1.15.1" @@ -4561,10 +4722,37 @@ dependencies = [ ] [[package]] -name = "rustls-webpki" -version = "0.103.15" +name = "rustls-platform-verifier" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2" +checksum = "1167586491e2b18b8bfbb293e8180ec17c201c4f076d7cb3070ca964e7598f98" +dependencies = [ + "core-foundation 0.10.1", + "core-foundation-sys", + "jni 0.22.4", + "log", + "once_cell", + "rustls", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki", + "security-framework", + "security-framework-sys", + "webpki-root-certs", + "windows-sys 0.61.2", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eec689c0bc40ff2458a5977b6619cb718087084a18e02a131c599b62d05e1a5f" + +[[package]] +name = "rustls-webpki" +version = "0.103.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281" dependencies = [ "ring", "rustls-pki-types", @@ -4616,9 +4804,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939" +checksum = "9cb23c424d8ee841bb4d813677ca237e2a610067d594fec130f87d6093495ab5" dependencies = [ "windows-sys 0.61.2", ] @@ -4692,6 +4880,16 @@ dependencies = [ "sha2 0.11.1", ] +[[package]] +name = "sec1" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d56d437c2f19203ce5f7122e507831de96f3d2d4d3be5af44a0b0a09d8a80e4d" +dependencies = [ + "der", + "zeroize", +] + [[package]] name = "security-framework" version = "3.7.0" @@ -5038,9 +5236,9 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "smallvec" -version = "1.16.3" +version = "1.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b3dc8af474f516a851ff4bd12db780f948b9250ad37211e4eec0bccea54e01b" +checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8" [[package]] name = "snow" @@ -5159,6 +5357,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "static_vcruntime" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff7589a1859b09232522bb9edf076ca7fcf14ded96685d3fa629db73023ffbb7" + [[package]] name = "string_cache" version = "0.9.0" @@ -5277,6 +5481,17 @@ dependencies = [ "futures-core", ] +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "synstructure" version = "0.14.0" @@ -5339,7 +5554,7 @@ dependencies = [ [[package]] name = "tao" version = "0.37.1" -source = "git+https://github.com/yuezk/tao?rev=1452ae7a42c9f134296ba199f91f514fc9077f61#1452ae7a42c9f134296ba199f91f514fc9077f61" +source = "git+https://github.com/yuezk/tao?rev=bba0f1c4e86d697b173c75280d1651f408b8023c#bba0f1c4e86d697b173c75280d1651f408b8023c" dependencies = [ "bitflags 2.13.2", "block2", @@ -5378,7 +5593,7 @@ dependencies = [ [[package]] name = "tao-macros" version = "0.1.4" -source = "git+https://github.com/yuezk/tao?rev=1452ae7a42c9f134296ba199f91f514fc9077f61#1452ae7a42c9f134296ba199f91f514fc9077f61" +source = "git+https://github.com/yuezk/tao?rev=bba0f1c4e86d697b173c75280d1651f408b8023c#bba0f1c4e86d697b173c75280d1651f408b8023c" dependencies = [ "proc-macro2", "quote", @@ -5404,9 +5619,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.12.3" +version = "2.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c404ecf956ff241bf6b39dd688614724e1bf1f63255abb4fc46d1c40371672ea" +checksum = "5fb0244332cfb9cee7e2a568bf5da29a36ed8fdbd717f6f47a66b6b7b358c072" dependencies = [ "anyhow", "bytes", @@ -5455,9 +5670,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eea0b6302f82c574b21af6fc6ae6e86183b9280853c22621d0abf0936911ffc" +checksum = "adddb0e648752aaac5da9c3c3c6a68e1e87cab55e3b757b18a9441ef8c3ac614" dependencies = [ "anyhow", "cargo_toml", @@ -5469,6 +5684,8 @@ dependencies = [ "semver", "serde", "serde_json", + "static_vcruntime", + "strsim", "tauri-utils", "tauri-winres", "walkdir", @@ -5476,16 +5693,16 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f468f9a9bcd404f57e5c191d91024e3de953d4b610f78c2907e7110615cb1c" +checksum = "fb37631cf71dab5e8ab55e1bdd701e18a52653d90b78e71d0e5598b1e0a61316" dependencies = [ "base64 0.23.1", "brotli", "ico", "json-patch", "plist", - "png 0.18.1", + "png", "proc-macro2", "quote", "semver", @@ -5503,9 +5720,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "131bffec939b20642380317f8403a33c8888489925e14bb965ceaff0d949b1cb" +checksum = "0cc38db58854c10fb5f91a887ed8bf82d3239bb92b5d8db86eda09e96d9963d1" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -5517,9 +5734,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.12.1" +version = "2.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2a57a2a9b8c8b7fc00d35b510fe808ded7f9f1b44fc1cdda6aee38632ea5413" +checksum = "7c55766d99cea69055904d1735b93c2049302b2e09effd462120deb5581d78e9" dependencies = [ "cookie", "dpi", @@ -5542,9 +5759,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.12.1" +version = "2.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e7e0c9f80a5130773cfabb6df4dc924518fb1b2c923726966804634b57d22" +checksum = "e1aa9d8b7a120f879f44fdc1053f7b7dbf416bf0bbc6a72b714dec46b782b52f" dependencies = [ "gtk", "http", @@ -5552,7 +5769,6 @@ dependencies = [ "log", "objc2", "objc2-app-kit", - "once_cell", "percent-encoding", "raw-window-handle", "softbuffer", @@ -5568,9 +5784,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.10.1" +version = "2.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ff55a614843b9a3f010f211df637c94df2607175b8d0f6e0f4a7c19e18621ee" +checksum = "362ab21cd4cc713f2a02b1a9b5688198b1541cfb6907c4281e9190e0f0ef4aa3" dependencies = [ "anyhow", "brotli", @@ -5606,9 +5822,9 @@ dependencies = [ [[package]] name = "tauri-winres" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc65d45c68858bfe420dd29e834b5d15dbecf8a07a8a16cf4d532c7b1f69d4b6" +checksum = "c52bb6904475a6ca662f15ef787f18ade61d5740a1ee12c45d3b748efdb6f796" dependencies = [ "dunce", "embed-resource", @@ -5732,9 +5948,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e27c91459209c2986af3dcf603a5a74a4368754ce37414f59acc971167f643" +checksum = "abc840c238154d58f9e86b2792261edfde565a17696e1cda1a449de27979801a" dependencies = [ "displaydoc", "zerovec", @@ -5748,9 +5964,9 @@ checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee" [[package]] name = "tokio" -version = "1.53.2" +version = "1.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e95f91fcc7a621e8b030f6aa23c71fe9838ae2fb4d8118b75602a328f5144044" +checksum = "b52fd3255258d26fac7264ab5a76b53c13367136dc011d3d6ad4f8ed070396a3" dependencies = [ "bytes", "libc", @@ -5773,16 +5989,6 @@ dependencies = [ "syn 3.0.9", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.26.6" @@ -6007,7 +6213,7 @@ dependencies = [ "objc2-core-graphics", "objc2-foundation", "once_cell", - "png 0.18.1", + "png", "serde", "thiserror 2.0.21", "windows-sys 0.61.2", @@ -6094,9 +6300,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" +checksum = "ca718471876992059f251e33aafc334346ada08042b7661dd1fe313a9bced557" [[package]] name = "universal-hash" @@ -6157,9 +6363,12 @@ dependencies = [ [[package]] name = "utf8_iter" -version = "1.0.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" +checksum = "af3bd9d3e571c26fcce9d033b87ea5ab061b8d2ffe9b7a5675d810d68f03edf0" +dependencies = [ + "utf_types", +] [[package]] name = "utf8parse" @@ -6168,10 +6377,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] -name = "uuid" -version = "1.28.0" +name = "utf_types" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc1186384beb7dd8eedea376413fd654937285ea6c9cfbb928dc3043ea4b606" +checksum = "3a3b425286980a367278453f3b6d28cdcb134b574e5a35824a6ff5eebad50bb6" + +[[package]] +name = "uuid" +version = "1.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a0e2d11620c50695fe12bbbfde96b3477fe606e7284c22d505c12ce51214514" dependencies = [ "getrandom 0.4.3", "js-sys", @@ -6300,12 +6515,11 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.129" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb54f33acc68fd454578d9820b0bde1a1a3d17aa17bb7b6595806d02886d409" +checksum = "a0181c14ddd6c7b8b0b0132a5f1ea2f32be0d893cd3ea97b6e3b28886b8a3d1c" dependencies = [ "cfg-if", - "once_cell", "rustversion", "wasm-bindgen-macro", "wasm-bindgen-shared", @@ -6313,9 +6527,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.79" +version = "0.4.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cbab34de2d982e9b48e18d216d04c4a6f641066ff19ffb699980f591ee3610e" +checksum = "5e14e0327cb5368ad60ccb22d04a9827a693c95a926d8d125e9fa39e0baec501" dependencies = [ "js-sys", "tokio", @@ -6324,9 +6538,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.129" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e29d0c35b16e224a7eeb5cd2d25e3e1968fbd65604117b44d3b789d00ee8535" +checksum = "6e931a02a39abdbf66966fc35902b5ed58344750a70885bed4ebb3d8eaf28ed9" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6334,9 +6548,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.129" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f501a8bc3719dba86ef8ae4728879c08001bea749eb1333ac5b91e040e2a6b7" +checksum = "2ca4b54280e455bd831e33a6b8e734baf432fe63fbc35c42ac14ce67a043a53a" dependencies = [ "bumpalo", "proc-macro2", @@ -6347,9 +6561,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.129" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23f0c9c52aa7cd7d77769a4cfe2a9adb1b331f489a41d912ce14513d5ab995c6" +checksum = "3b1f9c3798725016c6ee5f2f57869ec0831e8bbc0ab0310a86e787e97f41389e" dependencies = [ "unicode-ident", ] @@ -6369,9 +6583,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.106" +version = "0.3.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88261b9deccee56594c11a3460c462c41f58d148598fe70ad77070126a68aba4" +checksum = "d7d179596ff5ec0f6de4db64d54011bde6289cc49603d3a6e4ce3f329207ab88" dependencies = [ "js-sys", "wasm-bindgen", @@ -6401,9 +6615,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "1.2.4" +version = "1.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c35be770821a214dbc362fc26908c853e776c0004294d0b10b8a6bad582f94" +checksum = "fe8d20d0214027baf11b8b0cc307c1da7657d8f4db9aa956f7de27a6fb1acbd5" dependencies = [ "jni 0.22.4", "log", @@ -6459,6 +6673,15 @@ dependencies = [ "system-deps", ] +[[package]] +name = "webpki-root-certs" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e49d0e65abc00c142e8f9428da991da9f1a250c39be97459901eb12b9b49f62a" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "webview2-com" version = "0.39.1" @@ -6882,11 +7105,11 @@ checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc" [[package]] name = "wry" -version = "0.57.0" +version = "0.57.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a819957a01b3119af85e638a38d242af76dbc87d130dca67bfd0441072e21ff0" +checksum = "759c50ddad0ef9913bb5496cb9d509a50433a3b78cb0238d61105526589cf0e9" dependencies = [ - "base64 0.22.1", + "base64 0.23.1", "block2", "cookie", "crossbeam-channel", @@ -6907,7 +7130,6 @@ dependencies = [ "objc2-foundation", "objc2-ui-kit", "objc2-web-kit", - "once_cell", "percent-encoding", "raw-window-handle", "sha2 0.10.9", @@ -6957,10 +7179,27 @@ dependencies = [ ] [[package]] -name = "xattr" -version = "1.6.1" +name = "x509-parser" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" +checksum = "d43b0f71ce057da06bc0851b23ee24f3f86190b07203dd8f567d0b706a185202" +dependencies = [ + "asn1-rs", + "data-encoding", + "der-parser", + "lazy_static", + "nom", + "oid-registry", + "rusticata-macros", + "thiserror 2.0.21", + "time", +] + +[[package]] +name = "xattr" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "963d6fab92d5504b971dc8bd90ca743c2575e590bc8071ea5bc571598667ae08" dependencies = [ "libc", "rustix", @@ -6993,9 +7232,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5" +checksum = "417ef3fcf6c300b7dbd25c85531a746931c02ad536f3cf4786ed1e88223340b3" dependencies = [ "stable_deref_trait", "yoke-derive", @@ -7011,23 +7250,23 @@ dependencies = [ "proc-macro2", "quote", "syn 3.0.9", - "synstructure", + "synstructure 0.14.0", ] [[package]] name = "zerocopy" -version = "0.8.62" +version = "0.8.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86502bf56ac7c77571a32e2647bb2a15894565e981fb2a48d7bde2d91c965a9d" +checksum = "e5fe1f8f1b06191a00962174c61aa5005e0bb391a6d80d07e24d115c01a92ed8" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.62" +version = "0.8.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5457206954b06561e2608c7e19cf58b1926586d999c246eebe4502f7e2039d1a" +checksum = "863ad3ac83293fb4d740aedbfdc9240dd8d1a50c1099acd76ce80ce7c7230c7f" dependencies = [ "proc-macro2", "quote", @@ -7052,7 +7291,7 @@ dependencies = [ "proc-macro2", "quote", "syn 3.0.9", - "synstructure", + "synstructure 0.14.0", ] [[package]] @@ -7077,9 +7316,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8" +checksum = "f58a2799cfe9a1670c7ea8edbd52ef8edb93cb37a7f83bf31ba9e35d9dae6a40" dependencies = [ "yoke", "zerofrom", @@ -7088,9 +7327,9 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.6" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da" +checksum = "c3743ddbf47738d929cd1ae2e199d40d0162979dfe31aef8ae646d2bf00bf97a" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 0362fef..3f910a6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -resolver = "2" +resolver = "3" members = [ "crates/*", @@ -11,7 +11,7 @@ members = [ [workspace.package] rust-version = "1.91" -version = "3.2.0" +version = "3.3.0" authors = ["Kevin Yue "] homepage = "https://github.com/yuezk/GlobalProtect-openconnect" edition = "2024" @@ -32,7 +32,7 @@ is_executable = "1.0" log = "0.4" # RUST_LOG accepts user-supplied Unicode property filters through env_logger. regex = { version = "1", default-features = false, features = ["std", "perf", "unicode"] } -reqwest = { version = "0.13", default-features = false, features = ["native-tls", "charset", "http2", "system-proxy", "json", "form", "query"] } +reqwest = { version = "0.13", default-features = false, features = ["rustls-no-provider", "charset", "http2", "system-proxy", "json", "form", "query"] } openssl = "0.10" pem = "4" xmltree = { version = "0.12", features = ["attribute-order"] } @@ -43,6 +43,7 @@ sysinfo = { version = "0.38.4", default-features = false, features = ["system"] tempfile = "3.8" tokio = { version = "1" } tokio-util = "0.7" +tokio-tungstenite = "0.30" url = "2.4" urlencoding = "2.1.3" axum = { version = "0.8", default-features = false, features = ["http1", "tokio"] } @@ -57,7 +58,7 @@ md5 = "0.8" sha2 = { version = "0.11", default-features = false } which = "8" uuid = "1" -netdev = "0.46.3" +netdev = "0.47" humantime = "2" snow = { version = "0.10", default-features = false, features = ["use-getrandom", "use-curve25519", "use-chacha20poly1305", "use-sha2"] } zeroize = "1" @@ -68,10 +69,10 @@ specta = "=2.0.0-rc.20" proptest = "1" [patch.crates-io] -# Restore BSD GTK resize hit testing until https://github.com/tauri-apps/tao/pull/1356 is released. -tao = { git = "https://github.com/yuezk/tao", rev = "1452ae7a42c9f134296ba199f91f514fc9077f61" } +# Restore BSD GTK resize hit testing and apply fixed-size windows before first configure. +tao = { git = "https://github.com/yuezk/tao", rev = "bba0f1c4e86d697b173c75280d1651f408b8023c" } # Use one macro source for Tao and Wry so Cargo can vendor the workspace. -tao-macros = { git = "https://github.com/yuezk/tao", rev = "1452ae7a42c9f134296ba199f91f514fc9077f61" } +tao-macros = { git = "https://github.com/yuezk/tao", rev = "bba0f1c4e86d697b173c75280d1651f408b8023c" } [profile.release] opt-level = 'z' # Optimize for size diff --git a/Makefile b/Makefile index 83150b8..551bbeb 100644 --- a/Makefile +++ b/Makefile @@ -190,8 +190,7 @@ install-unix: install-gpclient-unix set -e; if [ -f "$(GPGUI_BINARY)" ]; then \ install -m 755 "$(GPGUI_BINARY)" "$(DESTDIR)$(PREFIX)/bin/gpgui"; \ fi - set -e; for file in packaging/files/usr/share/icons/hicolor/*/apps/gpgui.* \ - packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-*.svg; do \ + set -e; for file in packaging/files/usr/share/icons/hicolor/*/apps/gpgui.*; do \ destination="$(DESTDIR)$(PREFIX)/$${file#packaging/files/usr/}"; \ install -d "$$(dirname "$$destination")"; \ install -m 644 "$$file" "$$destination"; \ @@ -200,6 +199,8 @@ install-unix: install-gpclient-unix install-linux: install-unix @echo "Installing Linux integration under $(PREFIX)..." set -e; for file in share/applications/gpgui.desktop \ + share/applications/gpgui-helper.desktop \ + share/applications/gpauth.desktop \ share/polkit-1/actions/com.yuezk.gpgui.policy \ lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down \ lib/NetworkManager/dispatcher.d/gpclient-nm-hook; do \ @@ -213,7 +214,7 @@ install-linux: install-unix install-bsd: install-unix @echo "Installing BSD integration under $(PREFIX)..." install -d "$(DESTDIR)$(PREFIX)/share/applications" "$(DESTDIR)$(PREFIX)/share/polkit-1/actions" - install -m 644 packaging/bsd/gpgui.desktop "$(DESTDIR)$(PREFIX)/share/applications/" + install -m 644 packaging/bsd/gpgui.desktop packaging/bsd/gpgui-helper.desktop packaging/bsd/gpauth.desktop "$(DESTDIR)$(PREFIX)/share/applications/" install -m 644 packaging/bsd/com.yuezk.gpgui.policy "$(DESTDIR)$(PREFIX)/share/polkit-1/actions/" sh scripts/relocate-install-paths.sh "$(PREFIX)" /usr/local "$(DESTDIR)$(PREFIX)" @@ -259,7 +260,9 @@ package-openbsd: clean-bsd-package $(MAKE) install-bsd DESTDIR=$(CURDIR)/.build/openbsd/pkgroot PREFIX=$(PREFIX) GPGUI_BINARY="$(GPGUI_BINARY)" cp packaging/bsd/openbsd/COMMENT .build/openbsd/+COMMENT cp packaging/bsd/openbsd/DESC .build/openbsd/+DESC + sh scripts/openbsd-library-dependencies.sh .build/openbsd/pkgroot > .build/openbsd/WANTLIB { \ + cat .build/openbsd/WANTLIB; \ echo '@unexec-delete /bin/rm -f /usr/local/libexec/gpclient/gpgui /var/db/gpclient/scripts/vpnc-script /var/db/gpclient/scripts/vpnc-script.metadata || echo "Warning: failed to remove gpclient runtime files" >&2'; \ echo '@unexec-delete /bin/rmdir /usr/local/libexec/gpclient 2>/dev/null || true'; \ echo '@unexec-delete /bin/rmdir /var/db/gpclient/scripts 2>/dev/null || true'; \ @@ -314,11 +317,12 @@ uninstall-unix: set -e; for file in gp-hip-script-installer gp-vpnc-script-installer vpnc-script; do \ rm -f "$(DESTDIR)$(PREFIX)/libexec/gpclient/$$file"; \ done - set -e; for file in packaging/files/usr/share/icons/hicolor/*/apps/gpgui.* \ - packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-*.svg; do \ + set -e; for file in packaging/files/usr/share/icons/hicolor/*/apps/gpgui.*; do \ rm -f "$(DESTDIR)$(PREFIX)/$${file#packaging/files/usr/}"; \ done rm -f "$(DESTDIR)$(PREFIX)/share/applications/gpgui.desktop" \ + "$(DESTDIR)$(PREFIX)/share/applications/gpgui-helper.desktop" \ + "$(DESTDIR)$(PREFIX)/share/applications/gpauth.desktop" \ "$(DESTDIR)$(PREFIX)/share/polkit-1/actions/com.yuezk.gpgui.policy" rmdir "$(DESTDIR)$(PREFIX)/libexec/gpclient" 2>/dev/null || true @@ -326,6 +330,7 @@ uninstall-linux: uninstall-unix rm -f "$(DESTDIR)$(PREFIX)/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down" \ "$(DESTDIR)$(PREFIX)/lib/NetworkManager/dispatcher.d/gpclient-nm-hook" rm -f "$(DESTDIR)/var/lib/gpclient/gpgui" \ + "$(DESTDIR)/var/lib/gpclient/gpgui-nsh" \ "$(DESTDIR)/var/lib/gpclient/scripts/vpnc-script" \ "$(DESTDIR)/var/lib/gpclient/scripts/vpnc-script.metadata" rmdir "$(DESTDIR)/var/lib/gpclient/scripts" "$(DESTDIR)/var/lib/gpclient" 2>/dev/null || true diff --git a/README.md b/README.md index 65c1000..9ff76ab 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # GlobalProtect-openconnect -A GlobalProtect VPN client built on OpenConnect with support for SSO authentication. It provides command-line tools and the GP Connect desktop application for macOS, Linux, FreeBSD, and OpenBSD. +A GlobalProtect VPN client built on OpenConnect. It provides command-line tools (`gpclient`) and the GP Connect desktop application for macOS, Linux, FreeBSD, and OpenBSD. + +> **Disclaimer**: GP Connect is an independent third-party client for GlobalProtect VPN networks. It is not affiliated with or endorsed by Palo Alto Networks, Inc.

@@ -22,146 +24,89 @@ A GlobalProtect VPN client built on OpenConnect with support for SSO authenticat - [macOS](#macos) - [Debian / Ubuntu](#debian--ubuntu) - [Arch Linux / Manjaro](#arch-linux--manjaro) - - [Fedora 38+ / Rawhide](#fedora-38--rawhide) - - [openSUSE Leap 15.6+ / Tumbleweed](#opensuse-leap-156--tumbleweed) - - [Other RPM-based Distributions](#other-rpm-based-distributions) + - [Fedora / RHEL](#fedora--rhel) + - [openSUSE](#opensuse) - [Alpine Linux](#alpine-linux) - [FreeBSD](#freebsd) - [OpenBSD](#openbsd) - [Gentoo](#gentoo) - [NixOS](#nixos) - - [Official Docker Image](#official-docker-image) + - [Docker](#docker) - [Other Distributions](#other-distributions) - [Building from Source](#building-from-source) -- [Frequently Asked Questions](#frequently-asked-questions) +- [Troubleshooting](#troubleshooting) - [NetworkManager Integration](#networkmanager-integration) - [Licensing](#licensing) ## Features -- **Desktop Platform Support** – macOS, Linux, FreeBSD, and OpenBSD -- **Dual Interface** – Available as both CLI and GUI applications -- **Flexible Authentication** – Supports SSO, non-SSO, FIDO2 (e.g., YubiKey), and client certificate authentication -- **Browser Integration** – Authenticate using your default browser or any specified browser -- **Multi-Portal Support** – Connect to multiple portals and gateways -- **Direct Gateway Connection** – Bypass portal selection when needed -- **Auto-Connect** – Automatically connect on system startup -- **System Tray Integration** – Convenient system tray icon (requires [gnome-shell-extension-appindicator](https://extensions.gnome.org/extension/615/appindicator-support/) on GNOME) +- **Multi-Platform** – macOS (Apple silicon), Linux, FreeBSD, and OpenBSD +- **Dual Interfaces** – Fast terminal CLI (`gpclient`) and desktop GUI (**GP Connect**) +- **Native Shell on Linux** – Ultra-low-memory native desktop GUI alongside the webview interface +- **Flexible Routing** – Full System VPN tunnel or local SOCKS5 proxy mode +- **Modern Authentication** – SAML / SSO, MFA, FIDO2 (YubiKey), client certificates, and external browser login +- **Automated HIP Reports** – Built-in HIP report generation or custom scripts +- **Multi-Portal & Direct Gateway** – Manage multiple saved portals or connect directly to a gateway +- **Desktop Integration** – Theme-aware system tray icon, auto-connect on launch, and reconnect on wake ## Usage ### Command-Line Interface -The CLI is free and open source. Use it to authenticate, connect to portals or gateways, and generate HIP reports from the terminal. - -#### Basic Commands +The open-source `gpclient` CLI handles authentication, connection lifecycle, and HIP generation: ```bash -Usage: gpclient [OPTIONS] +# Connect to a portal server +sudo gpclient connect -Commands: - connect Connect to a portal server - disconnect Disconnect from the server - launch-gui Launch the GUI - hip Generate HIP report - help Print this message or the help of the given subcommand(s) - -Options: - --fix-openssl Uses extended compatibility mode for OpenSSL operations to support a broader range of systems and formats. - --ignore-tls-errors Ignore the TLS errors - --lock-file Path to the gpclient PID lock file - --log-format Log output format. JSON is intended for non-interactive consumers; interactive prompts remain text. [default: text] [possible values: text, json] - -v, --verbose... Enable verbose output, -v for debug, -vv for trace - -q, --quiet... Decrease logging verbosity, -q for warnings, -qq for errors - -h, --help Print help (see more with '--help') - -V, --version Print version -``` - -The `--fix-openssl` option is available on Linux, FreeBSD, and OpenBSD. macOS uses native TLS and GnuTLS and does not accept this option. - -> **Tip:** Use `gpclient help ` for detailed information on a specific command. - -#### HIP reports - -HIP is disabled in the CLI unless enabled explicitly. Use `--hip` to generate reports inside `gpclient`, including later reports requested by the gateway: - -```bash -sudo gpclient connect --hip -``` - -Use `--hip=/absolute/path/to/script` for a custom executable. It runs as the `gpclient` process user unless `--hip-user` specifies another user. No installed HIP script is discovered automatically. `--hip-user` applies only to custom executables. - -`gpclient hip` generates a report on demand for inspection; see `gpclient hip --help` for report inputs. The GUI's HIP tab supports generated reports, edited XML, and HIP Off on all desktop platforms. Linux, FreeBSD, and OpenBSD also support desktop-user scripts and explicitly approved root scripts. - -#### External Browser Authentication - -Use `gpclient` directly for browser-based authentication. It opens the browser as your normal desktop user while keeping VPN tunnel setup privileged: - -```bash +# Connect using browser authentication (SSO / SAML) sudo gpclient connect --browser + +# Connect directly to a gateway server +sudo gpclient connect --as-gateway + +# Connect with automatic HIP report generation +sudo gpclient connect --hip + +# Headless / remote server authentication (prints auth URL to open in any browser) +sudo gpclient connect --browser manual + +# Disconnect +sudo gpclient disconnect ``` -For standalone CLI installations, use `--browser manual` (`--browser remote` before v3.0.6): open the printed URL and paste the resulting `globalprotectcallback:…` data into the terminal. - -To reuse a saved portal cookie for later connections, add `--cookie-cache`: - -```bash -sudo gpclient connect --browser --cookie-cache -``` - -Add `--gateway ` to select a particular gateway. Cookie caching is handled by `gpclient`. Its default cache file is `$HOME/.config/gpclient/cookie.json`, which normally belongs to root when running with `sudo`. To choose a predictable location, specify the path explicitly: - -```bash -sudo gpclient connect --browser --cookie-cache=/absolute/path/to/cookie.json -``` - -**Browser Options:** - -- Use `--browser` to automatically select an available browser -- Use `--browser ` to specify a browser (e.g., `firefox`, `chrome`) -- Use `--browser manual` for standalone CLI installations or headless servers +Run `gpclient --help` or `gpclient --help` to view all available commands and options. ### Graphical User Interface -GP Connect provides a desktop interface for managing VPN connections. On macOS, open GP Connect from Applications. On Linux, FreeBSD, and OpenBSD, launch it from your application menu or via the terminal: +- **macOS**: Open **GP Connect** from Applications. +- **Linux / BSD**: Launch GP Connect from your application menu or run: + ```bash + gpclient launch-gui + ``` -```bash -gpclient launch-gui -``` - -> [!Note] -> -> The GUI version is partially open source. The background service ([gpservice](./apps/gpservice/)) is open source, while the GUI wrapper is proprietary. +> [!TIP] +> **On Linux, try Native Shell for lower memory usage.** Switch between Native Shell and Tauri in **Settings → General → Interface**. ## Installation -> [!Note] -> -> For older Linux distributions, use [v2.3.13](https://github.com/yuezk/GlobalProtect-openconnect/releases/tag/v2.3.13) instead of the latest release. It provides release assets for common distro families, including Debian/Ubuntu (`.deb`), Arch Linux / Manjaro (`.pkg.tar.zst`), RPM-based distros such as Fedora / RHEL / Rocky / AlmaLinux / CentOS (`.rpm`), and generic Linux tarballs (`.bin.tar.xz`). - ### macOS -GP Connect requires Apple silicon and macOS 13 or later. The macOS app includes both the desktop application and the free `gpclient` CLI. The CLI does not require a GUI license. +Requires Apple silicon and macOS 13+. Includes both GP Connect and the `gpclient` CLI. -#### Option 1: Install with Homebrew +#### Option 1: Homebrew (Recommended) ```bash brew install --cask yuezk/gp-connect/gp-connect ``` -Open GP Connect from Applications, or connect from the terminal: +#### Option 2: DMG Installer -```bash -sudo gpclient connect --browser -``` - -#### Option 2: Install from DMG - -Download the GP Connect `.dmg` from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page, open it, and drag GP Connect into Applications. +Download the `.dmg` from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page and drag GP Connect into Applications. ### Debian / Ubuntu -#### Option 1: Install from PPA (Recommended) +#### Option 1: PPA (Recommended) ```bash sudo add-apt-repository ppa:yuezk/globalprotect-openconnect @@ -169,384 +114,152 @@ sudo apt-get update sudo apt-get install globalprotect-openconnect ``` -> [!Note] -> -> **For Linux Mint users:** If you encounter a GPG key error, import the key manually: -> ```bash -> sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7937C393082992E5D6E4A60453FC26B43838D761 -> ``` +#### Option 2: DEB Package -#### Option 2: Install from DEB Package - -Download the latest `.deb` package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page, then install: +Download the latest `.deb` from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page: ```bash -sudo apt install --fix-broken ./globalprotect-openconnect_*.deb +sudo apt install ./globalprotect-openconnect_*.deb ``` ### Arch Linux / Manjaro -#### Option 1: Install from AUR - -Package: [globalprotect-openconnect-git](https://aur.archlinux.org/packages/globalprotect-openconnect-git/) - -You can install it using an AUR helper like [`yay`](https://github.com/Jguer/yay): - ```bash +# Official Extra repository +sudo pacman -S globalprotect-openconnect + +# AUR (git main) yay -S globalprotect-openconnect-git ``` -#### Option 2: Install from the Official Extra Repository +### Fedora / RHEL -The package is also available in the official Arch Linux Extra repository. - -Package: [globalprotect-openconnect](https://archlinux.org/packages/extra/x86_64/globalprotect-openconnect/) - -> [!Note] -> -> Since the official package does not include the system tray support dependency, you need to install `libappindicator` manually: - -```bash -sudo pacman -S libappindicator globalprotect-openconnect -``` - -#### Option 3: Install from Package - -Download the latest package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page, then install: - -```bash -sudo pacman -U globalprotect-openconnect-*.pkg.tar.zst -``` - -### Fedora 38+ / Rawhide - -#### Install from COPR - -The package is available on [COPR](https://copr.fedorainfracloud.org/coprs/yuezk/globalprotect-openconnect/) for RPM-based distributions: +Enable the COPR repository: ```bash sudo dnf copr enable yuezk/globalprotect-openconnect sudo dnf install globalprotect-openconnect ``` -### openSUSE Leap 15.6+ / Tumbleweed +### openSUSE -#### Install from OBS (openSUSE Build Service) - -Packages are available on the [openSUSE Build Service](https://build.opensuse.org/package/show/home:yuezk/globalprotect-openconnect). Follow the [installation instructions](https://software.opensuse.org//download.html?project=home%3Ayuezk&package=globalprotect-openconnect) for your distribution. - -### Other RPM-based Distributions - -#### Install from RPM Package - -Download the latest RPM package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page: - -```bash -sudo rpm -i globalprotect-openconnect-*.rpm -``` +Packages are available on the [openSUSE Build Service](https://build.opensuse.org/package/show/home:yuezk/globalprotect-openconnect). Follow the [OBS instructions](https://software.opensuse.org/download.html?project=home%3Ayuezk&package=globalprotect-openconnect) for your distribution. ### Alpine Linux -Download the latest `.apk` package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page, then install: +Download the latest `.apk` package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page: ```bash sudo apk add --allow-untrusted globalprotect-openconnect-*.apk ``` -The package uses Alpine's native musl build. Make sure the `community` repository is enabled so GUI dependencies such as `webkit2gtk-4.1`, `libsecret`, and `libayatana-appindicator` can be resolved. GUI-launched connections use polkit, and VPN tunnel creation requires `/dev/net/tun`. +*(Requires `community` repository enabled for WebKitGTK and AppIndicator dependencies).* ### FreeBSD -Download the latest FreeBSD package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page, then install: +Download the latest FreeBSD package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page: ```bash sudo pkg install ./globalprotect-openconnect-*-freebsd-*.pkg ``` -To build from source, see [Building from Source on FreeBSD and OpenBSD](./docs/bsd-source-build.md). - ### OpenBSD -Download the latest OpenBSD package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page, then install: +Download the latest OpenBSD package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page: ```bash doas pkg_add -D unsigned ./globalprotect-openconnect-*-openbsd-*.tgz ``` -To build from source, see [Building from Source on FreeBSD and OpenBSD](./docs/bsd-source-build.md). - ### Gentoo -Available via the `guru` and `lamdness` overlays: +Available via the `guru` repository: ```bash sudo eselect repository enable guru sudo emerge --sync guru -sudo emerge --ask --verbose net-vpn/GlobalProtect-openconnect +sudo emerge --ask net-vpn/GlobalProtect-openconnect ``` ### NixOS -This repository includes a flake for NixOS integration. - -#### Installation Steps - -Add the flake input and NixOS module to your `flake.nix`: - -The module builds the package with your NixOS configuration's `pkgs`, so the -GlobalProtect GUI and the system use the same Nixpkgs dependency versions. -It also enables Polkit and its setuid `pkexec` wrapper for privileged operations. +Add the flake to your `flake.nix`: ```nix { - inputs = { - # ... other inputs - globalprotect-openconnect.url = "github:yuezk/GlobalProtect-openconnect"; - }; + inputs.globalprotect-openconnect.url = "github:yuezk/GlobalProtect-openconnect"; - outputs = { self, nixpkgs, globalprotect-openconnect, ... }: - let - system = "x86_64-linux"; # or "aarch64-linux" for ARM64 - hostname = ""; - in { - nixosConfigurations.${hostname} = nixpkgs.lib.nixosSystem { - inherit system; - - modules = [ - ./configuration.nix - globalprotect-openconnect.nixosModules.default - { - programs.globalprotect-openconnect.enable = true; - - environment.systemPackages = [ - nixpkgs.legacyPackages.${system}.gnomeExtensions.appindicator - ]; - } - ]; - }; + outputs = { self, nixpkgs, globalprotect-openconnect, ... }: { + nixosConfigurations. = nixpkgs.lib.nixosSystem { + modules = [ + globalprotect-openconnect.nixosModules.default + { + programs.globalprotect-openconnect.enable = true; + } + ]; }; + } } ``` -Apply: +Apply changes: ```bash sudo nixos-rebuild switch -loginctl terminate-user "$USER" ``` -After logging back in to GNOME, enable AppIndicator support if needed: +### Docker -```bash -gnome-extensions enable appindicatorsupport@rgcjonas.gmail.com -``` - -NixOS does not run an imperative package-uninstall hook when a package is -removed from the system configuration. Remove an installed replacement VPN -script from the app settings before removing the package. - -The `prebuilt` package and NixOS module use the published release pinned in `flake.nix`. Both `prebuilt` and `fromSource` run natively on the host with packaged dependencies and installer paths. The `fromSource` package builds the current flake checkout, including its Git submodules: - -```bash -git submodule update --init --recursive -nix build "git+file://$PWD?submodules=1#fromSource" -``` - -Local source builds require initialized Git submodules and a flake URL with `submodules=1`, as shown above. For a remote source flake, use a Git URL with submodules enabled, such as `git+https://github.com/yuezk/GlobalProtect-openconnect?submodules=1#fromSource`. The `prebuilt` package and NixOS module do not require Git submodules. Build output (`target`, `.build`, and `node_modules`) is excluded from the source input. Updating release asset hashes changes the prebuilt package, independently of source builds. - -### Official Docker Image - -The [official Docker image](https://hub.docker.com/r/yuezk/globalprotect-openconnect) provides the CLI tools on Alpine Linux: - -```bash -docker pull yuezk/globalprotect-openconnect: -``` - -Release images are tagged as `vX.Y.Z`, `X.Y.Z`, and `latest`. - -Run it with access to the TUN device: +Run the CLI client in an official Alpine container: ```bash docker run --rm -it --cap-add=NET_ADMIN --device=/dev/net/tun \ - yuezk/globalprotect-openconnect: \ - connect -``` - -For browser authentication in a headless environment, use manual browser authentication: - -```bash -docker run --rm -it --cap-add=NET_ADMIN --device=/dev/net/tun \ - yuezk/globalprotect-openconnect: \ + yuezk/globalprotect-openconnect:latest \ connect --browser manual ``` -On a host with multiple network interfaces, use `--browser-listen` to select the IP address reachable from the browser machine: - -```bash -gpclient connect --browser manual --browser-listen 192.168.107.15 -``` - -On a Linux host, add host networking if the VPN routes should affect the host network namespace: - -```bash -docker run --rm -it --network host --cap-add=NET_ADMIN --device=/dev/net/tun \ - yuezk/globalprotect-openconnect: \ - connect --browser manual -``` - -Without `--network host`, the VPN connection stays inside the container's network namespace. Docker Desktop on macOS and Windows does not make the host use the VPN through `--network host`; run `gpclient` on the host or use a container gateway setup for host traffic. - -The image includes `gpclient` and `gpauth` only. It does not include embedded webview authentication, `gpgui-helper`, or `gpgui`. +*(Add `--network host` on Linux if VPN routes should apply to the host network).* ### Other Distributions -#### Manual Installation +Download `globalprotect-openconnect_${version}_${arch}.bin.tar.xz` from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page: -1. **Install dependencies:** - - WebKitGTK 4.1 (for example, `libwebkit2gtk-4.1-0` on Debian/Ubuntu) - - `libsecret` - - `libayatana-appindicator` or `libappindicator-gtk3` - - polkit (`pkexec`) for GUI-launched VPN connections - -2. **Download and extract:** - Download `globalprotect-openconnect_${version}_${arch}.bin.tar.xz` from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page: - ```bash - tar -xJf globalprotect-openconnect_${version}_${arch}.bin.tar.xz - cd globalprotect-openconnect_${version} - ``` - -3. **Install:** - ```bash - sudo make install - ``` +```bash +tar -xJf globalprotect-openconnect_*.bin.tar.xz +cd globalprotect-openconnect_* +sudo make install +``` ## Building from Source -The instructions below build the open-source components on Linux. For FreeBSD and OpenBSD, see [Building from Source on FreeBSD and OpenBSD](./docs/bsd-source-build.md). +### Prerequisites (Linux) -### Method 1: Using DevContainer +- [Rust](https://www.rust-lang.org/tools/install) 1.91 or later +- Build tools: `make`, `pkg-config`, `autoconf`, `automake`, `libtool`, `gettext` +- Libraries: `gmp`, `gnutls`, `nettle`, `libxml2`, `zlib`, `lz4`, `p11-kit`, `libsecret`, and `webkit2gtk-4.1` (or GTK 4 for Native Shell) +- Polkit (`pkexec`) for privileged tunnel setup -This project includes a DevContainer configuration for Linux development. The repository's `rust-toolchain.toml` selects the Rust toolchain; rustup may need to download it on the first build. +*(For FreeBSD and OpenBSD instructions, see [Building from Source on FreeBSD and OpenBSD](docs/bsd-source-build.md)).* -#### Prerequisites - -- [Docker](https://docs.docker.com/get-docker/) -- [Visual Studio Code](https://code.visualstudio.com/) (optional, for IDE support) -- [Dev Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) (if using VS Code) - -#### Build Steps - -1. **Clone the repository:** - ```bash - git clone https://github.com/yuezk/GlobalProtect-openconnect.git - cd GlobalProtect-openconnect - git submodule update --init --recursive - ``` - -2. **Build the DevContainer image:** - ```bash - docker build -t gpoc-devcontainer .devcontainer/ - ``` - -3. **Build the project:** - - To build the open-source components, including the GUI helper, run: - ```bash - docker run --privileged --cap-add=NET_ADMIN --device=/dev/net/tun \ - --tty -v "$(pwd)":/workspace -w /workspace gpoc-devcontainer \ - bash -c "export PATH=/usr/local/cargo/bin:\$PATH && make build" - ``` - To build without the GUI helper run the same command as above, but with `BUILD_GUI_HELPER=0` passed as an argument to `make`. - -4. **Locate build artifacts:** - - The compiled binaries will be available in `target/release/`: - - `gpclient` – CLI client - - `gpservice` – Background service - - `gpauth` – Authentication helper - - `gpgui-helper` – GUI helper - - `gp-hip-script-installer` – Privileged HIP script installer - - `gp-vpnc-script-installer` – Privileged VPN script installer - - The proprietary GP Connect desktop application is distributed separately. Use `INCLUDE_GUI=1` with `make build` to download its matching published Linux build for installation. - -#### Alternative: Using VS Code - -1. Open the project in VS Code -2. When prompted, click "Reopen in Container" (or run **Dev Containers: Reopen in Container**) -3. Once the container is ready, open a terminal and run: - ```bash - make build - ``` - -### Method 2: Local Development Build - -#### Prerequisites - -- [Rust 1.91 or later](https://www.rust-lang.org/tools/install) -- [Tauri dependencies](https://tauri.app/start/prerequisites/) -- OpenConnect source-build dependencies: `autoconf`, `automake`, `autopoint`/`gettext`, `libtool`, `patch`, `pkg-config`, `libxml2`, `zlib`, `lz4`, `gnutls`, `p11-kit`, `nettle`, and `gmp` development packages -- `pkexec` and `gnome-keyring` (or `pam_kwallet` on KDE) -- Node.js and pnpm if rebuilding the GUI helper frontend - -#### Build Steps - -1. **Download source code:** - - Download `globalprotect-openconnect-${version}.tar.gz` from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page. - -2. **Extract and build:** - ```bash - tar -xzf globalprotect-openconnect-${version}.tar.gz - cd globalprotect-openconnect-${version} - make build - ``` - -3. **Install:** - ```bash - sudo make install - ``` - - To stage the files for packaging instead of installing them into the system, use `make install DESTDIR=/absolute/path/to/staging`. - -### Testing Your Build - -Verify the CLI client is working correctly: +### Build Steps ```bash -./target/release/gpclient --help +git clone --recursive https://github.com/yuezk/GlobalProtect-openconnect.git +cd GlobalProtect-openconnect +make build +sudo make install ``` -### Build Options +**Build Options:** -- `BUILD_GUI_HELPER=0` – Skip building and installing the GUI helper -- `BUILD_WEBVIEW_AUTH=0` – Build `gpauth` without embedded browser authentication; use an external browser or manual authentication -- `INCLUDE_GUI=1` – Download the matching published Linux desktop application for installation -- `OFFLINE=1` – Build in offline mode using vendored dependencies +- `INCLUDE_GUI=1` – Download and install the matching desktop application bundle. +- `BUILD_WEBVIEW_AUTH=0` – Build `gpauth` without embedded browser authentication (uses external browser or manual mode). +- `BUILD_GUI_HELPER=0` – Skip building the helper UI. -## Frequently Asked Questions +## Troubleshooting -When reporting a problem, follow the [diagnostics collection instructions](docs/diagnostics.md). A standalone script is available for versions without the diagnostics command; you do not need to upgrade first. - -### Q: How do I resolve the "Secure Storage not ready" error? - -Unlock your desktop keyring and ensure the application can access it. On Linux and BSD, check that a keyring service such as GNOME Keyring is installed and running in your desktop session. On macOS, check Keychain access. - -Linux and BSD can use file storage when secure storage is unavailable during initial setup. An existing configuration that uses the keyring still needs access to that keyring. - -See related issues: [#321](https://github.com/yuezk/GlobalProtect-openconnect/issues/321), [#316](https://github.com/yuezk/GlobalProtect-openconnect/issues/316) - -### Q: How do I fix the "cannot open display" error when using CLI? - -Run the client from a terminal in your normal desktop session and use an external browser: - -```bash -sudo gpclient connect --browser -``` - -See related issue: [#316](https://github.com/yuezk/GlobalProtect-openconnect/issues/316) - -On a headless server, use `--browser manual` and complete authentication from another machine. +- **Headless / Remote Login**: When running without a desktop display or over SSH, use `--browser manual`. Open the printed URL in any browser and paste the callback URL back into the terminal. +- **Diagnostics**: If you encounter issues, run `gpclient diagnostics` or follow the [diagnostics guide](docs/diagnostics.md) when opening an issue. ## NetworkManager Integration @@ -555,14 +268,10 @@ On a headless server, use `--browser manual` and complete authentication from an ## Licensing -### Trial and Pricing +- **CLI (`gpclient`)**: Free and open source (GPL-3.0). +- **GUI (GP Connect)**: Commercial desktop application with a free trial. -The **CLI version** is completely free and open source. -The **GUI version** is a paid application with a **7-day trial**. Start the trial in the app by verifying your email address with a one-time code. Installing the app alone does not start the trial. - -### Open Source Licenses - -This project consists of multiple components, each with its own license: +### Open Source Components | Component | Type | License | |-----------|------|---------| diff --git a/apps/gpauth/Cargo.toml b/apps/gpauth/Cargo.toml index 11148cf..f92edb5 100644 --- a/apps/gpauth/Cargo.toml +++ b/apps/gpauth/Cargo.toml @@ -21,7 +21,6 @@ clap.workspace = true log.workspace = true serde_json.workspace = true tokio = { workspace = true, features = ["rt-multi-thread"] } -tempfile.workspace = true compile-time.workspace = true home = "0.5.12" @@ -33,3 +32,6 @@ tauri = { workspace = true, optional = true } default = ["webview-auth"] webview-auth = ["auth/webview-auth", "dep:tauri", "dep:tauri-build"] release-devtools = ["auth/release-devtools"] + +[dev-dependencies] +tempfile.workspace = true diff --git a/apps/gpauth/icons/128x128.png b/apps/gpauth/icons/128x128.png index f695805..81ae1f7 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 28fca23..97ca8cb 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 8cebbbb..2b69052 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 a01cd91..ce10b96 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 58c4cc2..f33305d 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 79084fa..3bb4415 100644 Binary files a/apps/gpauth/icons/icon.png and b/apps/gpauth/icons/icon.png differ diff --git a/apps/gpauth/src/cli.rs b/apps/gpauth/src/cli.rs index a29f37c..104b0d1 100644 --- a/apps/gpauth/src/cli.rs +++ b/apps/gpauth/src/cli.rs @@ -6,8 +6,6 @@ use clap::Parser; use clap::Subcommand; #[cfg(feature = "webview-auth")] use gpapi::auth::AuthWindowTheme; -#[cfg(not(target_os = "macos"))] -use gpapi::utils::openssl; use gpapi::{ auth::{AuthenticationCancelled, SamlAuthData, SamlAuthResult}, clap::{Args, InfoLevelVerbosity, args::Os, handle_error}, @@ -20,8 +18,6 @@ use gpapi::{ use log::info; use serde_json::json; use std::net::IpAddr; -#[cfg(not(target_os = "macos"))] -use tempfile::NamedTempFile; const VERSION: &str = concat!( env!("CARGO_PKG_VERSION"), @@ -89,7 +85,7 @@ struct Cli { key_password: Option, #[cfg(not(target_os = "macos"))] - #[arg(long, help = "Get around the OpenSSL `unsafe legacy renegotiation` error")] + #[arg(long, hide = true)] fix_openssl: bool, #[arg(long, help = "Ignore TLS errors")] @@ -149,11 +145,6 @@ enum CliCommand { } impl Args for Cli { - #[cfg(not(target_os = "macos"))] - fn fix_openssl(&self) -> bool { - self.fix_openssl - } - fn ignore_tls_errors(&self) -> bool { self.ignore_tls_errors } @@ -164,19 +155,12 @@ impl Args for Cli { } impl Cli { - #[cfg(not(target_os = "macos"))] - fn prepare_openssl(&self) -> anyhow::Result> { + async fn run(&self) -> anyhow::Result<()> { + #[cfg(not(target_os = "macos"))] if self.fix_openssl { - info!("Fixing OpenSSL environment"); - let file = openssl::fix_openssl_env()?; - - return Ok(Some(file)); + log::warn!("--fix-openssl is deprecated and has no effect. It will be removed in a future release."); } - Ok(None) - } - - async fn run(&self) -> anyhow::Result<()> { if self.browser_listen.is_some() && !matches!(self.browser.as_deref(), Some(browser) if browser.eq_ignore_ascii_case("manual") || browser.eq_ignore_ascii_case("remote")) { @@ -189,8 +173,6 @@ impl Cli { #[cfg(feature = "webview-auth")] gpapi::utils::env_utils::patch_gui_runtime_env(self.hidpi); - #[cfg(not(target_os = "macos"))] - let openssl_conf = self.prepare_openssl()?; let server = normalize_server(self.server.as_deref().expect("server is required for authentication"))?; let gp_params = self.build_gp_params(); @@ -230,8 +212,6 @@ impl Cli { print_auth_result(auth_result, Some(&auth_host_id)); - #[cfg(not(target_os = "macos"))] - drop(openssl_conf); return Ok(()); } @@ -243,8 +223,6 @@ impl Cli { self.clean, self.window_title.clone(), self.window_theme, - #[cfg(not(target_os = "macos"))] - openssl_conf, ) .await?; @@ -263,13 +241,10 @@ impl Cli { fn build_os_profile(&self) -> OsProfile { let mut builder = OsProfile::builder(ClientOs::from(self.os)); - if let Some(host_id) = self.host_id.as_deref() { - builder = builder.host_id_override(host_id); - } if let Some(client_version) = self.client_version.as_deref() { builder = builder.client_version(client_version); } - builder.build() + gpapi::os_profile::desktop::collect_profile(builder, self.host_id.as_deref()) } fn external_browser_requested(&self) -> bool { @@ -341,9 +316,13 @@ mod tests { use super::*; #[test] - fn openssl_option_is_available_only_on_supported_platforms() { + fn deprecated_openssl_option_remains_supported_but_hidden() { let result = Cli::try_parse_from(["gpauth", "portal.example.com", "--fix-openssl"]); assert_eq!(result.is_ok(), !cfg!(target_os = "macos")); + for flag in ["-h", "--help"] { + let help = Cli::try_parse_from(["gpauth", flag]).err().unwrap().to_string(); + assert!(!help.contains("--fix-openssl")); + } } #[test] @@ -351,12 +330,12 @@ mod tests { use gpapi::error::ServerTlsErrorKind; let tls = ServerTlsError { server: "https://vpn.example.com".into(), - kind: ServerTlsErrorKind::LegacyRenegotiation, + kind: ServerTlsErrorKind::Certificate, }; let outcome = auth_outcome(Err(anyhow::Error::new(tls).context("retry failed")), None); assert_eq!( serde_json::to_value(outcome).unwrap(), - json!({"serverTlsError": {"server": "https://vpn.example.com", "kind": "legacyRenegotiation"}}) + json!({"serverTlsError": {"server": "https://vpn.example.com", "kind": "certificate"}}) ); assert_eq!( serde_json::to_value(auth_outcome(Err(anyhow::anyhow!("rejected")), None)).unwrap(), diff --git a/apps/gpauth/src/webview_auth.rs b/apps/gpauth/src/webview_auth.rs index 4a836bc..c86ed81 100644 --- a/apps/gpauth/src/webview_auth.rs +++ b/apps/gpauth/src/webview_auth.rs @@ -1,11 +1,5 @@ use auth::{WebviewAuthenticator, apply_auth_theme}; use gpapi::{auth::AuthWindowTheme, gp_params::GpParams}; -#[cfg(not(target_os = "macos"))] -use log::info; -#[cfg(not(target_os = "macos"))] -use tauri::RunEvent; -#[cfg(not(target_os = "macos"))] -use tempfile::NamedTempFile; use crate::cli::print_auth_result; @@ -16,7 +10,6 @@ pub async fn authenticate( clean: bool, window_title: Option, window_theme: AuthWindowTheme, - #[cfg(not(target_os = "macos"))] mut openssl_conf: Option, ) -> anyhow::Result<()> { let auth_host_id = gp_params.os_profile().host_identity().host_id().to_string(); @@ -46,16 +39,7 @@ pub async fn authenticate( Ok(()) }) .build(crate::tauri_context::get())? - .run(move |_app_handle, _event| { - #[cfg(not(target_os = "macos"))] - if let RunEvent::Exit = _event { - if let Some(file) = openssl_conf.take() { - if let Err(err) = file.close() { - info!("Error closing OpenSSL config file: {}", err); - } - } - } - }); + .run(|_, _| {}); Ok(()) } diff --git a/apps/gpauth/tests/deprecated_cli.rs b/apps/gpauth/tests/deprecated_cli.rs new file mode 100644 index 0000000..f60dedd --- /dev/null +++ b/apps/gpauth/tests/deprecated_cli.rs @@ -0,0 +1,40 @@ +#![cfg(not(target_os = "macos"))] + +use std::process::Command; + +#[test] +fn deprecated_flag_warns_without_changing_auth_output_or_configuration() { + const WARNING: &str = "--fix-openssl is deprecated and has no effect. It will be removed in a future release."; + let directory = tempfile::tempdir().unwrap(); + let configuration = directory.path().join("openssl.cnf"); + std::fs::write(&configuration, "existing user configuration").unwrap(); + for deprecated in [false, true] { + let mut command = Command::new(env!("CARGO_BIN_EXE_gpauth")); + command.arg("portal.example.com"); + if deprecated { + command.arg("--fix-openssl"); + } + // Reject invalid options before authentication, without making a network request. + let output = command + .args(["--browser-listen", "127.0.0.1", "--log-format", "json"]) + .env("OPENSSL_CONF", &configuration) + .output() + .unwrap(); + assert!(!output.status.success()); + assert!(output.stdout.is_empty()); + let logs = String::from_utf8(output.stderr).unwrap(); + let records = logs + .lines() + .map(|line| serde_json::from_str::(line).unwrap()) + .collect::>(); + assert_eq!( + records.iter().filter(|record| record["message"] == WARNING).count(), + usize::from(deprecated) + ); + assert!(logs.contains("requires '--browser manual'")); + assert_eq!( + std::fs::read_to_string(&configuration).unwrap(), + "existing user configuration" + ); + } +} diff --git a/apps/gpclient/Cargo.toml b/apps/gpclient/Cargo.toml index e927499..9bae06d 100644 --- a/apps/gpclient/Cargo.toml +++ b/apps/gpclient/Cargo.toml @@ -28,8 +28,6 @@ sysinfo.workspace = true serde.workspace = true serde_json.workspace = true whoami.workspace = true -tempfile.workspace = true -reqwest.workspace = true directories.workspace = true compile-time.workspace = true uzers.workspace = true @@ -40,3 +38,6 @@ webview-auth = ["gpapi/webview-auth"] [target.'cfg(target_os = "macos")'.dependencies] gpvpnc = { path = "../../crates/gpvpnc" } + +[dev-dependencies] +tempfile.workspace = true diff --git a/apps/gpclient/src/cli.rs b/apps/gpclient/src/cli.rs index 32a990c..8233674 100644 --- a/apps/gpclient/src/cli.rs +++ b/apps/gpclient/src/cli.rs @@ -5,16 +5,12 @@ use std::{ use anyhow::bail; use clap::{Parser, Subcommand}; -#[cfg(not(target_os = "macos"))] -use gpapi::utils::openssl; use gpapi::{ clap::{Args, InfoLevelVerbosity, handle_error}, log_format::{LogFormat, write_json_record}, }; use log::info; use sysinfo::{Pid, System}; -#[cfg(not(target_os = "macos"))] -use tempfile::NamedTempFile; use tokio::fs; use crate::{ @@ -36,8 +32,6 @@ const VERSION: &str = concat!( ); pub(crate) struct SharedArgs<'a> { - #[cfg(not(target_os = "macos"))] - pub(crate) fix_openssl: bool, pub(crate) ignore_tls_errors: bool, pub(crate) lock_file: &'a Path, pub(crate) verbose: &'a InfoLevelVerbosity, @@ -96,10 +90,7 @@ struct Cli { command: CliCommand, #[cfg(not(target_os = "macos"))] - #[arg( - long, - help = "Uses extended compatibility mode for OpenSSL operations to support a broader range of systems and formats." - )] + #[arg(long, hide = true)] fix_openssl: bool, #[arg(long, help = "Ignore the TLS errors")] ignore_tls_errors: bool, @@ -127,11 +118,6 @@ struct Cli { } impl Args for Cli { - #[cfg(not(target_os = "macos"))] - fn fix_openssl(&self) -> bool { - self.fix_openssl - } - fn ignore_tls_errors(&self) -> bool { self.ignore_tls_errors } @@ -169,17 +155,14 @@ impl Cli { .unwrap_or(false) } - #[cfg(not(target_os = "macos"))] - fn fix_openssl(&self) -> anyhow::Result> { - if self.fix_openssl { - let file = openssl::fix_openssl_env()?; - return Ok(Some(file)); + async fn run(&self) -> anyhow::Result<()> { + #[cfg(not(target_os = "macos"))] + if self.fix_openssl + && !(matches!(&self.command, CliCommand::Connect(args) if args.background) && self.background_worker_fd.is_none()) + { + log::warn!("--fix-openssl is deprecated and has no effect. It will be removed in a future release."); } - Ok(None) - } - - async fn run(&self) -> anyhow::Result<()> { if let CliCommand::Connect(args) = &self.command { if args.dashboard { crate::dashboard::validate(self.log_format)?; @@ -214,13 +197,7 @@ impl Cli { None }; - // The temp file will be dropped automatically when the file handle is dropped - // So, declare it here to ensure it's not dropped - #[cfg(not(target_os = "macos"))] - let _file = self.fix_openssl()?; let shared_args = SharedArgs { - #[cfg(not(target_os = "macos"))] - fix_openssl: self.fix_openssl, ignore_tls_errors: self.ignore_tls_errors, lock_file: &self.lock_file, verbose: &self.verbose, @@ -243,7 +220,7 @@ impl Cli { CliCommand::Hip(args) => HipHandler::new(args).handle().await, CliCommand::Diagnostics(_) => unreachable!("diagnostics is dispatched before VPN setup"), CliCommand::DetectInternalHost { address, hostname } => { - let internal = gpapi::session::network::native::detect_in_helper(*address, hostname)?; + let internal = gpapi::session::desktop::network::native::detect_in_helper(*address, hostname)?; println!("{}", serde_json::to_string(&internal)?); Ok(()) } @@ -252,7 +229,7 @@ impl Cli { port, disable_ipv6, } => { - let addresses = gpapi::session::network::native::lookup_in_helper(host, *port, *disable_ipv6)?; + let addresses = gpapi::session::desktop::network::native::lookup_in_helper(host, *port, *disable_ipv6)?; println!("{}", serde_json::to_string(&addresses)?); Ok(()) } @@ -370,9 +347,13 @@ mod tests { } #[test] - fn openssl_option_is_available_only_on_supported_platforms() { + fn deprecated_openssl_option_remains_supported_but_hidden() { let result = Cli::try_parse_from(["gpclient", "--fix-openssl", "diagnostics"]); assert_eq!(result.is_ok(), !cfg!(target_os = "macos")); + for flag in ["-h", "--help"] { + let help = Cli::try_parse_from(["gpclient", flag]).err().unwrap().to_string(); + assert!(!help.contains("--fix-openssl")); + } } #[test] diff --git a/apps/gpclient/src/connect/args.rs b/apps/gpclient/src/connect/args.rs index 493f06b..0d5de04 100644 --- a/apps/gpclient/src/connect/args.rs +++ b/apps/gpclient/src/connect/args.rs @@ -203,10 +203,7 @@ pub(super) fn build_os_profile_with_host_id(args: &ConnectArgs, host_id: Option< if let Some(local_hostname) = args.local_hostname.as_deref() { builder = builder.computer_name_override(local_hostname.to_string()); } - if let Some(host_id) = host_id { - builder = builder.host_id_override(host_id); - } - builder.build() + gpapi::os_profile::desktop::collect_profile(builder, host_id) } pub(super) fn cookie_cache_path(args: &ConnectArgs) -> Option { @@ -489,14 +486,9 @@ mod tests { ("ipv4", GatewayIpPreference::Ipv4), ("ipv6", GatewayIpPreference::Ipv6), ] { - let cli = ConnectArgsTestCli::try_parse_from([ - "test", - "portal.example.com", - "--ip-preference", - value, - "--disable-ipv6", - ]) - .unwrap(); + let cli = + ConnectArgsTestCli::try_parse_from(["test", "portal.example.com", "--ip-preference", value, "--disable-ipv6"]) + .unwrap(); assert_eq!(cli.args.ip_preference, expected); assert!(cli.args.disable_ipv6); } diff --git a/apps/gpclient/src/connect/credential.rs b/apps/gpclient/src/connect/credential.rs index 276f347..dc0b850 100644 --- a/apps/gpclient/src/connect/credential.rs +++ b/apps/gpclient/src/connect/credential.rs @@ -138,9 +138,6 @@ impl ConnectHandler<'_> { .log_format(self.shared_args.log_format) .verbose(verbose); - #[cfg(not(target_os = "macos"))] - let auth_launcher = auth_launcher.fix_openssl(self.shared_args.fix_openssl); - #[cfg(feature = "webview-auth")] let use_default_browser = external_browser_supported && self.args.default_browser; #[cfg(feature = "webview-auth")] diff --git a/apps/gpclient/src/connect/flow_tests.rs b/apps/gpclient/src/connect/flow_tests.rs index a6c3df4..8ace769 100644 --- a/apps/gpclient/src/connect/flow_tests.rs +++ b/apps/gpclient/src/connect/flow_tests.rs @@ -98,8 +98,6 @@ async fn cached_tunnel_authentication_does_not_require_portal_discovery() { let lock = directory.path().join("client.pid"); let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0); let shared = SharedArgs { - #[cfg(not(target_os = "macos"))] - fix_openssl: false, ignore_tls_errors: true, lock_file: &lock, verbose: &verbose, @@ -144,8 +142,6 @@ async fn internal_tunnel_keeps_gateway_authentication_after_portal_cookie_reject let lock = directory.path().join("client.pid"); let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0); let shared = SharedArgs { - #[cfg(not(target_os = "macos"))] - fix_openssl: false, ignore_tls_errors: true, lock_file: &lock, verbose: &verbose, @@ -192,8 +188,6 @@ async fn rendering_recovery_fetches_new_prelogin_metadata_and_preserves_gateway_ let lock = directory.path().join("client.pid"); let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0); let shared = SharedArgs { - #[cfg(not(target_os = "macos"))] - fix_openssl: false, ignore_tls_errors: true, lock_file: &lock, verbose: &verbose, @@ -227,8 +221,6 @@ async fn cancellation_during_recovery_prelogin_stops_request() { let lock = directory.path().join("client.pid"); let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0); let shared = SharedArgs { - #[cfg(not(target_os = "macos"))] - fix_openssl: false, ignore_tls_errors: true, lock_file: &lock, verbose: &verbose, @@ -295,8 +287,6 @@ async fn auth_crash_uses_fresh_saml_and_clean_once_with_shared_budget() { let lock = directory.path().join("client.pid"); let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0); let shared = SharedArgs { - #[cfg(not(target_os = "macos"))] - fix_openssl: false, ignore_tls_errors: true, lock_file: &lock, verbose: &verbose, @@ -355,8 +345,6 @@ async fn exhausted_auth_recovery_is_terminal_before_portal_gateway_fallback() { let lock = directory.path().join("client.pid"); let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0); let shared = SharedArgs { - #[cfg(not(target_os = "macos"))] - fix_openssl: false, ignore_tls_errors: true, lock_file: &lock, verbose: &verbose, @@ -503,8 +491,6 @@ printf '%s\n' '{"success":{"username":"alice","preloginCookie":"new-cookie"}}' let lock = directory.join("client.pid"); let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0); let shared = SharedArgs { - #[cfg(not(target_os = "macos"))] - fix_openssl: false, ignore_tls_errors: true, lock_file: &lock, verbose: &verbose, diff --git a/apps/gpclient/src/connect/gateway.rs b/apps/gpclient/src/connect/gateway.rs index 3560826..5c8652b 100644 --- a/apps/gpclient/src/connect/gateway.rs +++ b/apps/gpclient/src/connect/gateway.rs @@ -360,22 +360,26 @@ impl ConnectHandler<'_> { match login { GatewayLogin::Authenticated(authentication) => { let descriptor = Gateway::new(gateway.to_string(), gateway.to_string()); - client.register_session( - descriptor.clone(), - authentication.clone(), - &mut self.sessions.borrow_mut(), - ); + self + .sessions + .borrow_mut() + .register_login(descriptor.clone(), authentication.clone(), &client); self.check_cancelled()?; - if internal && authentication.mode() == SessionMode::NonTunnel && !self.args.cookie_only { - client - .bind_non_tunnel(self.args.disable_ipv6, None, &cancellation) - .await - .map_err(|error| error.context(gpapi::gateway::GatewayLoginProtocolError))?; - client.update_registered_session(&descriptor, &authentication, &mut self.sessions.borrow_mut()); - } + let binding = if internal && authentication.mode() == SessionMode::NonTunnel && !self.args.cookie_only { + Some( + self + .sessions + .borrow_mut() + .bind_non_tunnel(&descriptor, &client, self.args.disable_ipv6, None, &cancellation) + .await + .map_err(|error| error.context(gpapi::gateway::GatewayLoginProtocolError))?, + ) + } else { + None + }; return Ok(GatewayLoginSession { authentication, - extension_auth: SessionExtensionAuth::new(cred.clone(), client), + extension_auth: SessionExtensionAuth::new(cred.clone(), client).with_binding(binding), }); } GatewayLogin::Mfa(message, input_str) => { diff --git a/apps/gpclient/src/connect/internal.rs b/apps/gpclient/src/connect/internal.rs index b818e6d..8e0e9a0 100644 --- a/apps/gpclient/src/connect/internal.rs +++ b/apps/gpclient/src/connect/internal.rs @@ -2,14 +2,14 @@ use std::sync::Arc; use anyhow::{Context, bail, ensure}; use gpapi::{ + collection::CollectionControl, credential::AuthCookieCredential, gateway::{Gateway, GatewayLoginContext, GatewaySelection}, portal::PortalConfig, - process::collection::CollectionControl, session::{ MaintenanceState, SessionEndReason, SessionMode, - network::PhysicalNetwork, - non_tunnel::{SessionCallbacks, SessionExit, maintain_non_tunnel_sessions}, + desktop::network::PhysicalNetwork, + desktop::non_tunnel::{SessionCallbacks, SessionExit, maintain_non_tunnel_sessions}, }, }; use log::{info, warn}; diff --git a/apps/gpclient/src/connect/mod.rs b/apps/gpclient/src/connect/mod.rs index e78999e..f5aec04 100644 --- a/apps/gpclient/src/connect/mod.rs +++ b/apps/gpclient/src/connect/mod.rs @@ -19,8 +19,8 @@ use gpapi::{ gateway::GatewaySelection, gp_params::GpParams, os_profile::OsProfile, - portal::{PreloginOptions, prelogin, retrieve_config}, - session::GatewaySessions, + portal::{PreloginOptions, discovery::discover, prelogin}, + session::desktop::GatewaySessions, utils::request::RequestIdentityError, }; use inquire::{Password, PasswordDisplayMode, Select}; @@ -185,11 +185,11 @@ impl<'a> ConnectHandler<'a> { match identity_error { RequestIdentityError::UnsupportedEncryption - | RequestIdentityError::LegacyKeyConversion(_) | RequestIdentityError::UnsupportedKeyFormat | RequestIdentityError::InvalidKey | RequestIdentityError::InvalidCertificate | RequestIdentityError::IncompletePkcs12 + | RequestIdentityError::AmbiguousPkcs12 | RequestIdentityError::InvalidPkcs12(_) => return Err(err), RequestIdentityError::NoKey => { let format = self.shared_args.log_format; @@ -282,7 +282,7 @@ impl<'a> ConnectHandler<'a> { let cached = self.cached_portal_credential(portal); let cached_config = match cached { - Some(cred) => match retrieve_config(portal, &cred, &gp_params, &self.cancellation).await { + Some(cred) => match discover(portal, &cred, &gp_params, &self.cancellation).await { Ok(config) => Some((cred, config)), Err(error) => { self.check_cancelled()?; @@ -301,7 +301,7 @@ impl<'a> ConnectHandler<'a> { .await?; prelogin = replacement; self.check_cancelled()?; - let config = retrieve_config(portal, &cred, &gp_params, &self.cancellation).await?; + let config = discover(portal, &cred, &gp_params, &self.cancellation).await?; (cred, config) } }; diff --git a/apps/gpclient/src/dashboard/layout.rs b/apps/gpclient/src/dashboard/layout.rs index 290a044..0a4a95a 100644 --- a/apps/gpclient/src/dashboard/layout.rs +++ b/apps/gpclient/src/dashboard/layout.rs @@ -1,6 +1,8 @@ //! Dashboard presentation only; connection ownership and sampling stay outside this module. use crossterm::event::KeyCode; -use gpapi::session::tunnel::{TunnelList, TunnelPhase, TunnelState, TunnelStatisticsSnapshot, TunnelStatisticsState}; +use gpapi::session::desktop::tunnel::{ + TunnelList, TunnelPhase, TunnelState, TunnelStatisticsSnapshot, TunnelStatisticsState, +}; use ratatui::{ Frame, buffer::Buffer, @@ -338,7 +340,7 @@ pub(super) fn render_tunnel( #[cfg(test)] mod tests { - use gpapi::session::tunnel::{TunnelStatistics, TunnelStatisticsView, TunnelTransport}; + use gpapi::session::desktop::tunnel::{TunnelStatistics, TunnelStatisticsView, TunnelTransport}; use ratatui::{Terminal, backend::TestBackend}; use super::*; diff --git a/apps/gpclient/src/dashboard/screen.rs b/apps/gpclient/src/dashboard/screen.rs index 75f0533..7462829 100644 --- a/apps/gpclient/src/dashboard/screen.rs +++ b/apps/gpclient/src/dashboard/screen.rs @@ -15,7 +15,7 @@ use crossterm::{ execute, terminal::{EnterAlternateScreen, LeaveAlternateScreen, disable_raw_mode, enable_raw_mode}, }; -use gpapi::session::tunnel::TunnelPhase; +use gpapi::session::desktop::tunnel::TunnelPhase; use log::Level; use nix::unistd::{getpgrp, tcgetpgrp}; use ratatui::{ @@ -317,7 +317,7 @@ fn footer_text(logs: bool, ending: &str, scrollable: bool, width: u16) -> Paragr fn notice_for_status( notice: Option, phase: TunnelPhase, - transport: gpapi::session::tunnel::TunnelTransport, + transport: gpapi::session::desktop::tunnel::TunnelTransport, ) -> Notice { notice.unwrap_or_else(|| Notice { level: Level::Info, @@ -345,7 +345,7 @@ mod tests { #[test] fn status_transitions_cannot_overwrite_an_existing_warning() { - use gpapi::session::tunnel::TunnelTransport; + use gpapi::session::desktop::tunnel::TunnelTransport; let warning = Notice { level: Level::Warn, message: "ESP unavailable; using SSL".into(), diff --git a/apps/gpclient/src/hip.rs b/apps/gpclient/src/hip.rs index b733351..ac91c32 100644 --- a/apps/gpclient/src/hip.rs +++ b/apps/gpclient/src/hip.rs @@ -3,8 +3,8 @@ use std::time::Duration; use clap::Args; use gpapi::{ clap::args::Os, + collection::CollectionBudget, os_profile::{ClientOs, OsProfileBuilder}, - process::collection::CollectionBudget, }; use gphip::{ReportContext, ReportInput, generate_report_with_control}; @@ -51,11 +51,12 @@ impl<'a> HipHandler<'a> { if let Some(os_version) = self.args.os_version.as_deref() { builder = builder.os_version(os_version); } - if let Some(host_id) = self.args.host_id.as_deref() { - builder = builder.host_id_override(host_id); - } let input = ReportInput { - profile: builder.build_with_control(&budget)?, + profile: gpapi::os_profile::desktop::collect_profile_with_control( + builder, + self.args.host_id.as_deref(), + &budget, + )?, context: ReportContext::Connected { cookie: self.args.cookie.clone(), client_ip: self.args.client_ip.clone(), diff --git a/apps/gpclient/src/launch_gui.rs b/apps/gpclient/src/launch_gui.rs index bef2bea..5109745 100644 --- a/apps/gpclient/src/launch_gui.rs +++ b/apps/gpclient/src/launch_gui.rs @@ -11,7 +11,7 @@ use clap::Args; #[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd", test))] use common::binary_paths; use directories::ProjectDirs; -use gpapi::{process::desktop_launcher::DesktopLauncher, utils::endpoint::http_endpoint}; +use gpapi::process::desktop_launcher::DesktopLauncher; use log::info; #[derive(Args)] @@ -61,7 +61,7 @@ impl<'a> LaunchGuiHandler<'a> { return forward_auth_callback(callback); } - if try_active_gui().await.is_ok() { + if DesktopLauncher::activate_existing().await.is_ok() { info!("The GUI is already running"); return Ok(()); } @@ -115,18 +115,6 @@ fn parse_auth_callback(callback: &str) -> Result { .ok_or_else(|| "callback URL must use the globalprotectcallback scheme".to_owned()) } -async fn try_active_gui() -> anyhow::Result<()> { - let service_endpoint = http_endpoint().await?; - - reqwest::Client::default() - .post(format!("{}/active-gui", service_endpoint)) - .send() - .await? - .error_for_status()?; - - Ok(()) -} - fn get_log_file() -> anyhow::Result { let dirs = ProjectDirs::from("com.yuezk", "GlobalProtect-openconnect", "gpclient") .ok_or_else(|| anyhow::anyhow!("Failed to get project dirs"))?; diff --git a/apps/gpclient/src/session.rs b/apps/gpclient/src/session.rs index 1e972c4..507bdd3 100644 --- a/apps/gpclient/src/session.rs +++ b/apps/gpclient/src/session.rs @@ -182,9 +182,10 @@ mod tests { #[test] fn builds_session_context_from_os_profile() { - let profile = OsProfile::builder(gpapi::os_profile::ClientOs::Mac) - .client_version("6.3.1-12".to_string()) - .build(); + let profile = gpapi::os_profile::desktop::collect_profile( + OsProfile::builder(gpapi::os_profile::ClientOs::Mac).client_version("6.3.1-12".to_string()), + None, + ); let expected_user_agent = profile.user_agent().to_string(); let ctx = build_session_context(SessionContextInput { diff --git a/apps/gpclient/tests/deprecated_cli.rs b/apps/gpclient/tests/deprecated_cli.rs new file mode 100644 index 0000000..fe615fe --- /dev/null +++ b/apps/gpclient/tests/deprecated_cli.rs @@ -0,0 +1,38 @@ +#![cfg(not(target_os = "macos"))] + +use std::process::Command; + +#[test] +fn background_worker_warns_once_for_the_deprecated_flag() { + const WARNING: &str = "--fix-openssl is deprecated and has no effect. It will be removed in a future release."; + let directory = tempfile::tempdir().unwrap(); + for deprecated in [false, true] { + let log = directory.path().join(format!("background-{deprecated}.log")); + let mut command = Command::new(env!("CARGO_BIN_EXE_gpclient")); + if deprecated { + command.arg("--fix-openssl"); + } + let output = command + .arg("--lock-file") + .arg(directory.path().join("client.pid")) + .args([ + "--log-format", + "json", + "connect", + "vpn.example.test", + "--background", + "--certificate", + ]) + // Fail identity preparation before authentication or a network connection. + .arg(directory.path().join("missing.pem")) + .arg("--log-file") + .arg(&log) + .output() + .unwrap(); + assert!(!output.status.success()); + let mut records = String::from_utf8(output.stderr).unwrap(); + records.push_str(&std::fs::read_to_string(log).unwrap()); + assert!(records.contains("Failed to read client identity"), "{records}"); + assert_eq!(records.matches(WARNING).count(), usize::from(deprecated), "{records}"); + } +} diff --git a/apps/gpclient/tests/diagnostics.rs b/apps/gpclient/tests/diagnostics.rs index e1e2b04..ddda1bb 100644 --- a/apps/gpclient/tests/diagnostics.rs +++ b/apps/gpclient/tests/diagnostics.rs @@ -73,5 +73,11 @@ async fn embedded_collector_reports_missing_helpers_without_recursing_or_exposin report["fields"]["env.XDG_CURRENT_DESKTOP"]["value"], "TestDesktop Injected: secret" ); - assert!(!String::from_utf8_lossy(&output.stderr).contains("Using 'UnsafeLegacyServerConnect'")); + #[cfg(not(target_os = "macos"))] + assert_eq!( + String::from_utf8_lossy(&output.stderr) + .matches("--fix-openssl is deprecated and has no effect. It will be removed in a future release.") + .count(), + 1 + ); } diff --git a/apps/gpgui-helper/README.md b/apps/gpgui-helper/README.md index 102e366..c12e8db 100644 --- a/apps/gpgui-helper/README.md +++ b/apps/gpgui-helper/README.md @@ -1,7 +1,36 @@ -# Tauri + React + Typescript +# GP Connect download helper -This template should help get you started developing with Tauri, React and Typescript in Vite. +The desktop supervisor launches this window when the selected GUI is missing or +has an incompatible version. It downloads the selected Tauri or Native Shell +interface and requests installation through the service. Launches require the +existing service credential and lifetime channel on stdin. -## Recommended IDE Setup +## Appearance -- [VS Code](https://code.visualstudio.com/) + [Tauri](https://marketplace.visualstudio.com/items?itemName=tauri-apps.tauri-vscode) + [rust-analyzer](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer) +`--theme system|light|dark` controls this window only. The default is `system`, +which follows system appearance and changes while the window is open. Explicit +`light` and `dark` modes override system appearance for that launch. Nothing is +saved by the helper. + +Initial downloads follow the system. During Linux Tauri/Native Shell switches, +Desktop Core supplies the running app's saved theme choice to the supervisor, +which forwards it to the helper. There is no `--helper-theme` option on +`gpclient launch-gui`. + +The native window and web content use the selected appearance before the window +is shown. Browser previews follow the system when no native mode is supplied. + +## Development + +```sh +pnpm build +pnpm test +``` + +The built `dist/` assets are tracked and must be rebuilt after frontend changes. +Run Rust checks and helper tests from the `gp` repository: + +```sh +cargo check -p gpgui-helper +cargo test -p gpgui-helper --lib +``` diff --git a/apps/gpgui-helper/dist/assets/icon-small-BO4dlTNl.svg b/apps/gpgui-helper/dist/assets/icon-small-BO4dlTNl.svg deleted file mode 100644 index 592bec9..0000000 --- a/apps/gpgui-helper/dist/assets/icon-small-BO4dlTNl.svg +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/apps/gpgui-helper/dist/assets/icon-small-DFuJkDph.svg b/apps/gpgui-helper/dist/assets/icon-small-DFuJkDph.svg new file mode 100644 index 0000000..6181301 --- /dev/null +++ b/apps/gpgui-helper/dist/assets/icon-small-DFuJkDph.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/gpgui-helper/dist/assets/main-BU3mus1z.js b/apps/gpgui-helper/dist/assets/main-BJvLW_Ih.js similarity index 71% rename from apps/gpgui-helper/dist/assets/main-BU3mus1z.js rename to apps/gpgui-helper/dist/assets/main-BJvLW_Ih.js index af4e003..9f076c0 100644 --- a/apps/gpgui-helper/dist/assets/main-BU3mus1z.js +++ b/apps/gpgui-helper/dist/assets/main-BJvLW_Ih.js @@ -1,9 +1,9 @@ -var e=(e,t)=>()=>(t||(e((t={exports:{}}).exports,t),e=null),t.exports);(function(){let e=document.createElement(`link`).relList;if(e&&e.supports&&e.supports(`modulepreload`))return;for(let e of document.querySelectorAll(`link[rel="modulepreload"]`))n(e);new MutationObserver(e=>{for(let t of e)if(t.type===`childList`)for(let e of t.addedNodes)e.tagName===`LINK`&&e.rel===`modulepreload`&&n(e)}).observe(document,{childList:!0,subtree:!0});function t(e){let t={};return e.integrity&&(t.integrity=e.integrity),e.referrerPolicy&&(t.referrerPolicy=e.referrerPolicy),t.credentials=e.crossOrigin===`use-credentials`?`include`:e.crossOrigin===`anonymous`?`omit`:`same-origin`,t}function n(e){if(e.ep)return;e.ep=!0;let n=t(e);fetch(e.href,n)}})();var t=e((e=>{function t(e,t){var n=e.length;e.push(t);a:for(;0>>1,a=e[r];if(0>>1;ri(c,n))li(u,c)?(e[r]=u,e[l]=n,r=l):(e[r]=c,e[s]=n,r=s);else if(li(u,n))e[r]=u,e[l]=n,r=l;else break a}}return t}function i(e,t){var n=e.sortIndex-t.sortIndex;return n===0?e.id-t.id:n}if(e.unstable_now=void 0,typeof performance==`object`&&typeof performance.now==`function`){var a=performance;e.unstable_now=function(){return a.now()}}else{var o=Date,s=o.now();e.unstable_now=function(){return o.now()-s}}var c=[],l=[],u=1,d=null,f=3,p=!1,m=!1,h=!1,g=!1,_=typeof setTimeout==`function`?setTimeout:null,v=typeof clearTimeout==`function`?clearTimeout:null,y=typeof setImmediate<`u`?setImmediate:null;function b(e){for(var i=n(l);i!==null;){if(i.callback===null)r(l);else if(i.startTime<=e)r(l),i.sortIndex=i.expirationTime,t(c,i);else break;i=n(l)}}function ee(e){if(h=!1,b(e),!m){if(n(c)!==null)m=!0,x||(x=!0,ie());else{var t=n(l);t!==null&&se(ee,t.startTime-e)}}}var x=!1,te=-1,ne=5,S=-1;function re(){return g?!0:!(e.unstable_now()-St&&re());){var o=d.callback;if(typeof o==`function`){d.callback=null,f=d.priorityLevel;var s=o(d.expirationTime<=t);if(t=e.unstable_now(),typeof s==`function`){d.callback=s,b(t),i=!0;break b}d===n(c)&&r(c),b(t)}else r(c);d=n(c)}if(d!==null)i=!0;else{var u=n(l);u!==null&&se(ee,u.startTime-t),i=!1}}break a}finally{d=null,f=a,p=!1}i=void 0}}finally{i?ie():x=!1}}}var ie;if(typeof y==`function`)ie=function(){y(C)};else if(typeof MessageChannel<`u`){var ae=new MessageChannel,oe=ae.port2;ae.port1.onmessage=C,ie=function(){oe.postMessage(null)}}else ie=function(){_(C,0)};function se(t,n){te=_(function(){t(e.unstable_now())},n)}e.unstable_IdlePriority=5,e.unstable_ImmediatePriority=1,e.unstable_LowPriority=4,e.unstable_NormalPriority=3,e.unstable_Profiling=null,e.unstable_UserBlockingPriority=2,e.unstable_cancelCallback=function(e){e.callback=null},e.unstable_forceFrameRate=function(e){0>e||125o?(r.sortIndex=a,t(l,r),n(c)===null&&r===n(l)&&(h?(v(te),te=-1):h=!0,se(ee,a-o))):(r.sortIndex=s,t(c,r),m||p||(m=!0,x||(x=!0,ie()))),r},e.unstable_shouldYield=re,e.unstable_wrapCallback=function(e){var t=f;return function(){var n=f;f=t;try{return e.apply(this,arguments)}finally{f=n}}}})),n=e(((e,n)=>{n.exports=t()})),r=e((e=>{var t=Symbol.for(`react.transitional.element`),n=Symbol.for(`react.portal`),r=Symbol.for(`react.fragment`),i=Symbol.for(`react.strict_mode`),a=Symbol.for(`react.profiler`),o=Symbol.for(`react.consumer`),s=Symbol.for(`react.context`),c=Symbol.for(`react.forward_ref`),l=Symbol.for(`react.suspense`),u=Symbol.for(`react.memo`),d=Symbol.for(`react.lazy`),f=Symbol.for(`react.activity`),p=Symbol.for(`react.view_transition`),m=Symbol.iterator;function h(e){return typeof e!=`object`||!e?null:(e=m&&e[m]||e[`@@iterator`],typeof e==`function`?e:null)}var g={isMounted:function(){return!1},enqueueForceUpdate:function(){},enqueueReplaceState:function(){},enqueueSetState:function(){}},_=Object.assign,v={};function y(e,t,n){this.props=e,this.context=t,this.refs=v,this.updater=n||g}y.prototype.isReactComponent={},y.prototype.setState=function(e,t){if(typeof e!=`object`&&typeof e!=`function`&&e!=null)throw Error(`takes an object of state variables to update or a function which returns an object of state variables.`);this.updater.enqueueSetState(this,e,t,`setState`)},y.prototype.forceUpdate=function(e){this.updater.enqueueForceUpdate(this,e,`forceUpdate`)};function b(){}b.prototype=y.prototype;function ee(e,t,n){this.props=e,this.context=t,this.refs=v,this.updater=n||g}var x=ee.prototype=new b;x.constructor=ee,_(x,y.prototype),x.isPureReactComponent=!0;var te=Array.isArray;function ne(){}var S={H:null,A:null,T:null,S:null},re=Object.prototype.hasOwnProperty;function C(e,n,r){var i=r.ref;return{$$typeof:t,type:e,key:n,ref:i===void 0?null:i,props:r}}function ie(e,t){return C(e.type,t,e.props)}function ae(e){return typeof e==`object`&&!!e&&e.$$typeof===t}function oe(e){var t={"=":`=0`,":":`=2`};return`$`+e.replace(/[=:]/g,function(e){return t[e]})}var se=/\/+/g;function ce(e,t){return typeof e==`object`&&e&&e.key!=null?oe(``+e.key):t.toString(36)}function le(e){switch(e.status){case`fulfilled`:return e.value;case`rejected`:throw e.reason;default:switch(typeof e.status==`string`?e.then(ne,ne):(e.status=`pending`,e.then(function(t){e.status===`pending`&&(e.status=`fulfilled`,e.value=t)},function(t){e.status===`pending`&&(e.status=`rejected`,e.reason=t)})),e.status){case`fulfilled`:return e.value;case`rejected`:throw e.reason}}throw e}function ue(e,r,i,a,o){var s=typeof e;(s===`undefined`||s===`boolean`)&&(e=null);var c=!1;if(e===null)c=!0;else switch(s){case`bigint`:case`string`:case`number`:c=!0;break;case`object`:switch(e.$$typeof){case t:case n:c=!0;break;case d:return c=e._init,ue(c(e._payload),r,i,a,o)}}if(c)return o=o(e),c=a===``?`.`+ce(e,0):a,te(o)?(i=``,c!=null&&(i=c.replace(se,`$&/`)+`/`),ue(o,r,i,``,function(e){return e})):o!=null&&(ae(o)&&(o=ie(o,i+(o.key==null||e&&e.key===o.key?``:(``+o.key).replace(se,`$&/`)+`/`)+c)),r.push(o)),1;c=0;var l=a===``?`.`:a+`:`;if(te(e))for(var u=0;u{t.exports=r()})),a=e((e=>{var t=i();function n(e){var t=`https://react.dev/errors/`+e;if(1{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=a()})),s=e((e=>{var t=n(),r=i(),a=o();function s(e){var t=`https://react.dev/errors/`+e;if(1Oe||(e.current=De[Oe],De[Oe]=null,Oe--)}function D(e,t){Oe++,De[Oe]=e.current,e.current=t}var je=ke(null),Me=ke(null),Ne=ke(null),Pe=ke(null);function Fe(e,t){switch(D(Ne,t),D(Me,e),D(je,null),t.nodeType){case 9:case 11:e=(e=t.documentElement)&&(e=e.namespaceURI)?up(e):0;break;default:if(e=t.tagName,t=t.namespaceURI)t=up(t),e=dp(t,e);else switch(e){case`svg`:e=1;break;case`math`:e=2;break;default:e=0}}Ae(je),D(je,e)}function Ie(){Ae(je),Ae(Me),Ae(Ne)}function Le(e){var t=e.memoizedState;t!==null&&(sh._currentValue=t.memoizedState,D(Pe,e)),t=je.current;var n=dp(t,e.type);t!==n&&(D(Me,e),D(je,n))}function Re(e){Me.current===e&&(Ae(je),Ae(Me)),Pe.current===e&&(Ae(Pe),sh._currentValue=Ee)}var ze,Be;function Ve(e){if(ze===void 0)try{throw Error()}catch(e){var t=e.stack.trim().match(/\n( *(at )?)/);ze=t&&t[1]||``,Be=-1()=>(t||(e((t={exports:{}}).exports,t,t.exports),e=null),t.exports);(function(){let e=document.createElement(`link`).relList;if(e&&e.supports&&e.supports(`modulepreload`))return;for(let e of document.querySelectorAll(`link[rel="modulepreload"]`))n(e);new MutationObserver(e=>{for(let t of e)if(t.type===`childList`)for(let e of t.addedNodes)e.tagName===`LINK`&&e.rel===`modulepreload`&&n(e)}).observe(document,{childList:!0,subtree:!0});function t(e){let t={};return e.integrity&&(t.integrity=e.integrity),e.referrerPolicy&&(t.referrerPolicy=e.referrerPolicy),t.credentials=e.crossOrigin===`use-credentials`?`include`:e.crossOrigin===`anonymous`?`omit`:`same-origin`,t}function n(e){if(e.ep)return;e.ep=!0;let n=t(e);fetch(e.href,n)}})();var t=e((e=>{function t(e,t){var n=e.length;e.push(t);a:for(;0>>1,a=e[r];if(0>>1;ri(c,n))li(u,c)?(e[r]=u,e[l]=n,r=l):(e[r]=c,e[s]=n,r=s);else if(li(u,n))e[r]=u,e[l]=n,r=l;else break a}}return t}function i(e,t){var n=e.sortIndex-t.sortIndex;return n===0?e.id-t.id:n}if(e.unstable_now=void 0,typeof performance==`object`&&typeof performance.now==`function`){var a=performance;e.unstable_now=function(){return a.now()}}else{var o=Date,s=o.now();e.unstable_now=function(){return o.now()-s}}var c=[],l=[],u=1,d=null,f=3,p=!1,m=!1,h=!1,g=!1,_=typeof setTimeout==`function`?setTimeout:null,v=typeof clearTimeout==`function`?clearTimeout:null,y=typeof setImmediate<`u`?setImmediate:null;function b(e){for(var i=n(l);i!==null;){if(i.callback===null)r(l);else if(i.startTime<=e)r(l),i.sortIndex=i.expirationTime,t(c,i);else break;i=n(l)}}function ee(e){if(h=!1,b(e),!m){if(n(c)!==null)m=!0,x||(x=!0,ie());else{var t=n(l);t!==null&&se(ee,t.startTime-e)}}}var x=!1,te=-1,ne=5,S=-1;function re(){return g?!0:!(e.unstable_now()-St&&re());){var o=d.callback;if(typeof o==`function`){d.callback=null,f=d.priorityLevel;var s=o(d.expirationTime<=t);if(t=e.unstable_now(),typeof s==`function`){d.callback=s,b(t),i=!0;break b}d===n(c)&&r(c),b(t)}else r(c);d=n(c)}if(d!==null)i=!0;else{var u=n(l);u!==null&&se(ee,u.startTime-t),i=!1}}break a}finally{d=null,f=a,p=!1}i=void 0}}finally{i?ie():x=!1}}}var ie;if(typeof y==`function`)ie=function(){y(C)};else if(typeof MessageChannel<`u`){var ae=new MessageChannel,oe=ae.port2;ae.port1.onmessage=C,ie=function(){oe.postMessage(null)}}else ie=function(){_(C,0)};function se(t,n){te=_(function(){t(e.unstable_now())},n)}e.unstable_IdlePriority=5,e.unstable_ImmediatePriority=1,e.unstable_LowPriority=4,e.unstable_NormalPriority=3,e.unstable_Profiling=null,e.unstable_UserBlockingPriority=2,e.unstable_cancelCallback=function(e){e.callback=null},e.unstable_forceFrameRate=function(e){0>e||125o?(r.sortIndex=a,t(l,r),n(c)===null&&r===n(l)&&(h?(v(te),te=-1):h=!0,se(ee,a-o))):(r.sortIndex=s,t(c,r),m||p||(m=!0,x||(x=!0,ie()))),r},e.unstable_shouldYield=re,e.unstable_wrapCallback=function(e){var t=f;return function(){var n=f;f=t;try{return e.apply(this,arguments)}finally{f=n}}}})),n=e(((e,n)=>{n.exports=t()})),r=e((e=>{var t=Symbol.for(`react.transitional.element`),n=Symbol.for(`react.portal`),r=Symbol.for(`react.fragment`),i=Symbol.for(`react.strict_mode`),a=Symbol.for(`react.profiler`),o=Symbol.for(`react.consumer`),s=Symbol.for(`react.context`),c=Symbol.for(`react.forward_ref`),l=Symbol.for(`react.suspense`),u=Symbol.for(`react.memo`),d=Symbol.for(`react.lazy`),f=Symbol.for(`react.activity`),p=Symbol.for(`react.view_transition`),m=Symbol.iterator;function h(e){return typeof e!=`object`||!e?null:(e=m&&e[m]||e[`@@iterator`],typeof e==`function`?e:null)}var g={isMounted:function(){return!1},enqueueForceUpdate:function(){},enqueueReplaceState:function(){},enqueueSetState:function(){}},_=Object.assign,v={};function y(e,t,n){this.props=e,this.context=t,this.refs=v,this.updater=n||g}y.prototype.isReactComponent={},y.prototype.setState=function(e,t){if(typeof e!=`object`&&typeof e!=`function`&&e!=null)throw Error(`takes an object of state variables to update or a function which returns an object of state variables.`);this.updater.enqueueSetState(this,e,t,`setState`)},y.prototype.forceUpdate=function(e){this.updater.enqueueForceUpdate(this,e,`forceUpdate`)};function b(){}b.prototype=y.prototype;function ee(e,t,n){this.props=e,this.context=t,this.refs=v,this.updater=n||g}var x=ee.prototype=new b;x.constructor=ee,_(x,y.prototype),x.isPureReactComponent=!0;var te=Array.isArray;function ne(){}var S={H:null,A:null,T:null,S:null},re=Object.prototype.hasOwnProperty;function C(e,n,r){var i=r.ref;return{$$typeof:t,type:e,key:n,ref:i===void 0?null:i,props:r}}function ie(e,t){return C(e.type,t,e.props)}function ae(e){return typeof e==`object`&&!!e&&e.$$typeof===t}function oe(e){var t={"=":`=0`,":":`=2`};return`$`+e.replace(/[=:]/g,function(e){return t[e]})}var se=/\/+/g;function ce(e,t){return typeof e==`object`&&e&&e.key!=null?oe(``+e.key):t.toString(36)}function le(e){switch(e.status){case`fulfilled`:return e.value;case`rejected`:throw e.reason;default:switch(typeof e.status==`string`?e.then(ne,ne):(e.status=`pending`,e.then(function(t){e.status===`pending`&&(e.status=`fulfilled`,e.value=t)},function(t){e.status===`pending`&&(e.status=`rejected`,e.reason=t)})),e.status){case`fulfilled`:return e.value;case`rejected`:throw e.reason}}throw e}function ue(e,r,i,a,o){var s=typeof e;(s===`undefined`||s===`boolean`)&&(e=null);var c=!1;if(e===null)c=!0;else switch(s){case`bigint`:case`string`:case`number`:c=!0;break;case`object`:switch(e.$$typeof){case t:case n:c=!0;break;case d:return c=e._init,ue(c(e._payload),r,i,a,o)}}if(c)return o=o(e),c=a===``?`.`+ce(e,0):a,te(o)?(i=``,c!=null&&(i=c.replace(se,`$&/`)+`/`),ue(o,r,i,``,function(e){return e})):o!=null&&(ae(o)&&(o=ie(o,i+(o.key==null||e&&e.key===o.key?``:(``+o.key).replace(se,`$&/`)+`/`)+c)),r.push(o)),1;c=0;var l=a===``?`.`:a+`:`;if(te(e))for(var u=0;u{t.exports=r()})),a=e((e=>{var t=i();function n(e){var t=`https://react.dev/errors/`+e;if(1{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=a()})),s=e((e=>{var t=n(),r=i(),a=o();function s(e){var t=`https://react.dev/errors/`+e;if(1Oe||(e.current=De[Oe],De[Oe]=null,Oe--)}function D(e,t){Oe++,De[Oe]=e.current,e.current=t}var je=ke(null),Me=ke(null),Ne=ke(null),Pe=ke(null);function Fe(e,t){switch(D(Ne,t),D(Me,e),D(je,null),t.nodeType){case 9:case 11:e=(e=t.documentElement)&&(e=e.namespaceURI)?up(e):0;break;default:if(e=t.tagName,t=t.namespaceURI)t=up(t),e=dp(t,e);else switch(e){case`svg`:e=1;break;case`math`:e=2;break;default:e=0}}Ae(je),D(je,e)}function Ie(){Ae(je),Ae(Me),Ae(Ne)}function Le(e){var t=e.memoizedState;t!==null&&(sh._currentValue=t.memoizedState,D(Pe,e)),t=je.current;var n=dp(t,e.type);t!==n&&(D(Me,e),D(je,n))}function Re(e){Me.current===e&&(Ae(je),Ae(Me)),Pe.current===e&&(Ae(Pe),sh._currentValue=Ee)}var ze,Be;function Ve(e){if(ze===void 0)try{throw Error()}catch(e){var t=e.stack.trim().match(/\n( *(at )?)/);ze=t&&t[1]||``,Be=-1)`:-1i||c[r]!==l[i]){var u=` `+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-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 +`+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-DFuJkDph.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/assets/main-CVTp2z3I.css b/apps/gpgui-helper/dist/assets/main-CVTp2z3I.css new file mode 100644 index 0000000..4fd3aca --- /dev/null +++ b/apps/gpgui-helper/dist/assets/main-CVTp2z3I.css @@ -0,0 +1 @@ +:root{--lightningcss-light:initial;--lightningcss-dark: ;color-scheme:light;--background:#f6f5f4;--foreground:#2e3436;--muted-foreground:#5e5c64;--progress-label:#3d3846;--progress-track:#d5d3d1;--progress-fill:#3584e4;--error:#9c2f2f;--button:#1c71d8;--button-hover:#1a5fb4;--button-active:#174a8b;--focus-ring:#1a5fb4}:root[data-theme=dark]{--lightningcss-light: ;--lightningcss-dark:initial;color-scheme:dark;--background:#242424;--foreground:#fff;--muted-foreground:#c0bfbc;--progress-label:#deddda;--progress-track:#454545;--progress-fill:#78aeed;--error:#ffb4ab;--button:#1c71d8;--button-hover:#3584e4;--button-active:#1a5fb4;--focus-ring:#78aeed}html,body,#root{box-sizing:border-box;-webkit-user-select:none;user-select:none;cursor:default;height:100%;margin:0;padding:0;overflow:hidden}body{background:var(--background);color:var(--foreground);font-family:Inter,ui-sans-serif,-apple-system,BlinkMacSystemFont,Segoe UI,sans-serif}button{font:inherit}.update-window{box-sizing:border-box;background:var(--background);align-items:center;gap:15px;width:100%;height:100%;padding:16px 18px;display:flex}.update-logo{flex:none;width:48px;height:48px}.update-content,.update-status{width:100%;min-width:0}.update-title{color:var(--foreground);letter-spacing:-.01em;margin:0;font-size:16px;font-weight:600;line-height:1.25}.update-description{color:var(--muted-foreground);margin:3px 0 0;font-size:12px;line-height:1.4}.progress-summary{justify-content:space-between;align-items:baseline;gap:12px;margin-top:3px;display:flex}.progress-summary .update-description{margin:0}.progress-bar{background-color:var(--progress-track);border-radius:3px;width:100%;height:6px;margin-top:9px;position:relative;overflow:hidden}.progress-fill{background:var(--progress-fill);border-radius:3px;height:100%;transition:width .18s ease-out}.progress-bar-indeterminate .progress-fill{width:35%;animation:1.4s ease-in-out infinite progress-indeterminate}@keyframes progress-indeterminate{0%{transform:translate(-110%)}to{transform:translate(300%)}}@media (prefers-reduced-motion:reduce){.progress-fill{transition:none}.progress-bar-indeterminate .progress-fill{animation:none;transform:translate(90%)}}.progress-label{color:var(--progress-label);font-variant-numeric:tabular-nums;text-align:right;white-space:nowrap;flex:none;font-size:12px;font-weight:500}.error-status{justify-content:space-between;align-items:center;gap:16px;display:flex}.error-status .update-title{color:var(--error)}.error-copy{min-width:0}.retry-button{background:var(--button);color:#fff;cursor:default;border:0;border-radius:8px;min-width:68px;padding:4px 14px;font-size:12px;font-weight:600;line-height:1.5}.retry-button:hover{background:var(--button-hover)}.retry-button:active{background:var(--button-active)}.retry-button:focus-visible{outline:2px solid var(--focus-ring);outline-offset:2px} diff --git a/apps/gpgui-helper/dist/assets/main-DiWGniCh.css b/apps/gpgui-helper/dist/assets/main-DiWGniCh.css deleted file mode 100644 index 718afda..0000000 --- a/apps/gpgui-helper/dist/assets/main-DiWGniCh.css +++ /dev/null @@ -1 +0,0 @@ -html,body,#root{box-sizing:border-box;-webkit-user-select:none;user-select:none;cursor:default;height:100%;margin:0;padding:0;overflow:hidden}body{color:#2e3436;background:#f6f5f4;font-family:Inter,ui-sans-serif,-apple-system,BlinkMacSystemFont,Segoe UI,sans-serif}button{font:inherit}.update-window{box-sizing:border-box;background:#f6f5f4;align-items:center;gap:15px;width:100%;height:100%;padding:16px 18px;display:flex}.update-logo{flex:none;width:48px;height:48px}.update-content,.update-status{width:100%;min-width:0}.update-title{color:#2e3436;letter-spacing:-.01em;margin:0;font-size:16px;font-weight:600;line-height:1.25}.update-description{color:#5e5c64;margin:3px 0 0;font-size:12px;line-height:1.4}.progress-summary{justify-content:space-between;align-items:baseline;gap:12px;margin-top:3px;display:flex}.progress-summary .update-description{margin:0}.progress-bar{background-color:#d5d3d1;border-radius:3px;width:100%;height:6px;margin-top:9px;position:relative;overflow:hidden}.progress-fill{background:#3584e4;border-radius:3px;height:100%;transition:width .18s ease-out}.progress-bar-indeterminate .progress-fill{width:35%;animation:1.4s ease-in-out infinite progress-indeterminate}@keyframes progress-indeterminate{0%{transform:translate(-110%)}to{transform:translate(300%)}}@media (prefers-reduced-motion:reduce){.progress-fill{transition:none}.progress-bar-indeterminate .progress-fill{animation:none;transform:translate(90%)}}.progress-label{color:#3d3846;font-variant-numeric:tabular-nums;text-align:right;white-space:nowrap;flex:none;font-size:12px;font-weight:500}.error-status{justify-content:space-between;align-items:center;gap:16px;display:flex}.error-status .update-title{color:#9c2f2f}.error-copy{min-width:0}.retry-button{color:#fff;cursor:pointer;background:#1c71d8;border:0;border-radius:8px;min-width:68px;padding:4px 14px;font-size:12px;font-weight:600;line-height:1.5}.retry-button:hover{background:#1a5fb4}.retry-button:active{background:#174a8b}.retry-button:focus-visible{outline-offset:2px;outline:2px solid #1a5fb4} diff --git a/apps/gpgui-helper/dist/index.html b/apps/gpgui-helper/dist/index.html index 8cd7054..e8fe51e 100644 --- a/apps/gpgui-helper/dist/index.html +++ b/apps/gpgui-helper/dist/index.html @@ -2,11 +2,21 @@ - + + GPGUI Downloader - - + + GPGUI Downloader diff --git a/apps/gpgui-helper/package.json b/apps/gpgui-helper/package.json index 0c16dd2..9da7fc8 100644 --- a/apps/gpgui-helper/package.json +++ b/apps/gpgui-helper/package.json @@ -5,21 +5,22 @@ "scripts": { "dev": "vite", "build": "tsc && vite build", + "test": "node --test tests/*.test.mjs", "preview": "vite preview", "tauri": "tauri" }, "dependencies": { - "@tauri-apps/api": "^2.12.3", - "react": "^19.3.0", - "react-dom": "^19.3.0" + "@tauri-apps/api": "^2.12.4", + "react": "^19.3.1", + "react-dom": "^19.3.1" }, "devDependencies": { - "@tauri-apps/cli": "^2.12.2", - "@types/node": "^26.6.5", + "@tauri-apps/cli": "^2.12.4", + "@types/node": "^26.6.6", "@types/react": "^19.3.0", "@types/react-dom": "^19.3.0", - "@typescript-eslint/eslint-plugin": "^8.71.2", - "@typescript-eslint/parser": "^8.71.2", + "@typescript-eslint/eslint-plugin": "^8.72.1", + "@typescript-eslint/parser": "^8.72.1", "@vitejs/plugin-react": "^6.1.2", "eslint": "^9.39.5", "eslint-config-prettier": "^10.1.8", @@ -27,7 +28,7 @@ "eslint-plugin-react-hooks": "^7.1.1", "prettier": "3.9.10", "typescript": "^6.0.3", - "vite": "^8.3.4" + "vite": "^8.3.5" }, "packageManager": "pnpm@9.15.1" } diff --git a/apps/gpgui-helper/pnpm-lock.yaml b/apps/gpgui-helper/pnpm-lock.yaml index 55b0681..88e4566 100644 --- a/apps/gpgui-helper/pnpm-lock.yaml +++ b/apps/gpgui-helper/pnpm-lock.yaml @@ -9,21 +9,21 @@ importers: .: dependencies: '@tauri-apps/api': - specifier: ^2.12.3 - version: 2.12.3 + specifier: ^2.12.4 + version: 2.12.4 react: - specifier: ^19.3.0 - version: 19.3.0 + specifier: ^19.3.1 + version: 19.3.1 react-dom: - specifier: ^19.3.0 - version: 19.3.0(react@19.3.0) + specifier: ^19.3.1 + version: 19.3.1(react@19.3.1) devDependencies: '@tauri-apps/cli': - specifier: ^2.12.2 - version: 2.12.2 + specifier: ^2.12.4 + version: 2.12.4 '@types/node': - specifier: ^26.6.5 - version: 26.6.5 + specifier: ^26.6.6 + version: 26.6.6 '@types/react': specifier: ^19.3.0 version: 19.3.0 @@ -31,14 +31,14 @@ importers: specifier: ^19.3.0 version: 19.3.0(@types/react@19.3.0) '@typescript-eslint/eslint-plugin': - 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) + specifier: ^8.72.1 + version: 8.72.1(@typescript-eslint/parser@8.72.1(eslint@9.39.5)(typescript@6.0.3))(eslint@9.39.5)(typescript@6.0.3) '@typescript-eslint/parser': - specifier: ^8.71.2 - version: 8.71.2(eslint@9.39.5)(typescript@6.0.3) + specifier: ^8.72.1 + version: 8.72.1(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)) + version: 6.1.2(vite@8.3.5(@types/node@26.6.6)(esbuild@0.27.2)) eslint: specifier: ^9.39.5 version: 9.39.5 @@ -58,8 +58,8 @@ importers: specifier: ^6.0.3 version: 6.0.3 vite: - specifier: ^8.3.4 - version: 8.3.4(@types/node@26.6.5)(esbuild@0.27.2) + specifier: ^8.3.5 + version: 8.3.5(@types/node@26.6.6)(esbuild@0.27.2) packages: @@ -360,95 +360,95 @@ packages: '@jridgewell/trace-mapping@0.3.31': resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} - '@oxc-project/types@0.153.0': - resolution: {integrity: sha512-jSNrRIyvPVLL5E1z/tS5zLAprosGz/FuI1PWwEOz59j3E4TTTzSpqKb/RDGqJhhW0QHYISGXxq582wGx6T11Tw==} + '@oxc-project/types@0.156.0': + resolution: {integrity: sha512-1Duyg48TdJNdyhEB8Xn1L36bT9Pv6GUtlKjHxOys8xkaF/rQq3XJE+bAurSK/AgIz5mGFsb77cn9Pb20+WCScw==} - '@rolldown/binding-android-arm-eabi@1.2.13': - resolution: {integrity: sha512-Vu/NICrgdRvUOeaJZIyB2FP63s6fO/4ud5l8dXmxDx9yDyn+mN0y+gsvsVviSli+T361Aqo0h46EuMoobrwawA==} + '@rolldown/binding-android-arm-eabi@1.2.16': + resolution: {integrity: sha512-ia3DwAs0OsMGS7+IConptSiyk9pEXkOx/AbJ2n/lAGxH3QkWQus1t8d7gnAT38FCU2sQu8lUbeR6AiZFv4JxaA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [android] - '@rolldown/binding-android-arm64@1.2.13': - resolution: {integrity: sha512-6LEoIrGy5vvCd2boNnv2soPSUZj/PRvhp8R/t9KlX+mIZxThIE/ZqxrGXxmuNX0FuvQFvLdZr7S4HrYpYBVhEQ==} + '@rolldown/binding-android-arm64@1.2.16': + resolution: {integrity: sha512-kx5wBiMB6E7TEvpl2B9gjLU004BkvEm2Dr941BFjx/SontPwSzNuQUIoVKxHHoSjpFIfHMmcguyLOtyn0hObRg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [android] - '@rolldown/binding-darwin-arm64@1.2.13': - resolution: {integrity: sha512-CaJSRzlQ6Q+zkDMVA9OkVxBjVoPRCDEE3v0FSJ9kIQBgRjFApA3Si4ijhbNVUji7ZJt+PfO0e46qy4nPInHUPA==} + '@rolldown/binding-darwin-arm64@1.2.16': + resolution: {integrity: sha512-qslZrXnKJU4cUpjoAmtAo/KQM9e2IRMlmpig6Zpwj+8KWxW8v+nkAf9216Bsek9lOC1jvg2yCjygCFo2f83msQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [darwin] - '@rolldown/binding-darwin-x64@1.2.13': - resolution: {integrity: sha512-e4r340I5hxSzJkD3YJBxgzq/rJ3wwxwdLLb2FPt1Zpyem20nrQPT11DDEEkazwxaHumH8wpglsp/Ozgj/wT6mw==} + '@rolldown/binding-darwin-x64@1.2.16': + resolution: {integrity: sha512-FdF+y48ND13eAyM2mQn+85kvAqNlvRWROy2rhgA463X/0Gv4vGtazZtfaF1mRBLscYvtOlh4QnLjOWiFzX69OQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [darwin] - '@rolldown/binding-freebsd-x64@1.2.13': - resolution: {integrity: sha512-hoBWDZ4/K/mJKVMbsgUd1jfpA2DiOrJ54mpegObU9TBHBBrtX4FLIXJJQRDPZ/2Dn91GvPob+Z2hwKJzf4E5SQ==} + '@rolldown/binding-freebsd-x64@1.2.16': + resolution: {integrity: sha512-ddjqFM5e95AgLbUPtKIS7V1KTVlA0RUgCVr5mn+/IEhsdy3pr+Vuj/HZ7nlMN2FyxIwUktOH1LEPIQXO1v9y1Q==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [freebsd] - '@rolldown/binding-linux-arm-gnueabihf@1.2.13': - resolution: {integrity: sha512-oF9fZu3vTWnTiVAkDFxU9PJLt1nh20K9RRpuHsR7ZnE2L7XookBbDBVLojCVSLGbvtSlxeUNnjAj6DbNsKyzbg==} + '@rolldown/binding-linux-arm-gnueabihf@1.2.16': + resolution: {integrity: sha512-tHdKWbFkFBI687iim3LIyIvyL7j66VvQYkDPss5Stn/qyE2tWkR1YD0dXmXPFKKqT/o5ZEJVsaRsWS2meQwGOA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [linux] - '@rolldown/binding-linux-arm64-gnu@1.2.13': - resolution: {integrity: sha512-DTpb/+jMiqWMPgphn4ksW1zW+XLJ6dJJ9FMvnIk9I291LhCctMPhMYJrP5t9p6C9qa3KXadDdUEZHBaPh3kNxQ==} + '@rolldown/binding-linux-arm64-gnu@1.2.16': + resolution: {integrity: sha512-FJiLGAblPBMlBEdbOqw6kW6QcXDWAf/oJu7gYs9ZJZwmg+K+/zjFLxPTIY9izJUzxzc24FHvmseyA0IvJSl17w==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] - '@rolldown/binding-linux-arm64-musl@1.2.13': - resolution: {integrity: sha512-xU+Kvv9N2A3SY35zFh1FWWNjxbadE/BKeqnkXe7vScU4GZsw757BlVmDLITZEq8DPpk6m7uoDYkK7P+x/uU5Ow==} + '@rolldown/binding-linux-arm64-musl@1.2.16': + resolution: {integrity: sha512-hrJpblMsrQ58U9veWpbXzkhV5zStunds6HWLprqq1qauvgBr1E6P+24kLj6lSLI9vjRn/RYpjprhkHQPKGWpNg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] - '@rolldown/binding-linux-ppc64-gnu@1.2.13': - resolution: {integrity: sha512-XMk/hnhh25oQ756Lclb1Q11h4ll0xC0Esa5w4Vzp+mAE2S3AGJgeM0SonrIgY8fHhjarb6hcoTuwoFG0VVP2ig==} + '@rolldown/binding-linux-ppc64-gnu@1.2.16': + resolution: {integrity: sha512-qJd/dC6j6CwLG9/s/RP2nb1RZ0GIgj7Ioj7x/SYa3RzjVrlzrmH0fhIOpfvqQDeIsdP0loi+kHaMhJzY1PBIaA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ppc64] os: [linux] - '@rolldown/binding-linux-s390x-gnu@1.2.13': - resolution: {integrity: sha512-U1BoTHYmlywE2n3HUWjzZ+8EQsKr+OwpxYuDWaubx42tUL8QSL7nOqRz/NVHanibbFP3M1Rxuprz/wNcbMKjqw==} + '@rolldown/binding-linux-s390x-gnu@1.2.16': + resolution: {integrity: sha512-Vx7Xg5uUJuNcujJjI70OICaH0EYj80BtOLZTSN7uOYg8QOLlyKnaG0IW7Fn/J0IpJsaKzmDKMhOQv1JBM9m9vg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [s390x] os: [linux] - '@rolldown/binding-linux-x64-gnu@1.2.13': - resolution: {integrity: sha512-J4cm80Pc6wEwV5AZ42o62sIQgDk+Y7R2s646jIwuvO+4V46QB58N4vVuMPWCBaNgursXLpmUWJV//WQAkPvHBQ==} + '@rolldown/binding-linux-x64-gnu@1.2.16': + resolution: {integrity: sha512-TNKhgE3uJTsTzatUSSYt0Kgo+Oa2uSlSjz4r1aEIea7HX6ULBym4fAlYUhG1i6pjNf2njfCUAfKwr6C3E9Xg1w==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] - '@rolldown/binding-linux-x64-musl@1.2.13': - resolution: {integrity: sha512-W0euZS40U4V6JkmEnVCIX9mcsL6cbXQ4X8c2w+MMOIjFg68TXUW+u3RT+2e1t1pv9mg/EP3pDtK3POXdQ7Rxyw==} + '@rolldown/binding-linux-x64-musl@1.2.16': + resolution: {integrity: sha512-7chXdpjXZ8qG0+mIxECN3cT9kvhZ3/oZhMX6Pp876P7CDrIy8nJswva6Mq357JR7eYXfuskwZxMeV1SzoZdHrA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] - '@rolldown/binding-openharmony-arm64@1.2.13': - resolution: {integrity: sha512-do/AF/4n9MRshia3a5aXoy8xM2c6mgfT6D7H/dY6my5z+hfCIR4ab7mk4IRj++nsEQpKy39kd0DQnDq+r692tw==} + '@rolldown/binding-openharmony-arm64@1.2.16': + resolution: {integrity: sha512-Kwjt+7uNTJK5/MDkGWGVO2KQPnj8yAV75dMpfwyHZrJSXWHrniOB0aUEWlVYf3H1hOqFLIStLdM5QXq6bnKmOQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [openharmony] - '@rolldown/binding-win32-arm64-msvc@1.2.13': - resolution: {integrity: sha512-6FtUf2cJZobutJdxnGYX8z0vtbgqU0b2v8vfBhkXb9wp2MppMFtkunE+IaOntyi01rkIQoPW2GHABtfzsC0BRQ==} + '@rolldown/binding-win32-arm64-msvc@1.2.16': + resolution: {integrity: sha512-/LH6WfjDRXXJz/p5xl4TmU+jpcnwcxbKEQBW/GZE0JHfN0lGIyTtsUEGaQ/q/GikkGJ2yLKe6pwm7AnEWO8pdw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [win32] - '@rolldown/binding-win32-x64-msvc@1.2.13': - resolution: {integrity: sha512-UKhFaZTeTcbKrb3iU82m17jVcPEAoqDkCN5MBqgPyZSwp/cQmib21crTS0DdH7T1B7wZRWEI89YQAOJMet5yhg==} + '@rolldown/binding-win32-x64-msvc@1.2.16': + resolution: {integrity: sha512-1lv1KvX0Z871zfk7vw+dnXMMnHNyDwMzWG8Kv3HxDXMOhzCX4SHc7HK319fInP0i+0p9D8brkfzL7pJOaGl+tw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [win32] @@ -456,77 +456,77 @@ packages: '@rolldown/pluginutils@1.0.1': resolution: {integrity: sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==} - '@tauri-apps/api@2.12.3': - resolution: {integrity: sha512-9s0PKw0p4r3kFq92jhpivYSp+cSht15o0gXpZxuQd0+dV9KCexEVkNaLELVoLdJWyoH4KlfQo5h3W2LIM8siJg==} + '@tauri-apps/api@2.12.4': + resolution: {integrity: sha512-pVmfis+4zT8H0Qhp3xPZx9Ju7kpzvA6rr/PSJPyuwfvucTQ8sVt61NYU9KMkK703UFlYadFmjKA4HhybOtN0gg==} - '@tauri-apps/cli-darwin-arm64@2.12.2': - resolution: {integrity: sha512-Lk3zaBTfzNvA7670Al5PNgo2M/95uaDPe1yp+ILJeDOmol87XiYuK5E5+FUbK5e6U6OORx9qpZdOo2U+5tETtQ==} + '@tauri-apps/cli-darwin-arm64@2.12.4': + resolution: {integrity: sha512-OxqKSckIkoJ6vX2AjifIJpTasFC0Hbdoo7gEiCmAjauABO3U8m2MRsLWe+QTiBwDx1mIrvgA+rvI7tvDnbnHVg==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@tauri-apps/cli-darwin-x64@2.12.2': - resolution: {integrity: sha512-2CyYjJ833JB3sKRz4B0W/Tv4oOVC16ws1bxdSCWj1XvrmanWwvZi99e5tNIoCHwHhcOm0jh+sh0PCGQyls6Z+w==} + '@tauri-apps/cli-darwin-x64@2.12.4': + resolution: {integrity: sha512-fz76/77wMMJOaaUN6n3CybRG0P/MTEjjqYk81mGPyhi9m6Ue5T+LWBnJP/AkPooNatBPI2vtulGqomyMJ44lCQ==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@tauri-apps/cli-linux-arm-gnueabihf@2.12.2': - resolution: {integrity: sha512-uvt2xbone4JftKarelssi86Kqnl7JiG1Smh5+Ae+nZmtM+JUhTGmqkcqfUPXRW8Ygwog92POZvd4oGDN9j8eXQ==} + '@tauri-apps/cli-linux-arm-gnueabihf@2.12.4': + resolution: {integrity: sha512-K0w8Bof6Lt8QKLAYhRy0yy36ZH5iA/35VuSOvnxyjvCUZ+A3JKsUTlALviH/sVgAlisaPzzmeJSH8XOn4Q2HBA==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@tauri-apps/cli-linux-arm64-gnu@2.12.2': - resolution: {integrity: sha512-DZlDJ24u3tlocKOYqzR+b2M+Qr+5WFcoMBZ7EfdhHN5j3ZXwBBpms4G4gyNvPCrak5vMzmdZ65ecBXPJcC+5sA==} + '@tauri-apps/cli-linux-arm64-gnu@2.12.4': + resolution: {integrity: sha512-j5rOnjmRUwWrm1oosf0zBYl4D+fqydgUROFCk0hvKZxvbTT8SOERes0QB7rBV/XWNy+kM6pCKzb3oSm2sRglzg==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-arm64-musl@2.12.2': - resolution: {integrity: sha512-pb+RTZUYH/p0gR4j4ecCCq+FNfz3W3eKuUQvVEBn7MQZx6DzfLO7FaYzt2NyDKWpdNN3lP10mdzOvw3R5P5aAQ==} + '@tauri-apps/cli-linux-arm64-musl@2.12.4': + resolution: {integrity: sha512-aOue3Fy6Jb7+oWcfAVUsVHfeTybSCt2CZoU06aO4jv4d2Ks/KnaTPwMAK3CLEduGOvBLY1lbBBrIyomqLLH5Sg==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-riscv64-gnu@2.12.2': - resolution: {integrity: sha512-nidEvDUJyHYNbIv9MUk6KiEix8IXfRh4Wj2G2SA5g8nFmgbBCwazUNWYiG/LhNeNbfZpBMLerRBUtoQ5K0GidA==} + '@tauri-apps/cli-linux-riscv64-gnu@2.12.4': + resolution: {integrity: sha512-Fx6GShY/RvST+t6LMlTHAwd66+1tEaAAGrnU7cysVfaiRP1BKng5Vl6rVmO6rSLOA1Sp1dRzNYM4f0OWQGb7qA==} engines: {node: '>= 10'} cpu: [riscv64] os: [linux] - '@tauri-apps/cli-linux-x64-gnu@2.12.2': - resolution: {integrity: sha512-gkXyYn3w+Xfc8nz/DleEbkm1M7bBuU2cejqUXNmI98cA2P5kp+oPmS4ALTorb1FaNWjpsKoYZBWsbS9BXxYFkQ==} + '@tauri-apps/cli-linux-x64-gnu@2.12.4': + resolution: {integrity: sha512-tNzZSa79Z1nRpHxEpQ38lsAFpKlFlYvoXzjTV+lRRn/zSf3wrdUC3wnLcq2XEadchPu4ttK0zivhYzr+XGD19Q==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-linux-x64-musl@2.12.2': - resolution: {integrity: sha512-MrjgoZ09s8Hsn99XvxSNvK8NQTZxi7XiyK3FxxytzfHgz2jb3qUT69CZtsokRkN/zdi9rCgrMtq+w9XNICjcfQ==} + '@tauri-apps/cli-linux-x64-musl@2.12.4': + resolution: {integrity: sha512-jmZ1pr0xEqUhuEusWtt9Yt+GF6lCnGHUmIL+KIknpbjK/XQ2qkhDBhaxK/JMHM2A8dAacVXCxXJk2EXpwhQUfA==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-win32-arm64-msvc@2.12.2': - resolution: {integrity: sha512-BR+CYM7iF3lkfyTtVkwMQU/s9hwegLpj3UqDjaxKCPmixQCa1csBBPy3C75V+FhLtOjIXNna4Gt6Vm9oxbV+qA==} + '@tauri-apps/cli-win32-arm64-msvc@2.12.4': + resolution: {integrity: sha512-fGo8pgEHZxdSYgZ/J98m1usJ7NHKmKbq7k6uT0x1rpOq6Bg2YVzzpaAblWk710f5LHYBJIL5QIFS5IrD+4gmTg==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@tauri-apps/cli-win32-ia32-msvc@2.12.2': - resolution: {integrity: sha512-zODJo9l3TbNBM+GrO/yPqGeELNMK5cjIc+QHh1WQc3l8tD+jDZGTQyYuAxViCsM6Uh5uWJ//RnCZG9LXrvsXww==} + '@tauri-apps/cli-win32-ia32-msvc@2.12.4': + resolution: {integrity: sha512-ezl8sQIcjYsye3TUnTH5VcWmWzccZASlQm7hlZt0dYyj1XD0qpVW47u2xYVrIKui0F8uQv/7QGZixdWiClBsbg==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] - '@tauri-apps/cli-win32-x64-msvc@2.12.2': - resolution: {integrity: sha512-cQXI2ZaZmwBDt0XATCqASVanYizxkEE3ceQVlVHXaQ51HzsQUWA04c9Nz7LrrY2lgAu3jFMyat+8Yz3Z2R2qBA==} + '@tauri-apps/cli-win32-x64-msvc@2.12.4': + resolution: {integrity: sha512-DJhDeCqjLDNMWYFy7ZS8cfeAHX2RK0RbQMLiA3bMVVkXRDJ4NBYiHriGqsUhsr9iG41aTb+dJGkFPmPw1gWwVw==} engines: {node: '>= 10'} cpu: [x64] os: [win32] - '@tauri-apps/cli@2.12.2': - resolution: {integrity: sha512-PMSppzAnlT+BvZtRKuidxjRSm2r5t8kDpJ/czmmQUa0AtDNTwrjLE8vApK3phCWGg7isfnYL46Dl1jB4ArI0hA==} + '@tauri-apps/cli@2.12.4': + resolution: {integrity: sha512-JI9bHfudSRJikGOrjbXEm6RjzzvmKuLc+JixB1NE8hNzQkNlCCIC3pTES3uypkR9lxHrsbxzcnSwhI2IxBQphw==} engines: {node: '>= 10'} hasBin: true @@ -536,8 +536,8 @@ packages: '@types/json-schema@7.0.15': resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} - '@types/node@26.6.5': - resolution: {integrity: sha512-uMzsv9stDdofIZBx4UGh4Z9ZgXnGC9seRDscilBcTHAeOFk67MZg/k9bWVfO+bk4qZmG+l52hRnLwUiH2LnJTg==} + '@types/node@26.6.6': + resolution: {integrity: sha512-MzQj+8Kx3XI40OmUAE6Qoh58ZMNstNNMwn2nfd3qWsfe7nDNSqJNzes4njhz6AHwrSHOffSLwXU6yb474Q4aog==} '@types/react-dom@19.3.0': resolution: {integrity: sha512-ZI7bU42mZXXKHn/qNLEw2IrbiINU7X5+vfgdixBHkCNpYWXjKgfQ/P+uyGb5CjOLB9UcnTeg3rylQtV2hym44Q==} @@ -547,63 +547,63 @@ packages: '@types/react@19.3.0': resolution: {integrity: sha512-N0rFCuH9YoxG9/m61l9MfpJKfmLOVU0em7ipIz6TRgSSkvReLB9vL85GB+yr8Bs5leqpvg96JSwF4ZS1s4viQg==} - '@typescript-eslint/eslint-plugin@8.71.2': - resolution: {integrity: sha512-K72/pvT7qpm8q3k8G5u93NCSN1RcLxX5h7Gw0bQpbMXviBHeY6Nx1WEwmk9wP+eKTSQ8ecxvcgt/ZX/rB938xQ==} + '@typescript-eslint/eslint-plugin@8.72.1': + resolution: {integrity: sha512-5CokTWXpmbylfFabsbvHC0CAw3XLaGnoa+nFJX5FR592h/LoZsENUE6p/rg5xvkKrFEXz6pYmgI29AgXc2N3BQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - '@typescript-eslint/parser': ^8.71.2 + '@typescript-eslint/parser': ^8.72.1 eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/parser@8.71.2': - resolution: {integrity: sha512-aTtmZjp/x3gsGHkDs04/1I8kNogBJkpQaeGaN0PfiG43NzDEmW2n+OP5im9wfsvyX0yP1UZWBrAGtDBfH9jEVw==} + '@typescript-eslint/parser@8.72.1': + resolution: {integrity: sha512-ZGwZP4OCfyA0AQTpEAMWz+rtX01DRhQWW5hB0ucKDEIX5U7jdmPSaMx94rQfaPAQzIYz2BimOgKOJtjfpRFQ9g==} 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.2': - resolution: {integrity: sha512-Pd68GsLVh5ZXlcEccFPdhSOvtHZ/2WU0XsA8zmXOS3F158lVlcTLhfQ6qvtL1RzbMie0Kp8xtbVwAg4nejKPHw==} + '@typescript-eslint/project-service@8.72.1': + resolution: {integrity: sha512-fAuVMkwdO/huI8nyo/WKnNKf6Gag93S56Rh3Ts5mGcavwSdaN8tRg1gCeIGX8PF+nzp1BjGfO4gHhGzW1J6jTg==} 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.2': - resolution: {integrity: sha512-YF4wgg5iUX5Obywoac27B56FhozMNFhdJSbh11H5GBAwmBtfyRhmgTQqW9tRNNmHDvsZ2CX6UGzoz+YfYn2Leg==} + '@typescript-eslint/scope-manager@8.72.1': + resolution: {integrity: sha512-lC/t6eMCZZQAAKZEYGL6RDVSuFehpdmMT6h+nJIjIa6oylN/PwDgDVtEIbB7O9xFfZYtZAYLoLlDNWKJhtF+uQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/tsconfig-utils@8.71.2': - resolution: {integrity: sha512-jz49TAWokm/7yWD9/o837nYax9DyALxIPOImdImvVzo6canBCZYzin8zJyqNR5k1j9K1DE0bVvr0XYB+99uAdg==} + '@typescript-eslint/tsconfig-utils@8.72.1': + resolution: {integrity: sha512-e4D5R5vpeAEPBxT2BAzsFQL3sbwyeeeo5+aczgNSRK1V734jE7pTqaGFU+fXapWEQwnZbpFaTn32+Z8DwS6OTg==} 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.2': - resolution: {integrity: sha512-cC8UaalCViJkb3rH/xLIvidEwoFRtMZMUqDjjJMGEKaTFwYRHYBcoczlEGHuvkHEO8svRDrgZ0yQgOArFmwang==} + '@typescript-eslint/type-utils@8.72.1': + resolution: {integrity: sha512-iY2wlmyrXJmx4yxUGP3aYCFF3cA/6ShddOKmLU2dx7LnEykbAM8WThlxZEfd1NddqceF6eJmZUayxx9oKIYNlg==} 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.2': - resolution: {integrity: sha512-y5Ukl3oVp7e/VGxqIoEXoeb/Roj71PAJ4WG/N/RGj+eeDvKRLM15kGr9MijLbN0i03S52zxu31Z98E5gWChJKw==} + '@typescript-eslint/types@8.72.1': + resolution: {integrity: sha512-LmE5IhQet1BWOWEXqBrVtBPsMAOQ6Nzk35d+WLh3mk4EUF33sqlfxjio1MdYeSvKSG5skactKKuixBIKXhL4Rw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.71.2': - resolution: {integrity: sha512-DgNOEsl4pdYzwSL+N/Cl33tX1Hlw3FvId73LnKXfq7jnrF2viOEn7X+P7RBkkSWCVm92gnWd28GIC5vJuLREeA==} + '@typescript-eslint/typescript-estree@8.72.1': + resolution: {integrity: sha512-DAlUoUV93hIvrtIQLwCbmZQYVZwOMhiHJrOVUUIWicFZaIYjTRqlY3I/NZevfkLmSqkNHRu2qYDcq9lrn16oOQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/utils@8.71.2': - resolution: {integrity: sha512-RyKa1G1M9rKHDhrk+HJtiF1MvLD5Ux2JW3TSkzw+02pRALdpJb+QzG1Y5em+LvCgzGwgg8H7mBRFKljNz7ImPw==} + '@typescript-eslint/utils@8.72.1': + resolution: {integrity: sha512-5v5liypurJBFHCBNqh/RjsymAD+VWcE0djuGY/BUqp5fC3Qn+luWDEksjuTtWjPn6i5zQlUtkZCRG/CYG0yCkA==} 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.2': - resolution: {integrity: sha512-zozlN0UA32bSG2zkKAgQyRYSbEISVoyU6vvkKYo2aSny74D8Jh4e+POkJ6Lk0dlezZi5x7TtD+88Xb06IB8nhg==} + '@typescript-eslint/visitor-keys@8.72.1': + resolution: {integrity: sha512-SB8xqipSzZHUePCCLNeYxqnxq83X61/qzNhjQGbTfjxGZIeOEP7tBgWYX05Tcd6CgE02WdTJnh5b8kMZJ/+bnQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@vitejs/plugin-react@6.1.2': @@ -1031,8 +1031,8 @@ packages: resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==} engines: {node: '>= 4'} - ignore@7.0.12: - resolution: {integrity: sha512-/8UvqAPU9DGTI9k4mxtf49U37Isfwr8Uts96+SBHIkFxPJnHS0Ew4f00sM4Scd8V8EjM0jUNtVDdv1kPdt35lg==} + ignore@7.0.14: + resolution: {integrity: sha512-wCBiZ77u1tuWde6G/nfOtLaCTYcFDU5yCzARzK10y+rLhzYoL7a7yEemcopcc2Mzow7gZOIjnV2ym1NYmdiJOQ==} engines: {node: '>= 4'} import-fresh@3.3.1: @@ -1378,8 +1378,8 @@ packages: resolution: {integrity: sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==} engines: {node: '>= 0.4'} - postcss@8.5.29: - resolution: {integrity: sha512-49cGhUbXj8Qenv0iTMxA1cFBzxXoctpC9Ujd77t1WcbJIr6nF/eI7g/8MgxrYldFRuAXvja7xQRwavoW7kgrxQ==} + postcss@8.5.32: + resolution: {integrity: sha512-LJlKCCAUFKOuZxipUdYw1NzIITEsPcgyOG9LkvRJvuKj/bRzbuRY0ARXvL0pWGpsZvn8jku+LMep2eU0seHp8g==} engines: {node: ^10 || ^12 || >=14} prelude-ls@1.2.1: @@ -1398,16 +1398,16 @@ packages: resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} - react-dom@19.3.0: - resolution: {integrity: sha512-JDk8dgif51OjFoDE70+OT9ICyYr+69HlmihNwp1+Nsfbna3t5sIiCa9ZJktDmQ4/1b/rn26hIAR2uYXDMr5r0Q==} + react-dom@19.3.1: + resolution: {integrity: sha512-Y0bARz53lhEC1NMCASs0/j+faB/zqt3R8hpvg1e8+61ZVJ4UL0UdC4cBbXfZMcIuhrfgeILTLe+ZeBCavQPtKQ==} peerDependencies: - react: ^19.3.0 + react: ^19.3.1 react-is@16.13.1: resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==} - react@19.3.0: - resolution: {integrity: sha512-E8LUcbtBWt20bbl2YoHfx4ZDBdxVTfOKtCZn9cDSJ4l6/nuoApcpIBcj47t2wZoVX8g2ZHuMHbiShgCR1T5Sog==} + react@19.3.1: + resolution: {integrity: sha512-QNhWdt7nrgVWWQG58QuGsAR3jv3Hbe4mb4vz7w2csnHavciZJgda1CPNaldF6eVxv90ud3jUXpKlHL69gO38yw==} engines: {node: '>=0.10.0'} reflect.getprototypeof@1.0.10: @@ -1427,8 +1427,8 @@ packages: engines: {node: '>= 0.4'} hasBin: true - rolldown@1.2.13: - resolution: {integrity: sha512-/5apOkwWxtACcQtZ5WlrAsKS4JwXVThQPJZ3RqIruRY9UG9M8e0VlXN068xum/JRKA4aIUoJ13ghe/kGCvidiQ==} + rolldown@1.2.16: + resolution: {integrity: sha512-bWvlMpFKiTfDKfnK7FC2MPgPeWCf/Kpwsq49ApdW+FQaBZb6O6dZ4MAPbPUjp7hYQrw/RobqCzn64BRrQecGHw==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true @@ -1582,13 +1582,13 @@ packages: uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} - vite@8.3.4: - resolution: {integrity: sha512-IftLE8phJhdNRIGNEV4JCCvfNScoZQVfcXaN8TQropWGJtOHcu+iAB9pHcuGvmEb/kddw0LBe/jS8ztdC6xdiQ==} + vite@8.3.5: + resolution: {integrity: sha512-z1YpjieJ9g0ebTmQpLBv/oq9E3F9EIlOe+7LahW8SrE3LTiG3udBRUXQOlYXP9b+IC2q2phHeVxj9xGlw34OEQ==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true peerDependencies: '@types/node': ^20.19.0 || >=22.12.0 - '@vitejs/devtools': ^0.7.1 + '@vitejs/devtools': ^0.7.1 || ^0.8.0 esbuild: ^0.27.0 || ^0.28.0 jiti: '>=1.21.0' less: ^4.0.0 @@ -1927,109 +1927,109 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.6.0 - '@oxc-project/types@0.153.0': {} + '@oxc-project/types@0.156.0': {} - '@rolldown/binding-android-arm-eabi@1.2.13': + '@rolldown/binding-android-arm-eabi@1.2.16': optional: true - '@rolldown/binding-android-arm64@1.2.13': + '@rolldown/binding-android-arm64@1.2.16': optional: true - '@rolldown/binding-darwin-arm64@1.2.13': + '@rolldown/binding-darwin-arm64@1.2.16': optional: true - '@rolldown/binding-darwin-x64@1.2.13': + '@rolldown/binding-darwin-x64@1.2.16': optional: true - '@rolldown/binding-freebsd-x64@1.2.13': + '@rolldown/binding-freebsd-x64@1.2.16': optional: true - '@rolldown/binding-linux-arm-gnueabihf@1.2.13': + '@rolldown/binding-linux-arm-gnueabihf@1.2.16': optional: true - '@rolldown/binding-linux-arm64-gnu@1.2.13': + '@rolldown/binding-linux-arm64-gnu@1.2.16': optional: true - '@rolldown/binding-linux-arm64-musl@1.2.13': + '@rolldown/binding-linux-arm64-musl@1.2.16': optional: true - '@rolldown/binding-linux-ppc64-gnu@1.2.13': + '@rolldown/binding-linux-ppc64-gnu@1.2.16': optional: true - '@rolldown/binding-linux-s390x-gnu@1.2.13': + '@rolldown/binding-linux-s390x-gnu@1.2.16': optional: true - '@rolldown/binding-linux-x64-gnu@1.2.13': + '@rolldown/binding-linux-x64-gnu@1.2.16': optional: true - '@rolldown/binding-linux-x64-musl@1.2.13': + '@rolldown/binding-linux-x64-musl@1.2.16': optional: true - '@rolldown/binding-openharmony-arm64@1.2.13': + '@rolldown/binding-openharmony-arm64@1.2.16': optional: true - '@rolldown/binding-win32-arm64-msvc@1.2.13': + '@rolldown/binding-win32-arm64-msvc@1.2.16': optional: true - '@rolldown/binding-win32-x64-msvc@1.2.13': + '@rolldown/binding-win32-x64-msvc@1.2.16': optional: true '@rolldown/pluginutils@1.0.1': {} - '@tauri-apps/api@2.12.3': {} + '@tauri-apps/api@2.12.4': {} - '@tauri-apps/cli-darwin-arm64@2.12.2': + '@tauri-apps/cli-darwin-arm64@2.12.4': optional: true - '@tauri-apps/cli-darwin-x64@2.12.2': + '@tauri-apps/cli-darwin-x64@2.12.4': optional: true - '@tauri-apps/cli-linux-arm-gnueabihf@2.12.2': + '@tauri-apps/cli-linux-arm-gnueabihf@2.12.4': optional: true - '@tauri-apps/cli-linux-arm64-gnu@2.12.2': + '@tauri-apps/cli-linux-arm64-gnu@2.12.4': optional: true - '@tauri-apps/cli-linux-arm64-musl@2.12.2': + '@tauri-apps/cli-linux-arm64-musl@2.12.4': optional: true - '@tauri-apps/cli-linux-riscv64-gnu@2.12.2': + '@tauri-apps/cli-linux-riscv64-gnu@2.12.4': optional: true - '@tauri-apps/cli-linux-x64-gnu@2.12.2': + '@tauri-apps/cli-linux-x64-gnu@2.12.4': optional: true - '@tauri-apps/cli-linux-x64-musl@2.12.2': + '@tauri-apps/cli-linux-x64-musl@2.12.4': optional: true - '@tauri-apps/cli-win32-arm64-msvc@2.12.2': + '@tauri-apps/cli-win32-arm64-msvc@2.12.4': optional: true - '@tauri-apps/cli-win32-ia32-msvc@2.12.2': + '@tauri-apps/cli-win32-ia32-msvc@2.12.4': optional: true - '@tauri-apps/cli-win32-x64-msvc@2.12.2': + '@tauri-apps/cli-win32-x64-msvc@2.12.4': optional: true - '@tauri-apps/cli@2.12.2': + '@tauri-apps/cli@2.12.4': optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 2.12.2 - '@tauri-apps/cli-darwin-x64': 2.12.2 - '@tauri-apps/cli-linux-arm-gnueabihf': 2.12.2 - '@tauri-apps/cli-linux-arm64-gnu': 2.12.2 - '@tauri-apps/cli-linux-arm64-musl': 2.12.2 - '@tauri-apps/cli-linux-riscv64-gnu': 2.12.2 - '@tauri-apps/cli-linux-x64-gnu': 2.12.2 - '@tauri-apps/cli-linux-x64-musl': 2.12.2 - '@tauri-apps/cli-win32-arm64-msvc': 2.12.2 - '@tauri-apps/cli-win32-ia32-msvc': 2.12.2 - '@tauri-apps/cli-win32-x64-msvc': 2.12.2 + '@tauri-apps/cli-darwin-arm64': 2.12.4 + '@tauri-apps/cli-darwin-x64': 2.12.4 + '@tauri-apps/cli-linux-arm-gnueabihf': 2.12.4 + '@tauri-apps/cli-linux-arm64-gnu': 2.12.4 + '@tauri-apps/cli-linux-arm64-musl': 2.12.4 + '@tauri-apps/cli-linux-riscv64-gnu': 2.12.4 + '@tauri-apps/cli-linux-x64-gnu': 2.12.4 + '@tauri-apps/cli-linux-x64-musl': 2.12.4 + '@tauri-apps/cli-win32-arm64-msvc': 2.12.4 + '@tauri-apps/cli-win32-ia32-msvc': 2.12.4 + '@tauri-apps/cli-win32-x64-msvc': 2.12.4 '@types/estree@1.0.9': {} '@types/json-schema@7.0.15': {} - '@types/node@26.6.5': + '@types/node@26.6.6': dependencies: undici-types: 8.9.0 @@ -2041,57 +2041,57 @@ snapshots: dependencies: csstype: 3.2.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)': + '@typescript-eslint/eslint-plugin@8.72.1(@typescript-eslint/parser@8.72.1(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.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 + '@typescript-eslint/parser': 8.72.1(eslint@9.39.5)(typescript@6.0.3) + '@typescript-eslint/scope-manager': 8.72.1 + '@typescript-eslint/type-utils': 8.72.1(eslint@9.39.5)(typescript@6.0.3) + '@typescript-eslint/utils': 8.72.1(eslint@9.39.5)(typescript@6.0.3) + '@typescript-eslint/visitor-keys': 8.72.1 eslint: 9.39.5 - ignore: 7.0.12 + ignore: 7.0.14 natural-compare: 1.4.0 ts-api-utils: 2.5.0(typescript@6.0.3) typescript: 6.0.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.71.2(eslint@9.39.5)(typescript@6.0.3)': + '@typescript-eslint/parser@8.72.1(eslint@9.39.5)(typescript@6.0.3)': dependencies: - '@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 + '@typescript-eslint/scope-manager': 8.72.1 + '@typescript-eslint/types': 8.72.1 + '@typescript-eslint/typescript-estree': 8.72.1(typescript@6.0.3) + '@typescript-eslint/visitor-keys': 8.72.1 debug: 4.4.3 eslint: 9.39.5 typescript: 6.0.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/project-service@8.71.2(typescript@6.0.3)': + '@typescript-eslint/project-service@8.72.1(typescript@6.0.3)': dependencies: - '@typescript-eslint/tsconfig-utils': 8.71.2(typescript@6.0.3) - '@typescript-eslint/types': 8.71.2 + '@typescript-eslint/tsconfig-utils': 8.72.1(typescript@6.0.3) + '@typescript-eslint/types': 8.72.1 debug: 4.4.3 typescript: 6.0.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@8.71.2': + '@typescript-eslint/scope-manager@8.72.1': dependencies: - '@typescript-eslint/types': 8.71.2 - '@typescript-eslint/visitor-keys': 8.71.2 + '@typescript-eslint/types': 8.72.1 + '@typescript-eslint/visitor-keys': 8.72.1 - '@typescript-eslint/tsconfig-utils@8.71.2(typescript@6.0.3)': + '@typescript-eslint/tsconfig-utils@8.72.1(typescript@6.0.3)': dependencies: typescript: 6.0.3 - '@typescript-eslint/type-utils@8.71.2(eslint@9.39.5)(typescript@6.0.3)': + '@typescript-eslint/type-utils@8.72.1(eslint@9.39.5)(typescript@6.0.3)': dependencies: - '@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) + '@typescript-eslint/types': 8.72.1 + '@typescript-eslint/typescript-estree': 8.72.1(typescript@6.0.3) + '@typescript-eslint/utils': 8.72.1(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.2': {} + '@typescript-eslint/types@8.72.1': {} - '@typescript-eslint/typescript-estree@8.71.2(typescript@6.0.3)': + '@typescript-eslint/typescript-estree@8.72.1(typescript@6.0.3)': dependencies: - '@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 + '@typescript-eslint/project-service': 8.72.1(typescript@6.0.3) + '@typescript-eslint/tsconfig-utils': 8.72.1(typescript@6.0.3) + '@typescript-eslint/types': 8.72.1 + '@typescript-eslint/visitor-keys': 8.72.1 debug: 4.4.3 minimatch: 10.2.6 semver: 7.8.5 @@ -2116,26 +2116,26 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.71.2(eslint@9.39.5)(typescript@6.0.3)': + '@typescript-eslint/utils@8.72.1(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.2 - '@typescript-eslint/types': 8.71.2 - '@typescript-eslint/typescript-estree': 8.71.2(typescript@6.0.3) + '@typescript-eslint/scope-manager': 8.72.1 + '@typescript-eslint/types': 8.72.1 + '@typescript-eslint/typescript-estree': 8.72.1(typescript@6.0.3) eslint: 9.39.5 typescript: 6.0.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/visitor-keys@8.71.2': + '@typescript-eslint/visitor-keys@8.72.1': dependencies: - '@typescript-eslint/types': 8.71.2 + '@typescript-eslint/types': 8.72.1 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))': + '@vitejs/plugin-react@6.1.2(vite@8.3.5(@types/node@26.6.6)(esbuild@0.27.2))': dependencies: '@rolldown/pluginutils': 1.0.1 - vite: 8.3.4(@types/node@26.6.5)(esbuild@0.27.2) + vite: 8.3.5(@types/node@26.6.6)(esbuild@0.27.2) acorn-jsx@5.3.2(acorn@8.19.0): dependencies: @@ -2706,7 +2706,7 @@ snapshots: ignore@5.3.2: {} - ignore@7.0.12: {} + ignore@7.0.14: {} import-fresh@3.3.1: dependencies: @@ -3040,7 +3040,7 @@ snapshots: possible-typed-array-names@1.1.0: {} - postcss@8.5.29: + postcss@8.5.32: dependencies: nanoid: 3.3.20 picocolors: 1.1.1 @@ -3058,14 +3058,14 @@ snapshots: punycode@2.3.1: {} - react-dom@19.3.0(react@19.3.0): + react-dom@19.3.1(react@19.3.1): dependencies: - react: 19.3.0 + react: 19.3.1 scheduler: 0.28.0 react-is@16.13.1: {} - react@19.3.0: {} + react@19.3.1: {} reflect.getprototypeof@1.0.10: dependencies: @@ -3098,26 +3098,26 @@ snapshots: path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 - rolldown@1.2.13: + rolldown@1.2.16: dependencies: - '@oxc-project/types': 0.153.0 + '@oxc-project/types': 0.156.0 '@rolldown/pluginutils': 1.0.1 optionalDependencies: - '@rolldown/binding-android-arm-eabi': 1.2.13 - '@rolldown/binding-android-arm64': 1.2.13 - '@rolldown/binding-darwin-arm64': 1.2.13 - '@rolldown/binding-darwin-x64': 1.2.13 - '@rolldown/binding-freebsd-x64': 1.2.13 - '@rolldown/binding-linux-arm-gnueabihf': 1.2.13 - '@rolldown/binding-linux-arm64-gnu': 1.2.13 - '@rolldown/binding-linux-arm64-musl': 1.2.13 - '@rolldown/binding-linux-ppc64-gnu': 1.2.13 - '@rolldown/binding-linux-s390x-gnu': 1.2.13 - '@rolldown/binding-linux-x64-gnu': 1.2.13 - '@rolldown/binding-linux-x64-musl': 1.2.13 - '@rolldown/binding-openharmony-arm64': 1.2.13 - '@rolldown/binding-win32-arm64-msvc': 1.2.13 - '@rolldown/binding-win32-x64-msvc': 1.2.13 + '@rolldown/binding-android-arm-eabi': 1.2.16 + '@rolldown/binding-android-arm64': 1.2.16 + '@rolldown/binding-darwin-arm64': 1.2.16 + '@rolldown/binding-darwin-x64': 1.2.16 + '@rolldown/binding-freebsd-x64': 1.2.16 + '@rolldown/binding-linux-arm-gnueabihf': 1.2.16 + '@rolldown/binding-linux-arm64-gnu': 1.2.16 + '@rolldown/binding-linux-arm64-musl': 1.2.16 + '@rolldown/binding-linux-ppc64-gnu': 1.2.16 + '@rolldown/binding-linux-s390x-gnu': 1.2.16 + '@rolldown/binding-linux-x64-gnu': 1.2.16 + '@rolldown/binding-linux-x64-musl': 1.2.16 + '@rolldown/binding-openharmony-arm64': 1.2.16 + '@rolldown/binding-win32-arm64-msvc': 1.2.16 + '@rolldown/binding-win32-x64-msvc': 1.2.16 safe-array-concat@1.1.4: dependencies: @@ -3326,15 +3326,15 @@ snapshots: dependencies: punycode: 2.3.1 - vite@8.3.4(@types/node@26.6.5)(esbuild@0.27.2): + vite@8.3.5(@types/node@26.6.6)(esbuild@0.27.2): dependencies: lightningcss: 1.33.0 picomatch: 4.0.7 - postcss: 8.5.29 - rolldown: 1.2.13 + postcss: 8.5.32 + rolldown: 1.2.16 tinyglobby: 0.2.17 optionalDependencies: - '@types/node': 26.6.5 + '@types/node': 26.6.6 esbuild: 0.27.2 fsevents: 2.3.3 diff --git a/apps/gpgui-helper/src-tauri/icons/128x128.png b/apps/gpgui-helper/src-tauri/icons/128x128.png index f695805..81ae1f7 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 28fca23..97ca8cb 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 8cebbbb..2b69052 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 a01cd91..ce10b96 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 58c4cc2..f33305d 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 79084fa..3bb4415 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 afcda2b..8bfbad1 100644 --- a/apps/gpgui-helper/src-tauri/icons/icon.svg +++ b/apps/gpgui-helper/src-tauri/icons/icon.svg @@ -1,60 +1,56 @@ - - + + - + - + + + + + + + + + + + - - - - - - - - - - - - + - - + + + + + + + + - - - - - - - - - - - - - + + + + - + - + - + diff --git a/apps/gpgui-helper/src-tauri/src/app.rs b/apps/gpgui-helper/src-tauri/src/app.rs index a444c4a..9d5415b 100644 --- a/apps/gpgui-helper/src-tauri/src/app.rs +++ b/apps/gpgui-helper/src-tauri/src/app.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use gpapi::service::transport::SessionCredential; +use gpapi::{gui::GuiTheme, service::transport::SessionCredential}; use log::info; use tauri::{Listener, Manager}; use tokio::sync::watch; @@ -11,30 +11,68 @@ pub struct App { credential: Arc, credential_lease: watch::Receiver, gui_version: String, + variant: gpapi::gui::GuiVariant, + theme: GuiTheme, } impl App { - pub fn new(credential: Arc, credential_lease: watch::Receiver, gui_version: &str) -> Self { + pub fn new( + credential: Arc, + credential_lease: watch::Receiver, + gui_version: &str, + variant: gpapi::gui::GuiVariant, + theme: GuiTheme, + ) -> Self { Self { credential, credential_lease, gui_version: gui_version.to_string(), + variant, + theme, } } pub fn run(&self) -> anyhow::Result<()> { let gui_version = self.gui_version.clone(); + let variant = self.variant; + let theme = self.theme; let credential = Arc::clone(&self.credential); let credential_lease = self.credential_lease.clone(); tauri::Builder::default() + .on_window_event(move |window, event| { + if theme == GuiTheme::System + && let tauri::WindowEvent::ThemeChanged(theme) = event + && let Some(win) = window.get_webview_window(window.label()) + && let Err(error) = win.set_background_color(Some(background_color(*theme))) + { + log::warn!("Could not update helper window background: {error}"); + } + }) .setup(move |app| { - let win = app.get_webview_window("main").expect("no main window"); + let native_theme = match theme { + GuiTheme::System => None, + GuiTheme::Light => Some(tauri::Theme::Light), + GuiTheme::Dark => Some(tauri::Theme::Dark), + }; + let config = app + .config() + .app + .windows + .iter() + .find(|window| window.label == "main") + .expect("no main window"); + let win = tauri::WebviewWindowBuilder::from_config(app, config)? + .theme(native_theme) + .initialization_script(format!("window.__GP_HELPER_THEME__ = {:?};", theme.as_str())) + .visible(false) + .build()?; + win.set_background_color(Some(background_color(win.theme()?)))?; let _ = win.hide_menu(); let notifier = ProgressNotifier::new(win.clone()); let installer = Installer::new(credential, credential_lease.clone()); - let updater = Arc::new(GuiUpdater::new(gui_version, notifier, installer)); + let updater = Arc::new(GuiUpdater::new(gui_version, notifier, installer, variant)); let app_handle = app.handle().clone(); let mut app_credential_lease = credential_lease; @@ -66,6 +104,8 @@ impl App { tokio::spawn(async move { updater.update().await }); }); + win.show()?; + Ok(()) }) .run(tauri::generate_context!())?; @@ -73,3 +113,10 @@ impl App { Ok(()) } } + +fn background_color(theme: tauri::Theme) -> tauri::window::Color { + match theme { + tauri::Theme::Dark => tauri::window::Color(36, 36, 36, 255), + _ => tauri::window::Color(246, 245, 244, 255), + } +} diff --git a/apps/gpgui-helper/src-tauri/src/cli.rs b/apps/gpgui-helper/src-tauri/src/cli.rs index 7cb0c4b..7ae5e27 100644 --- a/apps/gpgui-helper/src-tauri/src/cli.rs +++ b/apps/gpgui-helper/src-tauri/src/cli.rs @@ -4,6 +4,7 @@ use std::{io::Read, sync::Arc}; use anyhow::{Context, bail}; use gpapi::{ clap::InfoLevelVerbosity, + gui::GuiTheme, service::transport::{MAX_CREDENTIAL_FRAME, SessionCredential}, utils::env_utils, }; @@ -29,6 +30,11 @@ struct Cli { #[arg(long, default_value = env!("CARGO_PKG_VERSION"), help = "The version of the GUI")] gui_version: String, + #[arg(long, default_value = "tauri", value_parser = ["tauri", "nsh"])] + gui_variant: String, + + #[arg(long, value_enum, default_value = "system", help = "Window appearance")] + theme: GuiTheme, #[command(flatten)] verbose: InfoLevelVerbosity, @@ -38,7 +44,22 @@ impl Cli { fn run(&self) -> anyhow::Result<()> { let credential = self.read_credential()?; let credential_lease = monitor_credential_lease().context("Failed to monitor service credential lifetime")?; - let app = App::new(Arc::new(credential), credential_lease, &self.gui_version); + let variant = if self.gui_variant == "nsh" { + gpapi::gui::GuiVariant::Nsh + } else { + gpapi::gui::GuiVariant::Tauri + }; + anyhow::ensure!( + variant != gpapi::gui::GuiVariant::Nsh || cfg!(target_os = "linux"), + "Native Shell is available only on Linux" + ); + let app = App::new( + Arc::new(credential), + credential_lease, + &self.gui_version, + variant, + self.theme, + ); env_utils::patch_gui_runtime_env(false); @@ -110,6 +131,22 @@ mod tests { use super::*; + #[test] + fn theme_defaults_to_system_and_accepts_explicit_modes() { + assert_eq!(Cli::try_parse_from(["gpgui-helper"]).unwrap().theme, GuiTheme::System); + for (value, expected) in [ + ("system", GuiTheme::System), + ("light", GuiTheme::Light), + ("dark", GuiTheme::Dark), + ] { + assert_eq!( + Cli::try_parse_from(["gpgui-helper", "--theme", value]).unwrap().theme, + expected + ); + } + assert!(Cli::try_parse_from(["gpgui-helper", "--theme", "invalid"]).is_err()); + } + #[test] fn credential_lease_closes_at_eof() { let (lease_tx, lease_rx) = watch::channel(true); diff --git a/apps/gpgui-helper/src-tauri/src/downloader.rs b/apps/gpgui-helper/src-tauri/src/downloader.rs index bd04602..b067886 100644 --- a/apps/gpgui-helper/src-tauri/src/downloader.rs +++ b/apps/gpgui-helper/src-tauri/src/downloader.rs @@ -33,7 +33,12 @@ impl<'a> FileDownloader<'a> { } pub async fn download(&self) -> anyhow::Result { - let res = reqwest::get(self.url).await?.error_for_status()?; + let res = gpapi::utils::request::client_builder() + .build()? + .get(self.url) + .send() + .await? + .error_for_status()?; let content_length = res.content_length().unwrap_or(0); info!("Content length: {}", content_length); @@ -79,7 +84,12 @@ impl<'a> ChecksumFetcher<'a> { } pub async fn fetch(&self) -> anyhow::Result { - let res = reqwest::get(self.url).await?.error_for_status()?; + let res = gpapi::utils::request::client_builder() + .build()? + .get(self.url) + .send() + .await? + .error_for_status()?; let checksum = res.text().await?.trim().to_string(); Ok(checksum) diff --git a/apps/gpgui-helper/src-tauri/src/updater.rs b/apps/gpgui-helper/src-tauri/src/updater.rs index 1fc4748..67650fd 100644 --- a/apps/gpgui-helper/src-tauri/src/updater.rs +++ b/apps/gpgui-helper/src-tauri/src/updater.rs @@ -41,10 +41,20 @@ const GUI_LIBC_SUFFIX: &str = "-musl"; #[cfg(not(target_env = "musl"))] const GUI_LIBC_SUFFIX: &str = ""; -fn gui_asset_name() -> Option { +fn gui_asset_name(variant: gpapi::gui::GuiVariant) -> Option { + if variant == gpapi::gui::GuiVariant::Nsh { + return nsh_asset_name_for(std::env::consts::OS, std::env::consts::ARCH); + } gui_asset_name_for(std::env::consts::OS, std::env::consts::ARCH, GUI_LIBC_SUFFIX) } +fn nsh_asset_name_for(os: &str, arch: &str) -> Option { + match (os, arch) { + ("linux", "x86_64" | "aarch64") => Some(format!("gpgui-nsh_{arch}.bin.tar.xz")), + _ => None, + } +} + fn gui_asset_name_for(os: &str, arch: &str, libc_suffix: &str) -> Option { let name = match (os, arch) { ("linux", "x86_64" | "aarch64") => format!("gpgui_{arch}{libc_suffix}.bin.tar.xz"), @@ -97,10 +107,11 @@ impl Installer { Self { command_tx } } - async fn install(&self, path: &str, checksum: &str) -> anyhow::Result<()> { + async fn install(&self, path: &str, checksum: &str, variant: gpapi::gui::GuiVariant) -> anyhow::Result<()> { let request = UpdateGuiRequest { path: path.to_string(), checksum: checksum.to_string(), + variant, }; let (reply, result) = oneshot::channel(); self @@ -363,6 +374,7 @@ async fn receive_binary(socket: &mut Socket) -> anyhow::Result> { pub struct GuiUpdater { version: String, + variant: gpapi::gui::GuiVariant, notifier: Arc, installer: Installer, in_progress: RwLock, @@ -370,9 +382,15 @@ pub struct GuiUpdater { } impl GuiUpdater { - pub fn new(version: String, notifier: ProgressNotifier, installer: Installer) -> Self { + pub fn new( + version: String, + notifier: ProgressNotifier, + installer: Installer, + variant: gpapi::gui::GuiVariant, + ) -> Self { Self { version, + variant, notifier: Arc::new(notifier), installer, in_progress: Default::default(), @@ -381,7 +399,7 @@ impl GuiUpdater { } pub async fn update(&self) { - let Some(asset_name) = gui_asset_name() else { + let Some(asset_name) = gui_asset_name(self.variant) else { info!("GUI updates are not supported on this platform."); return; }; @@ -438,7 +456,7 @@ impl GuiUpdater { info!("Checksum success"); - if let Err(err) = self.installer.install(&file_path, &checksum).await { + if let Err(err) = self.installer.install(&file_path, &checksum, self.variant).await { warn!("Install error: {}", err); self.notify_error(); } else { @@ -488,13 +506,10 @@ impl GuiUpdater { #[cfg(test)] mod tests { - use gpapi::{ - os_profile::HostIdentity, - service::{ - transport::{ClientPrelude, NoiseResponder}, - vpn_env::{HostInfo, VpnEnv}, - vpn_state::VpnState, - }, + use gpapi::service::{ + transport::{ClientPrelude, NoiseResponder}, + vpn_env::{HostInfo, VpnEnv}, + vpn_state::VpnState, }; use tokio::net::TcpListener; use tokio_tungstenite::accept_async; @@ -522,6 +537,21 @@ mod tests { assert_eq!(gui_asset_name_for("macos", "aarch64", ""), None); } + #[test] + fn nsh_assets_are_linux_only_and_use_the_nsh_binary_archive() { + assert_eq!( + nsh_asset_name_for("linux", "x86_64"), + Some("gpgui-nsh_x86_64.bin.tar.xz".into()) + ); + assert_eq!( + nsh_asset_name_for("linux", "aarch64"), + Some("gpgui-nsh_aarch64.bin.tar.xz".into()) + ); + for os in ["freebsd", "openbsd", "macos"] { + assert_eq!(nsh_asset_name_for(os, "x86_64"), None); + } + } + #[tokio::test] async fn pending_install_reconnects_with_a_fresh_handshake() { let credential = Arc::new(SessionCredential::generate(Uuid::new_v4(), env!("CARGO_PKG_VERSION")).unwrap()); @@ -532,6 +562,7 @@ mod tests { request: UpdateGuiRequest { path: "/tmp/gpgui-update".to_owned(), checksum: "checksum".to_owned(), + variant: gpapi::gui::GuiVariant::Tauri, }, reply: reply_tx, }) @@ -635,7 +666,7 @@ mod tests { vpnc_script: None, auth_executable: String::new(), host_info: HostInfo { - host_identity: HostIdentity::collect(), + host_identity: gpapi::os_profile::desktop::collect_identity(), }, }, }; diff --git a/apps/gpgui-helper/src-tauri/tauri.conf.json b/apps/gpgui-helper/src-tauri/tauri.conf.json index 3bb182c..4f44b38 100644 --- a/apps/gpgui-helper/src-tauri/tauri.conf.json +++ b/apps/gpgui-helper/src-tauri/tauri.conf.json @@ -25,6 +25,7 @@ "maxWidth": 460, "maxHeight": 104, "label": "main", + "create": false, "decorations": false } ] diff --git a/apps/gpgui-helper/src/assets/icon-small.svg b/apps/gpgui-helper/src/assets/icon-small.svg index 592bec9..6181301 100644 --- a/apps/gpgui-helper/src/assets/icon-small.svg +++ b/apps/gpgui-helper/src/assets/icon-small.svg @@ -1,43 +1,44 @@ - - + + - + - + + + + + - - - - + + + + + + + + - - - - - - - - - - - + + + + - - - + + + - + diff --git a/apps/gpgui-helper/src/components/App/styles.css b/apps/gpgui-helper/src/components/App/styles.css index 7489b62..2902225 100644 --- a/apps/gpgui-helper/src/components/App/styles.css +++ b/apps/gpgui-helper/src/components/App/styles.css @@ -1,3 +1,33 @@ +:root { + color-scheme: light; + --background: #f6f5f4; + --foreground: #2e3436; + --muted-foreground: #5e5c64; + --progress-label: #3d3846; + --progress-track: #d5d3d1; + --progress-fill: #3584e4; + --error: #9c2f2f; + --button: #1c71d8; + --button-hover: #1a5fb4; + --button-active: #174a8b; + --focus-ring: #1a5fb4; +} + +:root[data-theme="dark"] { + color-scheme: dark; + --background: #242424; + --foreground: #ffffff; + --muted-foreground: #c0bfbc; + --progress-label: #deddda; + --progress-track: #454545; + --progress-fill: #78aeed; + --error: #ffb4ab; + --button: #1c71d8; + --button-hover: #3584e4; + --button-active: #1a5fb4; + --focus-ring: #78aeed; +} + html, body, #root { @@ -12,8 +42,8 @@ body, } body { - background: #f6f5f4; - color: #2e3436; + background: var(--background); + color: var(--foreground); font-family: Inter, ui-sans-serif, @@ -35,7 +65,7 @@ button { height: 100%; padding: 16px 18px; gap: 15px; - background: #f6f5f4; + background: var(--background); } .update-logo { @@ -52,7 +82,7 @@ button { .update-title { margin: 0; - color: #2e3436; + color: var(--foreground); font-size: 16px; font-weight: 600; line-height: 1.25; @@ -61,7 +91,7 @@ button { .update-description { margin: 3px 0 0; - color: #5e5c64; + color: var(--muted-foreground); font-size: 12px; line-height: 1.4; } @@ -85,13 +115,13 @@ button { margin-top: 9px; overflow: hidden; border-radius: 3px; - background-color: #d5d3d1; + background-color: var(--progress-track); } .progress-fill { height: 100%; border-radius: 3px; - background: #3584e4; + background: var(--progress-fill); transition: width 180ms ease-out; } @@ -123,7 +153,7 @@ button { .progress-label { flex: 0 0 auto; - color: #3d3846; + color: var(--progress-label); font-size: 12px; font-variant-numeric: tabular-nums; font-weight: 500; @@ -139,7 +169,7 @@ button { } .error-status .update-title { - color: #9c2f2f; + color: var(--error); } .error-copy { @@ -151,23 +181,23 @@ button { padding: 4px 14px; border: 0; border-radius: 8px; - background: #1c71d8; + background: var(--button); color: #ffffff; - cursor: pointer; + cursor: default; font-size: 12px; font-weight: 600; line-height: 1.5; } .retry-button:hover { - background: #1a5fb4; + background: var(--button-hover); } .retry-button:active { - background: #174a8b; + background: var(--button-active); } .retry-button:focus-visible { - outline: 2px solid #1a5fb4; + outline: 2px solid var(--focus-ring); outline-offset: 2px; } diff --git a/apps/gpgui-helper/tests/theme.test.mjs b/apps/gpgui-helper/tests/theme.test.mjs new file mode 100644 index 0000000..972ffc4 --- /dev/null +++ b/apps/gpgui-helper/tests/theme.test.mjs @@ -0,0 +1,48 @@ +import { readFileSync } from "node:fs"; +import { runInNewContext } from "node:vm"; +import { test } from "node:test"; +import assert from "node:assert/strict"; + +const html = readFileSync(new URL("../index.html", import.meta.url), "utf8"); +const script = html.match(/