diff --git a/Cargo.lock b/Cargo.lock index ef86f50..2d24781 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -324,7 +324,7 @@ dependencies = [ "memchr", "proc-macro2", "quote", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "serde", "serde_derive", "syn 2.0.118", @@ -345,7 +345,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7db09fde9143e7ac4513358fb32ee32847125b63b18ea715afd487956da715da" dependencies = [ - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "serde", "serde_derive", "unicode-ident", @@ -1298,7 +1298,7 @@ dependencies = [ "cosmic-text", "etagere", "lru 0.16.4", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "wgpu", ] @@ -1919,8 +1919,8 @@ dependencies = [ [[package]] name = "flexaccess-iroh" -version = "0.0.8" -source = "git+https://github.com/flexaccessdev/flexaccess-iroh?tag=v0.0.8#e718f5d0b00f9837a7bea50114d77320f31f5197" +version = "0.0.9" +source = "git+https://github.com/flexaccessdev/flexaccess-iroh?tag=v0.0.9#e3e7ae1366419ce5b3a01d50e89eb229bdf4b4fb" dependencies = [ "anyhow", "base64", @@ -1945,7 +1945,7 @@ dependencies = [ [[package]] name = "flextunnel-cli" -version = "0.0.77" +version = "0.0.78" dependencies = [ "anyhow", "clap", @@ -1961,7 +1961,7 @@ dependencies = [ [[package]] name = "flextunnel-core" -version = "0.0.77" +version = "0.0.78" dependencies = [ "anyhow", "askama", @@ -1992,7 +1992,7 @@ dependencies = [ [[package]] name = "flextunnel-desktop" -version = "0.0.77" +version = "0.0.78" dependencies = [ "aes-gcm", "anyhow", @@ -2021,7 +2021,7 @@ dependencies = [ [[package]] name = "flextunnel-ffi" -version = "0.0.77" +version = "0.0.78" dependencies = [ "flextunnel-core", "iroh", @@ -2753,24 +2753,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2295ed2f9c31e471e1428a8f88a3f0e1f4b27c15049592138d1eebe9c35b183" dependencies = [ "async-trait", - "bytes", "cfg-if", "data-encoding", "futures-channel", "futures-io", "futures-util", - "h2", "hickory-proto", - "http", "idna", "ipnet", "jni 0.22.4", "rand 0.10.1", - "rustls", "thiserror 2.0.18", "tinyvec", "tokio", - "tokio-rustls", "tracing", "url", ] @@ -2805,21 +2800,14 @@ dependencies = [ "futures-util", "hickory-net", "hickory-proto", - "ipconfig", "ipnet", - "jni 0.22.4", "moka", - "ndk-context", "once_cell", "parking_lot", "rand 0.10.1", - "resolv-conf", - "rustls", "smallvec", - "system-configuration", "thiserror 2.0.18", "tokio", - "tokio-rustls", "tracing", ] @@ -2989,7 +2977,7 @@ dependencies = [ "lilt", "log", "num-traits", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "smol_str 0.2.2", "thiserror 2.0.18", "web-time", @@ -3015,7 +3003,7 @@ dependencies = [ "futures", "iced_core", "log", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "tokio", "wasm-bindgen-futures", "wasmtimer", @@ -3035,7 +3023,7 @@ dependencies = [ "iced_futures", "log", "raw-window-handle", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "thiserror 2.0.18", "unicode-segmentation", ] @@ -3088,7 +3076,7 @@ dependencies = [ "iced_graphics", "kurbo", "log", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "softbuffer", "tiny-skia", ] @@ -3108,7 +3096,7 @@ dependencies = [ "iced_debug", "iced_graphics", "log", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "thiserror 2.0.18", "wgpu", ] @@ -3122,7 +3110,7 @@ dependencies = [ "iced_renderer", "log", "num-traits", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "thiserror 2.0.18", "unicode-segmentation", ] @@ -3137,7 +3125,7 @@ dependencies = [ "iced_program", "log", "mundy", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "thiserror 2.0.18", "tracing", "wasm-bindgen-futures", @@ -3366,9 +3354,9 @@ checksum = "cf370abdafd54d13e54a620e8c3e1145f28e46cc9d704bc6d94414559df41763" [[package]] name = "iroh" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "329552fad4e46b5ccb4439d5635216f6289eec2c46f3fde4bc732d762694b9e5" +checksum = "b2f8d1cfffc83efe39a1031aab423ce09cb8048071baba550508931e9a81ce46" dependencies = [ "backon", "blake3", @@ -3380,7 +3368,6 @@ dependencies = [ "ed25519-dalek", "futures-util", "getrandom 0.4.3", - "hickory-resolver", "http", "ipnet", "iroh-base", @@ -3400,7 +3387,7 @@ dependencies = [ "portmapper", "rand 0.10.1", "reqwest", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "rustls", "rustls-pki-types", "serde", @@ -3417,9 +3404,9 @@ dependencies = [ [[package]] name = "iroh-base" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ccf4cde68a02ef03c0095ab2c031c6adfe508f3bc8e7c258558a027ebe64a8e" +checksum = "ffd1efd1aaecd68d4d1b0727a30c5811f43fb822843e48f65f6e5db3b7256cc9" dependencies = [ "curve25519-dalek", "data-encoding", @@ -3436,18 +3423,17 @@ dependencies = [ [[package]] name = "iroh-dns" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a41224eb0140a5c519935d4073fc6b236d174080be401f9bf7da126b2ee3aa4" +checksum = "80276761b56e904e26ea71d0863beef0bb8d5ab6b639cbd1338e4b615209e3a1" dependencies = [ "arc-swap", "cfg_aliases", "derive_more", - "hickory-resolver", "iroh-base", + "n0-dns-resolver", "n0-error", "n0-future", - "ndk-context", "portable-atomic", "rand 0.10.1", "rustls", @@ -3507,9 +3493,9 @@ dependencies = [ [[package]] name = "iroh-relay" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5f6f07e2c9b0c4bc82e2864be09f4aea4320165d5316e668616dbc822f428a" +checksum = "beb2294a9749d6a25fd7cd8bcf0fccd932f20716d4f967d85d3f23c7135ae6a2" dependencies = [ "blake3", "bytes", @@ -3517,7 +3503,6 @@ dependencies = [ "data-encoding", "derive_more", "getrandom 0.4.3", - "hickory-resolver", "http", "http-body-util", "hyper", @@ -4125,6 +4110,31 @@ dependencies = [ "zbus", ] +[[package]] +name = "n0-dns-resolver" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "535c99c9a786bee714155d2ee4fc2477405c2c43536e1bc6a51de09a0d1448f7" +dependencies = [ + "derive_more", + "ipconfig", + "jni 0.22.4", + "lru 0.18.0", + "n0-error", + "n0-future", + "ndk-context", + "rand 0.10.1", + "reqwest", + "rustc-hash 2.1.3", + "rustls", + "simple-dns", + "system-configuration", + "tokio", + "tokio-rustls", + "tracing", + "webpki-roots", +] + [[package]] name = "n0-error" version = "1.0.0" @@ -4426,9 +4436,9 @@ dependencies = [ [[package]] name = "noq" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1e6c57353d26be91a242f0ec96073066c4481a03f6be874daafb18902394515" +checksum = "b78be567e796cfa74bb9bdc4117790af2d505eb887019cf8803244353eb09d89" dependencies = [ "bytes", "cfg_aliases", @@ -4436,7 +4446,7 @@ dependencies = [ "noq-proto", "noq-udp", "pin-project-lite", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "rustls", "socket2", "thiserror 2.0.18", @@ -4448,9 +4458,9 @@ dependencies = [ [[package]] name = "noq-proto" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a46813e306c29c4f86357b6ffa39a8e1c97bb274b9a296a19a56d62e4111225" +checksum = "7c1e5b6fe668491eca022f745a0a9402585626c73a7b839b3424ace15d6a9c8f" dependencies = [ "aes-gcm", "bytes", @@ -4462,7 +4472,7 @@ dependencies = [ "rand 0.10.1", "rand_pcg", "ring", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "rustls", "rustls-pki-types", "slab", @@ -4475,9 +4485,9 @@ dependencies = [ [[package]] name = "noq-udp" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b56d621ed2c1773b5356ab39cc68c819f8d0103f7493d8661c4a5f5f8ea55f40" +checksum = "4dc50afea61aff926e150a36c31f06094608848e114a3fe667d76ec233163b1c" dependencies = [ "cfg_aliases", "libc", @@ -4538,7 +4548,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8" dependencies = [ - "proc-macro-crate 2.0.2", + "proc-macro-crate 3.5.0", "proc-macro2", "quote", "syn 2.0.118", @@ -5969,12 +5979,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "resolv-conf" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e061d1b48cb8d38042de4ae0a7a6401009d6143dc80d2e2d6f31f0bdd6470c7" - [[package]] name = "rfd" version = "0.15.4" @@ -6027,9 +6031,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc-hash" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" +checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d" [[package]] name = "rustc_version" @@ -6797,12 +6801,12 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b" +checksum = "501336eb7ba9e417300a6a0fa985721065467aa83a6dcf0422a8e43e4c0328fa" dependencies = [ "bitflags 2.13.0", - "core-foundation 0.9.4", + "core-foundation 0.10.1", "system-configuration-sys", ] diff --git a/Cargo.toml b/Cargo.toml index 526c6b0..c08e6d7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ default-members = [ ] [workspace.package] -version = "0.0.77" +version = "0.0.78" edition = "2024" description = "SOCKS5/HTTP-proxy-over-QUIC split tunnel via iroh P2P" @@ -31,8 +31,8 @@ hickory-resolver = { version = "0.26", default-features = false, features = ["to # Shared iroh transport layer (relay config + probe, endpoint building and # rebuild, home-relay watchdog, endpoint-bound auth transcript). `mdns` turns on # local-network discovery on every endpoint (compiled out on iOS by the crate). -flexaccess-iroh = { git = "https://github.com/flexaccessdev/flexaccess-iroh", tag = "v0.0.8", features = ["mdns"] } -iroh = "1.1.0" +flexaccess-iroh = { git = "https://github.com/flexaccessdev/flexaccess-iroh", tag = "v0.0.9", features = ["mdns"] } +iroh = "1.2.0" libc = "0.2" log = "0.4" n0-future = "0.3"