diff --git a/Cargo.lock b/Cargo.lock index 6897229a..9eacd8d9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,6 +52,15 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "aho-corasick" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" +dependencies = [ + "memchr", +] + [[package]] name = "aho-corasick" version = "1.1.3" @@ -90,7 +99,7 @@ checksum = "f6f39be698127218cca460cb624878c9aa4e2b47dba3b277963d2bf00bad263b" dependencies = [ "android_log-sys", "env_filter", - "log", + "log 0.4.29", ] [[package]] @@ -175,7 +184,7 @@ checksum = "c1df21f715862ede32a0c525ce2ca4d52626bb0007f8c18b87a384503ac33e70" dependencies = [ "clipboard-win", "image", - "log", + "log 0.4.29", "objc2 0.6.1", "objc2-app-kit", "objc2-core-foundation", @@ -999,7 +1008,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" dependencies = [ - "lazy_static", + "lazy_static 1.5.0", "windows-sys 0.59.0", ] @@ -1519,7 +1528,7 @@ dependencies = [ "rustc_version", "toml 0.8.23", "vswhom", - "winreg", + "winreg 0.55.0", ] [[package]] @@ -1570,8 +1579,8 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" dependencies = [ - "log", - "regex", + "log 0.4.29", + "regex 1.11.1", ] [[package]] @@ -1584,7 +1593,7 @@ dependencies = [ "anstyle", "env_filter", "jiff", - "log", + "log 0.4.29", ] [[package]] @@ -1645,7 +1654,7 @@ name = "eventsource-client" version = "0.14.0" source = "git+https://github.com/yaakapp/rust-eventsource-client#60e0e3ac5038149c4778dc4979b09b152214f9a8" dependencies = [ - "log", + "log 0.4.29", "pin-project", ] @@ -1693,7 +1702,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4316185f709b23713e41e3195f90edef7fb00c3ed4adc79769cf09cc762a3b29" dependencies = [ "colored", - "log", + "log 0.4.29", ] [[package]] @@ -1702,7 +1711,7 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset", + "memoffset 0.9.1", "rustc_version", ] @@ -2143,7 +2152,7 @@ dependencies = [ "bitflags 2.9.1", "libc", "libgit2-sys", - "log", + "log 0.4.29", "openssl-probe", "openssl-sys", "url", @@ -2284,6 +2293,21 @@ dependencies = [ "tracing", ] +[[package]] +name = "handlebars" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb04af2006ea09d985fef82b81e0eb25337e51b691c76403332378a53d521edc" +dependencies = [ + "lazy_static 0.2.11", + "log 0.3.9", + "pest", + "quick-error", + "regex 0.2.11", + "serde", + "serde_json", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -2356,7 +2380,7 @@ version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b7410cae13cbc75623c98ac4cbfd1f0bedddf3227afc24f370cf0f50a44a11c" dependencies = [ - "log", + "log 0.4.29", "mac", "markup5ever", "match_token", @@ -2517,7 +2541,7 @@ dependencies = [ "core-foundation-sys", "iana-time-zone-haiku", "js-sys", - "log", + "log 0.4.29", "wasm-bindgen", "windows-core", ] @@ -2758,6 +2782,22 @@ dependencies = [ "generic-array", ] +[[package]] +name = "interfaces" +version = "0.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec8f50a973916cac3da5057c986db05cd3346f38c78e9bc24f64cc9f6a3978f" +dependencies = [ + "bitflags 1.3.2", + "cc", + "handlebars", + "lazy_static 1.5.0", + "libc", + "nix 0.23.2", + "serde", + "serde_derive", +] + [[package]] name = "ipnet" version = "2.11.0" @@ -2844,7 +2884,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e67e8da4c49d6d9909fe03361f9b620f58898859f5c7aded68351e85e71ecf50" dependencies = [ "jiff-static", - "log", + "log 0.4.29", "portable-atomic", "portable-atomic-util", "serde_core", @@ -2871,7 +2911,7 @@ dependencies = [ "cfg-if", "combine", "jni-sys", - "log", + "log 0.4.29", "thiserror 1.0.69", "walkdir", "windows-sys 0.45.0", @@ -2950,7 +2990,7 @@ checksum = "eebcc3aff044e5944a8fbaf69eb277d11986064cba30c468730e8b9909fb551c" dependencies = [ "byteorder", "dbus-secret-service", - "log", + "log 0.4.29", "security-framework 2.11.1", "security-framework 3.5.1", "windows-sys 0.60.2", @@ -2989,6 +3029,12 @@ dependencies = [ "selectors", ] +[[package]] +name = "lazy_static" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" + [[package]] name = "lazy_static" version = "1.5.0" @@ -3005,7 +3051,7 @@ dependencies = [ "gtk", "gtk-sys", "libappindicator-sys", - "log", + "log 0.4.29", ] [[package]] @@ -3163,6 +3209,15 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "log" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" +dependencies = [ + "log 0.4.29", +] + [[package]] name = "log" version = "0.4.29" @@ -3199,7 +3254,7 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7a7213d12e1864c0f002f52c2923d4556935a43dec5e71355c2760e0f6e7a18" dependencies = [ - "log", + "log 0.4.29", "phf 0.11.3", "phf_codegen 0.11.3", "string_cache", @@ -3248,6 +3303,15 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + [[package]] name = "memoffset" version = "0.9.1" @@ -3302,7 +3366,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" dependencies = [ "libc", - "log", + "log 0.4.29", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.59.0", ] @@ -3344,7 +3408,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" dependencies = [ "libc", - "log", + "log 0.4.29", "openssl", "openssl-probe", "openssl-sys", @@ -3362,7 +3426,7 @@ checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ "bitflags 2.9.1", "jni-sys", - "log", + "log 0.4.29", "ndk-sys", "num_enum", "raw-window-handle", @@ -3390,6 +3454,19 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" +[[package]] +name = "nix" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" +dependencies = [ + "bitflags 1.3.2", + "cc", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + [[package]] name = "nix" version = "0.30.1" @@ -3400,7 +3477,7 @@ dependencies = [ "cfg-if", "cfg_aliases", "libc", - "memoffset", + "memoffset 0.9.1", ] [[package]] @@ -3431,7 +3508,7 @@ dependencies = [ "inotify", "kqueue", "libc", - "log", + "log 0.4.29", "mio", "notify-types", "walkdir", @@ -3872,7 +3949,7 @@ version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41fc863e2ca13dc2d5c34fb22ea4a588248ac14db929616ba65c45f21744b1e9" dependencies = [ - "log", + "log 0.4.29", "serde", "windows-sys 0.52.0", ] @@ -3912,7 +3989,7 @@ dependencies = [ "des", "getrandom 0.2.16", "hmac", - "lazy_static", + "lazy_static 1.5.0", "rc2", "sha1", "yasna", @@ -4000,6 +4077,12 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "pest" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6dda33d67c26f0aac90d324ab2eb7239c819fc7b2552fe9faa4fe88441edc8" + [[package]] name = "petgraph" version = "0.6.5" @@ -4435,6 +4518,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + [[package]] name = "quick-xml" version = "0.32.0" @@ -4529,7 +4618,7 @@ version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" dependencies = [ - "log", + "log 0.4.29", "parking_lot", "scheduled-thread-pool", ] @@ -4696,16 +4785,29 @@ dependencies = [ "thiserror 2.0.17", ] +[[package]] +name = "regex" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" +dependencies = [ + "aho-corasick 0.6.10", + "memchr", + "regex-syntax 0.5.6", + "thread_local", + "utf8-ranges", +] + [[package]] name = "regex" version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ - "aho-corasick", + "aho-corasick 1.1.3", "memchr", "regex-automata", - "regex-syntax", + "regex-syntax 0.8.5", ] [[package]] @@ -4714,9 +4816,18 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ - "aho-corasick", + "aho-corasick 1.1.3", "memchr", - "regex-syntax", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-syntax" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" +dependencies = [ + "ucd-util", ] [[package]] @@ -4755,7 +4866,7 @@ dependencies = [ "hyper-tls", "hyper-util", "js-sys", - "log", + "log 0.4.29", "mime", "mime_guess", "native-tls", @@ -4796,7 +4907,7 @@ dependencies = [ "gobject-sys", "gtk-sys", "js-sys", - "log", + "log 0.4.29", "objc2 0.6.1", "objc2-app-kit", "objc2-core-foundation", @@ -4988,7 +5099,7 @@ dependencies = [ "core-foundation 0.10.1", "core-foundation-sys", "jni", - "log", + "log 0.4.29", "once_cell", "rustls", "rustls-native-certs", @@ -5176,7 +5287,7 @@ dependencies = [ "cssparser", "derive_more", "fxhash", - "log", + "log 0.4.29", "phf 0.8.0", "phf_codegen 0.8.0", "precomputed-hash", @@ -5544,7 +5655,7 @@ dependencies = [ "core-graphics 0.24.0", "foreign-types 0.5.0", "js-sys", - "log", + "log 0.4.29", "objc2 0.5.2", "objc2-foundation 0.2.2", "objc2-quartz-core 0.2.2", @@ -5692,6 +5803,18 @@ dependencies = [ "libc", ] +[[package]] +name = "sysproxy" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9707a79d3b95683aa5a9521e698ffd878b8fb289727c25a69157fb85d529ffff" +dependencies = [ + "interfaces", + "thiserror 1.0.69", + "winapi", + "winreg 0.10.1", +] + [[package]] name = "system-configuration" version = "0.6.1" @@ -5744,9 +5867,9 @@ dependencies = [ "gdkx11-sys", "gtk", "jni", - "lazy_static", + "lazy_static 1.5.0", "libc", - "log", + "log 0.4.29", "ndk", "ndk-context", "ndk-sys", @@ -5820,7 +5943,7 @@ dependencies = [ "http-range", "jni", "libc", - "log", + "log 0.4.29", "mime", "muda", "objc2 0.6.1", @@ -5939,7 +6062,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206dc20af4ed210748ba945c2774e60fd0acd52b9a73a028402caf809e9b6ecf" dependencies = [ "arboard", - "log", + "log 0.4.29", "serde", "serde_json", "tauri", @@ -5974,7 +6097,7 @@ version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "313f8138692ddc4a2127c4c9607d616a46f5c042e77b3722450866da0aad2f19" dependencies = [ - "log", + "log 0.4.29", "raw-window-handle", "rfd", "serde", @@ -6017,7 +6140,7 @@ dependencies = [ "android_logger", "byte-unit", "fern", - "log", + "log 0.4.29", "objc2 0.6.1", "objc2-foundation 0.3.1", "serde", @@ -6059,7 +6182,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8f08346c8deb39e96f86973da0e2d76cbb933d7ac9b750f6dc4daf955a6f997" dependencies = [ "gethostname 1.0.2", - "log", + "log 0.4.29", "os_info", "serde", "serde_json", @@ -6077,10 +6200,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c374b6db45f2a8a304f0273a15080d98c70cde86178855fc24653ba657a1144c" dependencies = [ "encoding_rs", - "log", + "log 0.4.29", "open", "os_pipe", - "regex", + "regex 1.11.1", "schemars", "serde", "serde_json", @@ -6119,7 +6242,7 @@ dependencies = [ "futures-util", "http", "infer", - "log", + "log 0.4.29", "minisign-verify", "osakit", "percent-encoding", @@ -6146,7 +6269,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73736611e14142408d15353e21e3cca2f12a3cfb523ad0ce85999b6d2ef1a704" dependencies = [ "bitflags 2.9.1", - "log", + "log 0.4.29", "serde", "serde_json", "tauri", @@ -6188,7 +6311,7 @@ dependencies = [ "gtk", "http", "jni", - "log", + "log 0.4.29", "objc2 0.6.1", "objc2-app-kit", "objc2-foundation 0.3.1", @@ -6223,12 +6346,12 @@ dependencies = [ "infer", "json-patch", "kuchikiki", - "log", + "log 0.4.29", "memchr", "phf 0.11.3", "proc-macro2", "quote", - "regex", + "regex 1.11.1", "schemars", "semver", "serde", @@ -6328,6 +6451,15 @@ dependencies = [ "syn 2.0.101", ] +[[package]] +name = "thread_local" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" +dependencies = [ + "lazy_static 1.5.0", +] + [[package]] name = "tiff" version = "0.9.1" @@ -6472,7 +6604,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084" dependencies = [ "futures-util", - "log", + "log 0.4.29", "rustls", "rustls-native-certs", "rustls-pki-types", @@ -6816,7 +6948,7 @@ dependencies = [ "data-encoding", "http", "httparse", - "log", + "log 0.4.29", "rand 0.9.1", "rustls", "rustls-pki-types", @@ -6837,13 +6969,19 @@ version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" +[[package]] +name = "ucd-util" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abd2fc5d32b590614af8b0a20d837f32eca055edd0bbead59a9cfe80858be003" + [[package]] name = "uds_windows" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset", + "memoffset 0.9.1", "tempfile", "winapi", ] @@ -6953,7 +7091,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70acd30e3aa1450bc2eece896ce2ad0d178e9c079493819301573dae3c37ba6d" dependencies = [ - "regex", + "regex 1.11.1", "serde", "unic-ucd-ident", "url", @@ -6965,6 +7103,12 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf8-ranges" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba" + [[package]] name = "utf8-width" version = "0.1.7" @@ -7101,7 +7245,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", - "log", + "log 0.4.29", "proc-macro2", "quote", "syn 2.0.101", @@ -7848,6 +7992,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + [[package]] name = "winreg" version = "0.55.0" @@ -7874,7 +8027,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e5ff8d0e60065f549fafd9d6cb626203ea64a798186c80d8e7df4f8af56baeb" dependencies = [ "libc", - "log", + "log 0.4.29", "os_pipe", "rustix 0.38.44", "tempfile", @@ -7994,6 +8147,17 @@ dependencies = [ "rustix 1.0.7", ] +[[package]] +name = "yaak-api" +version = "0.1.0" +dependencies = [ + "log 0.4.29", + "reqwest", + "sysproxy", + "thiserror 2.0.17", + "yaak-common", +] + [[package]] name = "yaak-app" version = "0.0.0" @@ -8003,7 +8167,7 @@ dependencies = [ "cookie", "eventsource-client", "http", - "log", + "log 0.4.29", "md5 0.8.0", "mime_guess", "openssl-sys", @@ -8034,6 +8198,7 @@ dependencies = [ "ts-rs", "url", "uuid", + "yaak-api", "yaak-common", "yaak-core", "yaak-crypto", @@ -8060,7 +8225,7 @@ dependencies = [ "clap", "dirs", "env_logger", - "log", + "log 0.4.29", "serde_json", "tokio", "yaak-crypto", @@ -8093,7 +8258,7 @@ dependencies = [ "base64 0.22.1", "chacha20poly1305", "keyring", - "log", + "log 0.4.29", "serde", "thiserror 2.0.17", "yaak-models", @@ -8117,7 +8282,7 @@ version = "0.1.0" dependencies = [ "chrono", "git2", - "log", + "log 0.4.29", "serde", "serde_json", "serde_yaml", @@ -8139,7 +8304,7 @@ dependencies = [ "dunce", "hyper-rustls", "hyper-util", - "log", + "log 0.4.29", "md5 0.7.0", "prost", "prost-reflect", @@ -8169,9 +8334,9 @@ dependencies = [ "futures-util", "http-body", "hyper-util", - "log", + "log 0.4.29", "mime_guess", - "regex", + "regex 1.11.1", "reqwest", "serde", "serde_json", @@ -8192,7 +8357,7 @@ name = "yaak-license" version = "0.1.0" dependencies = [ "chrono", - "log", + "log 0.4.29", "reqwest", "serde", "serde_json", @@ -8200,9 +8365,9 @@ dependencies = [ "tauri-plugin", "thiserror 2.0.17", "ts-rs", + "yaak-api", "yaak-common", "yaak-models", - "yaak-tauri-utils", ] [[package]] @@ -8211,7 +8376,7 @@ version = "0.1.0" dependencies = [ "cocoa", "csscolorparser", - "log", + "log 0.4.29", "objc", "rand 0.9.1", "tauri", @@ -8225,7 +8390,7 @@ dependencies = [ "chrono", "hex", "include_dir", - "log", + "log 0.4.29", "nanoid", "r2d2", "r2d2_sqlite", @@ -8250,11 +8415,11 @@ dependencies = [ "futures-util", "hex", "keyring", - "log", + "log 0.4.29", "md5 0.7.0", "path-slash", "rand 0.9.1", - "regex", + "regex 1.11.1", "reqwest", "serde", "serde_json", @@ -8284,7 +8449,7 @@ version = "0.1.0" dependencies = [ "chrono", "hex", - "log", + "log 0.4.29", "notify", "serde", "serde_json", @@ -8301,12 +8466,8 @@ dependencies = [ name = "yaak-tauri-utils" version = "0.1.0" dependencies = [ - "regex", - "reqwest", - "serde", + "regex 1.11.1", "tauri", - "thiserror 2.0.17", - "yaak-common", ] [[package]] @@ -8314,7 +8475,7 @@ name = "yaak-templates" version = "0.1.0" dependencies = [ "base64 0.22.1", - "log", + "log 0.4.29", "serde", "serde-wasm-bindgen", "serde_json", @@ -8328,7 +8489,7 @@ dependencies = [ name = "yaak-tls" version = "0.1.0" dependencies = [ - "log", + "log 0.4.29", "p12", "rustls", "rustls-pemfile", @@ -8345,7 +8506,7 @@ version = "0.1.0" dependencies = [ "futures-util", "http", - "log", + "log 0.4.29", "md5 0.8.0", "serde", "serde_json", @@ -8409,7 +8570,7 @@ dependencies = [ "futures-core", "futures-lite", "hex", - "nix", + "nix 0.30.1", "ordered-stream", "serde", "serde_repr", @@ -8576,7 +8737,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aed5f10c571472911e37d8f7601a8dfba52b4f7f73a344015291b82ab292faf6" dependencies = [ - "log", + "log 0.4.29", "thiserror 2.0.17", "zip", ] @@ -8595,7 +8756,7 @@ checksum = "edfc5ee405f504cd4984ecc6f14d02d55cfda60fa4b689434ef4102aae150cd7" dependencies = [ "bumpalo", "crc32fast", - "log", + "log 0.4.29", "simd-adler32", ] diff --git a/Cargo.toml b/Cargo.toml index 18a45a58..34cb3ee7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,6 +15,7 @@ members = [ "crates/yaak-templates", "crates/yaak-tls", "crates/yaak-ws", + "crates/yaak-api", # CLI crates "crates-cli/yaak-cli", # Tauri-specific crates @@ -58,6 +59,7 @@ yaak-sync = { path = "crates/yaak-sync" } yaak-templates = { path = "crates/yaak-templates" } yaak-tls = { path = "crates/yaak-tls" } yaak-ws = { path = "crates/yaak-ws" } +yaak-api = { path = "crates/yaak-api" } # Internal crates - Tauri-specific yaak-fonts = { path = "crates-tauri/yaak-fonts" } diff --git a/crates-tauri/yaak-app/Cargo.toml b/crates-tauri/yaak-app/Cargo.toml index 7213ea93..96f05ba0 100644 --- a/crates-tauri/yaak-app/Cargo.toml +++ b/crates-tauri/yaak-app/Cargo.toml @@ -57,6 +57,7 @@ url = "2" tokio-util = { version = "0.7", features = ["codec"] } ts-rs = { workspace = true } uuid = "1.12.1" +yaak-api = { workspace = true } yaak-common = { workspace = true } yaak-tauri-utils = { workspace = true } yaak-core = { workspace = true } diff --git a/crates-tauri/yaak-app/src/error.rs b/crates-tauri/yaak-app/src/error.rs index 9af1ce16..10659d53 100644 --- a/crates-tauri/yaak-app/src/error.rs +++ b/crates-tauri/yaak-app/src/error.rs @@ -36,7 +36,7 @@ pub enum Error { PluginError(#[from] yaak_plugins::error::Error), #[error(transparent)] - TauriUtilsError(#[from] yaak_tauri_utils::error::Error), + ApiError(#[from] yaak_api::Error), #[error(transparent)] ClipboardError(#[from] tauri_plugin_clipboard_manager::Error), diff --git a/crates-tauri/yaak-app/src/notifications.rs b/crates-tauri/yaak-app/src/notifications.rs index 9354e5f3..53a5c253 100644 --- a/crates-tauri/yaak-app/src/notifications.rs +++ b/crates-tauri/yaak-app/src/notifications.rs @@ -10,7 +10,7 @@ use tauri::{AppHandle, Emitter, Manager, Runtime, WebviewWindow}; use ts_rs::TS; use yaak_common::platform::get_os_str; use yaak_models::util::UpdateSource; -use yaak_tauri_utils::api_client::yaak_api_client; +use yaak_api::yaak_api_client; // Check for updates every hour const MAX_UPDATE_CHECK_SECONDS: u64 = 60 * 60; @@ -101,7 +101,8 @@ impl YaakNotifier { let license_check = "disabled".to_string(); let launch_info = get_or_upsert_launch_info(app_handle); - let req = yaak_api_client(app_handle)? + let app_version = app_handle.package_info().version.to_string(); + let req = yaak_api_client(&app_version)? .request(Method::GET, "https://notify.yaak.app/notifications") .query(&[ ("version", &launch_info.current_version), diff --git a/crates-tauri/yaak-app/src/plugins_ext.rs b/crates-tauri/yaak-app/src/plugins_ext.rs index 8807840d..f3a0af5a 100644 --- a/crates-tauri/yaak-app/src/plugins_ext.rs +++ b/crates-tauri/yaak-app/src/plugins_ext.rs @@ -31,7 +31,7 @@ use yaak_plugins::events::{Color, Icon, PluginContext, ShowToastRequest}; use yaak_plugins::install::{delete_and_uninstall, download_and_install}; use yaak_plugins::manager::PluginManager; use yaak_plugins::plugin_meta::get_plugin_meta; -use yaak_tauri_utils::api_client::yaak_api_client; +use yaak_api::yaak_api_client; static EXITING: AtomicBool = AtomicBool::new(false); @@ -72,7 +72,8 @@ impl PluginUpdater { info!("Checking for plugin updates"); - let http_client = yaak_api_client(window.app_handle())?; + let app_version = window.app_handle().package_info().version.to_string(); + let http_client = yaak_api_client(&app_version)?; let plugins = window.app_handle().db().list_plugins()?; let updates = check_plugin_updates(&http_client, plugins.clone()).await?; @@ -136,7 +137,8 @@ pub async fn cmd_plugins_search( app_handle: AppHandle, query: &str, ) -> Result { - let http_client = yaak_api_client(&app_handle)?; + let app_version = app_handle.package_info().version.to_string(); + let http_client = yaak_api_client(&app_version)?; Ok(search_plugins(&http_client, query).await?) } @@ -147,7 +149,8 @@ pub async fn cmd_plugins_install( version: Option, ) -> Result<()> { let plugin_manager = Arc::new((*window.state::()).clone()); - let http_client = yaak_api_client(window.app_handle())?; + let app_version = window.app_handle().package_info().version.to_string(); + let http_client = yaak_api_client(&app_version)?; let query_manager = window.state::(); let plugin_context = window.plugin_context(); download_and_install( @@ -177,7 +180,8 @@ pub async fn cmd_plugins_uninstall( pub async fn cmd_plugins_updates( app_handle: AppHandle, ) -> Result { - let http_client = yaak_api_client(&app_handle)?; + let app_version = app_handle.package_info().version.to_string(); + let http_client = yaak_api_client(&app_version)?; let plugins = app_handle.db().list_plugins()?; Ok(check_plugin_updates(&http_client, plugins).await?) } @@ -186,7 +190,8 @@ pub async fn cmd_plugins_updates( pub async fn cmd_plugins_update_all( window: WebviewWindow, ) -> Result> { - let http_client = yaak_api_client(window.app_handle())?; + let app_version = window.app_handle().package_info().version.to_string(); + let http_client = yaak_api_client(&app_version)?; let plugins = window.db().list_plugins()?; // Get list of available updates (already filtered to only registry plugins) diff --git a/crates-tauri/yaak-app/src/updates.rs b/crates-tauri/yaak-app/src/updates.rs index b8f64a5a..c068a813 100644 --- a/crates-tauri/yaak-app/src/updates.rs +++ b/crates-tauri/yaak-app/src/updates.rs @@ -15,6 +15,9 @@ use ts_rs::TS; use yaak_models::util::generate_id; use yaak_plugins::manager::PluginManager; +use url::Url; +use yaak_api::get_system_proxy_url; + use crate::error::Error::GenericError; use crate::is_dev; @@ -87,8 +90,13 @@ impl YaakUpdater { info!("Checking for updates mode={} autodl={}", mode, auto_download); let w = window.clone(); - let update_check_result = w - .updater_builder() + let mut updater_builder = w.updater_builder(); + if let Some(proxy_url) = get_system_proxy_url() { + if let Ok(url) = Url::parse(&proxy_url) { + updater_builder = updater_builder.proxy(url); + } + } + let update_check_result = updater_builder .on_before_exit(move || { // Kill plugin manager before exit or NSIS installer will fail to replace sidecar // while it's running. diff --git a/crates-tauri/yaak-app/src/uri_scheme.rs b/crates-tauri/yaak-app/src/uri_scheme.rs index 52119241..d186bbfc 100644 --- a/crates-tauri/yaak-app/src/uri_scheme.rs +++ b/crates-tauri/yaak-app/src/uri_scheme.rs @@ -12,7 +12,7 @@ use yaak_models::util::generate_id; use yaak_plugins::events::{Color, ShowToastRequest}; use yaak_plugins::install::download_and_install; use yaak_plugins::manager::PluginManager; -use yaak_tauri_utils::api_client::yaak_api_client; +use yaak_api::yaak_api_client; pub(crate) async fn handle_deep_link( app_handle: &AppHandle, @@ -46,7 +46,8 @@ pub(crate) async fn handle_deep_link( let plugin_manager = Arc::new((*window.state::()).clone()); let query_manager = app_handle.db_manager(); - let http_client = yaak_api_client(app_handle)?; + let app_version = app_handle.package_info().version.to_string(); + let http_client = yaak_api_client(&app_version)?; let plugin_context = window.plugin_context(); let pv = download_and_install( plugin_manager, @@ -86,7 +87,8 @@ pub(crate) async fn handle_deep_link( return Ok(()); } - let resp = yaak_api_client(app_handle)?.get(file_url).send().await?; + let app_version = app_handle.package_info().version.to_string(); + let resp = yaak_api_client(&app_version)?.get(file_url).send().await?; let json = resp.bytes().await?; let p = app_handle .path() diff --git a/crates-tauri/yaak-license/Cargo.toml b/crates-tauri/yaak-license/Cargo.toml index 3560040a..4eb04489 100644 --- a/crates-tauri/yaak-license/Cargo.toml +++ b/crates-tauri/yaak-license/Cargo.toml @@ -16,7 +16,7 @@ thiserror = { workspace = true } ts-rs = { workspace = true } yaak-common = { workspace = true } yaak-models = { workspace = true } -yaak-tauri-utils = { workspace = true } +yaak-api = { workspace = true } [build-dependencies] tauri-plugin = { workspace = true, features = ["build"] } diff --git a/crates-tauri/yaak-license/src/error.rs b/crates-tauri/yaak-license/src/error.rs index 823260fe..99e1292d 100644 --- a/crates-tauri/yaak-license/src/error.rs +++ b/crates-tauri/yaak-license/src/error.rs @@ -16,7 +16,7 @@ pub enum Error { ModelError(#[from] yaak_models::error::Error), #[error(transparent)] - TauriUtilsError(#[from] yaak_tauri_utils::error::Error), + ApiError(#[from] yaak_api::Error), #[error("Internal server error")] ServerError, diff --git a/crates-tauri/yaak-license/src/license.rs b/crates-tauri/yaak-license/src/license.rs index dc6c185e..3f2c4aa3 100644 --- a/crates-tauri/yaak-license/src/license.rs +++ b/crates-tauri/yaak-license/src/license.rs @@ -11,7 +11,7 @@ use yaak_common::platform::get_os_str; use yaak_models::db_context::DbContext; use yaak_models::query_manager::QueryManager; use yaak_models::util::UpdateSource; -use yaak_tauri_utils::api_client::yaak_api_client; +use yaak_api::yaak_api_client; /// Extension trait for accessing the QueryManager from Tauri Manager types. /// This is needed temporarily until all crates are refactored to not use Tauri. @@ -118,11 +118,12 @@ pub async fn activate_license( license_key: &str, ) -> Result<()> { info!("Activating license {}", license_key); - let client = reqwest::Client::new(); + let app_version = window.app_handle().package_info().version.to_string(); + let client = yaak_api_client(&app_version)?; let payload = ActivateLicenseRequestPayload { license_key: license_key.to_string(), app_platform: get_os_str().to_string(), - app_version: window.app_handle().package_info().version.to_string(), + app_version, }; let response = client.post(build_url("/licenses/activate")).json(&payload).send().await?; @@ -155,11 +156,12 @@ pub async fn deactivate_license(window: &WebviewWindow) -> Result let app_handle = window.app_handle(); let activation_id = get_activation_id(app_handle).await; - let client = reqwest::Client::new(); + let app_version = window.app_handle().package_info().version.to_string(); + let client = yaak_api_client(&app_version)?; let path = format!("/licenses/activations/{}/deactivate", activation_id); let payload = DeactivateLicenseRequestPayload { app_platform: get_os_str().to_string(), - app_version: window.app_handle().package_info().version.to_string(), + app_version, }; let response = client.post(build_url(&path)).json(&payload).send().await?; @@ -186,9 +188,10 @@ pub async fn deactivate_license(window: &WebviewWindow) -> Result } pub async fn check_license(window: &WebviewWindow) -> Result { + let app_version = window.app_handle().package_info().version.to_string(); let payload = CheckActivationRequestPayload { app_platform: get_os_str().to_string(), - app_version: window.package_info().version.to_string(), + app_version, }; let activation_id = get_activation_id(window.app_handle()).await; @@ -204,7 +207,7 @@ pub async fn check_license(window: &WebviewWindow) -> Result { info!("Checking license activation"); // A license has been activated, so let's check the license server - let client = yaak_api_client(window.app_handle())?; + let client = yaak_api_client(&payload.app_version)?; let path = format!("/licenses/activations/{activation_id}/check-v2"); let response = client.post(build_url(&path)).json(&payload).send().await?; diff --git a/crates-tauri/yaak-tauri-utils/Cargo.toml b/crates-tauri/yaak-tauri-utils/Cargo.toml index 11652f1a..74272621 100644 --- a/crates-tauri/yaak-tauri-utils/Cargo.toml +++ b/crates-tauri/yaak-tauri-utils/Cargo.toml @@ -6,8 +6,4 @@ publish = false [dependencies] tauri = { workspace = true } -reqwest = { workspace = true, features = ["gzip"] } -thiserror = { workspace = true } -serde = { workspace = true, features = ["derive"] } regex = "1.11.0" -yaak-common = { workspace = true } diff --git a/crates-tauri/yaak-tauri-utils/src/api_client.rs b/crates-tauri/yaak-tauri-utils/src/api_client.rs deleted file mode 100644 index cc308126..00000000 --- a/crates-tauri/yaak-tauri-utils/src/api_client.rs +++ /dev/null @@ -1,24 +0,0 @@ -use crate::error::Result; -use reqwest::Client; -use std::time::Duration; -use tauri::http::{HeaderMap, HeaderValue}; -use tauri::{AppHandle, Runtime}; -use yaak_common::platform::{get_ua_arch, get_ua_platform}; - -pub fn yaak_api_client(app_handle: &AppHandle) -> Result { - let platform = get_ua_platform(); - let version = app_handle.package_info().version.clone(); - let arch = get_ua_arch(); - let ua = format!("Yaak/{version} ({platform}; {arch})"); - let mut default_headers = HeaderMap::new(); - default_headers.insert("Accept", HeaderValue::from_str("application/json").unwrap()); - - let client = reqwest::ClientBuilder::new() - .timeout(Duration::from_secs(20)) - .default_headers(default_headers) - .gzip(true) - .user_agent(ua) - .build()?; - - Ok(client) -} diff --git a/crates-tauri/yaak-tauri-utils/src/error.rs b/crates-tauri/yaak-tauri-utils/src/error.rs deleted file mode 100644 index 46a9c103..00000000 --- a/crates-tauri/yaak-tauri-utils/src/error.rs +++ /dev/null @@ -1,19 +0,0 @@ -use serde::{Serialize, Serializer}; -use thiserror::Error; - -#[derive(Error, Debug)] -pub enum Error { - #[error(transparent)] - ReqwestError(#[from] reqwest::Error), -} - -impl Serialize for Error { - fn serialize(&self, serializer: S) -> std::result::Result - where - S: Serializer, - { - serializer.serialize_str(self.to_string().as_ref()) - } -} - -pub type Result = std::result::Result; diff --git a/crates-tauri/yaak-tauri-utils/src/lib.rs b/crates-tauri/yaak-tauri-utils/src/lib.rs index 719ee7f0..61b63f17 100644 --- a/crates-tauri/yaak-tauri-utils/src/lib.rs +++ b/crates-tauri/yaak-tauri-utils/src/lib.rs @@ -1,3 +1 @@ -pub mod api_client; -pub mod error; pub mod window; diff --git a/crates/yaak-api/Cargo.toml b/crates/yaak-api/Cargo.toml new file mode 100644 index 00000000..024ae852 --- /dev/null +++ b/crates/yaak-api/Cargo.toml @@ -0,0 +1,12 @@ +[package] +name = "yaak-api" +version = "0.1.0" +edition = "2024" +publish = false + +[dependencies] +log = { workspace = true } +reqwest = { workspace = true, features = ["gzip"] } +sysproxy = "0.3" +thiserror = { workspace = true } +yaak-common = { workspace = true } diff --git a/crates/yaak-api/src/error.rs b/crates/yaak-api/src/error.rs new file mode 100644 index 00000000..2cdc6a11 --- /dev/null +++ b/crates/yaak-api/src/error.rs @@ -0,0 +1,9 @@ +use thiserror::Error; + +#[derive(Error, Debug)] +pub enum Error { + #[error(transparent)] + ReqwestError(#[from] reqwest::Error), +} + +pub type Result = std::result::Result; diff --git a/crates/yaak-api/src/lib.rs b/crates/yaak-api/src/lib.rs new file mode 100644 index 00000000..6e18de19 --- /dev/null +++ b/crates/yaak-api/src/lib.rs @@ -0,0 +1,70 @@ +mod error; + +pub use error::{Error, Result}; + +use log::{debug, warn}; +use reqwest::Client; +use reqwest::header::{HeaderMap, HeaderValue}; +use std::time::Duration; +use yaak_common::platform::{get_ua_arch, get_ua_platform}; + +/// Build a reqwest Client configured for Yaak's own API calls. +/// +/// Includes a custom User-Agent, JSON accept header, 20s timeout, gzip, +/// and automatic OS-level proxy detection via sysproxy. +pub fn yaak_api_client(version: &str) -> Result { + let platform = get_ua_platform(); + let arch = get_ua_arch(); + let ua = format!("Yaak/{version} ({platform}; {arch})"); + + let mut default_headers = HeaderMap::new(); + default_headers.insert("Accept", HeaderValue::from_str("application/json").unwrap()); + + let mut builder = reqwest::ClientBuilder::new() + .timeout(Duration::from_secs(20)) + .default_headers(default_headers) + .gzip(true) + .user_agent(ua); + + if let Some(sys) = get_enabled_system_proxy() { + let proxy_url = format!("http://{}:{}", sys.host, sys.port); + match reqwest::Proxy::all(&proxy_url) { + Ok(p) => { + let p = if !sys.bypass.is_empty() { + p.no_proxy(reqwest::NoProxy::from_string(&sys.bypass)) + } else { + p + }; + builder = builder.proxy(p); + } + Err(e) => { + warn!("Failed to configure system proxy: {e}"); + } + } + } + + Ok(builder.build()?) +} + +/// Returns the system proxy URL if one is enabled, e.g. `http://host:port`. +pub fn get_system_proxy_url() -> Option { + let sys = get_enabled_system_proxy()?; + Some(format!("http://{}:{}", sys.host, sys.port)) +} + +fn get_enabled_system_proxy() -> Option { + match sysproxy::Sysproxy::get_system_proxy() { + Ok(sys) if sys.enable => { + debug!("Detected system proxy: http://{}:{}", sys.host, sys.port); + Some(sys) + } + Ok(_) => { + debug!("System proxy detected but not enabled"); + None + } + Err(e) => { + debug!("Could not detect system proxy: {e}"); + None + } + } +}